From minahito ＠ users.sourceforge.jp  Wed Feb  1 16:30:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 16:30:43 +0900
Subject: [xoops-cvslog 2029] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060201073043.44FDC2AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.6 xoops2jp/html/modules/user/language/english/main.php:1.1.2.7
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.6	Thu Jan 26 20:17:27 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Wed Feb  1 16:30:43 2006
@@ -60,7 +60,7 @@
 define('_US_ENTERPWD', "ERROR: You must provide a password.");
 define('_US_EXTRAINFO', "Extra Info");
 define('_US_FINISH', "Finish");
-define('_US_GROUPS', "User\");
+define('_US_GROUPS', "User\'s Groups");
 define('_US_HASJUSTREG', "%s has just registered!");
 define('_US_IAGREE', "I agree to the above");
 define('_US_ICQ', "ICQ");
@@ -94,7 +94,6 @@
 define('_US_NICKNAMETOOSHORT', "Username is too short. It must be more than %s characters.");
 define('_US_NO', "No");
 define('_US_NOACTTPADM', "The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.");
-define('_US_NOEDITRIGHT', "Sorry, you don't have the right to edit this user's info.");
 define('_US_NOPERMISS', "Sorry, you dont have the permission to perform this action!");
 define('_US_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account.");
 define('_US_NOREGISTER', "Sorry, we are currently closed for new user registrations");

From minahito ＠ users.sourceforge.jp  Wed Feb  1 20:37:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 20:37:53 +0900
Subject: [xoops-cvslog 2030] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060201113753.564BE2AC142@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.15 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.16
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.15	Tue Jan 31 14:31:21 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Wed Feb  1 20:37:53 2006
@@ -1,125 +1,126 @@
-<?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_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', "password required");
-define('_AD_USER_ERROR_RAISE_ERROR', "エラーが発生しました");
-define('_AD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_AD_USER_ERROR_UMODE', "コメントの並び順に指定した値が不正です");
-define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "uname no unique");
-define('_AD_USER_ERROR_WRONG_FORMAT', "不正なフォーマットです");
-define('_AD_USER_LANG_ACTIVEUSER', "activeuser");
-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', "avatar 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_WEIGHT', "優先度");
-define('_AD_USER_LANG_BIO', "その他");
-define('_AD_USER_LANG_BODY', "body");
-define('_AD_USER_LANG_BY_EMAIL', "by_email");
-define('_AD_USER_LANG_BY_PM', "by_pm");
-define('_AD_USER_LANG_CONTROL', "操作");
-define('_AD_USER_LANG_CREATE_NEW', "新規作成");
-define('_AD_USER_LANG_CUSTOM_AVATAR', "custom avatar");
-define('_AD_USER_LANG_DELETE_RANK', "ユーザーランクの削除");
-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', "groupid");
-define('_AD_USER_LANG_ID', "id");
-define('_AD_USER_LANG_LASTLOGIN', "最終ログイン");
-define('_AD_USER_LANG_LASTLOGIN_FLAG', "lastlogin_flag");
-define('_AD_USER_LANG_LEVEL', "レベル");
-define('_AD_USER_LANG_MAILOK', "mailok");
-define('_AD_USER_LANG_NAME', "本名");
-define('_AD_USER_LANG_NO_SPECIAL_RANK', "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_PASS', "パスワード");
-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_REGISTDATE', "registdate");
-define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
-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_TIMEZONE_OFFSET', "タイムゾーン");
-define('_AD_USER_LANG_UID', "UID");
-define('_AD_USER_LANG_UMODE', "コメント表示モード");
-define('_AD_USER_LANG_UNAME', "ユーザー名");
-define('_AD_USER_LANG_UORDER', "コメントの並び順");
-define('_AD_USER_LANG_URL', "ホームページ");
-define('_AD_USER_LANG_USER_AIM', "AIM");
-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_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', "ユーザーランクを保存しました");
-
-?>
+<?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_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_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_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_WEIGHT', "優先度");
+define('_AD_USER_LANG_BIO', "その他");
+define('_AD_USER_LANG_BODY', "本文");
+define('_AD_USER_LANG_BY_EMAIL', "by_email");
+define('_AD_USER_LANG_BY_PM', "by_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_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_LASTLOGIN', "最終ログイン");
+define('_AD_USER_LANG_LASTLOGIN_FLAG', "lastlogin_flag");
+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_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
+define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
+define('_AD_USER_LANG_OFF', "オフ");
+define('_AD_USER_LANG_ON', "オン");
+define('_AD_USER_LANG_PASS', "パスワード");
+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_REGISTDATE', "登録日時");
+define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
+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_TIMEZONE_OFFSET', "タイムゾーン");
+define('_AD_USER_LANG_UID', "UID");
+define('_AD_USER_LANG_UMODE', "コメント表示モード");
+define('_AD_USER_LANG_UNAME', "ユーザー名");
+define('_AD_USER_LANG_UORDER', "コメントの並び順");
+define('_AD_USER_LANG_URL', "ホームページ");
+define('_AD_USER_LANG_USER_AIM', "AIM");
+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_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', "ユーザーランクを保存しました");
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Feb  1 20:38:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 20:38:06 +0900
Subject: [xoops-cvslog 2031] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060201113806.AEC322AC071@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.7 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.8
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.7	Tue Jan 31 14:31:21 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Wed Feb  1 20:38:06 2006
@@ -25,7 +25,7 @@
 define('_AD_USER_LANG_AVATAR_EDIT', "avatar edit");
 define('_AD_USER_LANG_AVATAR_FILE', "File");
 define('_AD_USER_LANG_AVATAR_ID', "ID");
-define('_AD_USER_LANG_AVATAR_MIMETYPE', "Mimetype");
+define('_AD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
 define('_AD_USER_LANG_AVATAR_NAME', "Name");
 define('_AD_USER_LANG_AVATAR_NEW', "avatar new");
 define('_AD_USER_LANG_AVATAR_TYPE', "Type");
@@ -38,7 +38,9 @@
 define('_AD_USER_LANG_CREATE_NEW', "Create new");
 define('_AD_USER_LANG_CUSTOM_AVATAR', "Custom avatar");
 define('_AD_USER_LANG_DELETE_RANK', "Delete rank");
+define('_AD_USER_LANG_EDIT', "Edit");
 define('_AD_USER_LANG_EMAIL', "Email");
+define('_AD_USER_LANG_GROUP', "User lang group");
 define('_AD_USER_LANG_GROUP_AMMO', "Count");
 define('_AD_USER_LANG_GROUP_ASSIGN', "Assign member");
 define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "The member list of this group");
@@ -60,11 +62,11 @@
 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_MAILOK', "mailok");
+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_NOTIFY_METHOD', "notify_method");
-define('_AD_USER_LANG_NOTIFY_MODE', "notify_mode");
+define('_AD_USER_LANG_NOTIFY_METHOD', "Method of receiving event notice");
+define('_AD_USER_LANG_NOTIFY_MODE', "Timing of receiving event notice");
 define('_AD_USER_LANG_OFF', "Off");
 define('_AD_USER_LANG_ON', "On");
 define('_AD_USER_LANG_PASS', "Password");
@@ -103,6 +105,7 @@
 define('_AD_USER_LANG_USER_AIM', "AIM");
 define('_AD_USER_LANG_USER_DELETE', "Delete user");
 define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete <b>_%s_</b>, OK?");
+define('_AD_USER_LANG_USER_EDIT', "Edit user");
 define('_AD_USER_LANG_USER_FROM', "user_from");
 define('_AD_USER_LANG_USER_ICQ', "ICQ");
 define('_AD_USER_LANG_USER_INTREST', "user_intrest");

From minahito ＠ users.sourceforge.jp  Wed Feb  1 20:38:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 20:38:25 +0900
Subject: [xoops-cvslog 2032] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060201113825.E7B9C2AC071@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.7 xoops2jp/html/modules/user/language/english/main.php:1.1.2.8
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.7	Wed Feb  1 16:30:43 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Wed Feb  1 20:38:25 2006
@@ -1,40 +1,45 @@
 <?php
 
-define('_MD_USER_ERROR_AVATAR_EXTENSION', "avatar extension");
-define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "avatar maxfilesize");
+define('_MD_USER_ERROR_AVATAR_EXTENSION', "Uploaded file's extension is not allowed");
+define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "Avatar maxfilesize");
 define('_MD_USER_ERROR_AVATAR_SELECT', "avatar select");
 define('_MD_USER_ERROR_AVATAR_SIZE', "avatar size");
-define('_MD_USER_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_USER_ERROR_EMAIL_FORMAT', "email format");
-define('_MD_USER_ERROR_MAXLENGTH', "maxlength");
-define('_MD_USER_ERROR_REQUIRED', "required");
+define('_MD_USER_ERROR_DBUPDATE_FAILED', "Updating database is fail.");
+define('_MD_USER_ERROR_EMAIL_FORMAT', "Email is wrong.");
+define('_MD_USER_ERROR_INTRANGE', "{0} is wrong.");
+define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
+define('_MD_USER_ERROR_MINLENGTH', "Input {0} with over {1} characters.");
+define('_MD_USER_ERROR_PASSWORD', "Confirm password is difference.");
+define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with under {2} characters.");
+define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with over {2} characters.");
+define('_MD_USER_ERROR_REQUIRED', "{0} is required.");
 define('_MD_USER_ERROR_SEND_MAIL', "send mail");
-define('_MD_USER_ERROR_TIMEZONE', "timezone");
-define('_MD_USER_LANG_AVATAR', "avatar");
-define('_MD_USER_LANG_AVATAR_CREATED', "avatar created");
-define('_MD_USER_LANG_AVATAR_DISPLAY', "avatar display");
-define('_MD_USER_LANG_AVATAR_FILE', "avatar file");
-define('_MD_USER_LANG_AVATAR_HEIGHT', "avatar height");
-define('_MD_USER_LANG_AVATAR_ID', "avatar id");
-define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "avatar maxfilesize");
-define('_MD_USER_LANG_AVATAR_MIMETYPE', "avatar mimetype");
-define('_MD_USER_LANG_AVATAR_NAME', "avatar name");
-define('_MD_USER_LANG_AVATAR_TYPE', "avatar type");
-define('_MD_USER_LANG_AVATAR_WEIGHT', "avatar weight");
-define('_MD_USER_LANG_AVATAR_WIDTH', "avatar width");
-define('_MD_USER_LANG_CONTROL', "control");
-define('_MD_USER_LANG_CREATE_NEW', "create new");
-define('_MD_USER_LANG_EMAIL', "email");
-define('_MD_USER_LANG_GROUPID', "groupid");
-define('_MD_USER_LANG_PASS', "pass");
-define('_MD_USER_LANG_RANK_ID', "rank id");
-define('_MD_USER_LANG_SELECT', "select");
+define('_MD_USER_ERROR_TIMEZONE', "Timezone");
+define('_MD_USER_LANG_AVATAR', "Avatar");
+define('_MD_USER_LANG_AVATAR_CREATED', "Created");
+define('_MD_USER_LANG_AVATAR_DISPLAY', "Display");
+define('_MD_USER_LANG_AVATAR_FILE', "File");
+define('_MD_USER_LANG_AVATAR_HEIGHT', "Height");
+define('_MD_USER_LANG_AVATAR_ID', "ID");
+define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Maxfilesize");
+define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
+define('_MD_USER_LANG_AVATAR_NAME', "Name");
+define('_MD_USER_LANG_AVATAR_TYPE', "Type");
+define('_MD_USER_LANG_AVATAR_WEIGHT', "Weight");
+define('_MD_USER_LANG_AVATAR_WIDTH', "Width");
+define('_MD_USER_LANG_CONTROL', "Control");
+define('_MD_USER_LANG_CREATE_NEW', "Create new");
+define('_MD_USER_LANG_EMAIL', "Email");
+define('_MD_USER_LANG_GROUPID', "Group ID");
+define('_MD_USER_LANG_PASS', "Password");
+define('_MD_USER_LANG_RANK_ID', "ID");
+define('_MD_USER_LANG_SELECT', "Select");
 define('_MD_USER_LANG_SUBMIT', "Submit");
-define('_MD_USER_LANG_TIMEZONE_OFFSET', "timezone offset");
-define('_MD_USER_LANG_UID', "uid");
+define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone offset");
+define('_MD_USER_LANG_UID', "UID");
 define('_MD_USER_LANG_UNAME', "uname");
-define('_MD_USER_LANG_URL', "url");
-define('_MD_USER_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MD_USER_LANG_URL', "URL");
+define('_MD_USER_MESSAGE_CONFIRM_DELETE', "Do you delete the following data?");
 define('_US_ACONTACT', "Selected account is already activated!");
 define('_US_ACTKEYNOT', "Activation key not correct!");
 define('_US_ACTLOGIN', "Your account has been activated. Please login with the registered password.");
@@ -94,6 +99,7 @@
 define('_US_NICKNAMETOOSHORT', "Username is too short. It must be more than %s characters.");
 define('_US_NO', "No");
 define('_US_NOACTTPADM', "The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.");
+define('_US_NOEDITRIGHT', " us noeditright");
 define('_US_NOPERMISS', "Sorry, you dont have the permission to perform this action!");
 define('_US_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account.");
 define('_US_NOREGISTER', "Sorry, we are currently closed for new user registrations");

From minahito ＠ users.sourceforge.jp  Wed Feb  1 20:38:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 20:38:51 +0900
Subject: [xoops-cvslog 2033] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060201113851.DB5F32AC071@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/main.php
diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.8 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.9
--- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.8	Thu Jan 26 20:17:32 2006
+++ xoops2jp/html/modules/user/language/japanese/main.php	Wed Feb  1 20:38:51 2006
@@ -15,31 +15,31 @@
 define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。");
 define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン");
-define('_MD_USER_LANG_AVATAR', "avatar");
-define('_MD_USER_LANG_AVATAR_CREATED', "avatar created");
-define('_MD_USER_LANG_AVATAR_DISPLAY', "avatar display");
-define('_MD_USER_LANG_AVATAR_FILE', "avatar file");
-define('_MD_USER_LANG_AVATAR_HEIGHT', "avatar height");
-define('_MD_USER_LANG_AVATAR_ID', "avatar id");
-define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "avatar maxfilesize");
-define('_MD_USER_LANG_AVATAR_MIMETYPE', "avatar mimetype");
-define('_MD_USER_LANG_AVATAR_NAME', "avatar name");
-define('_MD_USER_LANG_AVATAR_TYPE', "avatar type");
-define('_MD_USER_LANG_AVATAR_WEIGHT', "avatar weight");
-define('_MD_USER_LANG_AVATAR_WIDTH', "avatar width");
-define('_MD_USER_LANG_CONTROL', "control");
-define('_MD_USER_LANG_CREATE_NEW', "create new");
-define('_MD_USER_LANG_EMAIL', "email");
-define('_MD_USER_LANG_GROUPID', "groupid");
-define('_MD_USER_LANG_PASS', "pass");
-define('_MD_USER_LANG_RANK_ID', "rank id");
-define('_MD_USER_LANG_SELECT', "select");
-define('_MD_USER_LANG_SUBMIT', "Submit");
-define('_MD_USER_LANG_TIMEZONE_OFFSET', "timezone offset");
-define('_MD_USER_LANG_UID', "uid");
-define('_MD_USER_LANG_UNAME', "uname");
-define('_MD_USER_LANG_URL', "url");
-define('_MD_USER_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MD_USER_LANG_AVATAR', "アバター");
+define('_MD_USER_LANG_AVATAR_CREATED', "作成日時");
+define('_MD_USER_LANG_AVATAR_DISPLAY', "表示");
+define('_MD_USER_LANG_AVATAR_FILE', "ファイル");
+define('_MD_USER_LANG_AVATAR_HEIGHT', "高さ");
+define('_MD_USER_LANG_AVATAR_ID', "ID");
+define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "最大ファイルサイズ");
+define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
+define('_MD_USER_LANG_AVATAR_NAME', "名前");
+define('_MD_USER_LANG_AVATAR_TYPE', "タイプ");
+define('_MD_USER_LANG_AVATAR_WEIGHT', "優先度");
+define('_MD_USER_LANG_AVATAR_WIDTH', "幅");
+define('_MD_USER_LANG_CONTROL', "操作");
+define('_MD_USER_LANG_CREATE_NEW', "新規作成");
+define('_MD_USER_LANG_EMAIL', "電子メール");
+define('_MD_USER_LANG_GROUPID', "グループID");
+define('_MD_USER_LANG_PASS', "パスワード");
+define('_MD_USER_LANG_RANK_ID', "ID");
+define('_MD_USER_LANG_SELECT', "選択");
+define('_MD_USER_LANG_SUBMIT', "送信");
+define('_MD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーンオフセット");
+define('_MD_USER_LANG_UID', "UID");
+define('_MD_USER_LANG_UNAME', "ユーザー名");
+define('_MD_USER_LANG_URL', "URL");
+define('_MD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか？");
 define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。");
 define('_US_ACTKEYNOT', "承認キーが間違っています。");
 define('_US_ACTLOGIN', "アカウントを承認しました。登録の際に記入したパスワードを使用してログインしてください。");

From minahito ＠ users.sourceforge.jp  Wed Feb  1 23:57:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Feb 2006 23:57:02 +0900
Subject: [xoops-cvslog 2034] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060201145702.E8A2F2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.1	Sat Jan 14 02:31:14 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php	Wed Feb  1 23:57:02 2006
@@ -29,8 +29,7 @@
 		$this->mFieldProperties['tpl_id']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_TPL_ID);
 
 		$this->mFieldProperties['tpl_desc'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['tpl_desc']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['tpl_desc']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_TPL_DESC, '255');
+		$this->mFieldProperties['tpl_desc']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['tpl_desc']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_TPL_DESC, '255');
 		$this->mFieldProperties['tpl_desc']->addVar('maxlength', 255);
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 14:32:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 14:32:21 +0900
Subject: [xoops-cvslog 2035] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060202053221.B4AEB2AC01F@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.9 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.10
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.9	Mon Jan 30 13:33:38 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Thu Feb  2 14:32:21 2006
@@ -1,37 +1,37 @@
 <?php
 
-define('_AD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_AD_BASE_ERROR_EXTENSION', "extension");
-define('_AD_BASE_ERROR_MAXLENGTH', "maxlength");
-define('_AD_BASE_ERROR_REQUIRED', "required");
-define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "smile url required");
-define('_AD_BASE_LANG_CODE', "code");
-define('_AD_BASE_LANG_COM_CREATED', "com created");
+define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Updating database was fail.");
+define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension is wrong.");
+define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
+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_CODE', "Code");
+define('_AD_BASE_LANG_COM_CREATED', "Created");
 define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_AD_BASE_LANG_COM_ICON', "com icon");
-define('_AD_BASE_LANG_COM_ID', "com id");
-define('_AD_BASE_LANG_COM_IP', "com ip");
-define('_AD_BASE_LANG_COM_ITEMID', "com itemid");
-define('_AD_BASE_LANG_COM_MODID', "com modid");
-define('_AD_BASE_LANG_COM_MODIFIED', "com modified");
-define('_AD_BASE_LANG_COM_PID', "com pid");
-define('_AD_BASE_LANG_COM_ROOTID', "com rootid");
-define('_AD_BASE_LANG_COM_SIG', "com sig");
-define('_AD_BASE_LANG_COM_STATUS', "com status");
-define('_AD_BASE_LANG_COM_TEXT', "com text");
-define('_AD_BASE_LANG_COM_TITLE', "com title");
-define('_AD_BASE_LANG_COM_UID', "com uid");
-define('_AD_BASE_LANG_COMMENT_DELETE', "comment delete");
-define('_AD_BASE_LANG_COMMENT_EDIT', "comment edit");
-define('_AD_BASE_LANG_COMMENT_NEW', "comment new");
-define('_AD_BASE_LANG_CONTROL', "control");
-define('_AD_BASE_LANG_CREATE_NEW', "create new");
-define('_AD_BASE_LANG_DISPLAY', "display");
-define('_AD_BASE_LANG_DOBR', "dobr");
-define('_AD_BASE_LANG_DOHTML', "dohtml");
+define('_AD_BASE_LANG_COM_ICON', "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_MODIFIED', "Modified");
+define('_AD_BASE_LANG_COM_PID', "PID");
+define('_AD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_AD_BASE_LANG_COM_SIG', "Signature");
+define('_AD_BASE_LANG_COM_STATUS', "Status");
+define('_AD_BASE_LANG_COM_TEXT', "Comment");
+define('_AD_BASE_LANG_COM_TITLE', "Title");
+define('_AD_BASE_LANG_COM_UID', "UID");
+define('_AD_BASE_LANG_COMMENT_DELETE', "Delete comment");
+define('_AD_BASE_LANG_COMMENT_EDIT', "Edit comment");
+define('_AD_BASE_LANG_COMMENT_NEW', "Add new comment");
+define('_AD_BASE_LANG_CONTROL', "Control");
+define('_AD_BASE_LANG_CREATE_NEW', "Create new");
+define('_AD_BASE_LANG_DISPLAY', "Display");
+define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
+define('_AD_BASE_LANG_DOHTML', "Use HTML tags");
 define('_AD_BASE_LANG_DOIMAGE', "doimage");
-define('_AD_BASE_LANG_DOSMILEY', "dosmiley");
-define('_AD_BASE_LANG_DOXCODE', "doxcode");
+define('_AD_BASE_LANG_DOSMILEY', "Use smilies");
+define('_AD_BASE_LANG_DOXCODE', "Use XOOPS code");
 define('_AD_BASE_LANG_EMOTION', "emotion");
 define('_AD_BASE_LANG_ID', "id");
 define('_AD_BASE_LANG_SMILE_URL', "smile url");
@@ -48,6 +48,7 @@
 define('_MD_A_BASE_ERROR_ABOUT_ISACTIVE', "'IS ACTIVE' is a bad value");
 define('_MD_A_BASE_ERROR_MAXLENGTH', "{0} is needed over {1} characters");
 define('_MD_A_BASE_ERROR_MIN', "{0} is needed over {1}");
+define('_MD_A_BASE_ERROR_NO_HELP_FILE', " md a base error no help file");
 define('_MD_A_BASE_ERROR_REQUIRED', "{0} is required");
 define('_MD_A_BASE_ERROR_SEARCH_REQUIRED', "Input keyword");
 define('_MD_A_BASE_LANG_ACTIONSEARCH', "Actionsearch");
@@ -58,6 +59,7 @@
 define('_MD_A_BASE_LANG_ADMINMENU_MENU', "Admin Menu");
 define('_MD_A_BASE_LANG_ADMINMENU_NAME', "Admin Menu name");
 define('_MD_A_BASE_LANG_ADMINMENU_URL', "Admin Menu URL");
+define('_MD_A_BASE_LANG_AGREE', " md a base lang agree");
 define('_MD_A_BASE_LANG_BLOCK_KEY', "BLOCK_KEY");
 define('_MD_A_BASE_LANG_BLOCK_VAL', "BLOCK_VAL");
 define('_MD_A_BASE_LANG_BLOCKS_INFO', "BLOCKS_INFO");
@@ -101,6 +103,7 @@
 define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "module update success");
 define('_MD_A_BASE_LANG_NAME', "Name");
 define('_MD_A_BASE_LANG_NO_ADMINMENU', "no Admin Menu");
+define('_MD_A_BASE_LANG_NO_AGREE', " md a base lang no agree");
 define('_MD_A_BASE_LANG_NO_BLOCK', "NO_BLOCK");
 define('_MD_A_BASE_LANG_NO_CHANGE', "no change");
 define('_MD_A_BASE_LANG_NO_CONFIG', "NO_CONFIG");

From minahito ＠ users.sourceforge.jp  Thu Feb  2 14:32:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 14:32:31 +0900
Subject: [xoops-cvslog 2036] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060202053231.D04ED2AC01F@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.5 xoops2jp/html/modules/base/language/english/main.php:1.1.2.6
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.5	Sun Jan 29 00:52:03 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Thu Feb  2 14:32:31 2006
@@ -1,66 +1,66 @@
-<?php
-
-define('_MD_BASE_ERROR_MAXLENGTH', "maxlength");
-define('_MD_BASE_ERROR_REQUIRED', "required");
-define('_MD_BASE_LANG_COM_CREATED', "com created");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "com icon");
-define('_MD_BASE_LANG_COM_ID', "com id");
-define('_MD_BASE_LANG_COM_IP', "com ip");
-define('_MD_BASE_LANG_COM_ITEMID', "com itemid");
-define('_MD_BASE_LANG_COM_MODID', "com modid");
-define('_MD_BASE_LANG_COM_MODIFIED', "com modified");
-define('_MD_BASE_LANG_COM_PID', "com pid");
-define('_MD_BASE_LANG_COM_ROOTID', "com rootid");
-define('_MD_BASE_LANG_COM_SIG', "com sig");
-define('_MD_BASE_LANG_COM_STATUS', "com status");
-define('_MD_BASE_LANG_COM_TEXT', "com text");
-define('_MD_BASE_LANG_COM_TITLE', "com title");
-define('_MD_BASE_LANG_COM_UID', "com uid");
-define('_MD_BASE_LANG_COMMENT_RULE', "comment rule");
-define('_MD_BASE_LANG_DOBR', "dobr");
-define('_MD_BASE_LANG_DOHTML', "dohtml");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "dosmiley");
-define('_MD_BASE_LANG_DOXCODE', "doxcode");
-define('_MD_BASE_LANG_ID', "id");
-define('_MD_BASE_LANG_SUBMIT', "Submit");
-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 Email: ");
-define('_MSC_FRIENDNAMEC', "Friend Name: ");
-define('_MSC_INTSITE', "Interesting Site: %s");
-define('_MSC_INVALIDEMAIL1', "The email address you provided is not a valid address.");
-define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
-define('_MSC_NEEDINFO', "You need to enter required info!");
-define('_MSC_RECOMMENDSITE', "Recommend this Site to a Friend");
-define('_MSC_REFERENCESENT', "The reference to our site has been sent to your friend. Thanks!");
-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 <b>%s</b> match(es)");
-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 <b>%s</b> characters will be ignored");
-define('_SR_KEYTOOSHORT', "Keywords must be at least <b>%s</b> characters long");
-define('_SR_KEYWORDS', "Keyword(s)");
-define('_SR_NEXT', "Next >>");
-define('_SR_NOMATCH', "No Match Found for 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_MAXLENGTH', "Input {0} with under {1} characters.");
+define('_MD_BASE_ERROR_REQUIRED', "{0} is required.");
+define('_MD_BASE_LANG_COM_CREATED', "Created");
+define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_MD_BASE_LANG_COM_ICON', "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', "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', "The rule about comment");
+define('_MD_BASE_LANG_DOBR', "Insert line-break automatically");
+define('_MD_BASE_LANG_DOHTML', "Use HTML tags");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
+define('_MD_BASE_LANG_DOXCODE', "User XOOPS code");
+define('_MD_BASE_LANG_ID', "ID");
+define('_MD_BASE_LANG_SUBMIT', "Submit");
+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 Email: ");
+define('_MSC_FRIENDNAMEC', "Friend Name: ");
+define('_MSC_INTSITE', "Interesting Site: %s");
+define('_MSC_INVALIDEMAIL1', "The email address you provided is not a valid address.");
+define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
+define('_MSC_NEEDINFO', "You need to enter required info!");
+define('_MSC_RECOMMENDSITE', "Recommend this Site to a Friend");
+define('_MSC_REFERENCESENT', "The reference to our site has been sent to your friend. Thanks!");
+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 <b>%s</b> match(es)");
+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 <b>%s</b> characters will be ignored");
+define('_SR_KEYTOOSHORT', "Keywords must be at least <b>%s</b> characters long");
+define('_SR_KEYWORDS', "Keyword(s)");
+define('_SR_NEXT', "Next >>");
+define('_SR_NOMATCH', "No Match Found for 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  Thu Feb  2 14:32:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 14:32:55 +0900
Subject: [xoops-cvslog 2037] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060202053255.2A8FB2AC01F@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.5 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.6
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.5	Sun Jan 29 00:52:03 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Thu Feb  2 14:32:55 2006
@@ -1,13 +1,13 @@
-<?php
-
-define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
-define('_MI_BASE_MENU_COMMENTMANAGE', "commentmanage");
-define('_MI_BASE_MENU_MODULEINSTALL', "Module Install");
-define('_MI_BASE_MENU_MODULELIST', "Module list");
-define('_MI_BASE_MENU_SMILES_MANAGE', "smiles manage");
-define('_MI_BASE_NAME', "Legacy compatible module");
-define('_MI_BASE_NAME_DESC', "This module gives compatibility with 2.0.x to Cube");
-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_MENU_ACTIONSEARCH', "Action search");
+define('_MI_BASE_MENU_COMMENTMANAGE', "Comment manage");
+define('_MI_BASE_MENU_MODULEINSTALL', "Module install");
+define('_MI_BASE_MENU_MODULELIST', "Module manage");
+define('_MI_BASE_MENU_SMILES_MANAGE', "Smiles manage");
+define('_MI_BASE_NAME', "Legacy compatible module");
+define('_MI_BASE_NAME_DESC', "This module gives compatibility with 2.0.x to Cube");
+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.");
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 14:33:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 14:33:07 +0900
Subject: [xoops-cvslog 2038] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060202053307.ACD512AC01F@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.6 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.7
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.6	Sun Jan 29 00:52:03 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Thu Feb  2 14:33:07 2006
@@ -1,11 +1,11 @@
-<?php
-
-define('_MI_BASE_MENU_ACTIONSEARCH', "コマンド検索");
-define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
-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_MENU_ACTIONSEARCH', "コマンド検索");
+define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
+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.5 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.6
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.5	Sun Jan 29 00:52:03 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Thu Feb  2 14:33:07 2006
@@ -1,66 +1,66 @@
-<?php
-
-define('_MD_BASE_ERROR_MAXLENGTH', "maxlength");
-define('_MD_BASE_ERROR_REQUIRED', "required");
-define('_MD_BASE_LANG_COM_CREATED', "com created");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "アイコン");
-define('_MD_BASE_LANG_COM_ID', "com id");
-define('_MD_BASE_LANG_COM_IP', "com ip");
-define('_MD_BASE_LANG_COM_ITEMID', "com itemid");
-define('_MD_BASE_LANG_COM_MODID', "com modid");
-define('_MD_BASE_LANG_COM_MODIFIED', "com modified");
-define('_MD_BASE_LANG_COM_PID', "com pid");
-define('_MD_BASE_LANG_COM_ROOTID', "com rootid");
-define('_MD_BASE_LANG_COM_SIG', "com sig");
-define('_MD_BASE_LANG_COM_STATUS', "com status");
-define('_MD_BASE_LANG_COM_TEXT', "コメント");
-define('_MD_BASE_LANG_COM_TITLE', "表題");
-define('_MD_BASE_LANG_COM_UID', "com uid");
-define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
-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_ID', "id");
-define('_MD_BASE_LANG_SUBMIT', "Submit");
-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', "文字数が <b>%s</b> 文字未満のキーワードは無視されます。");
-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_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+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_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_ID', "ID");
+define('_MD_BASE_LANG_SUBMIT', "送信");
+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', "文字数が <b>%s</b> 文字未満のキーワードは無視されます。");
+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.14 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.15
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.14	Mon Jan 30 13:33:38 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Thu Feb  2 14:33:07 2006
@@ -1,37 +1,37 @@
 <?php
 
-define('_AD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_AD_BASE_ERROR_EXTENSION', "extension");
-define('_AD_BASE_ERROR_MAXLENGTH', "maxlength");
-define('_AD_BASE_ERROR_REQUIRED', "required");
-define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "smile url required");
-define('_AD_BASE_LANG_CODE', "code");
-define('_AD_BASE_LANG_COM_CREATED', "com created");
+define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
+define('_AD_BASE_ERROR_EXTENSION', "アップロードされたファイルの拡張子が不正です");
+define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい");
+define('_AD_BASE_LANG_CODE', "コード");
+define('_AD_BASE_LANG_COM_CREATED', "作成日時");
 define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_AD_BASE_LANG_COM_ICON', "com icon");
-define('_AD_BASE_LANG_COM_ID', "com id");
-define('_AD_BASE_LANG_COM_IP', "com ip");
-define('_AD_BASE_LANG_COM_ITEMID', "com itemid");
-define('_AD_BASE_LANG_COM_MODID', "com modid");
-define('_AD_BASE_LANG_COM_MODIFIED', "com modified");
-define('_AD_BASE_LANG_COM_PID', "com pid");
-define('_AD_BASE_LANG_COM_ROOTID', "com rootid");
-define('_AD_BASE_LANG_COM_SIG', "com sig");
-define('_AD_BASE_LANG_COM_STATUS', "com status");
-define('_AD_BASE_LANG_COM_TEXT', "com text");
-define('_AD_BASE_LANG_COM_TITLE', "com title");
-define('_AD_BASE_LANG_COM_UID', "com uid");
+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_MODIFIED', "編集日時");
+define('_AD_BASE_LANG_COM_PID', "PID");
+define('_AD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_AD_BASE_LANG_COM_SIG', "署名");
+define('_AD_BASE_LANG_COM_STATUS', "ステータス");
+define('_AD_BASE_LANG_COM_TEXT', "コメント");
+define('_AD_BASE_LANG_COM_TITLE', "表題");
+define('_AD_BASE_LANG_COM_UID', "UID");
 define('_AD_BASE_LANG_COMMENT_DELETE', "コメント削除");
 define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集");
 define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加");
-define('_AD_BASE_LANG_CONTROL', "control");
-define('_AD_BASE_LANG_CREATE_NEW', "create new");
-define('_AD_BASE_LANG_DISPLAY', "display");
-define('_AD_BASE_LANG_DOBR', "dobr");
-define('_AD_BASE_LANG_DOHTML', "dohtml");
+define('_AD_BASE_LANG_CONTROL', "コントロール");
+define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
+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', "dosmiley");
-define('_AD_BASE_LANG_DOXCODE', "doxcode");
+define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
+define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
 define('_AD_BASE_LANG_EMOTION', "emotion");
 define('_AD_BASE_LANG_ID', "id");
 define('_AD_BASE_LANG_SMILE_URL', "smile url");

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 14:33:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 14:33:24 +0900
Subject: [xoops-cvslog 2039] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060202053324.50BB02AC016@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.8 xoops2jp/html/modules/user/language/english/main.php:1.1.2.9
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.8	Wed Feb  1 20:38:25 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Thu Feb  2 14:33:24 2006
@@ -18,15 +18,16 @@
 define('_MD_USER_LANG_AVATAR', "Avatar");
 define('_MD_USER_LANG_AVATAR_CREATED', "Created");
 define('_MD_USER_LANG_AVATAR_DISPLAY', "Display");
+define('_MD_USER_LANG_AVATAR_EDIT', "avatar edit");
 define('_MD_USER_LANG_AVATAR_FILE', "File");
-define('_MD_USER_LANG_AVATAR_HEIGHT', "Height");
 define('_MD_USER_LANG_AVATAR_ID', "ID");
+define('_MD_USER_LANG_AVATAR_LIST', "avatar list");
 define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Maxfilesize");
 define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
 define('_MD_USER_LANG_AVATAR_NAME', "Name");
 define('_MD_USER_LANG_AVATAR_TYPE', "Type");
 define('_MD_USER_LANG_AVATAR_WEIGHT', "Weight");
-define('_MD_USER_LANG_AVATAR_WIDTH', "Width");
+define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "avatar width hight");
 define('_MD_USER_LANG_CONTROL', "Control");
 define('_MD_USER_LANG_CREATE_NEW', "Create new");
 define('_MD_USER_LANG_EMAIL', "Email");

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 14:33:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 14:33:24 +0900
Subject: [xoops-cvslog 2040] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060202053324.7428F2AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/main.php
diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.9 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.10
--- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.9	Wed Feb  1 20:38:51 2006
+++ xoops2jp/html/modules/user/language/japanese/main.php	Thu Feb  2 14:33:24 2006
@@ -18,15 +18,16 @@
 define('_MD_USER_LANG_AVATAR', "アバター");
 define('_MD_USER_LANG_AVATAR_CREATED', "作成日時");
 define('_MD_USER_LANG_AVATAR_DISPLAY', "表示");
+define('_MD_USER_LANG_AVATAR_EDIT', "アバター編集");
 define('_MD_USER_LANG_AVATAR_FILE', "ファイル");
-define('_MD_USER_LANG_AVATAR_HEIGHT', "高さ");
 define('_MD_USER_LANG_AVATAR_ID', "ID");
+define('_MD_USER_LANG_AVATAR_LIST', "使用可能アバター一覧");
 define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "最大ファイルサイズ");
 define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
 define('_MD_USER_LANG_AVATAR_NAME', "名前");
 define('_MD_USER_LANG_AVATAR_TYPE', "タイプ");
 define('_MD_USER_LANG_AVATAR_WEIGHT', "優先度");
-define('_MD_USER_LANG_AVATAR_WIDTH', "幅");
+define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "幅 x 高さ");
 define('_MD_USER_LANG_CONTROL', "操作");
 define('_MD_USER_LANG_CREATE_NEW', "新規作成");
 define('_MD_USER_LANG_EMAIL', "電子メール");
@@ -103,7 +104,7 @@
 define('_US_NOPERMISS', "このユーザ情報を変更することはできません。");
 define('_US_NOPROBLEM', "ご心配なく。まずはあなたが登録に使用したメールアドレスを入力し、ボタンをクリックしてください。 パスワード取得用のリンクが記載されたメールがあなたの登録メールアドレス宛に送られます。");
 define('_US_NOREGISTER', "申し訳ございませんが、現在このサイトでは新規ユーザの登録受付を行っておりません。");
-define('_US_NOTREGISTERED', "今すぐ<a href=");
+define('_US_NOTREGISTERED', "今すぐ<a href='register.php'>登録</a>しませんか？");
 define('_US_OCCUPATION', "職業");
 define('_US_OLDDELETED', "古いアバター画像は上書きされます。");
 define('_US_PASSNOTSAME', "パスワードが正しくありません。同じパスワードを二度入力してください。");

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 14:34:19 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 14:34:19 +0900
Subject: [xoops-cvslog 2041] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060202053419.CE20C2AC085@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.4
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.3	Wed Jan 18 02:26:36 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Thu Feb  2 14:34:19 2006
@@ -1,73 +1,69 @@
 <{if $actionForm->hasError()}>
-	<ul>
-		<{foreach item=message from=$actionForm->getErrorMessages()}>
-			<li><{$message}></li>
-		<{/foreach}>
-	</ul>
+<ul>
+  <{foreach item=message from=$actionForm->getErrorMessages()}>
+  <li><{$message}></li>
+  <{/foreach}>
+</ul>
 <{/if}>
+
 <form action="index.php?action=Register" method="post">
-	<{xoops_token form=$actionForm}>
-	<table class="outer" cellspacing="1" width="100%">
-		<tr>
-			<th colspan="2"><{$smarty.const._US_USERREG}></th>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_NICKNAME}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=uname}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_EMAIL}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=email size=30 maxlength=60}><br/>
-				<{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}>
-				<{$smarty.const._US_ALLOWVIEWEMAIL}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_WEBSITE}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=url size=30 maxlength=100}>
-			</td>
-		</tr>
-        <tr>
-          <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
-          <td class="<{cycle values="odd,even"}>">
-            <select name="timezone_offset">
-              <{foreach item=timezone from=$timezones}>
-                <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
-              <{/foreach}>
-            </select>
-          </td>
-        </tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_PASSWORD}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input type=password name=pass value=$actionForm->get('pass') size=10 maxlength=32}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_VERIFYPASS}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=10 maxlength=32}>
-			</td>
-		</tr>
-		<{if $enableAgree}>
-			<tr>
-				<td class="head"><{$smarty.const._US_DISCLAIMER}></td>
-				<td class="<{cycle values="odd,even"}>">
-					<{xoops_textarea name=disclaimer rows=8 cols=50 readonly=true value=$disclaimer}>
-					<br/>
-					<{xoops_input type=checkbox name=agree value=1 default=$actionForm->get('agree')}><{$smarty.const._US_IAGREE}>
-				</td>
-			</tr>
-		<{/if}>
-		<tr>
-			<td class="head">&nbsp;</td>
-			<td class="<{cycle values="odd,even"}>">
-				<input type="submit" value="<{$smarty.const._US_SUBMIT}>" />
-			</td>
-		</tr>
-	</table>
+<{xoops_token form=$actionForm}>
+<table class="outer" width="100%">
+  <tr>
+    <th colspan="2" style="text-align:center;"><{$smarty.const._US_USERREG}></th>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_NICKNAME}></td>
+    <td class="<{cycle values="odd,even"}>"><{xoops_input name=uname}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=email size=30 maxlength=60}><br />
+      <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}>
+      <{$smarty.const._US_ALLOWVIEWEMAIL}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_WEBSITE}></td>
+    <td class="<{cycle values="odd,even"}>"><{xoops_input name=url size=30 maxlength=100}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <select name="timezone_offset">
+        <{foreach item=timezone from=$timezones}>
+          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
+        <{/foreach}>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_PASSWORD}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input type=password name=pass value=$actionForm->get('pass') size=10 maxlength=32}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_VERIFYPASS}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=10 maxlength=32}>
+    </td>
+  </tr>
+  <{if $enableAgree}>
+  <tr>
+    <td class="head"><{$smarty.const._US_DISCLAIMER}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_textarea name=disclaimer rows=8 cols=50 readonly=true value=$disclaimer}><br />
+      <{xoops_input type=checkbox name=agree value=1 default=$actionForm->get('agree')}>
+      <{$smarty.const._US_IAGREE}>
+    </td>
+  </tr>
+  <{/if}>
+  <tr>
+    <td colsapn="2" class="foot" style="text-align:center;">
+      <input type="submit" value="<{$smarty.const._US_SUBMIT}>" />
+    </td>
+  </tr>
+</table>
 </form>
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.4	Thu Jan 19 21:10:01 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Thu Feb  2 14:34:19 2006
@@ -1,116 +1,122 @@
-<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._US_EDITPROFILE}><br /><br />
+<div>
+<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a>
+&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._US_EDITPROFILE}>
+</div>
+
 <{if $actionForm->hasError()}>
-	<ul>
-		<{foreach item=message from=$actionForm->getErrorMessages()}>
-			<li><{$message}></li>
-		<{/foreach}>
-	</ul>
+<ul>
+  <{foreach item=message from=$actionForm->getErrorMessages()}>
+    <li><{$message}></li>
+  <{/foreach}>
+</ul>
 <{/if}>
+
 <form action="./index.php?action=EditUser" method="post">
-	<{xoops_token form=$actionForm}>
-	<{xoops_input name=uid type=hidden value=$actionForm->get('uid')}>
-	<table class="outer" cellspacing="1" width="100%">
-		<tr><th colspan="2"><{$smarty.const._US_EDITPROFILE}></th></tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_NICKNAME}></td>
-			<td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_REALNAME}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=name size=30 maxlength=60 value=$actionForm->getVar('name')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_EMAIL}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=email size=30 maxlength=60 value=$actionForm->getVar('email')}><br/>
-				<input type="checkbox" name="user_viewemail" value="1" <{if $actionForm->getVar('user_viewemail')}>checked<{/if}> />
-				<{$smarty.const._US_ALLOWVIEWEMAIL}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_WEBSITE}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=url size=30 maxlength=100 value=$actionForm->getVar('url')}>
-			</td>
-		</tr>
-		<!--- // TODO TIMEZONE --->
-		<tr>
-			<td class="head"><{$smarty.const._US_ICQ}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->getVar('user_icq')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_AIM}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->getVar('user_aim')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_YIM}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->getVar('user_yim')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_MSNM}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->getVar('user_msnm')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_LOCATION}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->getVar('user_from')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_OCCUPATION}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->getVar('user_occ')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_INTEREST}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->getVar('user_intrest')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_SIGNATURE}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_dhtmltarea name=user_sig value=$actionForm->getVar('user_sig')}><br/>
-				<input type="checkbox" name="attachsig" value="1" <{if $actionForm->getVar('attachsig')}>checked<{/if}> />
-				<{$smarty.const._US_SHOWSIG}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_EXTRAINFO}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_textarea name=bio value=$actionForm->getVar('bio') rows=5 cols=50 id=bio}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_PASSWORD}><br/><{$smarty.const._US_TYPEPASSTWICE}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->getVar('pass')}>
-				<{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->getVar('vpass')}>
-			</td>
-		</tr>
-		<tr>
-			<td class="head"><{$smarty.const._US_MAILOK}></td>
-			<td class="<{cycle values="odd,even"}>">
-				<input type="radio" name="user_mailok" value="1" <{if $actionForm->getVar('user_mailok')==1}>checked<{/if}> />YES
-				<input type="radio" name="user_mailok" value="0" <{if $actionForm->getVar('user_mailok')==0}>checked<{/if}> />NO
-			</td>
-		</tr>
-		<tr>
-			<td class="head">&nbsp;</td>
-			<td class="<{cycle values="odd,even"}>">
-				<input type="submit" value="<{$smarty.const._US_SAVECHANGES}>" />
-			</td>
-		</tr>
-	</table>
+<{xoops_token form=$actionForm}>
+<{xoops_input name=uid type=hidden value=$actionForm->get('uid')}>
+<table class="outer" cellspacing="1" width="100%">
+  <tr>
+    <th colspan="2"><{$smarty.const._US_EDITPROFILE}></th>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_NICKNAME}></td>
+    <td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_REALNAME}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=name size=30 maxlength=60 value=$actionForm->getVar('name')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->getVar('email')}><br />
+      <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->getVar('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_WEBSITE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->getVar('url')}>
+    </td>
+  </tr>
+  <!--- // TODO TIMEZONE --->
+  <tr>
+    <td class="head"><{$smarty.const._US_ICQ}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->getVar('user_icq')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_AIM}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->getVar('user_aim')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_YIM}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->getVar('user_yim')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_MSNM}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->getVar('user_msnm')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_LOCATION}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->getVar('user_from')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_OCCUPATION}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->getVar('user_occ')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_INTEREST}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->getVar('user_intrest')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_SIGNATURE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_dhtmltarea name=user_sig value=$actionForm->getVar('user_sig')}><br />
+      <input type="checkbox" name="attachsig" value="1"<{if $actionForm->getVar('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_textarea name=bio value=$actionForm->getVar('bio') rows=5 cols=50 id=bio}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_PASSWORD}><br />
+    <{$smarty.const._US_TYPEPASSTWICE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->getVar('pass')}>
+      <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->getVar('vpass')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_MAILOK}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <input type="radio" name="user_mailok" value="1"<{if $actionForm->getVar('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}>
+      <input type="radio" name="user_mailok" value="0"<{if $actionForm->getVar('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head">&nbsp;</td>
+    <td class="<{cycle values="odd,even"}>">
+      <input type="submit" value="<{$smarty.const._US_SAVECHANGES}>" />
+    </td>
+  </tr>
+</table>
 </form>
Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.2
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.1	Tue Nov  8 21:13:05 2005
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Thu Feb  2 14:34:19 2006
@@ -1,20 +1,20 @@
-<table width="100%" class="outer" cellspacing="1">
-	<tr>
-		<td class="head"><{$smarty.const._US_NICKNAME}></td>
-		<td class="<{cycle values="odd,even"}>">
-			<{$registForm->getVar('uname')|escape}>
-		</td>
-	</tr>
-	<tr>
-		<td class="head"><{$smarty.const._US_EMAIL}></td>
-		<td class="<{cycle values="odd,even"}>">
-			<{$registForm->getVar('email')|escape}>
-		</td>
-	</tr>
-	<tr>
-		<td class="head">&nbsp;</td>
-		<td class="<{cycle values="odd,even"}>">
-			<input type="submit" value="<{$smarty.const._US_SUBMIT}>" ID="Submit1" NAME="Submit1"/>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
+
+<table width="100%" class="outer">
+  <tr>
+    <td class="head"><{$smarty.const._US_NICKNAME}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{$registForm->getVar('uname')|escape}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{$registForm->getVar('email')|escape}>
+    </td>
+  </tr>
+  <tr>
+    <td colsapn="2" class="foot" style="text-align:center;">
+      <input type="submit" value="<{$smarty.const._US_SUBMIT}>" />
+    </td>
+  </tr>
+</table>
Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.4	Thu Jan 26 20:18:37 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Thu Feb  2 14:34:19 2006
@@ -1,33 +1,12 @@
-
-<{if $user_ownpage == true}>
-<form name="usernav" action="user.php" method="post">
-<table width="70%" align="center" border="0">
-  <tr align="center">
-    <td>
-      <input type="button" value="<{$smarty.const._US_EDITPROFILE}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>'" />
-      <input type="button" value="<{$smarty.const._US_AVATAR}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getVar('uid')}>'" />
-      <{if $user_candelete == true}>
-        <input type="button" value="<{$smarty.const._US_DELACCOUNT}>" onclick="location='<{$smarty.const.XOOPS_URL}>user.php?op=delete'" />
-      <{/if}>
-      <input type="button" value="<{$smarty.const._US_LOGOUT}>" onclick="location='<{$smarty.const.XOOPS_URL}>/user.php?op=logout'" />
-    </td>
-  </tr>
-</table>
-</form>
-
-<{elseif $xoops_isadmin != false}>
-<br /><br />
-<table width="70%" align="center" border="0">
-  <tr align="center">
-    <td>
-      <input type="button" value="<{$smarty.const._US_EDITPROFILE}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>'" />
-      <input type="button" value="<{$smarty.const._US_AVATAR}>" onclick="location='<{$smarty.const.XOOPS_URL}>edituser.php?op=avatarform'" />
-      <input type="button" value="<{$smarty.const._US_DELACCOUNT}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getVar('uid')}>'" />
-    </td>
-  </tr>
-</table>
-<br /><br />
-
+<{if $user_ownpage == true && $user_candelete == true}>
+  <div style="text-align:right;">
+    <a href="<{$smarty.const.XOOPS_URL}>/user.php?op=delete"><{$smarty.const._US_DELACCOUNT}></a>
+  </div>
+<{elseif $xoops_isadmin == true}>
+  <div style="text-align:right;">
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - 
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_DELACCOUNT}></a>
+  </div>
 <{/if}>
 
 <table width="100%" border="0" cellspacing="5">
@@ -36,15 +15,33 @@
 
     <table class="outer" cellpadding="4" cellspacing="1" width="100%">
       <tr>
-        <th colspan="2" align="center"><{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}></th>
+        <th colspan="2" style="text-align:center;">
+          <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}>
+        </th>
+      </tr>
+      <{if $user_ownpage == true}>
+      <tr>
+        <td class="head" colspan="2" style="text-align:center;">
+          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a>
+        </td>
       </tr>
+      <{/if}>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_AVATAR}></td>
-        <td align="center" class="even"><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="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" />
+          <{else}>
+            <img src="<{$smarty.const.XOOPS_URL}>/modules/user/no_avatar.gif" alt="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>
+          <{/if}>
+        </td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_REALNAME}></td>
-        <td align="center" class="odd"><{$thisUser->getVar('name')}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->getVar('name')}></td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_WEBSITE}></td>
@@ -53,16 +50,18 @@
       <tr valign="top">
         <td class="head"><{$smarty.const._US_EMAIL}></td>
         <td class="odd">
-        <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
-          <{mailto address=$thisUser->getVar('email') encode="javascript"}>
-        <{/if}>
+          <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
+            <{mailto address=$thisUser->getVar('email') encode="javascript"}>
+          <{/if}>
         </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_PM}></td>
         <td class="even">
-          <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getVar('uid')}>', 'pmlite', 450, 380);"><img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" /></a>
-        <{$user_pmlink}></td>
+          <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>
+          <{$user_pmlink}>
+        </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_ICQ}></td>
@@ -101,30 +100,32 @@
     <td width="50%">
     <table class="outer" cellpadding="4" cellspacing="1" width="100%">
       <tr valign="top">
-        <th colspan="2" align="center"><{$smarty.const._US_STATISTICS}></th>
+        <th colspan="2" style="text-align:center;"><{$smarty.const._US_STATISTICS}></th>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_MEMBERSINCE}></td>
-        <td align="center" class="even"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_RANK}></td>
-        <td align="center" class="odd"><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" /><br />
-        <{$rank->getVar('rank_title')}></td>
+        <td class="odd" style="text-align:center;">
+          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" /><br />
+          <{$rank->getVar('rank_title')}>
+        </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_POSTS}></td>
-        <td align="center" class="even"><{$thisUser->getVar('posts')}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->getVar('posts')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_LASTLOGIN}></td>
-        <td align="center" class="odd"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td>
       </tr>
     </table>
     <br />
     <table class="outer" cellpadding="4" cellspacing="1" width="100%">
       <tr valign="top">
-        <th colspan="2" align="center"><{$smarty.const._US_SIGNATURE}></th>
+        <th colspan="2" style="text-align:center;"><{$smarty.const._US_SIGNATURE}></th>
       </tr>
       <tr valign="top">
         <td class="even"><{$user_signature}></td>
@@ -150,4 +151,4 @@
   <{/if}>
   </p>
 <{/foreach}>
-<!-- end module search results loop -->
+<!-- end module search results loop -->
\ No newline at end of file
Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.2
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.1	Thu Jan 26 20:17:46 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Thu Feb  2 14:34:19 2006
@@ -1,3 +1,8 @@
+<div>
+<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a>
+&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
+</div>
+
 <{if $allowUpload}>
 <{if $actionForm->hasError()}>
   <ul>
@@ -6,37 +11,34 @@
     <{/foreach}>
   </ul>
 <{/if}>
+
 <form action="?action=AvatarUpload" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=uid value=$actionForm->getVar('uid')}>
-  <table class="outer" cellspacing="1">
+  <table class="outer">
     <tr>
-      <th><{$smarty.const._MD_USER_LANG_AVATAR_WIDTH}></th>
-      <td class="odd">
-        <{$avatarWidth}>
-      </td>
+      <th colspan="2" style="text-align:center;"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></th>
     </tr>
     <tr>
-      <th><{$smarty.const._MD_USER_LANG_AVATAR_HEIGHT}></th>
-      <td class="odd">
-        <{$avatarHeight}>
+      <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR_WIDTH_HIGHT}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{$avatarWidth}> x <{$avatarHeight}> (px)
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._MD_USER_LANG_AVATAR_MAXFILESIZE}></th>
-      <td class="odd">
-        <{$avatarMaxfilesize}>
+      <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR_MAXFILESIZE}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{$avatarMaxfilesize|number_format}> (bytes)
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._MD_USER_LANG_AVATAR}></th>
-      <td class="odd">
-        <input type="file" name="uploadavatar" />
+      <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <input type="file" name="uploadavatar" size="30" />
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._MD_USER_LANG_CONTROL}></th>
-      <td class="foot">
+      <td colspan="2" class="foot" style="text-align:center;">
         <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
       </td>
     </tr>
@@ -47,22 +49,20 @@
 <form action="index.php?action=AvatarSelect" method="POST">
   <{xoops_token form=$avatarSelectForm}>
   <{xoops_input type=hidden name=uid value=$avatarSelectForm->get('uid')}>
-  <table class="outer" cellspacing="1">
-    <{foreach item=obj from=$systemAvatars}>
-      <tr class="<{cycle values='odd,even'}>">
-        <td>
-          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" />
-        </td>
-        <td>
-          <{$obj->getVar('avatar_name')}>
-        </td>
-        <td>
+  <table class="outer" style="text-align:center;">
+    <tr>
+      <th colspan="5"><{$smarty.const._MD_USER_LANG_AVATAR_LIST}></th>
+    </tr>
+    <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 />
+          <{$obj->getVar('avatar_name')}><br />
           <input name="avatar_id[<{$obj->getVar('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
-        </td>
-      </tr>
-    <{/foreach}>
+        <{cycle name="table" values="</td>,</td>,</td>,</td>,</td></tr><tr>"}>
+      <{/foreach}>
+    </tr>
   </table>
 </form>
-<br />
-<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
 
+<div class="pagenavi" style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
\ No newline at end of file
Index: xoops2jp/html/modules/user/templates/user_userform.html
diff -u xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.3
--- xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.2	Wed Oct 26 01:47:15 2005
+++ xoops2jp/html/modules/user/templates/user_userform.html	Thu Feb  2 14:34:19 2006
@@ -1,11 +1,11 @@
 <fieldset style="padding: 10px;">
   <legend style="font-weight: bold;"><{$smarty.const._LOGIN}></legend>
-  <form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post" ID="Form1">
-    <{$smarty.const._USERNAME}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" ID="Text1"/><br />
-    <{$smarty.const._PASSWORD}> <input type="password" name="pass" size="21" maxlength="32" ID="Password1"/><br />
-    <input type="hidden" name="op" value="login" ID="Hidden1"/>
-    <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" ID="Hidden2"/>
-    <input type="submit" value="<{$smarty.const._LOGIN}>" ID="Submit1" NAME="Submit1"/>
+  <form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post" >
+    <{$smarty.const._USERNAME}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" /><br />
+    <{$smarty.const._PASSWORD}> <input type="password" name="pass" size="21" maxlength="32" /><br />
+    <input type="hidden" name="op" value="login" />
+    <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" />
+    <input type="submit" value="<{$smarty.const._LOGIN}>" />
   </form>
   <a name="lost"></a>
   <div><{$smarty.const._US_NOTREGISTERED}><br /></div>
@@ -16,7 +16,10 @@
 <fieldset style="padding: 10px;">
   <legend style="font-weight: bold;"><{$smarty.const._US_LOSTPASSWORD}></legend>
   <div><br /><{$smarty.const._US_NOPROBLEM}></div>
-  <form action="lostpass.php" method="post" ID="Form2">
-    <{$smarty.const._US_YOUREMAIL}> <input type="text" name="email" size="26" maxlength="60" ID="Text2"/>&nbsp;&nbsp;<input type="hidden" name="op" value="mailpasswd" ID="Hidden3"/><input type="submit" value="<{$smarty.const._US_SENDPASSWORD}>" ID="Submit2" NAME="Submit2"/>
+  <form action="lostpass.php" method="post">
+    <{$smarty.const._US_YOUREMAIL}>
+    <input type="text" name="email" size="26" maxlength="60" />&nbsp;&nbsp;
+    <input type="hidden" name="op" value="mailpasswd" />
+    <input type="submit" value="<{$smarty.const._US_SENDPASSWORD}>" />
   </form>
-</fieldset>
\ No newline at end of file
+</fieldset>
Index: xoops2jp/html/modules/user/templates/user_default.html
diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.3
--- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.2	Thu Jan 19 21:10:01 2006
+++ xoops2jp/html/modules/user/templates/user_default.html	Thu Feb  2 14:34:19 2006
@@ -1,11 +1,29 @@
-<fieldset style="padding: 10px;">
-  <legend style="font-weight: bold;"><{$smarty.const._LOGIN}></legend>
-  <form action="index.php" method="post">
-    <{xoops_token form=$actionForm}>
-    <{$smarty.const._US_USERNAME}> : <{xoops_input name=uname size=26 maxlength=25 value="" }>
-    <{$smarty.const._US_PASSWORD}> : <{xoops_input type=password name=pass size=21 maxlength=32 value="" }>
-    <input type="submit" value="<{$smarty.const._LOGIN}>" />
-  </form>
-  <div><{$smarty.const._US_NOTREGISTERED}></div>
+<form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post">
+<input type="hidden" name="op" value="login" />
+<input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" />
+<table class="outer">
+  <tr>
+    <th colspan="2" style="text-align:center;"><{$smarty.const._LOGIN}></th>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._USERNAME}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <input type="text" name="uname" size="25" maxlength="25" value="<{$usercookie}>" />
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._PASSWORD}></td>
+    <td class="<{cycle values="odd,even"}>">
+     <input type="password" name="pass" size="30" maxlength="32" />
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" class="foot" style="text-align:center;">
+      <input type="submit" value="<{$smarty.const._LOGIN}>" />
+    </td>
+  </tr>
+</table>
+</form>
+
+<div style="text-align:center;"><{$smarty.const._US_NOTREGISTERED}></div>
 
-</fieldset>
Index: xoops2jp/html/modules/user/templates/user_lostpass.html
diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.3
--- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.2	Thu Jan 19 21:10:01 2006
+++ xoops2jp/html/modules/user/templates/user_lostpass.html	Thu Feb  2 14:34:19 2006
@@ -6,12 +6,28 @@
 </ul>
 <{/if}>
 
-<fieldset style="padding: 10px;">
-  <legend style="font-weight: bold;"><{$smarty.const._US_LOSTPASSWORD}></legend>
-  <div><{$smarty.const._US_NOPROBLEM}></div>
-  <form action="index.php?action=Lostpass" method="post">
-    <{xoops_token form=$actionForm}>
-    <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}>
-    <input type="submit" value="<{$smarty.const._SEND}>" />
-  </form>
-</fieldset>
\ No newline at end of file
+<form action="index.php?action=Lostpass" method="post">
+<{xoops_token form=$actionForm}>
+<table class="outer">
+  <tr>
+    <th colspan="2" style="text-align:center;"><{$smarty.const._US_LOSTPASSWORD}></th>
+  </tr>
+  <tr>
+    <td colspan="2" class="<{cycle values="odd,even"}>">
+      <{$smarty.const._US_NOPROBLEM}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td colspan="2" class="foot" style="text-align:center;">
+      <input type="submit" value="<{$smarty.const._SEND}>" />
+    </td>
+  </tr>
+</table>
+</form>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 15:24:23 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 15:24:23 +0900
Subject: [xoops-cvslog 2042] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060202062423.6C24E2AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_misc_smilies.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.1	Mon Dec 26 20:23:37 2005
+++ xoops2jp/html/modules/base/templates/legacy_misc_smilies.html	Thu Feb  2 15:24:23 2006
@@ -6,29 +6,25 @@
     }
     //-->
 </script>
-<table width="100%" class="outer" ID="Table1">
-	<tr>
-		<th colspan="3">
-			<{$smarty.const._MSC_SMILIES}>
-		</th>
-	</tr>
-	<tr class="head">
-		<td><{$smarty.const._MSC_CODE}></td>
-		<td><{$smarty.const._MSC_EMOTION}></td>
-		<td><{$smarty.const._IMAGE}></td>
-	</tr>
-	<{foreach item=smile from=$smiles}>
-		<tr class="<{cycle values="even,odd"}>">
-			<td>
-				<{$smile.code}>
-			</td>
-			<td>
-				<{$smile.emotion}>
-			</td>
-			<td>
-				<img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$smile.code}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$smile.smile_url}>' alt='' />
-			</td>
-		</tr>
-	<{/foreach}>
+
+<table width="100%" class="outer">
+  <tr>
+    <th colspan="3"><{$smarty.const._MSC_SMILIES}></th>
+  </tr>
+  <tr class="head">
+    <td><{$smarty.const._MSC_CODE}></td>
+    <td><{$smarty.const._MSC_EMOTION}></td>
+    <td><{$smarty.const._IMAGE}></td>
+  </tr>
+  <{foreach item=smile from=$smiles}>
+    <tr class="<{cycle values="even,odd"}>">
+      <td><{$smile.code}></td>
+      <td><{$smile.emotion}></td>
+      <td>
+        <img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$smile.code}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$smile.smile_url}>' alt='' />
+      </td>
+    </tr>
+  <{/foreach}>
 </table>
+
 <{$smarty.const._MSC_CLICKASMILIE}>
Index: xoops2jp/html/modules/base/templates/legacy_misc_ssllogin.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_ssllogin.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_misc_ssllogin.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_misc_ssllogin.html:1.1.2.1	Mon Dec 26 20:23:37 2005
+++ xoops2jp/html/modules/base/templates/legacy_misc_ssllogin.html	Thu Feb  2 15:24:23 2006
@@ -1,4 +1,4 @@
 <{$message}>
 <div style="text-align:center;">
-	<input class="formButton" value="<{$smarty.const._CLOSE}>" type="button" onclick="window.opener.location.reload();window.close();" ID="Button1" NAME="Button1"/>
+  <input class="formButton" value="<{$smarty.const._CLOSE}>" type="button" onclick="window.opener.location.reload();window.close();" />
 </div>
Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.2 xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.3
--- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.2	Mon Dec 26 21:13:26 2005
+++ xoops2jp/html/modules/base/templates/legacy_misc_online.html	Thu Feb  2 15:24:23 2006
@@ -1,25 +1,28 @@
-<table class="outer" id="table1" width="100%" cellspacing="1">
-	<tr>
-		<th colspan="3"><{$smarty.const._WHOSONLINE}></th>
-		<{foreach item=user from=$onlineUsers}>
-			<tr class="<{cycle values="odd,even"}> valign="middle" align="center">
-				<td>
-					<{if $user.user}>
-						<{$user.user->getVar('uname')}>
-					<{else}>
-						GUEST
-					<{/if}>
-				</td>
-				<td>
-					<{if $user.module}>
-						<{$user.module}>
-					<{/if}>
-				</td>
-				<{if $xoops_isadmin}>
-					<td><{$user.onlineInfo.online_ip}></td>
-				<{/if}>
-			</tr>
-		<{/foreach}>
-	</tr>
+<table class="outer" width="100%" cellspacing="1">
+  <tr>
+    <th colspan="3"><{$smarty.const._WHOSONLINE}></th>
+  </tr>
+  <{foreach item=user from=$onlineUsers}>
+    <tr class="<{cycle values="odd,even"}> valign="middle" align="center">
+      <td>
+        <{if $user.user}>
+          <{$user.user->getVar('uname')}>
+        <{else}>
+          <{$smarty.const._GUEST}>
+        <{/if}>
+      </td>
+      <td>
+        <{if $user.module}>
+          <{$user.module}>
+        <{/if}>
+      </td>
+      <td>
+        <{if $xoops_isadmin}>
+          <{$user.onlineInfo.online_ip}>
+        <{/if}>
+      </td>
+    </tr>
+  <{/foreach}>
 </table>
+
 <div style="text-align: right;"><!--- pagenavi ---></div>
Index: xoops2jp/html/modules/base/templates/legacy_misc_avatars.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.1	Mon Dec 26 20:23:37 2005
+++ xoops2jp/html/modules/base/templates/legacy_misc_avatars.html	Thu Feb  2 15:24:23 2006
@@ -11,17 +11,19 @@
         }
         //-->
 </script>
+
 <h4><{$smarty.const._MSC_AVAVATARS}></h4>
-<form name='avatars' action='misc.php?action=avatars' ID="Form1">
-	<table witdh="100%" id="Table1">
-		<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 />
-					<{$avatar.avatarName}><br/>
-					<input name="myimage" type="button" value="<{$smarty.const._SELECT}>"  onclick="myimage_onclick(<{$avatar.counter}>)" />
-				</td><{if $key && $key is div by 8}><tr></tr><{/if}>
-			<{/foreach}>
-		</tr>
-	</table>
+<form name="avatars" action="misc.php?action=avatars">
+<table witdh="100%">
+  <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 />
+        <{$avatar.avatarName}><br />
+        <input name="myimage" type="button" value="<{$smarty.const._SELECT}>" onclick="myimage_onclick(<{$avatar.counter}>)" />
+      </td>
+      <{if $key && $key is div by 8}><tr></tr><{/if}>
+    <{/foreach}>
+  </tr>
+</table>
 </form>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:10:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:10:17 +0900
Subject: [xoops-cvslog 2043] CVS update: xoops2jp/html/modules/user
Message-ID: <20060202081017.C734A2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.10 xoops2jp/html/modules/user/xoops_version.php:1.1.2.11
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.10	Thu Jan 26 20:09:07 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Thu Feb  2 17:10:17 2006
@@ -1,246 +1,242 @@
-<?php
-// $Id$
-//  ------------------------------------------------------------------------ //
-//                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 //
-//  ------------------------------------------------------------------------ //
-
-$modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 1.00;
-$modversion['description'] = _MI_USER_NAME_DESC;
-$modversion['author'] = "";
-$modversion['credits'] = "The XOOPS Project";
-$modversion['help'] = "system.html";
-$modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 1;
-$modversion['image'] = "images/user.gif";
-$modversion['dirname'] = "user";
-
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$modversion['tables'][] = "user_mailjob";
-$modversion['tables'][] = "user_mailjob_link";
-
-// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-
-// Templates
-$modversion['templates'][1]['file'] = 'user_userinfo.html';
-$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php';
-
-$modversion['templates'][2]['file'] = 'user_userform.html';
-$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user';
-
-$modversion['templates'][3]['file'] = 'user_edituser.html';
-$modversion['templates'][3]['description'] = 'When user edit own information, display this';
-
-$modversion['templates'][4]['file'] = 'user_register_form.html';
-$modversion['templates'][4]['description'] = '';
-
-$modversion['templates'][5]['file'] = 'user_register_confirm.html';
-$modversion['templates'][5]['description'] = '';
-
-$modversion['templates'][6]['file'] = 'user_lostpass.html';
-$modversion['templates'][6]['description'] = '';
-
-$modversion['templates'][7]['file'] = 'user_default.html';
-$modversion['templates'][7]['description'] = '';
-
-$modversion['templates'][8]['file'] = 'user_avatar_edit.html';
-$modversion['templates'][8]['description'] = '';
-
-//Preference
-$modversion['config'][]=array (
-		"name"=>"allow_register",
-		"title"=>"_MI_USER_CONF_ALLOW_REGISTER",
-		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"minpass",
-		"title"=>"_MI_USER_CONF_MINPASS",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>5
-	);
-
-$modversion['config'][]=array (
-		"name"=>"minuname",
-		"title"=>"_MI_USER_CONF_MINUNAME",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>3
-	);
-
-$modversion['config'][]=array (
-		"name"=>"maxuname",
-		"title"=>"_MI_USER_CONF_MAXUNAME",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>10
-	);
-
-$modversion['config'][]=array (
-		"name"=>"allow_chgmail",
-		"title"=>"_MI_USER_CONF_CHGMAIL",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"new_user_notify",
-		"title"=>"_MI_USER_CONF_NEW_USER_NOTIFY",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"new_user_notify_group",
-		"title"=>"_MI_USER_CONF_NEW_NTF_GROUP",
-		"formtype"=>"group",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"activation_type",
-		"title"=>"_MI_USER_CONF_ACTV_TYPE",
-		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_ACTV_USER=>0,_MI_USER_CONF_ACTV_AUTO=>1,_MI_USER_CONF_ACTV_ADMIN=>2),
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"activation_group",
-		"title"=>"_MI_USER_CONF_ACTV_GROUP",
-		"description"=>"_MI_USER_CONF_ACTV_GROUP_DESC",
-		"formtype"=>"group",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"uname_test_level",
-		"title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL",
-		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG=>0,_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL=>1,_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK=>2),
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_allow_upload",
-		"title"=>"_MI_USER_CONF_AVTR_ALLOW_UP",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_minposts",
-		"title"=>"_MI_USER_CONF_AVATAR_MINPOSTS",
-		"description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_width",
-		"title"=>"_MI_USER_CONF_AVATAR_WIDTH",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>80
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_height",
-		"title"=>"_MI_USER_CONF_AVATAR_HEIGHT",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>80
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_maxsize",
-		"title"=>"_MI_USER_CONF_AVATAR_MAXSIZE",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>35000
-	);
-
-$modversion['config'][]=array (
-		"name"=>"self_delete",
-		"title"=>"_MI_USER_CONF_SELF_DELETE",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"bad_unames",
-		"title"=>"_MI_USER_CONF_BAD_UNAMES",
-		"description"=>"_MI_USER_CONF_BAD_UNAMES_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>"webmaster|^xoops|^admin"
-	);
-
-$modversion['config'][]=array (
-		"name"=>"bad_emails",
-		"title"=>"_MI_USER_CONF_BAD_EMAILS",
-		"description"=>"_MI_USER_CONF_BAD_EMAILS_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>"xoopscube.org$|xoopscube.jp$"
-	);
-
-$modversion['config'][]=array (
-		"name"=>"reg_dispdsclmr",
-		"title"=>"_MI_USER_CONF_DISPDSCLMR",
-		"description"=>"_MI_USER_CONF_DISPDSCLMR_DESC",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"reg_disclaimer",
-		"title"=>"_MI_USER_CONF_DISCLAIMER",
-		"description"=>"_MI_USER_CONF_DISCLAIMER_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>""
-	);
-
-// Menu
-$modversion['hasMain'] = 1;
-
-?>
+<?php
+// $Id$
+//  ------------------------------------------------------------------------ //
+//                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 //
+//  ------------------------------------------------------------------------ //
+
+$modversion['name'] = _MI_USER_NAME;
+$modversion['version'] = 1.00;
+$modversion['description'] = _MI_USER_NAME_DESC;
+$modversion['author'] = "";
+$modversion['credits'] = "The XOOPS Project";
+$modversion['help'] = "system.html";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 1;
+$modversion['image'] = "images/user.gif";
+$modversion['dirname'] = "user";
+
+// Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+// Templates
+$modversion['templates'][1]['file'] = 'user_userinfo.html';
+$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php';
+
+$modversion['templates'][2]['file'] = 'user_userform.html';
+$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user';
+
+$modversion['templates'][3]['file'] = 'user_edituser.html';
+$modversion['templates'][3]['description'] = 'When user edit own information, display this';
+
+$modversion['templates'][4]['file'] = 'user_register_form.html';
+$modversion['templates'][4]['description'] = '';
+
+$modversion['templates'][5]['file'] = 'user_register_confirm.html';
+$modversion['templates'][5]['description'] = '';
+
+$modversion['templates'][6]['file'] = 'user_lostpass.html';
+$modversion['templates'][6]['description'] = '';
+
+$modversion['templates'][7]['file'] = 'user_default.html';
+$modversion['templates'][7]['description'] = '';
+
+$modversion['templates'][8]['file'] = 'user_avatar_edit.html';
+$modversion['templates'][8]['description'] = '';
+
+//Preference
+$modversion['config'][]=array (
+		"name"=>"allow_register",
+		"title"=>"_MI_USER_CONF_ALLOW_REGISTER",
+		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"minpass",
+		"title"=>"_MI_USER_CONF_MINPASS",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>5
+	);
+
+$modversion['config'][]=array (
+		"name"=>"minuname",
+		"title"=>"_MI_USER_CONF_MINUNAME",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>3
+	);
+
+$modversion['config'][]=array (
+		"name"=>"maxuname",
+		"title"=>"_MI_USER_CONF_MAXUNAME",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>10
+	);
+
+$modversion['config'][]=array (
+		"name"=>"allow_chgmail",
+		"title"=>"_MI_USER_CONF_CHGMAIL",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"new_user_notify",
+		"title"=>"_MI_USER_CONF_NEW_USER_NOTIFY",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"new_user_notify_group",
+		"title"=>"_MI_USER_CONF_NEW_NTF_GROUP",
+		"formtype"=>"group",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"activation_type",
+		"title"=>"_MI_USER_CONF_ACTV_TYPE",
+		"formtype"=>"select",
+		"options"=>array(_MI_USER_CONF_ACTV_USER=>0,_MI_USER_CONF_ACTV_AUTO=>1,_MI_USER_CONF_ACTV_ADMIN=>2),
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"activation_group",
+		"title"=>"_MI_USER_CONF_ACTV_GROUP",
+		"description"=>"_MI_USER_CONF_ACTV_GROUP_DESC",
+		"formtype"=>"group",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"uname_test_level",
+		"title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL",
+		"formtype"=>"select",
+		"options"=>array(_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG=>0,_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL=>1,_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK=>2),
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_allow_upload",
+		"title"=>"_MI_USER_CONF_AVTR_ALLOW_UP",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_minposts",
+		"title"=>"_MI_USER_CONF_AVATAR_MINPOSTS",
+		"description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_width",
+		"title"=>"_MI_USER_CONF_AVATAR_WIDTH",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>80
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_height",
+		"title"=>"_MI_USER_CONF_AVATAR_HEIGHT",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>80
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_maxsize",
+		"title"=>"_MI_USER_CONF_AVATAR_MAXSIZE",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>35000
+	);
+
+$modversion['config'][]=array (
+		"name"=>"self_delete",
+		"title"=>"_MI_USER_CONF_SELF_DELETE",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"bad_unames",
+		"title"=>"_MI_USER_CONF_BAD_UNAMES",
+		"description"=>"_MI_USER_CONF_BAD_UNAMES_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>"webmaster|^xoops|^admin"
+	);
+
+$modversion['config'][]=array (
+		"name"=>"bad_emails",
+		"title"=>"_MI_USER_CONF_BAD_EMAILS",
+		"description"=>"_MI_USER_CONF_BAD_EMAILS_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>"xoopscube.org$|xoopscube.jp$"
+	);
+
+$modversion['config'][]=array (
+		"name"=>"reg_dispdsclmr",
+		"title"=>"_MI_USER_CONF_DISPDSCLMR",
+		"description"=>"_MI_USER_CONF_DISPDSCLMR_DESC",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"reg_disclaimer",
+		"title"=>"_MI_USER_CONF_DISCLAIMER",
+		"description"=>"_MI_USER_CONF_DISCLAIMER_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>""
+	);
+
+// Menu
+$modversion['hasMain'] = 1;
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:11:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:11:11 +0900
Subject: [xoops-cvslog 2044] CVS update: xoops2jp/html/modules/user/sql
Message-ID: <20060202081111.7FD5F2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/sql/mysql.sql
diff -u xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.1 xoops2jp/html/modules/user/sql/mysql.sql:removed
--- xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.1	Tue Jan 10 08:33:42 2006
+++ xoops2jp/html/modules/user/sql/mysql.sql	Thu Feb  2 17:11:11 2006
@@ -1,23 +0,0 @@
-CREATE TABLE user_mailjob (
-  `id` int(10) NOT NULL auto_increment,
-  `lastlogin` int(10) default NULL,
-  `lastlogin_flag` tinyint(1) NOT NULL default '0',
-  `mailok` tinyint(1) NOT NULL default '0',
-  `activeuser` tinyint(1) NOT NULL default '0',
-  `registdate` int(10) default '0',
-  `registdate_flag` tinyint(1) NOT NULL default '0',
-  `sender` varchar(255) default NULL,
-  `email` varchar(255) default NULL,
-  `subject` varchar(255) NOT NULL default '',
-  `body` text NOT NULL,
-  `by_pm` tinyint(1) NOT NULL default '0',
-  `by_email` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
-) TYPE=MyISAM;
-
-CREATE TABLE user_mailjob_link (
-  `lid` int(10) NOT NULL auto_increment,
-  `id` int(10) NOT NULL default '0',
-  `uid` mediumint(8) NOT NULL default '0',
-  PRIMARY KEY  (`lid`)
-) TYPE=MyISAM;

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:12:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:12:08 +0900
Subject: [xoops-cvslog 2045] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060202081208.9EC6D2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/MailjobEditForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/MailjobEditForm.class.php:1.1.2.1	Mon Jan  9 02:48:47 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobEditForm.class.php	Thu Feb  2 17:12:08 2006
@@ -1,98 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- */
-class User_MailjobEditForm extends XCube_ActionForm
-{
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['id'] =& new XCube_IntProperty('id');
-		$this->mFormProperties['lastlogin'] =& new XCube_IntProperty('lastlogin');
-		$this->mFormProperties['lastlogin_flag'] =& new XCube_BoolProperty('lastlogin_flag');
-		$this->mFormProperties['mailok'] =& new XCube_BoolProperty('mailok');
-		$this->mFormProperties['activeuser'] =& new XCube_BoolProperty('activeuser');
-		$this->mFormProperties['registdate'] =& new XCube_IntProperty('registdate');
-		$this->mFormProperties['registdate_flag'] =& new XCube_BoolProperty('registdate_flag');
-		$this->mFormProperties['sender'] =& new XCube_StringProperty('sender');
-		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
-		$this->mFormProperties['subject'] =& new XCube_StringProperty('subject');
-		$this->mFormProperties['body'] =& new XCube_TextProperty('body');
-		$this->mFormProperties['by_pm'] =& new XCube_BoolProperty('by_pm');
-		$this->mFormProperties['by_email'] =& new XCube_BoolProperty('by_email');
-
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['id'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['id']->setDependsByArray(array('required'));
-		$this->mFieldProperties['id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_ID);
-
-		$this->mFieldProperties['lastlogin'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['lastlogin']->setDependsByArray(array(''));
-
-		$this->mFieldProperties['registdate'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['registdate']->setDependsByArray(array(''));
-
-		$this->mFieldProperties['sender'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['sender']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['sender']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255');
-		$this->mFieldProperties['sender']->addVar('maxlength', 255);
-
-		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255');
-		$this->mFieldProperties['email']->addVar('maxlength', 255);
-
-		$this->mFieldProperties['subject'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['subject']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['subject']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_SUBJECT, '255');
-		$this->mFieldProperties['subject']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_SUBJECT, '255');
-		$this->mFieldProperties['subject']->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);
-	}
-
-	function load(&$obj)
-	{
-		$this->setVar('id', $obj->get('id'));
-		$this->setVar('lastlogin', $obj->get('lastlogin'));
-		$this->setVar('lastlogin_flag', $obj->get('lastlogin_flag'));
-		$this->setVar('mailok', $obj->get('mailok'));
-		$this->setVar('activeuser', $obj->get('activeuser'));
-		$this->setVar('registdate', $obj->get('registdate'));
-		$this->setVar('registdate_flag', $obj->get('registdate_flag'));
-		$this->setVar('sender', $obj->get('sender'));
-		$this->setVar('email', $obj->get('email'));
-		$this->setVar('subject', $obj->get('subject'));
-		$this->setVar('body', $obj->get('body'));
-		$this->setVar('by_pm', $obj->get('by_pm'));
-		$this->setVar('by_email', $obj->get('by_email'));
-	}
-
-	function update(&$obj)
-	{
-		$obj->setVar('id', $this->get('id'));
-		$obj->setVar('lastlogin', $this->get('lastlogin'));
-		$obj->setVar('lastlogin_flag', $this->get('lastlogin_flag'));
-		$obj->setVar('mailok', $this->get('mailok'));
-		$obj->setVar('activeuser', $this->get('activeuser'));
-		$obj->setVar('registdate', $this->get('registdate'));
-		$obj->setVar('registdate_flag', $this->get('registdate_flag'));
-		$obj->setVar('sender', $this->get('sender'));
-		$obj->setVar('email', $this->get('email'));
-		$obj->setVar('subject', $this->get('subject'));
-		$obj->setVar('body', $this->get('body'));
-		$obj->setVar('by_pm', $this->get('by_pm'));
-		$obj->setVar('by_email', $this->get('by_email'));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.1	Wed Jan 11 20:52:36 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php	Thu Feb  2 17:12:08 2006
@@ -1,127 +0,0 @@
-<?php
-
-define('MAILJOB_SORT_KEY_DEFAULT', 0);
-define('MAILJOB_SORT_KEY_ID', 1);
-define('MAILJOB_SORT_KEY_LASTLOGIN', 2);
-define('MAILJOB_SORT_KEY_LASTLOGIN_FLAG', 3);
-define('MAILJOB_SORT_KEY_MAILOK', 4);
-define('MAILJOB_SORT_KEY_ACTIVEUSER', 5);
-define('MAILJOB_SORT_KEY_REGISTDATE', 6);
-define('MAILJOB_SORT_KEY_REGISTDATE_FLAG', 7);
-define('MAILJOB_SORT_KEY_SENDER', 8);
-define('MAILJOB_SORT_KEY_EMAIL', 9);
-define('MAILJOB_SORT_KEY_SUBJECT', 10);
-define('MAILJOB_SORT_KEY_BODY', 11);
-define('MAILJOB_SORT_KEY_BY_PM', 12);
-define('MAILJOB_SORT_KEY_BY_EMAIL', 13);
-define('MAILJOB_SORT_KEY_MAXVALUE', 13);
-
-class User_MailjobFilterForm
-{
-	var $mSort = 0;
-	var $_mSortKeys = array(
-		MAILJOB_SORT_KEY_DEFAULT => 'id',
-		MAILJOB_SORT_KEY_ID => 'id',
-		MAILJOB_SORT_KEY_LASTLOGIN => 'lastlogin',
-		MAILJOB_SORT_KEY_LASTLOGIN_FLAG => 'lastlogin_flag',
-		MAILJOB_SORT_KEY_MAILOK => 'mailok',
-		MAILJOB_SORT_KEY_ACTIVEUSER => 'activeuser',
-		MAILJOB_SORT_KEY_REGISTDATE => 'registdate',
-		MAILJOB_SORT_KEY_REGISTDATE_FLAG => 'registdate_flag',
-		MAILJOB_SORT_KEY_SENDER => 'sender',
-		MAILJOB_SORT_KEY_EMAIL => 'email',
-		MAILJOB_SORT_KEY_SUBJECT => 'subject',
-		MAILJOB_SORT_KEY_BODY => 'body',
-		MAILJOB_SORT_KEY_BY_PM => 'by_pm',
-		MAILJOB_SORT_KEY_BY_EMAIL => 'by_email'
-	);
-	var $_mCriteria = null;
-
-	function User_MailjobFilterForm()
-	{
-		$this->_mCriteria =& new CriteriaCompo();
-	}
-
-	function fetch()
-	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-	
-		if ($this->mSort > MAILJOB_SORT_KEY_MAXVALUE) {
-			$this->mSort = MAILJOB_SORT_KEY_DEFAULT;
-		}
-	
-		if (isset($_REQUEST['id'])) {
-			$this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id'))));
-		}
-	
-		if (isset($_REQUEST['lastlogin'])) {
-			$this->_mCriteria->add(new Criteria('lastlogin', array(XOBJ_DTYPE_INT, xoops_getrequest('lastlogin'))));
-		}
-	
-		if (isset($_REQUEST['lastlogin_flag'])) {
-			$this->_mCriteria->add(new Criteria('lastlogin_flag', array(XOBJ_DTYPE_BOOL, xoops_getrequest('lastlogin_flag'))));
-		}
-	
-		if (isset($_REQUEST['mailok'])) {
-			$this->_mCriteria->add(new Criteria('mailok', array(XOBJ_DTYPE_BOOL, xoops_getrequest('mailok'))));
-		}
-	
-		if (isset($_REQUEST['activeuser'])) {
-			$this->_mCriteria->add(new Criteria('activeuser', array(XOBJ_DTYPE_BOOL, xoops_getrequest('activeuser'))));
-		}
-	
-		if (isset($_REQUEST['registdate'])) {
-			$this->_mCriteria->add(new Criteria('registdate', array(XOBJ_DTYPE_INT, xoops_getrequest('registdate'))));
-		}
-	
-		if (isset($_REQUEST['registdate_flag'])) {
-			$this->_mCriteria->add(new Criteria('registdate_flag', array(XOBJ_DTYPE_BOOL, xoops_getrequest('registdate_flag'))));
-		}
-	
-		if (isset($_REQUEST['sender'])) {
-			$this->_mCriteria->add(new Criteria('sender', array(XOBJ_DTYPE_STRING, xoops_getrequest('sender'))));
-		}
-	
-		if (isset($_REQUEST['email'])) {
-			$this->_mCriteria->add(new Criteria('email', array(XOBJ_DTYPE_STRING, xoops_getrequest('email'))));
-		}
-	
-		if (isset($_REQUEST['subject'])) {
-			$this->_mCriteria->add(new Criteria('subject', array(XOBJ_DTYPE_STRING, xoops_getrequest('subject'))));
-		}
-	
-		if (isset($_REQUEST['by_pm'])) {
-			$this->_mCriteria->add(new Criteria('by_pm', array(XOBJ_DTYPE_BOOL, xoops_getrequest('by_pm'))));
-		}
-	
-		if (isset($_REQUEST['by_email'])) {
-			$this->_mCriteria->add(new Criteria('by_email', array(XOBJ_DTYPE_BOOL, xoops_getrequest('by_email'))));
-		}
-	}
-
-	function getSort()
-	{
-		$sortkey = abs($this->mSort);
-		return $this->_mSortKeys[$sortkey];
-	}
-
-	function getOrder()
-	{
-		return ($this->mSort < 0) ? "DESC" : "ASC";
-	}
-
-	function getCriteria($start = 0, $limit = 0)
-	{
-		$criteria = $this->_mCriteria;
-	
-		$criteria->setStart($start);
-		$criteria->setLimit($limit);
-	
-		$criteria->setSort($this->getSort());
-		$criteria->setOrder($this->getOrder());
-	
-		return $criteria;
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:12:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:12:15 +0900
Subject: [xoops-cvslog 2046] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060202081215.3AD522AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:removed
--- xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.2	Mon Jan  9 02:55:00 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html	Thu Feb  2 17:12:15 2006
@@ -1,89 +0,0 @@
-<{if $actionForm->hasError()}>
-  <ul>
-    <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
-    <{/foreach}>
-  </ul>
-<{/if}>
-<form action="" method="post">
-  <{xoops_input type=hidden name=id value=$actionForm->getVar('id')}>
-  <table class="outer" cellspacing="1">
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_LASTLOGIN}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=lastlogin value=$actionForm->getVar('lastlogin')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_LASTLOGIN_FLAG}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=lastlogin_flag value=1 default=$actionForm->getVar('lastlogin_flag')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_MAILOK}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=mailok value=1 default=$actionForm->getVar('mailok')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_ACTIVEUSER}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=activeuser value=1 default=$actionForm->getVar('activeuser')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_REGISTDATE}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=registdate value=$actionForm->getVar('registdate')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_REGISTDATE_FLAG}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=registdate_flag value=1 default=$actionForm->getVar('registdate_flag')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_SENDER}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=sender value=$actionForm->getVar('sender') size=15 maxlength=255}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_EMAIL}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=email value=$actionForm->getVar('email') size=15 maxlength=255}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_SUBJECT}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=subject value=$actionForm->getVar('subject') size=15 maxlength=255}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_BODY}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text name=body value=$actionForm->getVar('body')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_BY_PM}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=by_pm value=1 default=$actionForm->getVar('by_pm')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_USER_LANG_BY_EMAIL}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=by_email value=1 default=$actionForm->getVar('by_email')}>
-      </td>
-    </tr>
-    <tr class="foot">
-      <td colspan="2" style="text-align:center;">
-        <input class="formButton" type="submit" value="<{$smarty.const._AD_USER_LANG_SUBMIT}>" />
-      </td>
-    </tr>
-  </table>
-</form>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.1 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:removed
--- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.1	Wed Jan 11 20:53:02 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html	Thu Feb  2 17:12:15 2006
@@ -1,62 +0,0 @@
-<table class="outer" cellspacing="1">
-  <tr>
-    <th><{$smarty.const._AD_USER_LANG_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_ID}>"><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.MAILJOB_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_LASTLOGIN_FLAG}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_LASTLOGIN_FLAG}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_LASTLOGIN_FLAG}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_MAILOK}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_MAILOK}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_MAILOK}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_ACTIVEUSER}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_ACTIVEUSER}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_ACTIVEUSER}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_REGISTDATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_REGISTDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_REGISTDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_REGISTDATE_FLAG}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_REGISTDATE_FLAG}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_REGISTDATE_FLAG}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_SENDER}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_SENDER}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_SENDER}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_EMAIL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_EMAIL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_EMAIL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_SUBJECT}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_SUBJECT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_SUBJECT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_BODY}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_BODY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_BODY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_BY_PM}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_BY_PM}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_BY_PM}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_BY_EMAIL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_BY_EMAIL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_BY_EMAIL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-  </tr>
-  <{foreach item=obj from=$objects}>
-    <tr class="<{cycle values='odd,even'}>">
-      <td><{$obj->getVar('id')}></td>
-      <td><{$obj->getVar('lastlogin')}></td>
-      <td><{$obj->getVar('lastlogin_flag')}></td>
-      <td><{$obj->getVar('mailok')}></td>
-      <td><{$obj->getVar('activeuser')}></td>
-      <td><{$obj->getVar('registdate')}></td>
-      <td><{$obj->getVar('registdate_flag')}></td>
-      <td><{$obj->getVar('sender')}></td>
-      <td><{$obj->getVar('email')}></td>
-      <td><{$obj->getVar('subject')}></td>
-      <td><{$obj->getVar('body')}></td>
-      <td><{$obj->getVar('by_pm')}></td>
-      <td><{$obj->getVar('by_email')}></td>
-    </tr>
-  <{/foreach}>
-</table>
-<br />
-<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:35:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:35:02 +0900
Subject: [xoops-cvslog 2047] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060202083504.7EB672AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.6
--- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.5	Thu Jan 19 21:07:59 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php	Thu Feb  2 17:35:02 2006
@@ -224,32 +224,32 @@
 	
 	function load(&$obj)
 	{
-		$this->setVar('uid', $obj->get('uid'));
-		$this->setVar('name', $obj->get('name'));
-		$this->setVar('uname', $obj->get('uname'));
-		$this->setVar('email', $obj->get('email'));
-		$this->setVar('url', $obj->get('url'));
-		$this->setVar('user_icq', $obj->get('user_icq'));
-		$this->setVar('user_from', $obj->get('user_from'));
-		$this->setVar('user_sig', $obj->get('user_sig'));
-		$this->setVar('user_viewemail', $obj->get('user_viewemail'));
-		$this->setVar('user_aim', $obj->get('user_aim'));
-		$this->setVar('user_yim', $obj->get('user_yim'));
-		$this->setVar('user_msnm', $obj->get('user_msnm'));
-
-		$this->setVar('posts', $obj->get('posts'));
-		$this->setVar('attachsig', $obj->get('attachsig'));
-		$this->setVar('rank', $obj->get('rank'));
-		$this->setVar('level', $obj->get('level'));
-		$this->setVar('timezone_offset', $obj->get('timezone_offset'));
-		$this->setVar('umode', $obj->get('umode'));
-		$this->setVar('uorder', $obj->get('uorder'));
-		$this->setVar('notify_method', $obj->get('notify_method'));
-		$this->setVar('notify_mode', $obj->get('notify_mode'));
-		$this->setVar('user_occ', $obj->get('user_occ'));
-		$this->setVar('bio', $obj->get('bio'));
-		$this->setVar('user_intrest', $obj->get('user_intrest'));
-		$this->setVar('user_mailok', $obj->get('user_mailok'));
+		$this->set('uid', $obj->get('uid'));
+		$this->set('name', $obj->get('name'));
+		$this->set('uname', $obj->get('uname'));
+		$this->set('email', $obj->get('email'));
+		$this->set('url', $obj->get('url'));
+		$this->set('user_icq', $obj->get('user_icq'));
+		$this->set('user_from', $obj->get('user_from'));
+		$this->set('user_sig', $obj->get('user_sig'));
+		$this->set('user_viewemail', $obj->get('user_viewemail'));
+		$this->set('user_aim', $obj->get('user_aim'));
+		$this->set('user_yim', $obj->get('user_yim'));
+		$this->set('user_msnm', $obj->get('user_msnm'));
+
+		$this->set('posts', $obj->get('posts'));
+		$this->set('attachsig', $obj->get('attachsig'));
+		$this->set('rank', $obj->get('rank'));
+		$this->set('level', $obj->get('level'));
+		$this->set('timezone_offset', $obj->get('timezone_offset'));
+		$this->set('umode', $obj->get('umode'));
+		$this->set('uorder', $obj->get('uorder'));
+		$this->set('notify_method', $obj->get('notify_method'));
+		$this->set('notify_mode', $obj->get('notify_mode'));
+		$this->set('user_occ', $obj->get('user_occ'));
+		$this->set('bio', $obj->get('bio'));
+		$this->set('user_intrest', $obj->get('user_intrest'));
+		$this->set('user_mailok', $obj->get('user_mailok'));
 		
 		$this->_mIsNew = $obj->isNew();
 
Index: xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.1	Thu Jan 19 21:07:45 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php	Thu Feb  2 17:35:02 2006
@@ -29,7 +29,7 @@
 
 	function load(&$obj)
 	{
-		$this->setVar('uid', $obj->get('uid'));
+		$this->set('uid', $obj->get('uid'));
 	}
 
 	function update(&$obj)
Index: xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.1	Thu Jan 19 21:07:36 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php	Thu Feb  2 17:35:02 2006
@@ -29,7 +29,7 @@
 
 	function load(&$obj)
 	{
-		$this->setVar('rank_id', $obj->get('rank_id'));
+		$this->set('rank_id', $obj->get('rank_id'));
 	}
 
 	function update(&$obj)
Index: xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.1	Thu Jan 19 21:07:26 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php	Thu Feb  2 17:35:02 2006
@@ -29,7 +29,7 @@
 
 	function load(&$obj)
 	{
-		$this->setVar('groupid', $obj->get('groupid'));
+		$this->set('groupid', $obj->get('groupid'));
 	}
 
 	function update(&$obj)
Index: xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.1	Thu Jan 19 21:07:26 2006
+++ xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php	Thu Feb  2 17:35:02 2006
@@ -29,7 +29,7 @@
 
 	function load(&$obj)
 	{
-		$this->setVar('avatar_id', $obj->get('avatar_id'));
+		$this->set('avatar_id', $obj->get('avatar_id'));
 	}
 
 	function update(&$obj)

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:35:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:35:27 +0900
Subject: [xoops-cvslog 2048] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060202083527.B9B422AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.2	Sun Jan  8 23:02:29 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php	Thu Feb  2 17:35:27 2006
@@ -8,6 +8,11 @@
  */
 class User_GroupEditForm extends XCube_ActionForm 
 {
+	function getTokenName()
+	{
+		return "module.user.GroupEditForm.TOKEN";
+	}
+
 	function prepare()
 	{
 		// set properties
@@ -26,9 +31,9 @@
 
 	function load(&$group)
 	{
-		$this->setVar('groupid', $group->getVar('groupid'));
-		$this->setVar('name', $group->getVar('name'));
-		$this->setVar('description', $group->getVar('description'));
+		$this->set('groupid', $group->getVar('groupid'));
+		$this->set('name', $group->getVar('name'));
+		$this->set('description', $group->getVar('description'));
 	}
 
 	function update(&$group)

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:35:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:35:33 +0900
Subject: [xoops-cvslog 2049] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060202083533.DF9322AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RankEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RankEditForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/RankEditForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/RankEditForm.class.php:1.1.2.4	Sun Jan  8 23:02:29 2006
+++ xoops2jp/html/modules/user/admin/forms/RankEditForm.class.php	Thu Feb  2 17:35:33 2006
@@ -1,131 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-require_once XOOPS_ROOT_PATH."/modules/user/class/UserFormFile.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class RankEditForm extends XCube_ActionForm 
-{
-	/**
-	 * Image file name.
-	 * Because of this does not set to property is that this is never fetched by $_REQUEST.
-	 */
-	var $mImageFileName;
-	
-	var $mImageFile;
-	
-	function RankEditForm()
-	{
-		parent::XCube_ActionForm();
-		$this->mImageFile = new UserFormFile('rank_image');
-	}
-	
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['rank_id']=new XCube_IntProperty('rank_id');
-		$this->mFormProperties['rank_title']=new XCube_StringProperty('rank_title');
-		$this->mFormProperties['rank_min']=new XCube_IntProperty('rank_min');
-		$this->mFormProperties['rank_max']=new XCube_IntProperty('rank_max');
-		$this->mFormProperties['rank_special']=new XCube_IntProperty('rank_special');
-
-		// set fields
-		$this->mFieldProperties['rank_title']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_title']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['rank_title']->addMessage("required",_AD_USER_ERROR_REQUIRED,_AD_USER_LANG_RANK_TITLE,"50");
-		$this->mFieldProperties['rank_title']->addVar("maxlength",50);
-
-		$this->mFieldProperties['rank_min']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_min']->setDependsByArray(array('required','min'));
-		$this->mFieldProperties['rank_min']->addMessage("required",_AD_USER_ERROR_REQUIRED,_AD_USER_LANG_RANK_MIN,"0");
-		$this->mFieldProperties['rank_min']->addMessage("min",_AD_USER_ERROR_MIN,_AD_USER_LANG_RANK_MIN,"0");
-		$this->mFieldProperties['rank_min']->addVar("min",0);
-
-		$this->mFieldProperties['rank_max']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_max']->setDependsByArray(array('required','min'));
-		$this->mFieldProperties['rank_max']->addMessage("required",_AD_USER_ERROR_REQUIRED,_AD_USER_LANG_RANK_MAX,"0");
-		$this->mFieldProperties['rank_max']->addMessage("min",_AD_USER_ERROR_MIN,_AD_USER_LANG_RANK_MAX,"0");
-		$this->mFieldProperties['rank_max']->addVar("min",0);
-
-		$this->mFieldProperties['rank_special']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_special']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['rank_special']->addMessage("intRange",_AD_USER_ERROR_INJURY_SPECIAL);
-		$this->mFieldProperties['rank_special']->addVar("min",0);
-		$this->mFieldProperties['rank_special']->addVar("max",1);
-	}
-
-	function fetch()
-	{
-		parent::fetch();
-		$this->mImageFile->fetch();
-	}
-	
-	function validate()
-	{
-		parent::validate();
-		if($this->getVar('max')<$this->getVar('min')) {
-			$this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX);
-		}
-
-		//
-		// Check file
-		//
-		if($this->mImageFile->hasUploadFile()) {
-			//
-			// Add code
-			//
-			if(!$this->mImageFile->checkFormat())
-				$this->addErrorMessage(_AD_USER_ERROR_WRONG_FORMAT);
-		}
-		elseif(!$this->hasError() && $this->mImageFileName==null) {
-			//
-			// If we have no filename and no file uploaded, the validation is error.
-			//
-			$this->addErrorMessage(_AD_USER_ERROR_NO_UPLOAD_FILE);
-		}
-	}
-
-	/**
-	 * @param $master UserRankObject
-	 */
-	function load(&$master)
-	{
-		$this->setVar('rank_id',$master->getProperty('rank_id'));
-		$this->setVar('rank_title',$master->getProperty('rank_title'));
-		$this->setVar('rank_min',$master->getProperty('rank_min'));
-		$this->setVar('rank_max',$master->getProperty('rank_max'));
-		$this->setVar('rank_special',$master->getProperty('rank_special'));
-		
-		//
-		// We set master.rankimage to original property.
-		//
-		$this->mImageFileName=$master->getProperty('rank_image');
-	}
-
-	/**
-	 * @param $master UserRankObject
-	 */
-	function update(&$master)
-	{
-		$master->setVar('rank_id',$this->getVar('rank_id'));
-		$master->setVar('rank_title',$this->getVar('rank_title'));
-		$master->setVar('rank_min',$this->getVar('rank_min'));
-		$master->setVar('rank_max',$this->getVar('rank_max'));
-		$master->setVar('rank_special',$this->getVar('rank_special'));
-
-		if($this->mImageFile->hasUploadFile()) {
-			// TODO Check error
-			$this->mImageFile->saveAsRandBody(XOOPS_UPLOAD_PATH,"rank");
-			$master->setVar('rank_image',$this->mImageFile->getFileName());
-		}
-		else {
-			$master->setVar('rank_image',$this->mImageFileName);
-		}
-	}
-}
-
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:35:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:35:43 +0900
Subject: [xoops-cvslog 2050] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060202083543.AD7922AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html	Thu Feb  2 17:35:43 2006
@@ -2,14 +2,14 @@
   <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=AvatarList"><{$smarty.const._MI_USER_ADMENU_AVATAR_MANAGE}></a>
   &raquo;&raquo; 
-  <{if $actionForm->getVar('avatar_id')}>
+  <{if $actionForm->get('avatar_id')}>
     <{$smarty.const._AD_USER_LANG_AVATAR_EDIT}>
   <{else}>
     <{$smarty.const._AD_USER_LANG_AVATAR_NEW}>
   <{/if}>
 </div>
 
-<{if $actionForm->getVar('avatar_id')}>
+<{if $actionForm->get('avatar_id')}>
   <h3><{$smarty.const._AD_USER_LANG_AVATAR_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_USER_LANG_AVATAR_NEW}></h3>
@@ -25,27 +25,27 @@
 
 <form action="?action=AvatarEdit" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=avatar_id value=$actionForm->getVar('avatar_id')}>
+  <{xoops_input type=hidden name=avatar_id value=$actionForm->get('avatar_id')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-        <{if $actionForm->getVar('avatar_id')}>
+        <{if $actionForm->get('avatar_id')}>
           <{$smarty.const._AD_USER_LANG_AVATAR_EDIT}>
         <{else}>
           <{$smarty.const._AD_USER_LANG_AVATAR_NEW}>
         <{/if}>
       </th>
     </tr>
-    <{if $actionForm->getVar('avatar_id')}>
+    <{if $actionForm->get('avatar_id')}>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$actionForm->getVar('avatar_id')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$actionForm->get('avatar_id')}></b></td>
     </tr>
     <{/if}>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_NAME}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=avatar_name value=$actionForm->getVar('avatar_name') size=15 maxlength=100}>
+        <{xoops_input type=text name=avatar_name value=$actionForm->get('avatar_name') size=15 maxlength=100}>
       </td>
     </tr>
     <tr>
@@ -57,14 +57,14 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_DISPLAY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=avatar_display value=1 default=$actionForm->getVar('avatar_display')}><{$smarty.const._YES}>
-        <{xoops_input type=radio name=avatar_display value=0 default=$actionForm->getVar('avatar_display')}><{$smarty.const._NO}>
+        <{xoops_input type=radio name=avatar_display value=1 default=$actionForm->get('avatar_display')}><{$smarty.const._YES}>
+        <{xoops_input type=radio name=avatar_display value=0 default=$actionForm->get('avatar_display')}><{$smarty.const._NO}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_WEIGHT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=avatar_weight value=$actionForm->getVar('avatar_weight')}>
+        <{xoops_input type=text name=avatar_weight value=$actionForm->get('avatar_weight')}>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/user/admin/templates/group_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.4	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_edit.html	Thu Feb  2 17:35:43 2006
@@ -2,14 +2,14 @@
   <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=GroupList"><{$smarty.const._AD_USER_LANG_GROUP_LIST}></a>
   &raquo;&raquo;
-  <{if $actionForm->getVar('groupid') }>
+  <{if $actionForm->get('groupid') }>
     <{$smarty.const._AD_USER_LANG_GROUP_EDIT}>
   <{else}>
     <{$smarty.const._AD_USER_LANG_GROUP_NEW}>
   <{/if}>
 </div>
 
-<{if $actionForm->getVar('groupid') }>
+<{if $actionForm->get('groupid') }>
   <h3><{$smarty.const._AD_USER_LANG_GROUP_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_USER_LANG_GROUP_NEW}></h3>
@@ -24,11 +24,12 @@
 <{/if}>
 
 <form action="?action=GroupEdit" method="post">
-  <{xoops_input type=hidden name=groupid value=$actionForm->getVar('groupid')}>
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=groupid value=$actionForm->get('groupid')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-      <{if $actionForm->getVar('groupid') }>
+      <{if $actionForm->get('groupid') }>
         <{$smarty.const._AD_USER_LANG_GROUP_EDIT}>
       <{else}>
         <{$smarty.const._AD_USER_LANG_GROUP_NEW}>
@@ -38,13 +39,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_NAME}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name')}>
+        <{xoops_input type=text name=name value=$actionForm->get('name')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_DESC}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea name=description value=$actionForm->getVar('description')}>
+        <{xoops_dhtmltarea name=description value=$actionForm->get('description')}>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html	Thu Feb  2 17:35:43 2006
@@ -2,14 +2,14 @@
   <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=RanksList"><{$smarty.const._AD_USER_LANG_RANK_LIST}></a>
   &raquo;&raquo; 
-  <{if $actionForm->getVar('rank_id') }>
+  <{if $actionForm->get('rank_id') }>
     <{$smarty.const._AD_USER_LANG_RANK_EDIT}>
   <{else}>
     <{$smarty.const._AD_USER_LANG_RANK_NEW}>
   <{/if}>
 </div>
 
-<{if $actionForm->getVar('rank_id') }>
+<{if $actionForm->get('rank_id') }>
   <h3><{$smarty.const._AD_USER_LANG_RANK_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_USER_LANG_RANK_NEW}></h3>
@@ -28,7 +28,7 @@
   <table class="outer">
     <tr>
       <th colspan="2">
-      <{if $actionForm->getVar('rank_id') }>
+      <{if $actionForm->get('rank_id') }>
         <{$smarty.const._AD_USER_LANG_RANK_EDIT}>
       <{else}>
         <{$smarty.const._AD_USER_LANG_RANK_NEW}>
@@ -38,19 +38,19 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=rank_title value=$actionForm->getVar('rank_title')}>
+        <{xoops_input type=text name=rank_title value=$actionForm->get('rank_title')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MIN}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=rank_min value=$actionForm->getVar('rank_min')}>
+        <{xoops_input type=text name=rank_min value=$actionForm->get('rank_min')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MAX}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=rank_max value=$actionForm->getVar('rank_max')}>
+        <{xoops_input type=text name=rank_max value=$actionForm->get('rank_max')}>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.6	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Thu Feb  2 17:35:43 2006
@@ -2,14 +2,14 @@
   <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;
-  <{if $actionForm->getVar('uid')}>
+  <{if $actionForm->get('uid')}>
     <{$smarty.const._AD_USER_LANG_USER_EDIT}>
   <{else}>
     <{$smarty.const._AD_USER_LANG_USER_NEW}>
   <{/if}>
 </div>
 
-<{if $actionForm->getVar('uid')}>
+<{if $actionForm->get('uid')}>
   <h3><{$smarty.const._AD_USER_LANG_USER_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_USER_LANG_USER_NEW}></h3>
@@ -25,11 +25,11 @@
 
 <form action="" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=uid value=$actionForm->getVar('uid')}>
+  <{xoops_input type=hidden name=uid value=$actionForm->get('uid')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-      <{if $actionForm->getVar('uid')}>
+      <{if $actionForm->get('uid')}>
         <{$smarty.const._AD_USER_LANG_USER_EDIT}>
       <{else}>
         <{$smarty.const._AD_USER_LANG_USER_NEW}>
@@ -39,28 +39,28 @@
     <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->getVar('uname') size=25 maxlength=25}>
+        <{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->getVar('name') size=30 maxlength=60}>
+        <{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->getVar('email') size=30 maxlength=60}>
+        <{xoops_input type=text name=email value=$actionForm->get('email') size=30 maxlength=60}>
         <br />
-        <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->getVar('user_viewemail')}>
+        <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}>
         <{$smarty.const._AD_USER_LANG_USER_VIEWEMAIL}>
       </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->getVar('url') size=50 maxlength=100}>
+        <{xoops_input type=text name=url value=$actionForm->get('url') size=50 maxlength=100}>
       </td>
     </tr>
     <tr>
@@ -68,7 +68,7 @@
       <td class="<{cycle values="odd,even"}>">
         <select name="timezone_offset">
         <{foreach item=timezone from=$timezones}>
-          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->getVar('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
+          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
         <{/foreach}>
         </select>
       </td>
@@ -76,82 +76,82 @@
     <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->getVar('user_icq') size=15 maxlength=15}>
+        <{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->getVar('user_aim') size=18 maxlength=18}>
+        <{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->getVar('user_yim') size=25 maxlength=25}>
+        <{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->getVar('user_msnm') size=25 maxlength=100}>
+        <{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_USER_FROM}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=user_from value=$actionForm->getVar('user_from') size=50 maxlength=100}>
+        <{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->getVar('user_occ') size=50 maxlength=100}>
+        <{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->getVar('user_intrest') size=50 maxlength=150}>
+        <{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_USER_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=user_sig value=$actionForm->getVar('user_sig')}>
+        <{xoops_dhtmltarea type=text name=user_sig value=$actionForm->get('user_sig')}>
         <br />
-        <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->getVar('attachsig')}>
+        <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}>
         <{$smarty.const._AD_USER_LANG_ATTACHSIG}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_UMODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{html_options name=umode options=$umodeOptions selected=$actionForm->getVar('umode')}>
+        <{html_options name=umode options=$umodeOptions selected=$actionForm->get('umode')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_UORDER}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{html_options name=uorder options=$uorderOptions selected=$actionForm->getVar('uorder')}>
+        <{html_options name=uorder options=$uorderOptions selected=$actionForm->get('uorder')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_NOTIFY_METHOD}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{html_options name=notify_method options=$notify_methodOptions selected=$actionForm->getVar('notify_method')}>
+        <{html_options name=notify_method options=$notify_methodOptions selected=$actionForm->get('notify_method')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_NOTIFY_MODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{html_options name=notify_mode options=$notify_modeOptions selected=$actionForm->getVar('notify_mode')}>
+        <{html_options name=notify_mode options=$notify_modeOptions selected=$actionForm->get('notify_mode')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_BIO}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text rows=5 cols=50 name=bio value=$actionForm->getVar('bio')}>
+        <{xoops_textarea type=text rows=5 cols=50 name=bio value=$actionForm->get('bio')}>
       </td>
     </tr>
     <tr>
@@ -168,21 +168,21 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_PASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=pass value=$actionForm->getVar('pass') size=25 maxlength=32}>
+        <{xoops_input type=text name=pass value=$actionForm->get('pass') size=25 maxlength=32}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_VPASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=pass2 value=$actionForm->getVar('vpass') size=25 maxlength=32}>
+        <{xoops_input type=text name=pass2 value=$actionForm->get('vpass') size=25 maxlength=32}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_USER_MAILOK}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->getVar('user_mailok')}>
+        <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}>
         <{$smarty.const._YES}>
-        <{xoops_input type=radio name=user_mailok value=0 default=$actionForm->getVar('user_mailok')}>
+        <{xoops_input type=radio name=user_mailok value=0 default=$actionForm->get('user_mailok')}>
         <{$smarty.const._NO}>
       </td>
     </tr>
@@ -190,7 +190,7 @@
       <td class="head"><{$smarty.const._AD_USER_LANG_GROUP}></td>
       <td class="<{cycle values="odd,even"}>">
         <select size="5" name="groups[]" multiple="multiple">
-          <{html_options options=$groupOptions selected=$actionForm->getVar('groups')}>
+          <{html_options options=$groupOptions selected=$actionForm->get('groups')}>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 17:40:48 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 17:40:48 +0900
Subject: [xoops-cvslog 2051] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202084048.34F402AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.2	Mon Jan 30 13:35:01 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_edit.html	Thu Feb  2 17:40:48 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENTMANAGE}></a>
-  <{if $actionForm->getVar('com_id')}>
+  <{if $actionform->get('com_id')}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
   <{else}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -9,7 +9,7 @@
 </div>
 
 <h3>
-<{if $actionForm->getVar('com_id')}>
+<{if $actionform->get('com_id')}>
   <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
 <{else}>
   <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -26,11 +26,11 @@
 
 <form action="" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=com_id value=$actionForm->getVar('com_id')}>
+  <{xoops_input type=hidden name=com_id value=$actionform->get('com_id')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-        <{if $actionForm->getVar('com_id')}>
+        <{if $actionform->get('com_id')}>
           <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
         <{else}>
           <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -40,115 +40,115 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_PID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_pid value=$actionForm->getVar('com_pid')}>
+        <{xoops_input type=text name=com_pid value=$actionform->get('com_pid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ROOTID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_rootid value=$actionForm->getVar('com_rootid')}>
+        <{xoops_input type=text name=com_rootid value=$actionform->get('com_rootid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modid value=$actionForm->getVar('com_modid')}>
+        <{xoops_input type=text name=com_modid value=$actionform->get('com_modid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ITEMID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_itemid value=$actionForm->getVar('com_itemid')}>
+        <{xoops_input type=text name=com_itemid value=$actionform->get('com_itemid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ICON}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_icon value=$actionForm->getVar('com_icon') size=15 maxlength=25}>
+        <{xoops_input type=text name=com_icon value=$actionform->get('com_icon') size=15 maxlength=25}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_CREATED}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_created value=$actionForm->getVar('com_created')}>
+        <{xoops_input type=text name=com_created value=$actionform->get('com_created')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modified value=$actionForm->getVar('com_modified')}>
+        <{xoops_input type=text name=com_modified value=$actionform->get('com_modified')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_UID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_uid value=$actionForm->getVar('com_uid')}>
+        <{xoops_input type=text name=com_uid value=$actionform->get('com_uid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_IP}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_ip value=$actionForm->getVar('com_ip') size=15 maxlength=15}>
+        <{xoops_input type=text name=com_ip value=$actionform->get('com_ip') size=15 maxlength=15}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_title value=$actionForm->getVar('com_title') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_title value=$actionform->get('com_title') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TEXT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=com_text value=$actionForm->getVar('com_text')}>
+        <{xoops_dhtmltarea type=text name=com_text value=$actionform->get('com_text')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=com_sig value=1 default=$actionForm->getVar('com_sig')}>
+        <{xoops_input type=checkbox name=com_sig value=1 default=$actionform->get('com_sig')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_STATUS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=com_status value=1 default=$actionForm->getVar('com_status')}>
+        <{xoops_input type=checkbox name=com_status value=1 default=$actionform->get('com_status')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_exparams value=$actionForm->getVar('com_exparams') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_exparams value=$actionform->get('com_exparams') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOHTML}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->getVar('dohtml')}>
+        <{xoops_input type=checkbox name=dohtml value=1 default=$actionform->get('dohtml')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOSMILEY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionForm->getVar('dosmiley')}>
+        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionform->get('dosmiley')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOXCODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doxcode value=1 default=$actionForm->getVar('doxcode')}>
+        <{xoops_input type=checkbox name=doxcode value=1 default=$actionform->get('doxcode')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOIMAGE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doimage value=1 default=$actionForm->getVar('doimage')}>
+        <{xoops_input type=checkbox name=doimage value=1 default=$actionform->get('doimage')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOBR}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dobr value=1 default=$actionForm->getVar('dobr')}>
+        <{xoops_input type=checkbox name=dobr value=1 default=$actionform->get('dobr')}>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.2	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html	Thu Feb  2 17:40:48 2006
@@ -20,21 +20,21 @@
   <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
     <td><{$mid}></td>
     <td>
-      <{if $actionForm->getVar('name',$mid) == $moduleObjects[$mid]->getProperty('name')}>
-        <{$actionForm->getVar('name',$mid)|escape}>
+      <{if $actionform->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}>
+        <{$actionform->get('name',$mid)|escape}>
       <{else}>
-         (<{$moduleObjects[$mid]->getVar('name',e)}>) &raquo; <b style="color:#ff0000;"><{$actionForm->getVar('name',$mid)|escape}></b>
+         (<{$moduleObjects[$mid]->getVar('name',e)}>) &raquo; <b style="color:#ff0000;"><{$actionform->get('name',$mid)|escape}></b>
       <{/if}>
     </td>
     <td>
-      <{if $actionForm->getVar('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}>
-        <{$actionForm->getVar('weight',$mid)|escape}>
+      <{if $actionform->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}>
+        <{$actionform->get('weight',$mid)|escape}>
       <{else}>
-         (<{$moduleObjects[$mid]->getVar('weight')}>) &raquo; <b style="color:#ff0000;"><{$actionForm->getVar('weight',$mid)|escape}></b>
+         (<{$moduleObjects[$mid]->getVar('weight')}>) &raquo; <b style="color:#ff0000;"><{$actionform->get('weight',$mid)|escape}></b>
       <{/if}>
     </td>
     <td>
-      <{if $actionForm->getVar('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}>
+      <{if $actionform->get('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}>
         <{$smarty.const._MD_A_BASE_LANG_NO_CHANGE}>
       <{else}>
         (<{if $moduleObjects[$mid]->getProperty('isactive') == 1 }>
@@ -44,7 +44,7 @@
         <{/if}>) 
         &raquo;
         <b style="color:#ff0000;">
-        <{if $actionForm->getVar('isactive',$mid) == 1}>
+        <{if $actionform->get('isactive',$mid) == 1}>
           <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
         <{else}>
           <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}>
@@ -52,9 +52,9 @@
       <{/if}>
     </td>
   </tr>
-  <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->getVar('name',$mid)|escape}>" />
-  <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->getVar('weight',$mid)|escape}>" />
-  <{if $actionForm->getVar('isactive',$mid)}>
+  <input type="hidden" name="name[<{$mid}>]" value="<{$actionform->get('name',$mid)|escape}>" />
+  <input type="hidden" name="weight[<{$mid}>]" value="<{$actionform->get('weight',$mid)|escape}>" />
+  <{if $actionform->get('isactive',$mid)}>
     <input type="hidden" name="isactive[<{$mid}>]" value="1" />
   <{else}>
     <input type="hidden" name="isactive[<{$mid}>]" value="0" />
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.4	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html	Thu Feb  2 17:40:48 2006
@@ -7,6 +7,6 @@
 
 <div><{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}></div>
 <form action="index.php?action=ActSearch" method="post">
-  <input type="text" name="keywords" <{if $actionForm}>value="<{$actionForm->getVar('keywords')|escape}>"<{/if}> />
+  <input type="text" name="keywords" <{if $actionForm}>value="<{$actionform->get('keywords')|escape}>"<{/if}> />
   <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
 </form>
Index: xoops2jp/html/modules/base/admin/templates/smiles_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.2	Mon Jan 30 12:36:49 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_edit.html	Thu Feb  2 17:40:48 2006
@@ -1,14 +1,14 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=SmilesList"><{$smarty.const._MI_BASE_MENU_SMILES_MANAGE}></a>
-  <{if $actionForm->getVar('id')}>
+  <{if $actionform->get('id')}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_SMILES_EDIT}>
   <{else}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_SMILES_NEW}>
   <{/if}>
 </div>
 
-<{if $actionForm->getVar('id')}>
+<{if $actionform->get('id')}>
   <h3><{$smarty.const._AD_BASE_LANG_SMILES_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_BASE_LANG_SMILES_NEW}></h3>
@@ -24,27 +24,27 @@
 
 <form action="index.php?action=SmilesEdit" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=id value=$actionForm->getVar('id')}>
+  <{xoops_input type=hidden name=id value=$actionform->get('id')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-        <{if $actionForm->getVar('id')}>
+        <{if $actionform->get('id')}>
           <{$smarty.const._AD_BASE_LANG_SMILES_EDIT}>
         <{else}>
           <{$smarty.const._AD_BASE_LANG_SMILES_NEW}>
         <{/if}>
       </th>
     </tr>
-    <{if $actionForm->getVar('id')}>
+    <{if $actionform->get('id')}>
       <tr>
         <td class="head"><{$smarty.const._AD_BASE_LANG_ID}></td>
-        <td class="<{cycle values="odd,even"}>"><b><{$actionForm->getVar('id')}></b></td>
+        <td class="<{cycle values="odd,even"}>"><b><{$actionform->get('id')}></b></td>
       </tr>
     <{/if}>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_CODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=code value=$actionForm->getVar('code') size=15 maxlength=50}>
+        <{xoops_input type=text name=code value=$actionform->get('code') size=15 maxlength=50}>
       </td>
     </tr>
     <tr>
@@ -56,14 +56,14 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_EMOTION}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=emotion value=$actionForm->getVar('emotion') size=30 maxlength=75}>
+        <{xoops_input type=text name=emotion value=$actionform->get('emotion') size=30 maxlength=75}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DISPLAY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=display value=1 default=$actionForm->getVar('display')}><{$smarty.const._YES}>
-        <{xoops_input type=radio name=display value=0 default=$actionForm->getVar('display')}><{$smarty.const._NO}>
+        <{xoops_input type=radio name=display value=1 default=$actionform->get('display')}><{$smarty.const._YES}>
+        <{xoops_input type=radio name=display value=0 default=$actionform->get('display')}><{$smarty.const._NO}>
       </td>
     </tr>
     <tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 17:40:48 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 17:40:48 +0900
Subject: [xoops-cvslog 2052] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060202084048.5B27D2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_search_form.html
diff -u xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.1	Mon Dec 26 20:23:37 2005
+++ xoops2jp/html/modules/base/templates/legacy_search_form.html	Thu Feb  2 17:40:48 2006
@@ -3,16 +3,16 @@
 		<tr>
 			<td class="head"><{$smarty.const._SR_KEYWORDS}></td>
 			<td class="<{cycle values="odd,even"}>">
-				<{xoops_input type=text name=query size=30 maxlength=255 value=$actionForm->getVar('query')}>
+				<{xoops_input type=text name=query size=30 maxlength=255 value=$actionform->get('query')}>
 			</td>
 		</tr>
 		<tr>
 			<td class="head"><{$smarty.const._SR_TYPE}></td>
 			<td class="<{cycle values="odd,even"}>">
 				<select name="andor">
-					<option value="0" <{if $actionForm->getVar('andor')==0}>selected<{/if}>><{$smarty.const._SR_ALL}></option>
-					<option value="1" <{if $actionForm->getVar('andor')==1}>selected<{/if}>><{$smarty.const._SR_ANY}></option>
-					<option value="2" <{if $actionForm->getVar('andor')==2}>selected<{/if}>><{$smarty.const._SR_EXACT}></option>
+					<option value="0" <{if $actionform->get('andor')==0}>selected<{/if}>><{$smarty.const._SR_ALL}></option>
+					<option value="1" <{if $actionform->get('andor')==1}>selected<{/if}>><{$smarty.const._SR_ANY}></option>
+					<option value="2" <{if $actionform->get('andor')==2}>selected<{/if}>><{$smarty.const._SR_EXACT}></option>
 				</select>
 			</td>
 		</tr>
@@ -20,7 +20,7 @@
 			<td class="head"><{$smarty.const._SR_SEARCHIN}></td>
 			<td class="<{cycle values="odd,even"}>">
 				<{foreach item=module from=$moduleList}>
-					<input type="checkbox" name="mids[]" value="<{$module->getVar('mid')}>" <{if in_array($module->getVar('mid'),$actionForm->getVar('mids'))}>checked<{/if}>><{$module->getVar('name')|escape}></a>
+					<input type="checkbox" name="mids[]" value="<{$module->getVar('mid')}>" <{if in_array($module->getVar('mid'),$actionform->get('mids'))}>checked<{/if}>><{$module->getVar('name')|escape}></a>
 				<{/foreach}>
 			</td>
 		</tr>
Index: xoops2jp/html/modules/base/templates/legacy_comment_edit.html
diff -u xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.1	Tue Jan 24 20:23:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment_edit.html	Thu Feb  2 17:40:48 2006
@@ -37,39 +37,39 @@
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_COM_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_title value=$actionForm->getVar('com_title') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_title value=$actionform->get('com_title') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_COM_TEXT}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=com_text value=$actionForm->getVar('com_text')}>
+        <{xoops_dhtmltarea type=text name=com_text value=$actionform->get('com_text')}>
       </td>
     </tr>
     <{if $xoops_isadmin}>
       <tr>
         <th><{$smarty.const._MD_BASE_LANG_DOHTML}></th>
         <td class="<{cycle values="odd,even"}>">
-          <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->getVar('dohtml')}>
+          <{xoops_input type=checkbox name=dohtml value=1 default=$actionform->get('dohtml')}>
         </td>
       </tr>
     <{/if}>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOSMILEY}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionForm->getVar('dosmiley')}>
+        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionform->get('dosmiley')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOXCODE}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doxcode value=1 default=$actionForm->getVar('doxcode')}>
+        <{xoops_input type=checkbox name=doxcode value=1 default=$actionform->get('doxcode')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOBR}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dobr value=1 default=$actionForm->getVar('dobr')}>
+        <{xoops_input type=checkbox name=dobr value=1 default=$actionform->get('dobr')}>
       </td>
     </tr>
     <tr class="foot">

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 17:40:48 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 17:40:48 +0900
Subject: [xoops-cvslog 2053] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060202084048.821402AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.5	Tue Jan 31 18:08:25 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html	Thu Feb  2 17:40:48 2006
@@ -30,7 +30,7 @@
 
 <form action="" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tpl_id value=$actionForm->getVar('tpl_id')}>
+  <{xoops_input type=hidden name=tpl_id value=$actionform->get('tpl_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_FILE_EDIT}></th>
@@ -49,7 +49,7 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
-      <td class="<{cycle values="odd,even"}>"><{$actionForm->getVar('tpl_desc')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$actionform->get('tpl_desc')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}></td>
@@ -67,7 +67,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-        <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$actionForm->getVar('tpl_source')|escape}></textarea>
+        <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$actionform->get('tpl_source')|escape}></textarea>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.4	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html	Thu Feb  2 17:40:48 2006
@@ -16,7 +16,7 @@
 
 <form action="./index.php?action=TplsetEdit" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tplset_id value=$actionForm->getVar('tplset_id')}>
+  <{xoops_input type=hidden name=tplset_id value=$actionform->get('tplset_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}></th>
@@ -28,13 +28,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=tplset_desc value=$actionForm->getVar('tplset_desc') size=50 maxlength=255}>
+        <{xoops_input type=text name=tplset_desc value=$actionform->get('tplset_desc') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$actionForm->getVar('tplset_credits')}>
+        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$actionform->get('tplset_credits')}>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.5	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html	Thu Feb  2 17:40:48 2006
@@ -16,7 +16,7 @@
 
 <form action="./index.php?action=TplsetClone" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tplset_id value=$actionForm->getVar('tplset_id')}>
+  <{xoops_input type=hidden name=tplset_id value=$actionform->get('tplset_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_CLONE}></th>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:45:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:45:18 +0900
Subject: [xoops-cvslog 2054] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202084518.20F9E2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/MailjobFilterForm.class.php
diff -u xoops2jp/html/modules/user/forms/MailjobFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/MailjobFilterForm.class.php:removed
--- xoops2jp/html/modules/user/forms/MailjobFilterForm.class.php:1.1.2.1	Thu Jan 12 20:26:05 2006
+++ xoops2jp/html/modules/user/forms/MailjobFilterForm.class.php	Thu Feb  2 17:45:18 2006
@@ -1,127 +0,0 @@
-<?php
-
-define('USER_SORT_KEY_DEFAULT', 0);
-define('USER_SORT_KEY_ID', 1);
-define('USER_SORT_KEY_LASTLOGIN', 2);
-define('USER_SORT_KEY_LASTLOGIN_FLAG', 3);
-define('USER_SORT_KEY_MAILOK', 4);
-define('USER_SORT_KEY_ACTIVEUSER', 5);
-define('USER_SORT_KEY_REGISTDATE', 6);
-define('USER_SORT_KEY_REGISTDATE_FLAG', 7);
-define('USER_SORT_KEY_SENDER', 8);
-define('USER_SORT_KEY_EMAIL', 9);
-define('USER_SORT_KEY_SUBJECT', 10);
-define('USER_SORT_KEY_BODY', 11);
-define('USER_SORT_KEY_BY_PM', 12);
-define('USER_SORT_KEY_BY_EMAIL', 13);
-define('USER_SORT_KEY_MAXVALUE', 13);
-
-class User_MailjobFilterForm
-{
-	var $mSort = 0;
-	var $_mSortKeys = array(
-		USER_SORT_KEY_DEFAULT => 'id',
-		USER_SORT_KEY_ID => 'id',
-		USER_SORT_KEY_LASTLOGIN => 'lastlogin',
-		USER_SORT_KEY_LASTLOGIN_FLAG => 'lastlogin_flag',
-		USER_SORT_KEY_MAILOK => 'mailok',
-		USER_SORT_KEY_ACTIVEUSER => 'activeuser',
-		USER_SORT_KEY_REGISTDATE => 'registdate',
-		USER_SORT_KEY_REGISTDATE_FLAG => 'registdate_flag',
-		USER_SORT_KEY_SENDER => 'sender',
-		USER_SORT_KEY_EMAIL => 'email',
-		USER_SORT_KEY_SUBJECT => 'subject',
-		USER_SORT_KEY_BODY => 'body',
-		USER_SORT_KEY_BY_PM => 'by_pm',
-		USER_SORT_KEY_BY_EMAIL => 'by_email'
-	);
-	var $_mCriteria = null;
-
-	function User_MailjobFilterForm()
-	{
-		$this->_mCriteria =& new CriteriaCompo();
-	}
-
-	function fetch()
-	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-	
-		if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
-			$this->mSort = USER_SORT_KEY_DEFAULT;
-		}
-	
-		if (isset($_REQUEST['id'])) {
-			$this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id'))));
-		}
-	
-		if (isset($_REQUEST['lastlogin'])) {
-			$this->_mCriteria->add(new Criteria('lastlogin', array(XOBJ_DTYPE_INT, xoops_getrequest('lastlogin'))));
-		}
-	
-		if (isset($_REQUEST['lastlogin_flag'])) {
-			$this->_mCriteria->add(new Criteria('lastlogin_flag', array(XOBJ_DTYPE_BOOL, xoops_getrequest('lastlogin_flag'))));
-		}
-	
-		if (isset($_REQUEST['mailok'])) {
-			$this->_mCriteria->add(new Criteria('mailok', array(XOBJ_DTYPE_BOOL, xoops_getrequest('mailok'))));
-		}
-	
-		if (isset($_REQUEST['activeuser'])) {
-			$this->_mCriteria->add(new Criteria('activeuser', array(XOBJ_DTYPE_BOOL, xoops_getrequest('activeuser'))));
-		}
-	
-		if (isset($_REQUEST['registdate'])) {
-			$this->_mCriteria->add(new Criteria('registdate', array(XOBJ_DTYPE_INT, xoops_getrequest('registdate'))));
-		}
-	
-		if (isset($_REQUEST['registdate_flag'])) {
-			$this->_mCriteria->add(new Criteria('registdate_flag', array(XOBJ_DTYPE_BOOL, xoops_getrequest('registdate_flag'))));
-		}
-	
-		if (isset($_REQUEST['sender'])) {
-			$this->_mCriteria->add(new Criteria('sender', array(XOBJ_DTYPE_STRING, xoops_getrequest('sender'))));
-		}
-	
-		if (isset($_REQUEST['email'])) {
-			$this->_mCriteria->add(new Criteria('email', array(XOBJ_DTYPE_STRING, xoops_getrequest('email'))));
-		}
-	
-		if (isset($_REQUEST['subject'])) {
-			$this->_mCriteria->add(new Criteria('subject', array(XOBJ_DTYPE_STRING, xoops_getrequest('subject'))));
-		}
-	
-		if (isset($_REQUEST['by_pm'])) {
-			$this->_mCriteria->add(new Criteria('by_pm', array(XOBJ_DTYPE_BOOL, xoops_getrequest('by_pm'))));
-		}
-	
-		if (isset($_REQUEST['by_email'])) {
-			$this->_mCriteria->add(new Criteria('by_email', array(XOBJ_DTYPE_BOOL, xoops_getrequest('by_email'))));
-		}
-	}
-
-	function getSort()
-	{
-		$sortkey = abs($this->mSort);
-		return $this->_mSortKeys[$sortkey];
-	}
-
-	function getOrder()
-	{
-		return ($this->mSort < 0) ? "DESC" : "ASC";
-	}
-
-	function getCriteria($start = 0, $limit = 0)
-	{
-		$criteria = $this->_mCriteria;
-	
-		$criteria->setStart($start);
-		$criteria->setLimit($limit);
-	
-		$criteria->setSort($this->getSort());
-		$criteria->setOrder($this->getOrder());
-	
-		return $criteria;
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:45:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:45:28 +0900
Subject: [xoops-cvslog 2055] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202084528.E8DE52AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/PageNavigator.class.php
diff -u xoops2jp/html/modules/user/forms/PageNavigator.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/PageNavigator.class.php:removed
--- xoops2jp/html/modules/user/forms/PageNavigator.class.php:1.1.2.1	Thu Jan 26 20:14:04 2006
+++ xoops2jp/html/modules/user/forms/PageNavigator.class.php	Thu Feb  2 17:45:28 2006
@@ -1,35 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH . "/class/XCube_PageNavigator.class.php";
-
-class User_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;
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:45:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:45:35 +0900
Subject: [xoops-cvslog 2056] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202084535.8FF622AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/LostpassForm.class.php
diff -u xoops2jp/html/modules/user/forms/LostpassForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/LostpassForm.class.php:removed
--- xoops2jp/html/modules/user/forms/LostpassForm.class.php:1.1.2.2	Wed Jan 18 02:24:51 2006
+++ xoops2jp/html/modules/user/forms/LostpassForm.class.php	Thu Feb  2 17:45:35 2006
@@ -1,79 +0,0 @@
-<?php
-// $Id: LostpassForm.class.php,v 1.1.2.2 2006/01/17 17:24:51 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-require_once XOOPS_MODULE_PATH."/user/forms/UserSimpleActionForm.class.php";
-
-/**
-This class is ported from bxBase.
-I must change this to Dynamic ActionForm.
-*/
-class LostpassForm extends UserModActionForm
-{
-	var $mEmailAddress=null;
-
-	function startup(&$master)
-	{
-		if($_SERVER['REQUEST_METHOD']=="POST") {
-			$this->fetch($master);
-			$this->validate($master);
-			return $this->hasError() ? UCONTROLLER_ACTIONFORM_ERROR : UCONTROLLER_ACTIONFORM_SUCCESS;
-		}
-		else {
-			$this->load($master);
-			return UCONTROLLER_ACTIONFORM_INIT;
-		}
-	}
-
-	function fetch(&$master)
-	{
-		$this->mEmailAddress=isset($_REQUEST['email']) ? trim($_REQUEST['email']) : null;
-	}
-
-	function validate (&$master)
-	{
-		if(!$this->mEmailAddress) {
-			$this->addErrorMessage("Email not input");
-		}
-		else {
-			$myts =& MyTextSanitizer::getInstance();
-			$memberHandler =& xoops_gethandler('member');
-			$user=&$memberHandler->getUsersByEmail($this->mEmailAddress);
-			if(!$user)
-				$this->addErrorMessage("Can't fetch user");
-		}
-	}
-	
-	function load(&$master)
-	{
-	}
-	
-	function hasError()
-	{
-		return count($this->errors_) ? true : false;
-	}
-}
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:45:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:45:41 +0900
Subject: [xoops-cvslog 2057] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202084541.186432AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/UserSimpleActionForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserSimpleActionForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/UserSimpleActionForm.class.php:removed
--- xoops2jp/html/modules/user/forms/UserSimpleActionForm.class.php:1.1.2.2	Wed Oct 26 01:46:18 2005
+++ xoops2jp/html/modules/user/forms/UserSimpleActionForm.class.php	Thu Feb  2 17:45:41 2006
@@ -1,70 +0,0 @@
-<?php
-// $Id: UserSimpleActionForm.class.php,v 1.1.2.2 2005/10/25 16:46:18 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-define("UCONTROLLER_ACTIONFORM_INIT",0);
-define("UCONTROLLER_ACTIONFORM_SUCCESS",1);
-define("UCONTROLLER_ACTIONFORM_ERROR",2);
-
-class UserModActionForm
-{
-	var $mErrorMessages = array();
-	
-	function setup(&$master)
-	{
-		if($_SERVER['REQUEST_METHOD']=="POST") {
-			$this->fetch($master);
-			$this->validate($master);
-		}
-		else {
-			$this->load($master);
-		}
-	}
-	
-	function load(&$master)
-	{
-	}
-	
-	function update(&$master)
-	{
-	}
-	
-	function addErrorMessage($message)
-	{
-		$this->mErrorMessages[]=$message;
-	}
-	
-	function getStatus()
-	{
-		if($_SERVER['REQUEST_METHOD']=="POST")
-			return count($this->mErrorMessages) ? UCONTROLLER_ACTION_ERROR : UCONTROLLER_ACTION_SUCCESS;
-		else
-			return UCONTROLLER_ACTION_INIT;
-	}
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:49:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:49:51 +0900
Subject: [xoops-cvslog 2058] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202084951.B7F172AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.1	Wed Jan 18 02:26:01 2006
+++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php	Thu Feb  2 17:49:51 2006
@@ -77,8 +77,8 @@
 		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
 			if($this->getVar('pass')!=$this->getVar('vpass')) {
 				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
-				$this->setVar('pass',null);	// reset
-				$this->setVar('vpass',null);
+				$this->set('pass',null);	// reset
+				$this->set('vpass',null);
 			}
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:50:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:50:01 +0900
Subject: [xoops-cvslog 2059] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202085001.5F58F2AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AvatarEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.1	Thu Jan 26 20:13:26 2006
+++ xoops2jp/html/modules/user/forms/AvatarEditForm.class.php	Thu Feb  2 17:50:01 2006
@@ -55,13 +55,13 @@
 	
 	function load(&$obj)
 	{
-		$this->setVar('uid', $obj->get('uid'));
+		$this->set('uid', $obj->get('uid'));
 		$this->mOldAvatarFilename = $obj->get('user_avatar');
 	}
 
 	function update(&$obj)
 	{
-		$obj->setVar('uid', $this->get('uid'));
+		$obj->set('uid', $this->get('uid'));
 		
 		$this->mFormFile = $this->get('uploadavatar');
 
@@ -70,7 +70,7 @@
 		$filename = $this->mFormFile->getFileName();
 		$this->mFormFile->setBodyName(substr($filename, 0, 25));
 		
-		$obj->setVar('user_avatar', $this->mFormFile->getFileName());	//< TODO
+		$obj->set('user_avatar', $this->mFormFile->getFileName());	//< TODO
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:50:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:50:12 +0900
Subject: [xoops-cvslog 2060] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202085012.E0DE02AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php
diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.7 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.8
--- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.7	Sat Jan 28 03:07:44 2006
+++ xoops2jp/html/modules/user/forms/EditUserForm.class.php	Thu Feb  2 17:50:12 2006
@@ -96,8 +96,8 @@
 		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
 			if($this->getVar('pass')!=$this->getVar('vpass')) {
 				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
-				$this->setVar('pass',null);	// reset
-				$this->setVar('vpass',null);
+				$this->set('pass',null);	// reset
+				$this->set('vpass',null);
 			}
 	}
 	
@@ -106,34 +106,34 @@
 		//Corner-cutting
 		$vars=$user->getProperties();
 		foreach($vars as $key=>$val) {
-			$this->setVar($key,$val);
+			$this->set($key,$val);
 		}
 
-		$this->setVar('pass',null);
-		$this->setVar('vpass',null);
+		$this->set('pass',null);
+		$this->set('vpass',null);
 	}
 	
 	function update(&$user)
 	{
-		$user->setVar('name',$this->getVar('name'));
-		$user->setVar('email',$this->getVar('email'));
-		$user->setVar('user_viewemail',$this->getVar('user_viewemail'));
-		$user->setVar('url',$this->getVar('url'));
-		$user->setVar('user_icq',$this->getVar('user_icq'));
-		$user->setVar('user_aim',$this->getVar('user_aim'));
-		$user->setVar('user_yim',$this->getVar('user_yim'));
-		$user->setVar('user_msnm',$this->getVar('user_msnm'));
-		$user->setVar('user_from',$this->getVar('user_from'));
-		$user->setVar('user_occ',$this->getVar('user_occ'));
-		$user->setVar('user_intrest',$this->getVar('user_intrest'));
-		$user->setVar('user_sig',$this->getVar('user_sig'));
-		$user->setVar('attachsig',$this->getVar('attachsig'));
-		$user->setVar('user_sig',$this->getVar('user_sig'));
-		$user->setVar('bio',$this->getVar('bio'));
-		$user->setVar('user_mailok',$this->getVar('user_mailok'));
+		$user->set('name',$this->getVar('name'));
+		$user->set('email',$this->getVar('email'));
+		$user->set('user_viewemail',$this->getVar('user_viewemail'));
+		$user->set('url',$this->getVar('url'));
+		$user->set('user_icq',$this->getVar('user_icq'));
+		$user->set('user_aim',$this->getVar('user_aim'));
+		$user->set('user_yim',$this->getVar('user_yim'));
+		$user->set('user_msnm',$this->getVar('user_msnm'));
+		$user->set('user_from',$this->getVar('user_from'));
+		$user->set('user_occ',$this->getVar('user_occ'));
+		$user->set('user_intrest',$this->getVar('user_intrest'));
+		$user->set('user_sig',$this->getVar('user_sig'));
+		$user->set('attachsig',$this->getVar('attachsig'));
+		$user->set('user_sig',$this->getVar('user_sig'));
+		$user->set('bio',$this->getVar('bio'));
+		$user->set('user_mailok',$this->getVar('user_mailok'));
 		
 		if($this->getVar('pass'))
-			$user->setVar('pass',$this->getVar('pass'));
+			$user->set('pass',$this->getVar('pass'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:50:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:50:32 +0900
Subject: [xoops-cvslog 2061] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202085032.482D22AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:1.1.2.7
--- xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:1.1.2.6	Wed Nov 16 19:13:38 2005
+++ xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php	Thu Feb  2 17:50:32 2006
@@ -8,6 +8,11 @@
 {
 	var $mConfig;
 
+	function getTokenName()
+	{
+		return "module.user.RegisterUserEditForm.TOKEN";
+	}
+
 	function RegisterUserEditForm()
 	{
 	}
@@ -71,8 +76,8 @@
 		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
 			if($this->getVar('pass')!=$this->getVar('vpass')) {
 				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
-				$this->setVar('pass',null);	// reset
-				$this->setVar('vpass',null);
+				$this->set('pass',null);	// reset
+				$this->set('vpass',null);
 			}
 	}
 
@@ -151,18 +156,18 @@
 
 	function update(&$user)
 	{
-		$user->setVar('uname',$this->getVar('uname'),true);
-		$user->setVar('email',$this->getVar('email'),true);
-		$user->setVar('user_viewemail',$this->getVar('user_viewemail'),true);
-		$user->setVar('url',$this->getVar('url'),true);
-		$user->setVar('user_avatar','blank.gif',true);
-        $user->setVar('pass', md5($this->getVar('pass')), true);
-        // $user->setVar('timezone_offset',$this->getVar('timezone_offset'),true);
-        $user->setVar('user_mailok',$this->getVar('user_mailok'),true);
+		$user->set('uname',$this->getVar('uname'),true);
+		$user->set('email',$this->getVar('email'),true);
+		$user->set('user_viewemail',$this->getVar('user_viewemail'),true);
+		$user->set('url',$this->getVar('url'),true);
+		$user->set('user_avatar','blank.gif',true);
+        $user->set('pass', md5($this->getVar('pass')), true);
+        // $user->set('timezone_offset',$this->getVar('timezone_offset'),true);
+        $user->set('user_mailok',$this->getVar('user_mailok'),true);
 
 		$actkey=substr(md5(uniqid(mt_rand(),1)),0,8);
-        $user->setVar('actkey',$actkey,true);
-        $user->setVar('user_regdate',time(),true);
+        $user->set('actkey',$actkey,true);
+        $user->set('user_regdate',time(),true);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:50:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:50:42 +0900
Subject: [xoops-cvslog 2062] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202085042.3B9C92AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/UserConfirmForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.1	Wed Nov  9 20:50:09 2005
+++ xoops2jp/html/modules/user/forms/UserConfirmForm.class.php	Thu Feb  2 17:50:42 2006
@@ -8,6 +8,11 @@
  */
 class UserConfirmForm extends XCube_ActionForm 
 {
+	function getTokenName()
+	{
+		return "module.user.UserConfirmForm.TOKEN";
+	}
+
 	function prepare()
 	{
 	}

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:50:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:50:53 +0900
Subject: [xoops-cvslog 2063] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060202085053.1A8E52AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.1	Wed Jan 18 02:26:01 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php	Thu Feb  2 17:50:52 2006
@@ -67,15 +67,15 @@
 
 	function update(&$obj)
 	{
-		$obj->setVar('uname', $this->get('uname'));
-		$obj->setVar('email', $this->get('email'));
-		$obj->setVar('user_viewemail', $this->get('user_viewemail'));
-		$obj->setVar('url', $this->get('url'));
-		$obj->setVar('timezone_offset', $this->get('timezone_offset'));
-		$obj->setVar('pass', $this->get('pass'));
-		$obj->setVar('vpass', $this->get('vpass'));
-		$obj->setVar('user_mailok', $this->get('user_mailok'));
-		$obj->setVar('agree', $this->get('agree'));
+		$obj->set('uname', $this->get('uname'));
+		$obj->set('email', $this->get('email'));
+		$obj->set('user_viewemail', $this->get('user_viewemail'));
+		$obj->set('url', $this->get('url'));
+		$obj->set('timezone_offset', $this->get('timezone_offset'));
+		$obj->set('pass', $this->get('pass'));
+		$obj->set('vpass', $this->get('vpass'));
+		$obj->set('user_mailok', $this->get('user_mailok'));
+		$obj->set('agree', $this->get('agree'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:51:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:51:06 +0900
Subject: [xoops-cvslog 2064] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060202085106.BF5F42AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.3
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.2	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Thu Feb  2 17:51:06 2006
@@ -14,7 +14,7 @@
 
 <form action="?action=AvatarUpload" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=uid value=$actionForm->getVar('uid')}>
+  <{xoops_input type=hidden name=uid value=$actionForm->get('uid')}>
   <table class="outer">
     <tr>
       <th colspan="2" style="text-align:center;"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></th>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 17:51:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 17:51:21 +0900
Subject: [xoops-cvslog 2065] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060202085121.D9A152AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.5 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.6
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.5	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Thu Feb  2 17:51:21 2006
@@ -25,91 +25,91 @@
   <tr>
     <td class="head"><{$smarty.const._US_REALNAME}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=name size=30 maxlength=60 value=$actionForm->getVar('name')}>
+      <{xoops_input name=name size=30 maxlength=60 value=$actionForm->get('name')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EMAIL}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->getVar('email')}><br />
-      <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->getVar('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}>
+      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
+      <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->get('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_WEBSITE}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->getVar('url')}>
+      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
     </td>
   </tr>
   <!--- // TODO TIMEZONE --->
   <tr>
     <td class="head"><{$smarty.const._US_ICQ}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->getVar('user_icq')}>
+      <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->get('user_icq')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_AIM}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->getVar('user_aim')}>
+      <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->get('user_aim')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_YIM}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->getVar('user_yim')}>
+      <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->get('user_yim')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_MSNM}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->getVar('user_msnm')}>
+      <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->get('user_msnm')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_LOCATION}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->getVar('user_from')}>
+      <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->get('user_from')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_OCCUPATION}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->getVar('user_occ')}>
+      <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->get('user_occ')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_INTEREST}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->getVar('user_intrest')}>
+      <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->get('user_intrest')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_SIGNATURE}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_dhtmltarea name=user_sig value=$actionForm->getVar('user_sig')}><br />
-      <input type="checkbox" name="attachsig" value="1"<{if $actionForm->getVar('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}>
+      <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}><br />
+      <input type="checkbox" name="attachsig" value="1"<{if $actionForm->get('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_textarea name=bio value=$actionForm->getVar('bio') rows=5 cols=50 id=bio}>
+      <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50 id=bio}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_PASSWORD}><br />
     <{$smarty.const._US_TYPEPASSTWICE}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->getVar('pass')}>
-      <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->getVar('vpass')}>
+      <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->get('pass')}>
+      <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->get('vpass')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_MAILOK}></td>
     <td class="<{cycle values="odd,even"}>">
-      <input type="radio" name="user_mailok" value="1"<{if $actionForm->getVar('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}>
-      <input type="radio" name="user_mailok" value="0"<{if $actionForm->getVar('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}>
+      <input type="radio" name="user_mailok" value="1"<{if $actionForm->get('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}>
+      <input type="radio" name="user_mailok" value="0"<{if $actionForm->get('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}>
     </td>
   </tr>
   <tr>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:05:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:05:07 +0900
Subject: [xoops-cvslog 2066] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060202090507.422AE2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/pmlite.html
diff -u xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.4 xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.5
--- xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.4	Wed Dec 28 23:34:50 2005
+++ xoops2jp/html/modules/pm/templates/pmlite.html	Thu Feb  2 18:05:07 2006
@@ -6,6 +6,7 @@
   </ul>
 <{/if}>
 <form action="pmlite.php" method="post" name="coolsus">
+  <{xoops_token form=$actionForm}>
   <table width="300" align="center" class="outer">
     <tr>
       <td class="head" width="25%"><{$smarty.const._PM_TO}></td>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:06:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:06:35 +0900
Subject: [xoops-cvslog 2067] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060202090635.CE47A2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.6 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.7
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.6	Wed Dec 28 23:34:50 2005
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Thu Feb  2 18:06:35 2006
@@ -1,7 +1,7 @@
 <h4 style='text-align:center;'><{$xoops_pagetitle}></h4>
 <br />
 
-<a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$currentUser->getVar("uid")}>"><{$smarty.const._PM_PROFILE}></a>&nbsp;
+<a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$currentUser->get("uid")}>"><{$smarty.const._PM_PROFILE}></a>&nbsp;
 <span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._PM_INBOX}><br /><br />
 
 <table border="0" cellspacing="1" cellpadding="4" width="100%" class="outer">
@@ -28,7 +28,7 @@
   <{foreach name=viewpm item=pm from=$pmObjects}>
     <tr style="text-align:left;" class="<{cycle values="odd,even"}>">
       <td valign="top" width="2%" style="text-align:center;">
-        <input type="checkbox" id="msg_id[]" name="msg_id[]" value="<{$pm->getVar("msg_id")}>" />
+        <input type="checkbox" id="msg_id[]" name="msg_id[]" value="<{$pm->get("msg_id")}>" />
       </td>
       <td valign="top" width="5%" style="text-align:center;">
         <{if $pm->isRead()}>
@@ -38,17 +38,17 @@
         <{/if}>
       </td>
       <td valign="top" width="5%" style="text-align:center;">
-        <img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$pm->getVar('msg_image', 'E')}>" alt='' />
+        <img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$pm->get('msg_image')|escape}>" alt='' />
       </td>
       <td valign="middle" width="10%">
-        <{$pm->getVar("from_userid")|xoops_user:"uname"}>
+        <{$pm->get("from_userid")|xoops_user:"uname"}>
       </td>
       <td valign="middle">
-        <a href="./index.php?action=read&amp;msg_id=<{$pm->getVar('msg_id')}>"><{$pm->getVar("subject")}></a>
+        <a href="./index.php?action=read&amp;msg_id=<{$pm->get('msg_id')}>"><{$pm->getVar("subject")}></a>
       </td>
       </td>
       <td valign="middle">
-        <{$pm->getVar("msg_time")|xoops_formattimestamp}>
+        <{$pm->get("msg_time")|xoops_formattimestamp}>
       </td>
     </tr>
   <{/foreach}>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:06:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:06:47 +0900
Subject: [xoops-cvslog 2068] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060202090647.C590F2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php
diff -u xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.4 xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.5
--- xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.4	Wed Nov 16 19:12:25 2005
+++ xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php	Thu Feb  2 18:06:47 2006
@@ -4,6 +4,9 @@
 
 /**
  * This class is generated by makeActionForm tool.
+ * 
+ * This class was generated in the old days. We should to check it.
+ * 
  * @auchor makeActionForm
  * @abstract
  */
@@ -11,6 +14,11 @@
 {
 	var $mState=null;
 	
+	function getTokenName()
+	{
+		return "module.user.PmliteEditForm.TOKEN";
+	}
+
 	function prepare()
 	{
 		$this->mFormProperties['subject']=new XCube_StringProperty('subject');
@@ -64,12 +72,12 @@
 	 */
 	function validateTo_userid()
 	{
-		if($this->getVar('to_userid')) {
+		if($this->get('to_userid')) {
 			$userHandler=&xoops_gethandler('user');
-			$user=&$userHandler->get($this->getVar('to_userid'));
+			$user=&$userHandler->get($this->get('to_userid'));
 
 			if(!(is_object($user)&&$user->isActive())) {
-				$this->setVar('to_userid',0);
+				$this->set('to_userid',0);
 				$this->addErrorMessage(_PM_USERNOEXIST);
 			}
 		}
@@ -81,20 +89,20 @@
 	function update(&$pm)
 	{
 		$userHandler=&xoops_gethandler('user');
-		$toUser=&$userHandler->get($this->getVar('to_userid'));
+		$toUser=&$userHandler->get($this->get('to_userid'));
 		$pm->setToUsers($toUser);
-		$pm->setSubject($this->getVar("subject"));
-		$pm->setMessage($this->getVar("message"));
+		$pm->setSubject($this->get("subject"));
+		$pm->setMessage($this->get("message"));
 	}
 
 	function setToUser(&$user)
 	{
-		$this->setVar('to_userid',$user->getVar('uid'));
+		$this->set('to_userid',$user->get('uid'));
 	}
 	
 	function resetToUser()
 	{
-		$this->setVar('to_userid',0);
+		$this->set('to_userid',0);
 	}
 }
 
@@ -113,9 +121,9 @@
 	 */
 	function validateTo_uname()
 	{
-		if($this->getVar('to_uname')) {
+		if($this->get('to_uname')) {
 			$userHandler=&xoops_gethandler('user');
-			$criteria=new Criteria("uname",$this->getVar("to_uname"));
+			$criteria=new Criteria("uname",$this->get("to_uname"));
 			$users=&$userHandler->getObjects($criteria);
 
 			if(!(count($users)>0 && is_object($users[0]) && $users[0]->isActive())) {
@@ -132,18 +140,18 @@
 	function update(&$pm)
 	{
 		$pm->setToUsers($this->mToUser);
-		$pm->setSubject($this->getVar("subject"));
-		$pm->setMessage($this->getVar("message"));
+		$pm->setSubject($this->get("subject"));
+		$pm->setMessage($this->get("message"));
 	}
 
 	function setToUser(&$user)
 	{
-		$this->setVar('to_uname',$user->getVar('uname'));
+		$this->set('to_uname',$user->get('uname'));
 	}
 
 	function resetToUser()
 	{
-		$this->setVar('to_uname',"");
+		$this->set('to_uname',"");
 	}
 }
 
@@ -165,26 +173,26 @@
 	 */
 	function fetch(&$form)
 	{
-		if($form->getVar('msg_id')) {
+		if($form->get('msg_id')) {
 			$pmHandler=&xoops_gethandler('privmessage');
-			$pm=&$pmHandler->get($form->getVar('msg_id'));
+			$pm=&$pmHandler->get($form->get('msg_id'));
 			if(is_object($pm)) {
 				$root=XCube_Root::getSingleton();
 				$currentUser=&$root->mController->getXoopsUser();
-				if($pm->getVar('to_userid')==$currentUser->getVar('uid')) {
-					if(!preg_match("/^Re:/",$pm->getVar('subject')))
-						$form->setVar('subject',"Re: ".$pm->getVar('subject'));
+				if($pm->get('to_userid')==$currentUser->get('uid')) {
+					if(!preg_match("/^Re:/",$pm->get('subject')))
+						$form->set('subject',"Re: ".$pm->get('subject'));
 
 					// TODO Use Active Check
 					$userHandler=&xoops_gethandler('user');
-					$user=&$userHandler->get($pm->getVar('from_userid'));
+					$user=&$userHandler->get($pm->get('from_userid'));
 
 					$form->setToUser($user);
 					$message="[quote]\n";
-					$message.=sprintf(_PM_USERWROTE,$user->getVar('uname')) . "\n";
+					$message.=sprintf(_PM_USERWROTE,$user->get('uname')) . "\n";
 					$message.=$pm->getProperty("msg_text") . "\n";
 					$message.="[/quote]\n";
-					$form->setVar("message",$message);
+					$form->set("message",$message);
 					
 					return;
 				}
@@ -194,7 +202,7 @@
 		//
 		// Reset
 		//
-		$form->setVar('msg_id',0);
+		$form->set('msg_id',0);
 		$form->resetToUser();
 	}
 }

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 18:18:04 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 18:18:04 +0900
Subject: [xoops-cvslog 2069] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202091804.E7EE72AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.5	Mon Jan 30 23:53:49 2006
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html	Thu Feb  2 18:18:04 2006
@@ -11,6 +11,7 @@
 </ul>
 
 <form method="POST">
+<{xoops_token form=$actionForm}>
 <input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
 <table class="outer">
   <tr>
Index: xoops2jp/html/modules/base/admin/templates/module_list.html
diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.2	Mon Jan 30 23:53:49 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list.html	Thu Feb  2 18:18:04 2006
@@ -8,6 +8,7 @@
 <div class="toptab">[ <a href="index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a> ]</div>
 
 <form method="post">
+<{xoops_token form=$actionForm}>
 <table classs="outer">
   <tr>
     <th><{$smarty.const._MD_A_BASE_LANG_MID}><br />
Index: xoops2jp/html/modules/base/admin/templates/module_installer_licence.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.3	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer_licence.html	Thu Feb  2 18:18:04 2006
@@ -8,6 +8,7 @@
 <h3><{$licence|escape}></h3>
 
 <form method="POST">
+<{xoops_token form=$actionForm}>
 <input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
 <table class="outer">
   <tr>
Index: xoops2jp/html/modules/base/admin/templates/module_install_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.5	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install_confirm.html	Thu Feb  2 18:18:04 2006
@@ -12,6 +12,7 @@
 </ul>
 
 <form method="POST">
+<{xoops_token form=$actionForm}>
 <input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
 <table class="outer">
   <tr>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.5	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html	Thu Feb  2 18:18:04 2006
@@ -7,6 +7,7 @@
 
 <div><{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}></div>
 <form action="index.php?action=ActSearch" method="post">
+  <{xoops_token form=$actionForm}>
   <input type="text" name="keywords" <{if $actionForm}>value="<{$actionform->get('keywords')|escape}>"<{/if}> />
   <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
 </form>
Index: xoops2jp/html/modules/base/admin/templates/module_update_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.5	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update_confirm.html	Thu Feb  2 18:18:04 2006
@@ -11,6 +11,7 @@
 </ul>
 
 <form method="POST">
+<{xoops_token form=$actionForm}>
 <input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
 <table class="outer">
   <tr>
Index: xoops2jp/html/modules/base/admin/templates/module_installer.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.3	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer.html	Thu Feb  2 18:18:04 2006
@@ -12,6 +12,7 @@
 </ul>
 
 <form method="POST">
+<{xoops_token form=$actionForm}>
 <input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
 <table class="outer">
   <tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 18:18:05 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 18:18:05 +0900
Subject: [xoops-cvslog 2070] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060202091805.809942AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_misc_avatars.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.2 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.2	Thu Feb  2 15:24:23 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_avatars.html	Thu Feb  2 18:18:05 2006
@@ -14,6 +14,7 @@
 
 <h4><{$smarty.const._MSC_AVAVATARS}></h4>
 <form name="avatars" action="misc.php?action=avatars">
+<{xoops_token form=$actionForm}>
 <table witdh="100%">
   <tr>
     <{foreach key=key item=avatar from=$avatarsList}>
Index: xoops2jp/html/modules/base/templates/legacy_comment_navi.html
diff -u xoops2jp/html/modules/base/templates/legacy_comment_navi.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_comment_navi.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_comment_navi.html:1.1.2.1	Wed Jan 25 16:13:08 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment_navi.html	Thu Feb  2 18:18:05 2006
@@ -1,4 +1,5 @@
 <form method="get" action="<{$pageName}>">
+  <{xoops_token form=$actionForm}>
   <table width="95%" class="outer" cellspacing="1">
     <tr>
       <td class="even" align="center">

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:22:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:22:17 +0900
Subject: [xoops-cvslog 2071] CVS update: xoops2jp/html/modules/user
Message-ID: <20060202092217.AB7072AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/register.php
diff -u xoops2jp/html/modules/user/register.php:1.1.2.1 xoops2jp/html/modules/user/register.php:removed
--- xoops2jp/html/modules/user/register.php:1.1.2.1	Tue Nov  8 21:12:32 2005
+++ xoops2jp/html/modules/user/register.php	Thu Feb  2 18:22:17 2006
@@ -1,20 +0,0 @@
-<?php
-
-require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH."/header.php";
-
-require_once "./class/UserActionFrame.class.php";
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-$moduleRunner=new UserActionFrame();
-$moduleRunner->setActionName("register");
-
-$root=&XCube_Root::getSingleton();
-$controller=&$root->getController();
-$controller->setActionStrategy($moduleRunner);
-
-$controller->executeAction();
-
-require_once XOOPS_ROOT_PATH."/footer.php";
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/register_confirm.php
diff -u xoops2jp/html/modules/user/register_confirm.php:1.1.2.1 xoops2jp/html/modules/user/register_confirm.php:removed
--- xoops2jp/html/modules/user/register_confirm.php:1.1.2.1	Tue Nov  8 21:12:32 2005
+++ xoops2jp/html/modules/user/register_confirm.php	Thu Feb  2 18:22:17 2006
@@ -1,22 +0,0 @@
-<?php
-
-require_once "../../class/XCube_ActionForm.class.php";
-require_once "./forms/RegisterUserEditForm.class.php";
-
-require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH."/header.php";
-
-require_once "./class/UserActionFrame.class.php";
-
-$moduleRunner=new UserActionFrame();
-$moduleRunner->setActionName("register_confirm");
-
-$root=&XCube_Root::getSingleton();
-$controller=&$root->getController();
-$controller->setActionStrategy($moduleRunner);
-
-$controller->executeAction();
-
-require_once XOOPS_ROOT_PATH."/footer.php";
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:22:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:22:45 +0900
Subject: [xoops-cvslog 2072] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060202092245.9DC8F2AC025@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.6 xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.7
--- xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.6	Tue Jan 17 19:38:18 2006
+++ xoops2jp/html/modules/user/kernel/UserEventFunction.class.php	Thu Feb  2 18:22:45 2006
@@ -18,7 +18,7 @@
 		else {
 			$xoopsUser=&$controller->getXoopsUser();
 			if(is_object($xoopsUser))
-				$url=XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->getVar('uid');
+				$url=XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid');
 		}
 
 		$controller->executeForward($url);
@@ -56,7 +56,7 @@
 		
 		switch($op) {
 			case "main":
-				$url=is_object($xoopsUser) ? XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->getVar('uid')
+				$url=is_object($xoopsUser) ? XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid')
 				                             : XOOPS_MODULE_URL."/user/index.php"; 
 				$controller->executeForward($url);
 				break;
@@ -79,8 +79,13 @@
 	 */
 	function AccessToRegister(&$controller,&$eventArgs)
 	{
-		// TODO user check?
-		$controller->executeForward(XOOPS_MODULE_URL."/user/register.php");
+		$xoopsUser =& $controller->getXoopsUser();
+		if (is_object($xoopsUser)) {
+			$controller->executeForward(XOOPS_URL);
+		}
+		else {
+			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=RegisterUser");
+		}
 	}
 	
 	function CheckLogin(&$controller,&$eventArgs)
@@ -99,7 +104,7 @@
 			return;
 		}
 
-		if($user->getVar('level')==0) {
+		if($user->get('level')==0) {
 			$eventArgs->setRedirectUrl(XOOPS_URL);
 			$eventArgs->setRedirectMessage(_US_NOACTTPADM);
 			return;
@@ -107,7 +112,7 @@
 	
 		// Regist to session
 		$_SESSION = array();
-		$_SESSION['xoopsUserId'] = $user->getVar('uid');
+		$_SESSION['xoopsUserId'] = $user->get('uid');
 		$_SESSION['xoopsUserGroups'] = $user->getGroups();
 		
 		if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) {
@@ -147,7 +152,7 @@
 		// clear entry from online users table
 		if (is_object($xoopsUser)) {
 			$onlineHandler =& xoops_gethandler('online');
-			$onlineHandler->destroy($xoopsUser->getVar('uid'));
+			$onlineHandler->destroy($xoopsUser->get('uid'));
 		}
 		
 		$eventArgs['successFlag']=true;
@@ -164,6 +169,22 @@
 			$userHandler->insert($eventArgs['xoopsUser']);
 		}
 	}
+
+	/**
+	 * If the current user is registered user, kick out to the top page.
+	 * Else, forward to the lost-pass page.
+	 */
+	function AccessToLostpass(&$controller, &$eventArgs)
+	{
+		$xoopsUser =& $controller->getXoopsUser();
+		if (is_object($xoopsUser)) {
+			$controller->executeForward(XOOPS_URL);
+		}
+		else {
+			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
+		}
+	}
+
 }
 
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:22:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:22:59 +0900
Subject: [xoops-cvslog 2073] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060202092259.DD7BC2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php
diff -u xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:1.1.2.5 xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:1.1.2.6
--- xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:1.1.2.5	Thu Nov 17 12:45:14 2005
+++ xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php	Thu Feb  2 18:22:59 2006
@@ -6,7 +6,8 @@
 {
 	var $_mList=array("Legacypage.Userinfo.Access","Legacypage.Edituser.Access",
 	                   "Legacypage.User.Access", "Site.CheckLogin", "Site.Logout",
-	                   "Legacypage.Register.Access","Site.CheckLogin.Success");
+	                   "Legacypage.Register.Access","Site.CheckLogin.Success",
+					   "Legacypage.Lostpass.Access");
 	
 	function getEventNameList()
 	{
@@ -61,6 +62,13 @@
 		$delegate=new XCube_Delegate("UserEventFunction","CheckLoginSuccess");
 		return $delegate;
 	}
+
+	function &createLegacypage_Lostpass_AccessDelegate()
+	{
+		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
+		$delegate=new XCube_Delegate("UserEventFunction","AccessToLostpass");
+		return $delegate;
+	}
 }
 
 class UserCommonEventFunction

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:28:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:28:59 +0900
Subject: [xoops-cvslog 2074] CVS update:
	xoops2jp/html/modules/comment/language/english
Message-ID: <20060202092859.989882AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/language/english/main.php
diff -u xoops2jp/html/modules/comment/language/english/main.php:1.1.2.1 xoops2jp/html/modules/comment/language/english/main.php:removed
--- xoops2jp/html/modules/comment/language/english/main.php:1.1.2.1	Thu Nov 24 01:30:07 2005
+++ xoops2jp/html/modules/comment/language/english/main.php	Thu Feb  2 18:28:59 2006
@@ -1,40 +0,0 @@
-<?php
-// $Id: comment.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
-define('_CM_TITLE','Title');
-define('_CM_MESSAGE','Message');
-define('_CM_DOSMILEY','Enable Smiley Icons');
-define('_CM_DOHTML','Enable HTML Tags');
-define('_CM_DOAUTOWRAP','Auto wrap lines');
-define('_CM_DOXCODE','Enable XOOPS Codes');
-define('_CM_REFRESH','Refresh');
-define('_CM_PENDING','Pending');
-define('_CM_HIDDEN','Hidden');
-define('_CM_ACTIVE','Active');
-define('_CM_STATUS','Status');
-define('_CM_POSTCOMMENT','Post Comment');
-define('_CM_REPLIES','Replies');
-define('_CM_PARENT','Parent');
-define('_CM_TOP','Top');
-define('_CM_BOTTOM','Bottom');
-define('_CM_ONLINE','Online!');
-define('_CM_POSTED','Posted'); // Posted date
-define('_CM_UPDATED', 'Updated');
-define('_CM_THREAD','Thread');
-define('_CM_POSTER','Poster');
-define('_CM_JOINED','Joined');
-define('_CM_POSTS','Posts');
-define('_CM_FROM','From');
-define('_CM_COMDELETED', 'Comment(s) deleted.');
-define('_CM_COMDELETENG', 'Could not delete comment.');
-define('_CM_DELETESELECT' , 'Delete all its child comments?');
-define('_CM_DELETEONE' , 'No, delete only this comment');
-define('_CM_DELETEALL', 'Yes, delete all');
-define('_CM_THANKSPOST', 'Thanks for posting!');
-define('_CM_NOTICE', "The comments are owned by the poster. We aren't responsible for their content.");
-define('_CM_COMRULES','Comment Rules');
-define('_CM_COMAPPROVEALL','Comments are always approved');
-define('_CM_COMAPPROVEUSER','Comments by registered users are always approved');
-define('_CM_COMAPPROVEADMIN','All comments need to be approved by administrator');
-define('_CM_COMANONPOST','Allow anonymous post in comments?');
-define('_CM_COMNOCOM','Disable comments');
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/language/english/modinfo.php
diff -u xoops2jp/html/modules/comment/language/english/modinfo.php:1.1.2.1 xoops2jp/html/modules/comment/language/english/modinfo.php:removed
--- xoops2jp/html/modules/comment/language/english/modinfo.php:1.1.2.1	Thu Nov 24 18:43:05 2005
+++ xoops2jp/html/modules/comment/language/english/modinfo.php	Thu Feb  2 18:28:59 2006
@@ -1,6 +0,0 @@
-<?php
-
-define("_MI_COMMENT_NAME","Comment module");
-define("_MI_COMMENT_NAME_DESC","Comment service module");
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:28:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:28:59 +0900
Subject: [xoops-cvslog 2075] CVS update:
	xoops2jp/html/modules/comment/templates
Message-ID: <20060202092859.CF2662AC09B@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/templates/comment_post_input.html
diff -u xoops2jp/html/modules/comment/templates/comment_post_input.html:1.1.2.2 xoops2jp/html/modules/comment/templates/comment_post_input.html:removed
--- xoops2jp/html/modules/comment/templates/comment_post_input.html:1.1.2.2	Thu Nov 24 18:47:02 2005
+++ xoops2jp/html/modules/comment/templates/comment_post_input.html	Thu Feb  2 18:28:59 2006
@@ -1,44 +0,0 @@
-<{if $reply.title && $reply.text}>
-	<table class="outer" cellpadding="1" ID="Table1">
-		<tr>
-			<td class="head">
-				<{$reply.title}>
-			</td>
-		</tr>
-		<tr>
-			<td class="odd">
-				<{$reply.text}>
-			</td>
-		</tr>
-	</table>
-<{/if}>
-
-<form method="post" ID="Form1">
-<{xoops_input type=hidden name=objId value=$actionForm->getVar('objId')}>
-<table class="outer" cellspacing="1" ID="Table2">
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_TITLE}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<{xoops_input type=text name=title value=$actionForm->getVar('title')}>
-		</td>
-	</tr>
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_MESSAGE}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<{xoops_dhtmltarea name=text value=$actionForm->getVar('text')}>
-		</td>
-	</tr>
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_CONTROL}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<input type="submit" ID="Submit1" NAME="Submit1"/>
-		</td>
-	</tr>
-</table>
-</form>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/templates/comment_comment.html
diff -u xoops2jp/html/modules/comment/templates/comment_comment.html:1.1.2.1 xoops2jp/html/modules/comment/templates/comment_comment.html:removed
--- xoops2jp/html/modules/comment/templates/comment_comment.html:1.1.2.1	Thu Nov 24 18:46:19 2005
+++ xoops2jp/html/modules/comment/templates/comment_comment.html	Thu Feb  2 18:28:59 2006
@@ -1,38 +0,0 @@
-<!-- start comment post -->
-<tr>
-	<td class="head">
-		<a id="comment<{$comment->getVar('id')}>"><{$comment.uid|xoops_user:uname}></a>
-	</td>
-	<td class="head">
-		<div class="comDate">
-			<span class="comDateCaption"><{$lang_posted}>:</span> <{$comment.created_time|xoops_formattimestamp:l}>&nbsp;&nbsp;
-			<span class="comDateCaption"><{$lang_updated}>:</span> <{$comment.modified_time|xoops_formattimestamp:l}>
-		</div>
-	</td>
-	<tr>
-		<{if $commnet->getVar('uid')}>
-			<td class="odd">
-				USER INFORMATION
-			</td>
-		<{else}>
-			<td class="odd">
-				GUEST INFORMATION
-			</td>
-		<{/if}>
-
-		<td class="odd">
-			<div class="comTitle">
-				ICON<{$comment->getVar('title')}>
-			</div>
-			<div class="comText">
-				<{$comment->getVar('message')}>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<a href="<{$replycomment_link}>&amp;obj_id=<{$comment->getVar('obj_id')}>">RES</a>
-		</td>
-	</tr>
-</tr>
-<!-- end comment post -->
\ No newline at end of file
Index: xoops2jp/html/modules/comment/templates/comment_reply_input.html
diff -u xoops2jp/html/modules/comment/templates/comment_reply_input.html:1.1.2.2 xoops2jp/html/modules/comment/templates/comment_reply_input.html:removed
--- xoops2jp/html/modules/comment/templates/comment_reply_input.html:1.1.2.2	Thu Nov 24 18:47:27 2005
+++ xoops2jp/html/modules/comment/templates/comment_reply_input.html	Thu Feb  2 18:28:59 2006
@@ -1,44 +0,0 @@
-<table class="outer" cellpadding="1">
-	<tr>
-		<td class="head">
-			<{$comment->getVar('title')}>
-		</td>
-	</tr>
-	<tr>
-		<td class="odd">
-			<{$smarty.const._CM_POSTER}> : <b><{$comment->getVar('uid')|xoops_user:uname}></b>
-			<{$smarty.const._CM_POSTED}> : <b><{$comment->getVar('created_time')|xoops_formattimestamp:l}></b><br/>
-			<{$comment->getVar('message')}>
-		</td>
-	</tr>
-</table>
-
-<form method="post">
-<{xoops_input type=hidden name=pid value=$actionForm->getVar('pid')}>
-<table class="outer" cellspacing="1">
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_TITLE}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<{xoops_input type=text name=title value=$actionForm->getVar('title')}>
-		</td>
-	</tr>
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_MESSAGE}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<{xoops_dhtmltarea name=message value=$actionForm->getVar('message')}>
-		</td>
-	</tr>
-	<tr>
-		<th>
-			<{$smarty.const._MD_COMMENT_LANG_CONTROL}>
-		</th>
-		<td class="<{cycle values="odd,even"}>">
-			<input type="submit" />
-		</td>
-	</tr>
-</table>
-</form>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/templates/comment_delete_input.html
diff -u xoops2jp/html/modules/comment/templates/comment_delete_input.html:1.1.2.1 xoops2jp/html/modules/comment/templates/comment_delete_input.html:removed
--- xoops2jp/html/modules/comment/templates/comment_delete_input.html:1.1.2.1	Thu Nov 24 01:30:40 2005
+++ xoops2jp/html/modules/comment/templates/comment_delete_input.html	Thu Feb  2 18:28:59 2006
@@ -1,11 +0,0 @@
-
-<h2><{$smarty.const._CM_DELETESELECT}></h2>
-
-<form method="post">
-	<input type="hidden" name="action" value="Delete" />
-	<input type="hidden" name="com_id" value="<{$comment->getVar('com_id')}>" />
-	<input type="radio" name="DeleteAll" value="0" checked /><{$smarty.const._CM_DELETEONE}><br/>
-	<input type="radio" name="DeleteAll" value="1" /><{$smarty.const._CM_DELETEALL}>
-
-	<input type="submit" />
-</form>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2076] CVS update: xoops2jp/html/modules/comment/actions
Message-ID: <20060202092900.0DB542AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/actions/CommentPostAction.class.php
diff -u xoops2jp/html/modules/comment/actions/CommentPostAction.class.php:1.1.2.5 xoops2jp/html/modules/comment/actions/CommentPostAction.class.php:removed
--- xoops2jp/html/modules/comment/actions/CommentPostAction.class.php:1.1.2.5	Sat Nov 26 14:12:56 2005
+++ xoops2jp/html/modules/comment/actions/CommentPostAction.class.php	Thu Feb  2 18:28:59 2006
@@ -1,112 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/modules/comment/forms/CommentPostForm.class.php";
-require_once XOOPS_ROOT_PATH."/modules/base/kernel/Legacy_UserAccountAdapter.class.php";
-
-class CommentPostAction extends CommentAction
-{
-	var $mComment;
-	var $mActionForm;
-
-	var $mReplyAttribte;
-	var $mItemId;
-	
-	function prepare(&$controller,&$xoopsUser)
-	{
-		parent::prepare($controller,$xoopsUser);
-		$controller->mRoot->mLanguageManager->loadModuleLanguage("comment");
-		$this->_processActionForm($controller);
-	}
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		//
-		// We cannot but depend on global variable here for compatibility with 2.0.x.
-		// The cause is that a includer use global variable for parameters.
-		//
-		global $com_replytitle, $com_replytext;
-		if(isset($_REQUEST['com_replytitle']) || isset($_REQUEST['com_replytext'])) {
-			die("Wrong parameter");
-		}
-
-		if(!empty($com_replytitle))
-			$this->mReplyAttribte['title']=$com_replytitle;
-
-		if(!empty($com_replytext))
-			$this->mReplyAttribte['text']=$com_replytext;
-		
-		//
-		// Get object ID
-		//
-		$xoopsModule=&$controller->mModuleController->getXoopsModule();
-		$commentConfig=$xoopsModule->getInfo('comments');
-
-		$mid=$xoopsModule->getVar('mid');
-		$className=$commentConfig['pageName'];
-		$object=$controller->mRoot->ContentManager->fetchContent($mid,$className,intval($_REQUEST['com_itemid']));
-
-		$this->mActionForm->load($object,$this->mReplyAttribte);
-		
-		return COMMENT_FRAME_VIEW_INPUT;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if($this->mActionForm->hasError()){
-			// TODO Add code
-			return COMMENT_FRAME_VIEW_INPUT;
-		}
-
-		//
-		// Set up parameters
-		//
-		$this->_processService($controller);
-
-		$parameters=array();
-
-		$parameters['Title']=$this->mActionForm->getVar('title');
-		$parameters['Message']=$this->mActionForm->getVar('text');
-		$parameters['ObjectId']=$this->mActionForm->getVar('objId');
-		$parameters['User']=new Legacy_UserAccountAdapter($xoopsUser);
-		$parameters['User']=&$xoopsUser;
-	
-		$result=&$this->mClient->call("post",$parameters);
-
-		return $result!==false ? COMMENT_FRAME_VIEW_SUCCESS : COMMENT_FRAME_VIEW_ERROR;
-	}
-	
-	function _processActionForm($controoler)
-	{
-		$this->mActionForm=new CommentPostForm();
-		$this->mActionForm->prepare();
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader(XOOPS_URL,1,"insert!");
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		//
-		// TODO
-		//
-		die();
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("comment_post_input.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("reply",$this->mReplyAttribte);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/actions/CommentReplyAction.class.php
diff -u xoops2jp/html/modules/comment/actions/CommentReplyAction.class.php:1.1.2.4 xoops2jp/html/modules/comment/actions/CommentReplyAction.class.php:removed
--- xoops2jp/html/modules/comment/actions/CommentReplyAction.class.php:1.1.2.4	Fri Nov 25 00:17:48 2005
+++ xoops2jp/html/modules/comment/actions/CommentReplyAction.class.php	Thu Feb  2 18:28:59 2006
@@ -1,82 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/modules/comment/forms/CommentReplyForm.class.php";
-require_once XOOPS_ROOT_PATH."/modules/base/kernel/Legacy_UserAccountAdapter.class.php";
-
-class CommentReplyAction extends CommentAction
-{
-	var $mComment;
-	var $mActionForm;
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		parent::prepare($controller,$xoopsUser);
-		$this->_processActionForm($controller);
-	}
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$pid=isset($_REQUEST['pid']) ? intval($_REQUEST['pid']) : 0;
-
-		$parameters=array('Id'=>$pid);
-		$comment=&$this->mClient->call("getComment",$parameters);
-		
-		if(!is_object($comment))
-			return COMMENT_FRAME_VIEW_ERROR;
-
-		$this->mActionForm->load($comment);
-
-		if(is_object($comment)) {
-			$this->mComment=&$comment;
-			return COMMENT_FRAME_VIEW_INPUT;
-		}
-		
-		return COMMENT_FRAME_VIEW_ERROR;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if($this->mActionForm->hasError()){
-			// TODO Add code
-			return COMMENT_FRAME_VIEW_INPUT;
-		}
-
-		$parameters=array();
-		$parameters['ParentId']=$this->mActionForm->getVar('pid');
-		$parameters['User']=new Legacy_UserAccountAdapter($xoopsUser);
-		$parameters['User']=$xoopsUser;
-		$parameters['Title']=$this->mActionForm->getVar('title');
-		$parameters['Message']=$this->mActionForm->getVar('message');
-
-		$result=&$this->mClient->call("postResponse",$parameters);
-
-		return COMMENT_FRAME_VIEW_SUCCESS;
-	}
-	
-	function _processActionForm($controoler)
-	{
-		$this->mActionForm=new CommentReplyForm();
-		$this->mActionForm->prepare();
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader(XOOPS_URL,1,"responce!");
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("comment_reply_input.html");
-		$renderSystem->setAttribute("comment",$this->mComment);
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/actions/CommentDeleteAction.class.php
diff -u xoops2jp/html/modules/comment/actions/CommentDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/comment/actions/CommentDeleteAction.class.php:removed
--- xoops2jp/html/modules/comment/actions/CommentDeleteAction.class.php:1.1.2.3	Fri Nov 25 00:18:25 2005
+++ xoops2jp/html/modules/comment/actions/CommentDeleteAction.class.php	Thu Feb  2 18:28:59 2006
@@ -1,58 +0,0 @@
-<?php
-
-class CommentDeleteAction extends CommentAction
-{
-	var $mComment;
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$id=isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
-		
-		$paramaters=array("id"=>$id);
-		$comment=&$this->mClient->call("getComment",$pamaraters);
-
-		if(is_object($comment)) {
-			$this->mComment=&$comment;
-			return COMMENT_FRAME_VIEW_INPUT;
-		}
-		
-		return COMMENT_FRAME_VIEW_ERROR;
-	}
-	
-	function execute()
-	{
-		$id = intval($_REQUEST["id"]);
-		$deleteAllFlag = intval($_REQUEST["DeleteAll"])==1 ? true : false;
-
-		//
-		// TODO We check a permission that user can delete this comment.
-		//
-
-		$parameters=array('Id'=>$id);
-		if($deleteAllFlag) {
-			$result=&$this->mClient->call("Delete",$parameters);
-		}
-		else {
-			$result=&$this->mClient->call("DeleteAll",$parameters);
-		}
-		
-		return COMMENT_FRAME_VIEW_SUCCESS;
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader(XOOPS_URL,1,"delete!");
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("comment_delete_input.html");
-		$renderSystem->setAttribute("comment",$this->mComment);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2077] CVS update: xoops2jp/html/modules/comment/images
Message-ID: <20060202092900.352492AC09B@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/images/comment.gif

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2078] CVS update:
	xoops2jp/html/modules/comment/language/japanese
Message-ID: <20060202092900.629B22AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/comment/language/japanese/modinfo.php:1.1.2.1 xoops2jp/html/modules/comment/language/japanese/modinfo.php:removed
--- xoops2jp/html/modules/comment/language/japanese/modinfo.php:1.1.2.1	Thu Nov 24 18:43:15 2005
+++ xoops2jp/html/modules/comment/language/japanese/modinfo.php	Thu Feb  2 18:29:00 2006
@@ -1,6 +0,0 @@
-<?php
-
-define("_MI_COMMENT_NAME","コメントモジュール");
-define("_MI_COMMENT_NAME_DESC","コメントサービスを担当するモジュール");
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/language/japanese/main.php
diff -u xoops2jp/html/modules/comment/language/japanese/main.php:1.1.2.1 xoops2jp/html/modules/comment/language/japanese/main.php:removed
--- xoops2jp/html/modules/comment/language/japanese/main.php:1.1.2.1	Thu Nov 24 01:30:18 2005
+++ xoops2jp/html/modules/comment/language/japanese/main.php	Thu Feb  2 18:29:00 2006
@@ -1,48 +0,0 @@
-<?php
-// $Id: comment.php,v 1.2 2005/03/18 13:00:58 onokazu Exp $
-define('_CM_TITLE','表題');
-define('_CM_MESSAGE','コメント');
-define('_CM_DOSMILEY','顔アイコンを有効にする');
-define('_CM_DOHTML','HTMLタグを有効にする');
-define('_CM_DOAUTOWRAP','改行を自動挿入する');
-define('_CM_DOXCODE','XOOPSコードを有効にする');
-define('_CM_REFRESH','更新');
-define('_CM_PENDING','承認待ち');
-define('_CM_HIDDEN','非表示');
-define('_CM_ACTIVE','アクティブ');
-define('_CM_STATUS','ステータス');
-define('_CM_POSTCOMMENT','投稿する');
-define('_CM_REPLIES','返信');
-define('_CM_PARENT','親コメント');
-define('_CM_TOP','上へ');
-define('_CM_BOTTOM','下へ');
-define('_CM_ONLINE','オンライン');
-define('_CM_POSTED','投稿日時'); // Posted date
-define('_CM_UPDATED', '更新日時');
-define('_CM_THREAD','スレッド');
-define('_CM_POSTER','投稿者');
-define('_CM_JOINED','登録日');
-define('_CM_POSTS','投稿数');
-define('_CM_FROM','居住地');
-define('_CM_COMDELETED', 'コメントを削除しました。');
-define('_CM_COMDELETENG', 'コメントを削除できませんでした。');
-define('_CM_DELETESELECT' , 'コメントの削除方法を選択してください。');
-define('_CM_DELETEONE' , 'このコメントだけ削除する');
-define('_CM_DELETEALL', 'このコメントに対する返信も全て削除する');
-define('_CM_THANKSPOST', '投稿を受け付けました。');
-define('_CM_NOTICE', '投稿された内容の著作権はコメントの投稿者に帰属します。');
-define('_CM_COMRULES','コメント投稿に関するルール');
-define('_CM_COMAPPROVEALL','コメントに承認は必要ない');
-define('_CM_COMAPPROVEUSER','登録ユーザ以外のコメントは承認が必要');
-define('_CM_COMAPPROVEADMIN','コメントは全て承認が必要');
-define('_CM_COMANONPOST','匿名によるコメント投稿を許可しますか？');
-define('_CM_COMNOCOM','コメント機能を無効にする');
-
-
-define("_MD_COMMENT_LANG_TITLE","表題");
-define("_MD_COMMENT_LANG_MESSAGE","コメント");
-define("_MD_COMMENT_ERROR_REQUIRED","{0}は必ず入力してください");
-define("_MD_COMMENT_LANG_CONTROL","コントロール");
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2079] CVS update: xoops2jp/html/modules/comment/class
Message-ID: <20060202092900.8D4352AC09B@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/class/comments.php
diff -u xoops2jp/html/modules/comment/class/comments.php:1.1.2.1 xoops2jp/html/modules/comment/class/comments.php:removed
--- xoops2jp/html/modules/comment/class/comments.php:1.1.2.1	Thu Nov 24 18:40:01 2005
+++ xoops2jp/html/modules/comment/class/comments.php	Thu Feb  2 18:29:00 2006
@@ -1,268 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH'))
-	exit();
-
-class CommentCommentsObject extends XoopsObject
-{
-	function CommentCommentsObject()
-	{
-		parent::XoopsObject();
-		$this->initVar('id', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('pid', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('root_id', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('obj_id', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('icon', XOBJ_DTYPE_TXTBOX, null, false);
-		$this->initVar('created_time', XOBJ_DTYPE_INT, time(), false);
-		$this->initVar('modified_time', XOBJ_DTYPE_INT, time(), false);
-		$this->initVar('uid', XOBJ_DTYPE_INT, 0, true);
-		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255, true);
-		$this->initVar('message', XOBJ_DTYPE_TXTAREA, null, true, null, true);
-		$this->initVar('status', XOBJ_DTYPE_INT, 0, false);
-
-		//
-		// Compatibility flags.
-		//
-		$this->initVar('ip', XOBJ_DTYPE_TXTBOX, null, false);
-
-		$this->initVar('sig', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('exparams', XOBJ_DTYPE_OTHER, null, false, 255);
-
-		$this->initVar('dohtml', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('dosmiley', XOBJ_DTYPE_INT, 1, false);
-		$this->initVar('doxcode', XOBJ_DTYPE_INT, 1, false);
-		$this->initVar('doimage', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('dobr', XOBJ_DTYPE_INT, 1, false);
-	}
-
-	/**
-	 * Create a responce comment object, and return it.
-	 * @return XoopsComment
-	 */
-    function createChild()
-    {
-		$ret=new CommentCommentsObject();
-		$ret->setNew();
-		$ret->setVar('pid',$this->getVar('id'));
-		$ret->setVar('root_id',$this->getVar('root_id'));
-		$ret->setVar('obj_id',$this->getVar('obj_id'));
-		$ret->setVar('exparams',$this->getVar('exparams'));
-		
-		return $ret;
-	}
-}
-
-class CommentCommentsHandler extends XoopsObjectHandler
-{
-	function &create($isNew=true)
-	{
-		$ret=new CommentCommentsObject();
-		if($isNew)
-			$ret->setNew();
-
-		return $ret;
-	}
-	
-	function &get($id)
-	{
-		$ret=false;
-
-		$sql="SELECT * FROM ".$this->db->prefix("comment_comments")." WHERE id=".intval($id);
-		$result=$this->db->query($sql);
-		if(!$result)
-			return $ret;
-
-		if($this->db->getRowsNum($result)==1) {
-			$ret = new CommentCommentsObject();
-			$ret->assignVars($this->db->fetchArray($result));
-			return $ret;
-		}
-		
-		return $ret;
-	}
-	
-	function insert(&$comment,$force=false)
-	{
-		if(!is_a($comment,"CommentCommentsObject"))
-			return false;
-
-		if(!$comment->isDirty())
-			return true;
-
-		if(!$comment->cleanVars())
-			return false;
-
-		$fields=array(
-			"id"            => $comment->getProperty('id'),
-			"pid"           => $comment->getProperty('pid'),
-			"root_id"       => $comment->getProperty('root_id'),
-			"obj_id"        => $comment->getProperty('obj_id'),
-			"icon"          => $this->db->quoteString($comment->getProperty('icon')),
-			"created_time"  => $comment->getProperty('created_time'),
-			"modified_time" => $comment->getProperty('modified_time'),
-			"uid"           => $comment->getProperty('uid'),
-			"title"         => $this->db->quoteString($comment->getProperty('title')),
-			"message"       => $this->db->quoteString($comment->getProperty('message')),
-			"status"        => $comment->getProperty('status'),
-			"ip"            => $this->db->quoteString($comment->getProperty('ip')),
-			"sig"           => $comment->getProperty('sig'),
-			"exparams"      => $this->db->quoteString($comment->getProperty('exparams')),
-			"dohtml"        => $comment->getProperty('dohtml'),
-			"dosmiley"      => $comment->getProperty('dosmiley'),
-			"doxcode"       => $comment->getProperty('doxcode'),
-			"doimage"       => $comment->getProperty('doimage'),
-			"dobr"          => $comment->getProperty('dobr')
-		);
-
-		//
-		// Generate SQL
-		//  Because XoopsObject Handler is deprecated, we keep this helper to base class.
-		//
-		$sql=null;
-		$isNewFlag=$comment->isNew();
-		if($isNewFlag) {
-			$sql="INSERT INTO ".$this->db->prefix("comment_comments").
-			      " ( ".implode(",",array_keys($fields))." ) ".
-			      " VALUES ( ".implode(",",array_values($fields))." )";
-		}
-		else {
-			$set=array();
-			foreach($fields as $key=>$value) {
-				$set[]= $key . "=" . $value;
-			}
-			$sql="UPDATE ".$this->db->prefix("comment_comments").
-			      " SET ".implode(",",$set)." WHERE id=".$fields['id'];
-		}
-
-		if($force) {
-			$result=$this->db->queryF($sql);
-		}
-		else {
-			$result=$this->db->query($sql);
-		}
-		if(!$result)
-			return false;
-		
-		if($isNewFlag) {
-			$comment->setVar('id',$this->db->getInsertId());
-			$comment->unsetNew();
-		}
-
-		return true;
-	}
-
-	function delete(&$comment)
-	{
-		if(!is_a($comment,"CommentCommentsObject"))
-			return false;
-
-		$sql="DELETE FORM ".$this->db->prefix("comment_comments")." WHERE id=".$comment->getVar('id');
-		$result=$this->db->query($sql);
-		
-		return $result ? true : false;
-	}
-	
-	/**
-	 * This function does not impletement about 'is_as_key'.
-	 */
-	function &getObjects($criteria=null,$id_as_key=false)
-	{
-		$ret=array();
-		$start = 0;
-		$limit = 0;
-
-		$sql="SELECT * FROM ".$this->db->prefix("comment_comments");
-		if(isset($criteria)&&is_a($criteria,"CriteriaElemenet")) {
-			$sql.=" ".$$criteria->renderWhere();
-			$sort = ($criteria->getSort() != null) ? $criteria->getSort() : "id";
-			$sql.=" ORDER BY ".$sort." ".$criteria->getOrder();
-			$start=$criteria->getStart();
-			$limit=$criteria->getLimit();
-		}
-		
-		$result=$this->db->query($sql,$limit,$start);
-		if(!$result)
-			return $ret;
-
-		while($row=$this->db->fetchArray($result)) {
-			$comment=new CommentCommentsObject();
-			$comment->assignVars($row);
-			$ret[]=&$comment;
-			unset($comment);
-		}
-		
-		return $ret;
-	}
-	
-	/**
-	 * Returns comment objects by object id.
-	 * @param $objectId int
-	 * @param $start int
-	 * @param $limit int
-	 */
-	function getObjectsByObjId($objectId,$start=0,$limit=0)
-	{
-		$ret=array();
-
-		// TODO SORT!!
-		$sql="SELECT * FROM ".$this->db->prefix("comment_comments")." WHERE obj_id=".intval($objectId);
-		
-		$result=$this->db->query($sql,$limit,$start);
-		if(!$result)
-			return $ret;
-
-		while($row=$this->db->fetchArray($result)) {
-			$comment=new CommentCommentsObject();
-			$comment->assignVars($row);
-			$ret[]=&$comment;
-			unset($comment);
-		}
-		
-		return $ret;
-	}
-	
-	function getCount($criteria=null)
-	{
-		$sql="SELECT COUNT(*) FROM ".$this->db->prefix("comment_comments");
-		if(isset($criteria)&&is_a($criteria,"CriteriaElement")) {
-			$sql.=" ".$criteria->renderWhere();
-		}
-		
-		$result=$this->db->query($sql);
-		if(!$result)
-			return 0;
-
-		list($count)=$this->db->fetchRow($result);
-		return $count;
-	}
-
-	function getChildObjects(&$comment)
-	{
-		$ret=array();
-
-		$table=$this->db->prefix("comment_comments");
-		$sql="SELECT * FROM ${table} WHERE pid=" . $comment->getVar("id") .
-		      " AND id<>".$comment->getVar("id");
-		$result=$this->db->query($sql);
-		while($row=$this->db->fetchArray($result)) {
-			$comment=new CommentCommentsObject();
-			$comment->assignVars($row);
-			$ret[]=&$comment;
-			unset($comment);
-		}
-		
-		return $ret;
-	}
-
-	function deleteWithChild(&$comment)
-	{
-		foreach($this->getChildObjects($comment) as $child) {
-			$this->deleteWithChild($child);
-		}
-		$this->delete($comment);
-		
-		return true;	// TODO
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/class/CommentActionFrame.class.php
diff -u xoops2jp/html/modules/comment/class/CommentActionFrame.class.php:1.1.2.2 xoops2jp/html/modules/comment/class/CommentActionFrame.class.php:removed
--- xoops2jp/html/modules/comment/class/CommentActionFrame.class.php:1.1.2.2	Fri Nov 25 00:19:50 2005
+++ xoops2jp/html/modules/comment/class/CommentActionFrame.class.php	Thu Feb  2 18:29:00 2006
@@ -1,173 +0,0 @@
-<?php
-// $Id: CommentActionFrame.class.php,v 1.1.2.2 2005/11/24 15:19:50 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionStrategy.class.php";
-
-define ("COMMENT_FRAME_PERFORM_SUCCESS",1);
-define ("COMMENT_FRAME_PERFORM_FAIL",2);
-define ("COMMENT_FRAME_INIT_SUCCESS",3);
-
-define ("COMMENT_FRAME_VIEW_NONE",1);
-define ("COMMENT_FRAME_VIEW_SUCCESS",1);
-define ("COMMENT_FRAME_VIEW_ERROR",2);
-define ("COMMENT_FRAME_VIEW_INDEX",3);
-define ("COMMENT_FRAME_VIEW_INPUT",4);
-
-/**
- * This is simple frame work for misc page controller.
- * @package user
- */
-class CommentActionFrame extends XCube_ActionStrategy
-{
-	var $mActionName="";
-	var $mAction;
-	
-	var $mAdminFlag=false;
-	
-	function CommentActionFrame($admin=false)
-	{
-		$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="Comment".ucfirst($this->mActionName)."Action";
-		$fileName=null;
-		if($this->mAdminFlag) {
-			$fileName=XOOPS_MODULE_PATH."/comment/admin/actions/${className}.class.php";
-		}
-		else {
-			$fileName=XOOPS_MODULE_PATH."/comment/actions/${className}.class.php";
-		}
-		if(!file_exists($fileName))
-			die();	// TODO
-		
-		require_once $fileName;
-		if(class_exists($className))
-				$this->mAction=new $className();
-		
-		if(!is_object($this->mAction))
-			die();	// TODO
-
-		$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 COMMENT_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case COMMENT_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case COMMENT_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-
-			case COMMENT_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-		}
-	}
-}
-
-class CommentAction
-{
-	var $mClient;
-	
-	function CommentAction()
-	{
-	}
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		$controller->mRoot->mLanguageManager->loadModuleLanguage("comment");
-		$this->_processService($controller);
-	}
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return COMMENT_FRAME_VIEW_NONE;
-	}
-	
-	function execute()
-	{
-		return COMMENT_FRAME_VIEW_NONE;
-	}
-	
-	function _processService($controller)
-	{
-		$service=&$controller->mRoot->mServiceManager->searchXCubeService('Comment');
-		if($service==null) {
-			die();	// FIXME
-		}
-
-		$this->mClient=new XCube_ServiceClient($service);
-		$parameters=array('rule'=>$controller->mModuleController->getConfig('com_rule'));
-		$result=&$this->mClient->call("setConfig",$parameters);
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2080] CVS update: xoops2jp/html/modules/comment/forms
Message-ID: <20060202092900.B2A5D2AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/forms/CommentPostForm.class.php
diff -u xoops2jp/html/modules/comment/forms/CommentPostForm.class.php:1.1.2.3 xoops2jp/html/modules/comment/forms/CommentPostForm.class.php:removed
--- xoops2jp/html/modules/comment/forms/CommentPostForm.class.php:1.1.2.3	Fri Nov 25 03:13:06 2005
+++ xoops2jp/html/modules/comment/forms/CommentPostForm.class.php	Thu Feb  2 18:29:00 2006
@@ -1,31 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class CommentPostForm extends XCube_ActionForm 
-{
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['objId']=new XCube_IntProperty('objId');
-		$this->mFormProperties['title']=new XCube_StringProperty('title');
-		$this->mFormProperties['text']=new XCube_TextProperty('text');
-	}
-	
-	function load(&$master,$replyAttr)
-	{
-		//
-		// If replytitle is set, set it to title.
-		//
-		if(isset($replyAttr['title']) && !$this->getVar('title'))
-			$this->setVar('title',"Re:" . $replyAttr['title']);
-
-		$this->setVar('objId',$master->getId());
-	}
-}
-
-?>
Index: xoops2jp/html/modules/comment/forms/CommentReplyForm.class.php
diff -u xoops2jp/html/modules/comment/forms/CommentReplyForm.class.php:1.1.2.3 xoops2jp/html/modules/comment/forms/CommentReplyForm.class.php:removed
--- xoops2jp/html/modules/comment/forms/CommentReplyForm.class.php:1.1.2.3	Fri Nov 25 03:13:17 2005
+++ xoops2jp/html/modules/comment/forms/CommentReplyForm.class.php	Thu Feb  2 18:29:00 2006
@@ -1,45 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class CommentReplyForm extends XCube_ActionForm 
-{
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['pid']=new XCube_IntProperty('pid');
-		$this->mFormProperties['title']=new XCube_StringProperty('title');
-		$this->mFormProperties['message']=new XCube_TextProperty('message');
-
-		// set fields
-	}
-	
-	function load(&$master)
-	{
-		$this->setVar('pid',$master->getVar('id'));
-
-		//
-		// Initialize own title by the com_title of the master.
-		//
-		$title=$master->getVar('title');
-		if(preg_match("/re\[(\d+)\]:(.+)$/i",$title,$matches)) {
-			$this->setVar('title', "Re[" . ($matches[1]+1) . "]:" . $matches[2]);
-		}
-		elseif(preg_match("/re:(.+)$/i",$title,$matches)) {
-			$this->setVar('title',"Re[2]:".$matches[1]);
-		}
-		else {
-			$this->setVar('title',"Re:".$title);
-		}
-	}
-
-	function update(&$master)
-	{
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:00 +0900
Subject: [xoops-cvslog 2081] CVS update: xoops2jp/html/modules/comment/sql
Message-ID: <20060202092900.D5F182AC09B@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/sql/mysql.sql
diff -u xoops2jp/html/modules/comment/sql/mysql.sql:1.1.2.1 xoops2jp/html/modules/comment/sql/mysql.sql:removed
--- xoops2jp/html/modules/comment/sql/mysql.sql:1.1.2.1	Thu Nov 24 18:46:05 2005
+++ xoops2jp/html/modules/comment/sql/mysql.sql	Thu Feb  2 18:29:00 2006
@@ -1,26 +0,0 @@
-CREATE TABLE comment_comments (
-	id mediumint(8) unsigned NOT NULL auto_increment,
-	pid mediumint(8) unsigned NOT NULL default '0',
-	root_id mediumint(8) unsigned NOT NULL default '0',
-	obj_id int(10) unsigned NOT NULL default '0',
-	icon varchar(25) NOT NULL default '',
-	created_time int(10) unsigned NOT NULL default '0',
-	modified_time int(10) unsigned NOT NULL default '0',
-	uid mediumint(8) unsigned NOT NULL default '0',
-	ip varchar(15) NOT NULL default '',
-	title varchar(255) NOT NULL default '',
-	message text NOT NULL,
-	status tinyint(1) unsigned NOT NULL default '0',
-	
-	sig tinyint(1) unsigned NOT NULL default '0',
-	exparams varchar(255) NOT NULL default '',
-
-	dohtml tinyint(1) unsigned NOT NULL default '0',
-	dosmiley tinyint(1) unsigned NOT NULL default '0',
-	doxcode tinyint(1) unsigned NOT NULL default '0',
-	doimage tinyint(1) unsigned NOT NULL default '0',
-	dobr tinyint(1) unsigned NOT NULL default '0',
-	
-	PRIMARY KEY(id),
-	KEY(obj_id)
-) TYPE=MyISAM;

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:01 +0900
Subject: [xoops-cvslog 2082] CVS update: xoops2jp/html/modules/comment/event
Message-ID: <20060202092901.070182AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/event/CommentEventFunction.class.php
diff -u xoops2jp/html/modules/comment/event/CommentEventFunction.class.php:1.1.2.3 xoops2jp/html/modules/comment/event/CommentEventFunction.class.php:removed
--- xoops2jp/html/modules/comment/event/CommentEventFunction.class.php:1.1.2.3	Fri Nov 25 13:26:00 2005
+++ xoops2jp/html/modules/comment/event/CommentEventFunction.class.php	Thu Feb  2 18:29:00 2006
@@ -1,48 +0,0 @@
-<?php
-
-class CommentEventFunction
-{
-/*	function PostFormAccess(&$controller,&$eventArgs)
-	{
-		require_once XOOPS_ROOT_PATH."/modules/comment/forms/CommentPostForm.class.php";
-		$form=new CommentPostForm();
-		$form->prepare();
-
-		$controller->mRenderSystem->setAttribute("comment_ComentPostForm",$form);
-	}*/
-	
-	/**
-	 *  TEST
-	 */
-	function PostFormAccess(&$controller,&$envetArgs)
-	{
-		$controller->mRoot->mLanguageManager->loadModuleLanguage("comment");
-
-		require_once XOOPS_ROOT_PATH."/modules/comment/forms/CommentPostForm.class.php";
-		$form=new CommentPostForm();
-		$form->prepare();
-		
-		$renderTarget=new CommentRenderTarget();
-		$renderTarget->setAttribute("actionForm",$form);
-		$renderTarget->setTemplateName("comment_post_input.html");
-
-		$controller->mRenderSystem->renderWithTarget($renderTarget);
-		
-		$controller->mRenderSystem->setAttribute("comment_post_form",$renderTarget->getResult());
-	}
-}
-
-class CommentRenderTarget extends XCube_RenderTarget
-{
-	function CommentRenderTarget()
-	{
-		parent::XCube_RenderTarget();
-	}
-	
-	function isTheme()
-	{
-		return false;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/comment/event/CommentEventProxyRegister.class.php
diff -u xoops2jp/html/modules/comment/event/CommentEventProxyRegister.class.php:1.1.2.2 xoops2jp/html/modules/comment/event/CommentEventProxyRegister.class.php:removed
--- xoops2jp/html/modules/comment/event/CommentEventProxyRegister.class.php:1.1.2.2	Fri Nov 25 03:11:01 2005
+++ xoops2jp/html/modules/comment/event/CommentEventProxyRegister.class.php	Thu Feb  2 18:29:00 2006
@@ -1,29 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
-
-/**
- * This class is proxy for a event manager about the process of comment.
- */
-class CommentEventProxyRegister extends XCube_EventProxyRegister
-{
-	var $_mList=array("Module.Comment.PostForm.Access","Module.Comment.PostForm.Submit",
-	                   "Module.Comment.PostFrom.Preview","Module.Comment.ReplyForm.Access",
-	                   "Module.Comment.ReplyForm.Submit","Module.Comment.ReplyForm.Preview",
-	                   "Module.Comment.DeleteForm.Access","Module.Comment.DeleteForm.Submit",
-	                   "Module.Comment.ListView.Access");
-	
-	function getEventNameList()
-	{
-		return $this->_mList;
-	}
-
-	function &createModule_Comment_PostForm_AccessDelegate()
-	{
-		require_once XOOPS_ROOT_PATH."/modules/comment/event/CommentEventFunction.class.php";
-		$delegate=new XCube_Delegate("CommentEventFunction","PostFormAccess");
-		return $delegate;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:01 +0900
Subject: [xoops-cvslog 2083] CVS update: xoops2jp/html/modules/comment
Message-ID: <20060202092901.2FC852AC09B@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/xoops_version.php
diff -u xoops2jp/html/modules/comment/xoops_version.php:1.1.2.3 xoops2jp/html/modules/comment/xoops_version.php:removed
--- xoops2jp/html/modules/comment/xoops_version.php:1.1.2.3	Fri Nov 25 00:04:24 2005
+++ xoops2jp/html/modules/comment/xoops_version.php	Thu Feb  2 18:29:01 2006
@@ -1,58 +0,0 @@
-<?php
-// $Id$
-//  ------------------------------------------------------------------------ //
-//              XOOPSCube - PHP Content Management System                    //
-//                  Copyright (c) 2005 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-$modversion['name'] = _MI_COMMENT_NAME;
-$modversion['version'] = 1.00;
-$modversion['description'] = _MI_COMMENT_NAME_DESC;
-$modversion['author'] = "";
-$modversion['credits'] = "The XOOPS Cube Project";
-$modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 1;
-$modversion['image'] = "images/comment.gif";
-$modversion['dirname'] = "comment";
-
-//
-// Database Setting
-//
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$modversion['tables'][0] = "comment_comments";
-
-// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-
-// Templates
-$modversion['templates'][1]['file'] = "comment_delete_input.html";
-$modversion['templates'][2]['file'] = "comment_reply_input.html";
-$modversion['templates'][3]['file'] = "comment_post_input.html";
-$modversion['templates'][4]['file'] = "comment_comment.html";
-
-// Menu
-$modversion['hasMain'] = 0;
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:29:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:29:01 +0900
Subject: [xoops-cvslog 2084] CVS update: xoops2jp/html/modules/comment/service
Message-ID: <20060202092901.542252AC09D@users.sourceforge.jp>

Index: xoops2jp/html/modules/comment/service/LegacyCommentService.class.php
diff -u xoops2jp/html/modules/comment/service/LegacyCommentService.class.php:1.1.2.2 xoops2jp/html/modules/comment/service/LegacyCommentService.class.php:removed
--- xoops2jp/html/modules/comment/service/LegacyCommentService.class.php:1.1.2.2	Thu Nov 24 18:45:07 2005
+++ xoops2jp/html/modules/comment/service/LegacyCommentService.class.php	Thu Feb  2 18:29:01 2006
@@ -1,173 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_Service.class.php";
-
-/**
- *
- *
- *
- *
- */
-class LegacyCommentService extends XCube_Service
-{
-	var $mRule;
-
-	function doSetConfig(&$parameters)
-	{
-		$this->mRule=$parameters['rule'];
-		
-		$dmy=null;
-		return $dmy;
-	}
-	
-	function doGetComment(&$parameters)
-	{
-		$commentHandler=&xoops_getmodulehandler('comments','comment');
-		$comment=&$commentHandler->get($parameters['Id']);
-
-		return $comment;
-	}
-
-	function doGetComments(&$parameters)
-	{
-		$commentHandler=&xoops_getmodulehandler('comments','comment');
-		$comments=&$commentHandler->getObjectsByObjId($parameters['ObjectId']);
-
-		return $comments;
-	}
-	
-	function doPost(&$parameters)
-	{
-		$ret=false;
-		
-		/* TODO START */
-		$commentHandler=&xoops_getmodulehandler('comments','comment');
-		$comment=&$commentHandler->create();
-		
-		$comment->setVar('obj_id',$parameters['ObjectId']);
-
-		if(isset($parameters['Icon'])) {
-			$comment->setVar('icon',$parameters['Icon']);
-		}
-		else {
-			$comment->setVar('icon','blank.gif');
-		}
-
-		$comment->setVar('title',$parameters['Title']);
-		$comment->setVar('message',$parameters['Message']);
-		$comment->setVar('uid',$parameters['User']->getId());
-
-		$comment->setVar("status",XOOPS_COMMENT_PENDING);
-
-		if(isset($parameters['Ip']))
-			$comment->setVar("ip",$parameters['Ip']);
-		
-		if(!$commentHandler->insert($comment))
-			return $ret;
-
-		//
-		// If this is a top comment, set own id as root id.
-		//
-		$comment->setVar('root_id',$comment->getVar('id'));
-		if($commentHandler->insert($comment)) {
-			$ret=&$comment;
-		}
-		else {
-			$commentHandler->delete($comment);
-		}
-		
-		return $ret;
-	}
-	
-	function doPostResponse(&$parameters)
-	{
-		$ret=false;
-		
-		//
-		// TODO We must remove 'CODE CLONE'
-		//
-		
-		
-		/* TODO START */
-		$commentHandler=&xoops_getmodulehandler('comments','comment');
-		$parentComment=&$commentHandler->get($parameters['ParentId']);
-		if(!is_object($parentComment))
-			return $ret;
-
-		$comment=&$parentComment->createChild();
-
-		if(isset($parameters['Icon'])) {
-			$comment->setVar('icon',$parameters['Icon']);
-		}
-		else {
-			$comment->setVar('icon','blank.gif');
-		}
-
-		$comment->setVar('title',$parameters['Title']);
-		$comment->setVar('message',$parameters['Message']);
-		$comment->setVar('uid',$parameters['User']->getId());
-
-		$comment->setVar("status",XOOPS_COMMENT_PENDING);
-
-		if(isset($parameters['Ip']))
-			$comment->setVar("ip",$parameters['Ip']);
-		
-		if(!$commentHandler->insert($comment))
-			return $ret;
-
-		/* TODO END */
-		
-		if($commentHandler->insert($comment))
-			$ret=&$comment;
-
-		return $ret;
-	}
-	
-	function doGetTotalComments(&$parameters)
-	{
-		$ret=0;
-
-		$commentHandler=&xoops_gethandler('comment');
-		
-		$criteria=new CriteriaCompo(new Criteria('com_modid',$parameters['mid']));
-		$criteria->add(new Criteria('com_itemid',$parameters['itemId']));
-		$criteria->add(new Criteria("com_status",XOOPS_COMMENT_ACTIVE));
-		$ret=$commentHandler->getCount($criteria);
-
-		return $ret;
-	}
-	
-	function doDelete(&$parameters)
-	{
-		$commentHandler=&xoops_gethandler('comment');
-		$id=$parameters['Id'];
-		$comment=&$commentHandler->get($id);
-		
-		//
-		// Check
-		//
-		
-		$ret = $commentHandler->delete($comment);
-		
-		return $ret;
-	}
-
-	function doDeleteAll(&$parameters)
-	{
-		$ret=true;	//< TODO
-
-		$commentHandler=&xoops_gethandler('comment');
-		$id=$parameters['Id'];
-		$comment=&$commentHandler->get($id);
-		
-		//
-		// Check
-		//
-
-		$commentHandler->deleteWithChild($comment);
-		
-		return $ret;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 18:36:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 18:36:33 +0900
Subject: [xoops-cvslog 2085] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060202093633.42BDB2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.4 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.5
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.4	Thu Jan 19 21:09:31 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Thu Feb  2 18:36:33 2006
@@ -1,7 +1,45 @@
 <?php
 
-define('_MI_USER_ADMENU_AVATAR_MANAGE', "avatar manage");
+define('_MI_USER_ADMENU_AVATAR_MANAGE', "Avatar manage");
+define('_MI_USER_ADMENU_GROUP_LIST', "User admenu group list");
+define('_MI_USER_ADMENU_LIST', "User admenu list");
 define('_MI_USER_ADMENU_MAIL', "mail");
+define('_MI_USER_ADMENU_NEW_RANK', "User admenu new rank");
+define('_MI_USER_ADMENU_RANK_LIST', "User admenu rank list");
+define('_MI_USER_ADMENU_SEARCH', "User admenu search");
+define('_MI_USER_CONF_ACTV_ADMIN', "User conf actv admin");
+define('_MI_USER_CONF_ACTV_AUTO', "User conf actv auto");
+define('_MI_USER_CONF_ACTV_GROUP', "User conf actv group");
+define('_MI_USER_CONF_ACTV_GROUP_DESC', "User conf actv group desc");
+define('_MI_USER_CONF_ACTV_TYPE', "User conf actv type");
+define('_MI_USER_CONF_ACTV_USER', "User conf actv user");
+define('_MI_USER_CONF_ALLOW_REGISTER', "User conf allow register");
+define('_MI_USER_CONF_ALLOW_REGISTER_DESC', "User conf allow register desc");
+define('_MI_USER_CONF_AVATAR_HEIGHT', "User conf avatar height");
+define('_MI_USER_CONF_AVATAR_MAXSIZE', "User conf avatar maxsize");
+define('_MI_USER_CONF_AVATAR_MINPOSTS', "User conf avatar minposts");
+define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "User conf avatar minposts desc");
+define('_MI_USER_CONF_AVATAR_WIDTH', "User conf avatar width");
+define('_MI_USER_CONF_AVTR_ALLOW_UP', "User conf avtr allow up");
+define('_MI_USER_CONF_BAD_EMAILS', "User conf bad emails");
+define('_MI_USER_CONF_BAD_EMAILS_DESC', "User conf bad emails desc");
+define('_MI_USER_CONF_BAD_UNAMES', "User conf bad unames");
+define('_MI_USER_CONF_BAD_UNAMES_DESC', "User conf bad unames desc");
+define('_MI_USER_CONF_CHGMAIL', "User conf chgmail");
+define('_MI_USER_CONF_DISCLAIMER', "User conf disclaimer");
+define('_MI_USER_CONF_DISCLAIMER_DESC', "User conf disclaimer desc");
+define('_MI_USER_CONF_DISPDSCLMR', "User conf dispdsclmr");
+define('_MI_USER_CONF_DISPDSCLMR_DESC', "User conf dispdsclmr desc");
+define('_MI_USER_CONF_MAXUNAME', "User conf maxuname");
+define('_MI_USER_CONF_MINPASS', "User conf minpass");
+define('_MI_USER_CONF_MINUNAME', "User conf minuname");
+define('_MI_USER_CONF_NEW_NTF_GROUP', "User conf new ntf group");
+define('_MI_USER_CONF_NEW_USER_NOTIFY', "User conf new user notify");
+define('_MI_USER_CONF_SELF_DELETE', "User conf self delete");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL', "User conf uname test level");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "User conf uname test level normal");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "User conf uname test level strong");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "User conf uname test level weak");
 define('_MI_USER_NAME', "User module");
 define('_MI_USER_NAME_DESC', "This module works about user accounts");
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:49:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:49:23 +0900
Subject: [xoops-cvslog 2086] CVS update: xoops2jp/html/class
Message-ID: <20060202114923.9132E2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ActionForm.class.php
diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.26 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.27
--- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.26	Sat Jan 28 23:50:29 2006
+++ xoops2jp/html/class/XCube_ActionForm.class.php	Thu Feb  2 20:49:23 2006
@@ -63,6 +63,16 @@
 		return $this->_mToken;
 	}
 	
+	/**
+	 * Return message when the validation of token is fail.
+	 * 
+	 * @return string
+	 */
+	function getTokenErrorMessage()
+	{
+		return _TOKEN_ERROR;
+	}
+	
 	function set()
 	{
 		if(isset($this->mFormProperties[func_get_arg(0)])) {
@@ -128,12 +138,24 @@
 		if ($this->getTokenName() != null) {
 			$token = xoops_getrequest(strtr($this->getTokenName(), '.', '_'));
 			
+			$flag = true;
+			
 			if (!isset($_SESSION['XCUBE_TOKEN'][$this->getTokenName()])) {
-				$this->addErrorMessage(_TOKEN_ERROR);
+				$flag = false;
 			}
 			elseif ($_SESSION['XCUBE_TOKEN'][$this->getTokenName()] != $token) {
 				unset($_SESSION['XCUBE_TOKEN'][$this->getTokenName()]);
-				$this->addErrorMessage(_TOKEN_ERROR);
+				$flag = false;
+			}
+			
+			if (!$flag) {
+				$message = $this->getTokenErrorMessage();
+				if ($message == null) {
+					$this->mErrorFlag = true;
+				}
+				else {
+					$this->addErrorMessage($message);
+				}
 			}
 			
 			//
@@ -167,9 +189,14 @@
 		}
 	}
 
+	/**
+	 * If the action form keeps error messages or the error flag, return true.
+	 * 
+	 * @return bool
+	 */
 	function hasError()
 	{
-		return count($this->mErrorMessages)>0;
+		return (count($this->mErrorMessages) > 0 || $this->mErrorFlag);
 	}
 	
 	function addErrorMessage($message)

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:57:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:57:17 +0900
Subject: [xoops-cvslog 2087] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202115717.2C82D2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:removed
--- xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.3	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html	Thu Feb  2 20:57:17 2006
@@ -1,69 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></h3>
-
-<form method="post">
-<input type="hidden" name="dummy_ticket" value="now_test" />
-<table classs="outer">
-  <tr>
-    <th><{$smarty.const._MD_A_BASE_LANG_MID}></th>
-    <th><{$smarty.const._MD_A_BASE_LANG_NAME}></th>
-    <th><{$smarty.const._MD_A_BASE_LANG_WEIGHT}></th>
-    <th><{$smarty.const._MD_A_BASE_LANG_ISACTIVE}></th>
-  </tr>
-
-<{foreach item=mid from=$mids}>
-  <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-    <td><{$mid}></td>
-    <td>
-      <{if $actionform->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}>
-        <{$actionform->get('name',$mid)|escape}>
-      <{else}>
-         (<{$moduleObjects[$mid]->getVar('name',e)}>) &raquo; <b style="color:#ff0000;"><{$actionform->get('name',$mid)|escape}></b>
-      <{/if}>
-    </td>
-    <td>
-      <{if $actionform->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}>
-        <{$actionform->get('weight',$mid)|escape}>
-      <{else}>
-         (<{$moduleObjects[$mid]->getVar('weight')}>) &raquo; <b style="color:#ff0000;"><{$actionform->get('weight',$mid)|escape}></b>
-      <{/if}>
-    </td>
-    <td>
-      <{if $actionform->get('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}>
-        <{$smarty.const._MD_A_BASE_LANG_NO_CHANGE}>
-      <{else}>
-        (<{if $moduleObjects[$mid]->getProperty('isactive') == 1 }>
-          <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
-        <{else}>
-          <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}>
-        <{/if}>) 
-        &raquo;
-        <b style="color:#ff0000;">
-        <{if $actionform->get('isactive',$mid) == 1}>
-          <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
-        <{else}>
-          <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}>
-        <{/if}></b>
-      <{/if}>
-    </td>
-  </tr>
-  <input type="hidden" name="name[<{$mid}>]" value="<{$actionform->get('name',$mid)|escape}>" />
-  <input type="hidden" name="weight[<{$mid}>]" value="<{$actionform->get('weight',$mid)|escape}>" />
-  <{if $actionform->get('isactive',$mid)}>
-    <input type="hidden" name="isactive[<{$mid}>]" value="1" />
-  <{else}>
-    <input type="hidden" name="isactive[<{$mid}>]" value="0" />
-  <{/if}>
-<{/foreach}>
-  <tr>
-    <td class="foot" colspan="4">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:57:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:57:55 +0900
Subject: [xoops-cvslog 2088] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202115755.12A992AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.1
--- /dev/null	Thu Feb  2 20:57:55 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html	Thu Feb  2 20:57:54 2006
@@ -0,0 +1,78 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></h3>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
+<form method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=confirm value=1}>
+<table classs="outer">
+  <tr>
+    <th><{$smarty.const._MD_A_BASE_LANG_MID}></th>
+    <th><{$smarty.const._MD_A_BASE_LANG_NAME}></th>
+    <th><{$smarty.const._MD_A_BASE_LANG_WEIGHT}></th>
+    <th><{$smarty.const._MD_A_BASE_LANG_ISACTIVE}></th>
+  </tr>
+
+<{foreach item=mid from=$mids}>
+  <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
+    <td><{$mid}></td>
+    <td>
+      <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}>
+        <{$actionForm->get('name',$mid)|escape}>
+      <{else}>
+         (<{$moduleObjects[$mid]->getVar('name',e)}>) &raquo; <b style="color:#ff0000;"><{$actionForm->get('name',$mid)|escape}></b>
+      <{/if}>
+    </td>
+    <td>
+      <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}>
+        <{$actionForm->get('weight',$mid)|escape}>
+      <{else}>
+         (<{$moduleObjects[$mid]->getVar('weight')}>) &raquo; <b style="color:#ff0000;"><{$actionForm->get('weight',$mid)|escape}></b>
+      <{/if}>
+    </td>
+    <td>
+      <{if $actionForm->get('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}>
+        <{$smarty.const._MD_A_BASE_LANG_NO_CHANGE}>
+      <{else}>
+        (<{if $moduleObjects[$mid]->getProperty('isactive') == 1 }>
+          <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
+        <{else}>
+          <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}>
+        <{/if}>) 
+        &raquo;
+        <b style="color:#ff0000;">
+        <{if $actionForm->get('isactive',$mid) == 1}>
+          <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
+        <{else}>
+          <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}>
+        <{/if}></b>
+      <{/if}>
+    </td>
+  </tr>
+  <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->get('name',$mid)|escape}>" />
+  <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->get('weight',$mid)|escape}>" />
+  <{if $actionForm->get('isactive',$mid)}>
+    <input type="hidden" name="isactive[<{$mid}>]" value="1" />
+  <{else}>
+    <input type="hidden" name="isactive[<{$mid}>]" value="0" />
+  <{/if}>
+<{/foreach}>
+  <tr>
+    <td class="foot" colspan="4">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:58:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:58:19 +0900
Subject: [xoops-cvslog 2089] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202115819.F060E2AC00E@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.3 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.3	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list.html	Thu Feb  2 20:58:19 2006
@@ -7,6 +7,14 @@
 
 <div class="toptab">[ <a href="index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a> ]</div>
 
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
 <form method="post">
 <{xoops_token form=$actionForm}>
 <table classs="outer">

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:58:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:58:40 +0900
Subject: [xoops-cvslog 2090] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060202115840.10E292AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleSettingsForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ModuleSettingsForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/ModuleSettingsForm.class.php:removed
--- xoops2jp/html/modules/base/admin/forms/ModuleSettingsForm.class.php:1.1.2.1	Thu Dec  1 14:17:19 2005
+++ xoops2jp/html/modules/base/admin/forms/ModuleSettingsForm.class.php	Thu Feb  2 20:58:40 2006
@@ -1,39 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class ModuleSettingsForm extends XCube_ActionForm 
-{
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['name']=new XCube_StringArrayProperty('name');
-		$this->mFormProperties['weight']=new XCube_IntArrayProperty('weight');
-		$this->mFormProperties['isactive']=new XCube_IntArrayProperty('isactive');
-
-		// set fields
-		$this->mFieldProperties['name']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['name']->addMessage("required",_MD_A_BASE_ERROR_REQUIRED,_MD_A_BASE_LANG_NAME,"140");
-		$this->mFieldProperties['name']->addMessage("maxlength",_MD_A_BASE_ERROR_MAXLENGTH,_MD_A_BASE_LANG_NAME,"140");
-		$this->mFieldProperties['name']->addVar("maxlength",140);
-
-		$this->mFieldProperties['weight']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['weight']->setDependsByArray(array('required','min'));
-		$this->mFieldProperties['weight']->addMessage("min",_MD_A_BASE_ERROR_MIN,_MD_A_BASE_LANG_WEIGHT,"0");
-		$this->mFieldProperties['weight']->addVar("min",0);
-
-		$this->mFieldProperties['isactive']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['isactive']->setDependsByArray(array('required','intRange'));
-		$this->mFieldProperties['isactive']->addMessage("min",_MD_A_BASE_ERROR_ABOUT_ISACTIVE);
-		$this->mFieldProperties['isactive']->addVar("min",0);
-		$this->mFieldProperties['isactive']->addVar("max",1);
-
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 20:59:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 20:59:31 +0900
Subject: [xoops-cvslog 2091] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060202115931.8EA662AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleListForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/ModuleListForm.class.php:1.1.2.1
--- /dev/null	Thu Feb  2 20:59:31 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleListForm.class.php	Thu Feb  2 20:59:31 2006
@@ -0,0 +1,57 @@
+<?php
+
+require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
+
+/**
+ * This class is generated by makeActionForm tool.
+ * @auchor makeActionForm
+ */
+class Legacy_ModuleListForm extends XCube_ActionForm 
+{
+	/**
+	 * If the request is GET, never return token name.
+	 * By this logic, a action can have three page in one action.
+	 */
+	function getTokenName()
+	{
+		//
+		//
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			return "module.legacy.ModuleSettingsForm.TOKEN";
+		}
+		else {
+			return null;
+		}
+	}
+	
+	/**
+	 * For displaying the confirm-page, don't show CSRF error.
+	 * Always return null.
+	 */
+	function getTokenErrorMessage()
+	{
+		return null;
+	}
+	
+	function prepare()
+	{
+		// set properties
+		$this->mFormProperties['name']=new XCube_StringArrayProperty('name');
+		$this->mFormProperties['weight']=new XCube_IntArrayProperty('weight');
+		$this->mFormProperties['isactive']=new XCube_BoolArrayProperty('isactive');
+
+		// set fields
+		$this->mFieldProperties['name']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['name']->addMessage("required",_MD_A_BASE_ERROR_REQUIRED,_MD_A_BASE_LANG_NAME,"140");
+		$this->mFieldProperties['name']->addMessage("maxlength",_MD_A_BASE_ERROR_MAXLENGTH,_MD_A_BASE_LANG_NAME,"140");
+		$this->mFieldProperties['name']->addVar("maxlength",140);
+
+		$this->mFieldProperties['weight']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['weight']->setDependsByArray(array('required','min'));
+		$this->mFieldProperties['weight']->addMessage("min",_MD_A_BASE_ERROR_MIN,_MD_A_BASE_LANG_WEIGHT,"0");
+		$this->mFieldProperties['weight']->addVar("min",0);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:00:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:00:43 +0900
Subject: [xoops-cvslog 2092] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120043.0BD5B2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php	Thu Feb  2 21:00:42 2006
@@ -1,92 +1,90 @@
 <?php
 /**
- * @version $Id: ModuleListAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.2 2006/02/02 12:00:42 minahito Exp $
  */
 
-require_once XOOPS_BASE_PATH."/admin/forms/ModuleListFilterForm.class.php";
-require_once XOOPS_BASE_PATH."/admin/forms/ModuleSettingsForm.class.php";
+require_once XOOPS_BASE_PATH . "/admin/forms/ModuleListFilterForm.class.php";
+require_once XOOPS_BASE_PATH . "/admin/forms/ModuleSettingsForm.class.php";
 
 class Legacy_ModuleListAction extends Legacy_Action
 {
-	var $mDB=null;
-	var $mModuleObjects=array();
-	var $mFilter=null;
-	var $mForm=null;
+	var $mDB = null;
+	var $mModuleObjects = array();
+	var $mFilter = null;
 
-	function prepare(&$controller,&$xoopsUser)
+	var $mActionForm = null;
+
+	function prepare(&$controller, &$xoopsUser)
 	{
-		$this->mDB=&$controller->getDB();
+		$this->mDB =& $controller->getDB();
+		
+		$this->mActionForm =& new Legacy_ModuleSettingsForm();
+		$this->mActionForm->prepare();
 	}
+	
 
-	function getDefaultView(&$controller,&$xoopsUser)
+	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$this->mFilter=new ModuleListFilterForm();
+		$this->mFilter =& new ModuleListFilterForm();
 		$this->mFilter->fetch();
 		
-		$moduleHandler=&xoops_gethandler('module');
+		$moduleHandler =& xoops_gethandler('module');
 
 		// dmy
-		$criteria=new Criteria('mid',0,'>');
+		$criteria =& new Criteria('mid',0,'>');
 		$criteria->setSort($this->mFilter->getSort());
 		$criteria->setOrder($this->mFilter->getOrder());
 		
-		$this->mModuleObjects=&$moduleHandler->getObjects($criteria);
+		$this->mModuleObjects =& $moduleHandler->getObjects($criteria);
 
 		return LEGACY_FRAME_VIEW_INDEX;
 	}
 	
-	function execute(&$controller,&$xoopsUser)
+	function execute(&$controller, &$xoopsUser)
 	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objests=$moduleHandler->getObjects();
-
-		$this->mForm=new ModuleSettingsForm();
-		$this->mForm->prepare();
-		
-		$this->mForm->fetch();
-		$this->mForm->validate();
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
 
-		if($this->mForm->hasError() || !isset($_POST['dummy_ticket'])) {
-			return $this->_processConfirm($controller,$xoopsUser);
+		if ($this->mActionForm->hasError()) {
+			return $this->_processConfirm($controller, $xoopsUser);
 		}
 		else {
-			return $this->_processSave($controller,$xoopsUser);
+			return $this->_processSave($controller, $xoopsUser);
 		}
-
 	}
 	
 	function _processConfirm(&$controller,&$xoopsUser)
 	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objests=$moduleHandler->getObjects();
+		$moduleHandler =& xoops_gethandler('module');
+		$objects =& $moduleHandler->getObjects();
 
 		//
 		// Do mapping.
 		//
-		foreach($objests as $modObject) {
-			$this->mModuleObjects[$modObject->getVar('mid')]=&$modObject;
+		foreach ($objects as $modObject) {
+			$this->mModuleObjects[$modObject->get('mid')] =& $modObject;
 			unset($modObject);
 		}
 
 		return LEGACY_FRAME_VIEW_INPUT;
 	}
 
-	function _processSave(&$controller,&$xoopsUser)
+	function _processSave(&$controller, &$xoopsUser)
 	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objects=$moduleHandler->getObjects();
+		$moduleHandler =& xoops_gethandler('module');
+		$objects =& $moduleHandler->getObjects();
 		
-		$successFlag=true;
+		$successFlag = true;
 		foreach($objects as $modObject) {
-			$mid=$modObject->getVar('mid');
-			$modObject->setVar('name',$this->mForm->getVar('name',$mid));
-			$modObject->setVar('weight',$this->mForm->getVar('weight',$mid));
-			$modObject->setVar('isactive',$this->mForm->getVar('isactive',$mid));
+			$mid = $modObject->get('mid');
+			$modObject->set('name', $this->mActionForm->get('name', $mid));
+			$modObject->set('weight', $this->mActionForm->get('weight', $mid));
+			$modObject->set('isactive', $this->mActionForm->get('isactive', $mid));
 
 			//
 			// Store.
 			//
-			$successFlag&=$moduleHandler->insert($modObject);
+			$successFlag &= $moduleHandler->insert($modObject);
 		}
 		
 		return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
@@ -95,43 +93,46 @@
 	/**
 	 * To support a template writer, this send the list of mid that actionForm kept.
 	 */
-	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
-		$renderer->setTemplateName("modulelist_confirm.html");
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
-		$renderer->setAttribute('actionForm',$this->mForm);
+		$render->setTemplateName("module_list_confirm.html");
+		$render->setAttribute('moduleObjects', $this->mModuleObjects);
+		$render->setAttribute('actionForm', $this->mActionForm);
 		
 		//
 		// To support a template writer, this send the list of mid that
 		// actionForm kept.
 		//
-		$tarray=&$this->mForm->getVar('name');
-		$renderer->setAttribute('mids',array_keys($tarray));
+		$tarray=&$this->mActionForm->get('name');
+		$render->setAttribute('mids', array_keys($tarray));
 	}
 
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
-		$renderer->setTemplateName("module_list.html");
+		$render->setTemplateName("module_list.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
 
 		//
 		// Load adminmenu before we assign these to template.
 		//
 		foreach(array_keys($this->mModuleObjects) as $key) {
 			$this->mModuleObjects[$key]->loadAdminMenu();
-			$this->mModuleObjects[$key]->loadInfo($this->mModuleObjects[$key]->getVar('dirname'));
+			$this->mModuleObjects[$key]->loadInfo($this->mModuleObjects[$key]->get('dirname'));
 		}
-
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
+		$render->setAttribute('moduleObjects', $this->mModuleObjects);
 	}
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
 	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*SUCCESS*");
+		$controller->executeForward('./index.php?action=ModuleList');
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderer)
+	function executeViewError(&$controller, &$xoopsUser, &$renderer)
 	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*ERROR*");
+		//
+		// TODO removed
+		//
+		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*ERROR*");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:00:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:00:58 +0900
Subject: [xoops-cvslog 2093] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060202120058.7FADB2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/module_update.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.1
--- /dev/null	Thu Feb  2 21:00:58 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_update.xml	Thu Feb  2 21:00:58 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="ModuleUpdateForm" type="XCube_ActionForm">
+		<form-property name="dirname" type="String" />
+		<form-property name="agree" type="Bool" />
+		<form-property name="force" type="Bool" />
+	</form-bean>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:01:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:01:27 +0900
Subject: [xoops-cvslog 2094] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120127.778CE2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php	Thu Feb  2 21:01:27 2006
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.2 2006/02/02 12:01:27 minahito Exp $
  */
 
-require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_BASE_PATH."/admin/class/ModuleUpdater.class.php";
+require_once XOOPS_BASE_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH . "/admin/class/ModuleUpdater.class.php";
+require_once XOOPS_BASE_PATH . "/admin/forms/ModuleUpdateForm.class.php";
 
 class Legacy_ModuleUpdateAction extends Legacy_AbstractModuleInstallAction
 {
@@ -13,7 +14,13 @@
 		$installer =& new Legacy_ModuleUpdater($dirname);
 		return $installer;
 	}
-
+	
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_ModuleUpdateForm();
+		$this->mActionForm->prepare();
+	}
+	
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
 	{
 		$renderer->setTemplateName("module_update_success.html");
@@ -24,6 +31,7 @@
 	{
 		$renderer->setTemplateName("module_update_confirm.html");
 		$renderer->setAttribute('module',$this->mModuleObject);
+		$renderer->setAttribute('actionForm',$this->mActionForm);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:01:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:01:40 +0900
Subject: [xoops-cvslog 2095] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060202120140.2EF372AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php:1.1.2.1
--- /dev/null	Thu Feb  2 21:01:40 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php	Thu Feb  2 21:01:40 2006
@@ -0,0 +1,37 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class Legacy_ModuleUpdateForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacy.ModuleUpdateForm.TOKEN." . $this->get('dirname');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname');
+		$this->mFormProperties['agree'] =& new XCube_BoolProperty('agree');
+		$this->mFormProperties['force'] =& new XCube_BoolProperty('force');
+	
+		//
+		// Set field properties
+		//
+	}
+
+	function load(&$obj)
+	{
+		$this->set('dirname', $obj->get('dirname'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('dirname', $this->get('dirname'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:03:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:03:15 +0900
Subject: [xoops-cvslog 2096] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120315.F39FA2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.2	Thu Feb  2 21:00:42 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php	Thu Feb  2 21:03:15 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleListAction.class.php,v 1.1.2.2 2006/02/02 12:00:42 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.3 2006/02/02 12:03:15 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH . "/admin/forms/ModuleListFilterForm.class.php";
@@ -18,7 +18,7 @@
 	{
 		$this->mDB =& $controller->getDB();
 		
-		$this->mActionForm =& new Legacy_ModuleSettingsForm();
+		$this->mActionForm =& new Legacy_ModuleListForm();
 		$this->mActionForm->prepare();
 	}
 	

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:03:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:03:50 +0900
Subject: [xoops-cvslog 2097] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120350.2CDF92AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.3	Thu Feb  2 21:03:15 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php	Thu Feb  2 21:03:50 2006
@@ -1,10 +1,10 @@
 <?php
 /**
- * @version $Id: ModuleListAction.class.php,v 1.1.2.3 2006/02/02 12:03:15 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.4 2006/02/02 12:03:50 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH . "/admin/forms/ModuleListFilterForm.class.php";
-require_once XOOPS_BASE_PATH . "/admin/forms/ModuleSettingsForm.class.php";
+require_once XOOPS_BASE_PATH . "/admin/forms/ModuleListForm.class.php";
 
 class Legacy_ModuleListAction extends Legacy_Action
 {

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:04:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:04:34 +0900
Subject: [xoops-cvslog 2098] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060202120435.038382AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.1
--- /dev/null	Thu Feb  2 21:04:34 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php	Thu Feb  2 21:04:34 2006
@@ -0,0 +1,35 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class Legacy_ModuleUninstallForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacy.ModuleUninstallForm.TOKEN." . $this->get('dirname');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname');
+	
+		//
+		// Set field properties
+		//
+	}
+
+	function load(&$obj)
+	{
+		$this->set('dirname', $obj->get('dirname'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('dirname', $this->get('dirname'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:04:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:04:46 +0900
Subject: [xoops-cvslog 2099] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060202120446.C9F9A2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.1
--- /dev/null	Thu Feb  2 21:04:46 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml	Thu Feb  2 21:04:46 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="ModuleUninstallForm" type="XCube_ActionForm">
+		<form-property name="dirname" type="String" />
+	</form-bean>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:05:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:05:15 +0900
Subject: [xoops-cvslog 2100] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120515.6DB962AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php	Thu Feb  2 21:05:15 2006
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.2 2006/02/02 12:05:15 minahito Exp $
  */
 
-require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_BASE_PATH."/admin/class/ModuleUninstaller.class.php";
+require_once XOOPS_BASE_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH . "/admin/class/ModuleUninstaller.class.php";
+require_once XOOPS_BASE_PATH . "/admin/forms/ModuleUninstallForm.class.php";
 
 /**
  * Uninstall module
@@ -16,6 +17,12 @@
 		$installer =& new Legacy_ModuleUninstaller($dirname);
 		return $installer;
 	}
+	
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_ModuleUninstallForm();
+		$this->mActionForm->prepare();
+	}
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
 	{
@@ -26,6 +33,7 @@
 	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
 	{
 		$renderer->setTemplateName("module_uninstall_confirm.html");
+		$renderer->setAttribute('actionForm',$this->mActionForm);
 		$renderer->setAttribute('module',$this->mModuleObject);
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:05:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:05:26 +0900
Subject: [xoops-cvslog 2101] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202120526.EE09E2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.4	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php	Thu Feb  2 21:05:26 2006
@@ -14,6 +14,17 @@
 	var $mModuleObject = null;
 	var $mLog = null;
 	
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$this->_setupActionForm();
+	}
+	
+	function _setupActionForm()
+	{
+	}
+
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$dirname = trim($_GET['dirname']);
@@ -27,6 +38,8 @@
 			return LEGACY_FRAME_VIEW_ERROR;
 		}
 
+		$this->mActionForm->load($this->mModuleObject);
+		
 		$this->mModuleObject->loadAdminMenu();
 		$this->mModuleObject->loadInfo($dirname);
 		
@@ -35,30 +48,27 @@
 
 	function execute(&$controller, &$xoopsUser)
 	{
-		$dirname = trim($_POST['dirname']);
-		$agree = false;
-		if (isset($_POST['agree'])) {
-			$agree = intval($_POST['agree']) > 0 ? true : false;
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return LEGACY_FRAME_VIEW_INPUT;
 		}
-
-		$force=false;
-		if(isset($_POST['force']))
-			$force=intval($_POST['force'])>0 ? true : false;
-
-		$installer =& $this->_getInstaller($dirname);
-		$this->mModuleObject =& $installer->loadModuleObject($dirname);
+		
+		$installer =& $this->_getInstaller($this->mActionForm->get('dirname'));
+		$this->mModuleObject =& $installer->loadModuleObject($this->mActionForm->get('dirname'));
 		
 		if (!is_object($this->mModuleObject)) {
 			return LEGACY_FRAME_VIEW_ERROR;
 		}
 
-		if ($installer->hasAgree() && !$agree) {
+		if ($installer->hasAgree() && !$this->mActionForm->get('agree')) {
 			$this->_loadAgreement();
 			return LEGACY_FRAME_VIEW_INPUT;
 		}
 		
-		$installer->setForceMode($force);
-		$installer->execute($dirname);
+		$installer->setForceMode($this->mActionForm->get('force'));
+		$installer->execute($this->mActionForm->get('dirname'));
 
 		$this->mLog =& $installer->getLog();
 		

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:06:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:06:45 +0900
Subject: [xoops-cvslog 2102] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060202120645.947E72AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/module_install.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.1
--- /dev/null	Thu Feb  2 21:06:45 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_install.xml	Thu Feb  2 21:06:45 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="ModuleInstallForm" type="XCube_ActionForm">
+		<form-property name="dirname" type="String" />
+		<form-property name="agree" type="Bool" />
+		<form-property name="force" type="Bool" />
+	</form-bean>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:10:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:10:42 +0900
Subject: [xoops-cvslog 2103] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060202121042.D70442AC025@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.9 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.10
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.9	Wed Jan 25 17:02:36 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Thu Feb  2 21:10:42 2006
@@ -323,34 +323,36 @@
 		$configHandler =& xoops_gethandler('config');
 
 		$count = 0;
-		foreach ($configInfos as $configInfo) {
-			$config =& $configHandler->createConfig();
-
-			$config->setVar('conf_modid', $module->getVar('mid'));
-			$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);
-			$config->setVar('conf_formtype', $configInfo['formtype'], true);
-			$config->setVar('conf_valuetype', $configInfo['valuetype'], true);
-			$config->setConfValueForInput($configInfo['default'], true);
-			$config->setVar('conf_order', $count++);
-
-			if (isset($configInfo['options']) && is_array($configInfo['options'])) {
-				foreach ($configInfo['options'] as $key => $value) {
-					$configOption =& $configHandler->createConfigOption();
-					$configOption->setVar('confop_name', $key, true);
-					$configOption->setVar('confop_value', $value, true);
-					$config->setConfOptions($configOption);
-					unset($configOption);
+		if (is_array($configInfos)) {
+			foreach ($configInfos as $configInfo) {
+				$config =& $configHandler->createConfig();
+	
+				$config->setVar('conf_modid', $module->getVar('mid'));
+				$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);
+				$config->setVar('conf_formtype', $configInfo['formtype'], true);
+				$config->setVar('conf_valuetype', $configInfo['valuetype'], true);
+				$config->setConfValueForInput($configInfo['default'], true);
+				$config->setVar('conf_order', $count++);
+	
+				if (isset($configInfo['options']) && is_array($configInfo['options'])) {
+					foreach ($configInfo['options'] as $key => $value) {
+						$configOption =& $configHandler->createConfigOption();
+						$configOption->setVar('confop_name', $key, true);
+						$configOption->setVar('confop_value', $value, true);
+						$config->setConfOptions($configOption);
+						unset($configOption);
+					}
 				}
+				
+				if (!$configHandler->insertConfig($config)) {
+					$log->addError("ERROR: Could not insert config " . $configInfo['name']);
+				}
+				
+				unset($config);
 			}
-			
-			if (!$configHandler->insertConfig($config)) {
-				$log->addError("ERROR: Could not insert config " . $configInfo['name']);
-			}
-			
-			unset($config);
 		}
 	}
 

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:11:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:11:01 +0900
Subject: [xoops-cvslog 2104] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202121101.D2CDE2AC025@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.1 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Thu Feb  2 21:11:01 2006
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.2 2006/02/02 12:11:01 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
 require_once XOOPS_BASE_PATH."/admin/class/ModuleInstaller.class.php";
+require_once XOOPS_BASE_PATH."/admin/forms/ModuleInstallForm.class.php";
 
 /**
  * Install module
@@ -19,6 +20,12 @@
 		$installer =& new Legacy_ModuleInstaller($dirname);
 		return $installer;
 	}
+	
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_ModuleInstallForm();
+		$this->mActionForm->prepare();
+	}
 
 	function _loadAgreement()
 	{
@@ -49,6 +56,7 @@
 	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
 	{
 		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
 
 		if (isset($this->mModuleObject->modinfo['installer'])) {
 			$renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:11:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:11:18 +0900
Subject: [xoops-cvslog 2105] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060202121118.AA23A2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php:1.1.2.1
--- /dev/null	Thu Feb  2 21:11:18 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php	Thu Feb  2 21:11:18 2006
@@ -0,0 +1,37 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class Legacy_ModuleInstallForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacy.ModuleInstallForm.TOKEN." . $this->get('dirname');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname');
+		$this->mFormProperties['agree'] =& new XCube_BoolProperty('agree');
+		$this->mFormProperties['force'] =& new XCube_BoolProperty('force');
+	
+		//
+		// Set field properties
+		//
+	}
+
+	function load(&$obj)
+	{
+		$this->set('dirname', $obj->get('dirname'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('dirname', $this->get('dirname'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:22:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:22:17 +0900
Subject: [xoops-cvslog 2106] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20060202122217.89B502AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/menu.php
diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.5 xoops2jp/html/modules/base/admin/menu.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/menu.php:1.1.2.5	Sun Jan 29 00:51:42 2006
+++ xoops2jp/html/modules/base/admin/menu.php	Thu Feb  2 21:22:17 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: menu.php,v 1.1.2.5 2006/01/28 15:51:42 minahito Exp $
+ * @version $Id: menu.php,v 1.1.2.6 2006/02/02 12:22:17 minahito Exp $
  */
 
 $adminmenu[1]['title']=_MI_BASE_MENU_ACTIONSEARCH;
@@ -10,7 +10,7 @@
 $adminmenu[2]['link']="admin/index.php?action=ModuleList";
 
 $adminmenu[3]['title']=_MI_BASE_MENU_MODULEINSTALL;
-$adminmenu[3]['link']="admin/index.php?action=ModuleDeactiveList";
+$adminmenu[3]['link']="admin/index.php?action=InstallList";
 
 $adminmenu[4]['title']=_MI_BASE_MENU_SMILES_MANAGE;
 $adminmenu[4]['link']="admin/index.php?action=SmilesList";

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:22:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:22:44 +0900
Subject: [xoops-cvslog 2107] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202122244.B89682AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/install_list.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.1
--- /dev/null	Thu Feb  2 21:22:44 2006
+++ xoops2jp/html/modules/base/admin/templates/install_list.html	Thu Feb  2 21:22:44 2006
@@ -0,0 +1,30 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></h3>
+
+<div class="tips"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE}></div>
+
+<table classs="outer">
+  <tr>
+    <th><{$smarty.const._MD_A_BASE_LANG_NAME}></th>
+    <th><{$smarty.const._MD_A_BASE_LANG_VERSION}></th>
+    <th><{$smarty.const._MD_A_BASE_LANG_CONTROL}></th>
+  </tr>
+  <{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 />
+        <{$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>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
Index: xoops2jp/html/modules/base/admin/templates/deactive_module_list.html
diff -u xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:removed
--- xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.4	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/deactive_module_list.html	Thu Feb  2 21:22:44 2006
@@ -1,30 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></h3>
-
-<div class="tips"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE}></div>
-
-<table classs="outer">
-  <tr>
-    <th><{$smarty.const._MD_A_BASE_LANG_NAME}></th>
-    <th><{$smarty.const._MD_A_BASE_LANG_VERSION}></th>
-    <th><{$smarty.const._MD_A_BASE_LANG_CONTROL}></th>
-  </tr>
-  <{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 />
-        <{$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>
-      </td>
-    </tr>
-  <{/foreach}>
-</table>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:22:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:22:44 +0900
Subject: [xoops-cvslog 2108] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202122244.EBAE92AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.1
--- /dev/null	Thu Feb  2 21:22:44 2006
+++ xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php	Thu Feb  2 21:22:44 2006
@@ -0,0 +1,36 @@
+<?php
+
+//
+// TODO We should to delete the original handler style.
+//
+require_once XOOPS_BASE_PATH."/admin/class/DeactiveModuleHandler.class.php";
+
+/**
+ * List up modules that are not installed yet.
+ */
+class Legacy_InstallListAction extends Legacy_Action
+{
+	var $mModuleObjects = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$db =& $controller->getDB();
+		$handler = new Legacy_DeactiveModuleHandler($db);
+		
+		$this->mModuleObjects =& $handler->getObjects();
+		
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("install_list.html");
+		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php	Thu Feb  2 21:22:44 2006
@@ -1,34 +0,0 @@
-<?php
-
-require_once XOOPS_BASE_PATH."/admin/class/DeactiveModuleHandler.class.php";
-
-/**
- * List up modules that are not installed yet.
- */
-class Legacy_ModuleDeactiveListAction extends Legacy_Action
-{
-	var $mModuleObjects = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-	}
-	
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		
-		$db =& $controller->getDB();
-		$handler = new Legacy_DeactiveModuleHandler($db);
-		
-		$this->mModuleObjects =& $handler->getObjects();
-		
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
-	{
-		$renderer->setTemplateName("deactive_module_list.html");
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:27:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:27:06 +0900
Subject: [xoops-cvslog 2109] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202122706.B4F692AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_installers_error.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installers_error.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_installers_error.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_installers_error.html:1.1.2.4	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installers_error.html	Thu Feb  2 21:27:06 2006
@@ -1,13 +0,0 @@
-<h4><{$smarty.const._ERROR}></h4>
-
-<ul>
-<{foreach item=msg from=$log}>
-  <{if $msg.type=="error"}>
-    <li style="color:red;"><{$msg.message}></li>
-  <{elseif $msg.type=="warning"}>
-    <li style="color:blue;"><{$msg.message}></li>
-  <{else}>
-    <li><{$msg.message}></li>
-  <{/if}>
-<{/foreach}>
-</ul>
Index: xoops2jp/html/modules/base/admin/templates/module_installer_error.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_installer_error.html:1.1.2.1
--- /dev/null	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer_error.html	Thu Feb  2 21:27:06 2006
@@ -0,0 +1,13 @@
+<h4><{$smarty.const._ERROR}></h4>
+
+<ul>
+<{foreach item=msg from=$log}>
+  <{if $msg.type=="error"}>
+    <li style="color:red;"><{$msg.message}></li>
+  <{elseif $msg.type=="warning"}>
+    <li style="color:blue;"><{$msg.message}></li>
+  <{else}>
+    <li><{$msg.message}></li>
+  <{/if}>
+<{/foreach}>
+</ul>
Index: xoops2jp/html/modules/base/admin/templates/module_update.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.1
--- /dev/null	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update.html	Thu Feb  2 21:27:06 2006
@@ -0,0 +1,70 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></h3>
+
+<ul>
+  <li><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
+</ul>
+
+<form method="POST">
+<{xoops_token form=$actionForm}>
+<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<table class="outer">
+  <tr>
+    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></th>
+  </tr>
+  <tr>
+    <td class="head" rowspan="6" style="text-align:center;">
+      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <div><{$module->modinfo.name|escape}></div>
+    </td>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
+	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
+	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
+	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
+	<{/if}>
+	</td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
+	<td class="<{cycle values='odd,even'}>">
+	  <{if $module->getVar('mid')}>
+	    <{$module->getVar('mid')}>
+	  <{else}>
+	    --
+	  <{/if}>
+	</td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
+	<td class="<{cycle values='odd,even'}>">
+	  <{if $module->getVar('last_update')}>
+        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+      <{else}>
+        --
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+  </tr>
+  <tr>
+    <td class="foot" colspan="3">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/module_uninstall.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.1
--- /dev/null	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall.html	Thu Feb  2 21:27:06 2006
@@ -0,0 +1,76 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></h3>
+
+<ul>
+  <li><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
+</ul>
+
+<form method="POST">
+<{xoops_token form=$actionForm}>
+<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<table class="outer">
+  <tr>
+    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></th>
+  </tr>
+  <tr>
+    <td rowspan="6" class="head" style="text-align:center;">
+      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <div><{$module->modinfo.name|escape}></div>
+    </td>
+    <td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
+    <td class="<{cycle values='odd,even'}>">
+      <{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
+      <{if $module->getVar('version') != $module->modinfo.version * 100 }>
+        &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
+      <{/if}>
+	</td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
+	<td class="<{cycle values='odd,even'}>">
+      <{if $module->getVar('mid')}>
+        <{$module->getVar('mid')}>
+      <{else}>
+        --
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
+    <td class="<{cycle values='odd,even'}>">
+      <{if $module->getVar('last_update')}>
+        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+      <{else}>
+        --
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+  </tr>
+  <tr>
+    <td class="foot" colspan="3">
+      <input type="checkbox" name="force" value="1" /><{$smarty.const._MD_A_BASE_LANG_FORCE_MODE}>
+    </td>
+  </tr>
+  <tr>
+    <td class="foot" colspan="3">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.6	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html	Thu Feb  2 21:27:06 2006
@@ -1,76 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></h3>
-
-<ul>
-  <li><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
-</ul>
-
-<form method="POST">
-<{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
-<table class="outer">
-  <tr>
-    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></th>
-  </tr>
-  <tr>
-    <td rowspan="6" class="head" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
-      <div><{$module->modinfo.name|escape}></div>
-    </td>
-    <td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
-  </tr>
-  <tr>
-    <td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
-    <td class="<{cycle values='odd,even'}>">
-      <{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-      <{if $module->getVar('version') != $module->modinfo.version * 100 }>
-        &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
-      <{/if}>
-	</td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
-	<td class="<{cycle values='odd,even'}>">
-      <{if $module->getVar('mid')}>
-        <{$module->getVar('mid')}>
-      <{else}>
-        --
-      <{/if}>
-    </td>
-  </tr>
-  <tr>
-    <td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
-    <td class="<{cycle values='odd,even'}>">
-      <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
-      <{else}>
-        --
-      <{/if}>
-    </td>
-  </tr>
-  <tr>
-    <td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
-  </tr>
-  <tr>
-    <td class="foot" colspan="3">
-      <input type="checkbox" name="force" value="1" /><{$smarty.const._MD_A_BASE_LANG_FORCE_MODE}>
-    </td>
-  </tr>
-  <tr>
-    <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>
Index: xoops2jp/html/modules/base/admin/templates/module_install.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.1
--- /dev/null	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install.html	Thu Feb  2 21:27:06 2006
@@ -0,0 +1,71 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></h3>
+
+<ul>
+  <li><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
+</ul>
+
+<form method="POST">
+<{xoops_token form=$actionForm}>
+<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<table class="outer">
+  <tr>
+    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></th>
+  </tr>
+  <tr>
+    <td class="head" rowspan="6" style="text-align:center;">
+      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <div><{$module->modinfo.name|escape}></div>
+    </td>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
+	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
+	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
+	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
+	<{/if}>
+	</td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
+	<td class="<{cycle values='odd,even'}>">
+	  <{if $module->getVar('mid')}>
+	    <{$module->getVar('mid')}>
+	  <{else}>
+	    --
+	  <{/if}>
+	</td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
+	<td class="<{cycle values='odd,even'}>">
+	  <{if $module->getVar('last_update')}>
+        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+      <{else}>
+        --
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+  </tr>
+  <tr>
+    <td class="foot" colspan="3">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/module_update_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.6	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update_confirm.html	Thu Feb  2 21:27:06 2006
@@ -1,70 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></h3>
-
-<ul>
-  <li><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
-</ul>
-
-<form method="POST">
-<{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
-<table class="outer">
-  <tr>
-    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></th>
-  </tr>
-  <tr>
-    <td class="head" rowspan="6" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
-      <div><{$module->modinfo.name|escape}></div>
-    </td>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
-	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
-	<{/if}>
-	</td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
-	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('mid')}>
-	    <{$module->getVar('mid')}>
-	  <{else}>
-	    --
-	  <{/if}>
-	</td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
-	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
-      <{else}>
-        --
-      <{/if}>
-    </td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
-  </tr>
-  <tr>
-    <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>
Index: xoops2jp/html/modules/base/admin/templates/module_install_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.6	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install_confirm.html	Thu Feb  2 21:27:06 2006
@@ -1,71 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></h3>
-
-<ul>
-  <li><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
-</ul>
-
-<form method="POST">
-<{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
-<table class="outer">
-  <tr>
-    <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></th>
-  </tr>
-  <tr>
-    <td class="head" rowspan="6" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
-      <div><{$module->modinfo.name|escape}></div>
-    </td>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
-	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
-	<{/if}>
-	</td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
-	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('mid')}>
-	    <{$module->getVar('mid')}>
-	  <{else}>
-	    --
-	  <{/if}>
-	</td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
-	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
-      <{else}>
-        --
-      <{/if}>
-    </td>
-  </tr>
-  <tr>
-	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DESC}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
-  </tr>
-  <tr>
-    <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:27:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:27:20 +0900
Subject: [xoops-cvslog 2110] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060202122720.1BD152AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.2	Thu Feb  2 21:05:15 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php	Thu Feb  2 21:27:19 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.2 2006/02/02 12:05:15 minahito Exp $
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.3 2006/02/02 12:27:19 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
@@ -32,7 +32,7 @@
 
 	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
 	{
-		$renderer->setTemplateName("module_uninstall_confirm.html");
+		$renderer->setTemplateName("module_uninstall.html");
 		$renderer->setAttribute('actionForm',$this->mActionForm);
 		$renderer->setAttribute('module',$this->mModuleObject);
 	}
Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.2	Thu Feb  2 21:11:01 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Thu Feb  2 21:27:19 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.2 2006/02/02 12:11:01 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.3 2006/02/02 12:27:19 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
@@ -64,7 +64,7 @@
 			$renderer->setTemplateName("module_installer.html");
 		}
 		else {
-			$renderer->setTemplateName("module_install_confirm.html");
+			$renderer->setTemplateName("module_install.html");
 		}
 	}
 
Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.2	Thu Feb  2 21:01:27 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php	Thu Feb  2 21:27:19 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.2 2006/02/02 12:01:27 minahito Exp $
+ * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.3 2006/02/02 12:27:19 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
@@ -29,7 +29,7 @@
 
 	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
 	{
-		$renderer->setTemplateName("module_update_confirm.html");
+		$renderer->setTemplateName("module_update.html");
 		$renderer->setAttribute('module',$this->mModuleObject);
 		$renderer->setAttribute('actionForm',$this->mActionForm);
 	}

From minahito ＠ users.sourceforge.jp  Thu Feb  2 21:27:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Feb 2006 21:27:31 +0900
Subject: [xoops-cvslog 2111] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202122731.C0D562AC013@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.4 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.4	Thu Feb  2 20:58:19 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list.html	Thu Feb  2 21:27:31 2006
@@ -5,7 +5,7 @@
 
 <h3><{$smarty.const._MI_BASE_MENU_MODULELIST}></h3>
 
-<div class="toptab">[ <a href="index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a> ]</div>
+<div class="toptab">[ <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a> ]</div>
 
 <{if $actionForm->hasError()}>
   <ul>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 22:28:23 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 22:28:23 +0900
Subject: [xoops-cvslog 2112] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060202132823.69DF52AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.5	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html	Thu Feb  2 22:28:23 2006
@@ -16,7 +16,7 @@
 
 <form action="./index.php?action=TplsetEdit" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tplset_id value=$actionform->get('tplset_id')}>
+  <{xoops_input type=hidden name=tplset_id value=$actionForm->get('tplset_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}></th>
@@ -28,13 +28,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=tplset_desc value=$actionform->get('tplset_desc') size=50 maxlength=255}>
+        <{xoops_input type=text name=tplset_desc value=$actionForm->get('tplset_desc') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$actionform->get('tplset_credits')}>
+        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$actionForm->get('tplset_credits')}>
       </td>
     </tr>
     <tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 22:50:45 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 22:50:45 +0900
Subject: [xoops-cvslog 2113] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202135045.E8E312AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_update.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.1	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update.html	Thu Feb  2 22:50:45 2006
@@ -64,6 +64,7 @@
   <tr>
     <td class="foot" colspan="3">
       <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.3	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_edit.html	Thu Feb  2 22:50:45 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENTMANAGE}></a>
-  <{if $actionform->get('com_id')}>
+  <{if $actionForm->get('com_id')}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
   <{else}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -9,7 +9,7 @@
 </div>
 
 <h3>
-<{if $actionform->get('com_id')}>
+<{if $actionForm->get('com_id')}>
   <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
 <{else}>
   <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -26,11 +26,11 @@
 
 <form action="" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=com_id value=$actionform->get('com_id')}>
+  <{xoops_input type=hidden name=com_id value=$actionForm->get('com_id')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-        <{if $actionform->get('com_id')}>
+        <{if $actionForm->get('com_id')}>
           <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
         <{else}>
           <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
@@ -40,120 +40,121 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_PID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_pid value=$actionform->get('com_pid')}>
+        <{xoops_input type=text name=com_pid value=$actionForm->get('com_pid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ROOTID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_rootid value=$actionform->get('com_rootid')}>
+        <{xoops_input type=text name=com_rootid value=$actionForm->get('com_rootid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modid value=$actionform->get('com_modid')}>
+        <{xoops_input type=text name=com_modid value=$actionForm->get('com_modid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ITEMID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_itemid value=$actionform->get('com_itemid')}>
+        <{xoops_input type=text name=com_itemid value=$actionForm->get('com_itemid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ICON}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_icon value=$actionform->get('com_icon') size=15 maxlength=25}>
+        <{xoops_input type=text name=com_icon value=$actionForm->get('com_icon') size=15 maxlength=25}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_CREATED}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_created value=$actionform->get('com_created')}>
+        <{xoops_input type=text name=com_created value=$actionForm->get('com_created')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modified value=$actionform->get('com_modified')}>
+        <{xoops_input type=text name=com_modified value=$actionForm->get('com_modified')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_UID}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_uid value=$actionform->get('com_uid')}>
+        <{xoops_input type=text name=com_uid value=$actionForm->get('com_uid')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_IP}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_ip value=$actionform->get('com_ip') size=15 maxlength=15}>
+        <{xoops_input type=text name=com_ip value=$actionForm->get('com_ip') size=15 maxlength=15}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_title value=$actionform->get('com_title') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_title value=$actionForm->get('com_title') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TEXT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=com_text value=$actionform->get('com_text')}>
+        <{xoops_dhtmltarea type=text name=com_text value=$actionForm->get('com_text')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=com_sig value=1 default=$actionform->get('com_sig')}>
+        <{xoops_input type=checkbox name=com_sig value=1 default=$actionForm->get('com_sig')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_STATUS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=com_status value=1 default=$actionform->get('com_status')}>
+        <{xoops_input type=checkbox name=com_status value=1 default=$actionForm->get('com_status')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_exparams value=$actionform->get('com_exparams') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_exparams value=$actionForm->get('com_exparams') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOHTML}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dohtml value=1 default=$actionform->get('dohtml')}>
+        <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->get('dohtml')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOSMILEY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionform->get('dosmiley')}>
+        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionForm->get('dosmiley')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOXCODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doxcode value=1 default=$actionform->get('doxcode')}>
+        <{xoops_input type=checkbox name=doxcode value=1 default=$actionForm->get('doxcode')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOIMAGE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doimage value=1 default=$actionform->get('doimage')}>
+        <{xoops_input type=checkbox name=doimage value=1 default=$actionForm->get('doimage')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DOBR}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dobr value=1 default=$actionform->get('dobr')}>
+        <{xoops_input type=checkbox name=dobr value=1 default=$actionForm->get('dobr')}>
       </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>
Index: xoops2jp/html/modules/base/admin/templates/module_install.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.1	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install.html	Thu Feb  2 22:50:45 2006
@@ -65,6 +65,7 @@
   <tr>
     <td class="foot" colspan="3">
       <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" class="formButton" />
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.1	Thu Feb  2 20:57:54 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html	Thu Feb  2 22:50:45 2006
@@ -72,6 +72,7 @@
   <tr>
     <td class="foot" colspan="4">
       <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/base/admin/templates/smiles_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.2	Mon Jan 30 12:36:49 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_delete.html	Thu Feb  2 22:50:45 2006
@@ -46,6 +46,7 @@
     <tr>
       <td colspan="2" class="foot">
         <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.2	Mon Jan 30 13:35:01 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_delete.html	Thu Feb  2 22:50:45 2006
@@ -97,6 +97,7 @@
     <tr>
       <td colspan="2" class="foot">
         <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/base/admin/templates/smiles_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.3	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_edit.html	Thu Feb  2 22:50:45 2006
@@ -1,14 +1,14 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=SmilesList"><{$smarty.const._MI_BASE_MENU_SMILES_MANAGE}></a>
-  <{if $actionform->get('id')}>
+  <{if $actionForm->get('id')}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_SMILES_EDIT}>
   <{else}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_SMILES_NEW}>
   <{/if}>
 </div>
 
-<{if $actionform->get('id')}>
+<{if $actionForm->get('id')}>
   <h3><{$smarty.const._AD_BASE_LANG_SMILES_EDIT}></h3>
 <{else}>
   <h3><{$smarty.const._AD_BASE_LANG_SMILES_NEW}></h3>
@@ -24,27 +24,27 @@
 
 <form action="index.php?action=SmilesEdit" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=id value=$actionform->get('id')}>
+  <{xoops_input type=hidden name=id value=$actionForm->get('id')}>
   <table class="outer">
     <tr>
       <th colspan="2">
-        <{if $actionform->get('id')}>
+        <{if $actionForm->get('id')}>
           <{$smarty.const._AD_BASE_LANG_SMILES_EDIT}>
         <{else}>
           <{$smarty.const._AD_BASE_LANG_SMILES_NEW}>
         <{/if}>
       </th>
     </tr>
-    <{if $actionform->get('id')}>
+    <{if $actionForm->get('id')}>
       <tr>
         <td class="head"><{$smarty.const._AD_BASE_LANG_ID}></td>
-        <td class="<{cycle values="odd,even"}>"><b><{$actionform->get('id')}></b></td>
+        <td class="<{cycle values="odd,even"}>"><b><{$actionForm->get('id')}></b></td>
       </tr>
     <{/if}>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_CODE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=code value=$actionform->get('code') size=15 maxlength=50}>
+        <{xoops_input type=text name=code value=$actionForm->get('code') size=15 maxlength=50}>
       </td>
     </tr>
     <tr>
@@ -56,19 +56,20 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_EMOTION}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=emotion value=$actionform->get('emotion') size=30 maxlength=75}>
+        <{xoops_input type=text name=emotion value=$actionForm->get('emotion') size=30 maxlength=75}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_DISPLAY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=display value=1 default=$actionform->get('display')}><{$smarty.const._YES}>
-        <{xoops_input type=radio name=display value=0 default=$actionform->get('display')}><{$smarty.const._NO}>
+        <{xoops_input type=radio name=display value=1 default=$actionForm->get('display')}><{$smarty.const._YES}>
+        <{xoops_input type=radio name=display value=0 default=$actionForm->get('display')}><{$smarty.const._NO}>
       </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>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 22:59:52 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 22:59:52 +0900
Subject: [xoops-cvslog 2114] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060202135952.454B22AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.4	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html	Thu Feb  2 22:59:52 2006
@@ -40,6 +40,7 @@
   <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>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.3	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html	Thu Feb  2 22:59:52 2006
@@ -58,4 +58,9 @@
       <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$object->Source->get('tpl_source')|escape}></textarea>
     </td>
   </tr>
+    <tr>
+      <td colspan="2" class="foot">
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+      </td>
+  </tr>
 </table>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.6	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html	Thu Feb  2 22:59:52 2006
@@ -30,7 +30,7 @@
 
 <form action="" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tpl_id value=$actionform->get('tpl_id')}>
+  <{xoops_input type=hidden name=tpl_id value=$actionForm->get('tpl_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_FILE_EDIT}></th>
@@ -49,7 +49,7 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
-      <td class="<{cycle values="odd,even"}>"><{$actionform->get('tpl_desc')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$actionForm->get('tpl_desc')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}></td>
@@ -67,7 +67,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-        <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$actionform->get('tpl_source')|escape}></textarea>
+        <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$actionForm->get('tpl_source')|escape}></textarea>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.6	Thu Feb  2 22:28:23 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html	Thu Feb  2 22:59:52 2006
@@ -40,6 +40,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._EDIT}>" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.6	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html	Thu Feb  2 22:59:52 2006
@@ -16,7 +16,7 @@
 
 <form action="./index.php?action=TplsetClone" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=tplset_id value=$actionform->get('tplset_id')}>
+  <{xoops_input type=hidden name=tplset_id value=$actionForm->get('tplset_id')}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_CLONE}></th>
@@ -43,6 +43,7 @@
     <tr>
       <td colspan="2" class="foot">
         <input class="formButton" type="submit" value="<{$smarty.const._CLONE}>" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 23:09:17 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 23:09:17 +0900
Subject: [xoops-cvslog 2115] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060202140917.78B4C2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.4	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Thu Feb  2 23:09:17 2006
@@ -68,7 +68,7 @@
       <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="./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}>
Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.3	Thu Feb  2 17:35:43 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html	Thu Feb  2 23:09:17 2006
@@ -69,6 +69,7 @@
     <tr>
       <td colspan="2" class="foot">
         <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </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.2 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Feb  2 23:09:17 2006
@@ -49,7 +49,7 @@
   <tr>
     <td class="foot" colspan="2">
       <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._NO}>" onclick="javascript:history.back()" class="formButton" />
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
   </tr>
 </table>
 </form>
Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.7	Thu Feb  2 17:35:43 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Thu Feb  2 23:09:17 2006
@@ -209,6 +209,7 @@
     <tr>
       <td colspan="2"  class="foot">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.2 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.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html	Thu Feb  2 23:09:17 2006
@@ -46,7 +46,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._NO}>" onclick="javascript:history.back()" class="formButton" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/user_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/user_delete.html	Thu Feb  2 23:09:17 2006
@@ -56,7 +56,7 @@
   <tr>
     <td colspan="2" class="foot">
       <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._NO}>" onclick="javascript:history.back()" class="formButton" />
+      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/group_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.5	Thu Feb  2 17:35:43 2006
+++ xoops2jp/html/modules/user/admin/templates/group_edit.html	Thu Feb  2 23:09:17 2006
@@ -51,6 +51,7 @@
     <tr>
       <td colspan="2" class="foot">
         <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 23:13:38 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 23:13:38 +0900
Subject: [xoops-cvslog 2116] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060202141338.818A12AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/help.html
diff -u xoops2jp/html/modules/pm/language/english/help.html:1.1.2.1 xoops2jp/html/modules/pm/language/english/help.html:1.1.2.2
--- xoops2jp/html/modules/pm/language/english/help.html:1.1.2.1	Sun Jan 29 16:10:49 2006
+++ xoops2jp/html/modules/pm/language/english/help.html	Thu Feb  2 23:13:38 2006
@@ -1,5 +1,5 @@
-<h2>Private message module</h2>
-<h3>Outline</h3>
+<h3>Private message module</h3>
+<h4>Outline</h4>
 <ul>
 <li>This module provides functions of Private Massages to XOOPS Cube 2.1.</li>
 <li>Also, virtual service concerning a private message is provided for interchangeability.</li>
@@ -7,13 +7,13 @@
 <li>Users can use text input box or pull-down to select recipient of the massages.</li>
 </ul>
 
-<h3>Preferences</h3>
+<h4>Preferences</h4>
 <ul>
 <li>Users chose recipient of massages by pull-down menu in default. However, it may be difficult when the site has many registered users.</li>
 <li>If administrator change the setting at preference, users can assign recipient of the massage by typing.</li>
 </ul>
 
-<h3>TODO</h3>
+<h4>TODO</h4>
 <ul>
 <li>To integrate core-function, some codes are hard-corded but it will be revised.</li>
 <li>Sent Box</li>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 23:13:38 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 23:13:38 +0900
Subject: [xoops-cvslog 2117] CVS update:
	xoops2jp/html/modules/stdCache/language/japanese
Message-ID: <20060202141338.C87C92AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/japanese/help.html
diff -u xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.1 xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.2
--- xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.1	Fri Jan  6 12:06:34 2006
+++ xoops2jp/html/modules/stdCache/language/japanese/help.html	Thu Feb  2 23:13:38 2006
@@ -1,5 +1,5 @@
-<h2>スタンダードキャッシュモジュール</h2>
-<h3>概要</h3>
+<h3>スタンダードキャッシュモジュール</h3>
+<h4>概要</h4>
 <ul>
 <li>このモジュールは、あなたのサイトに標準的なキャッシュ機能を提供します</li>
 <li>強力すぎるキャッシュ機能は、キャッシュファイル数の増大や、隠匿されるべき（管理者用の）情報のキャッシュを招いて問題を起こす可能性があります</li>
@@ -8,27 +8,21 @@
 <li>このキャッシュモジュールは、あなたのサイトがグループを独自に作成して、細かくユーザーを分類していない場合に有効です</li>
 </ul>
 
-<br/><br/>
-
-<h3>キャッシュクリアブロックについて</h3>
+<h4>キャッシュクリアブロックについて</h4>
 <ul>
 <li>このブロックは、アクセスを受けるとすべてのキャッシュをクリアします</li>
 <li>ゲストから閲覧できるようにブロックを設定し、ブロックキャッシュを１日程度に設定して下さい。１日に１度、全キャッシュをクリアするようになります</li>
 <li>XOOPS Cubeのモジュールキャッシュ機能は、URL単位で機能するため、余計なキャッシュファイルが作成される可能性があります。しかし、これは定期的にキャッシュファイルを全クリアすればほとんど問題になりません。</li>
 </ul>
 
-<br/><br/>
-
-<h3>設定方法</h3>
+<h4>設定方法</h4>
 <p>設定ファイルの[Cube]ブロック下に以下の２行を記述して下さい</p>
 <ul>
 <li>CacheSystem.path=/modules/stdCache/kernel</li>
 <li>CacheSystem.class=StdRenderCache</li>
 </ul>
 
-<br/><br/>
-
-<h3>チューンナップについて</h3>
+<h4>チューンナップについて</h4>
 <ul>
 <li>このモジュールはチューンナップ項目を持ちません</li>
 <li>より強力なキャッシュやきめ細かいキャッシュが必要な場合は、他のキャッシュモジュールを探してみましょう</li>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 23:13:38 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 23:13:38 +0900
Subject: [xoops-cvslog 2118] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060202141338.A6FF02AC021@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.1 xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.2
--- xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.1	Thu Dec 29 16:25:50 2005
+++ xoops2jp/html/modules/base/language/japanese/help.html	Thu Feb  2 23:13:38 2006
@@ -1,5 +1,5 @@
-<h2>互換モジュール</h2>
-<h3>概要</h3>
+<h3>互換モジュール</h3>
+<h4>概要</h4>
 <ul>
 <li>XOOPS Cube の各クラスを実装して、XOOPS 2.0.x と互換性のある動作を提供することを目指します。</li>
 <li>管理機能を提供します。</li>
@@ -7,12 +7,12 @@
 <li>未完成のため、systemモジュールを併用してください。</li>
 </ul>
 
-<h3>XOOPS 2.0.x 操作移行リスト</h3>
+<h4>XOOPS 2.0.x 操作移行リスト</h4>
 <ul>
 <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
 </ul>
 
-<h3>TODO</h3>
+<h4>TODO</h4>
 <ul>
 <li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
 <li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
Index: xoops2jp/html/modules/base/language/japanese/xoops2.html
diff -u xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.2
--- xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.1	Thu Dec 29 16:25:50 2005
+++ xoops2jp/html/modules/base/language/japanese/xoops2.html	Thu Feb  2 23:13:38 2006
@@ -1,11 +1,11 @@
-<h2>XOOPS2移行リスト</h2>
-<h3>まずはじめに</h3>
+<h4>XOOPS2移行リスト</h4>
+<h5>まずはじめに</h5>
 <p>
   systemモジュールの管理機能もすべて有効ですが、これは開発途中のためです。<br/>
    すべての管理機能は各モジュールの管理機能へ適切に移行する予定です。
 </p>
 
-<h3>モジュールの管理</h3>
+<h5>モジュールの管理</h5>
 <ul>
 <li>baseモジュールの管理からモジュールの管理を行うことが出来ます。</li>
 <li>今回、未インストールのモジュールとインストール済のモジュールは操作が分けられました。</li>
@@ -14,19 +14,19 @@
 <li>従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。baseモジュールでは、管理者に対してのみ権限を振っています。</li>
 </ul>
 
-<h3>ユーザーの管理</h3>
+<h5>ユーザーの管理</h5>
 <ul>
 <li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
 <li>このうち、アバターやメール、ユーザー編集に関しては移行を終えていません。</li>
 </ul>
 
-<h3>テーマの管理</h3>
+<h5>テーマの管理</h5>
 <ul>
 <li>テーマの管理は、各テーマエンジン（レンダーシステム）で行います。</li>
 <li>ＤＢテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。</li>
 </ul>
 
-<h3>TODO</h3>
+<h5>TODO</h5>
 <ul>
 <li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
 <li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>

From tom_g3x ＠ users.sourceforge.jp  Thu Feb  2 23:13:38 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Feb 2006 23:13:38 +0900
Subject: [xoops-cvslog 2119] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060202141338.E91B62AC03E@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/help.html
diff -u xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.3 xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.4
--- xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.3	Thu Dec 29 01:07:44 2005
+++ xoops2jp/html/modules/pm/language/japanese/help.html	Thu Feb  2 23:13:38 2006
@@ -1,5 +1,5 @@
-<h2>プライベートメッセージモジュール</h2>
-<h3>概要</h3>
+<h3>プライベートメッセージモジュール</h3>
+<h4>概要</h4>
 <ul>
 <li>XOOPS Cube 2.1 にプライベートメッセージ機能を付加します</li>
 <li>プライベートメッセージに関する仮想サービスを提供します</li>
@@ -7,13 +7,13 @@
 <li>XOOPS 2.0.x シリーズと同様のプルダウン指定のほか、テキスト入力による宛先の指定をサポートしています</li>
 </ul>
 
-<h3>一般設定について</h3>
+<h4>一般設定について</h4>
 <ul>
 <li>プライベートメッセージでは基本的に宛先をプルダウンメニューから選びます。ただしこの方法ではユーザーの多いサイトでは選びにくいなどの問題があります。</li>
 <li>一般設定を変更することで、宛先の入力方法をテキストフィールドに変更することができます。この場合、宛先はユーザーアカウントを入力することで指定します。</li>
 </ul>
 
-<h3>TODO</h3>
+<h4>TODO</h4>
 <ul>
 <li>現在、コア機能への組み込みはハードコードされていますが修正される予定です。</li>
 <li>送信箱機能</li>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 01:00:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 01:00:33 +0900
Subject: [xoops-cvslog 2120] CVS update: xoops2jp/html/modules/system/blocks
Message-ID: <20060202160033.239862AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/blocks/system_blocks.php
diff -u xoops2jp/html/modules/system/blocks/system_blocks.php:1.2.8.5 xoops2jp/html/modules/system/blocks/system_blocks.php:1.2.8.6
--- xoops2jp/html/modules/system/blocks/system_blocks.php:1.2.8.5	Mon Jan  2 21:40:55 2006
+++ xoops2jp/html/modules/system/blocks/system_blocks.php	Fri Feb  3 01:00:32 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: system_blocks.php,v 1.2.8.5 2006/01/02 12:40:55 minahito Exp $
+// $Id: system_blocks.php,v 1.2.8.6 2006/02/02 16:00:32 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -46,9 +46,14 @@
         $uname = '';
     }
     if (is_object($xoopsModule)) {
-        $online_handler->write($uid, $uname, time(), $xoopsModule->getVar('mid'), $_SERVER['REMOTE_ADDR']);
+        $online_handler->write($uid, $uname, time(), $xoopsModule->get('mid'), $_SERVER['REMOTE_ADDR']);
     } else {
-        $online_handler->write($uid, $uname, time(), 0, $_SERVER['REMOTE_ADDR']);
+		//
+		// TODO We have to find the best method.
+		//
+		if (strpos(xoops_getenv('REQUEST_URI'),'misc.php') === false) {
+			$online_handler->write($uid, $uname, time(), 0, $_SERVER['REMOTE_ADDR']);
+		}
     }
     $onlines =& $online_handler->getAll();
     if (false != $onlines) {

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 01:08:30 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 01:08:30 +0900
Subject: [xoops-cvslog 2121] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202160830.AF18D2AC015@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.2 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.2	Mon Jan 30 13:35:01 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html	Fri Feb  3 01:08:30 2006
@@ -12,21 +12,12 @@
     <th><{$smarty.const._AD_BASE_LANG_COM_ID}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_PID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_PID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_PID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_ROOTID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ROOTID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ROOTID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_MODID}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_MODID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_MODID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_ITEMID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ITEMID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ITEMID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_ICON}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ICON}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ICON}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_COM_TITLE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_CREATED}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -39,60 +30,25 @@
     <th><{$smarty.const._AD_BASE_LANG_COM_IP}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_IP}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_IP}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_TEXT}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TEXT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TEXT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_SIG}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_SIG}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_SIG}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_STATUS}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_STATUS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_STATUS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_EXPARAMS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_EXPARAMS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_DOHTML}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOHTML}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOHTML}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_DOSMILEY}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOSMILEY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOSMILEY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_DOXCODE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOXCODE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOXCODE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_DOIMAGE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOIMAGE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOIMAGE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_DOBR}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOBR}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_DOBR}>"><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'}>" style="text-align:center">
       <td><{$obj->getVar('com_id')}></td>
-      <td><{$obj->getVar('com_pid')}></td>
-      <td><{$obj->getVar('com_rootid')}></td>
       <td><{$obj->getVar('com_modid')}></td>
-      <td><{$obj->getVar('com_itemid')}></td>
-      <td><{$obj->getVar('com_icon')}></td>
-      <td><{$obj->getVar('com_created')}></td>
-      <td><{$obj->getVar('com_modified')}></td>
-      <td><{$obj->getVar('com_uid')}></td>
-      <td><{$obj->getVar('com_ip')}></td>
       <td><{$obj->getVar('com_title')}></td>
-      <td><{$obj->getVar('com_text')}></td>
-      <td><{$obj->getVar('com_sig')}></td>
-      <td><{$obj->getVar('com_status')}></td>
-      <td><{$obj->getVar('com_exparams')}></td>
-      <td><{$obj->getVar('dohtml')}></td>
-      <td><{$obj->getVar('dosmiley')}></td>
-      <td><{$obj->getVar('doxcode')}></td>
-      <td><{$obj->getVar('doimage')}></td>
-      <td><{$obj->getVar('dobr')}></td>
+      <td><{$obj->getVar('com_created')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getVar('com_modified')|xoops_formattimestamp:l}></td>
+      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{$obj->getVar('com_uid')}></a></td>
+      <td><{$obj->getVar('com_ip')}></td>
+      <td>
+        <{if $obj->getVar('com_status') == 1 }>
+          <img src="<{"icons/active.gif"|theme}>" />
+        <{/if}>
+      </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>
Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.4	Thu Feb  2 22:50:45 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_edit.html	Fri Feb  3 01:08:30 2006
@@ -94,7 +94,7 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_title value=$actionForm->get('com_title') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_title value=$actionForm->get('com_title') size=60 maxlength=255}>
       </td>
     </tr>
     <tr>
@@ -106,7 +106,8 @@
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=com_sig value=1 default=$actionForm->get('com_sig')}>
+        <{xoops_input type=radio name=com_sig value=1 default=$actionForm->get('com_sig')}><{$smarty.const._YES}>
+        <{xoops_input type=radio name=com_sig value=0 default=$actionForm->get('com_sig')}><{$smarty.const._NO}>
       </td>
     </tr>
     <tr>
@@ -122,33 +123,18 @@
       </td>
     </tr>
     <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_DOHTML}></td>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_CONTROL}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->get('dohtml')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_DOSMILEY}></td>
-      <td class="<{cycle values="odd,even"}>">
+        <{$smarty.const._AD_BASE_LANG_DOHTML}><br />
         <{xoops_input type=checkbox name=dosmiley value=1 default=$actionForm->get('dosmiley')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_DOXCODE}></td>
-      <td class="<{cycle values="odd,even"}>">
+        <{$smarty.const._AD_BASE_LANG_DOSMILEY}><br />
         <{xoops_input type=checkbox name=doxcode value=1 default=$actionForm->get('doxcode')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_DOIMAGE}></td>
-      <td class="<{cycle values="odd,even"}>">
+        <{$smarty.const._AD_BASE_LANG_DOXCODE}><br />
         <{xoops_input type=checkbox name=doimage value=1 default=$actionForm->get('doimage')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_DOBR}></td>
-      <td class="<{cycle values="odd,even"}>">
+        <{$smarty.const._AD_BASE_LANG_DOIMAGE}><br />
         <{xoops_input type=checkbox name=dobr value=1 default=$actionForm->get('dobr')}>
+        <{$smarty.const._AD_BASE_LANG_DOBR}>
       </td>
     </tr>
     <tr>

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 01:14:23 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 01:14:23 +0900
Subject: [xoops-cvslog 2122] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202161423.A962E2AC03E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.6	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html	Fri Feb  3 01:14:23 2006
@@ -7,7 +7,6 @@
 
 <div><{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}></div>
 <form action="index.php?action=ActSearch" method="post">
-  <{xoops_token form=$actionForm}>
   <input type="text" name="keywords" <{if $actionForm}>value="<{$actionform->get('keywords')|escape}>"<{/if}> />
   <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
 </form>

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 01:34:14 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 01:34:14 +0900
Subject: [xoops-cvslog 2123] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060202163414.26BB12AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.9 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.9	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html	Fri Feb  3 01:34:14 2006
@@ -15,9 +15,9 @@
 </div>
 
 <{if count($objects) == 1 }>
-  <div class="tip"><{$smarty.const._AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1}></div>
+  <div class="tips"><{$smarty.const._AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1}></div>
 <{else}>
-  <div class="tip"><{$smarty.const._AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2}></div>
+  <div class="tips"><{$smarty.const._AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2}></div>
 <{/if}>
 
 <{if $actionForm->hasError()}>

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 01:37:30 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 01:37:30 +0900
Subject: [xoops-cvslog 2124] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060202163730.EC37F2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.7	Fri Feb  3 01:14:23 2006
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html	Fri Feb  3 01:37:30 2006
@@ -5,8 +5,9 @@
 
 <h3><{$smarty.const._MI_BASE_MENU_ACTIONSEARCH}></h3>
 
-<div><{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}></div>
+<div class="tips"><{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}></div>
 <form action="index.php?action=ActSearch" method="post">
-  <input type="text" name="keywords" <{if $actionForm}>value="<{$actionform->get('keywords')|escape}>"<{/if}> />
+  <{xoops_token form=$actionForm}>
+  <input type="text" name="keywords" <{if $actionForm}>value="<{$actionForm->get('keywords')|escape}>"<{/if}> />
   <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
 </form>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 01:58:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 01:58:31 +0900
Subject: [xoops-cvslog 2125] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060202165831.306C72AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/Misc_OnlineAction.class.php
diff -u xoops2jp/html/modules/base/actions/Misc_OnlineAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/Misc_OnlineAction.class.php:removed
--- xoops2jp/html/modules/base/actions/Misc_OnlineAction.class.php:1.1.2.2	Mon Dec 26 20:24:16 2005
+++ xoops2jp/html/modules/base/actions/Misc_OnlineAction.class.php	Fri Feb  3 01:58:31 2006
@@ -1,81 +0,0 @@
-<?php
-// $Id: Misc_OnlineAction.class.php,v 1.1.2.2 2005/12/26 11:24:16 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 //
-//  ------------------------------------------------------------------------ //
-
-define ("MISC_ONLINE_PER_PAGE",20);
-
-class Misc_OnlineAction extends MiscAction
-{
-	var $mOnlineUsers=array();
-	
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$start=isset($_GET['start']) ? intval($_GET['start']) : 0;
-		
-		$onlineHandler=&xoops_gethandler('online');
-		$onlineTotal=$onlineHandler->getCount();
-		$limit = ($onlineTotal>MISC_ONLINE_PER_PAGE) ? MISC_ONLINE_PER_PAGE : $onlineTotal;
-		
-		// bad
-		$criteria=new CriteriaCompo();
-		$criteria->setLimit($limit);
-		$criteria->setStart($start);
-		
-		$onlineInfos=&$onlineHandler->getAll($criteria);
-		$count=count($onlineInfos);
-		
-		$moduleHandler=&xoops_gethandler('module');
-		$modules=&$moduleHandler->getList(new Criteria('isactive',1));
-		
-		foreach($onlineInfos as $info) {
-			$user=array();
-			$user['onlineInfo']=&$info;
-			if($info['online_uid']) {
-				$user['user']=new XoopsUser($info['online_uid']);
-			}
-			else {
-				$user['user']=null;
-			}
-			
-			$user['module'] = ($info['online_module'] > 0) ? $modules[$info['online_module']] : null;
-			
-			$this->mOnlineUsers[]=&$user;
-
-			unset($user);
-			unset($info);
-		}
-
-		return MISC_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_misc_online.html");
-		$renderSystem->setAttribute("onlineUsers",$this->mOnlineUsers);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Feb  3 01:58:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 01:58:41 +0900
Subject: [xoops-cvslog 2126] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060202165841.572D62AC039@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/OnlineAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.1
--- /dev/null	Fri Feb  3 01:58:41 2006
+++ xoops2jp/html/modules/base/actions/OnlineAction.class.php	Fri Feb  3 01:58:41 2006
@@ -0,0 +1,39 @@
+<?php
+
+require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/forms/OnlineFilterForm.class.php";
+
+class Legacy_OnlineAction extends Legacy_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('online', 'base');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_OnlineFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=OnlineList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("legacy_misc_online.html");
+		
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadModule();
+		}
+		
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 01:59:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 01:59:12 +0900
Subject: [xoops-cvslog 2127] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060202165912.387672AC031@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.1 xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.1	Thu Jan 26 01:18:03 2006
+++ xoops2jp/html/modules/base/class/AbstractFilterForm.class.php	Fri Feb  3 01:59:12 2006
@@ -20,7 +20,7 @@
 	function getSort()
 	{
 		$sortkey = abs($this->mSort);
-		return $this->_mSortKeys[$sortkey];
+		return isset($this->_mSortKeys[$sortkey]) ? $this->_mSortKeys[$sortkey] : null;
 	}
 
 	function getOrder()

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:00:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:00:14 +0900
Subject: [xoops-cvslog 2128] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060202170014.9CE462AC00E@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.9 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.10
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.9	Fri Jan 27 18:27:37 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php	Fri Feb  3 02:00:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.9 2006/01/27 09:27:37 minahito Exp $
+// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.10 2006/02/02 17:00:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -151,6 +151,7 @@
 	{
 		$languageManager=&$this->mController->mRoot->getLanguageManager();
 		$languageManager->loadModuleAdminLanguage($this->mModuleObject->getVar('dirname'));
+		$languageManager->loadManifestoLanguage($this->mModuleObject->getVar('dirname'));
 	}
 	
 	function _processErrorModuleNotExist()

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:00:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:00:35 +0900
Subject: [xoops-cvslog 2129] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060202170035.B1CF72AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.3
--- xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.2	Mon Dec 26 20:04:45 2005
+++ xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php	Fri Feb  3 02:00:35 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: MiscEventFunctions.class.php,v 1.1.2.2 2005/12/26 11:04:45 minahito Exp $
+ * @version $Id: MiscEventFunctions.class.php,v 1.1.2.3 2006/02/02 17:00:35 minahito Exp $
  */
 
 class Legacy_MiscEventFunction
@@ -8,13 +8,19 @@
 	function AccessToMisc(&$controller,$eventArgs)
 	{
 		require_once XOOPS_BASE_PATH . "/class/MiscActionFrame.class.php";
-		$moduleRunner =& new MiscActionFrame();
+		require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+
+		$actionName = isset($_GET['type']) ? trim($_GET['type']) : "Smilies";
+
+		$moduleRunner = new Legacy_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
 
-		$controller->setDialogMode(true);
 		$controller->setActionStrategy($moduleRunner);
-		
+
+		$controller->setDialogMode(true);
+
 		$controller->executeAction();
-		
+
 		$controller->executeView();
 	}
 }

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:00:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:00:56 +0900
Subject: [xoops-cvslog 2130] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060202170056.3C7D82AC031@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.3 xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.4
--- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.3	Thu Feb  2 15:24:23 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_online.html	Fri Feb  3 02:00:56 2006
@@ -2,27 +2,29 @@
   <tr>
     <th colspan="3"><{$smarty.const._WHOSONLINE}></th>
   </tr>
-  <{foreach item=user from=$onlineUsers}>
+  <{foreach item=obj from=$objects}>
     <tr class="<{cycle values="odd,even"}> valign="middle" align="center">
       <td>
-        <{if $user.user}>
-          <{$user.user->getVar('uname')}>
+        <{if $obj->get('uid')}>
+          <a href="<{$xoops_url}>/userinfo.php?uid=<{$obj->get('uid')|escape}>"><{$obj->getVar('uname')}></a>
         <{else}>
           <{$smarty.const._GUEST}>
         <{/if}>
       </td>
       <td>
-        <{if $user.module}>
-          <{$user.module}>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getVar('name')}>
+        <{else}>
+          ---
         <{/if}>
       </td>
       <td>
         <{if $xoops_isadmin}>
-          <{$user.onlineInfo.online_ip}>
+          <{$obj->getVar('online_ip')}>
         <{/if}>
       </td>
     </tr>
   <{/foreach}>
 </table>
-
-<div style="text-align: right;"><!--- pagenavi ---></div>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:01:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:01:33 +0900
Subject: [xoops-cvslog 2131] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20060202170133.EE61E2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.1
--- /dev/null	Fri Feb  3 02:01:33 2006
+++ xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php	Fri Feb  3 02:01:33 2006
@@ -0,0 +1,55 @@
+<?php
+
+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);
+define('ONLINE_SORT_KEY_ONLINE_MODULE', 4);
+define('ONLINE_SORT_KEY_ONLINE_IP', 5);
+define('ONLINE_SORT_KEY_MAXVALUE', 5);
+
+class Legacy_OnlineFilterForm extends Legacy_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $_mSortKeys = array(
+		ONLINE_SORT_KEY_ONLINE_UID => 'online_uid',
+		ONLINE_SORT_KEY_ONLINE_UNAME => 'online_uname',
+		ONLINE_SORT_KEY_ONLINE_UPDATED => 'online_updated',
+		ONLINE_SORT_KEY_ONLINE_MODULE => 'online_module',
+		ONLINE_SORT_KEY_ONLINE_IP => 'online_ip'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : ONLINE_SORT_KEY_DEFAULT;
+	
+		if ($this->mSort > ONLINE_SORT_KEY_MAXVALUE) {
+			$this->mSort = ONLINE_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['online_uid'])) {
+			$this->_mCriteria->add(new Criteria('online_uid', array(XOBJ_DTYPE_INT, xoops_getrequest('online_uid'))));
+		}
+	
+		if (isset($_REQUEST['online_uname'])) {
+			$this->_mCriteria->add(new Criteria('online_uname', array(XOBJ_DTYPE_STRING, xoops_getrequest('online_uname'))));
+		}
+	
+		if (isset($_REQUEST['online_updated'])) {
+			$this->_mCriteria->add(new Criteria('online_updated', array(XOBJ_DTYPE_INT, xoops_getrequest('online_updated'))));
+		}
+	
+		if (isset($_REQUEST['online_module'])) {
+			$this->_mCriteria->add(new Criteria('online_module', array(XOBJ_DTYPE_INT, xoops_getrequest('online_module'))));
+		}
+	
+		if (isset($_REQUEST['online_ip'])) {
+			$this->_mCriteria->add(new Criteria('online_ip', array(XOBJ_DTYPE_STRING, xoops_getrequest('online_ip'))));
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:02:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:02:01 +0900
Subject: [xoops-cvslog 2132] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060202170201.D7CE42AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/online.php
diff -u /dev/null xoops2jp/html/modules/base/class/online.php:1.1.2.1
--- /dev/null	Fri Feb  3 02:02:01 2006
+++ xoops2jp/html/modules/base/class/online.php	Fri Feb  3 02:02:01 2006
@@ -0,0 +1,32 @@
+<?php
+
+class BaseOnlineObject extends XoopsSimpleObject
+{
+	var $mModule = null;
+	
+	function BaseOnlineObject()
+	{
+		$this->initVar('online_uid', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_uname', XOBJ_DTYPE_STRING, '', true, 25);
+		$this->initVar('online_updated', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_module', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_ip', XOBJ_DTYPE_STRING, '', true, 15);
+	}
+	
+	function loadModule()
+	{
+		if ($this->get('online_module')) {
+			$handler =& xoops_gethandler('modules');
+			$this->mModule =& $handler->get($this->get('online_module'));
+		}
+	}
+}
+
+class BaseOnlineHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "online";
+	var $mPrimary = "";
+	var $mClass = "BaseOnlineObject";
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:02:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:02:45 +0900
Subject: [xoops-cvslog 2133] CVS update:
	xoops2jp/html/modules/base/class/kernel
Message-ID: <20060202170245.437ED2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/kernel/AbstractUserAccountUtils.class.php
diff -u xoops2jp/html/modules/base/class/kernel/AbstractUserAccountUtils.class.php:1.1.2.1 xoops2jp/html/modules/base/class/kernel/AbstractUserAccountUtils.class.php:removed
--- xoops2jp/html/modules/base/class/kernel/AbstractUserAccountUtils.class.php:1.1.2.1	Tue Oct 25 19:59:08 2005
+++ xoops2jp/html/modules/base/class/kernel/AbstractUserAccountUtils.class.php	Fri Feb  3 02:02:45 2006
@@ -1,29 +0,0 @@
-<?php
-
-class AbstractUserAccountUtils
-{
-	/**
-	Static method.
-	Return user object which is instance of XoopsUserObject.
-	If user is anonymouse, this method must return null.
-
-	@access public
-	@return XoopsUserObject
-	*/
-	function &getCurrentXoopsUser()
-	{
-	}
-
-	/**
-	Static method.
-	Return user object of class which we define for new xoops.
-	
-	@access public
-	@return ???
-	*/
-	function &getCurrentXCubeUser()
-	{
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Feb  3 02:02:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 02:02:45 +0900
Subject: [xoops-cvslog 2134] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060202170245.65D142AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/MiscActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/MiscActionFrame.class.php:1.1.2.2 xoops2jp/html/modules/base/class/MiscActionFrame.class.php:removed
--- xoops2jp/html/modules/base/class/MiscActionFrame.class.php:1.1.2.2	Mon Dec 26 20:23:58 2005
+++ xoops2jp/html/modules/base/class/MiscActionFrame.class.php	Fri Feb  3 02:02:45 2006
@@ -1,151 +0,0 @@
-<?php
-// $Id: MiscActionFrame.class.php,v 1.1.2.2 2005/12/26 11:23:58 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionStrategy.class.php";
-
-define ("MISC_FRAME_PERFORM_SUCCESS",1);
-define ("MISC_FRAME_PERFORM_FAIL",2);
-define ("MISC_FRAME_INIT_SUCCESS",3);
-
-define ("MISC_FRAME_VIEW_NONE",1);
-define ("MISC_FRAME_VIEW_SUCCESS",1);
-define ("MISC_FRAME_VIEW_ERROR",2);
-define ("MISC_FRAME_VIEW_INDEX",3);
-
-/**
- * This is simple frame work for misc page controller.
- * @package base
- */
-class MiscActionFrame extends XCube_ActionStrategy
-{
-	var $mActionName = null;
-	var $mAction;
-	
-	function MiscActionFrame()
-	{
-	}
-	
-	function execute(&$controller)
-	{
-		if($this->mActionName==null) {
-			$this->mActionName = isset($_REQUEST['type']) ? $_REQUEST['type'] : "";
-		}
-
-		if(!preg_match("/^\w+$/",$this->mActionName)) {
-			die();
-		}
-
-		$langManager =& $controller->mRoot->getLanguageManager();
-		$langManager->loadModuleLanguage("base");
-
-		//
-		// Create action object by mActionName
-		//
-		$className="Misc_".ucfirst($this->mActionName)."Action";
-		$fileName=XOOPS_MODULE_PATH."/base/actions/${className}.class.php";
-
-		if(!file_exists($fileName))
-			die();	// TODO
-		
-		require_once $fileName;
-		if(class_exists($className))
-				$this->mAction=new $className();
-		
-		if(!is_object($this->mAction))
-			die();	// TODO
-
-		$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 MISC_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case MISC_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case MISC_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-
-			case MISC_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-		}
-	}
-}
-
-class MiscAction
-{
-	function MiscAction()
-	{
-	}
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-	}
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return USER_FRAME_VIEW_NONE;
-	}
-	
-	function execute()
-	{
-		return USER_FRAME_VIEW_NONE;
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 02:24:07 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 02:24:07 +0900
Subject: [xoops-cvslog 2135] CVS update: xoops2jp/html/modules/base/admin/theme
Message-ID: <20060202172407.DEA122AC00E@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.2 xoops2jp/html/modules/base/admin/theme/style.css:1.1.2.3
--- xoops2jp/html/modules/base/admin/theme/style.css:1.1.2.2	Tue Jan 31 01:09:39 2006
+++ xoops2jp/html/modules/base/admin/theme/style.css	Fri Feb  3 02:24:07 2006
@@ -222,6 +222,11 @@
 	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 Feb  3 11:41:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 11:41:34 +0900
Subject: [xoops-cvslog 2136] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060203024134.7E2B62AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.3	Fri Feb  3 02:00:35 2006
+++ xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php	Fri Feb  3 11:41:34 2006
@@ -1,13 +1,12 @@
 <?php
 /**
- * @version $Id: MiscEventFunctions.class.php,v 1.1.2.3 2006/02/02 17:00:35 minahito Exp $
+ * @version $Id: MiscEventFunctions.class.php,v 1.1.2.4 2006/02/03 02:41:34 minahito Exp $
  */
 
 class Legacy_MiscEventFunction
 {
 	function AccessToMisc(&$controller,$eventArgs)
 	{
-		require_once XOOPS_BASE_PATH . "/class/MiscActionFrame.class.php";
 		require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
 
 		$actionName = isset($_GET['type']) ? trim($_GET['type']) : "Smilies";

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 11:58:13 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 11:58:13 +0900
Subject: [xoops-cvslog 2137] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060203025813.281C62AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.2 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.2	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_list.html	Fri Feb  3 11:58:13 2006
@@ -5,7 +5,7 @@
 
 <h3><{$smarty.const._AD_USER_LANG_RANK_LIST}></h3>
 
-<div class="toptab">[ <a href="index.php?action=RanksEdit"><{$smarty.const._AD_USER_LANG_CREATE_NEW}></strong></a> ]</div>
+<div class="toptab">[ <a href="index.php?action=RanksEdit"><{$smarty.const._AD_USER_LANG_CREATE_NEW}></a> ]</div>
 
 <table class="outer">
   <tr>

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 11:58:13 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 11:58:13 +0900
Subject: [xoops-cvslog 2138] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060203025813.5135B2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.2 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.2	Mon Jan 30 12:36:49 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_list.html	Fri Feb  3 11:58:13 2006
@@ -5,7 +5,7 @@
 
 <h3><{$smarty.const._MI_BASE_MENU_SMILES_MANAGE}></h3>
 
-<div class="toptab">[ <a href="index.php?action=SmilesEdit"><{$smarty.const._AD_BASE_LANG_CREATE_NEW}></strong></a> ]</div>
+<div class="toptab">[ <a href="index.php?action=SmilesEdit"><{$smarty.const._AD_BASE_LANG_CREATE_NEW}></a> ]</div>
 
 <table class="outer">
   <tr>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:03:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:03:45 +0900
Subject: [xoops-cvslog 2139] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203030345.EB5EF2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/Misc_AvatarsAction.class.php
diff -u xoops2jp/html/modules/base/actions/Misc_AvatarsAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/Misc_AvatarsAction.class.php:removed
--- xoops2jp/html/modules/base/actions/Misc_AvatarsAction.class.php:1.1.2.2	Mon Dec 26 20:24:16 2005
+++ xoops2jp/html/modules/base/actions/Misc_AvatarsAction.class.php	Fri Feb  3 12:03:45 2006
@@ -1,52 +0,0 @@
-<?php
-// $Id: Misc_AvatarsAction.class.php,v 1.1.2.2 2005/12/26 11:24:16 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 //
-//  ------------------------------------------------------------------------ //
-
-class Misc_AvatarsAction extends MiscAction
-{
-	var $mAvatarsList=array();
-	
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$avatarHandler=&xoops_gethandler('avatar');
-		$list=&$avatarHandler->getList('S');
-		
-		$counter=0;
-		foreach($list as $fileName=>$avatarName) {
-			$this->mAvatarsList[] = array("fileName"=>$fileName, "avatarName"=>$avatarName,"counter"=>$counter++);
-		}
-		
-		return MISC_FRAME_VIEW_INDEX;
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_misc_avatars.html");
-		$renderSystem->setAttribute("avatarsList",$this->mAvatarsList);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:03:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:03:56 +0900
Subject: [xoops-cvslog 2140] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203030356.79ECD2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/Misc_SslloginAction.class.php
diff -u xoops2jp/html/modules/base/actions/Misc_SslloginAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/Misc_SslloginAction.class.php:removed
--- xoops2jp/html/modules/base/actions/Misc_SslloginAction.class.php:1.1.2.2	Mon Dec 26 20:24:16 2005
+++ xoops2jp/html/modules/base/actions/Misc_SslloginAction.class.php	Fri Feb  3 12:03:56 2006
@@ -1,51 +0,0 @@
-<?php
-// $Id: Misc_SslloginAction.class.php,v 1.1.2.2 2005/12/26 11:24:16 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 //
-//  ------------------------------------------------------------------------ //
-
-require_once XOOPS_BASE_PATH."/class/misc/MiscAction.class.php";
-
-class Misc_SslloginAction extends MiscAction
-{
-	function execute(&$controller,&$xoopsUser)
-	{
-		$config=$controller->getConfig();
-		if($config['user_ssl']&&isset($_POST[$config['sslpost_name']])&&is_object($xoopsUser)) {
-			require_once XOOPS_ROOT_PATH.'/language/'.$config['language'].'/user.php';
-			return MISC_FRAME_VIEW_INDEX;
-		}
-		else {
-			return MISC_FRAME_VIEW_NONE;
-		}
-	}
-	
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_misc_ssllogin.html");
-		$renderSystem->setAttribute("message", ＠ sprintf(_US_LOGGINGU,$xoopsUser->getVar('uname')));
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/actions/Misc_SmiliesAction.class.php
diff -u xoops2jp/html/modules/base/actions/Misc_SmiliesAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/Misc_SmiliesAction.class.php:removed
--- xoops2jp/html/modules/base/actions/Misc_SmiliesAction.class.php:1.1.2.3	Thu Dec 29 13:13:02 2005
+++ xoops2jp/html/modules/base/actions/Misc_SmiliesAction.class.php	Fri Feb  3 12:03:56 2006
@@ -1,54 +0,0 @@
-<?php
-// $Id: Misc_SmiliesAction.class.php,v 1.1.2.3 2005/12/29 04:13:02 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 //
-//  ------------------------------------------------------------------------ //
-
-class Misc_SmiliesAction extends MiscAction
-{
-	var $mTargetName;
-	var $mSmiles=array();
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->mTargetName=isset($_GET['target']) ? trim($_GET['target']) : null;
-		$db=&$controller->getDB();
-		if($result=$db->query("SELECT * FROM ".$db->prefix("smiles"))) {
-			while($row=$db->fetchArray($result)) {
-				$this->mSmiles[]=$row;
-			}
-		}
-
-		return MISC_FRAME_VIEW_INDEX;
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_misc_smilies.html");
-		$renderSystem->setAttribute("targetName",$this->mTargetName);
-		$renderSystem->setAttribute("smiles",$this->mSmiles);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:04:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:04:05 +0900
Subject: [xoops-cvslog 2141] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203030405.D2BF72AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/OnlineAction.class.php
diff -u xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.1	Fri Feb  3 01:58:41 2006
+++ xoops2jp/html/modules/base/actions/OnlineAction.class.php	Fri Feb  3 12:04:05 2006
@@ -20,7 +20,7 @@
 
 	function _getBaseUrl()
 	{
-		return "./index.php?action=OnlineList";
+		return "./index.php?type=Online";
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:04:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:04:22 +0900
Subject: [xoops-cvslog 2142] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203030422.CF0912AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SslloginAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.1
--- /dev/null	Fri Feb  3 12:04:22 2006
+++ xoops2jp/html/modules/base/actions/SslloginAction.class.php	Fri Feb  3 12:04:22 2006
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * TODO This action should be implemented by base. We must move it to user.
+ */
+class Legacy_SslloginAction extends Legacy_Action
+{
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		//
+		// Because this action's template uses USER message catalog, load it.
+		//
+		$root =& $controller->mRoot;
+		$root->mLanguageManager->loadModuleLanguage('user');
+
+		$render->setTemplateName("legacy_misc_ssllogin.html");
+		$render->setAttribute("message", @sprintf(_US_LOGGINGU, $xoopsUser->getVar('uname')));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:04:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:04:50 +0900
Subject: [xoops-cvslog 2143] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203030450.99CFE2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SmiliesAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.1
--- /dev/null	Fri Feb  3 12:04:50 2006
+++ xoops2jp/html/modules/base/actions/SmiliesAction.class.php	Fri Feb  3 12:04:50 2006
@@ -0,0 +1,40 @@
+<?php
+
+require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/forms/SmilesFilterForm.class.php";
+
+class Legacy_SmiliesAction extends Legacy_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('smiles', 'base');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_SmilesFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./misc.php?type=Smilies";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		//
+		// Because this action's template uses BASE message catalog, load it.
+		//
+		$root =& $controller->mRoot;
+		$root->mLanguageManager->loadModuleLanguage('base');
+		
+		$render->setTemplateName("legacy_misc_smilies.html");
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:05:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:05:12 +0900
Subject: [xoops-cvslog 2144] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20060203030512.1BFA32AC085@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.1
--- /dev/null	Fri Feb  3 12:05:12 2006
+++ xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php	Fri Feb  3 12:05:11 2006
@@ -0,0 +1,56 @@
+<?php
+
+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);
+define('SMILES_SORT_KEY_EMOTION', 4);
+define('SMILES_SORT_KEY_DISPLAY', 5);
+define('SMILES_SORT_KEY_MAXVALUE', 5);
+
+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',
+		SMILES_SORT_KEY_EMOTION => 'emotion',
+		SMILES_SORT_KEY_DISPLAY => 'display'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > SMILES_SORT_KEY_MAXVALUE) {
+			$this->mSort = SMILES_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['id'])) {
+			$this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id'))));
+		}
+	
+		if (isset($_REQUEST['code'])) {
+			$this->_mCriteria->add(new Criteria('code', array(XOBJ_DTYPE_STRING, xoops_getrequest('code'))));
+		}
+	
+		if (isset($_REQUEST['smile_url'])) {
+			$this->_mCriteria->add(new Criteria('smile_url', array(XOBJ_DTYPE_STRING, xoops_getrequest('smile_url'))));
+		}
+	
+		if (isset($_REQUEST['emotion'])) {
+			$this->_mCriteria->add(new Criteria('emotion', array(XOBJ_DTYPE_STRING, xoops_getrequest('emotion'))));
+		}
+	
+		if (isset($_REQUEST['display'])) {
+			$this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display'))));
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:05:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:05:24 +0900
Subject: [xoops-cvslog 2145] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060203030524.35A5A2AC086@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.6 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.7
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.6	Thu Feb  2 14:33:07 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Fri Feb  3 12:05:24 2006
@@ -1,7 +1,9 @@
 <?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', "アイコン");
@@ -18,13 +20,20 @@
 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', "顔文字");

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:05:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:05:24 +0900
Subject: [xoops-cvslog 2146] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060203030524.5B8CD2AC08F@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.6 xoops2jp/html/modules/base/language/english/main.php:1.1.2.7
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.6	Thu Feb  2 14:32:31 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Fri Feb  3 12:05:24 2006
@@ -1,7 +1,9 @@
 <?php
 
+define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
 define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} 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', "com icon");
@@ -18,13 +20,20 @@
 define('_MD_BASE_LANG_COM_TITLE', "Title");
 define('_MD_BASE_LANG_COM_UID', "UID");
 define('_MD_BASE_LANG_COMMENT_RULE', "The rule about comment");
+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', "Use HTML tags");
 define('_MD_BASE_LANG_DOIMAGE', "doimage");
 define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
 define('_MD_BASE_LANG_DOXCODE', "User 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', "smile url");
 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");

From minahito ＠ users.sourceforge.jp  Fri Feb  3 12:05:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 12:05:47 +0900
Subject: [xoops-cvslog 2147] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060203030547.9E4682AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_misc_smilies.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.2 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.2	Thu Feb  2 15:24:23 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_smilies.html	Fri Feb  3 12:05:47 2006
@@ -9,22 +9,24 @@
 
 <table width="100%" class="outer">
   <tr>
-    <th colspan="3"><{$smarty.const._MSC_SMILIES}></th>
+    <th colspan="3"><{$smarty.const._MD_BASE_LANG_SMILIES}></th>
   </tr>
   <tr class="head">
-    <td><{$smarty.const._MSC_CODE}></td>
-    <td><{$smarty.const._MSC_EMOTION}></td>
-    <td><{$smarty.const._IMAGE}></td>
+    <td><{$smarty.const._MD_BASE_LANG_CODE}></td>
+    <td><{$smarty.const._MD_BASE_LANG_EMOTION}></td>
+    <td><{$smarty.const._MD_BASE_LANG_IMAGE}></td>
   </tr>
-  <{foreach item=smile from=$smiles}>
+  <{foreach item=obj from=$objects}>
     <tr class="<{cycle values="even,odd"}>">
-      <td><{$smile.code}></td>
-      <td><{$smile.emotion}></td>
+      <td><{$obj->getVar('code')}></td>
+      <td><{$obj->getVar('emotion')}></td>
       <td>
-        <img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$smile.code}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$smile.smile_url}>' alt='' />
+        <img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$obj->getVar('code')}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('smile_url')}>' alt='<{$obj->getVar('emotion')}>' />
       </td>
     </tr>
   <{/foreach}>
 </table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
 
-<{$smarty.const._MSC_CLICKASMILIE}>
+<{$smarty.const._MD_BASE_LANG_CLICKASMILIE}>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 13:26:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 13:26:39 +0900
Subject: [xoops-cvslog 2148] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060203042639.3989C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SmiliesAction.class.php
diff -u xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.1	Fri Feb  3 12:04:50 2006
+++ xoops2jp/html/modules/base/actions/SmiliesAction.class.php	Fri Feb  3 13:26:39 2006
@@ -6,6 +6,11 @@
 
 class Legacy_SmiliesAction extends Legacy_AbstractListAction
 {
+	/**
+	 * @var string
+	 */
+	var $mTargetName = null;
+
 	function &_getHandler()
 	{
 		$handler =& xoops_getmodulehandler('smiles', 'base');
@@ -23,6 +28,12 @@
 		return "./misc.php?type=Smilies";
 	}
 
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mTargetName = xoops_getrequest('target');
+		return parent::getDefaultView($controller, $xoopsUser);
+	}
+	
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
 		//
@@ -34,6 +45,7 @@
 		$render->setTemplateName("legacy_misc_smilies.html");
 		$render->setAttribute("objects", $this->mObjects);
 		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("targetName", $this->mTargetName);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:01:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:01:38 +0900
Subject: [xoops-cvslog 2149] CVS update: xoops2jp/html/kernel
Message-ID: <20060203060138.6E4992AC029@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.5 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.6
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.5	Wed Jan 25 00:34:21 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Fri Feb  3 15:01:38 2006
@@ -13,8 +13,8 @@
 {
 	var $mRoot;
 
-	var $mBlockChain;
-	var $mFilterChain;
+	var $mBlockChain = array();
+	var $mFilterChain = array();
 	
 	/**
 	 * XoopsLogger Instance

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:03:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:03:24 +0900
Subject: [xoops-cvslog 2150] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060203060324.DE83C2AC029@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.10 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.11
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.10	Fri Feb  3 02:00:14 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php	Fri Feb  3 15:03:24 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.10 2006/02/02 17:00:14 minahito Exp $
+// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.11 2006/02/03 06:03:24 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -72,6 +72,14 @@
 	}
 	
 	/**
+	 *  Check current user's permission, return boolean as its result. If current
+	 * module's dirname is Base or System, check whether current user has one of
+	 * the permissions of administrator.
+	 *
+	 *  The check of this method is loose for Base module and System module only.
+	 * But, In Base module's controller, system must check his permission strictly.
+	 *
+	 * @access public
 	 * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
 	 * @return bool
 	 */
@@ -82,17 +90,22 @@
 		//
 		// The guest user is never administrator.
 		//
-		if(!is_object($xoopsUser))
+		if (!is_object($xoopsUser))
 			return false;
-		
 
-		$xoopsModule=&$this->mModuleObject;
+		//
+		// Decide $mid as a argument for checkRight() by current module's dirname.
+		//
+		$mid = 0;
+		if ($this->mModuleObject->get('dirname') == 'base' || $this->mModuleObject->get('dirname') == 'system') {
+			$mid = -1;
+		}
+		else {
+			$mid = $this->mModuleObject->get('mid');
+		}
+		
         $modPermHandler =& xoops_gethandler('groupperm');
-
-		if (!$modPermHandler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups()))
-			return false;
-
-		return true;
+		return $modPermHandler->checkRight('module_admin', $mid, $xoopsUser->getGroups());
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:03:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:03:58 +0900
Subject: [xoops-cvslog 2151] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060203060358.E07442AC010@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.1 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.2
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.1	Thu Jan 26 01:18:03 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Fri Feb  3 15:03:58 2006
@@ -53,12 +53,21 @@
 		require_once $fileName;
 	
 		if (class_exists($className)) {
-			$this->mAction =& new $className();
+			$this->mAction =& new $className($this->mAdminFlag);
 		}
 	
 		if (!is_object($this->mAction)) {
 			die();
 		}
+		
+		if (!$this->mAction->isPerm($controller, $controller->getXoopsUser())) {
+			if ($this->mAdminFlag) {
+				$controller->executeForward(XOOPS_URL . "/admin.php");
+			}
+			else {
+				$controller->executeForward(XOOPS_URL);
+			}
+		}
 	
 		$this->mAction->prepare($controller, $controller->getXoopsUser());
 	
@@ -91,10 +100,34 @@
 
 class Legacy_Action
 {
-	function Legacy_Action()
+	/**
+	 * @access private
+	 */
+	var $_mAdminFlag = false;
+	
+	function Legacy_Action($adminFlag = false)
 	{
+		$this->_mAdminFlag = $adminFlag;
 	}
 
+	function isPerm(&$controller, &$xoopsUser)
+	{
+		if ($this->_mAdminFlag) {
+			$moduleHandler =& xoops_gethandler('module');
+			$permHandler =& xoops_gethandler('groupperm');
+		
+			$module =& $moduleHandler->getByDirname('base');
+		
+			return $permHandler->checkRight('module_admin', $module->get('mid'), $xoopsUser->getGroups());
+		}
+		else {
+			//
+			// TODO Really?
+			//
+			return true;
+		}
+	}
+	
 	function prepare(&$controller, &$xoopsUser)
 	{
 	}

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:04:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:04:51 +0900
Subject: [xoops-cvslog 2152] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203060451.B45492AC010@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.1 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Fri Feb  3 15:04:51 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: HelpAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.2 2006/02/03 06:04:51 minahito Exp $
  */
 
 /**
@@ -66,42 +66,47 @@
 
 	var $mErrorMessage = null;
 	
+	/**
+	 * @access private
+	 */
+	var $_mDirname = null;
+	
+	function isPerm(&$controller, &$xoopsUser)
+	{
+		$this->_mDirname = xoops_getrequest('dirname');
+		
+		$moduleHandler =& xoops_gethandler('module');
+		$permHandler =& xoops_gethandler('groupperm');
+		
+		$module =& $moduleHandler->getByDirname($this->_mDirname);
+		
+		return $permHandler->checkRight('module_admin', $module->get('mid'), $xoopsUser->getGroups());
+	}
+	
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		//
-		// TODO We must change the following lines to ActionForm.
-		//
-		$dirname = $_GET['dirname'];
-		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
-			return LEGACY_FRAME_VIEW_ERROR;
-		}
-
-		if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
-			return LEGACY_FRAME_VIEW_ERROR;
-		}
-
 		$moduleHandler =& xoops_gethandler('module');
-		$this->mModuleObject =& $moduleHandler->getByDirname($dirname);
+		$this->mModuleObject =& $moduleHandler->getByDirname($this->_mDirname);
 		
 		$language =& $controller->getConfig('language');
 
 		//
 		// TODO We must change the following lines to ActionForm.
 		//
-		$helpfile = isset($_GET['file']) ? $_GET['file'] : $this->mModuleObject->getHelp();
+		$helpfile = xoops_getrequest('file') ? xoops_getrequest('file') : $this->mModuleObject->getHelp();
 
 		//
 		// Smarty
 		//
 		$smarty =& new Legacy_HelpSmarty();
-		$smarty->setDirname($dirname);
+		$smarty->setDirname($this->_mDirname);
 
 		//
 		// file check
 		//
-		$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/" . $language;
+		$template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/" . $language;
 		if (!file_exists($template_dir . "/" . $helpfile)) {
-			$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/english";
+			$template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/english";
 			if (!file_exists($template_dir . "/" . $helpfile)) {
 				$this->mErrorMessage = _MD_A_BASE_ERROR_NO_HELP_FILE;
 				return LEGACY_FRAME_VIEW_ERROR;

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:05:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:05:06 +0900
Subject: [xoops-cvslog 2153] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060203060506.6748C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.1	Thu Jan 19 21:06:34 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php	Fri Feb  3 15:05:06 2006
@@ -30,7 +30,7 @@
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
 	{
-		XCube_Utils::redirectHeader("index.php?action=GroupList", 1, "*SUCCESS*");
+		$controller->executeForward("index.php?action=GroupList");
 	}
 
 	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
Index: xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.1	Thu Jan 19 21:06:03 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php	Fri Feb  3 15:05:06 2006
@@ -107,7 +107,7 @@
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$render)
 	{
-		XCube_Utils::redirectHeader("index.php?action=GroupPerm&amp;groupid=" . $this->mGroup->getVar('groupid'), 1, "*SUCCESS*");
+		$controller->executeForward("index.php?action=GroupPerm&amp;groupid=" . $this->mGroup->getVar('groupid'));
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 15:43:18 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 15:43:18 +0900
Subject: [xoops-cvslog 2154] CVS update: xoops2jp/html/class
Message-ID: <20060203064318.4E67B2AC054@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ActionForm.class.php
diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.27 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.28
--- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.27	Thu Feb  2 20:49:23 2006
+++ xoops2jp/html/class/XCube_ActionForm.class.php	Fri Feb  3 15:43:18 2006
@@ -260,7 +260,7 @@
 	{
 		$value = null;
 
-		if ($key != null && is_array($_REQUEST[$this->mName]) && isset($_REQUEST[$this->mName][$key])) {
+		if ($key !== null && is_array($_REQUEST[$this->mName]) && isset($_REQUEST[$this->mName][$key])) {
 			$value = $_REQUEST[$this->mName][$key];
 		}
 		elseif (isset($_REQUEST[$this->mName]) && !is_array($_REQUEST[$this->mName])) {
@@ -329,7 +329,7 @@
 			$ret = array();
 			
 			foreach ($this->mProperties as $name => $value) {
-				$ret[$name] = $value;
+				$ret[$name] = $value->getValue();
 			}
 
 			return $ret;

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 15:44:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 15:44:29 +0900
Subject: [xoops-cvslog 2155] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060203064429.2E7CC2AC020@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.8 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.8	Thu Feb  2 23:09:17 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Fri Feb  3 15:44:29 2006
@@ -174,7 +174,7 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_VPASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=pass2 value=$actionForm->get('vpass') size=25 maxlength=32}>
+        <{xoops_input type=text name=vpass value=$actionForm->get('vpass') size=25 maxlength=32}>
       </td>
     </tr>
     <tr>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:53:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:53:02 +0900
Subject: [xoops-cvslog 2156] CVS update:
	xoops2jp/html/modules/base/admin/blocks
Message-ID: <20060203065302.E38D62AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.4	Tue Dec 27 19:30:11 2005
+++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php	Fri Feb  3 15:53:02 2006
@@ -13,6 +13,13 @@
 class Legacy_AdminSideMenu extends XCube_BlockProcedure
 {
 	var $mModules=array();
+	
+	/**
+	 * protected, but read OK.
+	 * 
+	 * @access protected
+	 */
+	var $mCurrentModule = null;
 
 	function getTitle()
 	{
@@ -29,8 +36,19 @@
 		return false;
 	}
 
-	function execute(&$controller,&$user)
+	function execute(&$controller, &$user)
 	{
+		$this->mCurrentModule =& $controller->mModuleController->mModuleObject;
+		if ($this->mCurrentModule->get('dirname') == 'base') {
+			if (xoops_getrequest('action') == "help") {
+				$moduleHandler =& xoops_gethandler('module');
+				$t_module =& $moduleHandler->getByDirname(xoops_gethandler('dirname'));
+				if (is_object($t_module)) {
+					$this->mCurrentModule =& $t_module;
+				}
+			}
+		}
+		
 		$db=&$controller->getDB();
 		//
 		// TODO : We don't use handler and write sql directly.
@@ -83,7 +101,12 @@
 
 	function &getResult()
 	{
-		return $this->mModules;
+		$t_arr = array();
+		
+		$t_arr['modules'] =& $this->mModules;
+		$t_arr['currentModule'] =& $this->mCurrentModule;
+
+		return $t_arr;
 	}
 
 	function getTemplateName()

From minahito ＠ users.sourceforge.jp  Fri Feb  3 15:53:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 15:53:19 +0900
Subject: [xoops-cvslog 2157] CVS update:
	xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20060203065319.AEB962AC020@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.9
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.8	Fri Dec 30 17:25:19 2005
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html	Fri Feb  3 15:53:19 2006
@@ -1,5 +1,5 @@
 
-<{foreach item=module from=$block}>
+<{foreach item=module from=$block.modules}>
   <{if $module->modinfo.adminindex}>
 	<div id="t<{$module->getVar('mid')}>" class="head"><a href="javascript:void(0)" onclick="ccToggle(<{$module->getVar('mid')}>)"><img src="<{"design/navy.gif"|theme}>" alt="" id="i<{$module->getVar('mid')}>" /></a> <a href="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.adminindex}>"><{$module->getVar('name')}></a></div>
 	<div id="c<{$module->getVar('mid')}>" class="side">

From minahito ＠ users.sourceforge.jp  Fri Feb  3 16:08:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 16:08:05 +0900
Subject: [xoops-cvslog 2158] CVS update:
	xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20060203070805.23B292AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.10
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.9	Fri Feb  3 15:53:19 2006
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html	Fri Feb  3 16:08:05 2006
@@ -6,10 +6,12 @@
 	<ul>
 	<{if $module->adminmenu}>
 		<{foreach item=menu from=$module->adminmenu}>
-			<{if $menu.absolute}>
-				<li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
-			<{else}>
-				<li><a href="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
+			<{if $menu.enable !== false}>
+				<{if $menu.absolute}>
+					<li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
+				<{else}>
+					<li><a href="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
+				<{/if}>
 			<{/if}>
 		<{/foreach}>
 	<{else}>

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 16:32:00 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 16:32:00 +0900
Subject: [xoops-cvslog 2159] CVS update: xoops2jp/html/class
Message-ID: <20060203073200.659F32AC029@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ActionForm.class.php
diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.28 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.29
--- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.28	Fri Feb  3 15:43:18 2006
+++ xoops2jp/html/class/XCube_ActionForm.class.php	Fri Feb  3 16:32:00 2006
@@ -320,7 +320,10 @@
 
 	function setValue($index, $value)
 	{
-		$this->mValue[$index] = $value;
+		if (!isset($this->mProperties[$index])) {
+			$this->mProperties[$index] = new $this->mPropertyClassName($this->mName);
+		}
+		$this->mProperties[$index]->setValue($value);
 	}
 
 	function getValue($index=null)

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 16:35:15 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 16:35:15 +0900
Subject: [xoops-cvslog 2160] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060203073515.A6B732AC01D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.7
--- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.6	Thu Feb  2 17:35:02 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php	Fri Feb  3 16:35:15 2006
@@ -88,11 +88,11 @@
 		$this->mFieldProperties['user_from']->addVar('maxlength', 100);
 
 		$this->mFieldProperties['user_sig'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_sig']->setDependsByArray(array(''));
-		$this->mFieldProperties['user_sig']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_USER_SIG);
+//		$this->mFieldProperties['user_sig']->setDependsByArray(array(''));
+//		$this->mFieldProperties['user_sig']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_USER_SIG);
 
 		$this->mFieldProperties['user_viewemail'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_viewemail']->setDependsByArray(array(''));
+//		$this->mFieldProperties['user_viewemail']->setDependsByArray(array(''));
 
 		$this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength'));
@@ -124,7 +124,7 @@
 		$this->mFieldProperties['posts']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_POSTS);
 
 		$this->mFieldProperties['attachsig'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['attachsig']->setDependsByArray(array(''));
+//		$this->mFieldProperties['attachsig']->setDependsByArray(array(''));
 
 		$this->mFieldProperties['rank'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['rank']->setDependsByArray(array('required'));
@@ -169,7 +169,7 @@
 		$this->mFieldProperties['user_occ']->addVar('maxlength', 100);
 
 		$this->mFieldProperties['bio'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['bio']->setDependsByArray(array(''));
+//		$this->mFieldProperties['bio']->setDependsByArray(array(''));
 
 		$this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength'));
@@ -177,14 +177,18 @@
 		$this->mFieldProperties['user_intrest']->addVar('maxlength', 150);
 
 		$this->mFieldProperties['user_mailok'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_mailok']->setDependsByArray(array(''));
+//		$this->mFieldProperties['user_mailok']->setDependsByArray(array(''));
 	}
 	
 	function validateUname()
 	{
 		if ($this->get('uname') != null) {
 			$handler =& xoops_gethandler('user');
-			if ($handler->getCount(new Criteria('uname', $this->get('uname'))) > 0) {
+			$criteria =& new CriteriaCompo(new Criteria('uname', $this->get('uname')));
+			if ($this->get('uid')) {
+				$criteria->add(new Criteria('uid', $this->get('uid'), '<>'));
+			}
+			if ($handler->getCount($criteria) > 0) {
 				$this->addErrorMessage(_AD_USER_ERROR_UNAME_NO_UNIQUE);
 			}
 		}

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:15:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:15:05 +0900
Subject: [xoops-cvslog 2161] CVS update:
	xoops2jp/html/modules/base/admin/blocks
Message-ID: <20060203081505.F280A2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.5	Fri Feb  3 15:53:02 2006
+++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php	Fri Feb  3 17:15:05 2006
@@ -54,8 +54,8 @@
 		// TODO : We don't use handler and write sql directly.
 		//
 		$sql = "SELECT {mod}.* FROM {mod},{perm} ".
-		        "WHERE {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ".
-		        "ORDER BY {mod}.weight";
+		        "WHERE {mod}.isactive=1 AND {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ".
+		        "ORDER BY {mod}.weight, {mod}.mid";
 
 		$replaceMap=array("mod"=>$db->prefix("modules"),
 		                 "perm"=>$db->prefix("group_permission"),

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:33:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:33:01 +0900
Subject: [xoops-cvslog 2162] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060203083301.A4D3F2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php
diff -u xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php:removed
--- xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php:1.1.2.2	Mon Dec 26 21:23:12 2005
+++ xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php	Fri Feb  3 17:33:01 2006
@@ -1,81 +0,0 @@
-<?php
-/**
- * @version
- */
-
-/**
- */
-class Legacy_DeactiveModuleHandler extends XoopsObjectHandler
-{
-	var $_mXoopsModules = array();
-
-	var $mModHandler = null;
-
-	/**
-	 * readonly property
-	 */
-	var $_mExclusions = array(".", "..", "CVS");
-	
-	function Legacy_DeactiveModuleHandler(&$db)
-	{
-	}
-
-	/**
-	 * Once, load module objects to a member property from XOOPS_MODULE_PATH.
-	 */
-	function _setupObjects()
-	{
-		if (count($this->_mXoopsModules) == 0) {
-			if ($handler = opendir(XOOPS_MODULE_PATH))	{
-				while (($dir = readdir($handler)) !== false) {
-					if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
-						$module =& $this->get($dir);
-						if ($module !== false ) {
-							$this->_mXoopsModules[] =& $module;
-							unset($module);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Return module object by $dirname that is specified module directory.
-	 * If specified module has been installed or doesn't keep xoops_version, not return it.
-	 * @param $dirname string
-	 * @param XoopsModule or false
-	 */
-	function &get($dirname)
-	{
-		$ret=false;
-		
-		if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/xoops_version.php")) {
-			return $ret;
-		}
-
-		$moduleHandler =& xoops_gethandler('module');
-
-		$check =& $moduleHandler->getByDirname($dirname);
-		if (is_object($check)) {
-			return $ret;
-		}
-
-		$module =& $moduleHandler->create();
-		$module->loadInfoAsVar($dirname);
-		
-		return $module;
-	}
-
-	function &getObjects($criteria=null)
-	{
-		$ret =& $this->_setupObjects();
-
-		//
-		// ?????????
-		//
-		return $this->_mXoopsModules;
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:33:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:33:15 +0900
Subject: [xoops-cvslog 2163] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060203083315.356752AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_installer.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.4	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer.html	Fri Feb  3 17:33:15 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
   &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
 </div>
 
Index: xoops2jp/html/modules/base/admin/templates/module_information.html
diff -u xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.6	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_information.html	Fri Feb  3 17:33:15 2006
@@ -2,7 +2,7 @@
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
   <{if !$installed }>
-    &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+    &raquo;&raquo; <a href="./index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
   <{/if}>
   &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_INFORMATION}>
 </div>
Index: xoops2jp/html/modules/base/admin/templates/module_installer_licence.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.4	Thu Feb  2 18:18:04 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer_licence.html	Fri Feb  3 17:33:15 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
   &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
 </div>
 
Index: xoops2jp/html/modules/base/admin/templates/module_install_success.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.5	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install_success.html	Fri Feb  3 17:33:15 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <a href="./index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
   &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_SUCCESS}>
 </div>
 
Index: xoops2jp/html/modules/base/admin/templates/module_install.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.2	Thu Feb  2 22:50:45 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install.html	Fri Feb  3 17:33:15 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <a href="./index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
   &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
 </div>
 
Index: xoops2jp/html/modules/base/admin/templates/install_list.html
diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.1 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.1	Thu Feb  2 21:22:44 2006
+++ xoops2jp/html/modules/base/admin/templates/install_list.html	Fri Feb  3 17:33:15 2006
@@ -1,7 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleDeactiveList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <a href="./index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
 </div>
 
 <h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></h3>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:33:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:33:25 +0900
Subject: [xoops-cvslog 2164] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203083325.BC4EE2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.1	Thu Feb  2 21:22:44 2006
+++ xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php	Fri Feb  3 17:33:25 2006
@@ -1,26 +1,16 @@
 <?php
 
-//
-// TODO We should to delete the original handler style.
-//
-require_once XOOPS_BASE_PATH."/admin/class/DeactiveModuleHandler.class.php";
-
 /**
- * List up modules that are not installed yet.
+ * List up non-installation modules.
  */
 class Legacy_InstallListAction extends Legacy_Action
 {
 	var $mModuleObjects = null;
 	
-	function prepare(&$controller, &$xoopsUser)
-	{
-	}
-	
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$db =& $controller->getDB();
-		$handler = new Legacy_DeactiveModuleHandler($db);
-		
+		$handler =& xoops_getmodulehandler('non_installation_module');
+
 		$this->mModuleObjects =& $handler->getObjects();
 		
 		return LEGACY_FRAME_VIEW_INDEX;

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:33:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:33:36 +0900
Subject: [xoops-cvslog 2165] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060203083336.908A32AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/non_installation_module.php
diff -u /dev/null xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.1
--- /dev/null	Fri Feb  3 17:33:36 2006
+++ xoops2jp/html/modules/base/class/non_installation_module.php	Fri Feb  3 17:33:36 2006
@@ -0,0 +1,73 @@
+<?php
+
+class BaseNon_installation_moduleHandler extends XoopsObjectHandler
+{
+	var $_mXoopsModules = array();
+
+	var $mModHandler = null;
+
+	/**
+	 * readonly property
+	 */
+	var $_mExclusions = array(".", "..", "CVS");
+	
+	function BaseNon_installation_moduleHandler(&$db)
+	{
+		parent::XoopsObjectHandler($db);
+		$this->_setupObjects();
+	}
+
+	/**
+	 * Once, load module objects to a member property from XOOPS_MODULE_PATH.
+	 */
+	function _setupObjects()
+	{
+		if (count($this->_mXoopsModules) == 0) {
+			if ($handler = opendir(XOOPS_MODULE_PATH))	{
+				while (($dir = readdir($handler)) !== false) {
+					if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
+						$module =& $this->get($dir);
+						if ($module !== false ) {
+							$this->_mXoopsModules[] =& $module;
+							unset($module);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return module object by $dirname that is specified module directory.
+	 * If specified module has been installed or doesn't keep xoops_version, not return it.
+	 * @param $dirname string
+	 * @param XoopsModule or false
+	 */
+	function &get($dirname)
+	{
+		$ret=false;
+		
+		if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/xoops_version.php")) {
+			return $ret;
+		}
+
+		$moduleHandler =& xoops_gethandler('module');
+
+		$check =& $moduleHandler->getByDirname($dirname);
+		if (is_object($check)) {
+			return $ret;
+		}
+
+		$module =& $moduleHandler->create();
+		$module->loadInfoAsVar($dirname);
+		
+		return $module;
+	}
+
+	function &getObjects($criteria=null)
+	{
+		return $this->_mXoopsModules;
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:37:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:37:54 +0900
Subject: [xoops-cvslog 2166] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203083754.5436C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.1	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php	Fri Feb  3 17:37:54 2006
@@ -101,6 +101,12 @@
 		}
 	}
 
+	function isPerm(&$controller, &$xoopsUser)
+	{
+		$permHandler =& xoops_gethandler('groupperm');
+		return $permHandler->checkRight('module_admin', -1, $xoopsUser->getGroups());
+	}
+	
 	function getDefaultView(&$controller,&$xoopsUser)
 	{
 		$this->_processActionForm();

From minahito ＠ users.sourceforge.jp  Fri Feb  3 17:45:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 17:45:49 +0900
Subject: [xoops-cvslog 2167] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203084549.B2E272AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.2	Fri Feb  3 17:37:54 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php	Fri Feb  3 17:45:49 2006
@@ -61,6 +61,12 @@
 	}
 }
 
+/**
+ *  Execute action searching. Now, it returns all of modules' results whether
+ * the current user can access to.
+ * 
+ * @todo We should return the result by the current user's permission.
+ */
 class Legacy_ActSearchAction extends Legacy_Action
 {
 	var $mModules=array();

From minahito ＠ users.sourceforge.jp  Fri Feb  3 20:16:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 20:16:15 +0900
Subject: [xoops-cvslog 2168] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060203111615.793AB2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/install_wizard.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.1
--- /dev/null	Fri Feb  3 20:16:15 2006
+++ xoops2jp/html/modules/base/admin/.xml/install_wizard.xml	Fri Feb  3 20:16:15 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="InstallWizardForm" type="XCube_ActionForm">
+		<form-property name="dirname" type="String" />
+		<form-property name="agree" type="Bool" />
+		<form-property name="force" type="Bool" />
+	</form-bean>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 20:19:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 20:19:37 +0900
Subject: [xoops-cvslog 2169] CVS update: xoops2jp/html/modules/user
Message-ID: <20060203111937.9F3202AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.11 xoops2jp/html/modules/user/xoops_version.php:1.1.2.12
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.11	Thu Feb  2 17:10:17 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Fri Feb  3 20:19:37 2006
@@ -1,242 +1,242 @@
-<?php
-// $Id: xoops_version.php,v 1.1.2.11 2006/02/02 08:10:17 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 //
-//  ------------------------------------------------------------------------ //
-
-$modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 1.00;
-$modversion['description'] = _MI_USER_NAME_DESC;
-$modversion['author'] = "";
-$modversion['credits'] = "The XOOPS Project";
-$modversion['help'] = "system.html";
-$modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 1;
-$modversion['image'] = "images/user.gif";
-$modversion['dirname'] = "user";
-
-// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-
-// Templates
-$modversion['templates'][1]['file'] = 'user_userinfo.html';
-$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php';
-
-$modversion['templates'][2]['file'] = 'user_userform.html';
-$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user';
-
-$modversion['templates'][3]['file'] = 'user_edituser.html';
-$modversion['templates'][3]['description'] = 'When user edit own information, display this';
-
-$modversion['templates'][4]['file'] = 'user_register_form.html';
-$modversion['templates'][4]['description'] = '';
-
-$modversion['templates'][5]['file'] = 'user_register_confirm.html';
-$modversion['templates'][5]['description'] = '';
-
-$modversion['templates'][6]['file'] = 'user_lostpass.html';
-$modversion['templates'][6]['description'] = '';
-
-$modversion['templates'][7]['file'] = 'user_default.html';
-$modversion['templates'][7]['description'] = '';
-
-$modversion['templates'][8]['file'] = 'user_avatar_edit.html';
-$modversion['templates'][8]['description'] = '';
-
-//Preference
-$modversion['config'][]=array (
-		"name"=>"allow_register",
-		"title"=>"_MI_USER_CONF_ALLOW_REGISTER",
-		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"minpass",
-		"title"=>"_MI_USER_CONF_MINPASS",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>5
-	);
-
-$modversion['config'][]=array (
-		"name"=>"minuname",
-		"title"=>"_MI_USER_CONF_MINUNAME",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>3
-	);
-
-$modversion['config'][]=array (
-		"name"=>"maxuname",
-		"title"=>"_MI_USER_CONF_MAXUNAME",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>10
-	);
-
-$modversion['config'][]=array (
-		"name"=>"allow_chgmail",
-		"title"=>"_MI_USER_CONF_CHGMAIL",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"new_user_notify",
-		"title"=>"_MI_USER_CONF_NEW_USER_NOTIFY",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"new_user_notify_group",
-		"title"=>"_MI_USER_CONF_NEW_NTF_GROUP",
-		"formtype"=>"group",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"activation_type",
-		"title"=>"_MI_USER_CONF_ACTV_TYPE",
-		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_ACTV_USER=>0,_MI_USER_CONF_ACTV_AUTO=>1,_MI_USER_CONF_ACTV_ADMIN=>2),
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"activation_group",
-		"title"=>"_MI_USER_CONF_ACTV_GROUP",
-		"description"=>"_MI_USER_CONF_ACTV_GROUP_DESC",
-		"formtype"=>"group",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"uname_test_level",
-		"title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL",
-		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG=>0,_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL=>1,_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK=>2),
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_allow_upload",
-		"title"=>"_MI_USER_CONF_AVTR_ALLOW_UP",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_minposts",
-		"title"=>"_MI_USER_CONF_AVATAR_MINPOSTS",
-		"description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_width",
-		"title"=>"_MI_USER_CONF_AVATAR_WIDTH",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>80
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_height",
-		"title"=>"_MI_USER_CONF_AVATAR_HEIGHT",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>80
-	);
-
-$modversion['config'][]=array (
-		"name"=>"avatar_maxsize",
-		"title"=>"_MI_USER_CONF_AVATAR_MAXSIZE",
-		"formtype"=>"text",
-		"valuetype"=>"int",
-		"default"=>35000
-	);
-
-$modversion['config'][]=array (
-		"name"=>"self_delete",
-		"title"=>"_MI_USER_CONF_SELF_DELETE",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>1
-	);
-
-$modversion['config'][]=array (
-		"name"=>"bad_unames",
-		"title"=>"_MI_USER_CONF_BAD_UNAMES",
-		"description"=>"_MI_USER_CONF_BAD_UNAMES_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>"webmaster|^xoops|^admin"
-	);
-
-$modversion['config'][]=array (
-		"name"=>"bad_emails",
-		"title"=>"_MI_USER_CONF_BAD_EMAILS",
-		"description"=>"_MI_USER_CONF_BAD_EMAILS_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>"xoopscube.org$|xoopscube.jp$"
-	);
-
-$modversion['config'][]=array (
-		"name"=>"reg_dispdsclmr",
-		"title"=>"_MI_USER_CONF_DISPDSCLMR",
-		"description"=>"_MI_USER_CONF_DISPDSCLMR_DESC",
-		"formtype"=>"yesno",
-		"valuetype"=>"int",
-		"default"=>0
-	);
-
-$modversion['config'][]=array (
-		"name"=>"reg_disclaimer",
-		"title"=>"_MI_USER_CONF_DISCLAIMER",
-		"description"=>"_MI_USER_CONF_DISCLAIMER_DESC",
-		"formtype"=>"textarea",
-		"valuetype"=>"string",
-		"default"=>""
-	);
-
-// Menu
-$modversion['hasMain'] = 1;
-
-?>
+<?php
+// $Id: xoops_version.php,v 1.1.2.12 2006/02/03 11:19:37 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 //
+//  ------------------------------------------------------------------------ //
+
+$modversion['name'] = _MI_USER_NAME;
+$modversion['version'] = 1.00;
+$modversion['description'] = _MI_USER_NAME_DESC;
+$modversion['author'] = "";
+$modversion['credits'] = "The XOOPS Project";
+$modversion['help'] = "help.html";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 1;
+$modversion['image'] = "images/user.gif";
+$modversion['dirname'] = "user";
+
+// Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+// Templates
+$modversion['templates'][1]['file'] = 'user_userinfo.html';
+$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php';
+
+$modversion['templates'][2]['file'] = 'user_userform.html';
+$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user';
+
+$modversion['templates'][3]['file'] = 'user_edituser.html';
+$modversion['templates'][3]['description'] = 'When user edit own information, display this';
+
+$modversion['templates'][4]['file'] = 'user_register_form.html';
+$modversion['templates'][4]['description'] = '';
+
+$modversion['templates'][5]['file'] = 'user_register_confirm.html';
+$modversion['templates'][5]['description'] = '';
+
+$modversion['templates'][6]['file'] = 'user_lostpass.html';
+$modversion['templates'][6]['description'] = '';
+
+$modversion['templates'][7]['file'] = 'user_default.html';
+$modversion['templates'][7]['description'] = '';
+
+$modversion['templates'][8]['file'] = 'user_avatar_edit.html';
+$modversion['templates'][8]['description'] = '';
+
+//Preference
+$modversion['config'][]=array (
+		"name"=>"allow_register",
+		"title"=>"_MI_USER_CONF_ALLOW_REGISTER",
+		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"minpass",
+		"title"=>"_MI_USER_CONF_MINPASS",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>5
+	);
+
+$modversion['config'][]=array (
+		"name"=>"minuname",
+		"title"=>"_MI_USER_CONF_MINUNAME",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>3
+	);
+
+$modversion['config'][]=array (
+		"name"=>"maxuname",
+		"title"=>"_MI_USER_CONF_MAXUNAME",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>10
+	);
+
+$modversion['config'][]=array (
+		"name"=>"allow_chgmail",
+		"title"=>"_MI_USER_CONF_CHGMAIL",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"new_user_notify",
+		"title"=>"_MI_USER_CONF_NEW_USER_NOTIFY",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"new_user_notify_group",
+		"title"=>"_MI_USER_CONF_NEW_NTF_GROUP",
+		"formtype"=>"group",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"activation_type",
+		"title"=>"_MI_USER_CONF_ACTV_TYPE",
+		"formtype"=>"select",
+		"options"=>array(_MI_USER_CONF_ACTV_USER=>0,_MI_USER_CONF_ACTV_AUTO=>1,_MI_USER_CONF_ACTV_ADMIN=>2),
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"activation_group",
+		"title"=>"_MI_USER_CONF_ACTV_GROUP",
+		"description"=>"_MI_USER_CONF_ACTV_GROUP_DESC",
+		"formtype"=>"group",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"uname_test_level",
+		"title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL",
+		"formtype"=>"select",
+		"options"=>array(_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG=>0,_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL=>1,_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK=>2),
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_allow_upload",
+		"title"=>"_MI_USER_CONF_AVTR_ALLOW_UP",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_minposts",
+		"title"=>"_MI_USER_CONF_AVATAR_MINPOSTS",
+		"description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_width",
+		"title"=>"_MI_USER_CONF_AVATAR_WIDTH",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>80
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_height",
+		"title"=>"_MI_USER_CONF_AVATAR_HEIGHT",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>80
+	);
+
+$modversion['config'][]=array (
+		"name"=>"avatar_maxsize",
+		"title"=>"_MI_USER_CONF_AVATAR_MAXSIZE",
+		"formtype"=>"text",
+		"valuetype"=>"int",
+		"default"=>35000
+	);
+
+$modversion['config'][]=array (
+		"name"=>"self_delete",
+		"title"=>"_MI_USER_CONF_SELF_DELETE",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>1
+	);
+
+$modversion['config'][]=array (
+		"name"=>"bad_unames",
+		"title"=>"_MI_USER_CONF_BAD_UNAMES",
+		"description"=>"_MI_USER_CONF_BAD_UNAMES_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>"webmaster|^xoops|^admin"
+	);
+
+$modversion['config'][]=array (
+		"name"=>"bad_emails",
+		"title"=>"_MI_USER_CONF_BAD_EMAILS",
+		"description"=>"_MI_USER_CONF_BAD_EMAILS_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>"xoopscube.org$|xoopscube.jp$"
+	);
+
+$modversion['config'][]=array (
+		"name"=>"reg_dispdsclmr",
+		"title"=>"_MI_USER_CONF_DISPDSCLMR",
+		"description"=>"_MI_USER_CONF_DISPDSCLMR_DESC",
+		"formtype"=>"yesno",
+		"valuetype"=>"int",
+		"default"=>0
+	);
+
+$modversion['config'][]=array (
+		"name"=>"reg_disclaimer",
+		"title"=>"_MI_USER_CONF_DISCLAIMER",
+		"description"=>"_MI_USER_CONF_DISCLAIMER_DESC",
+		"formtype"=>"textarea",
+		"valuetype"=>"string",
+		"default"=>""
+	);
+
+// Menu
+$modversion['hasMain'] = 1;
+
+?>

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 22:44:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 22:44:51 +0900
Subject: [xoops-cvslog 2170] CVS update: xoops2jp/html/modules/user/admin/class
Message-ID: <20060203134451.0A7EC2AC020@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php
diff -u xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:1.1.2.1	Sun Dec 25 19:55:01 2005
+++ xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php	Fri Feb  3 22:44:50 2006
@@ -14,15 +14,15 @@
 		parent::XoopsGroup();
 		$this->initVar('user_count', XOBJ_DTYPE_INT, null, false);
 
-		$this->setVar('groupid', $group->getVar('groupid'));
-		$this->setVar('name', $group->getVar('name'));
-		$this->setVar('description', $group->getVar('description'));
-		$this->setVar('group_type', $group->getVar('group_type'));
+		$this->setVar('groupid', $group->get('groupid'));
+		$this->setVar('name', $group->get('name'));
+		$this->setVar('description', $group->get('description'));
+		$this->setVar('group_type', $group->get('group_type'));
 
 		if (is_object($group)) {
 			$memberHandler =& xoops_gethandler('member');
 
-			$this->setVar('user_count', $memberHandler->getUserCountByGroup($this->getVar('groupid')));
+			$this->setVar('user_count', $memberHandler->getUserCountByGroup($this->get('groupid')));
 		}
 	}
 }

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 22:44:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 22:44:51 +0900
Subject: [xoops-cvslog 2171] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060203134451.2EA422AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.3	Thu Feb  2 17:35:27 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php	Fri Feb  3 22:44:51 2006
@@ -31,16 +31,16 @@
 
 	function load(&$group)
 	{
-		$this->set('groupid', $group->getVar('groupid'));
-		$this->set('name', $group->getVar('name'));
-		$this->set('description', $group->getVar('description'));
+		$this->set('groupid', $group->get('groupid'));
+		$this->set('name', $group->get('name'));
+		$this->set('description', $group->get('description'));
 	}
 
 	function update(&$group)
 	{
-		$group->setVar('groupid', $this->getVar('groupid'));
-		$group->setVar('name', $this->getVar('name'));
-		$group->setVar('description', $this->getVar('description'));
+		$group->setVar('groupid', $this->get('groupid'));
+		$group->setVar('name', $this->get('name'));
+		$group->setVar('description', $this->get('description'));
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 23:34:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 23:34:08 +0900
Subject: [xoops-cvslog 2172] CVS update: xoops2jp/html
Message-ID: <20060203143408.E7E442AC021@users.sourceforge.jp>

Index: xoops2jp/html/admin.php
diff -u xoops2jp/html/admin.php:1.2.8.2 xoops2jp/html/admin.php:1.2.8.3
--- xoops2jp/html/admin.php:1.2.8.2	Fri Jan 27 23:47:17 2006
+++ xoops2jp/html/admin.php	Fri Feb  3 23:34:08 2006
@@ -1,132 +1,38 @@
 <?php
-// $Id: admin.php,v 1.2.8.2 2006/01/27 14:47:17 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 //
-//  ------------------------------------------------------------------------ //
-
-$xoopsOption['pagetype'] = "admin";
+// $Id: admin.php,v 1.2.8.3 2006/02/03 14:34:08 nobunobu Exp $
 include "mainfile.php";
-include XOOPS_ROOT_PATH."/include/cp_functions.php";
-/*********************************************************/
-/* Admin Authentication                                  */
-/*********************************************************/
-
-if ( $xoopsUser ) {
-    if ( !$xoopsUser->isAdmin(-1) ) {
-        redirect_header("index.php",2,_AD_NORIGHT);
-        exit();
-    }
-} else {
-    redirect_header("index.php",2,_AD_NORIGHT);
-    exit();
-}
-$op = "list";
+require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
+class DefaultSystemCheckProxyRegister extends XCube_EventProxyRegister
+{
+	var $_mList=array("Legacypage.Admin.SystemCheck");
+	function getEventNameList()
+	{
+		return $this->_mList;
+	}
+	function &createLegacypage_Admin_SystemCheckDelegate()
+	{
+		$delegate=new XCube_Delegate("DefaultSystemCheckFunction","DefaultCheck");
+		return $delegate;
+	}
 
-if ( !empty($_GET['op']) ) {
-    $op = $_GET['op'];
 }
-
-if ( !empty($_POST['op']) ) {
-    $op = $_POST['op'];
+class DefaultSystemCheckFunction
+{
+	function DefaultCheck()
+	{
+		if (is_dir(XOOPS_ROOT_PATH."/install/" )) {
+		    xoops_error(sprintf(_WARNINSTALL2,XOOPS_ROOT_PATH.'/install/'),'','tips');
+		}
+		if ( is_writable(XOOPS_ROOT_PATH."/mainfile.php" ) ) {
+		    xoops_error(sprintf(_WARNINWRITEABLE,XOOPS_ROOT_PATH.'/mainfile.php'),'','tips');
+		}
+	}
 }
 
-//if (!file_exists(XOOPS_CACHE_PATH.'/adminmenu.php') && $op != 'generate') {
-//    xoops_header();
-//    xoops_token_confirm(array('op' => 'generate'), 'admin.php', _AD_PRESSGEN);
-//    xoops_footer();
-//    exit();
-//}
-
-switch ($op) {
-case "list":
-    xoops_cp_header();
-    // ###### Output warn messages for security ######
-    if (is_dir(XOOPS_ROOT_PATH."/install/" )) {
-        xoops_error(sprintf(_WARNINSTALL2,XOOPS_ROOT_PATH.'/install/'));
-        echo '<br />';
-    }
-    if ( is_writable(XOOPS_ROOT_PATH."/mainfile.php" ) ) {
-        xoops_error(sprintf(_WARNINWRITEABLE,XOOPS_ROOT_PATH.'/mainfile.php'));
-        echo '<br />';
-    }
-/*    if (function_exists('mb_convert_encoding') && !empty($_GET['xoopsorgnews'])) {
-        $rssurl = 'http://jp.xoops.org/backend.php';
-        $rssfile = XOOPS_CACHE_PATH.'/adminnews.xml';
-        $rssdata = '';
-        if (!file_exists($rssfile) || filemtime($rssfile) < time() - 86400) {
-            require_once XOOPS_ROOT_PATH.'/class/snoopy.php';
-            $snoopy = new Snoopy;
-            if ($snoopy->fetch($rssurl)) {
-                $rssdata = $snoopy->results;
-                if (false !== $fp = fopen($rssfile, 'w')) {
-                    fwrite($fp, $rssdata);
-                }
-                fclose($fp);
-            }
-        } else {
-            if (false !== $fp = fopen($rssfile, 'r')) {
-                while (!feof ($fp)) {
-                    $rssdata .= fgets($fp, 4096);
-                }
-                fclose($fp);
-            }
-        }
-        if ($rssdata != '') {
-            include_once XOOPS_ROOT_PATH.'/class/xml/rss/xmlrss2parser.php';
-            $rss2parser = new XoopsXmlRss2Parser($rssdata);
-            if (false != $rss2parser->parse()) {
-                echo '<table class="outer" width="100%">';
-                $items =& $rss2parser->getItems();
-                $count = count($items);
-                for ($i = 0; $i < $count; $i++) {
-                    echo '<tr class="head"><td><a href="'.htmlspecialchars($items[$i]['link']).'" target="_blank">';
-                    echo htmlspecialchars(mb_convert_encoding($items[$i]['title'], _CHARSET, 'auto')).'</a> ('.htmlspecialchars($items[$i]['pubdate']).')</td></tr>';
-                    if ($items[$i]['description'] != "") {
-                        echo '<tr><td class="odd">'.mb_convert_encoding($items[$i]['description'], _CHARSET, 'auto');
-                        if ($items[$i]['guid'] != "") {
-                            echo '&nbsp;&nbsp;<a href="'.htmlspecialchars($items[$i]['guid']).'" target="_blank">'._MORE.'</a>';
-                        }
-                        echo '</td></tr>';
-                    } elseif ($items[$i]['guid'] != "") {
-                        echo '<tr><td class="even" valign="top"></td><td colspan="2" class="odd"><a href="'.htmlspecialchars($items[$i]['guid']).'" target="_blank">'._MORE.'</a></td></tr>';
-                    }
-                }
-                echo '</table>';
-            } else {
-                echo $rss2parser->getErrors();
-            }
-        }
-    }*/
-    xoops_cp_footer();
-    break;
-case 'generate':
-    if (xoops_confirm_validate()) {
-        xoops_module_write_admin_menu(xoops_module_get_admin_menu());
-    }
-    redirect_header('admin.php', 1, _AD_LOGINADMIN);
-    break;
-default:
-    break;
-}
+require_once XOOPS_ROOT_PATH . "/header.php";
+$root=&XCube_Root::getSingleton();
+$root->mEventManager->addProxyRegister(new DefaultSystemCheckProxyRegister());
+$eventArgs=array();
+$root->mEventManager->raiseEvent("Legacypage.Admin.SystemCheck",$root->mController,$eventArgs);
+require_once XOOPS_ROOT_PATH . "/footer.php";
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 23:34:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 23:34:09 +0900
Subject: [xoops-cvslog 2173] CVS update: xoops2jp/html/include
Message-ID: <20060203143409.1D6C42AC02E@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.9 xoops2jp/html/include/functions.php:1.2.8.10
--- xoops2jp/html/include/functions.php:1.2.8.9	Wed Jan 25 16:11:39 2006
+++ xoops2jp/html/include/functions.php	Fri Feb  3 23:34:08 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.9 2006/01/25 07:11:39 minahito Exp $
+// $Id: functions.php,v 1.2.8.10 2006/02/03 14:34:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -60,13 +60,14 @@
 		$renderSystem->showXoopsFooter();
 }
 
-function xoops_error($message, $title='')
+function xoops_error($message, $title='', $style='errorMsg')
 {
 	$root =& XCube_Root::getSingleton();
 	$renderTarget =& new Legacy_RenderTargetMain();
 	
 	$renderTarget->setModuleName("base");
 	$renderTarget->setTemplateName("legacy_xoops_error.html");
+	$renderTarget->setAttribute("style", $style);
 	$renderTarget->setAttribute("title", $title);
 	$renderTarget->setAttribute("message", $message);
 

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 23:34:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 23:34:09 +0900
Subject: [xoops-cvslog 2174] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060203143409.411482AC021@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/legacy_xoops_error.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_xoops_error.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/legacy_xoops_error.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/legacy_xoops_error.html:1.1.2.1	Wed Jan 25 12:44:20 2006
+++ xoops2jp/html/modules/base/admin/templates/legacy_xoops_error.html	Fri Feb  3 23:34:09 2006
@@ -1,4 +1,4 @@
-<div class="errorMsg">
+<div class="<{$style}>">
   <{if $title}>
     <h4><{$title}></h4>
   <{/if}>

From nobunobu ＠ users.sourceforge.jp  Fri Feb  3 23:34:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Feb 2006 23:34:09 +0900
Subject: [xoops-cvslog 2175] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060203143409.6425E2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_xoops_error.html
diff -u xoops2jp/html/modules/base/templates/legacy_xoops_error.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_xoops_error.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_xoops_error.html:1.1.2.1	Tue Jan 24 22:53:20 2006
+++ xoops2jp/html/modules/base/templates/legacy_xoops_error.html	Fri Feb  3 23:34:09 2006
@@ -1,4 +1,4 @@
-<div class="errorMsg">
+<div class="<{$style}>">
   <{if $title}>
     <h4><{$title}></h4>
   <{/if}>

From minahito ＠ users.sourceforge.jp  Fri Feb  3 23:41:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Feb 2006 23:41:26 +0900
Subject: [xoops-cvslog 2176] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060203144126.3F4172AC015@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.9 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.10
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.9	Fri Feb  3 15:44:29 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Fri Feb  3 23:41:26 2006
@@ -168,13 +168,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_PASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=pass value=$actionForm->get('pass') size=25 maxlength=32}>
+        <{xoops_input type=password name=pass value=$actionForm->get('pass') size=25 maxlength=32}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_VPASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=vpass value=$actionForm->get('vpass') size=25 maxlength=32}>
+        <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=25 maxlength=32}>
       </td>
     </tr>
     <tr>

From tom_g3x ＠ users.sourceforge.jp  Fri Feb  3 23:55:54 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Feb 2006 23:55:54 +0900
Subject: [xoops-cvslog 2177] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060203145554.C8C202AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.10 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.10	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html	Fri Feb  3 23:55:54 2006
@@ -25,7 +25,7 @@
   <{foreach item=theme from=$themes}>
     <{xoops_token form=$actionForm}>
     <{if $currentThemeName == $theme->get('name')}>
-      <tr class="head" style="background-color:pink;" style="text-align:center;">
+      <tr class="head" style="background-color:pink;text-align:center;">
     <{else}>
       <tr class="<{cycle values="odd,even"}>" style="text-align:center;">
     <{/if}>
@@ -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}>" />
+          <img src="<{"icons/active.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" />
         <{/if}>
-        <img src="<{'icons/info.gif'|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}>" align="absmiddle" />
+        <img src="<{'icons/info.gif'|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}>" style="vertical-align:middle;" />
       </td>
     </tr>
   <{/foreach}>

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 00:03:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 00:03:24 +0900
Subject: [xoops-cvslog 2178] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060203150324.7118F2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.3 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.3	Thu Feb  2 23:09:17 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Sat Feb  4 00:03:24 2006
@@ -7,7 +7,7 @@
 <h3><{$smarty.const._AD_USER_LANG_GROUP_DELETE}></h3>
 
 <ul>
-  <li><{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getVar('name')}>
+  <li><{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getVar('name')}></li>
   <li><{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE2}></li>
 </ul>
 
Index: xoops2jp/html/modules/user/admin/templates/user_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.3	Thu Feb  2 23:09:17 2006
+++ xoops2jp/html/modules/user/admin/templates/user_delete.html	Sat Feb  4 00:03:24 2006
@@ -7,7 +7,7 @@
 <h3><{$smarty.const._AD_USER_LANG_USER_DELETE}></h3>
 
 <ul>
-  <li><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getVar('uname')}>
+  <li><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getVar('uname')}></li>
 </ul>
 
 <{if $actionForm->hasError()}>

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 00:12:46 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 00:12:46 +0900
Subject: [xoops-cvslog 2179] CVS update:
	xoops2jp/html/modules/legacyRender/templates
Message-ID: <20060203151246.E1B092AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/templates/legacy_render_dialog.html
diff -u xoops2jp/html/modules/legacyRender/templates/legacy_render_dialog.html:1.1.2.1 xoops2jp/html/modules/legacyRender/templates/legacy_render_dialog.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/templates/legacy_render_dialog.html:1.1.2.1	Fri Nov 25 13:20:58 2005
+++ xoops2jp/html/modules/legacyRender/templates/legacy_render_dialog.html	Sat Feb  4 00:12:46 2006
@@ -1,8 +1,10 @@
 <!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}>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="<{$xoops_langcode}>" />
 <meta name="robots" content="<{$xoops_meta_robots}>" />
 <meta name="keywords" content="<{$xoops_meta_keywords}>" />
 <meta name="description" content="<{$xoops_meta_description}>" />

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 00:18:14 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 00:18:14 +0900
Subject: [xoops-cvslog 2180] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060203151814.872522AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.7 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.8
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.7	Thu Feb  2 18:06:35 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Sat Feb  4 00:18:14 2006
@@ -4,8 +4,8 @@
 <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$currentUser->get("uid")}>"><{$smarty.const._PM_PROFILE}></a>&nbsp;
 <span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._PM_INBOX}><br /><br />
 
+<form name="prvmsg" method="post" action="./index.php?action=delete">
 <table border="0" cellspacing="1" cellpadding="4" width="100%" class="outer">
-  <form name="prvmsg" method="post" action="./index.php?action=delete">
   <tr style="text-align:center;" valign="middle">
     <th>
       <input name="allbox" id="allbox" onclick='xoopsCheckAll("prvmsg", "allbox");' type="checkbox" value="Check All" />
@@ -69,7 +69,7 @@
     </tr>
   <{/if}>
 
-  </form>
 </table>
+</form>
 
 <div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 00:56:11 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 00:56:11 +0900
Subject: [xoops-cvslog 2181] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060203155611.D10962AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/help.html
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.1
--- /dev/null	Sat Feb  4 00:56:11 2006
+++ xoops2jp/html/modules/user/language/japanese/help.html	Sat Feb  4 00:56:11 2006
@@ -0,0 +1,43 @@
+<h4>概要</h4>
+<ul>
+  <li>ユーザーモジュールは、ユーザー管理・グループ管理に関する機能全般を提供します。個々のユーザーアカウントの追加・編集、ユーザーグループの管理、ユーザーランクの設定、ユーザーの新規登録可否の設定、登録ユーザー向けに一括してメールを配信する機能など、XOOPS
+  2.0.xでシステムモジュール内に含まれていたユーザー管理用の機能が移行されています。</li>
+</ul>
+
+<h4>ユーザー管理</h4>
+<ul>
+  <li>ユーザーの登録・登録情報の編集を行なうことが出来ます。</li>
+  <li>新規のユーザー登録を行う際には、ページの右上の「ユーザー新規登録」からユーザーの新規登録を行って下さい。</li>
+  <li>ユーザーの方のパスワードやプロフィール等を管理者の方が編集する必要がある場合は、一覧中の該当ユーザーの右側にある操作ボタン（鉛筆アイコン）をクリックするとユーザー情報の編集を行えます。</li>
+  <li>ユーザーを削除する時には同様に、削除ボタン（×印）をクリックすると確認画面が表示され「はい」をクリックすると登録されているユーザーが削除されます。</li>
+</ul>
+
+<h4>ユーザーランク管理</h4>
+<ul>
+  <li>フォーラムの投稿記事やユーザープロフィール等で表示されるユーザーランクを設定・編集出来ます。一覧中の該当ランク右側にある操作ボタン（鉛筆アイコン）をクリックするとユーザーランクの設定・編集を行うことができ、ユーザーランクを削除する時には削除ボタン（×印）をクリックします。</li>
+  <li>ページ右上の「ユーザーランク新規登録」を押すと、新規のユーザーランクを追加できます。</li>
+</ul>
+
+<h4>ユーザーグループ管理</h4>
+<ul>
+  <li>旧システム管理モジュールの「グループ管理」に相当する機能を提供します。それぞれのグループ毎に、モジュール・ブロック毎のアクセス権限、システムとモジュールの管理者権限を割り振る事で、ユーザー毎に柔軟なアクセス制御を実現します。</li>
+  <li>新規にユーザーグループを割り振る場合は、ページ右上の「ユーザーグループ新規追加」から、新規グループを追加して下さい。</li>
+  <li>新規のグループ追加に成功すると、一覧にグループ名が表示されるので、該当グループ名の「操作」欄にあるコマンドボタン「パーミッション(手の絵)」を押して該当グループに必要なパーミッションを追加します。</li>
+  <li>グループにユーザーを割り当てる際には、右側のコマンドボタン「メンバーの登録(旗の絵)」を押して、該当するユーザー名を一覧から選び「登録」ボタンを押します。グループからユーザーを削除(グループ権限を剥奪)する際には、こちらのメンバー登録画面の「登録されているユーザー一覧」からユーザー名を選び「削除」ボタンを押します。</li>
+</ul>
+
+<h5>(Tips)</h5>
+<ul>
+  <li>個々のユーザーは複数のグループに所属できます。複数のグループに所属するユーザーは、どちらか一方のグループでアクセス権が与えられていれば、該当のコンテンツにアクセスすることが出来ます。管理を容易にするためには、一つの基準となるグループを作成し、追加で作成するユーザーグループでは、必要最小限のアクセス権限を付加・管理されることをおすすめします。</li>
+  <li>ユーザーグループ一覧にあるコマンドボタン「プロパティ(スマイリーの絵)」にて、該当グループの設定情況を一覧で確認できます。グループパーミッションの設定情況を確認するためには、こちらの一覧で確認した上で、該当グループに属するテスト用のユーザーIDを作成し、実際にアクセスして確認することをおすすめします。</li>
+</ul>
+
+<h4>一斉メール送信</h4>
+<ul>
+  <li>登録ユーザーに対して一斉同報メールを送信することが出来ます。最終ログイン日時や登録日等で絞り込んでメールを送付することが出来るため、一定期間サイトにアクセスしていない人にサイト上のお知らせを確認するように促したり、最近一週間の間に登録された利用者にウェルカムメッセージを流したりすることが可能です。</li>
+</ul>
+
+<h4>一般設定</h4>
+<ul>
+  <li>サイトが新規ユーザの登録を許可するかどうか、ユーザー登録画面の利用許諾文、新規登録ユーザアカウントの有効化の方法、ユーザー名の最低・最大文字数やアバター画像のアップロード許可、ユーザ登録時のemailアドレスとして使用できない文字列などを設定できます。</li>
+</ul>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:00:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:00:10 +0900
Subject: [xoops-cvslog 2182] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060203160010.85B0E2AC061@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/install_wizard.xml
diff -u xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.2
--- xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.1	Fri Feb  3 20:16:15 2006
+++ xoops2jp/html/modules/base/admin/.xml/install_wizard.xml	Sat Feb  4 01:00:10 2006
@@ -3,6 +3,11 @@
 	<form-bean name="InstallWizardForm" type="XCube_ActionForm">
 		<form-property name="dirname" type="String" />
 		<form-property name="agree" type="Bool" />
-		<form-property name="force" type="Bool" />
 	</form-bean>
+	<form-validation>
+		<field property="agree" depends="min">
+			<msg name="min" key="const._AD_BASE_ERROR_PLEASE_AGREE" />
+			<var name="min" value="1" />
+		</field>
+	</form-validation>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:00:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:00:31 +0900
Subject: [xoops-cvslog 2183] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203160031.BEAB92AC049@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.5	Thu Feb  2 21:05:26 2006
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php	Sat Feb  4 01:00:31 2006
@@ -51,22 +51,21 @@
 		$this->mActionForm->fetch();
 		$this->mActionForm->validate();
 		
-		if ($this->mActionForm->hasError()) {
-			return LEGACY_FRAME_VIEW_INPUT;
-		}
-		
 		$installer =& $this->_getInstaller($this->mActionForm->get('dirname'));
 		$this->mModuleObject =& $installer->loadModuleObject($this->mActionForm->get('dirname'));
 		
-		if (!is_object($this->mModuleObject)) {
-			return LEGACY_FRAME_VIEW_ERROR;
+		if ($installer->hasAgree()) {
+			$this->_loadAgreement();
 		}
 
-		if ($installer->hasAgree() && !$this->mActionForm->get('agree')) {
-			$this->_loadAgreement();
+		if ($this->mActionForm->hasError()) {
 			return LEGACY_FRAME_VIEW_INPUT;
 		}
 		
+		if (!is_object($this->mModuleObject)) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+
 		$installer->setForceMode($this->mActionForm->get('force'));
 		$installer->execute($this->mActionForm->get('dirname'));
 
@@ -88,7 +87,7 @@
 
 	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
 	{
-		$renderer->setTemplateName("module_installers_error.html");
+		$renderer->setTemplateName("install_wizard_error.html");
 		$renderer->setAttribute('log', $this->mLog);
 	}
 }

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:00:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:00:58 +0900
Subject: [xoops-cvslog 2184] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060203160058.D1BEF2AC049@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_installer_error.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer_error.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/module_installer_error.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_installer_error.html:1.1.2.1	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer_error.html	Sat Feb  4 01:00:58 2006
@@ -1,13 +0,0 @@
-<h4><{$smarty.const._ERROR}></h4>
-
-<ul>
-<{foreach item=msg from=$log}>
-  <{if $msg.type=="error"}>
-    <li style="color:red;"><{$msg.message}></li>
-  <{elseif $msg.type=="warning"}>
-    <li style="color:blue;"><{$msg.message}></li>
-  <{else}>
-    <li><{$msg.message}></li>
-  <{/if}>
-<{/foreach}>
-</ul>
Index: xoops2jp/html/modules/base/admin/templates/module_installer.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_installer.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_installer.html:1.1.2.5	Fri Feb  3 17:33:15 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer.html	Sat Feb  4 01:00:58 2006
@@ -1,40 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
-</div>
-
-<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></h3>
-
-<ul>
-  <li><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
-</ul>
-
-<form method="POST">
-<{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
-<table class="outer">
-  <tr>
-    <th colspan="2"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></th>
-  </tr>
-  <tr>
-    <td class="head">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.installer.image}>" />
-    </td>
-    <td class="even" valign="top">
-      <h4><{$module->getVar('name')}></h4>
-      <ul>
-        <{foreach item=item from=$module->modinfo.installer.description}>
-          <li><{$item|escape}>
-        <{/foreach}>
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td class="foot" colspan="2">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"  class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>
Index: xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.1
--- /dev/null	Sat Feb  4 01:00:58 2006
+++ xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html	Sat Feb  4 01:00:58 2006
@@ -0,0 +1,40 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
+</div>
+
+<h3><{$licence|escape}></h3>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
+<form method="POST">
+<{xoops_token form=$actionForm}>
+<{xoops_input type=hidden name=dirname value=$actionForm->get('dirname')}>
+<table class="outer">
+  <tr>
+    <th><{$licence|escape}></th>
+  </tr>
+  <tr>
+    <td class="head" style="text-align:center">
+      <textarea cols="75" rows="15"><{$licenceText|escape}></textarea>
+    </td>
+  <tr>
+    <td class="foot">
+      <input type="radio" name="agree" value="1" /><{$smarty.const._MD_A_BASE_LANG_AGREE}>
+      <input type="radio" name="agree" value="0" /><{$smarty.const._MD_A_BASE_LANG_NO_AGREE}>
+    </td>
+  <tr>
+    <td class="foot">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"  class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/module_installer_licence.html
diff -u xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:removed
--- xoops2jp/html/modules/base/admin/templates/module_installer_licence.html:1.1.2.5	Fri Feb  3 17:33:15 2006
+++ xoops2jp/html/modules/base/admin/templates/module_installer_licence.html	Sat Feb  4 01:00:58 2006
@@ -1,32 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
-  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
-  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
-</div>
-
-<h3><{$licence|escape}></h3>
-
-<form method="POST">
-<{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
-<table class="outer">
-  <tr>
-    <th><{$licence|escape}></th>
-  </tr>
-  <tr>
-    <td class="head" style="text-align:center">
-      <textarea cols="75" rows="15"><{$licenceText|escape}></textarea>
-    </td>
-  <tr>
-    <td class="foot">
-      <input type="radio" name="agree" value="1" /><{$smarty.const._MD_A_BASE_LANG_AGREE}>
-      <input type="radio" name="agree" value="0" /><{$smarty.const._MD_A_BASE_LANG_NO_AGREE}>
-    </td>
-  <tr>
-    <td class="foot">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"  class="formButton" />
-    </td>
-  </tr>
-</table>
-</form>
Index: xoops2jp/html/modules/base/admin/templates/install_wizard_error.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.1
--- /dev/null	Sat Feb  4 01:00:58 2006
+++ xoops2jp/html/modules/base/admin/templates/install_wizard_error.html	Sat Feb  4 01:00:58 2006
@@ -0,0 +1,13 @@
+<h4><{$smarty.const._ERROR}></h4>
+
+<ul>
+<{foreach item=msg from=$log}>
+  <{if $msg.type=="error"}>
+    <li style="color:red;"><{$msg.message}></li>
+  <{elseif $msg.type=="warning"}>
+    <li style="color:blue;"><{$msg.message}></li>
+  <{else}>
+    <li><{$msg.message}></li>
+  <{/if}>
+<{/foreach}>
+</ul>
Index: xoops2jp/html/modules/base/admin/templates/install_wizard.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.1
--- /dev/null	Sat Feb  4 01:00:58 2006
+++ xoops2jp/html/modules/base/admin/templates/install_wizard.html	Sat Feb  4 01:00:58 2006
@@ -0,0 +1,40 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=ModuleList"><{$smarty.const._MI_BASE_MENU_MODULELIST}></a>
+  &raquo;&raquo; <a href="index.php?action=InstallList"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL}></a>
+  &raquo;&raquo; <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
+</div>
+
+<h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></h3>
+
+<ul>
+  <li><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
+</ul>
+
+<form method="POST">
+<{xoops_token form=$actionForm}>
+<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<table class="outer">
+  <tr>
+    <th colspan="2"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></th>
+  </tr>
+  <tr>
+    <td class="head">
+      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.installer.image}>" />
+    </td>
+    <td class="even" valign="top">
+      <h4><{$module->getVar('name')}></h4>
+      <ul>
+        <{foreach item=item from=$module->modinfo.installer.description}>
+          <li><{$item|escape}>
+        <{/foreach}>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="foot" colspan="2">
+      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"  class="formButton" />
+    </td>
+  </tr>
+</table>
+</form>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:01:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:01:25 +0900
Subject: [xoops-cvslog 2185] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060203160125.213522AC049@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.7 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.8
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.7	Fri Feb  3 12:05:24 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Sat Feb  4 01:01:24 2006
@@ -1,75 +1,75 @@
-<?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', "文字数が <b>%s</b> 文字未満のキーワードは無視されます。");
-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_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', "文字数が <b>%s</b> 文字未満のキーワードは無視されます。");
+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.15 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.16
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.15	Thu Feb  2 14:33:07 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Sat Feb  4 01:01:25 2006
@@ -3,6 +3,7 @@
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_AD_BASE_ERROR_EXTENSION', "アップロードされたファイルの拡張子が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい");
 define('_AD_BASE_LANG_CODE', "コード");
@@ -34,6 +35,11 @@
 define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
 define('_AD_BASE_LANG_EMOTION', "emotion");
 define('_AD_BASE_LANG_ID', "id");
+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_SMILE_URL', "smile url");
 define('_AD_BASE_LANG_SMILES_DELETE', "顔アイコン削除");
 define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:01:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:01:25 +0900
Subject: [xoops-cvslog 2186] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060203160125.4AE292AC058@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.10 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.11
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.10	Thu Feb  2 14:32:21 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sat Feb  4 01:01:25 2006
@@ -3,6 +3,7 @@
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Updating database was fail.");
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
+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_CODE', "Code");
@@ -34,6 +35,11 @@
 define('_AD_BASE_LANG_DOXCODE', "Use XOOPS code");
 define('_AD_BASE_LANG_EMOTION', "emotion");
 define('_AD_BASE_LANG_ID', "id");
+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_SMILE_URL', "smile url");
 define('_AD_BASE_LANG_SMILES_DELETE', "smiles delete");
 define('_AD_BASE_LANG_SMILES_EDIT', "smiles edit");
Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.7 xoops2jp/html/modules/base/language/english/main.php:1.1.2.8
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.7	Fri Feb  3 12:05:24 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Sat Feb  4 01:01:25 2006
@@ -1,75 +1,75 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} 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', "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', "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', "The rule about comment");
-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', "Use HTML tags");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
-define('_MD_BASE_LANG_DOXCODE', "User 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', "smile url");
-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 Email: ");
-define('_MSC_FRIENDNAMEC', "Friend Name: ");
-define('_MSC_INTSITE', "Interesting Site: %s");
-define('_MSC_INVALIDEMAIL1', "The email address you provided is not a valid address.");
-define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
-define('_MSC_NEEDINFO', "You need to enter required info!");
-define('_MSC_RECOMMENDSITE', "Recommend this Site to a Friend");
-define('_MSC_REFERENCESENT', "The reference to our site has been sent to your friend. Thanks!");
-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 <b>%s</b> match(es)");
-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 <b>%s</b> characters will be ignored");
-define('_SR_KEYTOOSHORT', "Keywords must be at least <b>%s</b> characters long");
-define('_SR_KEYWORDS', "Keyword(s)");
-define('_SR_NEXT', "Next >>");
-define('_SR_NOMATCH', "No Match Found for 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 under {1} 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', "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', "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', "The rule about comment");
+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', "Use HTML tags");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
+define('_MD_BASE_LANG_DOXCODE', "User 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', "smile url");
+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 Email: ");
+define('_MSC_FRIENDNAMEC', "Friend Name: ");
+define('_MSC_INTSITE', "Interesting Site: %s");
+define('_MSC_INVALIDEMAIL1', "The email address you provided is not a valid address.");
+define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
+define('_MSC_NEEDINFO', "You need to enter required info!");
+define('_MSC_RECOMMENDSITE', "Recommend this Site to a Friend");
+define('_MSC_REFERENCESENT', "The reference to our site has been sent to your friend. Thanks!");
+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 <b>%s</b> match(es)");
+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 <b>%s</b> characters will be ignored");
+define('_SR_KEYTOOSHORT', "Keywords must be at least <b>%s</b> characters long");
+define('_SR_KEYWORDS', "Keyword(s)");
+define('_SR_NEXT', "Next >>");
+define('_SR_NOMATCH', "No Match Found for 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  Sat Feb  4 01:01:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:01:38 +0900
Subject: [xoops-cvslog 2187] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203160138.569B42AC049@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.3 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.3	Thu Feb  2 21:27:19 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Sat Feb  4 01:01:38 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.3 2006/02/02 12:27:19 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.4 2006/02/03 16:01:38 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
@@ -59,9 +59,10 @@
 		$renderer->setAttribute('actionForm', $this->mActionForm);
 
 		if (isset($this->mModuleObject->modinfo['installer'])) {
-			$renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
-			$renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
-			$renderer->setTemplateName("module_installer.html");
+			//
+			// Jump
+			//
+			$controller->executeForward('index.php?action=InstallWizard&dirname=' . $this->mModuleObject->get('dirname'));
 		}
 		else {
 			$renderer->setTemplateName("module_install.html");

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 01:05:51 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 01:05:51 +0900
Subject: [xoops-cvslog 2188] CVS update:
	xoops2jp/html/modules/stdCache/language/japanese
Message-ID: <20060203160551.14A812AC058@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/japanese/help.html
diff -u xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.2 xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.3
--- xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.2	Thu Feb  2 23:13:38 2006
+++ xoops2jp/html/modules/stdCache/language/japanese/help.html	Sat Feb  4 01:05:50 2006
@@ -1,30 +1,32 @@
-<h3>スタンダードキャッシュモジュール</h3>
 <h4>概要</h4>
 <ul>
-<li>このモジュールは、あなたのサイトに標準的なキャッシュ機能を提供します</li>
-<li>強力すぎるキャッシュ機能は、キャッシュファイル数の増大や、隠匿されるべき（管理者用の）情報のキャッシュを招いて問題を起こす可能性があります</li>
-<li>このモジュールは、会員グループのみに所属するユーザーとゲストユーザーに対して個別にキャッシュ機能を働かせます。この２パターンのユーザーは一般的なXOOPSサイトでもっとも割合の多いビジターであり、おおむね高い効果が得られるでしょう。</li>
-<li>その他のグループのユーザーに対してはキャッシュ機能を働かせません</li>
-<li>このキャッシュモジュールは、あなたのサイトがグループを独自に作成して、細かくユーザーを分類していない場合に有効です</li>
+  <li>このモジュールは、あなたのサイトにキャッシュ機能を提供します。キャッシュ機能を有効に使うと、アクセス数の多いサイトでサーバーへの負荷を軽減する事が出来ます。</li>
+  <li>しかし、キャッシュ機能を多用すると、キャッシュファイル数の増大や、隠匿されるべき(管理者用の)情報がキャッシュされて一般ユーザーに公開されてしまう等の問題を起こす可能性があります。</li>
+  <li>このモジュールは、「登録ユーザー」グループのみに所属するユーザーとゲストユーザーに対して個別にキャッシュ機能を働かせます。一般的なサイトでは、この２種類のユーザーグループでアクセスしてくる人が殆どなので、おおむね高い効果が得られるでしょう。
+  </li>
+  <li>その他のグループのユーザーに対してはキャッシュ機能を働かせません。</li>
+  <li>このキャッシュモジュールは、あなたがサイトでグループを独自に作成して、細かくユーザーを分類している場合には効果を発揮できないことがあります。</li>
 </ul>
 
 <h4>キャッシュクリアブロックについて</h4>
 <ul>
-<li>このブロックは、アクセスを受けるとすべてのキャッシュをクリアします</li>
-<li>ゲストから閲覧できるようにブロックを設定し、ブロックキャッシュを１日程度に設定して下さい。１日に１度、全キャッシュをクリアするようになります</li>
-<li>XOOPS Cubeのモジュールキャッシュ機能は、URL単位で機能するため、余計なキャッシュファイルが作成される可能性があります。しかし、これは定期的にキャッシュファイルを全クリアすればほとんど問題になりません。</li>
+  <li>このブロックは、アクセスを受けるとすべてのキャッシュをクリアします</li>
+  <li>ゲストから閲覧できるようにブロックを設定し、ブロックキャッシュを１日程度に設定して下さい。１日に１度、全キャッシュがクリアされるようになります。</li>
+  <li>XOOPS
+  Cubeのモジュールキャッシュ機能は、URL単位で機能するため、余計なキャッシュファイルが作成される可能性があります。しかし、これはキャッシュクリアブロック等を活用して定期的にキャッシュファイルを全クリアすればほとんど問題になりません。
+  </li>
 </ul>
 
 <h4>設定方法</h4>
 <p>設定ファイルの[Cube]ブロック下に以下の２行を記述して下さい</p>
 <ul>
-<li>CacheSystem.path=/modules/stdCache/kernel</li>
-<li>CacheSystem.class=StdRenderCache</li>
+  <li>CacheSystem.path=/modules/stdCache/kernel</li>
+  <li>CacheSystem.class=StdRenderCache</li>
 </ul>
 
 <h4>チューンナップについて</h4>
 <ul>
-<li>このモジュールはチューンナップ項目を持ちません</li>
-<li>より強力なキャッシュやきめ細かいキャッシュが必要な場合は、他のキャッシュモジュールを探してみましょう</li>
-<li>あなたのサイトに適切なキャッシュモジュールをセッティングして、より軽いサイトを目指してみましょう</li>
+  <li>このモジュールはチューンナップ項目を持ちません</li>
+  <li>より強力なキャッシュやきめ細かいキャッシュが必要な場合は、他のキャッシュモジュールを探してみましょう</li>
+  <li>あなたのサイトに適切なキャッシュモジュールをセッティングして、より軽いサイトを目指してみましょう</li>
 </ul>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:06:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:06:16 +0900
Subject: [xoops-cvslog 2189] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060203160616.DDD5D2AC049@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php:1.1.2.1
--- /dev/null	Sat Feb  4 01:06:16 2006
+++ xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php	Sat Feb  4 01:06:16 2006
@@ -0,0 +1,40 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class Legacy_InstallWizardForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.base.InstallWizardForm.TOKEN." . $this->get('dirname');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname');
+		$this->mFormProperties['agree'] =& new XCube_BoolProperty('agree');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['agree'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['agree']->setDependsByArray(array('min'));
+		$this->mFieldProperties['agree']->addMessage('min', _AD_BASE_ERROR_PLEASE_AGREE);
+		$this->mFieldProperties['agree']->addVar('min', '1');
+	}
+
+	function load(&$obj)
+	{
+		$this->set('dirname', $obj->get('dirname'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('dirname', $this->get('dirname'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 01:06:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:06:50 +0900
Subject: [xoops-cvslog 2190] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203160650.4130B2AC049@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.1
--- /dev/null	Sat Feb  4 01:06:50 2006
+++ xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php	Sat Feb  4 01:06:50 2006
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @version $Id: InstallWizardAction.class.php,v 1.1.2.1 2006/02/03 16:06:50 minahito Exp $
+ */
+
+require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH."/admin/class/ModuleInstaller.class.php";
+require_once XOOPS_BASE_PATH."/admin/forms/InstallWizardForm.class.php";
+
+/**
+ * Install module
+ */
+class Legacy_InstallWizardAction extends Legacy_AbstractModuleInstallAction
+{
+	var $mLicence;
+	var $mLicenceText;
+
+	function &_getInstaller($dirname)
+	{
+		$installer =& new Legacy_ModuleInstaller($dirname);
+		return $installer;
+	}
+	
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_InstallWizardForm();
+		$this->mActionForm->prepare();
+	}
+
+	function _loadAgreement()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$this->mLicence = $this->mModuleObject->modinfo['installer']['licence']['title'];
+
+		$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
+		$language = $root->mController->getConfig('language');
+
+		$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;
+			if (!file_exists($path)) {
+				return;
+			}
+		}
+
+		$this->mLicenceText = file_get_contents($path);
+	}
+	
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_install_success.html");
+		$renderer->setAttribute('log', $this->mLog->mMessages);
+	}
+
+	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
+
+		if (isset($this->mModuleObject->modinfo['installer'])) {
+			$renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
+			$renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
+			$renderer->setTemplateName("install_wizard.html");
+		}
+		else {
+			$controller->executeForward("index.php?action=ModuleInstall&dirname=" . $this->mModuleObject->get('dirname'));
+		}
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("install_wizard_licence.html");
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
+		$renderer->setAttribute('licence', $this->mLicence);
+		$renderer->setAttribute('licenceText', $this->mLicenceText);
+	}
+}
+
+?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 01:08:42 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 01:08:42 +0900
Subject: [xoops-cvslog 2191] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060203160842.B2E272AC058@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/help.html
diff -u xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.4 xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.5
--- xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.4	Thu Feb  2 23:13:38 2006
+++ xoops2jp/html/modules/pm/language/japanese/help.html	Sat Feb  4 01:08:42 2006
@@ -1,22 +1,21 @@
-<h3>プライベートメッセージモジュール</h3>
 <h4>概要</h4>
 <ul>
-<li>XOOPS Cube 2.1 にプライベートメッセージ機能を付加します</li>
-<li>プライベートメッセージに関する仮想サービスを提供します</li>
-<li>ルートディレクトリ pmlite.php が発行するイベントにコールバックを登録し、従前動作と同じ動きを実現します</li>
-<li>XOOPS 2.0.x シリーズと同様のプルダウン指定のほか、テキスト入力による宛先の指定をサポートしています</li>
+  <li>XOOPS Cube 2.1 にプライベートメッセージ機能を付加します</li>
+  <li>プライベートメッセージに関する仮想サービスを提供します</li>
+  <li>ルートディレクトリ pmlite.php が発行するイベントにコールバックを登録し、XOOPS 2.0.x シリーズの動作と同じ動きを実現します。</li>
+  <li>あて先の指定には、XOOPS 2.0.x シリーズと同様のプルダウン指定のほか、テキスト入力による宛先の指定をサポートしています。</li>
 </ul>
 
 <h4>一般設定について</h4>
 <ul>
-<li>プライベートメッセージでは基本的に宛先をプルダウンメニューから選びます。ただしこの方法ではユーザーの多いサイトでは選びにくいなどの問題があります。</li>
-<li>一般設定を変更することで、宛先の入力方法をテキストフィールドに変更することができます。この場合、宛先はユーザーアカウントを入力することで指定します。</li>
+  <li>プライベートメッセージではデフォルトでは宛先をプルダウンメニューから選びます。ただしこの方法ではユーザーの多いサイトでは選びにくいなどの問題があります。</li>
+  <li>一般設定を変更することで、宛先の指定をテキストフィールドへの入力に変更することができます。この場合、宛先はユーザーアカウントを入力することで指定します。</li>
 </ul>
 
 <h4>TODO</h4>
 <ul>
-<li>現在、コア機能への組み込みはハードコードされていますが修正される予定です。</li>
-<li>送信箱機能</li>
-<li>受信拒否機能</li>
-<li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
+  <li>現在、コア機能への組み込みはハードコードされていますが修正される予定です。</li>
+  <li>送信箱機能</li>
+  <li>受信拒否機能</li>
+  <li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
 </ul>

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 01:15:08 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 01:15:08 +0900
Subject: [xoops-cvslog 2192] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060203161508.88DEE2AC049@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/japanese/help.html
diff -u xoops2jp/html/modules/legacyRender/language/japanese/help.html:1.1.2.3 xoops2jp/html/modules/legacyRender/language/japanese/help.html:1.1.2.4
--- xoops2jp/html/modules/legacyRender/language/japanese/help.html:1.1.2.3	Sun Jan 29 16:42:09 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/help.html	Sat Feb  4 01:15:08 2006
@@ -1,50 +1,50 @@
-<h4>まずはじめに</h4>
+<h4>はじめに</h4>
 <ul>
-	<li>このレンダリングエンジン(レンダラー)は、XOOPS 2.0.x/XOOPS JP 2.0.x用のテーマを使用する際に利用します。</li>
-	<li>オーバーライド(上書き)、およびフォールバックメカニズム(上手く動かなくなったときの復旧機能)を持ちません。 </li>
-	<li>レンダリングとキャッシュマネジメントにSmartyを使用します。速度は中速度です。 </li>
-	<li>詳しい公称スペックはpackage.ini.phpをご覧下さい。 </li>
+  <li>このレンダリングエンジン(レンダラー)は、XOOPS 2.0.x/XOOPS JP 2.0.x用のテーマを使用する際に利用します。</li>
+  <li>オーバーライド(上書き)、およびフォールバックメカニズム(上手く動かなくなったときの復旧機能)を持ちません。</li>
+  <li>レンダリングとキャッシュマネジメントにSmartyを使用します。速度は中速度です。</li>
+  <li>詳しい公称スペックはpackage.ini.phpをご覧下さい。</li>
 </ul>
 
 <h4>追加テーマの入手</h4>
 <ul>
-	<li>テーマ開発者のインターネットサイトなどで、追加テーマを入手できます。</li>
-	<li>配布されているテーマはたいてい圧縮されています。解凍ソフトで展開してから、使用中のXOOPS Cubeの決められた位置へアップロードします。</li>
+  <li>テーマ開発者のインターネットサイトなどで、追加テーマを入手できます。</li>
+  <li>配布されているテーマはたいてい圧縮されています。解凍ソフトで展開してから、使用中のXOOPS Cubeの決められた位置へアップロードします。</li>
 </ul>
 
 <h4>テーマのアップロード</h4>
 <ul>
-	<li>展開したテーマのディレクトリをXOOPS Cubeのルートディレクトリ下にあるthemesディレクトリへアップロードして下さい。</li>
-	<li>ディレクトリが二重にならないように、たとえばdefaultテーマであればdefaultディレクトリのすぐ下にtheme.htmlかmanifesto.ini.phpがある状態でアップロードします。</li>
-	<li>このレンダーシステムが対応していないテーマは一覧に表示しません。ご注意下さい。</li>
+  <li>展開したテーマのディレクトリをXOOPS Cubeのルートディレクトリ下にあるthemesディレクトリへアップロードして下さい。</li>
+  <li>ディレクトリが二重にならないように、たとえばdefaultテーマであればdefaultディレクトリのすぐ下にtheme.htmlかpackage.ini.phpがある状態でアップロードします。</li>
+  <li>このレンダーシステムが対応していないテーマは一覧に表示しません。ご注意下さい。</li>
 </ul>
 
 <h4>テーマの選択</h4>
 <ul>
-	<li>テーマの管理より、使用したいテーマの「テーマ選択」ボタンをクリックしてください。</li>
-	<li>テーマ管理のチェックボックスにチェックを入れたテーマは、テーマ選択ブロックにリストアップされ、ユーザーが任意のテーマを選択できるようになります。</li>
+  <li>テーマの管理より、使用したいテーマの「テーマ選択」ボタンをクリックしてください。</li>
+  <li>テーマ管理のチェックボックスにチェックを入れたテーマは、テーマ選択ブロックにリストアップされ、ユーザーが任意のテーマを選択できるようになります。</li>
 </ul>
 
 <h4>テーマのアンインストール</h4>
 <ul>
-	<li>このレンダーシステムは、データベースを使用せずにテーマを管理しています。</li>
-	<li>XOOPS Cubeのテーマディレクトリより、アンインストールしたいテーマをディレクトリごと削除して下さい。</li>
+  <li>このレンダーシステムは、データベースを使用せずにテーマを管理しています。</li>
+  <li>XOOPS Cubeのテーマディレクトリより、アンインストールしたいテーマをディレクトリごと削除して下さい。</li>
 </ul>
 
 <h4>テンプレート管理</h4>
 <ul>
-	<li>テンプレートセット一覧が表示されます。</li>
-	<li>テンプレート編集の際には「複製」ボタンを押して新しいテンプレートセットを作成して下さい。複製したテンプレートは「TPLFILE管理」から編集できます。テンプレートセットの一覧から利用したいテンプレートの「選択」ボタンを押すと、利用するテンプレートを切り替えることが出来ます。</li>
+  <li>テンプレートセット一覧が表示されます。</li>
+  <li>テンプレート編集の際には「複製」ボタンを押して新しいテンプレートセットを作成して下さい。複製したテンプレートは「TPLFILE管理」から編集できます。テンプレートセットの一覧から利用したいテンプレートの「選択」ボタンを押すと、利用するテンプレートを切り替えることが出来ます。</li>
 </ul>
 
 <h4>テンプレートファイル管理</h4>
 <ul>
-	<li>テンプレートファイル一覧が表示され、右側のアイコンボタンを押すことで該当のファイルを編集出来ます。</li>
+  <li>テンプレートファイル一覧が表示され、右側のアイコンボタンを押すことで該当のファイルを編集出来ます。</li>
 </ul>
 
 <h4>TODO</h4>
 <ul>
-	<li>「テーマ選択」に対応しなくてはいけない。</li>
-	<li>「テーマ選択ブロック」およびその動作を保証するアクションフィルタを移行しなくてはいけない。</li>
-	<li>デザイナーのライセンス提示、README表記に対応させなくてはいけない。</li>
-</ul>
\ No newline at end of file
+  <li>「テーマ選択」に対応しなくてはいけない。</li>
+  <li>「テーマ選択ブロック」およびその動作を保証するアクションフィルタを移行しなくてはいけない。</li>
+  <li>デザイナーのライセンス提示、README表記に対応させなくてはいけない。</li>
+</ul>

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 01:24:33 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 01:24:33 +0900
Subject: [xoops-cvslog 2193] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060203162433.59D732AC02E@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.2 xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.3
--- xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.2	Thu Feb  2 23:13:38 2006
+++ xoops2jp/html/modules/base/language/japanese/help.html	Sat Feb  4 01:24:33 2006
@@ -1,22 +1,37 @@
-<h3>互換モジュール</h3>
 <h4>概要</h4>
 <ul>
-<li>XOOPS Cube の各クラスを実装して、XOOPS 2.0.x と互換性のある動作を提供することを目指します。</li>
-<li>管理機能を提供します。</li>
-<li>管理機能に対して管理用のテーマエンジン（レンダーシステム）を提供します。</li>
-<li>未完成のため、systemモジュールを併用してください。</li>
+  <li>このモジュールは、XOOPS 2.0.x/2.0.xJP用のモジュールをXOOPS Cube2.1で利用する際に使用します。</li>
+  <li>このモジュールをインストールすると、XOOPS CubeにXOOPSモジュールを動かすための各クラスを実装して、XOOPS 2.0.xと互換性のある動作を提供します。</li>
+  <li>また、XOOPS 2.0.x互換モジュールの管理機能を提供します。</li>
+  <li>管理者メニューに対して管理用のテーマエンジンを提供します。</li>
+  <li>未完成のため、systemモジュールを併用してご利用ください。</li>
+</ul>
+
+<h4>コマンド検索(アクションサーチ)</h4>
+<ul>
+  <li>入力されたキーワードに関する情報を、管理メニューやヘルプから検索します。</li>
+  <li>XOOPS Cubeの使い方に迷ったときには、先ずこちらを検索してみてください。</li>
+</ul>
+
+モジュールの管理／インストール
+<ul>
+  <li>インストールされているモジュールの一覧が表示されます。</li>
+  <li>モジュールをインストールする際は、「モジュールのインストール」よりインストールするモジュールを選んでインストールして下さい。</li>
+  <li>モジュール一覧の「操作」から、「インフォメーション(！)」ボタンを押すと、モジュールの詳細情報を確認できます。</li>
+  <li>一覧画面でモジュールの「名前」を変更すると、メインメニューなどサイト内で表示されるモジュールの名称を変更できます。表示順の数字を変更すると、メインメニューでの表示順を変更できます。数字を「0」にすると、メインメニューでは表示されません。これらは、XOOPS
+  2.0.xのモジュール管理と同様の動作です。</li>
 </ul>
 
 <h4>XOOPS 2.0.x 操作移行リスト</h4>
 <ul>
-<li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
+  <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
 </ul>
 
 <h4>TODO</h4>
 <ul>
-<li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
-<li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
-<li>イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。</li>
-<li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
-<li>miscが一部の機能を実装していない</li>
+  <li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
+  <li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
+  <li>イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。</li>
+  <li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
+  <li>miscが一部の機能を実装していない</li>
 </ul>

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 01:36:07 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 01:36:07 +0900
Subject: [xoops-cvslog 2194] CVS update:
	xoops2jp/html/modules/stdCache/language/english
Message-ID: <20060203163607.9A54A2AC086@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.1 xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.2
--- xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.1	Sun Jan 29 19:25:06 2006
+++ xoops2jp/html/modules/stdCache/language/english/help.html	Sat Feb  4 01:36:07 2006
@@ -1,27 +1,21 @@
-<h3>Standard cache module</h3>
 <h4>Outline</h4>
 <ul>
-<li>This module offers the cash function to your site. It may reduce sever load especially when your site has many access. </li>
-<li>However, there is a possibility of causing problems such as the cash expose some improper contents (like a link to admin section) open to the public.</li>
-<li>This module makes the cash function to two types of user groups, guest user and normal registered user. We expect high effectiveness of the cash function in general site, most of the sites has two types of user, guest user and normal registered user.</li>
-<li>The cash function does not work for special types of user group other than normal registered user and guest user.</li>
+  <li>This module offers the cash function to your site. It may reduce sever load especially when your site has many access.</li>
+  <li>However, there is a possibility of causing problems such as the cash expose some improper contents (like a link to admin section) open to the public.</li>
+  <li>This module makes the cash function to two types of user groups, guest user and normal registered user. We expect high effectiveness of the cash function in general site, most of the sites has two types of user, guest user and normal registered user.</li>
+  <li>The cash function does not work for special types of user group other than normal registered user and guest user.</li>
 </ul>
-
 <h4>Cash Clear Block</h4>
 <ul>
-<li>This block clears all cash when the block get receive access.</li>
-<li>Please set the block is accessible from the guest, and set clearance interval for one day in block preference. Then, the module clear cash once in a day.</li>
-<li>The module may create large amount of cash files. But it is hardly becomes a problem if you use cash clear block properly.</li>
+  <li>This block clears all cash when the block get receive access.</li>
+  <li>Please set the block is accessible from the guest, and set clearance interval for one day in block preference. Then, the module clear cash once in a day.</li>
+  <li>The module may create large amount of cash files. But it is hardly becomes a problem if you use cash clear block properly..</li>
 </ul>
 
-<h4>設定方法</h4>
-<p>Please add the following two lines under the [Cube] block of the configuration file.</p>
+<h4>How to set up</h4>
 <ul>
-<li>CacheSystem.path=/modules/stdCache/kernel </li>
-<li>CacheSystem.class=StdRenderCache</li>
+  <li>Please add the following two lines under the [Cube] block of the configuration file.</li>
+  <li>CacheSystem.path=/modules/stdCache/kernel</li>
+  <li>CacheSystem.class=StdRenderCache</li>
 </ul>
 
-<h4>Tune up</h4>
-<ul>
-<li>no translated...</li>
-</ul>

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 01:36:07 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 01:36:07 +0900
Subject: [xoops-cvslog 2195] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060203163607.BF19F2AC08A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/help.html
diff -u /dev/null xoops2jp/html/modules/user/language/english/help.html:1.1.2.1
--- /dev/null	Sat Feb  4 01:36:07 2006
+++ xoops2jp/html/modules/user/language/english/help.html	Sat Feb  4 01:36:07 2006
@@ -0,0 +1,45 @@
+<h4>Outline</h4>
+<ul>
+  <li>User module has general function of user and group management. It provides functions of 'Edit Users' and 'Groups' in XOOPS 2.0. System Configuration. By using the User Module, you can edit user accounts, change group permission, modify user rank, allow or disallow new user registration, send email messages to users and so on.</li>
+</ul>
+
+<h4>User Administration(Edit User)</h4>
+<ul>
+  <li>Administrators can add new user and edit registered user information.</li>
+  <li>To add new user to your site, please go to 'Add User'.</li>
+  <li>To modify registered user information, click a command button (pencil icon) at the right of the listed user.</li>
+  <li>To delete a user form your site, click a delete button (X marked icon) at the right of the listed user.</li>
+</ul>
+
+<h4>User Ranks</h4>
+<ul>
+  <li>Administrators can edit User Rank settings. User Rank is displayed on posts in forums and user profiles.</li>
+  <li>To modify a registered user rank setting, click a command button (pencil icon) at the right of the listed rank.</li>
+  <li>To delete a registered user rank setting, click delete button (X marked icon) at the right of the listed rank.</li>
+</ul>
+
+<h4>Edit Groups</h4>
+<ul>
+  <li>Administrators can edit group settings including permission to access blocks, modules and administration functions to each group.</li>
+  <li>To add new group to your site, please go to 'Add Group' at upper right of the page.</li>
+  <li>If you add new group to your site, name of the new group would be listed. After adding a new group, you need to modify the group settings.</li>
+  <li>To modify a registered user rank setting, click a command button (pencil icon) at the right of the listed groups.</li>
+  <li>To add a new user to the group, click a command button (add member) at the right of the listed groups.</li>
+  <li>To delete users from group, select a user from group members list, then click delete button.</li>
+</ul>
+
+<h5>(Tips)</h5>
+<ul>
+  <li>Each user may belong to multiple groups. For easy maintenance, we suggest to set up a general (standard) group, then add special groups which has minimum privileges as needed.</li>
+  <li>You can check the settings of each group by clicking command button (property) at the right of the listed groups. To check group settings, we recommend to check the property, to add test user ID for each group, then login with the test ID and see how your site looks in each group.</li>
+</ul>
+
+<h4>Mail Users</h4>
+<ul>
+  <li>Administrators can send mass email or newsletter to registered users. You may narrow down recipient of emails by registered date, last login date and so on. It may be useful to send welcome messages to new users, to send email notification to persons who has not accessed to your website for a certain period.</li>
+</ul>
+
+<h4>Preferences</h4>
+<ul>
+  <li>Administrators may modify settings of accepting or rejecting new user registration, how to activate new user registration, minimum and maximum length of username/password, registration disclaimer at registration page and so on.</li>
+</ul>

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 01:36:07 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 01:36:07 +0900
Subject: [xoops-cvslog 2196] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060203163607.ED38A2AC086@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/help.html
diff -u xoops2jp/html/modules/pm/language/english/help.html:1.1.2.2 xoops2jp/html/modules/pm/language/english/help.html:1.1.2.3
--- xoops2jp/html/modules/pm/language/english/help.html:1.1.2.2	Thu Feb  2 23:13:38 2006
+++ xoops2jp/html/modules/pm/language/english/help.html	Sat Feb  4 01:36:07 2006
@@ -1,22 +1,19 @@
-<h3>Private message module</h3>
 <h4>Outline</h4>
 <ul>
-<li>This module provides functions of Private Massages to XOOPS Cube 2.1.</li>
-<li>Also, virtual service concerning a private message is provided for interchangeability.</li>
-<li>It register callback in the event that root directory pmlite.php issues, it enable interchangeability with XOOPS 2.0.x series.</li>
-<li>Users can use text input box or pull-down to select recipient of the massages.</li>
+  <li>This module provides functions of Private Massages to XOOPS Cube 2.1.</li>
+  <li>Also, virtual service concerning a private message is provided for interchangeability.</li>
+  <li>It register callback in the event that root directory pmlite.php issues, it enable interchangeability with XOOPS 2.0.x series.</li>
+  <li>Users can use text input box or pull-down to select recipient of the massages.</li>
 </ul>
 
 <h4>Preferences</h4>
 <ul>
-<li>Users chose recipient of massages by pull-down menu in default. However, it may be difficult when the site has many registered users.</li>
-<li>If administrator change the setting at preference, users can assign recipient of the massage by typing.</li>
+  <li>Users chose recipient of massages by pull-down menu in default. However, it may be difficult when the site has many registered users. If administrator change the setting at preference, users can assign recipient of the massage by typing.</li>
 </ul>
 
 <h4>TODO</h4>
 <ul>
-<li>To integrate core-function, some codes are hard-corded but it will be revised.</li>
-<li>Sent Box</li>
-<li>Reject Messages function</li>
-<li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
+  <li>To integrate core-function, some codes are hard-corded but it will be revised.</li>
+  <li>Sent Box</li>
+  <li>Reject Messages function</li>
 </ul>

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 01:36:07 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 01:36:07 +0900
Subject: [xoops-cvslog 2197] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060203163607.3CFEC2AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/english/help.html
diff -u xoops2jp/html/modules/legacyRender/language/english/help.html:1.1.2.2 xoops2jp/html/modules/legacyRender/language/english/help.html:1.1.2.3
--- xoops2jp/html/modules/legacyRender/language/english/help.html:1.1.2.2	Sun Jan 29 16:41:57 2006
+++ xoops2jp/html/modules/legacyRender/language/english/help.html	Sat Feb  4 01:36:07 2006
@@ -1,47 +1,46 @@
 <h4>Outline</h4>
 <ul>
-	<li>This rendering engine (renderer) is for themes of XOOPS 2.0.x/XOOPS JP 2.0.x.</li>
-	<li>It has neither override nor the fall backing mechanism. Smarty is used for rendering and the cash management. The renderer is medium speed. Please see package.ini.php for specs and details.</li>
+  <li>This rendering engine (renderer) is for themes of XOOPS 2.0.x/XOOPS JP 2.0.x.</li>
+  <li>It has neither override nor the fall backing mechanism. Smarty is used for rendering and the cash management. The renderer is medium speed. Please see package.ini.php for specs and details.</li>
 </ul>
 
 <h4>Additional theme</h4>
 <ul>
-	<li>An additional theme can be obtained on theme developer's website etc.</li>
-	<li>The distributed theme is mostly compressed. To use the theme, please upload it to /themes directory after decompression of files.</li>
+  <li>An additional theme can be obtained on theme developer's website etc.</li>
+  <li>The distributed theme is mostly compressed. To use the theme, please upload it to /themes directory after decompression of files.</li>
 </ul>
 
 <h4>Uploading of theme</h4>
 <ul>
-	<li>Please upload the folder of the decompressed theme to the themes directory under the root directory of XOOPS Cube.</li>
-	<li>The folder should include theme.html or package.ini.php.</li>
+  <li>Please upload the folder of the decompressed theme to the themes directory under the root directory of XOOPS Cube. The folder should include theme.html or package.ini.php.</li>
 </ul>
 
 <h4>Selection of theme</h4>
 <ul>
-	<li>Please click "Theme selection" button of the theme that wants to be used in the theme management.</li>
-	<li>As for the theme that puts the check in the check box of the theme management, it is listed in the theme selection block, and the user comes to be able to select an arbitrary theme.</li>
+  <li>Please click "Theme selection" button of the theme that wants to be used in the theme management.</li>
+  <li>As for the theme that puts the check in the check box of the theme management, it is listed in the theme selection block, and the user comes to be able to select an arbitrary theme.</li>
 </ul>
 
 <h4>Uninstallation of theme</h4>
 <ul>
-	<li>This render system manages the theme without using the database. Please delete the theme of each directory that wants to be uninstalled from the ‘themes’ directory of XOOPS Cube.</li>
+  <li>This render system manages the theme without using the database. Please delete the theme of each directory that wants to be uninstalled from the ?themes? directory of XOOPS Cube.</li>
 </ul>
 
 
 <h4>Template management</h4>
 <ul>
-	<li>The list of template set is displayed in template management.</li>
-	<li>When you need to edit the template, please make a new template set pushing "Reproduction" button. The reproduced template can be edited from "TPLFILE management". The administrators can change the template used by pushing "Selection" button of the template from the list of the template set.</li>
+  <li>The list of template set is displayed in template management.</li>
+  <li>When you need to edit the template, please make a new template set pushing "Reproduction" button. The reproduced template can be edited from "TPLFILE management". The administrators can change the template used by pushing "Selection" button of the template from the list of the template set.</li>
 </ul>
 
-<h4>Template file management</h4>
+<h4>TPLFILE management</h4>
 <ul>
-	<li>The list of template file is displayed, and the file can be edited by pushing a right icon button.</li>
+  <li>The list of template file is displayed, and the file can be edited by pushing a right icon button.</li>
 </ul>
 
 <h4>TODO</h4>
 <ul>
-	<li>Corresponds to "Theme selection". </li>
-	<li>The action filter that guarantees "Theme selection block" and the operation is shifted. </li>
-	<li>Correspond to the designer's license presentation and README mark.</li>
+  <li>Corresponds to "Theme selection".</li>
+  <li>The action filter that guarantees "Theme selection block" and the operation is shifted.</li>
+  <li>Correspond to the designer's license presentation and README mark.</li>
 </ul>

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 01:36:07 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 01:36:07 +0900
Subject: [xoops-cvslog 2198] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060203163607.6D1B42AC07C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/help.html
diff -u /dev/null xoops2jp/html/modules/base/language/english/help.html:1.1.2.1
--- /dev/null	Sat Feb  4 01:36:07 2006
+++ xoops2jp/html/modules/base/language/english/help.html	Sat Feb  4 01:36:07 2006
@@ -0,0 +1,35 @@
+<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>Action Search</h4>
+<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>
+</ul>
+
+<h4>Module administration / installation</h4>
+<ul>
+  <li>When you go to this area, you see a list of installed module in your XOOPS Cube.</li>
+  <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>
+<{*
+<h4>Transition manual (from XOOPS 2.0.x)</h4>
+<ul>
+  <li>Please refer <a href="<{'xoops2.html'|helpurl}>">here.</a></li>
+</ul>
+*}>
+
+<h4>TODO (What's coming?)</h4>
+<ul>
+  <li>Name of this module would be changed to 'Legacy module' form 'Base module'.</li>
+  <li>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 minahito ＠ users.sourceforge.jp  Sat Feb  4 01:46:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 01:46:19 +0900
Subject: [xoops-cvslog 2197] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060203164619.37B802AC077@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.2 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.2	Fri Feb  3 15:04:51 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Sat Feb  4 01:46:19 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: HelpAction.class.php,v 1.1.2.2 2006/02/03 06:04:51 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.3 2006/02/03 16:46:19 minahito Exp $
  */
 
 /**
@@ -22,6 +22,8 @@
 		$this->compile_dir = XOOPS_COMPILE_PATH;
 		$this->left_delimiter = "<{";
 		$this->right_delimiter = "}>";
+		
+		$this->force_compile = true;
 
 		$this->register_modifier("helpurl", "Legacy_modifier_helpurl");
 	}

From minahito ＠ users.sourceforge.jp  Sat Feb  4 02:12:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 02:12:55 +0900
Subject: [xoops-cvslog 2198] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060203171255.9450C2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml
diff -u xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.2
--- xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.1	Thu Feb  2 21:04:46 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml	Sat Feb  4 02:12:55 2006
@@ -2,5 +2,7 @@
 <xoopscube-dynaactionform>
 	<form-bean name="ModuleUninstallForm" type="XCube_ActionForm">
 		<form-property name="dirname" type="String" />
+		<form-property name="agree" type="Bool" />
+		<form-property name="force" type="Bool" />
 	</form-bean>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 02:13:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 02:13:12 +0900
Subject: [xoops-cvslog 2199] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060203171312.B32092AC08A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.1	Thu Feb  2 21:04:34 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php	Sat Feb  4 02:13:12 2006
@@ -15,6 +15,8 @@
 		// Set form properties
 		//
 		$this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname');
+		$this->mFormProperties['agree'] =& new XCube_BoolProperty('agree');
+		$this->mFormProperties['force'] =& new XCube_BoolProperty('force');
 	
 		//
 		// Set field properties

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 02:16:36 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 02:16:36 +0900
Subject: [xoops-cvslog 2200] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060203171636.D4B202AC02E@users.sourceforge.jp>

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.8.1
--- xoops2jp/html/install/language/japanese/install.php:1.2	Fri Mar 18 22:00:58 2005
+++ xoops2jp/html/install/language/japanese/install.php	Sat Feb  4 02:16:36 2006
@@ -1,6 +1,6 @@
 <?php
-// $Id: install.php,v 1.2 2005/03/18 13:00:58 onokazu Exp $
-define("_INSTALL_L0","XOOPS 2.0 インストールウィザードへようこそ");
+// $Id: install.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x 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","下記のボタンをクリックするとインストールを開始します。");
 define("_INSTALL_L1","mainfile.phpを開き、31行目に以下のコードがあることを確認してください。");
@@ -13,16 +13,16 @@
 define("_INSTALL_L8","ウィザードが検知した設定：");
 define("_INSTALL_L9","（Windows環境下では設定が正しくても注意のメッセージが表示されることがあります。設定に間違いが無い場合は、下記のボタンをクリックしてインストールを続けてください。）");
 define("_INSTALL_L10","設定が間違いが無ければ、下記のボタンをクリックしてインストールを続けてください。");
-define("_INSTALL_L11","XOOPSのディレクトリへのパス：");
-define("_INSTALL_L12","XOOPSへのURL：");
+define("_INSTALL_L11","XOOPS Cubeのディレクトリへのパス：");
+define("_INSTALL_L12","XOOPS CubeへのURL：");
 define("_INSTALL_L13","上記設定が正しい場合は、インストールを続けてください。<br />間違っている場合は、はじめからやり直してください。<br />または、mainfile.phpを直接編集して、このページを再読み込みしてください。");
 define("_INSTALL_L14","次へ");
 define("_INSTALL_L15","mainfile.phpを開き、必要な設定をすべて記入してください");
 define("_INSTALL_L16","%s はデータベースサーバのホスト名です。");
 define("_INSTALL_L17","%s はデータベースサーバにおけるユーザアカウント名です。");
 define("_INSTALL_L18","%s はデータベースにアクセスするために必要なパスワードです。");
-define("_INSTALL_L19","%s はXOOPSが使用するデータベースの名前です。");
-define("_INSTALL_L20","%s はXOOPSが使用する各データベーステーブルに付加されるprefix（接頭語）です。prefixを付加することで、既存テーブルとのテーブル名称の重複を防ぎます。");
+define("_INSTALL_L19","%s はXOOPS Cubeが使用するデータベースの名前です。");
+define("_INSTALL_L20","%s はXOOPS Cubeが使用する各データベーステーブルに付加されるprefix（接頭語）です。prefixを付加することで、既存テーブルとのテーブル名称の重複を防ぎます。");
 define("_INSTALL_L21","下記のデータベースが見つかりませんでした：");
 define("_INSTALL_L22","このデータベースの作成を試みる場合は、インストールを続けてください。<br />データベース名が間違っている場合は、はじめからやり直してください。<br />設定されたユーザアカウントでは、このデータベースが作成できない場合は、別途作成し、このページを再読み込みしてください。");
 define("_INSTALL_L23","はい");
@@ -43,15 +43,15 @@
 define("_INSTALL_L63","　各テーブル名にこの接頭語を付加し、既存テーブルとの名称の重複を防ぎます。<br />　よく分からない場合はデフォルトのままにしておいてください。");
 define("_INSTALL_L54","データベースへ持続的接続");
 define("_INSTALL_L69","　デフォルトは「いいえ」です。よく分からない場合は「いいえ」を選択してください。");
-define("_INSTALL_L55","XOOPSへのパス");
-define("_INSTALL_L59","　XOOPSが設置されているディレクトリへのフルパスを入力してください。<br />　末尾には「/」を付加しないでください。");
-define("_INSTALL_L56","XOOPSへのURL");
-define("_INSTALL_L58","　XOOPSにアクセスするURLを入力してください。<br />　末尾には「/」を付加しないでください。");
+define("_INSTALL_L55","XOOPS Cubeへのパス");
+define("_INSTALL_L59","　XOOPS Cubeが設置されているディレクトリへのフルパスを入力してください。<br />　末尾には「/」を付加しないでください。");
+define("_INSTALL_L56","XOOPS CubeへのURL");
+define("_INSTALL_L58","　XOOPS CubeにアクセスするURLを入力してください。<br />　末尾には「/」を付加しないでください。");
 
 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","管理者メールアドレス");
@@ -70,7 +70,7 @@
 define("_INSTALL_L44","%sテーブルの作成に失敗しました。"); 
 define("_INSTALL_L45","%sテーブルを作成しました。");
 
-define("_INSTALL_L46","XOOPSのモジュールが正常に動作するには、下記のファイルがサーバにより書き込み可能になっている必要があります。（UNIX/LINUXサーバをご使用の場合、各ファイルのパーミッションを666または777に設定してください。）");
+define("_INSTALL_L46","XOOPS Cubeのモジュールが正常に動作するには、下記のファイルがサーバにより書き込み可能になっている必要があります。（UNIX/LINUXサーバをご使用の場合、各ファイルのパーミッションを666または777に設定してください。）");
 define("_INSTALL_L47","次へ");
 
 define("_INSTALL_L53","設定内容の確認");
@@ -146,17 +146,17 @@
 define("_INSTALL_L138","コメントのアップデート");
 define("_INSTALL_L139","アバターのアップデート");
 define("_INSTALL_L140","顔アイコンのアップデート");
-define("_INSTALL_L141","インストーラは今から、XOOPS2で動くように各モジュールをアップデートします。<br />XOOPS2のパッケージに含まれるすべてのファイルがサーバにアップロードされているか確認してください。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
+define("_INSTALL_L141","インストーラは今から、XOOPS Cubeで動くように各モジュールをアップデートします。<br />XOOPS Cubeのパッケージに含まれるすべてのファイルがサーバにアップロードされているか確認してください。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
 define("_INSTALL_L142","モジュールのアップデート中…");
-define("_INSTALL_L143","The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS2.");  //[MADA]
+define("_INSTALL_L143","The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS Cube.");  //[MADA]
 define("_INSTALL_L144","コンフィギュレーションのアップデート");
 define("_INSTALL_L145","コメント(ID: %s)をデータベースに格納しました。");
 define("_INSTALL_L146","コメント(ID: %s)がデータベースに格納できません。");
 define("_INSTALL_L147","コメントのアップデート中…");
 define("_INSTALL_L148","アップデートが完了しました。");
-define("_INSTALL_L149","インストーラは今から、XOOPS2で使えるようにXOOPS 1.3.xのコメントポストをアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
-define("_INSTALL_L150","インストーラは今から、XOOPS2で使えるように顔アイコンとユーザランキングの画像をアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
-define("_INSTALL_L151","インストーラは今から、XOOPS2で使えるようにユーザアバターの画像をアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
+define("_INSTALL_L149","インストーラは今から、XOOPS Cubeで使えるようにXOOPS 1.3.xのコメントポストをアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
+define("_INSTALL_L150","インストーラは今から、XOOPS Cubeで使えるように顔アイコンとユーザランキングの画像をアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
+define("_INSTALL_L151","インストーラは今から、XOOPS Cubeで使えるようにユーザアバターの画像をアップデートします。<br />これが完了するまでには、しばらく時間が掛かるかもしれません。");
 define("_INSTALL_L155","顔アイコンとユーザランキング画像のアップデート中…");
 define("_INSTALL_L156","ユーザアバター画像のアップデート中…");
 define("_INSTALL_L157","各グループについてデフォルトのグループを選択してください。");
Index: xoops2jp/html/install/language/japanese/welcome.php
diff -u xoops2jp/html/install/language/japanese/welcome.php:1.1 xoops2jp/html/install/language/japanese/welcome.php:1.1.8.1
--- xoops2jp/html/install/language/japanese/welcome.php:1.1	Thu Sep  9 14:15:04 2004
+++ xoops2jp/html/install/language/japanese/welcome.php	Sat Feb  4 02:16:36 2006
@@ -2,12 +2,12 @@
 $content .=
 "<u><b>はじめに</b></u>
 <p>
-<b>XOOPS</b>は、オブジェクト指向ベースで作成された、PHPによるオープンソースのポータルサイト作成ソフトです。
-XOOPSは様々なデータベースサーバで動作します。
+<b>XOOPS Cube</b>は、オブジェクト指向ベースで作成された、PHPによるオープンソースのポータルサイト作成ソフトです。
+XOOPS Cubeは様々なデータベースサーバで動作します。
 規模の大小を問わず、ダイナミックなコミュニティーサイトや、イントラネット用のポータルサイト、企業のポータルサイト、ウェブログ、そういったものの作成に最適です。
 </p>
 <p>
-XOOPSは、<a href='http://www.gnu.org/copyleft/gpl.html' target='_blank'>GNU 一般公衆利用許諾契約書(GPL)</a>（参考：<a href='http://www.opensource.jp/gpl/gpl.ja.html' target='_blank'>日本語訳</a>）というライセンスでリリースされており、自由に使用し、また改変できます。再配布もGPLの条項にしたがっていれば、自由に行うことができます。
+XOOPS Cubeは、<a href='http://www.gnu.org/copyleft/gpl.html' target='_blank'>GNU 一般公衆利用許諾契約書(GPL)</a>（参考：<a href='http://www.opensource.jp/gpl/gpl.ja.html' target='_blank'>日本語訳</a>）というライセンスでリリースされており、自由に使用し、また改変できます。再配布もGPLの条項にしたがっていれば、自由に行うことができます。
 </p>
 <u><b>必要なソフトウエア</b></u>
 <p>
@@ -20,7 +20,7 @@
 <u><b>準備</b></u>
 <ul>
 <li>ウェブサーバ、PHP、データベースサーバを適切にセットアップする。</li>
-<li>XOOPS用にデータベースを１つ準備する。</li>
+<li>XOOPS Cube用にデータベースを１つ準備する。</li>
 <li>上記のデータベースにアクセスできる、データベースサーバのユーザアカウントを準備する。</li>
 <li>uploads/、cache/およびtemplates_c/ディレクトリと、mainfile.phpファイルをPHPから書込み可能にする。</li>
 <li>ブラウザのクッキーとJavaScriptをオンにする。</li>
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.8.1
--- xoops2jp/html/install/language/japanese/finish.php:1.1	Thu Sep  9 14:15:04 2004
+++ xoops2jp/html/install/language/japanese/finish.php	Sat Feb  4 02:16:36 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'>XOOPS Cube.org</a>サイト（英語）か、<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>に訪問ください。
 </p>
 ";
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 02:16:37 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 02:16:37 +0900
Subject: [xoops-cvslog 2201] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060203171637.064412AC08A@users.sourceforge.jp>

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.8.1
--- xoops2jp/html/install/language/english/install.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/language/english/install.php	Sat Feb  4 02:16:36 2006
@@ -1,6 +1,6 @@
 <?php
-// $Id: install.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
-define("_INSTALL_L0","Welcome to the Install Wizard for XOOPS 2.0");
+// $Id: install.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x 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.");
 define("_INSTALL_L1","Open mainfile.php with your text editor and find the following codes on line 31:");
@@ -13,15 +13,15 @@
 define("_INSTALL_L8","We detected: ");
 define("_INSTALL_L9","( On MS platforms, you may receive this error message even when your configuration is correct. If that is the case, please press the button below to continue)");
 define("_INSTALL_L10","Plesae press the button below to continue if this is really ok.");
-define("_INSTALL_L11","The server path to your XOOPS root directory: ");
-define("_INSTALL_L12","URL to your XOOPS root directory: ");
+define("_INSTALL_L11","The server path to your XOOPS Cube root directory: ");
+define("_INSTALL_L12","URL to your XOOPS Cube root directory: ");
 define("_INSTALL_L13","If the above setting is correct, press the button below to continue.");
 define("_INSTALL_L14","Next");
 define("_INSTALL_L15","Please open mainfile.php and enter required DB settings data");
 define("_INSTALL_L16","%s is the hostname of your database server.");
 define("_INSTALL_L17","%s is the username of your database account.");
 define("_INSTALL_L18","%s is the password required to access your database.");
-define("_INSTALL_L19","%s is the name of your database in which XOOPS tables will be created.");
+define("_INSTALL_L19","%s is the name of your database in which XOOPS Cube tables will be created.");
 define("_INSTALL_L20","%s is the prefix for tables that will be made during the installation.");
 define("_INSTALL_L21","The following database was not found on the server:");
 define("_INSTALL_L22","Attempt to create it?");
@@ -43,15 +43,15 @@
 define("_INSTALL_L63","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("_INSTALL_L54","Use persistent connection?");
 define("_INSTALL_L69","Default is 'NO'. Choose 'NO' if you are unsure.");
-define("_INSTALL_L55","XOOPS Physical Path");
-define("_INSTALL_L59","Physical path to your main XOOPS directory WITHOUT trailing slash");
-define("_INSTALL_L56","XOOPS Virtual Path (URL)");
-define("_INSTALL_L58","Virtual path to your main XOOPS directory WITHOUT trailing slash");
+define("_INSTALL_L55","XOOPS Cube Physical Path");
+define("_INSTALL_L59","Physical path to your main XOOPS Cube directory WITHOUT trailing slash");
+define("_INSTALL_L56","XOOPS Cube Virtual Path (URL)");
+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_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'>XOOPS Cube.org</a>");
 define("_INSTALL_L36","Please choose your site admin's name and password.");
 define("_INSTALL_L37","Admin Name");
 define("_INSTALL_L38","Admin Email");
@@ -145,17 +145,17 @@
 define("_INSTALL_L138","update comments");
 define("_INSTALL_L139","update avatars");
 define("_INSTALL_L140","update smilies");
-define("_INSTALL_L141","The installer will now update each module to work with XOOPS2.<br />Make sure that you have uploaded all files in XOOPS2 package to your server.<br />This may take a while to complete.");
+define("_INSTALL_L141","The installer will now update each module to work with XOOPS Cube.<br />Make sure that you have uploaded all files in XOOPS Cube package to your server.<br />This may take a while to complete.");
 define("_INSTALL_L142","Updating modules..");
-define("_INSTALL_L143","The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS2.");
+define("_INSTALL_L143","The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS Cube.");
 define("_INSTALL_L144","update config");
 define("_INSTALL_L145","Comment (ID: %s) inserted to the database.");
 define("_INSTALL_L146","Could not insert comment (ID: %s) to the database.");
 define("_INSTALL_L147","Updating comments..");
 define("_INSTALL_L148","Update complete.");
-define("_INSTALL_L149","The installer will now update comment posts in XOOPS 1.3.x to be used in XOOPS2.<br />This may take a while to complete.");
-define("_INSTALL_L150","The installer will now update the smiley and user rank images to be used with XOOPS2.<br />This may take a while to complete.");
-define("_INSTALL_L151","The installer will now update the user avatar images to be used in XOOPS2.<br />This may take a while to complete.");
+define("_INSTALL_L149","The installer will now update comment posts in XOOPS 1.3.x to be used in XOOPS Cube.<br />This may take a while to complete.");
+define("_INSTALL_L150","The installer will now update the smiley and user rank images to be used with XOOPS Cube.<br />This may take a while to complete.");
+define("_INSTALL_L151","The installer will now update the user avatar images to be used in XOOPS Cube.<br />This may take a while to complete.");
 define("_INSTALL_L155","Updating smiley/rank images..");
 define("_INSTALL_L156","Updating user avatar images..");
 define("_INSTALL_L157","Select the default user group for each group type");
Index: xoops2jp/html/install/language/english/welcome.php
diff -u xoops2jp/html/install/language/english/welcome.php:1.2 xoops2jp/html/install/language/english/welcome.php:1.2.8.1
--- xoops2jp/html/install/language/english/welcome.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/language/english/welcome.php	Sat Feb  4 02:16:36 2006
@@ -1,15 +1,15 @@
 <?php
-// $Id: welcome.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: welcome.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x Exp $
 $content .=
 "<u><b>What is it?</b></u>
 <p>
-<b>XOOPS</b> is a dynamic OO (Object Oriented) based open source portal script written in PHP.
-XOOPS supports a number of databases,
-making XOOPS an ideal tool for developing small to large dynamic community websites,
+<b>XOOPS Cube</b> is a dynamic OO (Object Oriented) based open source portal script written in PHP.
+XOOPS Cube supports a number of databases,
+making XOOPS Cube an ideal tool for developing small to large dynamic community websites,
 intra company portals, corporate portals, weblogs and much more.
 </p>
 <p>
-XOOPS is released under the terms of the <a href='http://www.gnu.org/copyleft/gpl.html' target='_blank'>GNU General Public License (GPL)</a> and is free to use and modify.
+XOOPS Cube is released under the terms of the <a href='http://www.gnu.org/copyleft/gpl.html' target='_blank'>GNU General Public License (GPL)</a> and is free to use and modify.
 It is free to redistribute as long as you abide by the distribution terms of the GPL.
 </p>
 <u><b>Requirements</b></u>
@@ -23,7 +23,7 @@
 <u><b>Before you install</b></u>
 <ul>
 <li>Setup WWW server, PHP and database server properly.</li>
-<li>Prepare a database for your XOOPS site.</li>
+<li>Prepare a database for your XOOPS Cube site.</li>
 <li>Prepare user account and grant the user the access to the database.</li>
 <li>Make the directories of uploads/, cache/ and templates_c/ and the files of mainfile.php writabale.</li>
 <li>Turn cookie and JavaScript of your browser on.</li>
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.8.1
--- xoops2jp/html/install/language/english/finish.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/language/english/finish.php	Sat Feb  4 02:16:36 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.8.1 2006/02/03 17:16:36 tom_g3x 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'>XOOPS Cube.org</a></p>
 ";
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 02:23:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 02:23:36 +0900
Subject: [xoops-cvslog 2202] CVS update:
	xoops2jp/html/modules/system/admin/preferences
Message-ID: <20060203172336.CDBDF2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/preferences/main.php
diff -u xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.2 xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.3
--- xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.2	Thu Oct 27 19:57:42 2005
+++ xoops2jp/html/modules/system/admin/preferences/main.php	Sat Feb  4 02:23:36 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.2.8.2 2005/10/27 10:57:42 minahito Exp $
+// $Id: main.php,v 1.2.8.3 2006/02/03 17:23:36 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -81,6 +81,11 @@
                 $myts =& MyTextSanitizer::getInstance();
                 if ($config[$i]->getVar('conf_valuetype') == 'array') {
                     // this is exceptional.. only when value type is arrayneed a smarter way for this
+                    
+					//
+					// TODO We should gurard warning in the following line
+					// "implode(): Bad arguments. in file"
+					//
                     $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
                 } else {
                     $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 02:39:42 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 02:39:42 +0900
Subject: [xoops-cvslog 2203] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060203173942.E0EF72AC08F@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/finish.php
diff -u xoops2jp/html/install/language/japanese/finish.php:1.1.8.1 xoops2jp/html/install/language/japanese/finish.php:1.1.8.2
--- xoops2jp/html/install/language/japanese/finish.php:1.1.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/japanese/finish.php	Sat Feb  4 02:39:42 2006
@@ -5,7 +5,7 @@
 <u><b>XOOPSの使い方について</b></u>
 <p>[未記述]</p>
 <u><b>サポート</b></u>
-<p><a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a>サイト（英語）か、<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>に訪問ください。
+<p><a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a>サイト（英語）か、<a href='http://xoopscube.jp/' target='_blank'>XOOPS Cube日本語公式サイト</a>に訪問ください。
 </p>
 ";
 ?>
\ No newline at end of file

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 02:58:57 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 02:58:57 +0900
Subject: [xoops-cvslog 2204] CVS update: xoops2jp/html/install
Message-ID: <20060203175857.E0BB82AC091@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.3 xoops2jp/html/install/makedata.php:1.2.8.4
--- xoops2jp/html/install/makedata.php:1.2.8.3	Tue Jan 31 19:05:57 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 02:58:57 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.3 2006/01/31 10:05:57 minahito Exp $
+// $Id: makedata.php,v 1.2.8.4 2006/02/03 17:58:57 ryuji_amano Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,13 +99,13 @@
     $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', '0', '_MD_AM_SERVERTZDSC', 'timezone', 'float', 8)");
     $dbm->insert('config', " VALUES (6, 0, 1, 'default_TZ', '_MD_AM_DEFAULTTZ', '0', '_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 (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', 'cube_default', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)");
     $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes(_INSTALL_ANON)."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)");
     $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '0', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)");
     $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', 'xoops_user', '_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', '1', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)");
-    $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '0', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)");
+    $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', '127.0.0.1', '_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)");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:07:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:07:20 +0900
Subject: [xoops-cvslog 2205] CVS update: xoops2jp/html/modules/pm
Message-ID: <20060203180720.20CAF2AC07C@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.11 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.12
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.11	Mon Jan  2 10:11:59 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Sat Feb  4 03:07:19 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.11 2006/01/02 01:11:59 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.12 2006/02/03 18:07:19 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -42,9 +42,9 @@
 
 // Installer
 $modversion['installer']['image'] = "images/pm_splash.gif";
-$modversion['installer']['description'][] = "プライベートメッセージ機能を担当します。";
-$modversion['installer']['description'][] = "XOOPS 2.0.x 相当のプライベートメッセージ機能を提供します。";
-$modversion['installer']['description'][] = "プライベートメッセージサービスを実装しています。他モジュールより仮想サービスを通じて最低限のＰＭ操作が可能となります。";
+$modversion['installer']['description'][] = _MI_PM_DESC_INSTALLER_1;
+$modversion['installer']['description'][] = _MI_PM_DESC_INSTALLER_2;
+$modversion['installer']['description'][] = _MI_PM_DESC_INSTALLER_3;
 $modversion['installer']['licence']['title'] = _MI_PM_LANG_GPL;
 $modversion['installer']['licence']['file'] = "licence.txt";
 

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:07:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:07:33 +0900
Subject: [xoops-cvslog 2206] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060203180733.706AD2AC07C@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.3 xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.4
--- xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.3	Thu Dec 29 16:22:46 2005
+++ xoops2jp/html/modules/pm/language/japanese/modinfo.php	Sat Feb  4 03:07:33 2006
@@ -1,12 +1,13 @@
 <?php
 
-define("_MI_PM_NAME","プライベートメッセージ");
-define("_MI_PM_NAME_DESC","プライベートメッセージの機能を司るモジュール");
-
-define("_MI_PM_CONF_SEND_TYPE","送信先入力方法");
-define("_MI_PM_CONF_SEND_TYPE_COMBO","コンボボックス(XOOPS 2.0.x互換)");
-define("_MI_PM_CONF_SEND_TYPE_TEXT","テキストでunameを入力");
-
+define('_MI_PM_CONF_SEND_TYPE', "送信先入力方法");
+define('_MI_PM_CONF_SEND_TYPE_COMBO', "コンボボックス(XOOPS 2.0.x互換)");
+define('_MI_PM_CONF_SEND_TYPE_TEXT', "テキストでunameを入力");
+define('_MI_PM_DESC_INSTALLER_1', "プライベートメッセージ機能を担当します。");
+define('_MI_PM_DESC_INSTALLER_2', "XOOPS 2.0.x 相当のプライベートメッセージ機能を提供します。");
+define('_MI_PM_DESC_INSTALLER_3', "プライベートメッセージサービスを実装しています。他モジュールより仮想サービスを通じて最低限のＰＭ操作が可能となります。");
 define('_MI_PM_LANG_GPL', "GNU 一般公衆利用許諾契約書");
+define('_MI_PM_NAME', "プライベートメッセージ");
+define('_MI_PM_NAME_DESC', "プライベートメッセージの機能を司るモジュール");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:07:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:07:33 +0900
Subject: [xoops-cvslog 2207] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060203180733.95B032AC08A@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/modinfo.php
diff -u xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.2 xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.3
--- xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.2	Sun Jan 29 16:10:23 2006
+++ xoops2jp/html/modules/pm/language/english/modinfo.php	Sat Feb  4 03:07:33 2006
@@ -1,12 +1,13 @@
 <?php
 
-define("_MI_PM_NAME","Private Message");
-define("_MI_PM_NAME_DESC","This module realizes the feature of Private Message.");
-
-define("_MI_PM_CONF_SEND_TYPE","送信先入力方法");
-define("_MI_PM_CONF_SEND_TYPE_COMBO","Conbo box (XOOPS 2.0.x compatible)");
-define("_MI_PM_CONF_SEND_TYPE_TEXT","Text (input uname directly)");
-
+define('_MI_PM_CONF_SEND_TYPE', "送信先入力方法");
+define('_MI_PM_CONF_SEND_TYPE_COMBO', "Conbo box (XOOPS 2.0.x compatible)");
+define('_MI_PM_CONF_SEND_TYPE_TEXT', "Text (input uname directly)");
+define('_MI_PM_DESC_INSTALLER_1', "This module has private message function.");
+define('_MI_PM_DESC_INSTALLER_2', "It is compatible with XOOPS 2.0.X.");
+define('_MI_PM_DESC_INSTALLER_3', "With this module, PM function is enabled from other modules by using virtual service.");
 define('_MI_PM_LANG_GPL', "The GNU General Public License");
+define('_MI_PM_NAME', "Private Message");
+define('_MI_PM_NAME_DESC', "This module realizes the feature of Private Message.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:10:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:10:06 +0900
Subject: [xoops-cvslog 2208] CVS update: xoops2jp/html/include
Message-ID: <20060203181006.A147A2AC08A@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.2 xoops2jp/html/include/version.php:1.4.8.3
--- xoops2jp/html/include/version.php:1.4.8.2	Wed Oct 19 17:09:12 2005
+++ xoops2jp/html/include/version.php	Sat Feb  4 03:10:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: version.php,v 1.4.8.2 2005/10/19 08:09:12 minahito Exp $
+// $Id: version.php,v 1.4.8.3 2006/02/03 18:10:06 minahito Exp $
 
-define("XOOPS_VERSION","XOOPS Cube 2.1 Development version");
+define("XOOPS_VERSION", "XOOPS Cube 2.1 alpha version 1");
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:13:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:13:10 +0900
Subject: [xoops-cvslog 2209] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060203181310.860372AC08A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.5	Thu Jan 19 21:11:16 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php	Sat Feb  4 03:13:10 2006
@@ -48,6 +48,16 @@
 		$render->setAttribute("thisUser",$this->mObject);
 		$render->setAttribute("currentUser",$xoopsUser);
 	}
+
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$controller->executeForward('./index.php?action=UserInfo&uid=' . $this->mObject->get('uid'));
+	}
+
+	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		redirect_header(XOOPS_URL, 1, _MD_USER_ERROR_DBUPDATE_FAILED);
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:14:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:14:33 +0900
Subject: [xoops-cvslog 2210] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060203181433.E88B82AC07C@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.2 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.2	Thu Jan 19 21:12:33 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Sat Feb  4 03:14:33 2006
@@ -67,10 +67,10 @@
 			
 			die("TODO");
 		}
-	
+		
 		$this->mAction->prepare($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig);
 	
-		if (!$this->mAction->isPerm($controller, $controller->getXoopsUser())) {
+		if (!$this->mAction->isPerm($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
 			//
 			// error
 			//

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 03:21:00 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 03:21:00 +0900
Subject: [xoops-cvslog 2211] CVS update: xoops2jp/html/install
Message-ID: <20060203182100.04C0F2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.2.8.1 xoops2jp/html/install/index.php:1.2.8.2
--- xoops2jp/html/install/index.php:1.2.8.1	Wed Oct 19 02:20:37 2005
+++ xoops2jp/html/install/index.php	Sat Feb  4 03:20:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.2.8.1 2005/10/18 17:20:37 minahito Exp $
+// $Id: index.php,v 1.2.8.2 2006/02/03 18:20:59 ryuji_amano Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -558,7 +558,7 @@
     $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', '0', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)");
+    $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)");
Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.4 xoops2jp/html/install/makedata.php:1.2.8.5
--- xoops2jp/html/install/makedata.php:1.2.8.4	Sat Feb  4 02:58:57 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 03:20:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.4 2006/02/03 17:58:57 ryuji_amano Exp $
+// $Id: makedata.php,v 1.2.8.5 2006/02/03 18:20:59 ryuji_amano Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -128,7 +128,7 @@
     $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 (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', '', '_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)");
@@ -139,9 +139,9 @@
     $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 (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', '', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
+    $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', '', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
+    $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', '', '_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)");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:25:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:25:19 +0900
Subject: [xoops-cvslog 2212] CVS update: xoops2jp/html/install
Message-ID: <20060203182519.4EAED2AC07C@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.5 xoops2jp/html/install/makedata.php:1.2.8.6
--- xoops2jp/html/install/makedata.php:1.2.8.5	Sat Feb  4 03:20:59 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 03:25:19 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.5 2006/02/03 18:20:59 ryuji_amano Exp $
+// $Id: makedata.php,v 1.2.8.6 2006/02/03 18:25:19 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -238,7 +238,15 @@
     $time = time();
 
     // RMV-NOTIFY (updated for extra column in table)
-    $dbm->insert("modules", " VALUES (${mid}, '" . constant($module_name) . "', 100, ".$time.", 0, 1, '${module}', 0, 1, 0, 0, 0, 0)");
+    //
+    // TODO We should set hasconfig and more option values here.
+    //
+    $hasconfig = isset($xoops_version['config']) ? 1 : 0;
+	$hasmain = 0;
+	if (isset($xoops_version['hasMain']) && $xoops_version['hasMain'] == 1) {
+		$hasmain = 1;
+	}
+    $dbm->insert("modules", " VALUES (${mid}, '" . constant($module_name) . "', 100, ".$time.", 0, 1, '${module}', ${hasmain}, 1, 0, ${hasconfig}, 0, 0)");
 
     if (is_array($modversion['templates']) && count($modversion['templates']) > 0) {
         foreach ($modversion['templates'] as $tplfile) {

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:29:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:29:42 +0900
Subject: [xoops-cvslog 2213] CVS update: xoops2jp/html/install
Message-ID: <20060203182942.E341E2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.6 xoops2jp/html/install/makedata.php:1.2.8.7
--- xoops2jp/html/install/makedata.php:1.2.8.6	Sat Feb  4 03:25:19 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 03:29:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.6 2006/02/03 18:25:19 minahito Exp $
+// $Id: makedata.php,v 1.2.8.7 2006/02/03 18:29:42 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -241,9 +241,9 @@
     //
     // TODO We should set hasconfig and more option values here.
     //
-    $hasconfig = isset($xoops_version['config']) ? 1 : 0;
+    $hasconfig = isset($modversion['config']) ? 1 : 0;
 	$hasmain = 0;
-	if (isset($xoops_version['hasMain']) && $xoops_version['hasMain'] == 1) {
+	if (isset($modversion['hasMain']) && $modversion['hasMain'] == 1) {
 		$hasmain = 1;
 	}
     $dbm->insert("modules", " VALUES (${mid}, '" . constant($module_name) . "', 100, ".$time.", 0, 1, '${module}', ${hasmain}, 1, 0, ${hasconfig}, 0, 0)");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 03:30:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 03:30:23 +0900
Subject: [xoops-cvslog 2214] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060203183023.3D9902AC03A@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/finish.php
diff -u xoops2jp/html/install/language/japanese/finish.php:1.1.8.2 xoops2jp/html/install/language/japanese/finish.php:1.1.8.3
--- xoops2jp/html/install/language/japanese/finish.php:1.1.8.2	Sat Feb  4 02:39:42 2006
+++ xoops2jp/html/install/language/japanese/finish.php	Sat Feb  4 03:30:23 2006
@@ -2,7 +2,7 @@
 $content .=
 "<u><b>サイト</b></u>
 <p>インストールされたサイトを見るには、<a href='../index.php'>ここ</a>をクリックしてください。</p>
-<u><b>XOOPSの使い方について</b></u>
+<u><b>XOOPS Cubeの使い方について</b></u>
 <p>[未記述]</p>
 <u><b>サポート</b></u>
 <p><a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a>サイト（英語）か、<a href='http://xoopscube.jp/' target='_blank'>XOOPS Cube日本語公式サイト</a>に訪問ください。

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 06:06:19 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 06:06:19 +0900
Subject: [xoops-cvslog 2215] CVS update: xoops2jp/html/kernel
Message-ID: <20060203210619.129C82AC094@users.sourceforge.jp>

Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2.8.1 xoops2jp/html/kernel/configitem.php:1.2.8.2
--- xoops2jp/html/kernel/configitem.php:1.2.8.1	Mon Jan  2 21:40:26 2006
+++ xoops2jp/html/kernel/configitem.php	Sat Feb  4 06:06:18 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: configitem.php,v 1.2.8.1 2006/01/02 12:40:26 minahito Exp $
+// $Id: configitem.php,v 1.2.8.2 2006/02/03 21:06:18 ryuji_amano Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -105,6 +105,7 @@
             break;
         case 'textarea':
             $ret = $this->getVar('conf_value');
+            break;
         default:
             $ret = $this->getVar('conf_value', 'N');
             break;

From ryuji_amano ＠ users.sourceforge.jp  Sat Feb  4 06:06:47 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat,  4 Feb 2006 06:06:47 +0900
Subject: [xoops-cvslog 2216] CVS update:
	xoops2jp/html/modules/system/admin/preferences
Message-ID: <20060203210647.3A8222AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/preferences/main.php
diff -u xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.3 xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.4
--- xoops2jp/html/modules/system/admin/preferences/main.php:1.2.8.3	Sat Feb  4 02:23:36 2006
+++ xoops2jp/html/modules/system/admin/preferences/main.php	Sat Feb  4 06:06:47 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.2.8.3 2006/02/03 17:23:36 minahito Exp $
+// $Id: main.php,v 1.2.8.4 2006/02/03 21:06:47 ryuji_amano Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -82,10 +82,6 @@
                 if ($config[$i]->getVar('conf_valuetype') == 'array') {
                     // this is exceptional.. only when value type is arrayneed a smarter way for this
                     
-					//
-					// TODO We should gurard warning in the following line
-					// "implode(): Bad arguments. in file"
-					//
                     $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
                 } else {
                     $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:37:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:37:28 +0900
Subject: [xoops-cvslog 2217] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060204033728.40BAD2AC0A0@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.6 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.7
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.6	Thu Feb  2 14:32:55 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Sat Feb  4 12:37:28 2006
@@ -1,13 +1,13 @@
-<?php
-
-define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
-define('_MI_BASE_MENU_COMMENTMANAGE', "Comment manage");
-define('_MI_BASE_MENU_MODULEINSTALL', "Module install");
-define('_MI_BASE_MENU_MODULELIST', "Module manage");
-define('_MI_BASE_MENU_SMILES_MANAGE', "Smiles manage");
-define('_MI_BASE_NAME', "Legacy compatible module");
-define('_MI_BASE_NAME_DESC', "This module gives compatibility with 2.0.x to Cube");
-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_MENU_ACTIONSEARCH', "Action search");
+define('_MI_BASE_MENU_COMMENTMANAGE', "Comment management");
+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 compatible module");
+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.11 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.12
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.11	Sat Feb  4 01:01:25 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sat Feb  4 12:37:28 2006
@@ -1,8 +1,8 @@
 <?php
 
-define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Updating database was fail.");
-define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension is wrong.");
-define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
+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_MAXLENGTH', "Input {0} with {1} or less characters.");
 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.");
@@ -22,122 +22,123 @@
 define('_AD_BASE_LANG_COM_TEXT', "Comment");
 define('_AD_BASE_LANG_COM_TITLE', "Title");
 define('_AD_BASE_LANG_COM_UID', "UID");
-define('_AD_BASE_LANG_COMMENT_DELETE', "Delete comment");
-define('_AD_BASE_LANG_COMMENT_EDIT', "Edit comment");
-define('_AD_BASE_LANG_COMMENT_NEW', "Add new comment");
+define('_AD_BASE_LANG_COMMENT_DELETE', "Delete a comment");
+define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment");
+define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment");
 define('_AD_BASE_LANG_CONTROL', "Control");
 define('_AD_BASE_LANG_CREATE_NEW', "Create new");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
-define('_AD_BASE_LANG_DOHTML', "Use HTML tags");
+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', "Use XOOPS code");
-define('_AD_BASE_LANG_EMOTION', "emotion");
-define('_AD_BASE_LANG_ID', "id");
+define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code");
+define('_AD_BASE_LANG_EMOTION', "Emotion");
+define('_AD_BASE_LANG_ID', "ID");
 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_SMILE_URL', "smile url");
-define('_AD_BASE_LANG_SMILES_DELETE', "smiles delete");
-define('_AD_BASE_LANG_SMILES_EDIT', "smiles edit");
-define('_AD_BASE_LANG_SMILES_NEW', "smiles new");
+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_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Confirm to delete");
 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");
 define('_MB_A_BASE_LANG_RESULT', "Results");
 define('_MB_A_BASE_LANG_SEARCH', "Search");
-define('_MD_A_BASE_ERROR_ABOUT_ISACTIVE', "'IS ACTIVE' is a bad value");
-define('_MD_A_BASE_ERROR_MAXLENGTH', "{0} is needed over {1} characters");
-define('_MD_A_BASE_ERROR_MIN', "{0} is needed over {1}");
-define('_MD_A_BASE_ERROR_NO_HELP_FILE', " md a base error no help file");
+define('_MD_A_BASE_ERROR_ABOUT_ISACTIVE', "Specified value for 'IS ACTIVE' is invalied.");
+define('_MD_A_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or more characters.");
+define('_MD_A_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value.");
+define('_MD_A_BASE_ERROR_NO_HELP_FILE', "Help file is not found.");
 define('_MD_A_BASE_ERROR_REQUIRED', "{0} is required");
 define('_MD_A_BASE_ERROR_SEARCH_REQUIRED', "Input keyword");
-define('_MD_A_BASE_LANG_ACTIONSEARCH', "Actionsearch");
+define('_MD_A_BASE_LANG_ACTIONSEARCH', "Action Search");
+define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "Search information of typed keyword from admin menu and help files.<br>Please perform search when you need to know how to use the XOOPS Cube.");
 define('_MD_A_BASE_LANG_ACTIVE', "Active");
-define('_MD_A_BASE_LANG_ADMIN_MENU', "Admin Menu Information");
-define('_MD_A_BASE_LANG_ADMINMENU_HAS_MAIN', "Admin Menu");
-define('_MD_A_BASE_LANG_ADMINMENU_INDEX', "Admin Menu");
-define('_MD_A_BASE_LANG_ADMINMENU_MENU', "Admin Menu");
-define('_MD_A_BASE_LANG_ADMINMENU_NAME', "Admin Menu name");
-define('_MD_A_BASE_LANG_ADMINMENU_URL', "Admin Menu URL");
-define('_MD_A_BASE_LANG_AGREE', " md a base lang agree");
-define('_MD_A_BASE_LANG_BLOCK_KEY', "BLOCK_KEY");
-define('_MD_A_BASE_LANG_BLOCK_VAL', "BLOCK_VAL");
-define('_MD_A_BASE_LANG_BLOCKS_INFO', "BLOCKS_INFO");
+define('_MD_A_BASE_LANG_ADMIN_MENU', "Information of Administration Menu");
+define('_MD_A_BASE_LANG_ADMINMENU_HAS_MAIN', "Administration Menu");
+define('_MD_A_BASE_LANG_ADMINMENU_INDEX', "Administration Menu");
+define('_MD_A_BASE_LANG_ADMINMENU_MENU', "Detailed module package information ");
+define('_MD_A_BASE_LANG_ADMINMENU_NAME', "Name of Administration Menu name");
+define('_MD_A_BASE_LANG_ADMINMENU_URL', "URL of Administration Menu");
+define('_MD_A_BASE_LANG_AGREE', "Agree");
+define('_MD_A_BASE_LANG_BLOCK_KEY', "Key");
+define('_MD_A_BASE_LANG_BLOCK_VAL', "Value");
+define('_MD_A_BASE_LANG_BLOCKS_INFO', "Block information");
 define('_MD_A_BASE_LANG_COMMENT_SVC', "Comment");
-define('_MD_A_BASE_LANG_CONFIG_INFO', "CONFIG_INFO");
-define('_MD_A_BASE_LANG_CONFIG_KEY', "CONFIG_KEY");
-define('_MD_A_BASE_LANG_CONFIG_VAL', "CONFIG_VAL");
+define('_MD_A_BASE_LANG_CONFIG_INFO', "General configuration");
+define('_MD_A_BASE_LANG_CONFIG_KEY', "Key");
+define('_MD_A_BASE_LANG_CONFIG_VAL', "Value");
 define('_MD_A_BASE_LANG_CONTROL', "Control");
-define('_MD_A_BASE_LANG_DEACTIVATE', "deactive");
-define('_MD_A_BASE_LANG_FEATURE_SVC_INFO', "FEATURE_SVC_INFO");
-define('_MD_A_BASE_LANG_FORCE_MODE', "force mode: ...................");
+define('_MD_A_BASE_LANG_DEACTIVATE', "Inactive");
+define('_MD_A_BASE_LANG_FEATURE_SVC_INFO', "Information of feature function");
+define('_MD_A_BASE_LANG_FORCE_MODE', "Force mode: Force uninstall overcoming errors and clean up database as much as possible.");
 define('_MD_A_BASE_LANG_INFORMATION', "Information");
-define('_MD_A_BASE_LANG_INSTALL', "install");
-define('_MD_A_BASE_LANG_ISACTIVE', "Isactive");
-define('_MD_A_BASE_LANG_LASTUPDATE', "Lastupdate");
-define('_MD_A_BASE_LANG_MAINMENU_HAS_MAIN', "MainMenu");
-define('_MD_A_BASE_LANG_MAINMENU_INFO', "MAINMENU_INFO");
-define('_MD_A_BASE_LANG_MID', "Mid");
-define('_MD_A_BASE_LANG_MOD_AUTHOR', "MOD_AUTHOR");
-define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "MOD_BASIC_INFO");
-define('_MD_A_BASE_LANG_MOD_CREDITS', "MOD_CREDITS");
-define('_MD_A_BASE_LANG_MOD_DESC', "MOD_DESC");
-define('_MD_A_BASE_LANG_MOD_DIR_NAME', "MOD_DIR_NAME");
-define('_MD_A_BASE_LANG_MOD_LICENSE_INFO', "MOD_LICENSE_INFO");
+define('_MD_A_BASE_LANG_INSTALL', "Install");
+define('_MD_A_BASE_LANG_ISACTIVE', "Active");
+define('_MD_A_BASE_LANG_LASTUPDATE', "Last update");
+define('_MD_A_BASE_LANG_MAINMENU_HAS_MAIN', "Main Menu");
+define('_MD_A_BASE_LANG_MAINMENU_INFO', "Information of Main Menu");
+define('_MD_A_BASE_LANG_MID', "MID");
+define('_MD_A_BASE_LANG_MOD_AUTHOR', "Module Author");
+define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "Outlines of module");
+define('_MD_A_BASE_LANG_MOD_CREDITS', "Signature / Memo");
+define('_MD_A_BASE_LANG_MOD_DESC', "Module discription");
+define('_MD_A_BASE_LANG_MOD_DIR_NAME', "Module directory");
+define('_MD_A_BASE_LANG_MOD_LICENSE_INFO', "Licence Information ");
 define('_MD_A_BASE_LANG_MODIFY', "Modify");
-define('_MD_A_BASE_LANG_MODINSTALL', "module install");
-define('_MD_A_BASE_LANG_MODINSTALL_ADVICE', "install module<b>_%s_</b> OK?");
-define('_MD_A_BASE_LANG_MODINSTALL_CONF', "module install confirm");
-define('_MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE', "いいかいお嬢さん……使わないモジュールはサーバーから削るもんだぜ。。");
-define('_MD_A_BASE_LANG_MODINSTALL_LOG', "module install LOG");
-define('_MD_A_BASE_LANG_MODINSTALL_SUCCESS', "module install success");
-define('_MD_A_BASE_LANG_MODLIST', "modules admin");
-define('_MD_A_BASE_LANG_MODULE_LICENSE', "MODULE_LICENSE");
-define('_MD_A_BASE_LANG_MODUNINSTALL_ADVICE', "Uninstall module<b>_%s_</b> OK?");
-define('_MD_A_BASE_LANG_MODUNINSTALL_CONF', "module uninstall confirm");
-define('_MD_A_BASE_LANG_MODUNINSTALL_LOG', "module uninstall LOG");
-define('_MD_A_BASE_LANG_MODUNINSTALL_SUCCESS', "module uninstall success");
-define('_MD_A_BASE_LANG_MODUPDATE_ADVICE', "uopdate module<b>_%s_</b> OK?");
-define('_MD_A_BASE_LANG_MODUPDATE_CONF', "update module");
-define('_MD_A_BASE_LANG_MODUPDATE_LOG', "module update LOG");
+define('_MD_A_BASE_LANG_MODINSTALL', "Module install");
+define('_MD_A_BASE_LANG_MODINSTALL_ADVICE', "Module");
+define('_MD_A_BASE_LANG_MODINSTALL_CONF', "Are you sure to install the module?");
+define('_MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from server to keep security of your site.  ");
+define('_MD_A_BASE_LANG_MODINSTALL_LOG', "module install log");
+define('_MD_A_BASE_LANG_MODINSTALL_SUCCESS', "The module is successfully installed.");
+define('_MD_A_BASE_LANG_MODLIST', "Modules administration");
+define('_MD_A_BASE_LANG_MODULE_LICENSE', "Module license");
+define('_MD_A_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure to uninstall module");
+define('_MD_A_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall");
+define('_MD_A_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log");
+define('_MD_A_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled.");
+define('_MD_A_BASE_LANG_MODUPDATE_ADVICE', "Update module");
+define('_MD_A_BASE_LANG_MODUPDATE_CONF', "Confirm module update.");
+define('_MD_A_BASE_LANG_MODUPDATE_LOG', "Module update log");
 define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "module update success");
 define('_MD_A_BASE_LANG_NAME', "Name");
-define('_MD_A_BASE_LANG_NO_ADMINMENU', "no Admin Menu");
-define('_MD_A_BASE_LANG_NO_AGREE', " md a base lang no agree");
-define('_MD_A_BASE_LANG_NO_BLOCK', "NO_BLOCK");
-define('_MD_A_BASE_LANG_NO_CHANGE', "no change");
-define('_MD_A_BASE_LANG_NO_CONFIG', "NO_CONFIG");
-define('_MD_A_BASE_LANG_NO_MAINMENU', "NO_MAINMENU");
-define('_MD_A_BASE_LANG_NO_SQL', "NO_SQL");
-define('_MD_A_BASE_LANG_NO_SUBMENU', "no SubMenu");
-define('_MD_A_BASE_LANG_NO_TEMPLATE', "NO_TEMPLATE");
+define('_MD_A_BASE_LANG_NO_ADMINMENU', "No Administration Menu");
+define('_MD_A_BASE_LANG_NO_AGREE', " I Do Not Agree.");
+define('_MD_A_BASE_LANG_NO_BLOCK', "No block information");
+define('_MD_A_BASE_LANG_NO_CHANGE', "No change");
+define('_MD_A_BASE_LANG_NO_CONFIG', "General settings has not been configured.");
+define('_MD_A_BASE_LANG_NO_MAINMENU', "Mainmenu settings has not been configured.");
+define('_MD_A_BASE_LANG_NO_SQL', "SQL information has not been configured.");
+define('_MD_A_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured.");
+define('_MD_A_BASE_LANG_NO_TEMPLATE', "Template information has not been configured.");
 define('_MD_A_BASE_LANG_NOTIF_SVC', "Notification");
 define('_MD_A_BASE_LANG_SEARCH', "Search");
 define('_MD_A_BASE_LANG_SEARCH_SVC', "Search");
 define('_MD_A_BASE_LANG_SMARTY', "Smarty");
-define('_MD_A_BASE_LANG_SQL_ENGINE', "SQL_ENGINE");
-define('_MD_A_BASE_LANG_SQL_FILE_NAME', "SQL_FILE_NAME");
-define('_MD_A_BASE_LANG_SQL_HAS_MAIN', "SQL_HAS_MAIN");
-define('_MD_A_BASE_LANG_SQL_INFO', "SQL_INFO");
-define('_MD_A_BASE_LANG_SQL_MYSQL', "SQL_MySQL");
+define('_MD_A_BASE_LANG_SQL_ENGINE', "SQL engine");
+define('_MD_A_BASE_LANG_SQL_FILE_NAME', "SQL file name");
+define('_MD_A_BASE_LANG_SQL_HAS_MAIN', "Use SQL");
+define('_MD_A_BASE_LANG_SQL_INFO', "SQL information");
+define('_MD_A_BASE_LANG_SQL_MYSQL', "MySQL");
 define('_MD_A_BASE_LANG_SUBMENU_NAME', "SubMenu name");
 define('_MD_A_BASE_LANG_SUBMENU_URL', "SubMenu URL");
 define('_MD_A_BASE_LANG_SUBMIT', "Submit");
-define('_MD_A_BASE_LANG_TABLE_NAME', "TABLE_NAME");
-define('_MD_A_BASE_LANG_TABLE_NUM', "TABLE_NUM");
-define('_MD_A_BASE_LANG_TABLE_PROPERTIES', "TABLE_PROPERTIES");
-define('_MD_A_BASE_LANG_TEMPLATE_DESC', "TEMPLATE_DESC");
-define('_MD_A_BASE_LANG_TEMPLATE_ENGINE', "TEMPLATE_ENGINE");
-define('_MD_A_BASE_LANG_TEMPLATE_FILE', "TEMPLATE_FILE");
-define('_MD_A_BASE_LANG_TEMPLATE_HAS_MAIN', "TEMPLATE_HAS_MAIN");
-define('_MD_A_BASE_LANG_TEMPLATE_INFO', "TEMPLATE_INFO");
-define('_MD_A_BASE_LANG_TEMPLATE_KEY', "TEMPLATE_KEY");
+define('_MD_A_BASE_LANG_TABLE_NAME', "Table name");
+define('_MD_A_BASE_LANG_TABLE_NUM', "Table Number");
+define('_MD_A_BASE_LANG_TABLE_PROPERTIES', "Table Properties");
+define('_MD_A_BASE_LANG_TEMPLATE_DESC', "Template description");
+define('_MD_A_BASE_LANG_TEMPLATE_ENGINE', "Template engine");
+define('_MD_A_BASE_LANG_TEMPLATE_FILE', "Template name");
+define('_MD_A_BASE_LANG_TEMPLATE_HAS_MAIN', "Use template");
+define('_MD_A_BASE_LANG_TEMPLATE_INFO', "Template information");
+define('_MD_A_BASE_LANG_TEMPLATE_KEY', "Template Key");
 define('_MD_A_BASE_LANG_UNINSTALL', "Uninstall");
 define('_MD_A_BASE_LANG_UPDATE', "Update");
 define('_MD_A_BASE_LANG_VERSION', "Version");
Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.8 xoops2jp/html/modules/base/language/english/main.php:1.1.2.9
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.8	Sat Feb  4 01:01:25 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Sat Feb  4 12:37:28 2006
@@ -1,12 +1,12 @@
 <?php
 
 define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
+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', "com icon");
+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");
@@ -19,15 +19,15 @@
 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', "The rule about comment");
+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', "Use HTML tags");
+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', "User XOOPS code");
+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");
@@ -38,30 +38,30 @@
 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 Email: ");
-define('_MSC_FRIENDNAMEC', "Friend Name: ");
-define('_MSC_INTSITE', "Interesting Site: %s");
-define('_MSC_INVALIDEMAIL1', "The email address you provided is not a valid address.");
+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 need to enter required info!");
-define('_MSC_RECOMMENDSITE', "Recommend this Site to a Friend");
-define('_MSC_REFERENCESENT', "The reference to our site has been sent to your friend. Thanks!");
+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 <b>%s</b> match(es)");
+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 <b>%s</b> characters will be ignored");
-define('_SR_KEYTOOSHORT', "Keywords must be at least <b>%s</b> characters long");
+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 Match Found for your Query");
+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");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:37:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:37:35 +0900
Subject: [xoops-cvslog 2218] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060204033735.808512AC0A0@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.7 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.8
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.7	Thu Feb  2 14:33:07 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Sat Feb  4 12:37:35 2006
@@ -1,11 +1,11 @@
-<?php
-
-define('_MI_BASE_MENU_ACTIONSEARCH', "コマンド検索");
-define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
-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_MENU_ACTIONSEARCH', "アクションサーチ");
+define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
+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.8 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.9
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.8	Sat Feb  4 01:01:24 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Sat Feb  4 12:37:35 2006
@@ -57,7 +57,7 @@
 define('_SR_EXACT', "フレーズ");
 define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
 define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
-define('_SR_KEYIGNORE', "文字数が <b>%s</b> 文字未満のキーワードは無視されます。");
+define('_SR_KEYIGNORE', "文字数が ");
 define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
 define('_SR_KEYWORDS', "キーワード");
 define('_SR_NEXT', "次のページ >>");
Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.16 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.17
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.16	Sat Feb  4 01:01:25 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Sat Feb  4 12:37:35 2006
@@ -1,7 +1,7 @@
 <?php
 
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
-define('_AD_BASE_ERROR_EXTENSION', "アップロードされたファイルの拡張子が不正です");
+define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
@@ -33,19 +33,19 @@
 define('_AD_BASE_LANG_DOIMAGE', "doimage");
 define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
 define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
-define('_AD_BASE_LANG_EMOTION', "emotion");
-define('_AD_BASE_LANG_ID', "id");
+define('_AD_BASE_LANG_EMOTION', "意味");
+define('_AD_BASE_LANG_ID', "ID");
 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_SMILE_URL', "smile url");
+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', "Submit");
-define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_AD_BASE_LANG_SUBMIT', "送信");
+define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。<br/>管理メニューの位置を忘れたときに使いましょう (例)利用許諾文");
 define('_MB_A_BASE_LANG_MENU', "メニュー");
@@ -86,7 +86,7 @@
 define('_MD_A_BASE_LANG_MID', "MID");
 define('_MD_A_BASE_LANG_MOD_AUTHOR', "モジュール作者");
 define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "モジュール概要");
-define('_MD_A_BASE_LANG_MOD_CREDITS', "クレジット情報");
+define('_MD_A_BASE_LANG_MOD_CREDITS', "署名＆メモ");
 define('_MD_A_BASE_LANG_MOD_DESC', "モジュール説明");
 define('_MD_A_BASE_LANG_MOD_DIR_NAME', "ディレクトリ名");
 define('_MD_A_BASE_LANG_MOD_LICENSE_INFO', "ライセンス情報");
@@ -106,7 +106,7 @@
 define('_MD_A_BASE_LANG_MODUPDATE_ADVICE', "<b>_%s_</b> をアップデートします。よろしいですか？");
 define('_MD_A_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認");
 define('_MD_A_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ");
-define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "モジュールアップデート終了");
+define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated.");
 define('_MD_A_BASE_LANG_NAME', "名前");
 define('_MD_A_BASE_LANG_NO_ADMINMENU', "管理画面情報は設定されていません");
 define('_MD_A_BASE_LANG_NO_AGREE', "同意しない");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:37:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:37:48 +0900
Subject: [xoops-cvslog 2219] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060204033748.9BD262AC0A3@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.4 xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.4	Sat Jan 14 02:34:03 2006
+++ xoops2jp/html/modules/legacyRender/language/english/modinfo.php	Sat Feb  4 12:37:48 2006
@@ -1,9 +1,9 @@
 <?php
 
 define('_MI_LEGACYRENDER_ADMENU_HELP', "Help");
-define('_MI_LEGACYRENDER_ADMENU_TEMPLATE_MANAGE', "template manage");
-define('_MI_LEGACYRENDER_ADMENU_THEME_SETTING', "Theme setting");
-define('_MI_LEGACYRENDER_ADMENU_TPLFILE_MANAGE', "tplfile manage");
+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_KEYWORD_ADD', "Add");
 define('_MI_LEGACYRENDER_KEYWORD_DELETE', "Delete");
 define('_MI_LEGACYRENDER_KEYWORD_DOWNLOAD', "Download");
@@ -12,7 +12,7 @@
 define('_MI_LEGACYRENDER_KEYWORD_THEME', "Theme");
 define('_MI_LEGACYRENDER_KEYWORD_UNINSTALL', "Uninstall");
 define('_MI_LEGACYRENDER_KEYWORD_UPLOAD', "Upload");
-define('_MI_LEGACYRENDER_NAME', "Compatibility Render System");
-define('_MI_LEGACYRENDER_NAME_DESC', "This system has compatibility with XOOPS 2.0.9 and XOOPS JP 2.0.x. You can use XOOPS2 Format Theme on this system.");
+define('_MI_LEGACYRENDER_NAME', "Compatible Render System");
+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.");
 
 ?>
Index: xoops2jp/html/modules/legacyRender/language/english/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.11 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.12
--- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.11	Tue Jan 31 17:28:53 2006
+++ xoops2jp/html/modules/legacyRender/language/english/admin.php	Sat Feb  4 12:37:48 2006
@@ -1,38 +1,43 @@
 <?php
 
-define('_AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED', "Updating database is failure.");
-define('_AD_LEGACYRENDER_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
-define('_AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST', "object is not exist");
+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_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', "template set is not exist");
+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_CONTROL', "Control");
-define('_AD_LEGACYRENDER_LANG_GET_ADDRESS', "Get address");
-define('_AD_LEGACYRENDER_LANG_GET_THEME', "Get theme");
-define('_AD_LEGACYRENDER_LANG_GETTING_START', "Getting start");
+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_INFORMATION', "Information");
 define('_AD_LEGACYRENDER_LANG_INSTALL', "Install");
+define('_AD_LEGACYRENDER_LANG_LICENCE', "Licence");
 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_RECENT_MODIFY_FILES', "Recent modified files");
-define('_AD_LEGACYRENDER_LANG_SEARCH_TEMPLATE', "Search template");
+define('_AD_LEGACYRENDER_LANG_PACKAGE', "Package");
+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");
+define('_AD_LEGACYRENDER_LANG_SELECTED', "The theme is selected.");
 define('_AD_LEGACYRENDER_LANG_SUBMIT', "Submit");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE', "template");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_EDIT', "Template file edit");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_LIST', "Template file list");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_VIEW', "Template file view");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_MANAGE', "Template manage");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_CLONE', "Template set clone");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE', "Template set delete");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF', "Do you delete Template set <b>%s</b> ?");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT', "Template set edit");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_LIST', "Template set list");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE', "Template");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_EDIT', "Edit template files");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_LIST', "List of template files");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_FILE_VIEW', "View template files");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_MANAGE', "Template management");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_CLONE', "Copy a template set");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE', "Delete template set");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF', "Do you delete Template set ");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT', "Edit a template set");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_LIST', "List of template sets");
 define('_AD_LEGACYRENDER_LANG_THEME', "Theme");
+define('_AD_LEGACYRENDER_LANG_THEME_ADMIN', "Theme administration");
 define('_AD_LEGACYRENDER_LANG_TPL_DESC', "Description");
 define('_AD_LEGACYRENDER_LANG_TPL_FILE', "File name");
 define('_AD_LEGACYRENDER_LANG_TPL_ID', "ID");
@@ -50,14 +55,15 @@
 define('_AD_LEGACYRENDER_LANG_TPLSET_NAME', "Name");
 define('_AD_LEGACYRENDER_LANG_UNINSTALL', "Uninstall");
 define('_AD_LEGACYRENDER_LANG_UPLOAD', "Upload");
-define('_AD_LEGACYRENDER_LANG_USER_ENABLE_SELECT', "Enable select to user");
+define('_AD_LEGACYRENDER_LANG_USER_ENABLE_SELECT', "Selectable by user");
 define('_AD_LEGACYRENDER_LANG_VERSION', "Version");
 define('_AD_LEGACYRENDER_LANG_VIEW', "View");
 define('_AD_LEGACYRENDER_LANG_W3C', "W3C");
-define('_AD_LEGACYRENDER_LANGE_TEMPLATE_MANAGE', "Template manage");
+define('_AD_LEGACYRENDER_LANGE_TEMPLATE_MANAGE', "Template management");
 define('_AD_LEGACYRENDER_MESSAGE_NO_MANIFESTO', "No manifesto");
-define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1', "At first, create the clone of default template set, and customize your site with modifying templates. To learn more details, read the help.");
+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.");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2', "Do you change template set for your site. To select template set, click 'Select' button. To learn more details, read the help.");
-define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "To change your site's looks to your favorite theme, click 'select' button.<br/> Do you want to let a user choose themes? List up themes to theme selection block with clicking checkboxes. To learn more details, read the help.");
+define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:37:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:37:55 +0900
Subject: [xoops-cvslog 2220] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060204033755.3B4C42AC0A3@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.12 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.13
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.12	Tue Jan 31 17:28:53 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php	Sat Feb  4 12:37:55 2006
@@ -32,7 +32,7 @@
 define('_AD_LEGACYRENDER_LANG_TEMPLATE_MANAGE', "テンプレート管理");
 define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_CLONE', "テンプレートセット複製");
 define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE', "テンプレートセット削除");
-define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF', "テンプレートセット<b>%s</b> を、削除しますが宜しいですか？");
+define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF', "テンプレートセット");
 define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT', "テンプレートセット編集");
 define('_AD_LEGACYRENDER_LANG_TEMPLATE_SET_LIST', "テンプレートセット一覧");
 define('_AD_LEGACYRENDER_LANG_THEME', "テーマ");
@@ -62,6 +62,6 @@
 define('_AD_LEGACYRENDER_MESSAGE_NO_PACKAGE', "パッケージ情報なし");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1', "まず、デフォルトのテンプレートセットの複製を作成し、テンプレートを変更してサイトをカスタマイズしましょう。詳しくはヘルプをご覧ください。");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2', "サイトに適用するテンプレートセットを変更しますか？　選択ボタンを押して、テンプレートセットを選びましょう。詳しくはヘルプをご覧ください。");
-define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。<br/>ユーザーにテーマを選択させたいですか？　チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。");
+define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:38:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:38:04 +0900
Subject: [xoops-cvslog 2221] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060204033804.ADC612AC0A3@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/main.php
diff -u xoops2jp/html/modules/pm/language/english/main.php:1.1.2.2 xoops2jp/html/modules/pm/language/english/main.php:1.1.2.3
--- xoops2jp/html/modules/pm/language/english/main.php:1.1.2.2	Sun Jan 29 16:10:23 2006
+++ xoops2jp/html/modules/pm/language/english/main.php	Sat Feb  4 12:38:04 2006
@@ -1,55 +1,43 @@
 <?php
-// $Id: main.php,v 1.1.2.2 2006/01/29 07:10:23 minahito Exp $
-//%%%%%%	File Name readpmsg.php 	%%%%%
-define("_PM_DELETED","Your message(s) has been deleted");
-define("_PM_PRIVATEMESSAGE","Private Messages");
-define("_PM_INBOX","Inbox");
-define("_PM_FROM","From");
-define("_PM_YOUDONTHAVE","You don't have any private messages");
-define("_PM_FROMC","From: ");
-define("_PM_SENTC","Sent: "); // The date of message sent
-define("_PM_PROFILE","Profile");
 
-// %s is a username
-define("_PM_PREVIOUS","Previous Message");
-define("_PM_NEXT","Next Message");
+define('_MD_PM_ERROR_ACCESS', "Access error");
+define('_MD_PM_ERROR_MESSAGE_SEND', "Sending message has been failed.");
+define('_MD_PM_ERROR_REQUIRED', "{0} is required");
+define('_MD_PM_LANG_MESSAGE', "Message");
+define('_MD_PM_LANG_MESSAGE_DETAIL', "Details of message");
+define('_MD_PM_LANG_SUBJECTC', "Subject： ");
+define('_PM_CANCELSEND', "Cancel sending");
+define('_PM_CLEAR', "Clear");
+define('_PM_CLICKHERE', "You can click here to view your private messages");
+define('_PM_DATE', "Date");
+define('_PM_DELETE', "Delete");
+define('_PM_DELETED', "Your message(s) has been deleted");
+define('_PM_FROM', "From");
+define('_PM_FROMC', "From: ");
+define('_PM_GOBACK', "Go Back");
+define('_PM_INBOX', "Inbox");
+define('_PM_MESSAGEC', "Message: ");
+define('_PM_MESSAGEPOSTED', "Your message has been posted.");
+define('_PM_NEXT', "Next Message");
+define('_PM_NOTREAD', "Unread");
+define('_PM_ONLINE', "Online");
+define('_PM_ORCLOSEWINDOW', "Or click here to close this window.");
+define('_PM_PLZREG', "Please register first to send private messages!");
+define('_PM_PLZTRYAGAIN', "Please check the name and try again.");
+define('_PM_PREVIOUS', "Previous Message");
+define('_PM_PRIVATEMESSAGE', "Private Messages");
+define('_PM_PROFILE', "Profile");
+define('_PM_REGISTERNOW', "Register Now!");
+define('_PM_REPLY', "Reply");
+define('_PM_SEND', "Send");
+define('_PM_SENTC', "Sent: ");
+define('_PM_SORRY', "Sorry! You are not a registered user.");
+define('_PM_SUBJECT', "Subject");
+define('_PM_SUBJECTC', "Subject: ");
+define('_PM_SUBMIT', "Submit");
+define('_PM_TO', "To: ");
+define('_PM_USERNOEXIST', "The selected user doesn't exist in the database.");
+define('_PM_USERWROTE', "%s wrote:");
+define('_PM_YOUDONTHAVE', "You don't have any private messages.");
 
-//%%%%%%	File Name pmlite.php 	%%%%%
-define("_PM_SORRY","Sorry! You are not a registered user.");
-define("_PM_REGISTERNOW","Register Now!");
-define("_PM_GOBACK","Go Back");
-define("_PM_USERNOEXIST","The selected user doesn't exist in the database.");
-define("_PM_PLZTRYAGAIN","Please check the name and try again.");
-define("_PM_MESSAGEPOSTED","Your message has been posted");
-define("_PM_CLICKHERE","You can click here to view your private messages");
-define("_PM_ORCLOSEWINDOW","Or click here to close this window.");
-define("_PM_USERWROTE","%s wrote:");
-define("_PM_TO","To: ");
-define("_PM_SUBJECTC","Subject: ");
-define("_PM_MESSAGEC","Message: ");
-define("_PM_CLEAR","Clear");
-define("_PM_CANCELSEND","Cancel Send");
-define("_PM_SUBMIT","Submit");
-
-//%%%%%%	File Name viewpmsg.php 	%%%%%
-define("_PM_SUBJECT","Subject");
-define("_PM_DATE","Date");
-define("_PM_NOTREAD","Not Read");
-define("_PM_SEND","Send");
-define("_PM_DELETE","Delete");
-define("_PM_REPLY", "Reply");
-define("_PM_PLZREG","Please register first to send private messages!");
-
-define("_PM_ONLINE", "Online");
-
-//
-// New message in XOOPS Cube.
-//
-define("_MD_PM_ERROR_MESSAGE_SEND","Sending message was failure.");
-define("_MD_PM_ERROR_REQUIRED","{0} is required");
-define("_MD_PM_LANG_SUBJECTC","Subject： ");
-define("_MD_PM_LANG_MESSAGE","Message");
-define("_MD_PM_ERROR_ACCESS","Access error");
-define("_MD_PM_LANG_MESSAGE_DETAIL","Message detail");
-
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/modules/pm/language/english/modinfo.php
diff -u xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.3 xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.4
--- xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.3	Sat Feb  4 03:07:33 2006
+++ xoops2jp/html/modules/pm/language/english/modinfo.php	Sat Feb  4 12:38:04 2006
@@ -1,13 +1,13 @@
 <?php
 
-define('_MI_PM_CONF_SEND_TYPE', "送信先入力方法");
+define('_MI_PM_CONF_SEND_TYPE', "How to specify recipient address?");
 define('_MI_PM_CONF_SEND_TYPE_COMBO', "Conbo box (XOOPS 2.0.x compatible)");
-define('_MI_PM_CONF_SEND_TYPE_TEXT', "Text (input uname directly)");
+define('_MI_PM_CONF_SEND_TYPE_TEXT', "Type (input username directly)");
 define('_MI_PM_DESC_INSTALLER_1', "This module has private message function.");
 define('_MI_PM_DESC_INSTALLER_2', "It is compatible with XOOPS 2.0.X.");
 define('_MI_PM_DESC_INSTALLER_3', "With this module, PM function is enabled from other modules by using virtual service.");
 define('_MI_PM_LANG_GPL', "The GNU General Public License");
 define('_MI_PM_NAME', "Private Message");
-define('_MI_PM_NAME_DESC', "This module realizes the feature of Private Message.");
+define('_MI_PM_NAME_DESC', "This module has the function of Private Message.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:38:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:38:11 +0900
Subject: [xoops-cvslog 2222] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060204033811.CFE142AC0A0@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.4 xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.5
--- xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.4	Sat Feb  4 03:07:33 2006
+++ xoops2jp/html/modules/pm/language/japanese/modinfo.php	Sat Feb  4 12:38:11 2006
@@ -2,7 +2,7 @@
 
 define('_MI_PM_CONF_SEND_TYPE', "送信先入力方法");
 define('_MI_PM_CONF_SEND_TYPE_COMBO', "コンボボックス(XOOPS 2.0.x互換)");
-define('_MI_PM_CONF_SEND_TYPE_TEXT', "テキストでunameを入力");
+define('_MI_PM_CONF_SEND_TYPE_TEXT', "ユーザー名を直接入力");
 define('_MI_PM_DESC_INSTALLER_1', "プライベートメッセージ機能を担当します。");
 define('_MI_PM_DESC_INSTALLER_2', "XOOPS 2.0.x 相当のプライベートメッセージ機能を提供します。");
 define('_MI_PM_DESC_INSTALLER_3', "プライベートメッセージサービスを実装しています。他モジュールより仮想サービスを通じて最低限のＰＭ操作が可能となります。");
Index: xoops2jp/html/modules/pm/language/japanese/main.php
diff -u xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.6 xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.7
--- xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.6	Sun Jan 29 16:10:31 2006
+++ xoops2jp/html/modules/pm/language/japanese/main.php	Sat Feb  4 12:38:11 2006
@@ -1,54 +1,43 @@
 <?php
-//%%%%%%	File Name readpmsg.php 	%%%%%
-define('_PM_DELETED','メッセージを削除しました。');
-define('_PM_PRIVATEMESSAGE','プライベートメッセージ');
-define('_PM_INBOX','受信箱');
-define('_PM_FROM','送信者');
-define('_PM_YOUDONTHAVE','プライベートメッセージはありません。');
-define('_PM_FROMC','送信者： ');
-define('_PM_SENTC','送信日時： '); // The date of message sent
-define('_PM_PROFILE','プロフィール');
 
-// %s is a username
-define('_PM_PREVIOUS','前のメッセージ');
-define('_PM_NEXT','次のメッセージ');
+define('_MD_PM_ERROR_ACCESS', "アクセスエラーです");
+define('_MD_PM_ERROR_MESSAGE_SEND', "メッセージの送信に失敗しました");
+define('_MD_PM_ERROR_REQUIRED', "{0}は必ず入力してください");
+define('_MD_PM_LANG_MESSAGE', "メッセージ");
+define('_MD_PM_LANG_MESSAGE_DETAIL', "メッセージの詳細");
+define('_MD_PM_LANG_SUBJECTC', "件名： ");
+define('_PM_CANCELSEND', "キャンセル");
+define('_PM_CLEAR', "クリア");
+define('_PM_CLICKHERE', "プライベートメッセージの受信箱を表示する");
+define('_PM_DATE', "送信日時");
+define('_PM_DELETE', "削除");
+define('_PM_DELETED', "メッセージを削除しました。");
+define('_PM_FROM', "送信者");
+define('_PM_FROMC', "送信者： ");
+define('_PM_GOBACK', "戻る");
+define('_PM_INBOX', "受信箱");
+define('_PM_MESSAGEC', "メッセージ：");
+define('_PM_MESSAGEPOSTED', "メッセージを送信しました。");
+define('_PM_NEXT', "次のメッセージ");
+define('_PM_NOTREAD', "未読");
+define('_PM_ONLINE', "オンライン");
+define('_PM_ORCLOSEWINDOW', "このウィンドウを閉じる");
+define('_PM_PLZREG', "プライベートメッセージを使用するにはユーザ登録が必要です。");
+define('_PM_PLZTRYAGAIN', "ユーザ名を確認しもう一度やり直してください。");
+define('_PM_PREVIOUS', "前のメッセージ");
+define('_PM_PRIVATEMESSAGE', "プライベートメッセージ");
+define('_PM_PROFILE', "プロフィール");
+define('_PM_REGISTERNOW', "今すぐ登録");
+define('_PM_REPLY', "返信");
+define('_PM_SEND', "送信");
+define('_PM_SENTC', "送信日時： ");
+define('_PM_SORRY', "プライベートメッセージを使用するにはユーザ登録が必要です。");
+define('_PM_SUBJECT', "件名");
+define('_PM_SUBJECTC', "件名：");
+define('_PM_SUBMIT', "送信");
+define('_PM_TO', "宛先：");
+define('_PM_USERNOEXIST', "選択したユーザは存在しません。");
+define('_PM_USERWROTE', "%s さんは書きました：");
+define('_PM_YOUDONTHAVE', "プライベートメッセージはありません。");
 
-//%%%%%%	File Name pmlite.php 	%%%%%
-define('_PM_SORRY','プライベートメッセージを使用するにはユーザ登録が必要です。');
-define('_PM_REGISTERNOW','今すぐ登録');
-define('_PM_GOBACK','戻る');
-define('_PM_USERNOEXIST','選択したユーザは存在しません。');
-define('_PM_PLZTRYAGAIN','ユーザ名を確認しもう一度やり直してください。');
-define('_PM_MESSAGEPOSTED','メッセージを送信しました。');
-define('_PM_CLICKHERE','プライベートメッセージの受信箱を表示する');
-define('_PM_ORCLOSEWINDOW','このウィンドウを閉じる');
-define('_PM_USERWROTE','%s さんは書きました：');
-define('_PM_TO','宛先：');
-define('_PM_SUBJECTC','件名：');
-define('_PM_MESSAGEC','メッセージ：');
-define('_PM_CLEAR','クリア');
-define('_PM_CANCELSEND','キャンセル');
-define('_PM_SUBMIT','送信');
-
-//%%%%%%	File Name viewpmsg.php 	%%%%%
-define('_PM_SUBJECT','件名');
-define('_PM_DATE','送信日時');
-define('_PM_NOTREAD','未読');
-define('_PM_SEND','送信');
-define('_PM_DELETE','削除');
-define('_PM_REPLY', '返信');
-define('_PM_PLZREG','プライベートメッセージを使用するにはユーザ登録が必要です。');
-
-define('_PM_ONLINE', 'オンライン');
-
-//
-// New message in XOOPS Cube.
-//
-define("_MD_PM_ERROR_MESSAGE_SEND","メッセージの送信に失敗しました");
-define("_MD_PM_ERROR_REQUIRED","{0}は必ず入力してください");
-define("_MD_PM_LANG_SUBJECTC","件名： ");
-define("_MD_PM_LANG_MESSAGE","メッセージ");
-define("_MD_PM_ERROR_ACCESS","アクセスエラーです");
-define("_MD_PM_LANG_MESSAGE_DETAIL","メッセージの詳細");
-
-?>
\ No newline at end of file
+?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:38:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:38:35 +0900
Subject: [xoops-cvslog 2223] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060204033835.113072AC0A0@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/UserModuleAction.class.php
diff -u xoops2jp/html/modules/user/class/UserModuleAction.class.php:1.1.2.1 xoops2jp/html/modules/user/class/UserModuleAction.class.php:removed
--- xoops2jp/html/modules/user/class/UserModuleAction.class.php:1.1.2.1	Fri Nov  4 19:10:36 2005
+++ xoops2jp/html/modules/user/class/UserModuleAction.class.php	Sat Feb  4 12:38:35 2006
@@ -1,56 +0,0 @@
-<?php
-
-class UserModuleAction
-{
-	function prepare()
-	{
-	}
-	
-	function isPermission()
-	{
-		return false;
-	}
-	
-	function isDependsOnActionForm()
-	{
-		return false;
-	}
-
-	/**
-	 */
-	function &getActionForm()
-	{
-	}
-	
-	/**
-	 * @return bool;
-	 */
-	function isSecure()
-	{
-		return false;
-	}
-	
-	function &getMasterForActionForm()
-	{
-		$dmy=null;
-		return $dmy;
-	}
-	
-	function doSuccess(&$actionForm,&$master)
-	{
-	}
-
-	function executePerformSuccessView(&$actionForm,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executePerformSuccessFail(&$actionForm,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeInitSuccessView(&$actionForm,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/class/UserModuleFrame.class.php
diff -u xoops2jp/html/modules/user/class/UserModuleFrame.class.php:1.1.2.2 xoops2jp/html/modules/user/class/UserModuleFrame.class.php:removed
--- xoops2jp/html/modules/user/class/UserModuleFrame.class.php:1.1.2.2	Tue Nov  8 18:57:00 2005
+++ xoops2jp/html/modules/user/class/UserModuleFrame.class.php	Sat Feb  4 12:38:35 2006
@@ -1,87 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionStrategy.class.php";
-
-define ("USER_MODULE_PERFORM_SUCCESS",1);
-define ("USER_MODULE_PERFORM_FAIL",2);
-define ("USER_MODULE_INIT_SUCCESS",3);
-
-class UserModuleFrame extends XCube_ActionStrategy
-{
-	var $mActionName="";
-	var $mAction;
-	
-	var $mActionForm=null;
-	
-	function UserModuleFrame(&$action)
-	{
-		$this->mAction=&$action;
-	}
-	
-	function prepare(&$controller)
-	{
-
-
-	}
-
-	function execute(&$controller)
-	{
-		global $xoopsTpl;
-
-		$xoopsUser=&$controller->getXoopsUser();
-		if($this->mAction->isSecure()&&!is_object($xoopsUser)){
-			XCube_Utils::redirectHeader(XOOPS_URL,1);
-		}
-		
-		$this->mAction->prepare($xoopsUser);
-		
-		if(!$this->mAction->isPermission($xoopsUser)) {
-			XCube_Utils::redirectHeader(XOOPS_URL,1);
-		}
-
-		$formFlag=USER_MODULE_INIT_SUCCESS;
-		$master=&$this->mAction->getMasterForActionForm();
-		if($this->mAction->isDependsOnActionForm()) {
-			$this->mActionForm=&$this->mAction->getActionForm();
-			$formFlag=$this->_processActionForm($master);
-		}
-
-		switch($formFlag) {
-			case USER_MODULE_PERFORM_SUCCESS:
-				$this->mAction->doSuccess($this->mActionForm,$master);
-				$this->mAction->executePerformSuccessView($this->mActionForm,$xoopsUser,$controller->mRenderSystem);
-				break;
-
-			case USER_MODULE_PERFORM_FAIL:
-				$this->mAction->executePerformFailView($this->mActionForm,$xoopsUser,$controller->mRenderSystem);
-				break;
-
-			case USER_MODULE_INIT_SUCCESS:
-				$this->mAction->executeInitSuccessView($this->mActionForm,$xoopsUser,$controller->mRenderSystem);
-				break;
-		}
-	}
-	
-	function _processActionForm(&$master)
-	{
-		$this->mActionForm->prepare();
-
-		if(xoops_getenv("REQUEST_METHOD")=="POST") {
-			$this->mActionForm->fetch();
-			$this->mActionForm->validate();
-			if($this->mActionForm->hasError()) {
-				return USER_MODULE_PERFORM_FAIL;
-			}
-			else {
-				$this->mActionForm->update($master);
-				return USER_MODULE_PERFORM_SUCCESS;
-			}
-		}
-		else {
-			$this->mActionForm->load($master);
-			return USER_MODULE_INIT_SUCCESS;
-		}
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:38:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:38:45 +0900
Subject: [xoops-cvslog 2224] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060204033845.19F5D2AC0A0@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/main.php
diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.10 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.11
--- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.10	Thu Feb  2 14:33:24 2006
+++ xoops2jp/html/modules/user/language/japanese/main.php	Sat Feb  4 12:38:44 2006
@@ -2,7 +2,7 @@
 
 define('_MD_USER_ERROR_AVATAR_EXTENSION', "許可されたファイル形式ではありません");
 define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "アバターのファイルサイズが許容サイズをオーバーしています");
-define('_MD_USER_ERROR_AVATAR_SELECT', "avatar select");
+define('_MD_USER_ERROR_AVATAR_SELECT', "ERROR - 指定したアバターは不正です");
 define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています");
 define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_MD_USER_ERROR_EMAIL_FORMAT', "不正なメールアドレスです");
@@ -10,8 +10,8 @@
 define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以下にして下さい");
 define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい");
 define('_MD_USER_ERROR_PASSWORD', "確認用パスワードが異なります");
-define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "パスワードは半角<b>{2}</b>文字以下にしてください。");
-define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "パスワードは半角<b>{1}</b>文字以上にしてください。");
+define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "パスワードは半角");
+define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "パスワードは半角");
 define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。");
 define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン");
@@ -20,13 +20,15 @@
 define('_MD_USER_LANG_AVATAR_DISPLAY', "表示");
 define('_MD_USER_LANG_AVATAR_EDIT', "アバター編集");
 define('_MD_USER_LANG_AVATAR_FILE', "ファイル");
+define('_MD_USER_LANG_AVATAR_HEIGHT', "高さ");
 define('_MD_USER_LANG_AVATAR_ID', "ID");
 define('_MD_USER_LANG_AVATAR_LIST', "使用可能アバター一覧");
 define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "最大ファイルサイズ");
-define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
+define('_MD_USER_LANG_AVATAR_MIMETYPE', "Mime Type");
 define('_MD_USER_LANG_AVATAR_NAME', "名前");
 define('_MD_USER_LANG_AVATAR_TYPE', "タイプ");
 define('_MD_USER_LANG_AVATAR_WEIGHT', "優先度");
+define('_MD_USER_LANG_AVATAR_WIDTH', "幅");
 define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "幅 x 高さ");
 define('_MD_USER_LANG_CONTROL', "操作");
 define('_MD_USER_LANG_CREATE_NEW', "新規作成");
@@ -36,7 +38,7 @@
 define('_MD_USER_LANG_RANK_ID', "ID");
 define('_MD_USER_LANG_SELECT', "選択");
 define('_MD_USER_LANG_SUBMIT', "送信");
-define('_MD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーンオフセット");
+define('_MD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
 define('_MD_USER_LANG_UID', "UID");
 define('_MD_USER_LANG_UNAME', "ユーザー名");
 define('_MD_USER_LANG_URL', "URL");
@@ -81,7 +83,7 @@
 define('_US_LOGGINGU', "%sさん、ようこそ。ログイン処理中です。");
 define('_US_LOGOUT', "ログアウト");
 define('_US_LOSTPASSWORD', "パスワードを紛失されましたか？");
-define('_US_MAILOK', "当サイトの新着情報などを<br />メールで受け取る");
+define('_US_MAILOK', "当サイトの新着情報などを");
 define('_US_MAILPWDNG', "mail_password: ユーザ情報の更新に失敗しました。お手数ですが、サイト管理者までお問合せください。");
 define('_US_MAXIMGSZ', "最大ファイルサイズ");
 define('_US_MAXPIXEL', "最大ピクセル数");
@@ -99,12 +101,12 @@
 define('_US_NICKNAMETOOLONG', "ユーザ名が長すぎます。半角 %s 文字以内に収めてください。");
 define('_US_NICKNAMETOOSHORT', "ユーザ名が短すぎます。半角 %s 文字以上にしてください。");
 define('_US_NO', "いいえ");
-define('_US_NOACTTPADM', "選択されたユーザはまだ存在しないか、承認が完了していません。<br />詳細についてはサイト管理者にお問合せください。");
+define('_US_NOACTTPADM', "選択されたユーザはまだ存在しないか、承認が完了していません。");
 define('_US_NOEDITRIGHT', "このユーザ情報を変更する権限がありません。");
 define('_US_NOPERMISS', "このユーザ情報を変更することはできません。");
 define('_US_NOPROBLEM', "ご心配なく。まずはあなたが登録に使用したメールアドレスを入力し、ボタンをクリックしてください。 パスワード取得用のリンクが記載されたメールがあなたの登録メールアドレス宛に送られます。");
 define('_US_NOREGISTER', "申し訳ございませんが、現在このサイトでは新規ユーザの登録受付を行っておりません。");
-define('_US_NOTREGISTERED', "今すぐ<a href='register.php'>登録</a>しませんか？");
+define('_US_NOTREGISTERED', "今すぐ登録？");
 define('_US_OCCUPATION', "職業");
 define('_US_OLDDELETED', "古いアバター画像は上書きされます。");
 define('_US_PASSNOTSAME', "パスワードが正しくありません。同じパスワードを二度入力してください。");
@@ -115,7 +117,7 @@
 define('_US_PROFILE', "プロフィール");
 define('_US_PROFUPDATED', "プロフィールを更新しました。");
 define('_US_PWDMAILED', "%sさん宛にパスワードを送信しました。");
-define('_US_PWDTOOSHORT', "パスワードは半角<b>%s</b>文字以上にしてください。");
+define('_US_PWDTOOSHORT', "パスワードは半角");
 define('_US_RANK', "ランク");
 define('_US_REALNAME', "本名");
 define('_US_REGISTERNG', "登録できませんでした");
Index: xoops2jp/html/modules/user/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.8 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.9
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.8	Thu Jan 19 21:09:31 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Sat Feb  4 12:38:44 2006
@@ -6,8 +6,8 @@
 define('_MI_USER_ADMENU_MAIL', "一斉メール送信");
 define('_MI_USER_ADMENU_NEW_RANK', "ユーザーランク新規登録");
 define('_MI_USER_ADMENU_RANK_LIST', "ユーザーランク管理");
-define('_MI_USER_ADMENU_SEARCH', "ユーザー一覧");
-define('_MI_USER_CONF_ACTV_ADMIN', "管理者が確認してアカウントを有効にする");
+define('_MI_USER_ADMENU_SEARCH', "ユーザー検索");
+define('_MI_USER_CONF_ACTV_ADMIN', "Activation by administrators");
 define('_MI_USER_CONF_ACTV_AUTO', "自動的にアカウントを有効にする");
 define('_MI_USER_CONF_ACTV_GROUP', "アカウント有効化依頼のメールの送信先グループ");
 define('_MI_USER_CONF_ACTV_GROUP_DESC', "「管理者が確認してアカウントを有効にする」設定になっている場合のみ有効です");
@@ -18,13 +18,13 @@
 define('_MI_USER_CONF_AVATAR_HEIGHT', "アバター画像の最大高さ(ピクセル)");
 define('_MI_USER_CONF_AVATAR_MAXSIZE', "アバター画像の最大ファイルサイズ(バイト)");
 define('_MI_USER_CONF_AVATAR_MINPOSTS', "アバターアップロード権を得るための発言数");
-define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "ユーザが自分で作成したアバターをアップロードするために必要な最低投稿数を設定してください。");
+define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "Enter the minimum number of posts required to upload a custom avatar.");
 define('_MI_USER_CONF_AVATAR_WIDTH', "アバター画像の最大幅(ピクセル)");
 define('_MI_USER_CONF_AVTR_ALLOW_UP', "アバター画像のアップロードを許可する");
 define('_MI_USER_CONF_BAD_EMAILS', "ユーザのemailアドレスとして使用できない文字列");
-define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は<b>|</b>で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。");
+define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は");
 define('_MI_USER_CONF_BAD_UNAMES', "ユーザ名として使用できない文字列");
-define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は<b>|</b>で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。");
+define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は");
 define('_MI_USER_CONF_CHGMAIL', "ユーザ自身のEmailアドレス変更を許可する");
 define('_MI_USER_CONF_DISCLAIMER', "利用許諾文");
 define('_MI_USER_CONF_DISCLAIMER_DESC', "ユーザの新規登録ページに表示する利用許諾文を入力してください。");
Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.16 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.17
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.16	Wed Feb  1 20:37:53 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Sat Feb  4 12:38:44 2006
@@ -1,126 +1,126 @@
-<?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_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_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_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_WEIGHT', "優先度");
-define('_AD_USER_LANG_BIO', "その他");
-define('_AD_USER_LANG_BODY', "本文");
-define('_AD_USER_LANG_BY_EMAIL', "by_email");
-define('_AD_USER_LANG_BY_PM', "by_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_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_LASTLOGIN', "最終ログイン");
-define('_AD_USER_LANG_LASTLOGIN_FLAG', "lastlogin_flag");
-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_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
-define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
-define('_AD_USER_LANG_OFF', "オフ");
-define('_AD_USER_LANG_ON', "オン");
-define('_AD_USER_LANG_PASS', "パスワード");
-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_REGISTDATE', "登録日時");
-define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
-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_TIMEZONE_OFFSET', "タイムゾーン");
-define('_AD_USER_LANG_UID', "UID");
-define('_AD_USER_LANG_UMODE', "コメント表示モード");
-define('_AD_USER_LANG_UNAME', "ユーザー名");
-define('_AD_USER_LANG_UORDER', "コメントの並び順");
-define('_AD_USER_LANG_URL', "ホームページ");
-define('_AD_USER_LANG_USER_AIM', "AIM");
-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_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', "ユーザーランクを保存しました");
-
-?>
+<?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_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_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_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_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_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_LASTLOGIN', "最終ログイン");
+define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
+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_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
+define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
+define('_AD_USER_LANG_OFF', "オフ");
+define('_AD_USER_LANG_ON', "オン");
+define('_AD_USER_LANG_PASS', "パスワード");
+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_REGISTDATE', "登録日時");
+define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
+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_TIMEZONE_OFFSET', "タイムゾーン");
+define('_AD_USER_LANG_UID', "UID");
+define('_AD_USER_LANG_UMODE', "コメント表示モード");
+define('_AD_USER_LANG_UNAME', "ユーザー名");
+define('_AD_USER_LANG_UORDER', "コメントの並び順");
+define('_AD_USER_LANG_URL', "ホームページ");
+define('_AD_USER_LANG_USER_AIM', "AIM");
+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', "Receive occasional email notices from administrators and moderators?");
+define('_AD_USER_LANG_USER_MSNM', "MSNM");
+define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録");
+define('_AD_USER_LANG_USER_OCC', "職業");
+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', "ユーザーランクを保存しました");
+
+?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:38:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:38:45 +0900
Subject: [xoops-cvslog 2225] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060204033845.40EC82AC0A9@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.8 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.9
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.8	Wed Feb  1 20:38:06 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Sat Feb  4 12:38:45 2006
@@ -1,92 +1,92 @@
 <?php
 
 define('_AD_USER_ERROR_AVATAR_EXTENSION', "A injury file is uploaded.");
-define('_AD_USER_ERROR_DBUPDATE_FAILED', "Updating database is failure.");
+define('_AD_USER_ERROR_DBUPDATE_FAILED', "Database update failed");
 define('_AD_USER_ERROR_GROUP_VALUE', "Specified group value is wrong.");
-define('_AD_USER_ERROR_IMAGE_REQUIRED', "Image file is required");
-define('_AD_USER_ERROR_INJURY', "{0} is wrong.");
-define('_AD_USER_ERROR_INJURY_MIN_MAX', "minimum value and maximum value is wrong.");
-define('_AD_USER_ERROR_INJURY_SPECIAL', "The special rank is wrong");
-define('_AD_USER_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
-define('_AD_USER_ERROR_MIN', "Input {0} with over {1} characters.");
-define('_AD_USER_ERROR_NO_UPLOAD_FILE', "Upload the image file for this rank.");
-define('_AD_USER_ERROR_PASSWORD', "Password and confrim password is difference.");
+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_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_AD_USER_ERROR_MIN', "Input {0} with {1} or more characters.");
+define('_AD_USER_ERROR_NO_UPLOAD_FILE', "Upload a image file for this rank.");
+define('_AD_USER_ERROR_PASSWORD', "The passwords you gave did not match.");
 define('_AD_USER_ERROR_PASSWORD_REQUIRED', "Password is required.");
-define('_AD_USER_ERROR_RAISE_ERROR', "Raise error.");
+define('_AD_USER_ERROR_RAISE_ERROR', "Raise an error(s).");
 define('_AD_USER_ERROR_REQUIRED', "{0} is required.");
-define('_AD_USER_ERROR_UMODE', "Comment sort is wrong.");
-define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "Uname is no unique.");
-define('_AD_USER_ERROR_WRONG_FORMAT', "Your format is wrong.");
+define('_AD_USER_ERROR_UMODE', "The specified value for comment sort order is invalid.");
+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_ATTACHSIG', "Always attach my signature");
 define('_AD_USER_LANG_AVATAR_CREATED', "Created");
-define('_AD_USER_LANG_AVATAR_DELETE', "avatar delete");
+define('_AD_USER_LANG_AVATAR_DELETE', "Delete avatar");
 define('_AD_USER_LANG_AVATAR_DISPLAY', "Display");
-define('_AD_USER_LANG_AVATAR_EDIT', "avatar edit");
+define('_AD_USER_LANG_AVATAR_EDIT', "Edit avatar");
 define('_AD_USER_LANG_AVATAR_FILE', "File");
 define('_AD_USER_LANG_AVATAR_ID', "ID");
 define('_AD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
 define('_AD_USER_LANG_AVATAR_NAME', "Name");
-define('_AD_USER_LANG_AVATAR_NEW', "avatar new");
+define('_AD_USER_LANG_AVATAR_NEW', "Add an avatar");
 define('_AD_USER_LANG_AVATAR_TYPE', "Type");
 define('_AD_USER_LANG_AVATAR_WEIGHT', "Weight");
-define('_AD_USER_LANG_BIO', "bio");
-define('_AD_USER_LANG_BODY', "body");
-define('_AD_USER_LANG_BY_EMAIL', "by_email");
-define('_AD_USER_LANG_BY_PM', "by_pm");
+define('_AD_USER_LANG_BIO', "Others");
+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_CONTROL', "Control");
 define('_AD_USER_LANG_CREATE_NEW', "Create new");
 define('_AD_USER_LANG_CUSTOM_AVATAR', "Custom avatar");
-define('_AD_USER_LANG_DELETE_RANK', "Delete rank");
+define('_AD_USER_LANG_DELETE_RANK', "Delete a rank");
 define('_AD_USER_LANG_EDIT', "Edit");
-define('_AD_USER_LANG_EMAIL', "Email");
-define('_AD_USER_LANG_GROUP', "User lang group");
+define('_AD_USER_LANG_EMAIL', "Email address");
+define('_AD_USER_LANG_GROUP', "Group");
 define('_AD_USER_LANG_GROUP_AMMO', "Count");
-define('_AD_USER_LANG_GROUP_ASSIGN', "Assign member");
-define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "The member list of this group");
+define('_AD_USER_LANG_GROUP_ASSIGN', "Assign a member");
+define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "Member list of this group");
 define('_AD_USER_LANG_GROUP_DELETE', "Delelete group");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "Delete <b>_%s_</b>, OK?");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "If you delete group, the member of it are never deleted.");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "Delete ");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "When you delete a group, user accounts of the group would not be deleted.");
 define('_AD_USER_LANG_GROUP_DESC', "Description");
-define('_AD_USER_LANG_GROUP_EDIT', "Edit group");
+define('_AD_USER_LANG_GROUP_EDIT', "Edit groups");
 define('_AD_USER_LANG_GROUP_GID', "GID");
-define('_AD_USER_LANG_GROUP_LIST', "Group list");
+define('_AD_USER_LANG_GROUP_LIST', "Group Management");
 define('_AD_USER_LANG_GROUP_NAME', "Name");
-define('_AD_USER_LANG_GROUP_NEW', "Add new group");
-define('_AD_USER_LANG_GROUP_NOASSIN_MEMBERS', "The un-member list of this group");
+define('_AD_USER_LANG_GROUP_NEW', "Add a new group");
+define('_AD_USER_LANG_GROUP_NOASSIN_MEMBERS', "Non-member users list of this group");
 define('_AD_USER_LANG_GROUP_PERMISSION', "Permission");
 define('_AD_USER_LANG_GROUP_PROPERTY', "Property");
 define('_AD_USER_LANG_GROUP_TYPE', "Type");
 define('_AD_USER_LANG_GROUPID', "Group ID");
 define('_AD_USER_LANG_ID', "ID");
 define('_AD_USER_LANG_LASTLOGIN', "Last login");
-define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last login Flag");
+define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
 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_NOTIFY_METHOD', "Method of receiving event notice");
-define('_AD_USER_LANG_NOTIFY_MODE', "Timing of receiving event notice");
+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");
 define('_AD_USER_LANG_ON', "On");
 define('_AD_USER_LANG_PASS', "Password");
 define('_AD_USER_LANG_PERM_ACCESS', "Access");
-define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Access permission admin");
-define('_AD_USER_LANG_PERM_ADMIN', "Admin");
-define('_AD_USER_LANG_PERM_BLOCK_ACCESS', "Access block permission");
-define('_AD_USER_LANG_PERM_GROUP_PERM_BLOCK', "Block admin");
-define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "Module admin");
-define('_AD_USER_LANG_PERM_MODULE_ACCESS', "Ssytem/module admin permission");
-define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "System admin");
+define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Privilege of access control");
+define('_AD_USER_LANG_PERM_ADMIN', "Administration");
+define('_AD_USER_LANG_PERM_BLOCK_ACCESS', "Permisson to access blocks");
+define('_AD_USER_LANG_PERM_GROUP_PERM_BLOCK', "Block Administration");
+define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "Module Administration");
+define('_AD_USER_LANG_PERM_MODULE_ACCESS', "Privilege of System/module administration");
+define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "System administration");
 define('_AD_USER_LANG_POSTS', "Posts");
 define('_AD_USER_LANG_RANK', "Rank");
-define('_AD_USER_LANG_RANK_EDIT', "Edit rank");
+define('_AD_USER_LANG_RANK_EDIT', "Edit user rank");
 define('_AD_USER_LANG_RANK_ID', "ID");
 define('_AD_USER_LANG_RANK_IMAGE', "Image");
-define('_AD_USER_LANG_RANK_LIST', "User rank admin");
+define('_AD_USER_LANG_RANK_LIST', "User rank administration");
 define('_AD_USER_LANG_RANK_MAX', "Maximum posts");
 define('_AD_USER_LANG_RANK_MIN', "Minimum posts");
-define('_AD_USER_LANG_RANK_NEW', "Add new rank");
+define('_AD_USER_LANG_RANK_NEW', "Add a new rank");
 define('_AD_USER_LANG_RANK_SPECIAL', "Special rank");
 define('_AD_USER_LANG_RANK_TITLE', "Title");
 define('_AD_USER_LANG_REGDATE', "Registered date");
@@ -96,31 +96,31 @@
 define('_AD_USER_LANG_SUBJECT', "Subject");
 define('_AD_USER_LANG_SUBMIT', "Submit");
 define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar");
-define('_AD_USER_LANG_TIMEZONE_OFFSET', "Timezone offset");
+define('_AD_USER_LANG_TIMEZONE_OFFSET', "TimeZone");
 define('_AD_USER_LANG_UID', "UID");
-define('_AD_USER_LANG_UMODE', "umode");
+define('_AD_USER_LANG_UMODE', "Comments Display Mode");
 define('_AD_USER_LANG_UNAME', "User name");
-define('_AD_USER_LANG_UORDER', "uorder");
-define('_AD_USER_LANG_URL', "url");
+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_DELETE', "Delete user");
-define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete <b>_%s_</b>, OK?");
-define('_AD_USER_LANG_USER_EDIT', "Edit user");
-define('_AD_USER_LANG_USER_FROM', "user_from");
+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");
+define('_AD_USER_LANG_USER_FROM', "Location");
 define('_AD_USER_LANG_USER_ICQ', "ICQ");
-define('_AD_USER_LANG_USER_INTREST', "user_intrest");
-define('_AD_USER_LANG_USER_LIST', "User admin");
+define('_AD_USER_LANG_USER_INTREST', "Interest");
+define('_AD_USER_LANG_USER_LIST', "User administration");
 define('_AD_USER_LANG_USER_MAILOK', "user_mailok");
-define('_AD_USER_LANG_USER_MSNM', "user_msnm");
-define('_AD_USER_LANG_USER_NEW', "Add new user");
-define('_AD_USER_LANG_USER_OCC', "user_occ");
-define('_AD_USER_LANG_USER_SIG', "user_sig");
-define('_AD_USER_LANG_USER_VIEWEMAIL', "user_viewemail");
-define('_AD_USER_LANG_USER_YIM', "user_yim");
-define('_AD_USER_LANG_VPASS', "vpass");
-define('_AD_USER_MESSAGE_CONFIRM_DELETE', "confirm delete");
-define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you dekete this rank?");
-define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "Delete the specified rank.");
-define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "Save the rank.");
+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_SIG', "Signature");
+define('_AD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address.");
+define('_AD_USER_LANG_USER_YIM', "YIM");
+define('_AD_USER_LANG_VPASS', "Verify password");
+define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?");
+define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you delete the user rank?");
+define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "The user rank has been deleted.");
+define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "The user rank has been saved.");
 
 ?>
Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.9 xoops2jp/html/modules/user/language/english/main.php:1.1.2.10
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.9	Thu Feb  2 14:33:24 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Sat Feb  4 12:38:45 2006
@@ -1,32 +1,34 @@
 <?php
 
-define('_MD_USER_ERROR_AVATAR_EXTENSION', "Uploaded file's extension is not allowed");
-define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "Avatar maxfilesize");
-define('_MD_USER_ERROR_AVATAR_SELECT', "avatar select");
-define('_MD_USER_ERROR_AVATAR_SIZE', "avatar size");
-define('_MD_USER_ERROR_DBUPDATE_FAILED', "Updating database is fail.");
-define('_MD_USER_ERROR_EMAIL_FORMAT', "Email is wrong.");
-define('_MD_USER_ERROR_INTRANGE', "{0} is wrong.");
-define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with under {1} characters.");
-define('_MD_USER_ERROR_MINLENGTH', "Input {0} with over {1} characters.");
-define('_MD_USER_ERROR_PASSWORD', "Confirm password is difference.");
-define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with under {2} characters.");
-define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with over {2} characters.");
+define('_MD_USER_ERROR_AVATAR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
+define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "Uploaded file exceeds the file size limit for avatar.");
+define('_MD_USER_ERROR_AVATAR_SELECT', "ERROR - Please select valid avatar.");
+define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar.");
+define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database");
+define('_MD_USER_ERROR_EMAIL_FORMAT', "Incorrect email address");
+define('_MD_USER_ERROR_INTRANGE', "Incorrect input on {0}.");
+define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters.");
+define('_MD_USER_ERROR_PASSWORD', "Incorrect Password");
+define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with {2} or less characters.");
+define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with {2} or more characters.");
 define('_MD_USER_ERROR_REQUIRED', "{0} is required.");
-define('_MD_USER_ERROR_SEND_MAIL', "send mail");
-define('_MD_USER_ERROR_TIMEZONE', "Timezone");
+define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator.");
+define('_MD_USER_ERROR_TIMEZONE', "TimeZone");
 define('_MD_USER_LANG_AVATAR', "Avatar");
 define('_MD_USER_LANG_AVATAR_CREATED', "Created");
 define('_MD_USER_LANG_AVATAR_DISPLAY', "Display");
 define('_MD_USER_LANG_AVATAR_EDIT', "avatar edit");
-define('_MD_USER_LANG_AVATAR_FILE', "File");
+define('_MD_USER_LANG_AVATAR_FILE', "Image file");
+define('_MD_USER_LANG_AVATAR_HEIGHT', "Height");
 define('_MD_USER_LANG_AVATAR_ID', "ID");
 define('_MD_USER_LANG_AVATAR_LIST', "avatar list");
-define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Maxfilesize");
-define('_MD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
+define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Max file size");
+define('_MD_USER_LANG_AVATAR_MIMETYPE', "Mime Type");
 define('_MD_USER_LANG_AVATAR_NAME', "Name");
 define('_MD_USER_LANG_AVATAR_TYPE', "Type");
 define('_MD_USER_LANG_AVATAR_WEIGHT', "Weight");
+define('_MD_USER_LANG_AVATAR_WIDTH', "Width");
 define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "avatar width hight");
 define('_MD_USER_LANG_CONTROL', "Control");
 define('_MD_USER_LANG_CREATE_NEW', "Create new");
@@ -36,17 +38,17 @@
 define('_MD_USER_LANG_RANK_ID', "ID");
 define('_MD_USER_LANG_SELECT', "Select");
 define('_MD_USER_LANG_SUBMIT', "Submit");
-define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone offset");
+define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone");
 define('_MD_USER_LANG_UID', "UID");
 define('_MD_USER_LANG_UNAME', "uname");
 define('_MD_USER_LANG_URL', "URL");
 define('_MD_USER_MESSAGE_CONFIRM_DELETE', "Do you delete the following data?");
 define('_US_ACONTACT', "Selected account is already activated!");
-define('_US_ACTKEYNOT', "Activation key not correct!");
+define('_US_ACTKEYNOT', "Activation key is not correct!");
 define('_US_ACTLOGIN', "Your account has been activated. Please login with the registered password.");
 define('_US_ACTVMAILNG', "Failed sending notification mail to %s");
 define('_US_ACTVMAILOK', "Notification mail to %s sent.");
-define('_US_ADMINNO', "User in the webmasters group cannot be removed");
+define('_US_ADMINNO', "User in the webmasters group cannot be removed.");
 define('_US_AIM', "AIM");
 define('_US_ALLABOUT', "All about %s");
 define('_US_ALLOWVIEWEMAIL', "Allow other users to view my email address");
@@ -55,7 +57,7 @@
 define('_US_BEENDELED', "Your account has been deleted.");
 define('_US_CDISPLAYMODE', "Comments Display Mode");
 define('_US_CHOOSEAVT', "Choose avatar from the available list");
-define('_US_CONFMAIL', "Confirmation Mail for %s mailed.");
+define('_US_CONFMAIL', "Confirmation Mail for %s has been sent.");
 define('_US_CSORTORDER', "Comments Sort Order");
 define('_US_DELACCOUNT', "Delete Account");
 define('_US_DISCLAIMER', "Disclaimer");
@@ -71,9 +73,9 @@
 define('_US_IAGREE', "I agree to the above");
 define('_US_ICQ', "ICQ");
 define('_US_INBOX', "Inbox");
-define('_US_INCORRECTLOGIN', "Incorrect Login!");
+define('_US_INCORRECTLOGIN', "Invalid Login!");
 define('_US_INTEREST', "Interest");
-define('_US_INVALIDMAIL', "ERROR: Invalid email");
+define('_US_INVALIDMAIL', "ERROR: Invalid email address");
 define('_US_INVALIDNICKNAME', "ERROR: Invalid Username");
 define('_US_LASTLOGIN', "Last Login");
 define('_US_LOCATION', "Location");
@@ -81,7 +83,7 @@
 define('_US_LOGGINGU', "Thank you for logging in, %s.");
 define('_US_LOGOUT', "Logout");
 define('_US_LOSTPASSWORD', "Lost your Password?");
-define('_US_MAILOK', "Receive occasional email notices <br />from administrators and moderators?");
+define('_US_MAILOK', "Receive occasional email notices ");
 define('_US_MAILPWDNG', "mail_password: could not update user entry. Contact the Administrator");
 define('_US_MAXIMGSZ', "Max Image Size (Bytes)");
 define('_US_MAXPIXEL', "Max Pixels");
@@ -90,21 +92,21 @@
 define('_US_MSNM', "MSNM");
 define('_US_MYAVATAR', "My Avatar");
 define('_US_MYINFO', "My Info");
-define('_US_NAMERESERVED', "ERROR: Name is reserved.");
+define('_US_NAMERESERVED', "ERROR: Username is reserved.");
 define('_US_NEWPWDREQ', "New Password Request at %s");
 define('_US_NEWUSERREGAT', "New user registration at %s");
 define('_US_NICKNAME', "Username");
 define('_US_NICKNAMENOSPACES', "There cannot be any spaces in the Username.");
-define('_US_NICKNAMETAKEN', "ERROR: Username taken.");
-define('_US_NICKNAMETOOLONG', "Username is too long. It must be less than %s characters.");
-define('_US_NICKNAMETOOSHORT', "Username is too short. It must be more than %s characters.");
+define('_US_NICKNAMETAKEN', "ERROR: Username has been taken.");
+define('_US_NICKNAMETOOLONG', "Username is too long. It must be %s or less characters.");
+define('_US_NICKNAMETOOSHORT', "Username is too short. It must be %s or more characters.");
 define('_US_NO', "No");
-define('_US_NOACTTPADM', "The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.");
-define('_US_NOEDITRIGHT', " us noeditright");
-define('_US_NOPERMISS', "Sorry, you dont have the permission to perform this action!");
+define('_US_NOACTTPADM', "The selected user has been deactivated or has not been activated yet.");
+define('_US_NOEDITRIGHT', "You do not have permisson to edit this account.");
+define('_US_NOPERMISS', "Sorry, you do not have the permission to perform this action!");
 define('_US_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account.");
-define('_US_NOREGISTER', "Sorry, we are currently closed for new user registrations");
-define('_US_NOTREGISTERED', "Not registered?  Click <a href=");
+define('_US_NOREGISTER', "Sorry, we are currently closed for new user registrations.");
+define('_US_NOTREGISTERED', "Not registered?");
 define('_US_OCCUPATION', "Occupation");
 define('_US_OLDDELETED', "Your old avatar will be deleted!");
 define('_US_PASSNOTSAME', "Both passwords are different. They must be identical.");
@@ -114,15 +116,15 @@
 define('_US_PRESSLOGIN', "Press the button below to login");
 define('_US_PROFILE', "Profile");
 define('_US_PROFUPDATED', "Your Profile Updated!");
-define('_US_PWDMAILED', "Password for %s mailed.");
-define('_US_PWDTOOSHORT', "Sorry, your password must be at least <b>%s</b> characters long.");
+define('_US_PWDMAILED', "Password for %s has been sent.");
+define('_US_PWDTOOSHORT', "Sorry, your password must be at least ");
 define('_US_RANK', "Rank");
 define('_US_REALNAME', "Real Name");
 define('_US_REGISTERNG', "Could not register new user.");
-define('_US_REMOVEINFO', "This will remove all your info from our database.");
+define('_US_REMOVEINFO', "This will remove all your information from our database.");
 define('_US_SAVECHANGES', "Save Changes");
 define('_US_SELECTNG', "No User Selected! Please go back and try again.");
-define('_US_SELFILE', "Select file");
+define('_US_SELFILE', "Select a file");
 define('_US_SENDPASSWORD', "Send Password");
 define('_US_SHOWALL', "Show All");
 define('_US_SHOWSIG', "Always attach my signature");
@@ -132,7 +134,7 @@
 define('_US_SUBMIT', "Submit");
 define('_US_SURETODEL', "Are you sure you want to delete your account?");
 define('_US_THANKYOUFORVISIT', "Thank you for your visit to our site!");
-define('_US_TIMEZONE', "Time Zone");
+define('_US_TIMEZONE', "TimeZone");
 define('_US_TYPEPASSTWICE', "(type a new password twice to change it)");
 define('_US_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered.");
 define('_US_UPLOADMYAVATAR', "Upload Avatar");
Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.5 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.6
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.5	Thu Feb  2 18:36:33 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Sat Feb  4 12:38:45 2006
@@ -1,46 +1,47 @@
 <?php
 
-define('_MI_USER_ADMENU_AVATAR_MANAGE', "Avatar manage");
-define('_MI_USER_ADMENU_GROUP_LIST', "User admenu group list");
-define('_MI_USER_ADMENU_LIST', "User admenu list");
-define('_MI_USER_ADMENU_MAIL', "mail");
-define('_MI_USER_ADMENU_NEW_RANK', "User admenu new rank");
-define('_MI_USER_ADMENU_RANK_LIST', "User admenu rank list");
-define('_MI_USER_ADMENU_SEARCH', "User admenu search");
+define('_MI_USER_ADMENU_AVATAR_MANAGE', "Avatar Management");
+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_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_CONF_ACTV_ADMIN', "User conf actv admin");
-define('_MI_USER_CONF_ACTV_AUTO', "User conf actv auto");
-define('_MI_USER_CONF_ACTV_GROUP', "User conf actv group");
-define('_MI_USER_CONF_ACTV_GROUP_DESC', "User conf actv group desc");
-define('_MI_USER_CONF_ACTV_TYPE', "User conf actv type");
-define('_MI_USER_CONF_ACTV_USER', "User conf actv user");
-define('_MI_USER_CONF_ALLOW_REGISTER', "User conf allow register");
-define('_MI_USER_CONF_ALLOW_REGISTER_DESC', "User conf allow register desc");
-define('_MI_USER_CONF_AVATAR_HEIGHT', "User conf avatar height");
-define('_MI_USER_CONF_AVATAR_MAXSIZE', "User conf avatar maxsize");
-define('_MI_USER_CONF_AVATAR_MINPOSTS', "User conf avatar minposts");
+define('_MI_USER_CONF_ACTV_AUTO', "Activate automatically");
+define('_MI_USER_CONF_ACTV_GROUP', "Select a group to which activation mail will be sent");
+define('_MI_USER_CONF_ACTV_GROUP_DESC', "Valid only when 'Activation by administrators' is selected.");
+define('_MI_USER_CONF_ACTV_TYPE', "Select activation type of newly registered users");
+define('_MI_USER_CONF_ACTV_USER', "Require activation by user");
+define('_MI_USER_CONF_ALLOW_REGISTER', "Allow new user registration?");
+define('_MI_USER_CONF_ALLOW_REGISTER_DESC', "Select yes to accept new user registration.");
+define('_MI_USER_CONF_AVATAR_HEIGHT', "Avatar image max height (pixel)");
+define('_MI_USER_CONF_AVATAR_MAXSIZE', "Avatar image max filesize (byte)");
+define('_MI_USER_CONF_AVATAR_MINPOSTS', "Minimum posts required");
 define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "User conf avatar minposts desc");
-define('_MI_USER_CONF_AVATAR_WIDTH', "User conf avatar width");
-define('_MI_USER_CONF_AVTR_ALLOW_UP', "User conf avtr allow up");
-define('_MI_USER_CONF_BAD_EMAILS', "User conf bad emails");
-define('_MI_USER_CONF_BAD_EMAILS_DESC', "User conf bad emails desc");
-define('_MI_USER_CONF_BAD_UNAMES', "User conf bad unames");
-define('_MI_USER_CONF_BAD_UNAMES_DESC', "User conf bad unames desc");
-define('_MI_USER_CONF_CHGMAIL', "User conf chgmail");
-define('_MI_USER_CONF_DISCLAIMER', "User conf disclaimer");
-define('_MI_USER_CONF_DISCLAIMER_DESC', "User conf disclaimer desc");
-define('_MI_USER_CONF_DISPDSCLMR', "User conf dispdsclmr");
-define('_MI_USER_CONF_DISPDSCLMR_DESC', "User conf dispdsclmr desc");
-define('_MI_USER_CONF_MAXUNAME', "User conf maxuname");
-define('_MI_USER_CONF_MINPASS', "User conf minpass");
-define('_MI_USER_CONF_MINUNAME', "User conf minuname");
-define('_MI_USER_CONF_NEW_NTF_GROUP', "User conf new ntf group");
-define('_MI_USER_CONF_NEW_USER_NOTIFY', "User conf new user notify");
-define('_MI_USER_CONF_SELF_DELETE', "User conf self delete");
-define('_MI_USER_CONF_UNAME_TEST_LEVEL', "User conf uname test level");
-define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "User conf uname test level normal");
-define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "User conf uname test level strong");
-define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "User conf uname test level weak");
+define('_MI_USER_CONF_AVATAR_WIDTH', "Avatar image max width (pixel)");
+define('_MI_USER_CONF_AVTR_ALLOW_UP', "Allow custom avatar upload?");
+define('_MI_USER_CONF_BAD_EMAILS', "Enter emails that should not be used in user profile");
+define('_MI_USER_CONF_BAD_EMAILS_DESC', "Separate each with a |, case insensitive, regex enabled.");
+define('_MI_USER_CONF_BAD_UNAMES', "Enter names that should not be selected as username
+");
+define('_MI_USER_CONF_BAD_UNAMES_DESC', "Separate each with a |, case insensitive, regex enabled.");
+define('_MI_USER_CONF_CHGMAIL', "Allow users to change email address?");
+define('_MI_USER_CONF_DISCLAIMER', "Registration disclaimer");
+define('_MI_USER_CONF_DISCLAIMER_DESC', "Enter text to be displayed as registration disclaimer.");
+define('_MI_USER_CONF_DISPDSCLMR', "Display disclaimer?");
+define('_MI_USER_CONF_DISPDSCLMR_DESC', "Select yes to display disclaimer in registration page");
+define('_MI_USER_CONF_MAXUNAME', "Maximum length of username");
+define('_MI_USER_CONF_MINPASS', "Minimum length of password required");
+define('_MI_USER_CONF_MINUNAME', "Minimum length of username required");
+define('_MI_USER_CONF_NEW_NTF_GROUP', "Select a group to which new user notification mail will be sent");
+define('_MI_USER_CONF_NEW_USER_NOTIFY', "Notify by mail when a new user is registered?");
+define('_MI_USER_CONF_SELF_DELETE', "Allow users to delete own account?");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL', "Select the level of strictness for username filtering");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "Medium");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "Strict (Only alphabets and numbers)");
+define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "Light (Allow 2byte characters)");
 define('_MI_USER_NAME', "User module");
-define('_MI_USER_NAME_DESC', "This module works about user accounts");
+define('_MI_USER_NAME_DESC', "This module manages user account.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 12:47:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 12:47:49 +0900
Subject: [xoops-cvslog 2226] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060204034749.E0C572AC0A3@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.6 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.6	Fri Dec 30 17:23:24 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Sat Feb  4 12:47:49 2006
@@ -31,6 +31,10 @@
 		$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;
 		}

From minahito ＠ users.sourceforge.jp  Sat Feb  4 13:26:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 13:26:46 +0900
Subject: [xoops-cvslog 2227] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060204042646.47BE62AC02B@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.12 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.13
--- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.12	Sat Feb  4 12:37:48 2006
+++ xoops2jp/html/modules/legacyRender/language/english/admin.php	Sat Feb  4 13:26:46 2006
@@ -64,6 +64,6 @@
 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.");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2', "Do you change template set for your site. To select template set, click 'Select' button. To learn more details, read the help.");
-define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.");
+define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.<br/> Do you think your site theme should be selectable by users?  Add themes to theme selection block with checking checkboxes. To learn more details, read the help.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 13:26:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 13:26:46 +0900
Subject: [xoops-cvslog 2228] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060204042646.6C0D42AC050@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.13 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.14
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.13	Sat Feb  4 12:37:55 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php	Sat Feb  4 13:26:46 2006
@@ -62,6 +62,6 @@
 define('_AD_LEGACYRENDER_MESSAGE_NO_PACKAGE', "パッケージ情報なし");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1', "まず、デフォルトのテンプレートセットの複製を作成し、テンプレートを変更してサイトをカスタマイズしましょう。詳しくはヘルプをご覧ください。");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2', "サイトに適用するテンプレートセットを変更しますか？　選択ボタンを押して、テンプレートセットを選びましょう。詳しくはヘルプをご覧ください。");
-define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。");
+define('_AD_LEGACYRENDER_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。<br/>ユーザーにテーマを選択させたいですか？　チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 14:43:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 14:43:19 +0900
Subject: [xoops-cvslog 2229] CVS update: xoops2jp/html/class
Message-ID: <20060204054319.B42E22AC049@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_EventManager.class.php
diff -u xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.6 xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.7
--- xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.6	Fri Jan 27 23:38:08 2006
+++ xoops2jp/html/class/XCube_EventManager.class.php	Sat Feb  4 14:43:19 2006
@@ -1,160 +1,161 @@
-<?php
-
-require_once XOOPS_ROOT_PATH."/class/XCube_Event.class.php";
-
-/**
- * This class manages plural events.
- * This class supports substitute registration for speedup.
- */
-class XCube_EventManager
-{
-	var $_mEvents=array();
-
-	var $_mReserveEventList=array();
-	var $_mRegistedFlags=array();
-	var $_mProxyRegisters=array();
-	
-	function XCube_EventManager()
-	{
-	}
-	
-	function prepare()
-	{
-	}
-	
-	function add($eventName,&$delegate)
-	{
-		if(!isset($this->_mEvents[$eventName]))
-			$this->_mEvents[$eventName] = new XCube_Event($eventName);
-
-		$this->_mEvents[$eventName]->add($delegate);
-	}
-	
-	function setAnchorDelegate($eventName,&$delegate)
-	{
-		if(!isset($this->_mEvents[$eventName]))
-			$this->_mEvents[$eventName] = new XCube_Event($eventName);
-
-		$this->_mEvents[$eventName]->setAnchorDelegate($delegate);
-	}
-	
-	function replaceEvent($eventName,&$eventHandler)
-	{
-		if(isset($this->_mEvents[$eventName])) {
-			if(strtolower(get_class($this->_mEvents[$eventName]))=="xcube_event") {
-				//
-				// TODO : omg! We access private property.
-				//
-				foreach($this->_mEvents[$eventName]->_mDelegates as $delegate) {
-					$eventHandler->_mDelegates[]=$delegate;
-					unset($delegate);
-				}
-				unset($this->_mEvents[$eventName]);
-				$this->_mEvents[$eventName]=&$eventHandler;
-			}
-		}
-		else {
-			$this->_mEvents[$eventName]=&$eventHandler;
-		}
-	}
-
-	function raiseEvent($eventName,&$sender,&$eventArgs)
-	{
-		if(isset($this->_mReserveEventList[$eventName])&&$this->_mRegistedFlags[$eventName]==false) {
-			$this->_processProxyRegist($eventName);
-		}
-		
-		if(isset($this->_mEvents[$eventName])) {
-			$this->_mEvents[$eventName]->raiseEvent($sender,$eventArgs);
-
-			return true;
-		}
-		return false;
-	}
-
-	function addProxyRegister(&$register)
-	{
-		$i=count($this->_mProxyRegisters)+1;
-		$this->_mProxyRegisters[$i]=&$register;
-		
-		$list=$register->getEventNameList();
-		foreach($list as $name) {
-			if(!isset($this->_mReserveEventList[$name])) {
-				$this->_mReserveEventList[$name]=array();
-				$this->_mRegistedFlags[$name]=false;
-			}
-
-			$this->_mReserveEventList[$name][]=$i;
-		}
-	}
-	
-	function _processProxyRegist($eventName)
-	{
-		$this->_mRegistedFlags[$eventName]=true;
-		foreach($this->_mReserveEventList[$eventName] as $i) {
-			$this->add($eventName,$this->_mProxyRegisters[$i]->createDelegate($eventName));
-		}
-	}
-}
-
-/**
- * This class tells a manager about a list of the event that the Delegate which this class can create.
- * And this class creates Delegate when the manager needs Delegate.
- * Developer does not need to use this by all means.
- */
-class XCube_EventProxyRegister
-{
-	/**
-	 * @return array
-	 */
-	function getEventNameList()
-	{
-	}
-	
-	function &createDelegate($name)
-	{
-		$ret =null;
-		$methodName=str_replace(".","_","create".ucfirst($name)."Delegate");
-		if(method_exists($this,$methodName)) {
-			$ret=&call_user_func(array($this,$methodName));
-		}
-
-		return $ret;
-	}
-}
-
-/**
-  *
-  * Static Utility methods for XCube_EventManager
-  *
-  */
-class XCube_EventUtils
-{
-    /**
-    Simple Raise Event method;
-    */
-    function &quickRaiseEvent($event, $eventArgs = array())
-    {
-        $root=&XCube_Root::getSingleton();
-        if ($root->mEventManager->raiseEvent($event, $root->mController, $eventArgs)) {
-            return $eventArgs;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    Simple Text Filterling with Event mechanism
-    */
-    function quickApplyFilter($filter, $string, $optionArgs = array())
-    {
-        $root=&XCube_Root::getSingleton();
-        $eventArgs = array_merge(array('string' => $string), $optionArgs);
-        if ($root->mEventManager->raiseEvent($filter, $root->mController, $eventArgs)) {
-            return $eventArgs['string'];
-        } else {
-            return $string;
-        }
-    }
-}
+<?php
+
+require_once XOOPS_ROOT_PATH."/class/XCube_Event.class.php";
+
+/**
+ * This class manages plural events.
+ * This class supports substitute registration for speedup.
+ */
+class XCube_EventManager
+{
+	var $_mEvents=array();
+
+	var $_mReserveEventList=array();
+	var $_mRegistedFlags=array();
+	var $_mProxyRegisters=array();
+	
+	function XCube_EventManager()
+	{
+	}
+	
+	function prepare()
+	{
+	}
+	
+	function add($eventName,&$delegate)
+	{
+		if(!isset($this->_mEvents[$eventName]))
+			$this->_mEvents[$eventName] = new XCube_Event($eventName);
+
+		$this->_mEvents[$eventName]->add($delegate);
+	}
+	
+	function setAnchorDelegate($eventName,&$delegate)
+	{
+		if(!isset($this->_mEvents[$eventName]))
+			$this->_mEvents[$eventName] = new XCube_Event($eventName);
+
+		$this->_mEvents[$eventName]->setAnchorDelegate($delegate);
+	}
+	
+	function replaceEvent($eventName,&$eventHandler)
+	{
+		if(isset($this->_mEvents[$eventName])) {
+			if(strtolower(get_class($this->_mEvents[$eventName]))=="xcube_event") {
+				//
+				// TODO : omg! We access private property.
+				//
+				foreach($this->_mEvents[$eventName]->_mDelegates as $delegate) {
+					$eventHandler->_mDelegates[]=$delegate;
+					unset($delegate);
+				}
+				unset($this->_mEvents[$eventName]);
+				$this->_mEvents[$eventName]=&$eventHandler;
+			}
+		}
+		else {
+			$this->_mEvents[$eventName]=&$eventHandler;
+		}
+	}
+
+	function raiseEvent($eventName,&$sender,&$eventArgs)
+	{
+		if(isset($this->_mReserveEventList[$eventName])&&$this->_mRegistedFlags[$eventName]==false) {
+			$this->_processProxyRegist($eventName);
+		}
+		
+		if(isset($this->_mEvents[$eventName])) {
+			$this->_mEvents[$eventName]->raiseEvent($sender,$eventArgs);
+
+			return true;
+		}
+		return false;
+	}
+
+	function addProxyRegister(&$register)
+	{
+		$i=count($this->_mProxyRegisters)+1;
+		$this->_mProxyRegisters[$i]=&$register;
+		
+		$list=$register->getEventNameList();
+		foreach($list as $name) {
+			if(!isset($this->_mReserveEventList[$name])) {
+				$this->_mReserveEventList[$name]=array();
+				$this->_mRegistedFlags[$name]=false;
+			}
+
+			$this->_mReserveEventList[$name][]=$i;
+		}
+	}
+	
+	function _processProxyRegist($eventName)
+	{
+		$this->_mRegistedFlags[$eventName]=true;
+		foreach($this->_mReserveEventList[$eventName] as $i) {
+			$this->add($eventName,$this->_mProxyRegisters[$i]->createDelegate($eventName));
+		}
+	}
+}
+
+/**
+ * This class tells a manager about a list of the event that the Delegate which this class can create.
+ * And this class creates Delegate when the manager needs Delegate.
+ * Developer does not need to use this by all means.
+ */
+class XCube_EventProxyRegister
+{
+	/**
+	 * @return array
+	 */
+	function getEventNameList()
+	{
+	}
+	
+	function &createDelegate($name)
+	{
+		$ret =null;
+		$methodName=str_replace(".","_","create".ucfirst($name)."Delegate");
+		if(method_exists($this,$methodName)) {
+			$ret=&call_user_func(array($this,$methodName));
+		}
+
+		return $ret;
+	}
+}
+
+/**
+  *
+  * Static Utility methods for XCube_EventManager
+  *
+  */
+class XCube_EventUtils
+{
+    /**
+    Simple Raise Event method;
+    */
+    function &quickRaiseEvent($event, $eventArgs = array())
+    {
+        $root=&XCube_Root::getSingleton();
+        if ($root->mEventManager->raiseEvent($event, $root->mController, $eventArgs)) {
+            return $eventArgs;
+        } else {
+			$ret = false;
+            return $ret;
+        }
+    }
+
+    /**
+    Simple Text Filterling with Event mechanism
+    */
+    function quickApplyFilter($filter, $string, $optionArgs = array())
+    {
+        $root=&XCube_Root::getSingleton();
+        $eventArgs = array_merge(array('string' => $string), $optionArgs);
+        if ($root->mEventManager->raiseEvent($filter, $root->mController, $eventArgs)) {
+            return $eventArgs['string'];
+        } else {
+            return $string;
+        }
+    }
+}
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:14:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:14:07 +0900
Subject: [xoops-cvslog 2230] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060204061407.806112AC037@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.3 xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.4
--- xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.3	Sat Feb  4 01:24:33 2006
+++ xoops2jp/html/modules/base/language/japanese/help.html	Sat Feb  4 15:14:07 2006
@@ -13,7 +13,7 @@
   <li>XOOPS Cubeの使い方に迷ったときには、先ずこちらを検索してみてください。</li>
 </ul>
 
-モジュールの管理／インストール
+<h4>モジュールの管理／インストール</h4>
 <ul>
   <li>インストールされているモジュールの一覧が表示されます。</li>
   <li>モジュールをインストールする際は、「モジュールのインストール」よりインストールするモジュールを選んでインストールして下さい。</li>
@@ -27,11 +27,14 @@
   <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
 </ul>
 
-<h4>TODO</h4>
+<h4>Cube 2.1 alpha 1 既知の問題点・注意事項</h4>
 <ul>
-  <li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
-  <li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
-  <li>イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。</li>
-  <li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
-  <li>miscが一部の機能を実装していない</li>
+  <li>「base module」の名称（ディレクトリ名を含む）は、正式版までに「Legacy module」に変更の予定です。</li>
+  <li>幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。</li>
+  <li>モジュールアップデートの際には、モジュールの設定情報が初期値に戻ります。</li>
+  <li>misc.phpに依存した機能の「SSLログイン」「友達に知らせる」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。</li>
+  <li>テンプレートマネージャーは現在開発試験中です。使用中のテンプレートと、defaultテンプレートの数に違いが生じたとき、作成や削除を行うことが出来ません。また、テンプレートファイルのアップロード・ダウンロードを管理画面上から行う事は出来ません。<li>
+  <li>旧バージョンからのアップグレードスクリプトは、本バージョンには含まれません。アップグレードスクリプトは、β版から提供される予定です。</li>
+  <li>旧来のシステムモジュールは、その機能が他の新しいモジュールへの移行が完了するまでのあいだそのまま残されています。移行が完了するまでの間、新しいモジュールとシステムモジュールの間で機能が重複する部分がありますがご了承下さい。<li>
+  <li>IISを利用した環境の場合、.sqlファイルを持つモジュールのインストールが上手く行かないケースがあります。IISを利用されている方からの動作状況の報告をお待ちしております。</li>
 </ul>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:24:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:24:11 +0900
Subject: [xoops-cvslog 2231] CVS update:
	xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20060204062411.7751A2AC037@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.11
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.10	Fri Feb  3 16:08:05 2006
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html	Sat Feb  4 15:24:11 2006
@@ -6,7 +6,7 @@
 	<ul>
 	<{if $module->adminmenu}>
 		<{foreach item=menu from=$module->adminmenu}>
-			<{if $menu.enable !== false}>
+			<{if $menu.show !== false}>
 				<{if $menu.absolute}>
 					<li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
 				<{else}>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:37:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:37:42 +0900
Subject: [xoops-cvslog 2232] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060204063742.239252AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.3 xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.4
--- xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.3	Wed Dec 28 22:55:21 2005
+++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php	Sat Feb  4 15:37:42 2006
@@ -47,7 +47,7 @@
 
 			$findFlag=true;
 			foreach($eventArgs->getKeywords() as $word) {
-				$findFlag&=(strpos(implode(" ",$configInfos),$word)!==false);
+				$findFlag&=(stripos(implode(" ",$configInfos),$word)!==false);
 			}
 				
 			if($findFlag) {
@@ -65,12 +65,12 @@
 				$findFlag=true;
 				foreach($eventArgs->getKeywords() as $word) {
 					$tmpFlag=false;
-					$tmpFlag|=(strpos($menu['title'],$word)!==false);
+					$tmpFlag|=(stripos($menu['title'],$word)!==false);
 
 					// Search keyword
 					if(isset($menu['keywords'])) {
 						$keyword=is_array($menu['keywords']) ? implode(" ",$menu['keywords']) : $menu['keywords'];
-						$tmpFlag|=(strpos($keyword,$word)!==false);
+						$tmpFlag|=(stripos($keyword,$word)!==false);
 					}
 
 					$findFlag&=$tmpFlag;
@@ -114,7 +114,7 @@
 			$lines = file($dir . "/" . $helpfile);
 			foreach ($lines as $line) {
 				foreach($eventArgs->getKeywords() as $word) {
-					if (strpos($line, $word) !== false) {
+					if (stripos($line, $word) !== false) {
 						$url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&amp;dirname=" . $this->mAdaptee->getVar('dirname');
 						$eventArgs->addRecord($this->mAdaptee->getVar('name'), $url, _HELP);
 						return;

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:39:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:39:02 +0900
Subject: [xoops-cvslog 2233] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20060204063902.976692AC037@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/menu.php
diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.6 xoops2jp/html/modules/base/admin/menu.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/menu.php:1.1.2.6	Thu Feb  2 21:22:17 2006
+++ xoops2jp/html/modules/base/admin/menu.php	Sat Feb  4 15:39:02 2006
@@ -1,22 +1,30 @@
 <?php
 /**
- * @version $Id: menu.php,v 1.1.2.6 2006/02/02 12:22:17 minahito Exp $
+ * @version $Id: menu.php,v 1.1.2.7 2006/02/04 06:39:02 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_SMILES_MANAGE;
-$adminmenu[4]['link']="admin/index.php?action=SmilesList";
+$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[5]['title']=_MI_BASE_MENU_COMMENTMANAGE;
-$adminmenu[5]['link']="admin/index.php?action=CommentList";
+// $adminmenu[6]['title']=_MI_BASE_MENU_COMMENTMANAGE;
+// $adminmenu[6]['link']="admin/index.php?action=CommentList";
 
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:39:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:39:26 +0900
Subject: [xoops-cvslog 2234] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060204063926.A97DE2AC037@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.8 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.9
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.8	Sat Feb  4 12:37:35 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Sat Feb  4 15:39:26 2006
@@ -1,7 +1,12 @@
 <?php
 
+define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
+define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
+define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
+define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
 define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
 define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
+define('_MI_BASE_MENU_CREATE_SMILES', "顔アイコンの新規作成");
 define('_MI_BASE_MENU_MODULEINSTALL', "モジュールのインストール");
 define('_MI_BASE_MENU_MODULELIST', "モジュールの管理");
 define('_MI_BASE_MENU_SMILES_MANAGE', "顔アイコンの管理");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:39:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:39:26 +0900
Subject: [xoops-cvslog 2235] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060204063926.CB6792AC03C@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.7 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.8
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.7	Sat Feb  4 12:37:28 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Sat Feb  4 15:39:26 2006
@@ -1,7 +1,12 @@
 <?php
 
+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_SMILES_MANAGE', "smilies edit change delete list");
 define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
 define('_MI_BASE_MENU_COMMENTMANAGE', "Comment management");
+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");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:55:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:55:21 +0900
Subject: [xoops-cvslog 2236] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060204065521.666BF2AC037@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.8 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.9
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.8	Sat Feb  4 15:39:26 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Sat Feb  4 15:55:21 2006
@@ -10,7 +10,7 @@
 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 compatible module");
+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.");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 15:55:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 15:55:50 +0900
Subject: [xoops-cvslog 2237] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060204065550.D9EF42AC037@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.5 xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.6
--- xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.5	Sat Feb  4 12:37:48 2006
+++ xoops2jp/html/modules/legacyRender/language/english/modinfo.php	Sat Feb  4 15:55:50 2006
@@ -12,7 +12,7 @@
 define('_MI_LEGACYRENDER_KEYWORD_THEME', "Theme");
 define('_MI_LEGACYRENDER_KEYWORD_UNINSTALL', "Uninstall");
 define('_MI_LEGACYRENDER_KEYWORD_UPLOAD', "Upload");
-define('_MI_LEGACYRENDER_NAME', "Compatible Render System");
+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.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:25:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:25:59 +0900
Subject: [xoops-cvslog 2238] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060204072559.25C8A2AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.4 xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.5
--- xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.4	Sat Feb  4 15:37:42 2006
+++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php	Sat Feb  4 16:25:59 2006
@@ -47,7 +47,7 @@
 
 			$findFlag=true;
 			foreach($eventArgs->getKeywords() as $word) {
-				$findFlag&=(stripos(implode(" ",$configInfos),$word)!==false);
+				$findFlag&=(stristr(implode(" ",$configInfos),$word)!==false);
 			}
 				
 			if($findFlag) {
@@ -65,12 +65,12 @@
 				$findFlag=true;
 				foreach($eventArgs->getKeywords() as $word) {
 					$tmpFlag=false;
-					$tmpFlag|=(stripos($menu['title'],$word)!==false);
+					$tmpFlag|=(stristr($menu['title'],$word)!==false);
 
 					// Search keyword
 					if(isset($menu['keywords'])) {
 						$keyword=is_array($menu['keywords']) ? implode(" ",$menu['keywords']) : $menu['keywords'];
-						$tmpFlag|=(stripos($keyword,$word)!==false);
+						$tmpFlag|=(stristr($keyword,$word)!==false);
 					}
 
 					$findFlag&=$tmpFlag;
@@ -114,7 +114,7 @@
 			$lines = file($dir . "/" . $helpfile);
 			foreach ($lines as $line) {
 				foreach($eventArgs->getKeywords() as $word) {
-					if (stripos($line, $word) !== false) {
+					if (stristr($line, $word) !== false) {
 						$url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&amp;dirname=" . $this->mAdaptee->getVar('dirname');
 						$eventArgs->addRecord($this->mAdaptee->getVar('name'), $url, _HELP);
 						return;

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:26:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:26:18 +0900
Subject: [xoops-cvslog 2239] CVS update: xoops2jp/html/modules/user/admin
Message-ID: <20060204072618.3DD472AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/menu.php
diff -u xoops2jp/html/modules/user/admin/menu.php:1.1.2.5 xoops2jp/html/modules/user/admin/menu.php:1.1.2.6
--- xoops2jp/html/modules/user/admin/menu.php:1.1.2.5	Thu Jan 19 21:11:35 2006
+++ xoops2jp/html/modules/user/admin/menu.php	Sat Feb  4 16:26:18 2006
@@ -1,18 +1,38 @@
 <?php
 
-$adminmenu[1]['title'] = _MI_USER_ADMENU_LIST;
-$adminmenu[1]['link'] = "admin/index.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_RANK_LIST;
-$adminmenu[2]['link'] = "admin/index.php?action=RanksList";
+$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_GROUP_LIST;
-$adminmenu[3]['link'] = "admin/index.php?action=GroupList";
+$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[4]['title'] = _MI_USER_ADMENU_MAIL;
-$adminmenu[4]['link'] = "admin/index.php?action=MailjobEdit";
+$adminmenu[4]['title'] = _MI_USER_ADMENU_RANK_LIST;
+$adminmenu[4]['link'] = "admin/index.php?action=RanksList";
 
-$adminmenu[4]['title'] = _MI_USER_ADMENU_AVATAR_MANAGE;
-$adminmenu[4]['link'] = "admin/index.php?action=AvatarList";
+$adminmenu[5]['title'] = _MI_USER_MENU_CREATE_GROUP;
+$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";
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:26:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:26:45 +0900
Subject: [xoops-cvslog 2240] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060204072645.179EC2AC072@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.9 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.10
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.9	Sat Feb  4 12:38:44 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Sat Feb  4 16:26:44 2006
@@ -40,6 +40,17 @@
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "中");
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "強（アルファベットおよび数字のみ）←推奨");
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "弱（漢字・平仮名も使用可）");
+define('_MI_USER_KEYWORD_AVATAR_MANAGE', "アバター カスタムアバター システムアバター  一覧 リスト 編集 変更 削除");
+define('_MI_USER_KEYWORD_CREATE_AVATAR', "アバター カスタムアバター システムアバター 新規作成 アップロード");
+define('_MI_USER_KEYWORD_CREATE_GROUP', "ユーザーグループ ユーザグループ");
+define('_MI_USER_KEYWORD_CREATE_RANK', "ランク ユーザーランク");
+define('_MI_USER_KEYWORD_CREATE_USER', "新規登録");
+define('_MI_USER_KEYWORD_GROUP_LIST', "グループ 一覧 リスト 編集 変更  削除 ユーザー ユーザグループ 権限 パーミッション 追加 メンバー");
+define('_MI_USER_KEYWORD_USER_LIST', "一覧 リスト 編集 変更 削除");
+define('_MI_USER_MENU_CREATE_AVATAR', "アバターの新規作成");
+define('_MI_USER_MENU_CREATE_GROUP', "グループの新規作成");
+define('_MI_USER_MENU_CREATE_RANK', "ランクの新規作成");
+define('_MI_USER_MENU_CREATE_USER', "ユーザーの新規作成");
 define('_MI_USER_NAME', "ユーザーモジュール");
 define('_MI_USER_NAME_DESC', "ユーザーアカウントに関する処理を行う基盤モジュール");
 

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:26:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:26:45 +0900
Subject: [xoops-cvslog 2241] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060204072645.38E8D2AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.6 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.7
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.6	Sat Feb  4 12:38:45 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Sat Feb  4 16:26:45 2006
@@ -23,8 +23,7 @@
 define('_MI_USER_CONF_AVTR_ALLOW_UP', "Allow custom avatar upload?");
 define('_MI_USER_CONF_BAD_EMAILS', "Enter emails that should not be used in user profile");
 define('_MI_USER_CONF_BAD_EMAILS_DESC', "Separate each with a |, case insensitive, regex enabled.");
-define('_MI_USER_CONF_BAD_UNAMES', "Enter names that should not be selected as username
-");
+define('_MI_USER_CONF_BAD_UNAMES', "");
 define('_MI_USER_CONF_BAD_UNAMES_DESC', "Separate each with a |, case insensitive, regex enabled.");
 define('_MI_USER_CONF_CHGMAIL', "Allow users to change email address?");
 define('_MI_USER_CONF_DISCLAIMER', "Registration disclaimer");
@@ -41,6 +40,17 @@
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "Medium");
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "Strict (Only alphabets and numbers)");
 define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "Light (Allow 2byte characters)");
+define('_MI_USER_KEYWORD_AVATAR_MANAGE', "avatar custom system list edit modify delete");
+define('_MI_USER_KEYWORD_CREATE_AVATAR', "create avatar");
+define('_MI_USER_KEYWORD_CREATE_GROUP', "create group");
+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_USER_LIST', "user 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");
+define('_MI_USER_MENU_CREATE_USER', "Create user");
 define('_MI_USER_NAME', "User module");
 define('_MI_USER_NAME_DESC', "This module manages user account.");
 

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:28:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:28:25 +0900
Subject: [xoops-cvslog 2242] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060204072825.8C77E2AC03E@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.10 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.10	Fri Feb  3 23:41:26 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Sat Feb  4 16:28:25 2006
@@ -168,13 +168,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_PASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=password name=pass value=$actionForm->get('pass') size=25 maxlength=32}>
+        <{xoops_input type=password name=pass size=25 maxlength=32}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_VPASS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=25 maxlength=32}>
+        <{xoops_input type=password name=vpass size=25 maxlength=32}>
       </td>
     </tr>
     <tr>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:32:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:32:40 +0900
Subject: [xoops-cvslog 2243] CVS update: xoops2jp/html/install
Message-ID: <20060204073240.04D682AC072@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.7 xoops2jp/html/install/makedata.php:1.2.8.8
--- xoops2jp/html/install/makedata.php:1.2.8.7	Sat Feb  4 03:29:42 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 16:32:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.7 2006/02/03 18:29:42 minahito Exp $
+// $Id: makedata.php,v 1.2.8.8 2006/02/04 07:32:39 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -248,6 +248,14 @@
 	}
     $dbm->insert("modules", " VALUES (${mid}, '" . constant($module_name) . "', 100, ".$time.", 0, 1, '${module}', ${hasmain}, 1, 0, ${hasconfig}, 0, 0)");
 
+	//
+	// Database
+	// TODO Dependence on mysql, Now.
+	//
+	if (isset($modversion['sqlfile']['mysql'])) {
+		$dbm->queryFromFile("../modules/${module}/" . $modversion['sqlfile']['mysql']);
+	}
+	
     if (is_array($modversion['templates']) && count($modversion['templates']) > 0) {
         foreach ($modversion['templates'] as $tplfile) {
             if ($fp = fopen("../modules/${module}/templates/".$tplfile['file'], 'r')) {

From minahito ＠ users.sourceforge.jp  Sat Feb  4 16:41:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 16:41:25 +0900
Subject: [xoops-cvslog 2244] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060204074125.2E3DE2AC077@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.17 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.18
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.17	Sat Feb  4 12:38:44 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Sat Feb  4 16:41:25 2006
@@ -110,7 +110,7 @@
 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', "Receive occasional email notices from administrators and moderators?");
+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', "職業");

From tom_g3x ＠ users.sourceforge.jp  Sat Feb  4 16:50:14 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Feb 2006 16:50:14 +0900
Subject: [xoops-cvslog 2245] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060204075014.7FAB82AC035@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.9 xoops2jp/html/modules/base/language/english/main.php:1.1.2.10
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.9	Sat Feb  4 12:37:28 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Sat Feb  4 16:50:14 2006
@@ -31,7 +31,7 @@
 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_SMILE_URL', "Image");
 define('_MD_BASE_LANG_SUBMIT', "Submit");
 define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
 define('_MSC_AVAVATARS', "Available Avatars");
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.12 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.13
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.12	Sat Feb  4 12:37:28 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sat Feb  4 16:50:14 2006
@@ -26,7 +26,7 @@
 define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment");
 define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment");
 define('_AD_BASE_LANG_CONTROL', "Control");
-define('_AD_BASE_LANG_CREATE_NEW', "Create new");
+define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
 define('_AD_BASE_LANG_DOHTML', "Enable HTML tags");
@@ -71,7 +71,7 @@
 define('_MD_A_BASE_LANG_BLOCK_VAL', "Value");
 define('_MD_A_BASE_LANG_BLOCKS_INFO', "Block information");
 define('_MD_A_BASE_LANG_COMMENT_SVC', "Comment");
-define('_MD_A_BASE_LANG_CONFIG_INFO', "General configuration");
+define('_MD_A_BASE_LANG_CONFIG_INFO', "Module Preferences");
 define('_MD_A_BASE_LANG_CONFIG_KEY', "Key");
 define('_MD_A_BASE_LANG_CONFIG_VAL', "Value");
 define('_MD_A_BASE_LANG_CONTROL', "Control");
@@ -86,7 +86,7 @@
 define('_MD_A_BASE_LANG_MAINMENU_INFO', "Information of Main Menu");
 define('_MD_A_BASE_LANG_MID', "MID");
 define('_MD_A_BASE_LANG_MOD_AUTHOR', "Module Author");
-define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "Outlines of module");
+define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "Basic Information");
 define('_MD_A_BASE_LANG_MOD_CREDITS', "Signature / Memo");
 define('_MD_A_BASE_LANG_MOD_DESC', "Module discription");
 define('_MD_A_BASE_LANG_MOD_DIR_NAME', "Module directory");
@@ -113,7 +113,7 @@
 define('_MD_A_BASE_LANG_NO_AGREE', " I Do Not Agree.");
 define('_MD_A_BASE_LANG_NO_BLOCK', "No block information");
 define('_MD_A_BASE_LANG_NO_CHANGE', "No change");
-define('_MD_A_BASE_LANG_NO_CONFIG', "General settings has not been configured.");
+define('_MD_A_BASE_LANG_NO_CONFIG', "Module preferences has not been configured.");
 define('_MD_A_BASE_LANG_NO_MAINMENU', "Mainmenu settings has not been configured.");
 define('_MD_A_BASE_LANG_NO_SQL', "SQL information has not been configured.");
 define('_MD_A_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured.");

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 16:52:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 16:52:47 +0900
Subject: [xoops-cvslog 2246] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060204075247.7AB8C2AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.4	Wed Nov 16 19:13:09 2005
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php	Sat Feb  4 16:52:47 2006
@@ -1,8 +1,8 @@
 <?php
 
-require_once XOOPS_MODULE_PATH."/user/forms/RegisterUserEditForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
 
-class UserRegisterAction extends UserAction
+class User_UserRegisterAction extends User_Action
 {
 	var $mActionForm=null;
 	var $mConfig;
@@ -29,8 +29,8 @@
 			return USER_FRAME_VIEW_INPUT;
 		}
 		else {
-			$_SESSION['user_register_actionform']=&$this->mActionForm;
-			$controller->executeForward('./register_confirm.php');
+			$_SESSION['user_register_actionform']=serialize(&$this->mActionForm);
+			$controller->executeForward('./index.php?action=UserRegister_confirm');
 		}
 	}
 
@@ -45,10 +45,10 @@
 	{
 		if($this->mConfig['reg_dispdsclmr']!=0 && $this->mConfig['reg_disclaimer']!=null) {
 			$this->mEnableAgreeFlag=true;
-			$this->mActionForm=new RegisterUserAgreeEditForm();
+			$this->mActionForm=new UserRegisterAgreeEditForm();
 		}
 		else {
-			$this->mActionForm=new RegisterUserEditForm();
+			$this->mActionForm=new UserRegisterEditForm();
 		}
 		
 		$this->mActionForm->prepare($this->mConfig);
@@ -56,6 +56,14 @@
 
 	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
 	{
+		//
+		// Get some objects for input form.
+		//
+		$tzoneHandler =& xoops_gethandler('timezone');
+		$timezones =& $tzoneHandler->getObjects();
+		
+		$renderSystem->setAttribute('timezones', $timezones);
+
 		$renderSystem->setTemplateName("user_register_form.html");
 		$renderSystem->setAttribute("actionForm",$this->mActionForm);
 		$renderSystem->setAttribute("enableAgree",$this->mEnableAgreeFlag);
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.3	Thu Nov 10 19:18:20 2005
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Sat Feb  4 16:52:47 2006
@@ -1,9 +1,8 @@
 <?php
-
 require_once XOOPS_MODULE_PATH."/user/forms/UserConfirmForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
 require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
-
-class UserRegister_confirmAction extends UserAction
+class User_UserRegister_confirmAction extends User_Action
 {
 	var $mActionForm=null;
 	var $mRegistForm=null;
@@ -29,9 +28,9 @@
 		
 		$memberHandler=&xoops_gethandler('member');
 		$this->mNewUser=&$memberHandler->createUser();
-		$this->mRegistForm->update($newUser);
+		$this->mRegistForm->update($this->mNewUser);
 		$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
-		$$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
+		$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
 		if($this->mUserConfig['activation_type'] == 1) {
 			$this->mNewUsersetVar('level',1,true);
 		}
@@ -49,8 +48,8 @@
 		$this->_clearRegistForm($controller);
 
 		$this->_processMail($controller);
-
-		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success");
+		$eventArgs = array();
+		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
 
 		// TODO the following process
 
@@ -71,9 +70,10 @@
 	 */
 	function _getRegistForm(&$controller)
 	{
-		$this->mRegistForm=&$_SESSION['user_register_actionform'];
-		if(!is_object($this->mRegistForm))
-			$controller->executeForward("./register.php");
+		$this->mRegistForm=& unserialize($_SESSION['user_register_actionform']);
+		if(!is_object($this->mRegistForm)) {
+			$controller->executeForward('./index.php?action=UserRegister');
+		}
 	}
 
 	/**
@@ -102,11 +102,11 @@
 		$mailer->send();	// CHECKS
 	}
 	
-	function eventNotifyMail()
+	function eventNotifyMail(&$controller,&$eventArgs)
 	{
 		if($this->mUserConfig['new_user_notify'] == 1 && !empty($this->mUserConfig['new_user_notify_group'])) {
 			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
-			$bilder = new RegistUserNotifyMailBuilder();
+			$builder = new RegistUserNotifyMailBuilder();
 			$director->contruct($builder);
 			$mailer=&$builder->getResult();
 			$mailer->send();

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 16:52:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 16:52:47 +0900
Subject: [xoops-cvslog 2247] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060204075247.B13262AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.1 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.2
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.1	Thu Nov 10 19:18:47 2005
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Sat Feb  4 16:52:47 2006
@@ -31,7 +31,7 @@
 	function RegistUserActivateMailBuilder()
 	{
 		$this->mMailer=&getMailer();
-		$this->mMailer->userMail();
+		$this->mMailer->useMail();
 	}
 
 	function setTemplate()
@@ -64,7 +64,7 @@
 	
 	function &getResult()
 	{
-		$this->mMailer;
+		return $this->mMailer;
 	}
 }
 
@@ -102,7 +102,7 @@
 	}
 }
 
-class RegistUserNotifyMailBuilder extends RegistUserNotifyMail
+class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
@@ -127,7 +127,7 @@
 
 	function setBody($user,$xoopsConfig)
 	{
-		$xoopsMailer->setBody(@printf(_US_HASJUSTREG,$uname->getVar('uname')));
+		$this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 16:52:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 16:52:47 +0900
Subject: [xoops-cvslog 2248] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060204075247.DF6A82AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.2	Thu Feb  2 17:49:51 2006
+++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php	Sat Feb  4 16:52:47 2006
@@ -58,7 +58,7 @@
 
 	function validateTimezone_offset()
 	{
-		$handler =& xoops_getmodulehandler('timezone');
+		$handler =& xoops_gethandler('timezone');
 		$obj =& $handler->get($this->get('timezone_offset'));
 		if (!is_object($obj)) {
 			$this->addErrorMessage(_MD_USER_ERROR_TIMEZONE);
Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.2	Thu Feb  2 17:50:52 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php	Sat Feb  4 16:52:47 2006
@@ -78,5 +78,23 @@
 		$obj->set('agree', $this->get('agree'));
 	}
 }
+class UserRegisterAgreeEditForm extends UserRegisterEditForm 
+{
+	function prepare($userConfig)
+	{
+		parent::prepare($userConfig);
+		
+		// set properties
+		$this->mFormProperties['agree']=new XCube_IntProperty('agree');
+
+		// set fields
+		$this->mFieldProperties['agree']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['agree']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['agree']->addMessage("required",_US_UNEEDAGREE);
+		$this->mFieldProperties['agree']->addMessage("intRange",_US_UNEEDAGREE);
+		$this->mFieldProperties['agree']->addVar("min",1);
+		$this->mFieldProperties['agree']->addVar("max",1);
+	}
+}
 
 ?>

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 16:52:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 16:52:48 +0900
Subject: [xoops-cvslog 2249] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060204075248.1A78B2AC059@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.7 xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.8
--- xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.7	Thu Feb  2 18:22:45 2006
+++ xoops2jp/html/modules/user/kernel/UserEventFunction.class.php	Sat Feb  4 16:52:47 2006
@@ -84,7 +84,7 @@
 			$controller->executeForward(XOOPS_URL);
 		}
 		else {
-			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=RegisterUser");
+			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserRegister");
 		}
 	}
 	

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 16:52:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 16:52:48 +0900
Subject: [xoops-cvslog 2250] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060204075248.421C82AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.3
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.2	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Sat Feb  4 16:52:48 2006
@@ -1,4 +1,4 @@
-
+<form action="index.php?action=UserRegister_confirm" method="post">
 <table width="100%" class="outer">
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
@@ -18,3 +18,4 @@
     </td>
   </tr>
 </table>
+</form>
Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.4	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Sat Feb  4 16:52:48 2006
@@ -6,7 +6,7 @@
 </ul>
 <{/if}>
 
-<form action="index.php?action=Register" method="post">
+<form action="index.php?action=UserRegister" method="post">
 <{xoops_token form=$actionForm}>
 <table class="outer" width="100%">
   <tr>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:37:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:37:06 +0900
Subject: [xoops-cvslog 2251] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060204083706.8CB6C2AC035@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.1 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.1	Thu Jan 19 21:06:03 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php	Sat Feb  4 17:37:06 2006
@@ -111,7 +111,9 @@
 
 		$groupHandler =& xoops_gethandler('group');
 		$group =& $groupHandler->get($groupId);
-		$this->mGroup =& new XoopsGroupEx($group);
+		if (is_object($group)) {
+			$this->mGroup =& new XoopsGroupEx($group);
+		}
 	}
 
 	function executeViewIndex(&$controller,&$xoopsUser,&$render)

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:37:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:37:42 +0900
Subject: [xoops-cvslog 2252] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060204083742.109832AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.2	Fri Feb  3 15:05:06 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php	Sat Feb  4 17:37:41 2006
@@ -1,6 +1,7 @@
 <?php
 
 require_once XOOPS_MODULE_PATH."/user/admin/actions/GroupPropertyAction.class.php";
+require_once XOOPS_MODULE_PATH."/user/admin/forms/GroupPermEditForm.class.php";
 
 /**
  *
@@ -8,6 +9,14 @@
  */
 class User_GroupPermAction extends User_GroupPropertyAction
 {
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->mActionForm =& new User_GroupPermEditForm();
+		$this->mActionForm->prepare();
+	}
+	
 	/**
 	 * This function don't use actionform, now.
 	 * I (minahito) must remove code-clone.
@@ -15,81 +24,80 @@
 	function execute(&$controller, &$xoopsUser)
 	{
 		$this->_loadGroup();
-
+		
 		if (!is_object($this->mGroup)) {
 			return USER_FRAME_VIEW_ERROR;
 		}
-
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
+		
 		//
 		// Reset group permission
 		//
 		$gpermHandler =& xoops_gethandler('groupperm');
 		$gpermHandler->deleteBasicPermission($this->mGroup->getVar('groupid'));
 		
-		if (isset($_POST['system']) && is_array($_POST['system'])) {
-			foreach ($_POST['system'] as $sid => $value)
-			{
-				$item =& new User_PermissionSystemAdminItem($sid, null);
-				$perm =& new User_Permission($this->mGroup->getVar('groupid'), $item);
+		foreach ($this->mActionForm->get('system') as $sid => $value)
+		{
+			$item =& new User_PermissionSystemAdminItem($sid, null);
+			$perm =& new User_Permission($this->mGroup->getVar('groupid'), $item);
 			
-				$perm->save();
+			$perm->save();
 
-				unset($perm);
-			}
+			unset($perm);
 		}
 		
 		$moduleHandler =& xoops_gethandler('module');
 		$modPerms = array();
 
-		if (isset($_POST['module']) && is_array($_POST['module'])) {
-			foreach ($_POST['module'] as $mid => $value)
-			{
-				$module =& $moduleHandler->get($mid);
-				if (is_object($module)) {
-					$item =& new User_PermissionModuleItem($module);
-					$modPerms[$mid] =& new User_Permission($this->mGroup->getVar('groupid'), $item);
+		foreach ($this->mActionForm->get('module') as $mid => $value)
+		{
+			$module =& $moduleHandler->get($mid);
+			if (is_object($module)) {
+				$item =& new User_PermissionModuleItem($module);
+				$modPerms[$mid] =& new User_Permission($this->mGroup->getVar('groupid'), $item);
 
-					if (isset($_POST['module_admin']) && isset($_POST['module_admin'][$mid])) {
-						$value |= $_POST['module_admin'][$mid];
-					}
+				if (isset($_POST['module_admin']) && isset($_POST['module_admin'][$mid])) {
+					$value |= $_POST['module_admin'][$mid];
+				}
 
-					$modPerms[$mid]->setValue($value);
+				$modPerms[$mid]->setValue($value);
 					
-					$modPerms[$mid]->save();
-				}
+				$modPerms[$mid]->save();
 			}
 		}
 
-		if (isset($_POST['module_admin']) && is_array($_POST['module_admin'])) {
-			foreach ($_POST['module_admin'] as $mid => $value)
-			{
-				$module =& $moduleHandler->get($mid);
-				if (is_object($module)) {
-					if (!isset($modPerms[$mid])) {
-						$item =& new User_PermissionModuleItem($module);
-						$modPerms[$mid] =& new User_Permission($this->mGroup->getVar('groupid'), $item);
-						$modPerms[$mid]->setValue($value);
+		foreach ($this->mActionForm->get('module_admin') as $mid => $value)
+		{
+			$module =& $moduleHandler->get($mid);
+			if (is_object($module)) {
+				if (!isset($modPerms[$mid])) {
+					$item =& new User_PermissionModuleItem($module);
+					$modPerms[$mid] =& new User_Permission($this->mGroup->getVar('groupid'), $item);
+					$modPerms[$mid]->setValue($value);
 
-						$modPerms[$mid]->save();
-					}
+					$modPerms[$mid]->save();
 				}
 			}
 		}
 
 		$blockHandler =& xoops_gethandler('block');
 
-		if (isset($_POST['block']) && is_array($_POST['block'])) {
-			foreach ($_POST['block'] as $bid => $value)
-			{
-				$block =& $blockHandler->get($bid);
-				if (is_object($block)) {
-					$item =& new User_PermissionBlockItem($block);
-					$perm =& new User_Permission($this->mGroup->getVar('groupid'), $item);
-					$perm->setValue($value);
-					$perm->save();
+		foreach ($this->mActionForm->get('block') as $bid => $value)
+		{
+			$block =& $blockHandler->get($bid);
+			if (is_object($block)) {
+				$item =& new User_PermissionBlockItem($block);
+				$perm =& new User_Permission($this->mGroup->getVar('groupid'), $item);
+				$perm->setValue($value);
+				$perm->save();
 					
-					unset($perm);
-				}
+				unset($perm);
 			}
 		}
 		
@@ -100,6 +108,7 @@
 	{
 		$render->setTemplateName("group_perm.html");
 		$render->setAttribute("group",$this->mGroup);
+		$render->setAttribute("actionForm",$this->mActionForm);
 		$render->setAttribute("modulePermissions",$this->mPermissions);
 		$render->setAttribute("blockPermissions",$this->mBlockPermissions);
 		$render->setAttribute("systemPermissions",$this->mSystemPermissions);
@@ -107,7 +116,7 @@
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$render)
 	{
-		$controller->executeForward("index.php?action=GroupPerm&amp;groupid=" . $this->mGroup->getVar('groupid'));
+		$controller->executeForward("index.php?action=GroupPerm&groupid=" . $this->mGroup->getVar('groupid'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:37:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:37:56 +0900
Subject: [xoops-cvslog 2253] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060204083756.E18012AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/group_perm.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/group_perm.xml:1.1.2.1
--- /dev/null	Sat Feb  4 17:37:56 2006
+++ xoops2jp/html/modules/user/admin/.xml/group_perm.xml	Sat Feb  4 17:37:56 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="GroupPermEditForm" type="XCube_ActionForm">
+		<form-property name="system" type="Bool[]" />
+		<form-property name="module" type="Bool[]" />
+		<form-property name="module_admin" type="Bool[]" />
+		<form-property name="block" type="Bool[]" />
+	</form-bean>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:38:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:38:12 +0900
Subject: [xoops-cvslog 2254] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060204083812.4EE132AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.5	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Sat Feb  4 17:38:12 2006
@@ -6,6 +6,14 @@
 
 <h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getVar('name')}> )</h3>
 
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
 <table class="outer">
   <tr>
     <th>&nbsp;</th>
@@ -41,6 +49,7 @@
 <h5><{$smarty.const._AD_USER_LANG_PERM_MODULE_ACCESS}></h5>
 
 <form action="index.php?action=GroupPerm" method="POST">
+<{xoops_token form=$actionForm}>
 <table class="outer">
   <tr>
     <th colspan="4"><{$smarty.const._AD_USER_LANG_PERM_SYSTEM_PERM_MODULE}></th>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:39:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:39:24 +0900
Subject: [xoops-cvslog 2255] CVS update: xoops2jp/html/modules/user/admin/class
Message-ID: <20060204083924.490A22AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/class/Permission.class.php
diff -u xoops2jp/html/modules/user/admin/class/Permission.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/class/Permission.class.php:1.1.2.5
--- xoops2jp/html/modules/user/admin/class/Permission.class.php:1.1.2.4	Fri Dec 30 17:29:28 2005
+++ xoops2jp/html/modules/user/admin/class/Permission.class.php	Sat Feb  4 17:39:24 2006
@@ -49,24 +49,20 @@
 	function save()
 	{
 		$gpermHandler =& xoops_gethandler('groupperm');
-
-		if ($this->mValue & USER_PERMISSION_READ) {
-			$name = $this->mItem->getReadPermName();
-			if ($name) {
-				$gperm =& $this->_createGperm($name);
-				if (!$gpermHandler->insert($gperm)) {
-					return false;
-				}
+		
+		$name = $this->mItem->getReadPermName();
+		if ($name) {
+			$gperm =& $this->_createGperm($name);
+			if (!$gpermHandler->insert($gperm)) {
+				return false;
 			}
 		}
 
-		if ($this->mValue & USER_PERMISSION_ADMIN) {
-			$name = $this->mItem->getAdminPermName();
-			if ($name) {
-				$gperm =& $this->_createGperm($name);
-				if (!$gpermHandler->insert($gperm)) {
-					return false;
-				}
+		$name = $this->mItem->getAdminPermName();
+		if ($name) {
+			$gperm =& $this->_createGperm($name);
+			if ($gpermHandler->insert($gperm)) {
+				return false;
 			}
 		}
 		
@@ -276,7 +272,7 @@
 	function loadPermission($groupId)
 	{
 		$ret = USER_PERMISSION_NONE;
-
+		
 		$gpermHandler =& xoops_gethandler('groupperm');
 		if ($gpermHandler->checkRight("system_admin", $this->mId, $groupId)) {
 			$ret |= USER_PERMISSION_ADMIN;

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:40:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:40:09 +0900
Subject: [xoops-cvslog 2256] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060204084009.398662AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupPermEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/GroupPermEditForm.class.php:1.1.2.1
--- /dev/null	Sat Feb  4 17:40:09 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupPermEditForm.class.php	Sat Feb  4 17:40:09 2006
@@ -0,0 +1,28 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class User_GroupPermEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.GroupPermEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['system'] =& new XCube_BoolArrayProperty('system');
+		$this->mFormProperties['module'] =& new XCube_BoolArrayProperty('module');
+		$this->mFormProperties['module_admin'] =& new XCube_BoolArrayProperty('module_admin');
+		$this->mFormProperties['block'] =& new XCube_BoolArrayProperty('block');
+	
+		//
+		// Set field properties
+		//
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:44:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:44:06 +0900
Subject: [xoops-cvslog 2257] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060204084406.B37072AC077@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.9 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.10
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.9	Sat Feb  4 12:38:45 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Sat Feb  4 17:44:06 2006
@@ -13,6 +13,7 @@
 define('_AD_USER_ERROR_PASSWORD', "The passwords you gave did not match.");
 define('_AD_USER_ERROR_PASSWORD_REQUIRED', "Password is required.");
 define('_AD_USER_ERROR_RAISE_ERROR', "Raise an error(s).");
+define('_AD_USER_ERROR_REQUEST_IS_WRONG', "Request is wrong");
 define('_AD_USER_ERROR_REQUIRED', "{0} is required.");
 define('_AD_USER_ERROR_UMODE', "The specified value for comment sort order is invalid.");
 define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "Username has been taken.");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 17:44:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 17:44:06 +0900
Subject: [xoops-cvslog 2258] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060204084406.D5F862AC079@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.18 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.19
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.18	Sat Feb  4 16:41:25 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Sat Feb  4 17:44:06 2006
@@ -13,6 +13,7 @@
 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', "ユーザー名が重複しています。変更して下さい。");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:06:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:06:41 +0900
Subject: [xoops-cvslog 2259] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060204090641.1D2982AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/group_member.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/group_member.xml:1.1.2.1
--- /dev/null	Sat Feb  4 18:06:41 2006
+++ xoops2jp/html/modules/user/admin/.xml/group_member.xml	Sat Feb  4 18:06:40 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="GroupMemberEditForm" type="XCube_ActionForm">
+		<form-property name="groupid" type="Int" />
+		<form-property name="uid" type="Int[]" />
+	</form-bean>
+	<form-validation>
+		<field property="uid" depends="intRange">
+			<msg name="intRange" key="const._AD_USER_ERROR_REQUEST_IS_WRONG" />
+			<var name="min" value="1" />
+			<var name="max" value="2" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:06:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:06:52 +0900
Subject: [xoops-cvslog 2260] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060204090652.DC46C2AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.1	Thu Jan 19 21:06:03 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php	Sat Feb  4 18:06:52 2006
@@ -2,6 +2,7 @@
 
 require_once XOOPS_ROOT_PATH."/class/XCube_PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH."/user/admin/class/XoopsGroupEx.class.php";
+require_once XOOPS_MODULE_PATH."/user/admin/forms/GroupMemberEditForm.class.php";
 
 /**
  *
@@ -22,11 +23,22 @@
 	 */
 	var $mNoUsers = array();
 	var $mNoPageNavi = null;
+	
+	var $mActionForm = null;
 
 	function isSecure()
 	{
 		return true;
 	}
+	
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
+	{
+		//
+		// TODO Because this action has two form, we should prepare two action forms.
+		//
+		$this->mActionForm =& new User_GroupMemberEditForm();
+		$this->mActionForm->prepare();
+	}
 
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
@@ -74,17 +86,22 @@
 		if (!is_object($this->mGroup)) {
 			return USER_FRAME_VIEW_ERROR;
 		}
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
 
 		$memberHandler =& xoops_gethandler('member');
 		
-		if (isset($_POST['uid']) && is_array($_POST['uid'])) {
-			foreach($_POST['uid'] as $uid => $value) {
-				if ($value==1) {
-					$memberHandler->addUserToGroup($this->mGroup->getVar('groupid'), $uid);
-				}
-				elseif ($value==2) {
-					$memberHandler->removeUserFromGroup($this->mGroup->getVar('groupid'), $uid);
-				}
+		foreach($this->mActionForm->get('uid') as $uid => $value) {
+			if ($value==1) {
+				$memberHandler->addUserToGroup($this->mGroup->getVar('groupid'), $uid);
+			}
+			elseif ($value==2) {
+				$memberHandler->removeUserFromGroup($this->mGroup->getVar('groupid'), $uid);
 			}
 		}
 		
@@ -94,7 +111,7 @@
 	function _loadGroup()
 	{
 		if (!is_object($this->mGroup)) {
-			$groupId = isset($_REQUEST['groupid']) ? intval($_REQUEST['groupid']) : 0;
+			$groupId = xoops_getrequest('groupid');
 
 			$groupHandler =& xoops_gethandler('group');
 			$group =& $groupHandler->get($groupId);
@@ -114,6 +131,8 @@
 
 		$render->setAttribute("noUsers",$this->mNoUsers);
 		$render->setAttribute("noPageNavi",$this->mNoPageNavi);
+		
+		$render->setAttribute("actionForm",$this->mActionForm);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:07:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:07:01 +0900
Subject: [xoops-cvslog 2261] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060204090701.036BE2AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php:1.1.2.1
--- /dev/null	Sat Feb  4 18:07:00 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php	Sat Feb  4 18:07:00 2006
@@ -0,0 +1,32 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+class User_GroupMemberEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.GroupMemberEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['groupid'] =& new XCube_IntProperty('groupid');
+		$this->mFormProperties['uid'] =& new XCube_IntArrayProperty('uid');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['uid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['uid']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['uid']->addMessage('intRange', _AD_USER_ERROR_REQUEST_IS_WRONG);
+		$this->mFieldProperties['uid']->addVar('min', '1');
+		$this->mFieldProperties['uid']->addVar('max', '2');
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:07:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:07:11 +0900
Subject: [xoops-cvslog 2262] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060204090711.53D762AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.5 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.5	Thu Feb  2 23:09:17 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Sat Feb  4 18:07:11 2006
@@ -38,7 +38,19 @@
 <hr />
 <h4><{$smarty.const._AD_USER_LANG_GROUP_NOASSIN_MEMBERS}></h4>
 
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
+<{assign var=tokenName value=$actionForm->getTokenName()}>
+<{assign var=tokenValue value=$actionForm->getToken()}>
+
 <form method="POST">
+<{xoops_token name=$tokenName value=$tokenValue}>
 <input type="hidden" name="perpage" value="<{$pageNavi->getPerpage()}>" />
 <input type="hidden" name="start" value="<{$pageNavi->getStart()}>" />
 <input type="hidden" name="noperpage" value="<{$noPageNavi->getPerpage()}>" />
@@ -89,6 +101,7 @@
 <h4><{$smarty.const._AD_USER_LANG_GROUP_ASSIN_MEMBERS}></h4>
 
 <form method="POST">
+<{xoops_token name=$tokenName value=$tokenValue}>
 <input type="hidden" name="perpage" value="<{$pageNavi->getPerpage()}>" />
 <input type="hidden" name="start" value="<{$pageNavi->getStart()}>" />
 <input type="hidden" name="noperpage" value="<{$noPageNavi->getPerpage()}>" />

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:07:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:07:32 +0900
Subject: [xoops-cvslog 2263] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060204090732.6BBB32AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.6 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.6	Sat Feb  4 17:38:12 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Sat Feb  4 18:07:32 2006
@@ -6,14 +6,6 @@
 
 <h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getVar('name')}> )</h3>
 
-<{if $actionForm->hasError()}>
-  <ul>
-    <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
-    <{/foreach}>
-  </ul>
-<{/if}>
-
 <table class="outer">
   <tr>
     <th>&nbsp;</th>
@@ -48,6 +40,14 @@
 
 <h5><{$smarty.const._AD_USER_LANG_PERM_MODULE_ACCESS}></h5>
 
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
 <form action="index.php?action=GroupPerm" method="POST">
 <{xoops_token form=$actionForm}>
 <table class="outer">

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:30:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:30:09 +0900
Subject: [xoops-cvslog 2264] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060204093009.11E722AC079@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/welcome.php
diff -u xoops2jp/html/install/language/english/welcome.php:1.2.8.1 xoops2jp/html/install/language/english/welcome.php:1.2.8.2
--- xoops2jp/html/install/language/english/welcome.php:1.2.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/english/welcome.php	Sat Feb  4 18:30:08 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: welcome.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x Exp $
+// $Id: welcome.php,v 1.2.8.2 2006/02/04 09:30:08 minahito Exp $
 $content .=
 "<u><b>What is it?</b></u>
 <p>
@@ -16,7 +16,7 @@
 <p>
 <ul>
 <li>WWW Server (<a href='http://www.apache.org/' target='_blank'>Apache</a>, IIS, Roxen, etc)</li>
-<li><a href='http://www.php.net/' target='_blank'>PHP</a> 4.0.5 and higher (4.1.1 or higher recommended)</li>
+<li><a href='http://www.php.net/' target='_blank'>PHP</a> 4.3.2 and higher</li>
 <li><a href='http://www.mysql.com/' target='_blank'>MySQL</a> Database 3.23.XX</li>
 </ul>
 </p>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:30:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:30:09 +0900
Subject: [xoops-cvslog 2265] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060204093009.34E9D2AC07A@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/welcome.php
diff -u xoops2jp/html/install/language/japanese/welcome.php:1.1.8.1 xoops2jp/html/install/language/japanese/welcome.php:1.1.8.2
--- xoops2jp/html/install/language/japanese/welcome.php:1.1.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/japanese/welcome.php	Sat Feb  4 18:30:09 2006
@@ -13,7 +13,7 @@
 <p>
 <ul>
 <li>ウェブサーバ(<a href='http://www.apache.org/' target='_blank'>Apache</a>, IIS, Roxen, など)</li>
-<li><a href='http://www.php.net/' target='_blank'>PHP</a> 4.1.0以降(4.1.1以降を推奨します。)</li>
+<li><a href='http://www.php.net/' target='_blank'>PHP</a> 4.3.2以降</li>
 <li>データベースサーバ（<a href='http://www.mysql.com/' target='_blank'>MySQL</a> Database 3.23.XX）</li>
 </ul>
 </p>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:31:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:31:01 +0900
Subject: [xoops-cvslog 2266] CVS update: xoops2jp/docs
Message-ID: <20060204093101.4BD372AC050@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.1 xoops2jp/docs/INSTALL.ja.html:1.1.8.2
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.1	Wed Oct 19 02:10:44 2005
+++ xoops2jp/docs/INSTALL.ja.html	Sat Feb  4 18:31:01 2006
@@ -55,7 +55,7 @@
 </p>
 <div class="indent">
 * HTTPサーバ (<a href="http://www.apache.org">Apache</a> または IIS) 注：XOOPS公式サポートHTTPサーバはApache<br />
-* <a href="http://www.php.net">PHP</a> 4.1.0 以上 (4.1.1 以上を推奨)<br />
+* <a href="http://www.php.net">PHP</a> 4.3.2 以上<br />
 * <a href="http://www.mysql.com">MySQL</a> データベース 3.23.XX<br />
 </div>
 
Index: xoops2jp/docs/INSTALL.html
diff -u xoops2jp/docs/INSTALL.html:1.1 xoops2jp/docs/INSTALL.html:1.1.8.1
--- xoops2jp/docs/INSTALL.html:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/docs/INSTALL.html	Sat Feb  4 18:31:01 2006
@@ -43,7 +43,7 @@
 <br />
 To install XOOPS for the first time, you'll need to have the minimum following server software pre-installed:<br />
 <div class="indent">* HTTP Server (<a href="http://www.apache.org">Apache</a> or IIS)  "Note, XOOPS only officially supports Apache"<br />
-* <a href="http://www.php.net">PHP</a> 4.1.0 and higher (4.1.1 or higher recommended)<br />
+* <a href="http://www.php.net">PHP</a> 4.3.2 and higher<br />
 * <a href="http://www.mysql.com">MySQL</a> Database 3.23.XX</div>
 <br />
 Before starting the install, be sure to have:<br />

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:40:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:40:14 +0900
Subject: [xoops-cvslog 2267] CVS update: xoops2jp/html/install
Message-ID: <20060204094014.0657F2AC050@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.8 xoops2jp/html/install/makedata.php:1.2.8.9
--- xoops2jp/html/install/makedata.php:1.2.8.8	Sat Feb  4 16:32:39 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 18:40:13 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.8 2006/02/04 07:32:39 minahito Exp $
+// $Id: makedata.php,v 1.2.8.9 2006/02/04 09:40:13 minahito 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.jp/', 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.jp/', 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.jp/', 1008813250)");
 
     // default theme
 
@@ -104,7 +104,7 @@
     $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '0', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)");
     $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', 'xoops_user', '_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', '1', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)");
+    $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '0', '_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', '127.0.0.1', '_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)");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:46:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:46:28 +0900
Subject: [xoops-cvslog 2268] CVS update: xoops2jp/html/install
Message-ID: <20060204094628.A54F32AC02E@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.2.8.9 xoops2jp/html/install/makedata.php:1.2.8.10
--- xoops2jp/html/install/makedata.php:1.2.8.9	Sat Feb  4 18:40:13 2006
+++ xoops2jp/html/install/makedata.php	Sat Feb  4 18:46:28 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.2.8.9 2006/02/04 09:40:13 minahito Exp $
+// $Id: makedata.php,v 1.2.8.10 2006/02/04 09:46:28 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -125,11 +125,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$', 'xoopscube.jp$')))."', '_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', '', '_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.1 Alpha 1 &copy; 2001-2006 <a href=\"http://www.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)");

From minahito ＠ users.sourceforge.jp  Sat Feb  4 18:59:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 18:59:46 +0900
Subject: [xoops-cvslog 2269] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20060204095946.B882B2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/themes/cube_default/theme.html
diff -u xoops2jp/html/themes/cube_default/theme.html:1.1.2.1 xoops2jp/html/themes/cube_default/theme.html:1.1.2.2
--- xoops2jp/html/themes/cube_default/theme.html:1.1.2.1	Fri Dec 30 17:32:04 2005
+++ xoops2jp/html/themes/cube_default/theme.html	Sat Feb  4 18:59:46 2006
@@ -95,8 +95,8 @@
 </table>
 
 <div class="footerbar">
-<a href=""><img src="<{$xoops_imageurl}>images/poweredby.gif" width="230" height="10" alt="XOOPS Cube PROJECT" /></a><br />
-<{if $xoops_footer != 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href="http://www.xoops.org/" target="_blank">The XOOPS Project</a>'}><{$xoops_footer}><{/if}>
+<a href="http://xoopscube.org"><img src="<{$xoops_imageurl}>images/poweredby.gif" width="230" height="10" alt="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>
 
 </div>

From minahito ＠ users.sourceforge.jp  Sat Feb  4 19:08:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Feb 2006 19:08:42 +0900
Subject: [xoops-cvslog 2270] CVS update: xoops2jp/html/class
Message-ID: <20060204100842.9352F2AC049@users.sourceforge.jp>

Index: xoops2jp/html/class/errorhandler.php
diff -u xoops2jp/html/class/errorhandler.php:1.2.8.1 xoops2jp/html/class/errorhandler.php:1.2.8.2
--- xoops2jp/html/class/errorhandler.php:1.2.8.1	Wed Oct 19 02:15:05 2005
+++ xoops2jp/html/class/errorhandler.php	Sat Feb  4 19:08:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: errorhandler.php,v 1.2.8.1 2005/10/18 17:15:05 minahito Exp $
+// $Id: errorhandler.php,v 1.2.8.2 2006/02/04 10:08:42 minahito 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  Sat Feb  4 22:32:38 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:32:38 +0900
Subject: [xoops-cvslog 2271] CVS update:
	xoops2jp/html/modules/user/language/english/mail_template
Message-ID: <20060204133238.72B762AC035@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:32:42 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:32:42 +0900
Subject: [xoops-cvslog 2272] CVS update:
	xoops2jp/html/modules/user/language/japanese/mail_template
Message-ID: <20060204133242.3A35B2AC035@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:31 +0900
Subject: [xoops-cvslog 2273] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060204133532.01EC02AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.4	Sat Feb  4 16:52:47 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Sat Feb  4 22:35:31 2006
@@ -1,134 +1,145 @@
-<?php
-require_once XOOPS_MODULE_PATH."/user/forms/UserConfirmForm.class.php";
-require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
-require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
-class User_UserRegister_confirmAction extends User_Action
-{
-	var $mActionForm=null;
-	var $mRegistForm=null;
-	var $mUserConfig=array();
-	
-	var $mNewUser=null;
-	
-	var $mRedirectMessage=null;
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		$confingHandler=&xoops_gethandler('config');
-		$this->mUserConfig=&$confingHandler->getConfigsByCat(XOOPS_CONF_USER);
-
-		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",new XCube_InstanceDelegate($this,"eventNotifyMail"));
-	}
-
-	function execute(&$controller,&$xoopsUser)
-	{
-		// confirmForm
-		$this->_getRegistForm($controller);
-		$this->_processActionForm($controller);
-		
-		$memberHandler=&xoops_gethandler('member');
-		$this->mNewUser=&$memberHandler->createUser();
-		$this->mRegistForm->update($this->mNewUser);
-		$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
-		$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
-		if($this->mUserConfig['activation_type'] == 1) {
-			$this->mNewUsersetVar('level',1,true);
-		}
-
-		if(!$memberHandler->insertUser($this->mNewUser)) {
-			$this->mRedirectMessage=_US_REGISTERNG;
-			return USER_FRAME_VIEW_ERROR;
-		}
-
-        if(!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS,$this->mNewUser->getVar('uid'))) {
-			$this->mRedirectMessage=_US_REGISTERNG;
-			return USER_FRAME_VIEW_ERROR;
-		}
-
-		$this->_clearRegistForm($controller);
-
-		$this->_processMail($controller);
-		$eventArgs = array();
-		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
-
-		// TODO the following process
-
-		if($this->mUserConfig['activation_type']==1)
-			XCube_Utils::redirectHeader(XOOPS_URL,4,_US_ACTLOGIN);
-	}
-	
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->_getRegistForm($controller);
-		$this->_processActionForm($controller);
-
-		return USER_FRAME_VIEW_INPUT;
-	}
-	
-	/**
-	 * Get regist actionform from Session and set it to the member property.
-	 */
-	function _getRegistForm(&$controller)
-	{
-		$this->mRegistForm=& unserialize($_SESSION['user_register_actionform']);
-		if(!is_object($this->mRegistForm)) {
-			$controller->executeForward('./index.php?action=UserRegister');
-		}
-	}
-
-	/**
-	 * clear session
-	 */
-	function _clearRegistForm(&$controller)
-	{
-		unset($_SESSION['user_register_actionform']);
-	}
-	
-	function _processMail(&$controller)
-	{
-		$activationType=$this->mUserConfig['activation_type'];
-		
-		if($activationType==1)
-			return;
-
-		// Wmm..
-		$builder = ($activationType==0) ? new RegistUserActivateMailBuilder()
-		                                    : new RegistUserAdminActivateMailBuilder();
-
-		$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
-		$director->contruct($builder);
-		$mailer=&$builder->getResult();
-		
-		$mailer->send();	// CHECKS
-	}
-	
-	function eventNotifyMail(&$controller,&$eventArgs)
-	{
-		if($this->mUserConfig['new_user_notify'] == 1 && !empty($this->mUserConfig['new_user_notify_group'])) {
-			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
-			$builder = new RegistUserNotifyMailBuilder();
-			$director->contruct($builder);
-			$mailer=&$builder->getResult();
-			$mailer->send();
-		}
-	}
-
-	function _processActionForm(&$controller)
-	{
-		$this->mActionForm=new UserConfirmForm();
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader(XOOPS_URL,1,$this->mRedirectMessage);
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("user_register_confirm.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("registForm",$this->mRegistForm);
-	}
-}
-
+<?php
+require_once XOOPS_MODULE_PATH."/user/forms/UserConfirmForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
+class User_UserRegister_confirmAction extends User_Action
+{
+	var $mActionForm=null;
+	var $mRegistForm=null;
+	var $mUserConfig=array();
+	
+	var $mNewUser=null;
+	
+	var $mRedirectMessage=null;
+
+	function prepare(&$controller,&$xoopsUser)
+	{
+		$confingHandler=&xoops_gethandler('config');
+		$this->mUserConfig=&$confingHandler->getConfigsByCat(XOOPS_CONF_USER);
+
+		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",new XCube_InstanceDelegate($this,"eventNotifyMail"));
+	}
+
+	function execute(&$controller,&$xoopsUser)
+	{
+		// confirmForm
+		$this->_getRegistForm($controller);
+		$this->_processActionForm($controller);
+		
+		$memberHandler=&xoops_gethandler('member');
+		$this->mNewUser=&$memberHandler->createUser();
+		$this->mRegistForm->update($this->mNewUser);
+		$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
+		$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
+		if($this->mUserConfig['activation_type'] == 1) {
+			$this->mNewUsersetVar('level',1,true);
+		}
+
+		if(!$memberHandler->insertUser($this->mNewUser)) {
+			$this->mRedirectMessage=_US_REGISTERNG;
+			return USER_FRAME_VIEW_ERROR;
+		}
+
+        if(!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS,$this->mNewUser->getVar('uid'))) {
+			$this->mRedirectMessage=_US_REGISTERNG;
+			return USER_FRAME_VIEW_ERROR;
+		}
+
+		$this->_clearRegistForm($controller);
+
+		$this->_processMail($controller);
+		$eventArgs = array();
+		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
+		
+		return true;
+	}
+	
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		$this->_getRegistForm($controller);
+		$this->_processActionForm($controller);
+
+		return USER_FRAME_VIEW_INPUT;
+	}
+	
+	/**
+	 * Get regist actionform from Session and set it to the member property.
+	 */
+	function _getRegistForm(&$controller)
+	{
+		$this->mRegistForm=& unserialize($_SESSION['user_register_actionform']);
+		if(!is_object($this->mRegistForm)) {
+			$controller->executeForward('./index.php?action=UserRegister');
+		}
+	}
+
+	/**
+	 * clear session
+	 */
+	function _clearRegistForm(&$controller)
+	{
+		unset($_SESSION['user_register_actionform']);
+	}
+	
+	function _processMail(&$controller)
+	{
+		$activationType=$this->mUserConfig['activation_type'];
+		
+		if($activationType==1)
+			return;
+
+		// Wmm..
+		$builder = ($activationType==0) ? new RegistUserActivateMailBuilder()
+		                                    : new RegistUserAdminActivateMailBuilder();
+
+		$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
+		$director->contruct($builder);
+		$mailer=&$builder->getResult();
+		
+		$mailer->send();	// CHECKS
+	}
+	
+	function eventNotifyMail(&$controller,&$eventArgs)
+	{
+		if($this->mUserConfig['new_user_notify'] == 1 && !empty($this->mUserConfig['new_user_notify_group'])) {
+			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
+			$builder = new RegistUserNotifyMailBuilder();
+			$director->contruct($builder);
+			$mailer=&$builder->getResult();
+			$mailer->send();
+		}
+	}
+
+	function _processActionForm(&$controller)
+	{
+		$this->mActionForm=new UserConfirmForm();
+	}
+
+	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		XCube_Utils::redirectHeader(XOOPS_URL,1,$this->mRedirectMessage);
+	}
+
+	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$renderSystem->setTemplateName("user_register_confirm.html");
+		$renderSystem->setAttribute("actionForm",$this->mActionForm);
+		$renderSystem->setAttribute("registForm",$this->mRegistForm);
+	}
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$activationType=$this->mUserConfig['activation_type'];
+
+		if($activationType==0) {
+			$renderSystem->setTemplateName("user_register_finish.html");
+			$renderSystem->setAttribute("complete_message",_US_YOURREGISTERED);
+		} else if($activationType==1) {
+			XCube_Utils::redirectHeader(XOOPS_URL,4,_US_ACTLOGIN);
+		} else if($activationType==2) {
+			$renderSystem->setTemplateName("user_register_finish.html");
+			$renderSystem->setAttribute("complete_message",_US_YOURREGISTERED2);
+		}
+	}
+}
+
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2274] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060204133532.275302AC038@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.2 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.2	Sat Feb  4 16:52:47 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Sat Feb  4 22:35:32 2006
@@ -1,135 +1,142 @@
-<?php
-
-class UserRegistMailDirector
-{
-	var $mBuilder;
-	var $mUser;
-	var $mXoopsConfig;
-	var $mUserConfig;
-
-	function UserRegistMailDirector(&$user,$xoopsConfig,$userConfig)
-	{
-		$this->mUser=&$user;
-		$this->mXoopsConfig=$xoopsConfig;
-		$this->mUserConfig=$userConfig;
-	}
-	
-	function contruct(&$builder)
-	{
-		$builder->setTemplate();
-		$builder->setToUsers($this->mUser,$this->mUserConfig);
-		$builder->setFromEmail($this->mXoopsConfig);
-		$builder->setSubject($this->mUser,$this->mXoopsConfig);
-		$builder->setBody($this->mUser,$this->mXoopsConfig);
-	}
-}
-
-class RegistUserActivateMailBuilder
-{
-	var $mMailer;
-	
-	function RegistUserActivateMailBuilder()
-	{
-		$this->mMailer=&getMailer();
-		$this->mMailer->useMail();
-	}
-
-	function setTemplate()
-	{
-		$this->mMailer->setTemplate("register.tpl");
-	}
-
-	function setToUsers($user,$userConfig)
-	{
-		$this->mMailer->setToUsers($user);
-	}
-	
-	function setFromEmail($xoopsConfig)
-	{
-		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
-		$this->mMailer->setFromName($xoopsConfig['sitename']);
-	}
-	
-	function setSubject($user,$xoopsConfig)
-	{
-		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
-	}
-
-	function setBody($user,$xoopsConfig)
-	{
-		$this->mMailer->assign("SITENAME",$xoopsConfig['sitename']);
-		$this->mMailer->assign("ADMINMAIL",$xoopsConfig['adminmail']);
-		$this->mMailer->assign("SITEURL",XOOPS_URL."/");
-	}
-	
-	function &getResult()
-	{
-		return $this->mMailer;
-	}
-}
-
-class RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
-{
-	function setTemplate()
-	{
-		$this->mMailer->setTemplate("adminactivate.tpl");
-	}
-
-	function setToUsers($user,$userConfig)
-	{
-		$memberHandler=&xoops_gethandler('member');
-		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
-		$this->mMailer->setToUsers($user);
-	}
-	
-	function setFromUser($xoopsConfig)
-	{
-		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
-		$this->mMailer->setFromName($xoopsConfig['sitename']);
-	}
-	
-	function setSubject($user,$xoopsConfig)
-	{
-		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
-	}
-
-	function setBody($user,$xoopsConfig)
-	{
-		parent::doAssign();
-		$this->mMailer->assign('USERNAME', $user->getVar('uname'));
-		$this->mMailer->assign('USEREMAIL', $user->getVar('email'));
-		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/user.php?op=actv&id='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
-	}
-}
-
-class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
-{
-	function setTemplate()
-	{
-	}
-
-	function setToUsers($user,$userConfig)
-	{
-		$memberHandler=&xoops_gethandler('member');
-		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
-	}
-	
-	function setFromUser($xoopsConfig)
-	{
-		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
-		$this->mMailer->setFromName($xoopsConfig['sitename']);
-	}
-	
-	function setSubject($user,$xoopsConfig)
-	{
-		$this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
-	}
-
-	function setBody($user,$xoopsConfig)
-	{
-		$this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
-	}
-}
-
-
+<?php
+
+class UserRegistMailDirector
+{
+	var $mBuilder;
+	var $mUser;
+	var $mXoopsConfig;
+	var $mUserConfig;
+
+	function UserRegistMailDirector(&$user,$xoopsConfig,$userConfig)
+	{
+		$this->mUser=&$user;
+		$this->mXoopsConfig=$xoopsConfig;
+		$this->mUserConfig=$userConfig;
+	}
+	
+	function contruct(&$builder)
+	{
+		$builder->setTemplate();
+		$builder->setToUsers($this->mUser,$this->mUserConfig);
+		$builder->setFromEmail($this->mXoopsConfig);
+		$builder->setSubject($this->mUser,$this->mXoopsConfig);
+		$builder->setBody($this->mUser,$this->mXoopsConfig);
+	}
+}
+
+class RegistUserActivateMailBuilder
+{
+	var $mMailer;
+	
+	function RegistUserActivateMailBuilder()
+	{
+		$this->mMailer=&getMailer();
+		$this->mMailer->useMail();
+	}
+
+	function setTemplate()
+	{
+		$root=&XCube_Root::getSingleton();
+		$language = $root->mController->getConfig('language');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH."/modules/user/language/".$language."/mail_template/");
+		$this->mMailer->setTemplate("register.tpl");
+	}
+
+	function setToUsers($user,$userConfig)
+	{
+		$this->mMailer->setToUsers($user);
+	}
+	
+	function setFromEmail($xoopsConfig)
+	{
+		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+		$this->mMailer->setFromName($xoopsConfig['sitename']);
+	}
+	
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
+	}
+
+	function setBody($user,$xoopsConfig)
+	{
+		$this->mMailer->assign("SITENAME",$xoopsConfig['sitename']);
+		$this->mMailer->assign("ADMINMAIL",$xoopsConfig['adminmail']);
+		$this->mMailer->assign("SITEURL",XOOPS_URL."/");
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+	}
+	
+	function &getResult()
+	{
+		return $this->mMailer;
+	}
+}
+
+class RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
+{
+	function setTemplate()
+	{
+		$root=&XCube_Root::getSingleton();
+		$language = $root->mController->getConfig('language');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH."/modules/user/language/".$language."/mail_template/");
+		$this->mMailer->setTemplate("adminactivate.tpl");
+	}
+
+	function setToUsers($user,$userConfig)
+	{
+		$memberHandler=&xoops_gethandler('member');
+		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
+		$this->mMailer->setToUsers($user);
+	}
+	
+	function setFromUser($xoopsConfig)
+	{
+		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+		$this->mMailer->setFromName($xoopsConfig['sitename']);
+	}
+	
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
+	}
+
+	function setBody($user,$xoopsConfig)
+	{
+		parent::doAssign();
+		$this->mMailer->assign('USERNAME', $user->getVar('uname'));
+		$this->mMailer->assign('USEREMAIL', $user->getVar('email'));
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+	}
+}
+
+class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
+{
+	function setTemplate()
+	{
+	}
+
+	function setToUsers($user,$userConfig)
+	{
+		$memberHandler=&xoops_gethandler('member');
+		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
+	}
+	
+	function setFromUser($xoopsConfig)
+	{
+		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+		$this->mMailer->setFromName($xoopsConfig['sitename']);
+	}
+	
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
+	}
+
+	function setBody($user,$xoopsConfig)
+	{
+		$this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
+	}
+}
+
+
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2275] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060204133532.4CF7F2AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.3 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.3	Sat Feb  4 16:52:47 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php	Sat Feb  4 22:35:32 2006
@@ -26,6 +26,8 @@
 		$this->mFormProperties['vpass'] =& new XCube_StringProperty('vpass');
 		$this->mFormProperties['user_mailok'] =& new XCube_BoolProperty('user_mailok');
 		$this->mFormProperties['agree'] =& new XCube_BoolProperty('agree');
+		$this->mFormProperties['actkey']=new XCube_StringProperty('actkey');
+		$this->mFormProperties['user_regdate']=new XCube_IntProperty('user_regdate');
 
 		//
 		// Set field properties
@@ -71,11 +73,15 @@
 		$obj->set('email', $this->get('email'));
 		$obj->set('user_viewemail', $this->get('user_viewemail'));
 		$obj->set('url', $this->get('url'));
+		$obj->set('user_avatar','blank.gif',true);
 		$obj->set('timezone_offset', $this->get('timezone_offset'));
-		$obj->set('pass', $this->get('pass'));
-		$obj->set('vpass', $this->get('vpass'));
+		$obj->set('pass', md5($this->get('pass')));
 		$obj->set('user_mailok', $this->get('user_mailok'));
 		$obj->set('agree', $this->get('agree'));
+
+		$actkey=substr(md5(uniqid(mt_rand(),1)),0,8);
+        $obj->set('actkey',$actkey,true);
+        $obj->set('user_regdate',time(),true);
 	}
 }
 class UserRegisterAgreeEditForm extends UserRegisterEditForm 
Index: xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:1.1.2.7 xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:removed
--- xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php:1.1.2.7	Thu Feb  2 17:50:32 2006
+++ xoops2jp/html/modules/user/forms/RegisterUserEditForm.class.php	Sat Feb  4 22:35:32 2006
@@ -1,194 +0,0 @@
-<?php
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class RegisterUserEditForm extends XCube_ActionForm 
-{
-	var $mConfig;
-
-	function getTokenName()
-	{
-		return "module.user.RegisterUserEditForm.TOKEN";
-	}
-
-	function RegisterUserEditForm()
-	{
-	}
-	
-	function prepare($userConfig)
-	{
-		$this->mConfig=$userConfig;
-		
-		// set properties
-		$this->mFormProperties['uname']=new XCube_StringProperty('uname');
-		$this->mFormProperties['email']=new XCube_StringProperty('email');
-		$this->mFormProperties['user_viewemail']=new XCube_IntProperty('user_viewemail');
-		$this->mFormProperties['url']=new XCube_StringProperty('url');
-		$this->mFormProperties['pass']=new XCube_StringProperty('pass');
-		$this->mFormProperties['vpass']=new XCube_StringProperty('vpass');
-		$this->mFormProperties['user_mailok']=new XCube_IntProperty('user_mailok');
-
-		// set fields
-		$this->mFieldProperties['uname']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['uname']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['uname']->addMessage("required",_MD_USER_ERROR_REQUIRED,_US_NICKNAME,"25");
-		$this->mFieldProperties['uname']->addMessage("minlength",_MD_USER_ERROR_MINLENGTH,_US_NICKNAME,"25");
-		$this->mFieldProperties['uname']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_NICKNAME,"25");
-		$this->mFieldProperties['uname']->addVar("minlength",$userConfig['minuname']);
-		$this->mFieldProperties['uname']->addVar("maxlength",$userConfig['maxuname']);
-
-		$this->mFieldProperties['email']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['email']->addMessage("required",_MD_USER_ERROR_REQUIRED,_US_EMAIL,"60");
-		$this->mFieldProperties['email']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_EMAIL,"60");
-		$this->mFieldProperties['email']->addVar("maxlength",60);
-
-		$this->mFieldProperties['user_viewemail']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_viewemail']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['user_viewemail']->addMessage("intRange",_MD_USER_ERROR_INTRANGE,"user_viewemail");
-		$this->mFieldProperties['user_viewemail']->addVar("min",0);
-		$this->mFieldProperties['user_viewemail']->addVar("max",1);
-
-		$this->mFieldProperties['url']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['url']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_WEBSITE,"100");
-		$this->mFieldProperties['url']->addVar("maxlength",100);
-
-		$this->mFieldProperties['user_mailok']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_mailok']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['user_mailok']->addMessage("intRange",_MD_USER_ERROR_INTRANGE,"user_mailok");
-		$this->mFieldProperties['user_mailok']->addVar("min",0);
-		$this->mFieldProperties['user_mailok']->addVar("max",1);
-
-		$this->mFieldProperties['pass']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['pass']->setDependsByArray(array('required','minlength','maxlength'));
-		$this->mFieldProperties['pass']->addMessage("required",_MD_USER_ERROR_REQUIRED,_US_PASSWORD,"30","60");
-		$this->mFieldProperties['pass']->addMessage("minlength",_MD_USER_ERROR_PASSWORD_MINLENGTH,_US_PASSWORD,"30","60");
-		$this->mFieldProperties['pass']->addMessage("maxlength",_MD_USER_ERROR_PASSWORD_MAXLENGTH,_US_PASSWORD,"30","60");
-		$this->mFieldProperties['pass']->addVar("minlength",$userConfig['minpass']);
-		$this->mFieldProperties['pass']->addVar("maxlength",32);
-	}
-
-	function validatePass()
-	{
-		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
-			if($this->getVar('pass')!=$this->getVar('vpass')) {
-				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
-				$this->set('pass',null);	// reset
-				$this->set('vpass',null);
-			}
-	}
-
-	function validateUname()
-	{
-		if($this->getVar('uname')) {
-
-			//
-			// uname unique check
-			//
-			$userHandler=&xoops_gethandler('user');
-			$count=$userHandler->getCount(new Criteria('uname',$this->getVar('uname')));
-			if($count!=0) {
-				$this->addErrorMessage(_US_NICKNAMETAKEN);
-			}
-
-			//
-			// Check allow uname string pattern.
-			//
-			$regex="";
-			switch($this->mConfig['uname_test_level']) {
-				case 0:
-					$regex="/[^a-zA-Z0-9\_\-]/";
-					break;
-
-				case 1:
-					$regex="/[^a-zA-Z0-9\_\-\<\>\,\.\$\%\#\@\!\\\'\"]/";
-					break;
-
-				case 2:
-					$regex="//[\000-\040]/";
-					break;
-			}
-			if(preg_match($regex,$this->getVar('uname'))) {
-				$this->addErrorMessage(_US_INVALIDNICKNAME);
-			}
-
-
-			//
-			// Check bad uname patterns.
-			//
-			foreach(explode("|",$this->mConfig['bad_unames']) as $pattern) {
-				if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->getVar('uname'))) {
-					$this->addErrorMessage(_US_NAMERESERVED);
-					break;
-				}
-			}
-		}
-	}
-
-	function validateEmail()
-	{
-		if($this->getVar('email')) {
-
-			//
-			// email unique check
-			//
-			$userHandler=&xoops_gethandler('user');
-			$count=$userHandler->getCount(new Criteria('email',$this->getVar('email')));
-			if($count!=0) {
-				$this->addErrorMessage(_US_EMAILTAKEN);
-			}
-			
-
-			//
-			// Check bad email patterns.
-			//
-			foreach(explode("|",$this->mConfig['bad_emails']) as $pattern) {
-				if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->getVar('email'))) {
-					$this->addErrorMessage(_US_INVALIDMAIL);
-					break;
-				}
-			}
-		}
-	}
-
-	function update(&$user)
-	{
-		$user->set('uname',$this->getVar('uname'),true);
-		$user->set('email',$this->getVar('email'),true);
-		$user->set('user_viewemail',$this->getVar('user_viewemail'),true);
-		$user->set('url',$this->getVar('url'),true);
-		$user->set('user_avatar','blank.gif',true);
-        $user->set('pass', md5($this->getVar('pass')), true);
-        // $user->set('timezone_offset',$this->getVar('timezone_offset'),true);
-        $user->set('user_mailok',$this->getVar('user_mailok'),true);
-
-		$actkey=substr(md5(uniqid(mt_rand(),1)),0,8);
-        $user->set('actkey',$actkey,true);
-        $user->set('user_regdate',time(),true);
-	}
-}
-
-class RegisterUserAgreeEditForm extends RegisterUserEditForm 
-{
-	function prepare($userConfig)
-	{
-		parent::prepare($userConfig);
-		
-		// set properties
-		$this->mFormProperties['agree']=new XCube_IntProperty('agree');
-
-		// set fields
-		$this->mFieldProperties['agree']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['agree']->setDependsByArray(array('required','intRange'));
-		$this->mFieldProperties['agree']->addMessage("required",_US_UNEEDAGREE);
-		$this->mFieldProperties['agree']->addMessage("intRange",_US_UNEEDAGREE);
-		$this->mFieldProperties['agree']->addVar("min",1);
-		$this->mFieldProperties['agree']->addVar("max",1);
-	}
-}
-
-
-?>

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2276] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060204133532.722D42AC038@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.4
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.3	Sat Feb  4 16:52:48 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Sat Feb  4 22:35:32 2006
@@ -14,7 +14,7 @@
   </tr>
   <tr>
     <td colsapn="2" class="foot" style="text-align:center;">
-      <input type="submit" value="<{$smarty.const._US_SUBMIT}>" />
+      <input type="submit" value="<{$smarty.const._US_FINISH}>" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/user/templates/user_register_finish.html
diff -u /dev/null xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/templates/user_register_finish.html	Sat Feb  4 22:35:32 2006
@@ -0,0 +1 @@
+<div><{$complete_message}></div>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2277] CVS update: xoops2jp/html/modules/user
Message-ID: <20060204133532.967342AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.12 xoops2jp/html/modules/user/xoops_version.php:1.1.2.13
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.12	Fri Feb  3 20:19:37 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sat Feb  4 22:35:32 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.12 2006/02/03 11:19:37 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.13 2006/02/04 13:35:32 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -66,6 +66,9 @@
 $modversion['templates'][8]['file'] = 'user_avatar_edit.html';
 $modversion['templates'][8]['description'] = '';
 
+$modversion['templates'][9]['file'] = 'user_register_finish.html';
+$modversion['templates'][9]['description'] = '';
+
 //Preference
 $modversion['config'][]=array (
 		"name"=>"allow_register",

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2278] CVS update:
	xoops2jp/html/modules/user/language/english/mail_template
Message-ID: <20060204133532.BB0E02AC038@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/mail_template/activated.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/english/mail_template/activated.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/english/mail_template/activated.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,12 @@
+Hello {X_UNAME},
+
+Your new account at {SITENAME} has been activated by the administrator.
+
+You can now login from the following URL with the password you have provided upon registration.
+
+{SITEURL}user.php
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/english/mail_template/adminactivate.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/english/mail_template/adminactivate.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/english/mail_template/adminactivate.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,11 @@
+Hello {X_UNAME},
+
+A new user {USERNAME} ({USEREMAIL}) has just registered an account at {SITENAME}.
+Clicking on the link below will activate the account of this user:
+
+{USERACTLINK}
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/english/mail_template/register.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/english/mail_template/register.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/english/mail_template/register.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,21 @@
+Hello {X_UNAME},
+
+Thanks for subscribing to {SITENAME}. As a registered member your can:
+- Send private messages among members
+- Participate in discussion boards
+- Get the latest news
+- Submit content
+- Much, much more....
+
+The email address ({X_UEMAIL}) has been used to register an account.
+
+To become a member of {SITENAME}, please confirm your
+request by clicking on the link below:
+
+{USERACTLINK}
+
+-----------
+Best Regards
+{SITENAME}
+({SITEURL}) 
+{ADMINMAIL}
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Feb  4 22:35:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Feb 2006 22:35:32 +0900
Subject: [xoops-cvslog 2279] CVS update:
	xoops2jp/html/modules/user/language/japanese/mail_template
Message-ID: <20060204133532.DF45B2AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/mail_template/activated.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/mail_template/activated.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/japanese/mail_template/activated.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,12 @@
+{X_UNAME}さん
+
+{SITENAME}でのユーザアカウントが管理人により承認されました。
+
+登録時に指定したパスワードを使用して下記リンクよりログインしてください。
+
+{SITEURL}user.php
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/japanese/mail_template/adminactivate.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/mail_template/adminactivate.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/japanese/mail_template/adminactivate.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,15 @@
+{X_UNAME}さん
+
+{SITENAME}にて新規ユーザの登録がありました。
+
+ユーザ名：{USERNAME}
+メールアドレス： {USEREMAIL}
+
+下記のリンクをクリックするとこのユーザの承認が完了します。
+
+{USERACTLINK}
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/japanese/mail_template/register.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/mail_template/register.tpl:1.1.2.1
--- /dev/null	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/language/japanese/mail_template/register.tpl	Sat Feb  4 22:35:32 2006
@@ -0,0 +1,12 @@
+{X_UNAME}さん、こんにちは
+
+{SITENAME}におけるユーザ登録用メールアドレスとしてあなたのメールアドレス（{X_UEMAIL}）が使用されました。もし{SITENAME}でのユーザ登録に覚えがない場合はこのメールを破棄してください。
+
+{SITENAME}でのユーザ登録を完了するには下記のリンクをクリックして登録の承認を行ってください。
+
+{USERACTLINK}
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:52 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:52 +0900
Subject: [xoops-cvslog 2280] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20060205051952.7CF472AC067@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.4 xoops2jp/html/class/xoopsform/form.php:1.4.6.1
--- xoops2jp/html/class/xoopsform/form.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/xoopsform/form.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: form.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -318,9 +318,11 @@
      * @return  string
      */
     function &getExtra(){
+        $ret = null;
         if (isset($this->_extra)) {
-            return $this->_extra;
+            $ret = $this->_extra;
         }
+        return $ret;
     }
 
     /**
Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php
diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.4 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.4.6.1
--- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formdhtmltextarea.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: formdhtmltextarea.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -126,7 +126,7 @@
     function _renderSmileys()
     {
         $myts =& MyTextSanitizer::getInstance();
-        $smiles =& $myts->getSmileys();
+        $smiles = $myts->getSmileys();
         $ret = '';
         if (empty($smiles)) {
             $db =& Database::getInstance();

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:52 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:52 +0900
Subject: [xoops-cvslog 2281] CVS update: xoops2jp/html
Message-ID: <20060205051952.A41012AC086@users.sourceforge.jp>

Index: xoops2jp/html/header.php
diff -u xoops2jp/html/header.php:1.5 xoops2jp/html/header.php:1.5.4.1
--- xoops2jp/html/header.php:1.5	Mon Sep  5 05:46:08 2005
+++ xoops2jp/html/header.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: header.php,v 1.5 2005/09/04 20:46:08 onokazu Exp $
+// $Id: header.php,v 1.5.4.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -144,11 +144,11 @@
                     continue;
                 }
                 $xoopsTpl->assign_by_ref('block', $bresult);
-                $bcontent =& $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
+                $bcontent = $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
                 $xoopsTpl->clear_assign('block');
             } else {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                $bcontent =& $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
+                $bcontent = $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
             }
         } else {
             $bid = $block_arr[$i]->getVar('bid');
@@ -159,11 +159,11 @@
                     continue;
                 }
                 $xoopsTpl->assign_by_ref('dummy_content', $bresult['content']);
-                $bcontent =& $xoopsTpl->fetch('db:system_dummy.html', 'blk_'.$bid);
+                $bcontent = $xoopsTpl->fetch('db:system_dummy.html', 'blk_'.$bid);
                 $xoopsTpl->clear_assign('block');
             } else {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                $bcontent =& $xoopsTpl->fetch('db:system_dummy.html', 'blk_'.$bid);
+                $bcontent = $xoopsTpl->fetch('db:system_dummy.html', 'blk_'.$bid);
             }
         }
         switch ($block_arr[$i]->getVar('side')) {
Index: xoops2jp/html/lostpass.php
diff -u xoops2jp/html/lostpass.php:1.3 xoops2jp/html/lostpass.php:1.3.6.1
--- xoops2jp/html/lostpass.php:1.3	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/lostpass.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: lostpass.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
+// $Id: lostpass.php,v 1.3.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,70 +30,70 @@
 $email = isset($_GET['email']) ? trim($_GET['email']) : '';
 $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
 if ($email == '') {
-	redirect_header("user.php",2,_US_SORRYNOTFOUND);
-	exit();
+    redirect_header("user.php",2,_US_SORRYNOTFOUND);
+    exit();
 }
 
 $myts =& MyTextSanitizer::getInstance();
 $member_handler =& xoops_gethandler('member');
-$getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
+$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
 
 if (empty($getuser)) {
-	redirect_header("user.php",2,_US_SORRYNOTFOUND);
-	exit();
+    redirect_header("user.php",2,_US_SORRYNOTFOUND);
+    exit();
 } else {
-	$code = isset($_GET['code']) ? trim($_GET['code']) : '';
-	$areyou = substr($getuser[0]->getVar("pass"), 0, 5);
-	if ($code != '' && $areyou == $code) {
-		$newpass = xoops_makepass();
-		$xoopsMailer =& getMailer();
-		$xoopsMailer->useMail();
-		$xoopsMailer->setTemplate("lostpass2.tpl");
-		$xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
-		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
-		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
-		$xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-		$xoopsMailer->assign("NEWPWD", $newpass);
-		$xoopsMailer->setToUsers($getuser[0]);
-		$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-		$xoopsMailer->setFromName($xoopsConfig['sitename']);
-		$xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
-		if ( !$xoopsMailer->send() ) {
-			echo $xoopsMailer->getErrors();
-		}
+    $code = isset($_GET['code']) ? trim($_GET['code']) : '';
+    $areyou = substr($getuser[0]->getVar("pass"), 0, 5);
+    if ($code != '' && $areyou == $code) {
+        $newpass = xoops_makepass();
+        $xoopsMailer =& getMailer();
+        $xoopsMailer->useMail();
+        $xoopsMailer->setTemplate("lostpass2.tpl");
+        $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+        $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+        $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+        $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+        $xoopsMailer->assign("NEWPWD", $newpass);
+        $xoopsMailer->setToUsers($getuser[0]);
+        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+        $xoopsMailer->setFromName($xoopsConfig['sitename']);
+        $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
+        if ( !$xoopsMailer->send() ) {
+            echo $xoopsMailer->getErrors();
+        }
 
-		// Next step: add the new password to the database
-		$sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
-		if ( !$xoopsDB->queryF($sql) ) {
-			include "header.php";
-			echo _US_MAILPWDNG;
-			include "footer.php";
-			exit();
-		}
-		redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
-		exit();
-	// If no Code, send it
-	} else {
-		$xoopsMailer =& getMailer();
-		$xoopsMailer->useMail();
-		$xoopsMailer->setTemplate("lostpass1.tpl");
-		$xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
-		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
-		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
-		$xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-		$xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
-		$xoopsMailer->setToUsers($getuser[0]);
-		$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-		$xoopsMailer->setFromName($xoopsConfig['sitename']);
-		$xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
-		include "header.php";
-		if ( !$xoopsMailer->send() ) {
-			echo $xoopsMailer->getErrors();
-		}
-		echo "<h4>";
-		printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
-		echo "</h4>";
-		include "footer.php";
-	}
+        // Next step: add the new password to the database
+        $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
+        if ( !$xoopsDB->queryF($sql) ) {
+            include "header.php";
+            echo _US_MAILPWDNG;
+            include "footer.php";
+            exit();
+        }
+        redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
+        exit();
+    // If no Code, send it
+    } else {
+        $xoopsMailer =& getMailer();
+        $xoopsMailer->useMail();
+        $xoopsMailer->setTemplate("lostpass1.tpl");
+        $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+        $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+        $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+        $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+        $xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
+        $xoopsMailer->setToUsers($getuser[0]);
+        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+        $xoopsMailer->setFromName($xoopsConfig['sitename']);
+        $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
+        include "header.php";
+        if ( !$xoopsMailer->send() ) {
+            echo $xoopsMailer->getErrors();
+        }
+        echo "<h4>";
+        printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
+        echo "</h4>";
+        include "footer.php";
+    }
 }
 ?>
\ No newline at end of file
Index: xoops2jp/html/userinfo.php
diff -u xoops2jp/html/userinfo.php:1.2 xoops2jp/html/userinfo.php:1.2.16.1
--- xoops2jp/html/userinfo.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/userinfo.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: userinfo.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: userinfo.php,v 1.2.16.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,60 +33,60 @@
 
 $uid = intval($_GET['uid']);
 if ($uid <= 0) {
-	redirect_header('index.php', 3, _US_SELECTNG);
-	exit();
+    redirect_header('index.php', 3, _US_SELECTNG);
+    exit();
 }
 
 $gperm_handler = & xoops_gethandler( 'groupperm' );
 $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
 
-$isAdmin = $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_USER, $groups);			// isadmin is true if user has 'edit users' admin rights
+$isAdmin = $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_USER, $groups);         // isadmin is true if user has 'edit users' admin rights
 
 if (is_object($xoopsUser)) {
-	if ($uid == $xoopsUser->getVar('uid')) {
-		$config_handler =& xoops_gethandler('config');
-		$xoopsConfigUser =& $config_handler->getConfigsByCat(XOOPS_CONF_USER);
-		$xoopsOption['template_main'] = 'system_userinfo.html';
-		include XOOPS_ROOT_PATH.'/header.php';
-		$xoopsTpl->assign('user_ownpage', true);
-		$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
-		$xoopsTpl->assign('lang_avatar', _US_AVATAR);
-		$xoopsTpl->assign('lang_inbox', _US_INBOX);
-		$xoopsTpl->assign('lang_logout', _US_LOGOUT);
-		if ($xoopsConfigUser['self_delete'] == 1) {
-			$xoopsTpl->assign('user_candelete', true);
-			$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
-		} else {
-			$xoopsTpl->assign('user_candelete', false);
-		}
-		$thisUser =& $xoopsUser;
-	} else {
-		$member_handler =& xoops_gethandler('member');
-		$thisUser =& $member_handler->getUser($uid);
-		if (!is_object($thisUser) || !$thisUser->isActive() ) {
-			redirect_header("index.php",3,_US_SELECTNG);
-			exit();
-		}
-		$xoopsOption['template_main'] = 'system_userinfo.html';
-		include XOOPS_ROOT_PATH.'/header.php';
-		$xoopsTpl->assign('user_ownpage', false);
-	}
+    if ($uid == $xoopsUser->getVar('uid')) {
+        $config_handler =& xoops_gethandler('config');
+        $xoopsConfigUser =& $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+        $xoopsOption['template_main'] = 'system_userinfo.html';
+        include XOOPS_ROOT_PATH.'/header.php';
+        $xoopsTpl->assign('user_ownpage', true);
+        $xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
+        $xoopsTpl->assign('lang_avatar', _US_AVATAR);
+        $xoopsTpl->assign('lang_inbox', _US_INBOX);
+        $xoopsTpl->assign('lang_logout', _US_LOGOUT);
+        if ($xoopsConfigUser['self_delete'] == 1) {
+            $xoopsTpl->assign('user_candelete', true);
+            $xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
+        } else {
+            $xoopsTpl->assign('user_candelete', false);
+        }
+        $thisUser =& $xoopsUser;
+    } else {
+        $member_handler =& xoops_gethandler('member');
+        $thisUser =& $member_handler->getUser($uid);
+        if (!is_object($thisUser) || !$thisUser->isActive() ) {
+            redirect_header("index.php",3,_US_SELECTNG);
+            exit();
+        }
+        $xoopsOption['template_main'] = 'system_userinfo.html';
+        include XOOPS_ROOT_PATH.'/header.php';
+        $xoopsTpl->assign('user_ownpage', false);
+    }
 } else {
-	$member_handler =& xoops_gethandler('member');
-	$thisUser =& $member_handler->getUser($uid);
-	if (!is_object($thisUser) || !$thisUser->isActive()) {
-		redirect_header("index.php",3,_US_SELECTNG);
-		exit();
-	}
-	$xoopsOption['template_main'] = 'system_userinfo.html';
-	include(XOOPS_ROOT_PATH.'/header.php');
-	$xoopsTpl->assign('user_ownpage', false);
+    $member_handler =& xoops_gethandler('member');
+    $thisUser =& $member_handler->getUser($uid);
+    if (!is_object($thisUser) || !$thisUser->isActive()) {
+        redirect_header("index.php",3,_US_SELECTNG);
+        exit();
+    }
+    $xoopsOption['template_main'] = 'system_userinfo.html';
+    include(XOOPS_ROOT_PATH.'/header.php');
+    $xoopsTpl->assign('user_ownpage', false);
 }
 $myts =& MyTextSanitizer::getInstance();
 if ( is_object($xoopsUser) && $isAdmin ) {
-	$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
-	$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
-	$xoopsTpl->assign('user_uid', $thisUser->getVar('uid'));
+    $xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
+    $xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
+    $xoopsTpl->assign('user_uid', $thisUser->getVar('uid'));
 }
 $xoopsTpl->assign('lang_allaboutuser', sprintf(_US_ALLABOUT,$thisUser->getVar('uname')));
 $xoopsTpl->assign('lang_avatar', _US_AVATAR);
@@ -129,63 +129,63 @@
 $xoopsTpl->assign('user_signature', $myts->makeTareaData4Show($thisUser->getVar('user_sig', 'N'),0,1,1));
 
 if ($thisUser->getVar('user_viewemail') == 1) {
-	$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
+    $xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
 } else {
-	if (is_object($xoopsUser)) {
-	 	// All admins will be allowed to see emails, even those that are not allowed to edit users (I think it's ok like this)
-		if ($xoopsUserIsAdmin || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
-			$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
-		} else {
-			$xoopsTpl->assign('user_email', '&nbsp;');
-		}
-	}
+    if (is_object($xoopsUser)) {
+        // All admins will be allowed to see emails, even those that are not allowed to edit users (I think it's ok like this)
+        if ($xoopsUserIsAdmin || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
+            $xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
+        } else {
+            $xoopsTpl->assign('user_email', '&nbsp;');
+        }
+    }
 }
 if (is_object($xoopsUser)) {
-	$xoopsTpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$thisUser->getVar('uid')."', 'pmlite', 450, 380);\"><img src=\"".XOOPS_URL."/images/icons/pm.gif\" alt=\"".sprintf(_SENDPMTO,$thisUser->getVar('uname'))."\" /></a>");
+    $xoopsTpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$thisUser->getVar('uid')."', 'pmlite', 450, 380);\"><img src=\"".XOOPS_URL."/images/icons/pm.gif\" alt=\"".sprintf(_SENDPMTO,$thisUser->getVar('uname'))."\" /></a>");
 } else {
-	$xoopsTpl->assign('user_pmlink', '');
+    $xoopsTpl->assign('user_pmlink', '');
 }
-$userrank =& $thisUser->rank();
+$userrank = $thisUser->rank();
 if ($userrank['image']) {
-	$xoopsTpl->assign('user_rankimage', '<img src="'.XOOPS_UPLOAD_URL.'/'.$userrank['image'].'" alt="" />');
+    $xoopsTpl->assign('user_rankimage', '<img src="'.XOOPS_UPLOAD_URL.'/'.$userrank['image'].'" alt="" />');
 }
 $xoopsTpl->assign('user_ranktitle', $userrank['title']);
 $date = $thisUser->getVar("last_login");
 if (!empty($date)) {
-	$xoopsTpl->assign('user_lastlogin', formatTimestamp($date,"m"));
+    $xoopsTpl->assign('user_lastlogin', formatTimestamp($date,"m"));
 }
 
 
 $module_handler =& xoops_gethandler('module');
 $criteria = new CriteriaCompo(new Criteria('hassearch', 1));
 $criteria->add(new Criteria('isactive', 1));
-$mids =& array_keys($module_handler->getList($criteria));
+$mids = array_keys($module_handler->getList($criteria));
 
 foreach ($mids as $mid) {
     // Hack by marcan : only return results of modules for which user has access permission
   if ( $gperm_handler->checkRight('module_read', $mid, $groups)) {
-	$module =& $module_handler->get($mid);
-	$results =& $module->search('', '', 5, 0, $thisUser->getVar('uid'));
-	$count = count($results);
-	if (is_array($results) && $count > 0) {
-		for ($i = 0; $i < $count; $i++) {
-			if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-				$results[$i]['image'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['image'];
-			} else {
-				$results[$i]['image'] = 'images/icons/posticon2.gif';
-			}
-			$results[$i]['link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['link'];
-			$results[$i]['title'] = $myts->makeTboxData4Show($results[$i]['title']);
-			$results[$i]['time'] = $results[$i]['time'] ? formatTimestamp($results[$i]['time']) : '';
-		}
-		if ($count == 5) {
-			$showall_link = '<a href="search.php?action=showallbyuser&amp;mid='.$mid.'&amp;uid='.$thisUser->getVar('uid').'">'._US_SHOWALL.'</a>';
-		} else {
-			$showall_link = '';
-		}
-		$xoopsTpl->append('modules', array('name' => $module->getVar('name'), 'results' => $results, 'showall_link' => $showall_link));
-	}
-	unset($module);
+    $module =& $module_handler->get($mid);
+    $results =& $module->search('', '', 5, 0, $thisUser->getVar('uid'));
+    $count = count($results);
+    if (is_array($results) && $count > 0) {
+        for ($i = 0; $i < $count; $i++) {
+            if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
+                $results[$i]['image'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['image'];
+            } else {
+                $results[$i]['image'] = 'images/icons/posticon2.gif';
+            }
+            $results[$i]['link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['link'];
+            $results[$i]['title'] = $myts->makeTboxData4Show($results[$i]['title']);
+            $results[$i]['time'] = $results[$i]['time'] ? formatTimestamp($results[$i]['time']) : '';
+        }
+        if ($count == 5) {
+            $showall_link = '<a href="search.php?action=showallbyuser&amp;mid='.$mid.'&amp;uid='.$thisUser->getVar('uid').'">'._US_SHOWALL.'</a>';
+        } else {
+            $showall_link = '';
+        }
+        $xoopsTpl->append('modules', array('name' => $module->getVar('name'), 'results' => $results, 'showall_link' => $showall_link));
+    }
+    unset($module);
   }
 }
 include XOOPS_ROOT_PATH.'/footer.php';

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:52 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:52 +0900
Subject: [xoops-cvslog 2282] CVS update: xoops2jp/html/include
Message-ID: <20060205051952.CF44E2AC067@users.sourceforge.jp>

Index: xoops2jp/html/include/cp_functions.php
diff -u xoops2jp/html/include/cp_functions.php:1.4 xoops2jp/html/include/cp_functions.php:1.4.6.1
--- xoops2jp/html/include/cp_functions.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/include/cp_functions.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: cp_functions.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: cp_functions.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -54,7 +54,7 @@
         echo '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/system/style.css" />';
         include_once XOOPS_CACHE_PATH.'/adminmenu.php';
         $moduleperm_handler =& xoops_gethandler('groupperm');
-        $admin_mids =& $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
+        $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
 
         $module_handler =& xoops_gethandler('module');
         $modules =& $module_handler->getObjects(new
Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.6 xoops2jp/html/include/functions.php:1.6.2.1
--- xoops2jp/html/include/functions.php:1.6	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/include/functions.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.6 2005/10/24 11:44:16 onokazu Exp $
+// $Id: functions.php,v 1.6.2.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -522,10 +522,12 @@
     if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php") ) {
         include_once XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php";
         if ( class_exists("XoopsMailerLocal") ) {
-            return new XoopsMailerLocal();
+            $ret =& new XoopsMailerLocal();
+            return $ret;
         }
     }
-    return new XoopsMailer();
+    $ret =& new XoopsMailer();
+    return $ret;
 }
 
 function &xoops_gethandler($name, $optional = false )
@@ -544,7 +546,11 @@
     if (!isset($handlers[$name]) && !$optional ) {
         trigger_error('Class <b>'.$class.'</b> does not exist<br />Handler Name: '.$name, E_USER_ERROR);
     }
-    return isset($handlers[$name]) ? $handlers[$name] : false;
+    $ret = false;
+    if (isset($handlers[$name])) {
+        $ret =& $handlers[$name];
+    }
+    return $ret;
 }
 
 function &xoops_getmodulehandler($name = null, $module_dir = null, $optional = false)
@@ -574,7 +580,11 @@
     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;
+    $ret = false;
+    if (isset($handlers[$module_dir][$name])) {
+        $ret =& $handlers[$module_dir][$name];
+    }
+    return $ret;
 }
 
 function xoops_getrank($rank_id =0, $posts = 0)
Index: xoops2jp/html/include/xoopscodes.php
diff -u xoops2jp/html/include/xoopscodes.php:1.4 xoops2jp/html/include/xoopscodes.php:1.4.6.1
--- xoops2jp/html/include/xoopscodes.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/include/xoopscodes.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopscodes.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: xoopscodes.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -81,7 +81,7 @@
 function xoopsSmilies($textarea_id)
 {
     $myts =& MyTextSanitizer::getInstance();
-    $smiles =& $myts->getSmileys();
+    $smiles = $myts->getSmileys();
     if (empty($smileys)) {
         $db =& Database::getInstance();
         if ($result = $db->query('SELECT * FROM '.$db->prefix('smiles').' WHERE display=1')) {

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2283] CVS update: xoops2jp/html/kernel
Message-ID: <20060205051953.139512AC086@users.sourceforge.jp>

Index: xoops2jp/html/kernel/config.php
diff -u xoops2jp/html/kernel/config.php:1.2 xoops2jp/html/kernel/config.php:1.2.16.1
--- xoops2jp/html/kernel/config.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/config.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: config.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: config.php,v 1.2.16.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
+    exit();
 }
 
 require_once XOOPS_ROOT_PATH.'/kernel/configoption.php';
@@ -39,8 +39,8 @@
 /**
  * @package     kernel
  * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2003 XOOPS.org
  */
 
 
@@ -63,55 +63,56 @@
      * holds reference to config item handler(DAO) class
      * 
      * @var     object
-     * @access	private
+     * @access  private
      */
     var $_cHandler;
 
     /**
      * holds reference to config option handler(DAO) class
      * 
-     * @var	    object
-     * @access	private
+     * @var     object
+     * @access  private
      */
     var $_oHandler;
 
-	/**
-	 * holds an array of cached references to config value arrays,
-	 *  indexed on module id and category id
-	 *
-	 * @var     array
-	 * @access  private
-	 */
-	var $_cachedConfigs = array();
+    /**
+     * holds an array of cached references to config value arrays,
+     *  indexed on module id and category id
+     *
+     * @var     array
+     * @access  private
+     */
+    var $_cachedConfigs = array();
 
     /**
      * Constructor
      * 
-     * @param	object  &$db    reference to database object
+     * @param   object  &$db    reference to database object
      */
     function XoopsConfigHandler(&$db)
     {
-        $this->_cHandler = new XoopsConfigItemHandler($db);
-        $this->_oHandler = new XoopsConfigOptionHandler($db);
+        $this->_cHandler =& new XoopsConfigItemHandler($db);
+        $this->_oHandler =& new XoopsConfigOptionHandler($db);
     }
 
     /**
      * Create a config
      * 
      * @see     XoopsConfigItem
-     * @return	object  reference to the new {@link XoopsConfigItem}
+     * @return  object  reference to the new {@link XoopsConfigItem}
      */
     function &createConfig()
     {
-        return $this->_cHandler->create();
+        $ret =& $this->_cHandler->create();
+        return $ret;
     }
 
     /**
      * Get a config
      * 
-     * @param	int     $id             ID of the config
-     * @param	bool    $withoptions    load the config's options now?
-     * @return	object  reference to the {@link XoopsConfig} 
+     * @param   int     $id             ID of the config
+     * @param   bool    $withoptions    load the config's options now?
+     * @return  object  reference to the {@link XoopsConfig} 
      */
     function &getConfig($id, $withoptions = false)
     {
@@ -125,7 +126,7 @@
     /**
      * insert a new config in the database
      * 
-     * @param	object  &$config    reference to the {@link XoopsConfigItem} 
+     * @param   object  &$config    reference to the {@link XoopsConfigItem} 
      */
     function insertConfig(&$config)
     {
@@ -134,23 +135,23 @@
         }
         $options =& $config->getConfOptions();
         $count = count($options);
-		$conf_id = $config->getVar('conf_id');
+        $conf_id = $config->getVar('conf_id');
         for ($i = 0; $i < $count; $i++) {
             $options[$i]->setVar('conf_id', $conf_id);
             if (!$this->_oHandler->insert($options[$i])) {
-				echo $options[$i]->getErrors();
-			}
+                echo $options[$i]->getErrors();
+            }
+        }
+        if (!empty($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')])) {
+            unset ($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')]);
         }
-		if (!empty($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')])) {
-			unset ($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')]);
-		}
         return true;
     }
 
     /**
      * Delete a config from the database
      * 
-     * @param	object  &$config    reference to a {@link XoopsConfigItem} 
+     * @param   object  &$config    reference to a {@link XoopsConfigItem} 
      */
     function deleteConfig(&$config)
     {
@@ -168,30 +169,31 @@
                 $this->_oHandler->delete($options[$i]);
             }
         }
-		if (!empty($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')])) {
-			unset ($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')]);
-		}
+        if (!empty($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')])) {
+            unset ($this->_cachedConfigs[$config->getVar('conf_modid')][$config->getVar('conf_catid')]);
+        }
         return true;
     }
 
     /**
      * get one or more Configs
      * 
-     * @param	object  $criteria       {@link CriteriaElement} 
-     * @param	bool    $id_as_key      Use the configs' ID as keys?
-     * @param	bool    $with_options   get the options now?
+     * @param   object  $criteria       {@link CriteriaElement} 
+     * @param   bool    $id_as_key      Use the configs' ID as keys?
+     * @param   bool    $with_options   get the options now?
      * 
-     * @return	array   Array of {@link XoopsConfigItem} objects
+     * @return  array   Array of {@link XoopsConfigItem} objects
      */
     function &getConfigs($criteria = null, $id_as_key = false, $with_options = false)
     {
-        return $this->_cHandler->getObjects($criteria, $id_as_key);
+        $ret =& $this->_cHandler->getObjects($criteria, $id_as_key); 
+        return $ret;
     }
 
     /**
      * Count some configs
      * 
-     * @param	object  $criteria   {@link CriteriaElement} 
+     * @param   object  $criteria   {@link CriteriaElement} 
      */
     function getConfigCount($criteria = null)
     {
@@ -201,73 +203,76 @@
     /**
      * Get configs from a certain category
      * 
-     * @param	int $category   ID of a category
-     * @param	int $module     ID of a module
+     * @param   int $category   ID of a category
+     * @param   int $module     ID of a module
      * 
-     * @return	array   array of {@link XoopsConfig}s 
+     * @return  array   array of {@link XoopsConfig}s 
      */
     function &getConfigsByCat($category, $module = 0)
     {
         static $_cachedConfigs;
-		if (!empty($_cachedConfigs[$module][$category])) {
-			return $_cachedConfigs[$module][$category];
-		} else {
-        	$ret = array();
-        	$criteria = new CriteriaCompo(new Criteria('conf_modid', intval($module)));
-        	if (!empty($category)) {
-            	$criteria->add(new Criteria('conf_catid', intval($category)));
-        	}
-        	$configs =& $this->getConfigs($criteria, true);
-			if (is_array($configs)) {
-            	foreach (array_keys($configs) as $i) {
-                	$ret[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
-            	}
-        	}
-			$_cachedConfigs[$module][$category] =& $ret;
-        	return $ret;
-		}
+        if (!empty($_cachedConfigs[$module][$category])) {
+            return $_cachedConfigs[$module][$category];
+        } else {
+            $ret = array();
+            $criteria = new CriteriaCompo(new Criteria('conf_modid', intval($module)));
+            if (!empty($category)) {
+                $criteria->add(new Criteria('conf_catid', intval($category)));
+            }
+            $configs =& $this->getConfigs($criteria, true);
+            if (is_array($configs)) {
+                foreach (array_keys($configs) as $i) {
+                    $ret[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
+                }
+            }
+            $_cachedConfigs[$module][$category] =& $ret;
+            return $ret;
+        }
     }
 
     /**
      * Make a new {@link XoopsConfigOption} 
      * 
-     * @return	object  {@link XoopsConfigOption} 
+     * @return  object  {@link XoopsConfigOption} 
      */
     function &createConfigOption(){
-        return $this->_oHandler->create();
+        $ret =& $this->_oHandler->create();
+        return $ret;
     }
 
     /**
      * Get a {@link XoopsConfigOption} 
      * 
-     * @param	int $id ID of the config option
+     * @param   int $id ID of the config option
      * 
-     * @return	object  {@link XoopsConfigOption} 
+     * @return  object  {@link XoopsConfigOption} 
      */
     function &getConfigOption($id)
     {
-        return $this->_oHandler->get($id);
+        $ret =& $this->_oHandler->get($id);
+        return $ret;
     }
 
     /**
      * Get one or more {@link XoopsConfigOption}s
      * 
-     * @param	object  $criteria   {@link CriteriaElement} 
-     * @param	bool    $id_as_key  Use IDs as keys in the array?
+     * @param   object  $criteria   {@link CriteriaElement} 
+     * @param   bool    $id_as_key  Use IDs as keys in the array?
      * 
-     * @return	array   Array of {@link XoopsConfigOption}s
+     * @return  array   Array of {@link XoopsConfigOption}s
      */
     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;
     }
 
     /**
      * Count some {@link XoopsConfigOption}s
      * 
-     * @param	object  $criteria   {@link CriteriaElement} 
+     * @param   object  $criteria   {@link CriteriaElement} 
      * 
-     * @return	int     Count of {@link XoopsConfigOption}s matching $criteria
+     * @return  int     Count of {@link XoopsConfigOption}s matching $criteria
      */
     function getConfigOptionsCount($criteria = null)
     {
@@ -277,29 +282,29 @@
     /**
      * Get a list of configs
      * 
-     * @param	int $conf_modid ID of the modules
-     * @param	int $conf_catid ID of the category
+     * @param   int $conf_modid ID of the modules
+     * @param   int $conf_catid ID of the category
      * 
-     * @return	array   Associative array of name=>value pairs.
+     * @return  array   Associative array of name=>value pairs.
      */
     function &getConfigList($conf_modid, $conf_catid = 0)
     {
-		if (!empty($this->_cachedConfigs[$conf_modid][$conf_catid])) {
-			return $this->_cachedConfigs[$conf_modid][$conf_catid];
-		} else {
-        	$criteria = new CriteriaCompo(new Criteria('conf_modid', $conf_modid));
-        	if (empty($conf_catid)) {
-            	$criteria->add(new Criteria('conf_catid', $conf_catid));
-        	}
-        	$configs =& $this->_cHandler->getObjects($criteria);
-        	$confcount = count($configs);
-        	$ret = array();
-        	for ($i = 0; $i < $confcount; $i++) {
-            	$ret[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
-        	}
-			$this->_cachedConfigs[$conf_modid][$conf_catid] =& $ret;
-        	return $ret;
-		}
+        if (!empty($this->_cachedConfigs[$conf_modid][$conf_catid])) {
+            return $this->_cachedConfigs[$conf_modid][$conf_catid];
+        } else {
+            $criteria = new CriteriaCompo(new Criteria('conf_modid', $conf_modid));
+            if (empty($conf_catid)) {
+                $criteria->add(new Criteria('conf_catid', $conf_catid));
+            }
+            $configs =& $this->_cHandler->getObjects($criteria);
+            $confcount = count($configs);
+            $ret = array();
+            for ($i = 0; $i < $confcount; $i++) {
+                $ret[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
+            }
+            $this->_cachedConfigs[$conf_modid][$conf_catid] =& $ret;
+            return $ret;
+        }
     }
 }
 ?>
Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2 xoops2jp/html/kernel/configitem.php:1.2.16.1
--- xoops2jp/html/kernel/configitem.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/configitem.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: configitem.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: configitem.php,v 1.2.16.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,14 +30,14 @@
 // ------------------------------------------------------------------------- //
 
 if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
+    exit();
 }
 
 /**
  * @package     kernel
  * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2003 XOOPS.org
  */
 
 /**#@+
@@ -54,8 +54,8 @@
 /**
  * 
  * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2003 XOOPS.org
  */
 class XoopsConfigItem extends XoopsObject
 {
@@ -63,8 +63,8 @@
     /**
      * Config options
      * 
-     * @var	array
-     * @access	private
+     * @var array
+     * @access  private
      */
     var $_confOptions = array();
 
@@ -88,33 +88,36 @@
     /**
      * Get a config value in a format ready for output
      * 
-     * @return	string
+     * @return  string
      */
     function &getConfValueForOutput()
     {
         switch ($this->getVar('conf_valuetype')) {
         case 'int':
-            return intval($this->getVar('conf_value', 'N'));
+            $ret = intval($this->getVar('conf_value', 'N'));
             break;
         case 'array':
-            return unserialize($this->getVar('conf_value', 'N'));
+            $ret = unserialize($this->getVar('conf_value', 'N'));
+            break;
         case 'float':
             $value = $this->getVar('conf_value', 'N');
-            return (float)$value;
+            $ret = (float)$value;
             break;
         case 'textarea':
-            return $this->getVar('conf_value');
+            $ret = $this->getVar('conf_value');
+            break;
         default:
-            return $this->getVar('conf_value', 'N');
+            $ret = $this->getVar('conf_value', 'N');
             break;
         }
+        return $ret;
     }
 
     /**
      * Set a config value
      * 
-     * @param	mixed   &$value Value
-     * @param	bool    $force_slash
+     * @param   mixed   &$value Value
+     * @param   bool    $force_slash
      */
     function setConfValueForInput(&$value, $force_slash = false)
     {
@@ -137,7 +140,7 @@
     /**
      * Assign one or more {@link XoopsConfigItemOption}s 
      * 
-     * @param	mixed   $option either a {@link XoopsConfigItemOption} object or an array of them
+     * @param   mixed   $option either a {@link XoopsConfigItemOption} object or an array of them
      */
     function setConfOptions($option)
     {
@@ -156,7 +159,7 @@
     /**
      * Get the {@link XoopsConfigItemOption}s of this Config
      * 
-     * @return	array   array of {@link XoopsConfigItemOption} 
+     * @return  array   array of {@link XoopsConfigItemOption} 
      */
     function &getConfOptions()
     {
@@ -181,8 +184,8 @@
      * Create a new {@link XoopsConfigItem}
      * 
      * @see     XoopsConfigItem
-     * @param	bool    $isNew  Flag the config as "new"?
-     * @return	object  reference to the new config
+     * @param   bool    $isNew  Flag the config as "new"?
+     * @return  object  reference to the new config
      */
     function &create($isNew = true)
     {
@@ -196,8 +199,8 @@
     /**
      * Load a config from the database
      * 
-     * @param	int $id ID of the config
-     * @return	object  reference to the config, FALSE on fail
+     * @param   int $id ID of the config
+     * @return  object  reference to the config, FALSE on fail
      */
     function &get($id)
     {
@@ -221,7 +224,7 @@
     /**
      * Write a config to the database
      * 
-     * @param	object  &$config    {@link XoopsConfigItem} object
+     * @param   object  &$config    {@link XoopsConfigItem} object
      * @return  mixed   FALSE on fail.
      */
     function insert(&$config)
@@ -257,8 +260,8 @@
     /**
      * Delete a config from the database
      * 
-     * @param	object  &$config    Config to delete
-     * @return	bool    Successful?
+     * @param   object  &$config    Config to delete
+     * @return  bool    Successful?
      */
     function delete(&$config)
     {
@@ -275,9 +278,9 @@
     /**
      * Get configs from the database
      * 
-     * @param	object  $criteria   {@link CriteriaElement}
-     * @param	bool    $id_as_key  return the config's id as key?
-     * @return	array   Array of {@link XoopsConfigItem} objects
+     * @param   object  $criteria   {@link CriteriaElement}
+     * @param   bool    $id_as_key  return the config's id as key?
+     * @return  array   Array of {@link XoopsConfigItem} objects
      */
     function &getObjects($criteria = null, $id_as_key = false)
     {
@@ -310,8 +313,8 @@
     /**
      * Count configs
      * 
-     * @param	object  $criteria   {@link CriteriaElement} 
-     * @return	int     Count of configs matching $criteria
+     * @param   object  $criteria   {@link CriteriaElement} 
+     * @return  int     Count of configs matching $criteria
      */
     function &getCount($criteria = null)
     {
Index: xoops2jp/html/kernel/group.php
diff -u xoops2jp/html/kernel/group.php:1.2 xoops2jp/html/kernel/group.php:1.2.16.1
--- xoops2jp/html/kernel/group.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/group.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: group.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: group.php,v 1.2.16.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
+    exit();
 }
 
 /**
@@ -186,11 +186,11 @@
         while ($myrow = $this->db->fetchArray($result)) {
             $group = new XoopsGroup();
             $group->assignVars($myrow);
-			if (!$id_as_key) {
-            	$ret[] =& $group;
-			} else {
-				$ret[$myrow['groupid']] =& $group;
-			}
+            if (!$id_as_key) {
+                $ret[] =& $group;
+            } else {
+                $ret[$myrow['groupid']] =& $group;
+            }
             unset($group);
         }
         return $ret;
@@ -347,11 +347,11 @@
         while ($myrow = $this->db->fetchArray($result)) {
             $mship = new XoopsMembership();
             $mship->assignVars($myrow);
-			if (!$id_as_key) {
-            	$ret[] =& $mship;
-			} else {
-				$ret[$myrow['linkid']] =& $mship;
-			}
+            if (!$id_as_key) {
+                $ret[] =& $mship;
+            } else {
+                $ret[$myrow['linkid']] =& $mship;
+            }
             unset($mship);
         }
         return $ret;
@@ -403,7 +403,7 @@
      * objects? FALSE returns associative array.
      * @return array array of groups the user belongs to
      */
-    function &getGroupsByUser($uid)
+    function getGroupsByUser($uid)
     {
         $ret = array();
         $sql = 'SELECT groupid FROM '.$this->db->prefix('groups_users_link').' WHERE uid='.intval($uid);
Index: xoops2jp/html/kernel/member.php
diff -u xoops2jp/html/kernel/member.php:1.4 xoops2jp/html/kernel/member.php:1.4.6.1
--- xoops2jp/html/kernel/member.php:1.4	Wed Aug  3 21:39:12 2005
+++ xoops2jp/html/kernel/member.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: member.php,v 1.4 2005/08/03 12:39:12 onokazu Exp $
+// $Id: member.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu 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;
     }
 
     /**
@@ -278,7 +281,7 @@
      */
     function getUsersByGroup($group_id, $asobject = false, $limit = 0, $start = 0)
     {
-        $user_ids =& $this->_mHandler->getUsersByGroup($group_id, $limit, $start);
+        $user_ids = $this->_mHandler->getUsersByGroup($group_id, $limit, $start);
         if (!$asobject) {
            return $user_ids;
         } else {
@@ -303,7 +306,7 @@
      */
     function getGroupsByUser($user_id, $asobject = false)
     {
-        $group_ids =& $this->_mHandler->getGroupsByUser($user_id);
+        $group_ids = $this->_mHandler->getGroupsByUser($user_id);
         if (!$asobject) {
            return $group_ids;
         } else {
@@ -327,7 +330,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];
     }
@@ -345,7 +349,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];
     }
Index: xoops2jp/html/kernel/object.php
diff -u xoops2jp/html/kernel/object.php:1.4 xoops2jp/html/kernel/object.php:1.4.6.1
--- xoops2jp/html/kernel/object.php:1.4	Wed Aug  3 21:39:12 2005
+++ xoops2jp/html/kernel/object.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: object.php,v 1.4 2005/08/03 12:39:12 onokazu Exp $
+// $Id: object.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -286,14 +286,16 @@
             case 'e':
             case 'edit':
                 $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ret);
+                $ret = $ts->htmlSpecialChars($ret);
+                return $ret;
                 break 1;
             case 'p':
             case 'preview':
             case 'f':
             case 'formpreview':
                 $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+                $ret = $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+                return $ret;
                 break 1;
             case 'n':
             case 'none':
@@ -311,11 +313,13 @@
                 $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
                 $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
                 $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
-                return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+                $ret = $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+                return $ret;
                 break 1;
             case 'e':
             case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
+                $ret = htmlspecialchars($ret, ENT_QUOTES);
+                return $ret;
                 break 1;
             case 'p':
             case 'preview':
@@ -325,12 +329,14 @@
                 $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
                 $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
                 $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
-                return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+                $ret = $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+                return $ret;
                 break 1;
             case 'f':
             case 'formpreview':
                 $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                $ret = htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                return $ret;
                 break 1;
             case 'n':
             case 'none':
@@ -348,17 +354,20 @@
                 break 1;
             case 'e':
             case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
+                $ret = htmlspecialchars($ret, ENT_QUOTES);
+                return $ret;
                 break 1;
             case 'p':
             case 'preview':
                 $ts =& MyTextSanitizer::getInstance();
-                return $ts->stripSlashesGPC($ret);
+                $ret = $ts->stripSlashesGPC($ret);
+                return $ret;
                 break 1;
             case 'f':
             case 'formpreview':
                 $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                $ret = htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                return $ret;
                 break 1;
             case 'n':
             case 'none':
@@ -381,7 +390,8 @@
                         }
                         $i++;
                     }
-                    return implode(', ', $ret);
+                    $ret = implode(', ', $ret);
+                    return $ret;
                 case 'e':
                 case 'edit':
                     $ret = explode('|', $ret);
Index: xoops2jp/html/kernel/tplfile.php
diff -u xoops2jp/html/kernel/tplfile.php:1.3 xoops2jp/html/kernel/tplfile.php:1.3.4.1
--- xoops2jp/html/kernel/tplfile.php:1.3	Mon Sep  5 05:46:09 2005
+++ xoops2jp/html/kernel/tplfile.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: tplfile.php,v 1.3 2005/09/04 20:46:09 onokazu Exp $
+// $Id: tplfile.php,v 1.3.4.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -29,35 +29,36 @@
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
+    exit();
 }
 class XoopsTplfile extends XoopsObject
 {
 
-	function XoopsTplfile()
-	{
-		$this->XoopsObject();
-		$this->initVar('tpl_id', XOBJ_DTYPE_INT, null, false);
-		$this->initVar('tpl_refid', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('tpl_tplset', XOBJ_DTYPE_OTHER, null, false);
-		$this->initVar('tpl_file', XOBJ_DTYPE_TXTBOX, null, true, 100);
-		$this->initVar('tpl_desc', XOBJ_DTYPE_TXTBOX, null, false, 100);
-		$this->initVar('tpl_lastmodified', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('tpl_lastimported', XOBJ_DTYPE_INT, 0, false);
-		$this->initVar('tpl_module', XOBJ_DTYPE_OTHER, null, false);
-		$this->initVar('tpl_type', XOBJ_DTYPE_OTHER, null, false);
-		$this->initVar('tpl_source', XOBJ_DTYPE_SOURCE, null, false);
-	}
-
-	function &getSource()
-	{
-		return $this->getVar('tpl_source');
-	}
-
-	function getLastModified()
-	{
-		return $this->getVar('tpl_lastmodified');
-	}
+    function XoopsTplfile()
+    {
+        $this->XoopsObject();
+        $this->initVar('tpl_id', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('tpl_refid', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('tpl_tplset', XOBJ_DTYPE_OTHER, null, false);
+        $this->initVar('tpl_file', XOBJ_DTYPE_TXTBOX, null, true, 100);
+        $this->initVar('tpl_desc', XOBJ_DTYPE_TXTBOX, null, false, 100);
+        $this->initVar('tpl_lastmodified', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('tpl_lastimported', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('tpl_module', XOBJ_DTYPE_OTHER, null, false);
+        $this->initVar('tpl_type', XOBJ_DTYPE_OTHER, null, false);
+        $this->initVar('tpl_source', XOBJ_DTYPE_SOURCE, null, false);
+    }
+
+    function &getSource()
+    {
+        $ret =& $this->getVar('tpl_source');
+        return $ret;
+    }
+
+    function getLastModified()
+    {
+        return $this->getVar('tpl_lastmodified');
+    }
 }
 
 /**
@@ -83,6 +84,7 @@
 
     function &get($id, $getsource = false)
     {
+        $ret = false;
         $id = intval($id);
         if ($id > 0) {
             if (!$getsource) {
@@ -90,17 +92,15 @@
             } else {
                 $sql = 'SELECT f.*, s.tpl_source FROM '.$this->db->prefix('tplfile').' f LEFT JOIN '.$this->db->prefix('tplsource').' s  ON s.tpl_id=f.tpl_id WHERE f.tpl_id='.$id;
             }
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $numrows = $this->db->getRowsNum($result);
-            if ($numrows == 1) {
-                $tplfile = new XoopsTplfile();
-                $tplfile->assignVars($this->db->fetchArray($result));
-                return $tplfile;
+            if ($result = $this->db->query($sql)) {
+                $numrows = $this->db->getRowsNum($result);
+                if ($numrows == 1) {
+                    $ret =& new XoopsTplfile();
+                    $ret->assignVars($this->db->fetchArray($result));
+                }
             }
         }
-        return false;
+        return $ret;
     }
 
     function loadSource(&$tplfile)
@@ -116,7 +116,7 @@
             $myrow = $this->db->fetchArray($result);
             $tplfile->assignVar('tpl_source', $myrow['tpl_source']);
         }
-		return true;
+        return true;
     }
 
     function insert(&$tplfile)
@@ -149,7 +149,7 @@
                     return false;
                 }
             }
-			$tplfile->assignVar('tpl_id', $tpl_id);
+            $tplfile->assignVar('tpl_id', $tpl_id);
         } else {
             $sql = sprintf("UPDATE %s SET tpl_tplset = %s, tpl_file = %s, tpl_desc = %s, tpl_lastimported = %u, tpl_lastmodified = %u WHERE tpl_id = %u", $this->db->prefix('tplfile'), $this->db->quoteString($tpl_tplset), $this->db->quoteString($tpl_file), $this->db->quoteString($tpl_desc), $tpl_lastimported, $tpl_lastmodified, $tpl_id);
             if (!$result = $this->db->query($sql)) {
@@ -190,10 +190,10 @@
                     return false;
                 }
             }
-			return true;
+            return true;
         } else {
-			return false;
-		}
+            return false;
+        }
     }
 
     function delete(&$tplfile)
@@ -297,7 +297,8 @@
                 $criteria->add(new Criteria('tpl_type', $type));
             }
         }
-        return $this->getObjects($criteria, $getsource, false);
+        $ret =& $this->getObjects($criteria, $getsource, false);
+        return $ret;
     }
 
     function templateExists($tplname, $tplset_name)
Index: xoops2jp/html/kernel/user.php
diff -u xoops2jp/html/kernel/user.php:1.2 xoops2jp/html/kernel/user.php:1.2.16.1
--- xoops2jp/html/kernel/user.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/user.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: user.php,v 1.2.16.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -29,7 +29,7 @@
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
+    exit();
 }
 /**
  * Class for users 
@@ -43,17 +43,17 @@
     /**
      * Array of groups that user belongs to 
      * @var array
-	 * @access private
+     * @access private
      */
     var $_groups = array();
     /**
      * @var bool is the user admin? 
-	 * @access private
+     * @access private
      */
     var $_isAdmin = null;
     /**
      * @var string user's rank
-	 * @access private
+     * @access private
      */
     var $_rank = null;
     /**
@@ -116,40 +116,40 @@
         }
     }
 
-	/**
-	 * check if the user is a guest user
+    /**
+     * check if the user is a guest user
      *
      * @return bool returns false
      *
      */
-	function isGuest()
-	{
-		return false;
-	}
+    function isGuest()
+    {
+        return false;
+    }
 
 
     /**
      * Updated by Catzwolf 11 Jan 2004
-	 * find the username for a given ID
-	 * 
-	 * @param int $userid ID of the user to find
-	 * @param int $usereal switch for usename or realname
-	 * @return string name of the user. name for "anonymous" if not found.
+     * find the username for a given ID
+     * 
+     * @param int $userid ID of the user to find
+     * @param int $usereal switch for usename or realname
+     * @return string name of the user. name for "anonymous" if not found.
      */
     function getUnameFromId( $userid, $usereal = 0 )
     {
-		$userid = intval($userid);
-		$usereal = intval($usereal);
-		if ($userid > 0) {
+        $userid = intval($userid);
+        $usereal = intval($usereal);
+        if ($userid > 0) {
             $member_handler =& xoops_gethandler('member');
             $user =& $member_handler->getUser($userid);
             if (is_object($user)) {
                 $ts =& MyTextSanitizer::getInstance();
                 if ( $usereal ) { 
-					return $ts->htmlSpecialChars($user->getVar('name'));
-            	} else {
-					return $ts->htmlSpecialChars($user->getVar('uname'));
-				}
+                    return $ts->htmlSpecialChars($user->getVar('name'));
+                } else {
+                    return $ts->htmlSpecialChars($user->getVar('uname'));
+                }
             }
         }
         return $GLOBALS['xoopsConfig']['anonymous'];
@@ -157,43 +157,43 @@
     /**
      * increase the number of posts for the user 
      *
-	 * @deprecated
+     * @deprecated
      */
     function incrementPost(){
         $member_handler =& xoops_gethandler('member');
         return $member_handler->updateUserByField($this, 'posts', $this->getVar('posts') + 1);
     }
-	/**
-	 * set the groups for the user
-	 * 
-	 * @param array $groupsArr Array of groups that user belongs to
-	 */
-	function setGroups($groupsArr)
-	{
-		if (is_array($groupsArr)) {
-			$this->_groups =& $groupsArr;
-		}
-	}
+    /**
+     * set the groups for the user
+     * 
+     * @param array $groupsArr Array of groups that user belongs to
+     */
+    function setGroups($groupsArr)
+    {
+        if (is_array($groupsArr)) {
+            $this->_groups =& $groupsArr;
+        }
+    }
     /**
      * get the groups that the user belongs to
-	 * 
-	 * @return array array of groups 
+     * 
+     * @return array array of groups 
      */
-    function &getGroups()
+    function getGroups()
     {
         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;
     }
-	/**
-	 * alias for {@link getGroups()}
-	 * @see getGroups()
-	 * @return array array of groups
-	 * @deprecated
-	 */
-	function &groups()
+    /**
+     * alias for {@link getGroups()}
+     * @see getGroups()
+     * @return array array of groups
+     * @deprecated
+     */
+    function groups()
     {
         return $this->getGroups();
     }
@@ -205,20 +205,20 @@
      * - If you set the module_id to -1, it will return true if the user has admin rights for at least one module
      *
      * @param int $module_id check if user is admin of this module
-	 * @return bool is the user admin of that module?
+     * @return bool is the user admin of that module?
      */
     function isAdmin( $module_id = null ) {
-		if ( is_null( $module_id ) ) {
-			$module_id = isset($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar( 'mid', 'n' ) : 1;
-		} elseif ( intval($module_id) < 1 ) {
-			$module_id = 0;
-		}
+        if ( is_null( $module_id ) ) {
+            $module_id = isset($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar( 'mid', 'n' ) : 1;
+        } elseif ( intval($module_id) < 1 ) {
+            $module_id = 0;
+        }
         $moduleperm_handler =& xoops_gethandler('groupperm');
         return $moduleperm_handler->checkRight('module_admin', $module_id, $this->getGroups());
     }
     /**
      * get the user's rank
-	 * @return array array of rank ID and title
+     * @return array array of rank ID and title
      */
     function rank()
     {
@@ -250,14 +250,14 @@
         }
         return $this->_isOnline;
     }
-	/**#@+
-	 * specialized wrapper for {@link XoopsObject::getVar()}
+    /**#@+
+     * specialized wrapper for {@link XoopsObject::getVar()}
      * 
      * kept for compatibility reasons.
      * 
- 	 * @see XoopsObject::getVar()
-	 * @deprecated
-	 */
+     * @see XoopsObject::getVar()
+     * @deprecated
+     */
     /**
      * get the users UID 
      * @return int
@@ -269,8 +269,8 @@
     
     /**
      * get the users name
-	 * @param string $format format for the output, see {@link XoopsObject::getVar()}
-	 * @return string 
+     * @param string $format format for the output, see {@link XoopsObject::getVar()}
+     * @return string 
      */
     function name($format="S")
     {
@@ -279,7 +279,7 @@
     
     /**
      * get the user's uname
-	 * @param string $format format for the output, see {@link XoopsObject::getVar()}
+     * @param string $format format for the output, see {@link XoopsObject::getVar()}
      * @return string
      */
     function uname($format="S")
@@ -289,9 +289,9 @@
     
     /**
      * get the user's email 
-	 * 
-	 * @param string $format format for the output, see {@link XoopsObject::getVar()}
-	 * @return string
+     * 
+     * @param string $format format for the output, see {@link XoopsObject::getVar()}
+     * @return string
      */
     function email($format="S")
     {
@@ -422,8 +422,8 @@
     {
         return $this->getVar("last_login");
     }
-	/**#@-*/
-	
+    /**#@-*/
+    
 }
 
 /**
@@ -434,16 +434,16 @@
  */
 class XoopsGuestUser extends XoopsUser
 {
-	/**
-	 * check if the user is a guest user
+    /**
+     * check if the user is a guest user
      *
      * @return bool returns true
      *
      */
-	function isGuest()
-	{
-		return true;
-	}
+    function isGuest()
+    {
+        return true;
+    }
 }
 
 
@@ -640,7 +640,7 @@
         return true;
     }
 
-	/**
+    /**
      * Change a value for users with a certain criteria
      * 
      * @param   string  $fieldname  Name of the field

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2284] CVS update: xoops2jp/html/modules/system
Message-ID: <20060205051953.43F592AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin.php
diff -u xoops2jp/html/modules/system/admin.php:1.2 xoops2jp/html/modules/system/admin.php:1.2.16.1
--- xoops2jp/html/modules/system/admin.php:1.2	Fri Mar 18 21:52:38 2005
+++ xoops2jp/html/modules/system/admin.php	Sun Feb  5 14:19:53 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: admin.php,v 1.2 2005/03/18 12:52:38 onokazu Exp $
+// $Id: admin.php,v 1.2.16.1 2006/02/05 05:19:53 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,125 +30,125 @@
 // ------------------------------------------------------------------------- //
 
 if (isset($_POST['fct'])) {
-	$fct = trim($_POST['fct']);
+    $fct = trim($_POST['fct']);
 }
 if (isset($_GET['fct'])) {
-	$fct = trim($_GET['fct']);
+    $fct = trim($_GET['fct']);
 }
 if (isset($fct) && $fct == "users") {
-	$xoopsOption['pagetype'] = "user";
+    $xoopsOption['pagetype'] = "user";
 }
 include "../../mainfile.php";
 include XOOPS_ROOT_PATH."/include/cp_functions.php";
 if ( file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php") ) {
-	include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
+    include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
 } else {
-	include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
+    include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
 }
 include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
 
 $admintest = 0;
 
 if (is_object($xoopsUser)) {
-	$xoopsModule =& XoopsModule::getByDirname("system");
-	if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
-		redirect_header(XOOPS_URL."/",3,_NOPERM);
-		exit();
-	}
-	$admintest=1;
+    $xoopsModule =& XoopsModule::getByDirname("system");
+    if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+        redirect_header(XOOPS_URL."/",3,_NOPERM);
+        exit();
+    }
+    $admintest=1;
 } else {
-	redirect_header(XOOPS_URL."/",3,_NOPERM);
-	exit();
+    redirect_header(XOOPS_URL."/",3,_NOPERM);
+    exit();
 }
 
 // include system category definitions
 include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
 $error = false;
 if ($admintest != 0) {
-	if (isset($fct) && $fct != '') {
-		if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
-		
-			if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
-				include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
-			} elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
-				include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
-			}
-			include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
-			$sysperm_handler =& xoops_gethandler('groupperm');
-			$category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
-			unset($modversion);
-			if ($category > 0) {
-				$groups =& $xoopsUser->getGroups();
-				if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
-					if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
-						include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
-					} else {
-						$error = true;
-					}
-				} else {
-					$error = true;
-				}
-			} elseif ($fct == 'version') {
-				if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
-					include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
-				} else {
-					$error = true;
-				}
-			} else {
-				$error = true;
-			}
-		} else {
-			$error = true;
-		}
-	} else {
-		$error = true;
-	}
+    if (isset($fct) && $fct != '') {
+        if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
+        
+            if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+                include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+            } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
+                include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
+            }
+            include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
+            $sysperm_handler =& xoops_gethandler('groupperm');
+            $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
+            unset($modversion);
+            if ($category > 0) {
+                $groups =& $xoopsUser->getGroups();
+                if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
+                    if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
+                        include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
+                    } else {
+                        $error = true;
+                    }
+                } else {
+                    $error = true;
+                }
+            } elseif ($fct == 'version') {
+                if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
+                    include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
+                } else {
+                    $error = true;
+                }
+            } else {
+                $error = true;
+            }
+        } else {
+            $error = true;
+        }
+    } else {
+        $error = true;
+    }
 }
 
 if (false != $error) {
-	xoops_cp_header();
-	echo "<h4>System Configuration</h4>";
-	echo '<table class="outer" cellpadding="4" cellspacing="1">';
-	echo '<tr>';
-	$groups = $xoopsUser->getGroups();
-	$all_ok = false;
-	if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
-		$sysperm_handler =& xoops_gethandler('groupperm');
-		$ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups);
-	} else {
-		$all_ok = true;
-	}
-	$admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
-	$handle = opendir($admin_dir);
-	$counter = 0;
-	$class = 'even';
-	while ($file = readdir($handle)) {
-		if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) {
-			include $admin_dir.'/'.$file.'/xoops_version.php';
-			if ($modversion['hasAdmin']) {
-				$category = isset($modversion['category']) ? intval($modversion['category']) : 0;
-				if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
-					echo "<td class='$class' align='center' valign='bottom' width='19%'>";
-					echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
-					echo "</td>";
-					$counter++;
-					$class = ($class == 'even') ? 'odd' : 'even';
-				}
-				if ( $counter > 4 ) {
-					$counter = 0;
-					echo "</tr>";
-					echo "<tr>";
-				}
-			}
-			unset($modversion);
-		}
-	}
-	while ($counter < 5) {
-		echo '<td class="'.$class.'">&nbsp;</td>';
-		$class = ($class == 'even') ? 'odd' : 'even';
-		$counter++;
-	}
-	echo '</tr></table>';
+    xoops_cp_header();
+    echo "<h4>System Configuration</h4>";
+    echo '<table class="outer" cellpadding="4" cellspacing="1">';
+    echo '<tr>';
+    $groups = $xoopsUser->getGroups();
+    $all_ok = false;
+    if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+        $sysperm_handler =& xoops_gethandler('groupperm');
+        $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups);
+    } else {
+        $all_ok = true;
+    }
+    $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
+    $handle = opendir($admin_dir);
+    $counter = 0;
+    $class = 'even';
+    while ($file = readdir($handle)) {
+        if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) {
+            include $admin_dir.'/'.$file.'/xoops_version.php';
+            if ($modversion['hasAdmin']) {
+                $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
+                if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+                    echo "<td class='$class' align='center' valign='bottom' width='19%'>";
+                    echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
+                    echo "</td>";
+                    $counter++;
+                    $class = ($class == 'even') ? 'odd' : 'even';
+                }
+                if ( $counter > 4 ) {
+                    $counter = 0;
+                    echo "</tr>";
+                    echo "<tr>";
+                }
+            }
+            unset($modversion);
+        }
+    }
+    while ($counter < 5) {
+        echo '<td class="'.$class.'">&nbsp;</td>';
+        $class = ($class == 'even') ? 'odd' : 'even';
+        $counter++;
+    }
+    echo '</tr></table>';
     xoops_cp_footer();
 }
 

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2285] CVS update:
	xoops2jp/html/modules/system/admin/groups
Message-ID: <20060205051953.8CDCB2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/groups/groups.php
diff -u xoops2jp/html/modules/system/admin/groups/groups.php:1.4 xoops2jp/html/modules/system/admin/groups/groups.php:1.4.6.1
--- xoops2jp/html/modules/system/admin/groups/groups.php:1.4	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/groups/groups.php	Sun Feb  5 14:19:53 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: groups.php,v 1.4 2005/08/03 12:39:16 onokazu Exp $
+// $Id: groups.php,v 1.4.6.1 2006/02/05 05:19:53 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -53,7 +53,7 @@
     //OpenTable();
     echo "<h4 style='text-align:left'>"._AM_EDITADG."</h4>";
     $member_handler =& xoops_gethandler('member');
-    $groups =& $member_handler->getGroups();
+    $groups = $member_handler->getGroups();
         echo "<table class='outer' width='40%' cellpadding='4' cellspacing='1'><tr><th colspan='2'>"._AM_EDITADG."</th></tr>";
     $count = count($groups);
     for ($i = 0; $i < $count; $i++) {
@@ -104,8 +104,8 @@
     $name_value = $thisgroup->getVar("name", "E");
     $desc_value = $thisgroup->getVar("description", "E");
     $moduleperm_handler =& xoops_gethandler('groupperm');
-    $a_mod_value =& $moduleperm_handler->getItemIds('module_admin', $thisgroup->getVar('groupid'));
-    $r_mod_value =& $moduleperm_handler->getItemIds('module_read', $thisgroup->getVar('groupid'));
+    $a_mod_value = $moduleperm_handler->getItemIds('module_admin', $thisgroup->getVar('groupid'));
+    $r_mod_value = $moduleperm_handler->getItemIds('module_read', $thisgroup->getVar('groupid'));
     $r_block_value =& XoopsBlock::getAllBlocksByGroup($thisgroup->getVar("groupid"), false);
     $op_value = "update";
     $submit_value = _AM_UPDATEADG;
@@ -117,7 +117,7 @@
     }
 
     $sysperm_handler =& xoops_gethandler('groupperm');
-    $s_cat_value =& $sysperm_handler->getItemIds('system_admin', $g_id);
+    $s_cat_value = $sysperm_handler->getItemIds('system_admin', $g_id);
 
     include XOOPS_ROOT_PATH."/modules/system/admin/groups/groupform.php";
     echo "<br /><h4 style='text-align:left'>"._AM_EDITMEMBER."</h4>";
@@ -128,7 +128,7 @@
     if ($usercount < 200 && $membercount < 200) {
         // do the old way only when counts are small
         $mlist = array();
-        $members =& $member_handler->getUsersByGroup($g_id, false);
+        $members = $member_handler->getUsersByGroup($g_id, false);
         if (count($members) > 0) {
             $member_criteria = new Criteria('uid', "(".implode(',', $members).")", "IN");
             $member_criteria->setSort('uname');
@@ -136,8 +136,8 @@
         }
         $criteria = new Criteria('level', 0, '>');
         $criteria->setSort('uname');
-        $userslist =& $member_handler->getUserList($criteria);
-        $users =& array_diff($userslist, $mlist);
+        $userslist = $member_handler->getUserList($criteria);
+        $users = array_diff($userslist, $mlist);
         echo '<table class="outer">
         <tr><th align="center">'._AM_NONMEMBERS.'<br />';
         echo '</th><th></th><th align="center">'._AM_MEMBERS.'<br />';

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2286] CVS update:
	xoops2jp/html/modules/system/admin/findusers
Message-ID: <20060205051953.68B632AC086@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/findusers/main.php
diff -u xoops2jp/html/modules/system/admin/findusers/main.php:1.5 xoops2jp/html/modules/system/admin/findusers/main.php:1.5.6.1
--- xoops2jp/html/modules/system/admin/findusers/main.php:1.5	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/findusers/main.php	Sun Feb  5 14:19:53 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.5 2005/08/03 12:39:16 onokazu Exp $
+// $Id: main.php,v 1.5.6.1 2006/02/05 05:19:53 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -360,7 +360,7 @@
         $criteria->setOrder($order);
         $criteria->setLimit($limit);
         $criteria->setStart($start);
-        $foundusers =& $member_handler->getUsers($criteria, true);
+        $foundusers = $member_handler->getUsers($criteria, true);
         $ucount = 0;
         foreach (array_keys($foundusers) as $j) {
             if ($ucount % 2 == 0) {

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2287] CVS update: xoops2jp/html/modules/system/blocks
Message-ID: <20060205051953.D673F2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/blocks/system_blocks.php
diff -u xoops2jp/html/modules/system/blocks/system_blocks.php:1.6.4.1 xoops2jp/html/modules/system/blocks/system_blocks.php:1.6.4.2
--- xoops2jp/html/modules/system/blocks/system_blocks.php:1.6.4.1	Tue Oct 25 11:52:05 2005
+++ xoops2jp/html/modules/system/blocks/system_blocks.php	Sun Feb  5 14:19:53 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: system_blocks.php,v 1.6.4.1 2005/10/25 02:52:05 onokazu Exp $
+// $Id: system_blocks.php,v 1.6.4.2 2006/02/05 05:19:53 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -116,7 +116,7 @@
     $modules =& $module_handler->getObjects($criteria, true);
     $moduleperm_handler =& xoops_gethandler('groupperm');
     $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
-    $read_allowed =& $moduleperm_handler->getItemIds('module_read', $groups);
+    $read_allowed = $moduleperm_handler->getItemIds('module_read', $groups);
     foreach (array_keys($modules) as $i) {
         if (in_array($i, $read_allowed)) {
             $block['modules'][$i]['name'] = $modules[$i]->getVar('name');

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:53 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:53 +0900
Subject: [xoops-cvslog 2288] CVS update:
	xoops2jp/html/modules/system/admin/mailusers
Message-ID: <20060205051953.AFDF72AC088@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4.6.1
--- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php	Sun Feb  5 14:19:53 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mailusers.php,v 1.4 2005/08/03 12:39:16 onokazu Exp $
+// $Id: mailusers.php,v 1.4.6.1 2006/02/05 05:19:53 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -32,220 +32,220 @@
 define ('SEND_SIM_PROCESS_AMMO',100);
 
 if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
-	exit("Access Denied");
+    exit("Access Denied");
 } else {
-	include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-	$op = "form";
+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    $op = "form";
 
-	if (!empty($_POST['op']) && $_POST['op'] == "send") {
-		$op =  $_POST['op'];
-	}
-
-	if ( $op == "form" ) {
-		xoops_cp_header();
-		//OpenTable();
-		$display_criteria = 1;
-		include XOOPS_ROOT_PATH."/modules/system/admin/mailusers/mailform.php";
-		$form->display();
-		//CloseTable();
-		xoops_cp_footer();
-	}
-
-	if ( $op == "send" && !empty($_POST['mail_send_to']) ) {
-		if(!XoopsSingleTokenHandler::quickValidate('mailusers_send')) {
-			xoops_cp_header();
-			xoops_error("Ticket Error");
-			xoops_cp_footer();
-			exit();
-		}
-
-		$added = array();
-		$added_id = array();
-		$criteria = array();
-		if ( !empty($_POST['mail_inactive']) ) {
-			$criteria[] = "level = 0";
-		} else {
-			if (!empty($_POST['mail_mailok'])) {
-				$criteria[] = 'user_mailok = 1';
-			}
-			if (!empty($_POST['mail_to_group'])) {
-				$member_handler =& xoops_gethandler('member');
-				$user_list = array();
-				foreach ($_POST['mail_to_group'] as $groupid ) {
-					$members =& $member_handler->getUsersByGroup($groupid, false);
-					// Mith: Changed this to not fetch user objects with getUsersByGroup 
-					// as it is resource-intensive and all we want is the userIDs
-					$user_list = array_merge($members, $user_list);
-						
-					// RMV: changed this because makes more sense to me
-					// if options all grouped by 'AND', not 'OR'
-					/*
-					foreach ($members as $member) {
-						if (!in_array($member->getVar('uid'), $user_list)) {
-							$user_list[] = $member->getVar('uid');
-						}
-					}
-					*/
-					//	if (!in_array($member->getVar('uid'), $added_id) ) {
-					//		$added_id[] = $member->getVar('uid');
-					//		$added[] =& $member;
-					//		unset($member);
-					//	}
-					//}
-				}
-				if (!empty($user_list)) {
-					$criteria[] = 'uid IN (' . join(',', $user_list) . ')';
-				}
-			}
-			if ( !empty($_POST['mail_lastlog_min']) ) {
-				$f_mail_lastlog_min = trim($_POST['mail_lastlog_min']);
-				$time = mktime(0,0,0,substr($f_mail_lastlog_min,5,2),substr($f_mail_lastlog_min,8,2),substr($f_mail_lastlog_min,0,4));
-				if ( $time > 0 ) {
-					$criteria[] = "last_login > $time";
-				}
-			}
-			if ( !empty($_POST['mail_lastlog_max']) ) {
-				$f_mail_lastlog_max = trim($_POST['mail_lastlog_max']);
-				$time = mktime(0,0,0,substr($f_mail_lastlog_max,5,2),substr($f_mail_lastlog_max,8,2),substr($f_mail_lastlog_max,0,4));
-				if ( $time > 0 ) {
-					$criteria[] = "last_login < $time";
-				}
-			}
-			if ( !empty($_POST['mail_idle_more']) && is_numeric($_POST['mail_idle_more']) ) {
-				$f_mail_idle_more = intval(trim($_POST['mail_idle_more']));
-				$time = 60 * 60 * 24 * $f_mail_idle_more;
-				$time = time() - $time;
-				if ( $time > 0 ) {
-					$criteria[] = "last_login < $time";
-				}
-			}
-			if ( !empty($_POST['mail_idle_less']) && is_numeric($_POST['mail_idle_less']) ) {
-				$f_mail_idle_less = intval(trim($_POST['mail_idle_less']));
-				$time = 60 * 60 * 24 * $f_mail_idle_less;
-				$time = time() - $time;
-				if ( $time > 0 ) {
-					$criteria[] = "last_login > $time";
-				}
-			}
-		}
-		if ( !empty($_POST['mail_regd_min']) ) {
-			$f_mail_regd_min = trim($_POST['mail_regd_min']);
-			$time = mktime(0,0,0,substr($f_mail_regd_min,5,2),substr($f_mail_regd_min,8,2),substr($f_mail_regd_min,0,4));
-			if ( $time > 0 ) {
-				$criteria[] = "user_regdate > $time";
-			}
-		}
-		if ( !empty($_POST['mail_regd_max']) ) {
-			$f_mail_regd_max = trim($_POST['mail_regd_max']);
-			$time = mktime(0,0,0,substr($f_mail_regd_max,5,2),substr($f_mail_regd_max,8,2),substr($f_mail_regd_max,0,4));
-			if ( $time > 0 ) {
-				$criteria[] = "user_regdate < $time";
-			}
-		}
-		if ( !empty($criteria) ) {
-			if ( empty($_POST['mail_inactive']) ) {
-				$criteria[] = "level > 0";
-			}
-			$criteria_object = new CriteriaCompo();
-			foreach ($criteria as $c) {
-				list ($field, $op, $value) = split(' ', $c);
-				$criteria_object->add(new Criteria($field,$value,$op), 'AND');
-			}
-			$member_handler =& xoops_gethandler('member');
-			$getusers =& $member_handler->getUsers($criteria_object);
-			foreach ($getusers as $getuser) {
-				if ( !in_array($getuser->getVar("uid"), $added_id) ) {
-					$added[] = $getuser;
-					$added_id[] = $getuser->getVar("uid");
-				}
-			}
-		}
-		if ( !empty($_POST['mail_to_user']) ) {
-			foreach ($_POST['mail_to_user'] as $to_user) {
-				if ( !in_array($to_user, $added_id) ) {
-					$added[] = new XoopsUser($to_user);
-					$added_id[] = $to_user;
-				}
-			}
-		}
-		$added_count = count($added);
-		xoops_cp_header();
-		//OpenTable();
-		if ( $added_count > 0 ) {
-			$mail_start = !empty($_POST['mail_start']) ? $_POST['mail_start'] : 0;
-			$mail_end = ($added_count > ($mail_start + SEND_SIM_PROCESS_AMMO)) ? ($mail_start + SEND_SIM_PROCESS_AMMO) : $added_count;
-			$myts =& MyTextSanitizer::getInstance();
-			$xoopsMailer =& getMailer();
-			for ( $i = $mail_start; $i < $mail_end; $i++) {
-				$xoopsMailer->setToUsers($added[$i]);
-			}
-			$xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
-			$xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
-			$xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
-			$xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
-			if ( in_array("mail", $_POST['mail_send_to']) ) {
-				$xoopsMailer->useMail();
-			}
-			if ( in_array("pm", $_POST['mail_send_to']) && empty($_POST['mail_inactive']) ) {
-				$xoopsMailer->usePM();
-			}
-			$xoopsMailer->send(true);
-			echo $xoopsMailer->getSuccess();
-			echo $xoopsMailer->getErrors();
-
-
-			if ( $added_count > $mail_end ) {
-				$form = new XoopsThemeForm(_AM_SENDMTOUSERS, "mailusers", "admin.php?fct=mailusers");
-				$form->addElement(new XoopsFormToken(XoopsSingleTokenHandler::quickCreate('mailusers_send')));
-				if ( !empty($_POST['mail_to_group']) ) {
-					foreach ( $_POST['mail_to_group'] as $mailgroup) {
-						$group_hidden = new XoopsFormHidden("mail_to_group[]", $mailgroup);
-						$form->addElement($group_hidden);
-					}
-				}
-				if(isset($_POST['mail_inactive']))
-					$form->addElement(new XoopsFormHidden("mail_inactive", intval($_POST['mail_inactive'])));
-				if(isset($_POST['mail_mailok']))
-					$form->addElement(new XoopsFormHidden("mail_mailok", intval($_POST['mail_mailok'])));
-				$lastlog_min_hidden = new XoopsFormHidden("mail_lastlog_min", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_min']));
-				$lastlog_max_hidden = new XoopsFormHidden("mail_lastlog_max", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_max']));
-				$regd_min_hidden = new XoopsFormHidden("mail_regd_min", $myts->makeTboxData4PreviewInForm($_POST['mail_regd_max']));
-				$regd_max_hidden = new XoopsFormHidden("mail_regd_max", $myts->makeTboxData4PreviewInForm($_POST['mail_regd_max']));
-				$idle_more_hidden = new XoopsFormHidden("mail_idle_more", $myts->makeTboxData4PreviewInForm($_POST['mail_idle_more']));
-				$idle_less_hidden = new XoopsFormHidden("mail_idle_less", $myts->makeTboxData4PreviewInForm($_POST['mail_idle_less']));
-				$fname_hidden = new XoopsFormHidden("mail_fromname", $myts->makeTboxData4PreviewInForm($_POST['mail_fromname']));
-				$femail_hidden = new XoopsFormHidden("mail_fromemail", $myts->makeTboxData4PreviewInForm($_POST['mail_fromemail']));
-				$subject_hidden = new XoopsFormHidden("mail_subject", $myts->makeTboxData4PreviewInForm($_POST['mail_subject']));
-				$body_hidden = new XoopsFormHidden("mail_body", $myts->makeTareaData4PreviewInForm($_POST['mail_body']));
-				$start_hidden = new XoopsFormHidden("mail_start", $mail_end);
-				$to_hidden = new XoopsFormHidden("mail_send_to[]", "mail");
-				$op_hidden = new XoopsFormHidden("op", "send");
-				$submit_button = new XoopsFormButton("", "mail_submit", _AM_SENDNEXT, "submit");
-				$sent_label = new XoopsFormLabel(_AM_SENT, sprintf(_AM_SENTNUM, $_POST['mail_start']+1, $mail_end, $added_count));
-				$form->addElement($sent_label);
-				$form->addElement($lastlog_min_hidden);
-				$form->addElement($lastlog_max_hidden);
-				$form->addElement($regd_min_hidden);
-				$form->addElement($regd_max_hidden);
-				$form->addElement($idle_more_hidden);
-				$form->addElement($idle_less_hidden);
-				$form->addElement($fname_hidden);
-				$form->addElement($femail_hidden);
-				$form->addElement($subject_hidden);
-				$form->addElement($body_hidden);
-				$form->addElement($to_hidden);
-				$form->addElement($op_hidden);
-				$form->addElement($start_hidden);
-				$form->addElement($submit_button);
-				$form->display();
-			} else {
-				echo "<h4>"._AM_SENDCOMP."</h4>";
-			}
-		} else {
-			echo "<h4>"._AM_NOUSERMATCH."</h4>";
-		}
-		//CloseTable();
-		xoops_cp_footer();
-	}
+    if (!empty($_POST['op']) && $_POST['op'] == "send") {
+        $op =  $_POST['op'];
+    }
+
+    if ( $op == "form" ) {
+        xoops_cp_header();
+        //OpenTable();
+        $display_criteria = 1;
+        include XOOPS_ROOT_PATH."/modules/system/admin/mailusers/mailform.php";
+        $form->display();
+        //CloseTable();
+        xoops_cp_footer();
+    }
+
+    if ( $op == "send" && !empty($_POST['mail_send_to']) ) {
+        if(!XoopsSingleTokenHandler::quickValidate('mailusers_send')) {
+            xoops_cp_header();
+            xoops_error("Ticket Error");
+            xoops_cp_footer();
+            exit();
+        }
+
+        $added = array();
+        $added_id = array();
+        $criteria = array();
+        if ( !empty($_POST['mail_inactive']) ) {
+            $criteria[] = "level = 0";
+        } else {
+            if (!empty($_POST['mail_mailok'])) {
+                $criteria[] = 'user_mailok = 1';
+            }
+            if (!empty($_POST['mail_to_group'])) {
+                $member_handler =& xoops_gethandler('member');
+                $user_list = array();
+                foreach ($_POST['mail_to_group'] as $groupid ) {
+                    $members =& $member_handler->getUsersByGroup($groupid, false);
+                    // Mith: Changed this to not fetch user objects with getUsersByGroup 
+                    // as it is resource-intensive and all we want is the userIDs
+                    $user_list = array_merge($members, $user_list);
+                        
+                    // RMV: changed this because makes more sense to me
+                    // if options all grouped by 'AND', not 'OR'
+                    /*
+                    foreach ($members as $member) {
+                        if (!in_array($member->getVar('uid'), $user_list)) {
+                            $user_list[] = $member->getVar('uid');
+                        }
+                    }
+                    */
+                    //  if (!in_array($member->getVar('uid'), $added_id) ) {
+                    //      $added_id[] = $member->getVar('uid');
+                    //      $added[] =& $member;
+                    //      unset($member);
+                    //  }
+                    //}
+                }
+                if (!empty($user_list)) {
+                    $criteria[] = 'uid IN (' . join(',', $user_list) . ')';
+                }
+            }
+            if ( !empty($_POST['mail_lastlog_min']) ) {
+                $f_mail_lastlog_min = trim($_POST['mail_lastlog_min']);
+                $time = mktime(0,0,0,substr($f_mail_lastlog_min,5,2),substr($f_mail_lastlog_min,8,2),substr($f_mail_lastlog_min,0,4));
+                if ( $time > 0 ) {
+                    $criteria[] = "last_login > $time";
+                }
+            }
+            if ( !empty($_POST['mail_lastlog_max']) ) {
+                $f_mail_lastlog_max = trim($_POST['mail_lastlog_max']);
+                $time = mktime(0,0,0,substr($f_mail_lastlog_max,5,2),substr($f_mail_lastlog_max,8,2),substr($f_mail_lastlog_max,0,4));
+                if ( $time > 0 ) {
+                    $criteria[] = "last_login < $time";
+                }
+            }
+            if ( !empty($_POST['mail_idle_more']) && is_numeric($_POST['mail_idle_more']) ) {
+                $f_mail_idle_more = intval(trim($_POST['mail_idle_more']));
+                $time = 60 * 60 * 24 * $f_mail_idle_more;
+                $time = time() - $time;
+                if ( $time > 0 ) {
+                    $criteria[] = "last_login < $time";
+                }
+            }
+            if ( !empty($_POST['mail_idle_less']) && is_numeric($_POST['mail_idle_less']) ) {
+                $f_mail_idle_less = intval(trim($_POST['mail_idle_less']));
+                $time = 60 * 60 * 24 * $f_mail_idle_less;
+                $time = time() - $time;
+                if ( $time > 0 ) {
+                    $criteria[] = "last_login > $time";
+                }
+            }
+        }
+        if ( !empty($_POST['mail_regd_min']) ) {
+            $f_mail_regd_min = trim($_POST['mail_regd_min']);
+            $time = mktime(0,0,0,substr($f_mail_regd_min,5,2),substr($f_mail_regd_min,8,2),substr($f_mail_regd_min,0,4));
+            if ( $time > 0 ) {
+                $criteria[] = "user_regdate > $time";
+            }
+        }
+        if ( !empty($_POST['mail_regd_max']) ) {
+            $f_mail_regd_max = trim($_POST['mail_regd_max']);
+            $time = mktime(0,0,0,substr($f_mail_regd_max,5,2),substr($f_mail_regd_max,8,2),substr($f_mail_regd_max,0,4));
+            if ( $time > 0 ) {
+                $criteria[] = "user_regdate < $time";
+            }
+        }
+        if ( !empty($criteria) ) {
+            if ( empty($_POST['mail_inactive']) ) {
+                $criteria[] = "level > 0";
+            }
+            $criteria_object = new CriteriaCompo();
+            foreach ($criteria as $c) {
+                list ($field, $op, $value) = split(' ', $c);
+                $criteria_object->add(new Criteria($field,$value,$op), 'AND');
+            }
+            $member_handler =& xoops_gethandler('member');
+            $getusers = $member_handler->getUsers($criteria_object);
+            foreach (array_keys($getusers) as $i) {
+                if ( !in_array($getusers[$i]->getVar("uid"), $added_id) ) {
+                    $added[] =& $getusers[$i];
+                    $added_id[] = $getusers[$i]->getVar("uid");
+                }
+            }
+        }
+        if ( !empty($_POST['mail_to_user']) ) {
+            foreach ($_POST['mail_to_user'] as $to_user) {
+                if ( !in_array($to_user, $added_id) ) {
+                    $added[] =& new XoopsUser($to_user);
+                    $added_id[] = $to_user;
+                }
+            }
+        }
+        $added_count = count($added);
+        xoops_cp_header();
+        //OpenTable();
+        if ( $added_count > 0 ) {
+            $mail_start = !empty($_POST['mail_start']) ? $_POST['mail_start'] : 0;
+            $mail_end = ($added_count > ($mail_start + SEND_SIM_PROCESS_AMMO)) ? ($mail_start + SEND_SIM_PROCESS_AMMO) : $added_count;
+            $myts =& MyTextSanitizer::getInstance();
+            $xoopsMailer =& getMailer();
+            for ( $i = $mail_start; $i < $mail_end; $i++) {
+                $xoopsMailer->setToUsers($added[$i]);
+            }
+            $xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
+            $xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
+            $xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
+            $xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
+            if ( in_array("mail", $_POST['mail_send_to']) ) {
+                $xoopsMailer->useMail();
+            }
+            if ( in_array("pm", $_POST['mail_send_to']) && empty($_POST['mail_inactive']) ) {
+                $xoopsMailer->usePM();
+            }
+            $xoopsMailer->send(true);
+            echo $xoopsMailer->getSuccess();
+            echo $xoopsMailer->getErrors();
+
+
+            if ( $added_count > $mail_end ) {
+                $form = new XoopsThemeForm(_AM_SENDMTOUSERS, "mailusers", "admin.php?fct=mailusers");
+                $form->addElement(new XoopsFormToken(XoopsSingleTokenHandler::quickCreate('mailusers_send')));
+                if ( !empty($_POST['mail_to_group']) ) {
+                    foreach ( $_POST['mail_to_group'] as $mailgroup) {
+                        $group_hidden = new XoopsFormHidden("mail_to_group[]", $mailgroup);
+                        $form->addElement($group_hidden);
+                    }
+                }
+                if(isset($_POST['mail_inactive']))
+                    $form->addElement(new XoopsFormHidden("mail_inactive", intval($_POST['mail_inactive'])));
+                if(isset($_POST['mail_mailok']))
+                    $form->addElement(new XoopsFormHidden("mail_mailok", intval($_POST['mail_mailok'])));
+                $lastlog_min_hidden = new XoopsFormHidden("mail_lastlog_min", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_min']));
+                $lastlog_max_hidden = new XoopsFormHidden("mail_lastlog_max", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_max']));
+                $regd_min_hidden = new XoopsFormHidden("mail_regd_min", $myts->makeTboxData4PreviewInForm($_POST['mail_regd_max']));
+                $regd_max_hidden = new XoopsFormHidden("mail_regd_max", $myts->makeTboxData4PreviewInForm($_POST['mail_regd_max']));
+                $idle_more_hidden = new XoopsFormHidden("mail_idle_more", $myts->makeTboxData4PreviewInForm($_POST['mail_idle_more']));
+                $idle_less_hidden = new XoopsFormHidden("mail_idle_less", $myts->makeTboxData4PreviewInForm($_POST['mail_idle_less']));
+                $fname_hidden = new XoopsFormHidden("mail_fromname", $myts->makeTboxData4PreviewInForm($_POST['mail_fromname']));
+                $femail_hidden = new XoopsFormHidden("mail_fromemail", $myts->makeTboxData4PreviewInForm($_POST['mail_fromemail']));
+                $subject_hidden = new XoopsFormHidden("mail_subject", $myts->makeTboxData4PreviewInForm($_POST['mail_subject']));
+                $body_hidden = new XoopsFormHidden("mail_body", $myts->makeTareaData4PreviewInForm($_POST['mail_body']));
+                $start_hidden = new XoopsFormHidden("mail_start", $mail_end);
+                $to_hidden = new XoopsFormHidden("mail_send_to[]", "mail");
+                $op_hidden = new XoopsFormHidden("op", "send");
+                $submit_button = new XoopsFormButton("", "mail_submit", _AM_SENDNEXT, "submit");
+                $sent_label = new XoopsFormLabel(_AM_SENT, sprintf(_AM_SENTNUM, $_POST['mail_start']+1, $mail_end, $added_count));
+                $form->addElement($sent_label);
+                $form->addElement($lastlog_min_hidden);
+                $form->addElement($lastlog_max_hidden);
+                $form->addElement($regd_min_hidden);
+                $form->addElement($regd_max_hidden);
+                $form->addElement($idle_more_hidden);
+                $form->addElement($idle_less_hidden);
+                $form->addElement($fname_hidden);
+                $form->addElement($femail_hidden);
+                $form->addElement($subject_hidden);
+                $form->addElement($body_hidden);
+                $form->addElement($to_hidden);
+                $form->addElement($op_hidden);
+                $form->addElement($start_hidden);
+                $form->addElement($submit_button);
+                $form->display();
+            } else {
+                echo "<h4>"._AM_SENDCOMP."</h4>";
+            }
+        } else {
+            echo "<h4>"._AM_NOUSERMATCH."</h4>";
+        }
+        //CloseTable();
+        xoops_cp_footer();
+    }
 }
 ?>

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:52 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:52 +0900
Subject: [xoops-cvslog 2289] CVS update: xoops2jp/html/class/database
Message-ID: <20060205051952.1B62A2AC059@users.sourceforge.jp>

Index: xoops2jp/html/class/database/database.php
diff -u xoops2jp/html/class/database/database.php:1.2 xoops2jp/html/class/database/database.php:1.2.16.1
--- xoops2jp/html/class/database/database.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/database/database.php	Sun Feb  5 14:19:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: database.php,v 1.2.16.1 2006/02/05 05:19:51 onokazu Exp $
 // database.php - defines abstract database wrapper class 
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
@@ -29,15 +29,15 @@
  * @package     kernel
  * @subpackage  database
  * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2003 XOOPS.org
  */
 
 /**
  * make sure this is only included once!
  */
 if ( !defined("XOOPS_C_DATABASE_INCLUDED") ) {
-	define("XOOPS_C_DATABASE_INCLUDED",1);
+    define("XOOPS_C_DATABASE_INCLUDED",1);
 
 /**
  * Abstract base class for Database access classes
@@ -51,67 +51,67 @@
  * @subpackage database
  */
 class XoopsDatabase
-	{
-		/**
-		 * Prefix for tables in the database
-		 * @var string
-		 */
-		var $prefix = '';
-		/**
-		 * reference to a {@link XoopsLogger} object
+    {
+        /**
+         * Prefix for tables in the database
+         * @var string
+         */
+        var $prefix = '';
+        /**
+         * reference to a {@link XoopsLogger} object
          * @see XoopsLogger
-		 * @var object XoopsLogger
-		 */
-		var $logger;
+         * @var object XoopsLogger
+         */
+        var $logger;
 
-		/**
-		 * constructor
+        /**
+         * constructor
          * 
          * will always fail, because this is an abstract class!
-		 */
-		function XoopsDatabase()
-		{
-			// exit("Cannot instantiate this class directly");
-		}
-
-		/**
-		 * assign a {@link XoopsLogger} object to the database
-		 * 
+         */
+        function XoopsDatabase()
+        {
+            // exit("Cannot instantiate this class directly");
+        }
+
+        /**
+         * assign a {@link XoopsLogger} object to the database
+         * 
          * @see XoopsLogger
          * @param object $logger reference to a {@link XoopsLogger} object
-		 */
-		function setLogger(&$logger)
-		{
-			$this->logger =& $logger;
-		}
-
-		/**
-		 * set the prefix for tables in the database
-		 * 
+         */
+        function setLogger(&$logger)
+        {
+            $this->logger =& $logger;
+        }
+
+        /**
+         * set the prefix for tables in the database
+         * 
          * @param string $value table prefix
-		 */
-		function setPrefix($value)
-		{
-			$this->prefix = $value;
-		}
-		
-		/**
-		 * attach the prefix.'_' to a given tablename
+         */
+        function setPrefix($value)
+        {
+            $this->prefix = $value;
+        }
+        
+        /**
+         * attach the prefix.'_' to a given tablename
          * 
          * if tablename is empty, only prefix will be returned
-		 * 
+         * 
          * @param string $tablename tablename
          * @return string prefixed tablename, just prefix if tablename is empty
-		 */
-		function prefix($tablename='')
-		{
-			if ( $tablename != '' ) {
-				return $this->prefix .'_'. $tablename;
-			} else {
-				return $this->prefix;
-			}
-		}
-	}
+         */
+        function prefix($tablename='')
+        {
+            if ( $tablename != '' ) {
+                return $this->prefix .'_'. $tablename;
+            } else {
+                return $this->prefix;
+            }
+        }
+    }
 }
 
 
@@ -123,10 +123,11 @@
 class Database
 {
 
-	function &getInstance()
-	{
-		return XoopsDatabaseFactory::getDatabaseConnection();
-	}
+    function &getInstance()
+    {
+        $ret =& XoopsDatabaseFactory::getDatabaseConnection();
+        return $ret;
+    }
 }
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/database/mysqldatabase.php
diff -u xoops2jp/html/class/database/mysqldatabase.php:1.2 xoops2jp/html/class/database/mysqldatabase.php:1.2.16.1
--- xoops2jp/html/class/database/mysqldatabase.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/database/mysqldatabase.php	Sun Feb  5 14:19:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysqldatabase.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: mysqldatabase.php,v 1.2.16.1 2006/02/05 05:19:51 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -32,8 +32,8 @@
  * @package     kernel
  * @subpackage  database
  * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2003 XOOPS.org
  */
 
 /**
@@ -54,71 +54,71 @@
  */
 class XoopsMySQLDatabase extends XoopsDatabase
 {
-	/**
-	 * Database connection
-	 * @var resource
-	 */
-	var $conn;
-
-	/**
-	 * connect to the database
-	 * 
+    /**
+     * Database connection
+     * @var resource
+     */
+    var $conn;
+
+    /**
+     * connect to the database
+     * 
      * @param bool $selectdb select the database now?
      * @return bool successful?
-	 */
-	function connect($selectdb = true)
-	{
-		if (XOOPS_DB_PCONNECT == 1) {
-			$this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-		} else {
-			$this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-		}
-	
-		if (!$this->conn) {
-			$this->logger->addQuery('', $this->error(), $this->errno());
-			return false;
-		}
-		
-		if($selectdb != false){
-			if (!mysql_select_db(XOOPS_DB_NAME)) {
-				$this->logger->addQuery('', $this->error(), $this->errno());
-				return false;
-			}
-		}
-		return true;
-	}
+     */
+    function connect($selectdb = true)
+    {
+        if (XOOPS_DB_PCONNECT == 1) {
+            $this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+        } else {
+            $this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+        }
+    
+        if (!$this->conn) {
+            $this->logger->addQuery('', $this->error(), $this->errno());
+            return false;
+        }
+        
+        if($selectdb != false){
+            if (!mysql_select_db(XOOPS_DB_NAME)) {
+                $this->logger->addQuery('', $this->error(), $this->errno());
+                return false;
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * generate an ID for a new row
+    /**
+     * generate an ID for a new row
      * 
      * This is for compatibility only. Will always return 0, because MySQL supports
      * autoincrement for primary keys.
      * 
      * @param string $sequence name of the sequence from which to get the next ID
      * @return int always 0, because mysql has support for autoincrement
-	 */
-	function genId($sequence)
-	{
-		return 0; // will use auto_increment
-	}
-
-	/**
-	 * Get a result row as an enumerated array
-	 * 
+     */
+    function genId($sequence)
+    {
+        return 0; // will use auto_increment
+    }
+
+    /**
+     * Get a result row as an enumerated array
+     * 
      * @param resource $result
      * @return array
-	 */
-	function fetchRow($result)
-	{
-		return @mysql_fetch_row($result);
-	}
-
-	/**
-	 * Fetch a result row as an associative array
-	 *
+     */
+    function fetchRow($result)
+    {
+        return @mysql_fetch_row($result);
+    }
+
+    /**
+     * Fetch a result row as an associative array
+     *
      * @return array
-	 */
-	function fetchArray($result)
+     */
+    function fetchArray($result)
     {
         return @mysql_fetch_assoc( $result );
     }
@@ -133,76 +133,76 @@
         return @mysql_fetch_array( $result, MYSQL_BOTH );
     }
 
-	/**
-	 * Get the ID generated from the previous INSERT operation
-	 * 
+    /**
+     * Get the ID generated from the previous INSERT operation
+     * 
      * @return int
-	 */
-	function getInsertId()
-	{
-		return mysql_insert_id($this->conn);
-	}
-
-	/**
-	 * Get number of rows in result
-	 * 
+     */
+    function getInsertId()
+    {
+        return mysql_insert_id($this->conn);
+    }
+
+    /**
+     * Get number of rows in result
+     * 
      * @param resource query result
      * @return int
-	 */
-	function getRowsNum($result)
-	{
-		return @mysql_num_rows($result);
-	}
-
-	/**
-	 * Get number of affected rows
-	 *
+     */
+    function getRowsNum($result)
+    {
+        return @mysql_num_rows($result);
+    }
+
+    /**
+     * Get number of affected rows
+     *
      * @return int
-	 */
-	function getAffectedRows()
-	{
-		return mysql_affected_rows($this->conn);
-	}
-
-	/**
-	 * Close MySQL connection
-	 * 
-	 */
-	function close()
-	{
-		mysql_close($this->conn);
-	}
-
-	/**
-	 * will free all memory associated with the result identifier result.
-	 * 
+     */
+    function getAffectedRows()
+    {
+        return mysql_affected_rows($this->conn);
+    }
+
+    /**
+     * Close MySQL connection
+     * 
+     */
+    function close()
+    {
+        mysql_close($this->conn);
+    }
+
+    /**
+     * will free all memory associated with the result identifier result.
+     * 
      * @param resource query result
      * @return bool TRUE on success or FALSE on failure. 
-	 */
-	function freeRecordSet($result)
-	{
-		return mysql_free_result($result);
-	}
-
-	/**
-	 * Returns the text of the error message from previous MySQL operation
-	 * 
+     */
+    function freeRecordSet($result)
+    {
+        return mysql_free_result($result);
+    }
+
+    /**
+     * Returns the text of the error message from previous MySQL operation
+     * 
      * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred. 
-	 */
-	function error()
-	{
-		return @mysql_error();
-	}
-
-	/**
-	 * Returns the numerical value of the error message from previous MySQL operation 
-	 * 
+     */
+    function error()
+    {
+        return @mysql_error();
+    }
+
+    /**
+     * Returns the numerical value of the error message from previous MySQL operation 
+     * 
      * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred. 
-	 */
-	function errno()
-	{
-		return @mysql_errno();
-	}
+     */
+    function errno()
+    {
+        return @mysql_errno();
+    }
 
     /**
      * Returns escaped string text with single quotes around it to be safely stored in database
@@ -226,50 +226,51 @@
      * or TRUE if successful and no result
      */
     function &queryF($sql, $limit=0, $start=0)
-	{
-		if ( !empty($limit) ) {
-			if (empty($start)) {
-				$start = 0;
-			}
-			$sql = $sql. ' LIMIT '.(int)$start.', '.(int)$limit;
-		}
-		$result =& mysql_query($sql, $this->conn);
-		if ( $result ) {
-			$this->logger->addQuery($sql);
-			return $result;
+    {
+        if ( !empty($limit) ) {
+            if (empty($start)) {
+                $start = 0;
+            }
+            $sql = $sql. ' LIMIT '.(int)$start.', '.(int)$limit;
+        }
+        $result = mysql_query($sql, $this->conn);
+        if ( $result ) {
+            $this->logger->addQuery($sql);
+            return $result;
         } else {
-			$this->logger->addQuery($sql, $this->error(), $this->errno());
-			return false;
+            $this->logger->addQuery($sql, $this->error(), $this->errno());
+            $ret = false;
+            return $ret;
         }
     }
 
-	/**
-	 * perform a query
+    /**
+     * perform a query
      * 
      * This method is empty and does nothing! It should therefore only be
      * used if nothing is exactly what you want done! ;-)
-	 * 
+     * 
      * @param string $sql a valid MySQL query
      * @param int $limit number of records to return
      * @param int $start offset of first record to return
      * 
      * @abstract
-	 */
-	function &query($sql, $limit=0, $start=0)
-	{
+     */
+    function &query($sql, $limit=0, $start=0)
+    {
 
     }
 
     /**
-	 * perform queries from SQL dump file in a batch
-	 * 
+     * perform queries from SQL dump file in a batch
+     * 
      * @param string $file file path to an SQL dump file
      * 
      * @return bool FALSE if failed reading SQL file or TRUE if the file has been read and queries executed
-	 */
-	function queryFromFile($file){
+     */
+    function queryFromFile($file){
         if (false !== ($fp = fopen($file, 'r'))) {
-			include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
+            include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
             $sql_queries = trim(fread($fp, filesize($file)));
             SqlUtility::splitMySqlFile($pieces, $sql_queries);
             foreach ($pieces as $query) {
@@ -286,39 +287,39 @@
     }
     
     /**
-	 * Get field name
-	 *
+     * Get field name
+     *
      * @param resource $result query result
      * @param int numerical field index
      * @return string
-	 */
-	function getFieldName($result, $offset)
-	{
-		return mysql_field_name($result, $offset);
-	}
-
-	/**
-	 * Get field type
-	 *
+     */
+    function getFieldName($result, $offset)
+    {
+        return mysql_field_name($result, $offset);
+    }
+
+    /**
+     * Get field type
+     *
      * @param resource $result query result
      * @param int $offset numerical field index
      * @return string
-	 */
+     */
     function getFieldType($result, $offset)
-	{
-		return mysql_field_type($result, $offset);
-	}
-
-	/**
-	 * Get number of fields in result
-	 *
+    {
+        return mysql_field_type($result, $offset);
+    }
+
+    /**
+     * Get number of fields in result
+     *
      * @param resource $result query result
      * @return int
-	 */
-	function getFieldsNum($result)
-	{
-		return mysql_num_fields($result);
-	}
+     */
+    function getFieldsNum($result)
+    {
+        return mysql_num_fields($result);
+    }
 }
 
 /**
@@ -343,10 +344,11 @@
      * @return resource query result or FALSE if successful
      * or TRUE if successful and no result
      */
-	function &query($sql, $limit=0, $start=0)
-	{
-		return $this->queryF($sql, $limit, $start);
-	}
+    function &query($sql, $limit=0, $start=0)
+    {
+        $ret =& $this->queryF($sql, $limit, $start);
+        return $ret;
+    }
 }
 
 /**
@@ -375,15 +377,17 @@
      * @param int $start offset of first record to return
      * @return resource query result or FALSE if unsuccessful
      */
-	function &query($sql, $limit=0, $start=0)
-	{
-	    $sql = ltrim($sql);
-		if (strtolower(substr($sql, 0, 6)) == 'select') {
-		//if (preg_match("/^SELECT.*/i", $sql)) {
-			return $this->queryF($sql, $limit, $start);
-		}
-		$this->logger->addQuery($sql, 'Database update not allowed during processing of a GET request', 0);
-		return false;
-	}
+    function &query($sql, $limit=0, $start=0)
+    {
+        $ret = false;
+        $sql = ltrim($sql);
+        if (strtolower(substr($sql, 0, 6)) == 'select') {
+        //if (preg_match("/^SELECT.*/i", $sql)) {
+            $ret =& $this->queryF($sql, $limit, $start);
+        } else {
+            $this->logger->addQuery($sql, 'Database update not allowed during processing of a GET request', 0);
+        }
+        return $ret;
+    }
 }
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Sun Feb  5 14:19:52 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  5 Feb 2006 14:19:52 +0900
Subject: [xoops-cvslog 2290] CVS update: xoops2jp/html/class
Message-ID: <20060205051952.4BEB82AC065@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.6 xoops2jp/html/class/module.textsanitizer.php:1.6.2.1
--- xoops2jp/html/class/module.textsanitizer.php:1.6	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/class/module.textsanitizer.php	Sun Feb  5 14:19:52 2006
@@ -1,602 +1,608 @@
-<?php
-// $Id: module.textsanitizer.php,v 1.6 2005/10/24 11:44:16 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 (http://www.myweb.ne.jp/, http://jp.xoops.org/)        //
-//         Goghs Cheng (http://www.eqiao.com, http://www.devbeez.com/)       //
-// Project: The XOOPS Project (http://www.xoops.org/)                        //
-// ------------------------------------------------------------------------- //
-
-/**
- * Class to "clean up" text for various uses
- *
- * <b>Singleton</b>
- *
- * @package     kernel
- * @subpackage  core
- *
- * @author      Kazumi Ono  <onokazu ＠ xoops.org>
- * @author      Goghs Cheng
- * @copyright   (c) 2000-2003 The Xoops Project - www.xoops.org
- */
-class MyTextSanitizer
-{
-    /**
-     * @var array
-     */
-    var $smileys = array();
-
-    /**
-     *
-     */
-    var $censorConf;
-
-    /*
-    * Constructor of this class
-    *
-    * Gets allowed html tags from admin config settings
-    * <br> should not be allowed since nl2br will be used
-    * when storing data.
-    *
-    * @access   private
-    *
-    * @todo Sofar, this does nuttin' ;-)
-    */
-    function MyTextSanitizer()
-    {
-
-    }
-
-    /**
-     * Access the only instance of this class
-     *
-     * @return  object
-     *
-     * @static
-     * @staticvar   object
-     */
-    function &getInstance()
-    {
-        static $instance;
-        if (!isset($instance)) {
-            $instance = new MyTextSanitizer();
-        }
-        return $instance;
-    }
-
-    /**
-     * Get the smileys
-     *
-     * @return  array
-     */
-    function getSmileys()
-    {
-        return $this->smileys;
-    }
-
-    /**
-     * Replace emoticons in the message with smiley images
-     *
-     * @param   string  $message
-     *
-     * @return  string
-     */
-    function &smiley($message)
-    {
-        $db =& Database::getInstance();
-        if (count($this->smileys) == 0) {
-            if ($getsmiles = $db->query("SELECT * FROM ".$db->prefix("smiles"))){
-                while ($smiles = $db->fetchArray($getsmiles)) {
-                    $message =& str_replace($smiles['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles['smile_url']).'" alt="" />', $message);
-                    array_push($this->smileys, $smiles);
-                }
-            }
-        }
-        elseif (is_array($this->smileys)) {
-            foreach ($this->smileys as $smile) {
-                $message =& str_replace($smile['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
-            }
-        }
-        return $message;
-    }
-
-    /**
-     * Make links in the text clickable
-     *
-     * @param   string  $text
-     * @return  string
-     **/
-    function &makeClickable(&$text)
-    {
-        $patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
-        $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
-        return preg_replace($patterns, $replacements, $text);
-    }
-
-    /**
-     * Replace XoopsCodes with their equivalent HTML formatting
-     *
-     * @param   string  $text
-     * @param   bool    $allowimage Allow images in the text?
-     *                              On FALSE, uses links to images.
-     * @return  string
-     **/
-    function &xoopsCodeDecode(&$text, $allowimage = 1)
-    {
-        $imgCallbackPattern = "/\[img( align=\w+)]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $text = preg_replace_callback($imgCallbackPattern, array($this, '_filterImgUrl'), $text);
-
-        $patterns = array();
-        $replacements = array();
-        // RMV: added new markup for intrasite url (allows easier site moves)
-        // TODO: automatically convert other URLs to this format if XOOPS_URL matches??
-        $patterns[] = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
-        $replacements[] = '<a href="'.XOOPS_URL.'/\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)([^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="http://\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[color=(['\"]?)([a-zA-Z0-9]*)\\1](.*)\[\/color\]/sU";
-        $replacements[] = '<span style="color: #\\2;">\\3</span>';
-        $patterns[] = "/\[size=(['\"]?)([a-z0-9-]*)\\1](.*)\[\/size\]/sU";
-        $replacements[] = '<span style="font-size: \\2;">\\3</span>';
-        $patterns[] = "/\[font=(['\"]?)([^;<>\*\(\)\"']*)\\1](.*)\[\/font\]/sU";
-        $replacements[] = '<span style="font-family: \\2;">\\3</span>';
-        $patterns[] = "/\[email]([^;<>\*\(\)\"']*)\[\/email\]/sU";
-        $replacements[] = '<a href="mailto:\\1">\\1</a>';
-        $patterns[] = "/\[b](.*)\[\/b\]/sU";
-        $replacements[] = '<b>\\1</b>';
-        $patterns[] = "/\[i](.*)\[\/i\]/sU";
-        $replacements[] = '<i>\\1</i>';
-        $patterns[] = "/\[u](.*)\[\/u\]/sU";
-        $replacements[] = '<u>\\1</u>';
-        $patterns[] = "/\[d](.*)\[\/d\]/sU";
-        $replacements[] = '<del>\\1</del>';
-        //$patterns[] = "/\[li](.*)\[\/li\]/sU";
-        //$replacements[] = '<li>\\1</li>';
-        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 id=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img id=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        if ($allowimage != 1) {
-            $replacements[] = '<a href="\\3" target="_blank">\\3</a>';
-            $replacements[] = '<a href="\\1" target="_blank">\\1</a>';
-            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\4" target="_blank">\\5</a>';
-            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\2" target="_blank">\\3</a>';
-        } else {
-            $replacements[] = '<img src="\\3" align="\\2" alt="" />';
-            $replacements[] = '<img src="\\1" alt="" />';
-            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\4" align="\\2" alt="\\5" />';
-            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\2" alt="\\3" />';
-        }
-        $patterns[] = "/\[quote]/sU";
-        $replacements[] = _QUOTEC.'<div class="xoopsQuote"><blockquote>';
-        //$replacements[] = 'Quote: <div class="xoopsQuote"><blockquote>';
-        $patterns[] = "/\[\/quote]/sU";
-        $replacements[] = '</blockquote></div>';
-        $patterns[] = "/javascript:/si";
-        $replacements[] = "java script:";
-        $patterns[] = "/about:/si";
-        $replacements[] = "about :";
-        return preg_replace($patterns, $replacements, $text);
-    }
-
-    /**
-     * Filters out invalid strings included in URL, if any
-     *
-     * @param   array  $matches
-     * @return  string
-     */
-    function _filterImgUrl($matches)
-    {
-        if ($this->checkUrlString($matches[2])) {
-            return $matches[0];
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Checks if invalid strings are included in URL
-     *
-     * @param   string  $text
-     * @return  bool
-     */
-    function checkUrlString($text)
-    {
-        // Check control code
-        if (preg_match("/[\\0-\\31]/", $text)) {
-            return false;
-        }
-        // check black pattern(deprecated)
-        return !preg_match("/^(javascript|vbscript|about):/i", $text);
-    }
-
-    /**
-     * Convert linebreaks to <br /> tags
-     *
-     * @param   string  $text
-     *
-     * @return  string
-     */
-    function &nl2Br($text)
-    {
-        return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
-    }
-
-    /**
-     * Add slashes to the text if magic_quotes_gpc is turned off.
-     *
-     * @param   string  $text
-     * @return  string
-     **/
-    function &addSlashes($text)
-    {
-        if (!get_magic_quotes_gpc()) {
-            $text =& addslashes($text);
-        }
-        return $text;
-    }
-    /*
-    * if magic_quotes_gpc is on, stirip back slashes
-    *
-    * @param    string  $text
-    *
-    * @return   string
-    */
-    function &stripSlashesGPC($text)
-    {
-        if (get_magic_quotes_gpc()) {
-            $text =& stripslashes($text);
-        }
-        return $text;
-    }
-
-    /*
-    *  for displaying data in html textbox forms
-    *
-    * @param    string  $text
-    *
-    * @return   string
-    */
-    function &htmlSpecialChars($text)
-    {
-        //return preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
-        return preg_replace(array("/&amp;/i", "/&nbsp;/i"), array('&', '&amp;nbsp;'), htmlspecialchars($text, ENT_QUOTES));
-    }
-
-    /**
-     * Reverses {@link htmlSpecialChars()}
-     *
-     * @param   string  $text
-     * @return  string
-     **/
-    function &undoHtmlSpecialChars(&$text)
-    {
-        return preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
-    }
-
-    /**
-     * Filters textarea form data in DB for display
-     *
-     * @param   string  $text
-     * @param   bool    $html   allow html?
-     * @param   bool    $smiley allow smileys?
-     * @param   bool    $xcode  allow xoopscode?
-     * @param   bool    $image  allow inline images?
-     * @param   bool    $br     convert linebreaks?
-     * @return  string
-     **/
-    function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
-    {
-        if ($html != 1) {
-            // html not allowed
-            $text =& $this->htmlSpecialChars($text);
-        }
-        $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        $text =& $this->makeClickable($text);
-        if ($smiley != 0) {
-            // process smiley
-            $text =& $this->smiley($text);
-        }
-        if ($xcode != 0) {
-            // decode xcode
-            if ($image != 0) {
-                // image allowed
-                $text =& $this->xoopsCodeDecode($text);
-                    } else {
-                        // image not allowed
-                        $text =& $this->xoopsCodeDecode($text, 0);
-            }
-        }
-        if ($br != 0) {
-            $text =& $this->nl2Br($text);
-        }
-        $text =& $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
-        return $text;
-    }
-
-    /**
-     * Filters textarea form data submitted for preview
-     *
-     * @param   string  $text
-     * @param   bool    $html   allow html?
-     * @param   bool    $smiley allow smileys?
-     * @param   bool    $xcode  allow xoopscode?
-     * @param   bool    $image  allow inline images?
-     * @param   bool    $br     convert linebreaks?
-     * @return  string
-     **/
-    function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
-    {
-        $text =& $this->stripSlashesGPC($text);
-        if ($html != 1) {
-            // html not allowed
-            $text =& $this->htmlSpecialChars($text);
-        }
-        $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        $text =& $this->makeClickable($text);
-        if ($smiley != 0) {
-            // process smiley
-            $text =& $this->smiley($text);
-        }
-        if ($xcode != 0) {
-            // decode xcode
-            if ($image != 0) {
-                // image allowed
-                $text =& $this->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                $text =& $this->xoopsCodeDecode($text, 0);
-            }
-        }
-        if ($br != 0) {
-            $text =& $this->nl2Br($text);
-        }
-        $text =& $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
-        return $text;
-    }
-
-    /**
-     * Replaces banned words in a string with their replacements
-     *
-     * @param   string $text
-     * @return  string
-     *
-     * @deprecated
-     **/
-    function &censorString(&$text)
-    {
-        if (!isset($this->censorConf)) {
-            $config_handler =& xoops_gethandler('config');
-            $this->censorConf =& $config_handler->getConfigsByCat(XOOPS_CONF_CENSOR);
-        }
-        if ($this->censorConf['censor_enable'] == 1) {
-            $replacement = $this->censorConf['censor_replace'];
-            foreach ($this->censorConf['censor_words'] as $bad) {
-                if ( !empty($bad) ) {
-                    $bad = quotemeta($bad);
-                    $patterns[] = "/(\s)".$bad."/siU";
-                    $replacements[] = "\\1".$replacement;
-                    $patterns[] = "/^".$bad."/siU";
-                    $replacements[] = $replacement;
-                    $patterns[] = "/(\n)".$bad."/siU";
-                    $replacements[] = "\\1".$replacement;
-                    $patterns[] = "/]".$bad."/siU";
-                    $replacements[] = "]".$replacement;
-                    $text = preg_replace($patterns, $replacements, $text);
-                }
-            }
-        }
-        return $text;
-    }
-
-
-    /**#@+
-     * Sanitizing of [code] tag
-     */
-    function codePreConv($text, $xcode = 1) {
-        if($xcode != 0){
-            $patterns = "/\[code](.*)\[\/code\]/esU";
-            $replacements = "'[code]'.base64_encode('$1').'[/code]'";
-            $text =  preg_replace($patterns, $replacements, $text);
-        }
-        return $text;
-    }
-
-    function codeConv($text, $xcode = 1, $image = 1){
-        if($xcode != 0){
-            $patterns = "/\[code](.*)\[\/code\]/esU";
-            if ($image != 0) {
-                // image allowed
-                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
-                //$text =& $this->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
-                //$text =& $this->xoopsCodeDecode($text, 0);
-            }
-            $text =  preg_replace($patterns, $replacements, $text);
-        }
-        return $text;
-    }
-
-    function codeSanitizer($str, $image = 1){
-        if($image != 0){
-            $str = $this->xoopsCodeDecode(
-                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str)))
-                );
-        }else{
-            $str = $this->xoopsCodeDecode(
-                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))),0
-                );
-        }
-        return $str;
-    }
-
-
-    /**#@-*/
-
-
-##################### Deprecated Methods ######################
-
-    /**#@+
-     * @deprecated
-     */
-    function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-    {
-        if ( $allowhtml == 0 ) {
-            $text = $this->htmlSpecialChars($text);
-        } else {
-            //$config =& $GLOBALS['xoopsConfig'];
-            //$allowed = $config['allowed_html'];
-            //$text = strip_tags($text, $allowed);
-            $text = $this->makeClickable($text);
-        }
-        if ( $smiley == 1 ) {
-            $text = $this->smiley($text);
-        }
-        if ( $bbcode == 1 ) {
-            $text = $this->xoopsCodeDecode($text);
-        }
-        $text = $this->nl2Br($text);
-        return $text;
-    }
-
-    function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-    {
-        $text = $this->oopsStripSlashesGPC($text);
-        if ( $allowhtml == 0 ) {
-            $text = $this->htmlSpecialChars($text);
-        } else {
-            //$config =& $GLOBALS['xoopsConfig'];
-            //$allowed = $config['allowed_html'];
-            //$text = strip_tags($text, $allowed);
-            $text = $this->makeClickable($text);
-        }
-        if ( $smiley == 1 ) {
-            $text = $this->smiley($text);
-        }
-        if ( $bbcode == 1 ) {
-            $text = $this->xoopsCodeDecode($text);
-        }
-        $text = $this->nl2Br($text);
-        return $text;
-    }
-
-    function makeTboxData4Save($text)
-    {
-        //$text = $this->undoHtmlSpecialChars($text);
-        return $this->addSlashes($text);
-    }
-
-    function makeTboxData4Show($text, $smiley=0)
-    {
-        $text = $this->htmlSpecialChars($text);
-        return $text;
-    }
-
-    function makeTboxData4Edit($text)
-    {
-        return $this->htmlSpecialChars($text);
-    }
-
-    function makeTboxData4Preview($text, $smiley=0)
-    {
-        $text = $this->stripSlashesGPC($text);
-        $text = $this->htmlSpecialChars($text);
-        return $text;
-    }
-
-    function makeTboxData4PreviewInForm($text)
-    {
-        $text = $this->stripSlashesGPC($text);
-        return $this->htmlSpecialChars($text);
-    }
-
-    function makeTareaData4Save($text)
-    {
-        return $this->addSlashes($text);
-    }
-
-    function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
-    {
-        return $this->displayTarea($text, $html, $smiley, $xcode);
-    }
-
-    function makeTareaData4Edit($text)
-    {
-        return $this->htmlSpecialChars($text);
-    }
-
-    function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
-    {
-        return $this->previewTarea($text, $html, $smiley, $xcode);
-    }
-
-    function makeTareaData4PreviewInForm($text)
-    {
-        //if magic_quotes_gpc is on, do stipslashes
-        $text = $this->stripSlashesGPC($text);
-        return $this->htmlSpecialChars($text);
-    }
-
-    function makeTareaData4InsideQuotes($text)
-    {
-        return $this->htmlSpecialChars($text);
-    }
-
-    function &oopsStripSlashesGPC($text)
-    {
-        return $this->stripSlashesGPC($text);
-    }
-
-    function &oopsStripSlashesRT($text)
-    {
-        if (get_magic_quotes_runtime()) {
-            $text =& stripslashes($text);
-        }
-        return $text;
-    }
-
-    function &oopsAddSlashes($text)
-    {
-        return $this->addSlashes($text);
-    }
-
-    function &oopsHtmlSpecialChars($text)
-    {
-        return $this->htmlSpecialChars($text);
-    }
-
-    function &oopsNl2Br($text)
-    {
-        return $this->nl2br($text);
-    }
-    /**#@-*/
-}
+<?php
+// $Id: module.textsanitizer.php,v 1.6.2.1 2006/02/05 05:19:52 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 (http://www.myweb.ne.jp/, http://jp.xoops.org/)        //
+//         Goghs Cheng (http://www.eqiao.com, http://www.devbeez.com/)       //
+// Project: The XOOPS Project (http://www.xoops.org/)                        //
+// ------------------------------------------------------------------------- //
+
+/**
+ * Class to "clean up" text for various uses
+ *
+ * <b>Singleton</b>
+ *
+ * @package     kernel
+ * @subpackage  core
+ *
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @author      Goghs Cheng
+ * @copyright   (c) 2000-2003 The Xoops Project - www.xoops.org
+ */
+class MyTextSanitizer
+{
+    /**
+     * @var array
+     */
+    var $smileys = array();
+
+    /**
+     *
+     */
+    var $censorConf;
+
+    /*
+    * Constructor of this class
+    *
+    * Gets allowed html tags from admin config settings
+    * <br> should not be allowed since nl2br will be used
+    * when storing data.
+    *
+    * @access   private
+    *
+    * @todo Sofar, this does nuttin' ;-)
+    */
+    function MyTextSanitizer()
+    {
+
+    }
+
+    /**
+     * Access the only instance of this class
+     *
+     * @return  object
+     *
+     * @static
+     * @staticvar   object
+     */
+    function &getInstance()
+    {
+        static $instance;
+        if (!isset($instance)) {
+            $instance = new MyTextSanitizer();
+        }
+        return $instance;
+    }
+
+    /**
+     * Get the smileys
+     *
+     * @return  array
+     */
+    function getSmileys()
+    {
+        return $this->smileys;
+    }
+
+    /**
+     * Replace emoticons in the message with smiley images
+     *
+     * @param   string  $message
+     *
+     * @return  string
+     */
+    function &smiley($message)
+    {
+        $db =& Database::getInstance();
+        if (count($this->smileys) == 0) {
+            if ($getsmiles = $db->query("SELECT * FROM ".$db->prefix("smiles"))){
+                while ($smiles = $db->fetchArray($getsmiles)) {
+                    $message = str_replace($smiles['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles['smile_url']).'" alt="" />', $message);
+                    array_push($this->smileys, $smiles);
+                }
+            }
+        }
+        elseif (is_array($this->smileys)) {
+            foreach ($this->smileys as $smile) {
+                $message = str_replace($smile['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
+            }
+        }
+        return $message;
+    }
+
+    /**
+     * Make links in the text clickable
+     *
+     * @param   string  $text
+     * @return  string
+     **/
+    function &makeClickable(&$text)
+    {
+        $patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
+        $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
+        $ret = preg_replace($patterns, $replacements, $text);
+        return $ret;
+    }
+
+    /**
+     * Replace XoopsCodes with their equivalent HTML formatting
+     *
+     * @param   string  $text
+     * @param   bool    $allowimage Allow images in the text?
+     *                              On FALSE, uses links to images.
+     * @return  string
+     **/
+    function &xoopsCodeDecode(&$text, $allowimage = 1)
+    {
+        $imgCallbackPattern = "/\[img( align=\w+)]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $text = preg_replace_callback($imgCallbackPattern, array($this, '_filterImgUrl'), $text);
+
+        $patterns = array();
+        $replacements = array();
+        // RMV: added new markup for intrasite url (allows easier site moves)
+        // TODO: automatically convert other URLs to this format if XOOPS_URL matches??
+        $patterns[] = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
+        $replacements[] = '<a href="'.XOOPS_URL.'/\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)([^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[] = '<a href="http://\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[color=(['\"]?)([a-zA-Z0-9]*)\\1](.*)\[\/color\]/sU";
+        $replacements[] = '<span style="color: #\\2;">\\3</span>';
+        $patterns[] = "/\[size=(['\"]?)([a-z0-9-]*)\\1](.*)\[\/size\]/sU";
+        $replacements[] = '<span style="font-size: \\2;">\\3</span>';
+        $patterns[] = "/\[font=(['\"]?)([^;<>\*\(\)\"']*)\\1](.*)\[\/font\]/sU";
+        $replacements[] = '<span style="font-family: \\2;">\\3</span>';
+        $patterns[] = "/\[email]([^;<>\*\(\)\"']*)\[\/email\]/sU";
+        $replacements[] = '<a href="mailto:\\1">\\1</a>';
+        $patterns[] = "/\[b](.*)\[\/b\]/sU";
+        $replacements[] = '<b>\\1</b>';
+        $patterns[] = "/\[i](.*)\[\/i\]/sU";
+        $replacements[] = '<i>\\1</i>';
+        $patterns[] = "/\[u](.*)\[\/u\]/sU";
+        $replacements[] = '<u>\\1</u>';
+        $patterns[] = "/\[d](.*)\[\/d\]/sU";
+        $replacements[] = '<del>\\1</del>';
+        //$patterns[] = "/\[li](.*)\[\/li\]/sU";
+        //$replacements[] = '<li>\\1</li>';
+        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $patterns[] = "/\[img]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 id=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $patterns[] = "/\[img id=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        if ($allowimage != 1) {
+            $replacements[] = '<a href="\\3" target="_blank">\\3</a>';
+            $replacements[] = '<a href="\\1" target="_blank">\\1</a>';
+            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\4" target="_blank">\\5</a>';
+            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\2" target="_blank">\\3</a>';
+        } else {
+            $replacements[] = '<img src="\\3" align="\\2" alt="" />';
+            $replacements[] = '<img src="\\1" alt="" />';
+            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\4" align="\\2" alt="\\5" />';
+            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\2" alt="\\3" />';
+        }
+        $patterns[] = "/\[quote]/sU";
+        $replacements[] = _QUOTEC.'<div class="xoopsQuote"><blockquote>';
+        //$replacements[] = 'Quote: <div class="xoopsQuote"><blockquote>';
+        $patterns[] = "/\[\/quote]/sU";
+        $replacements[] = '</blockquote></div>';
+        $patterns[] = "/javascript:/si";
+        $replacements[] = "java script:";
+        $patterns[] = "/about:/si";
+        $replacements[] = "about :";
+        $ret = preg_replace($patterns, $replacements, $text);
+        return $ret;
+    }
+
+    /**
+     * Filters out invalid strings included in URL, if any
+     *
+     * @param   array  $matches
+     * @return  string
+     */
+    function _filterImgUrl($matches)
+    {
+        if ($this->checkUrlString($matches[2])) {
+            return $matches[0];
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Checks if invalid strings are included in URL
+     *
+     * @param   string  $text
+     * @return  bool
+     */
+    function checkUrlString($text)
+    {
+        // Check control code
+        if (preg_match("/[\\0-\\31]/", $text)) {
+            return false;
+        }
+        // check black pattern(deprecated)
+        return !preg_match("/^(javascript|vbscript|about):/i", $text);
+    }
+
+    /**
+     * Convert linebreaks to <br /> tags
+     *
+     * @param   string  $text
+     *
+     * @return  string
+     */
+    function &nl2Br($text)
+    {
+        $ret = preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        return $ret;
+    }
+
+    /**
+     * Add slashes to the text if magic_quotes_gpc is turned off.
+     *
+     * @param   string  $text
+     * @return  string
+     **/
+    function &addSlashes($text)
+    {
+        if (!get_magic_quotes_gpc()) {
+            $text = addslashes($text);
+        }
+        return $text;
+    }
+    /*
+    * if magic_quotes_gpc is on, stirip back slashes
+    *
+    * @param    string  $text
+    *
+    * @return   string
+    */
+    function &stripSlashesGPC($text)
+    {
+        if (get_magic_quotes_gpc()) {
+            $text = stripslashes($text);
+        }
+        return $text;
+    }
+
+    /*
+    *  for displaying data in html textbox forms
+    *
+    * @param    string  $text
+    *
+    * @return   string
+    */
+    function &htmlSpecialChars($text)
+    {
+        //return preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
+        $ret = preg_replace(array("/&amp;/i", "/&nbsp;/i"), array('&', '&amp;nbsp;'), htmlspecialchars($text, ENT_QUOTES));
+        return $ret;
+    }
+
+    /**
+     * Reverses {@link htmlSpecialChars()}
+     *
+     * @param   string  $text
+     * @return  string
+     **/
+    function &undoHtmlSpecialChars(&$text)
+    {
+        return preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
+    }
+
+    /**
+     * Filters textarea form data in DB for display
+     *
+     * @param   string  $text
+     * @param   bool    $html   allow html?
+     * @param   bool    $smiley allow smileys?
+     * @param   bool    $xcode  allow xoopscode?
+     * @param   bool    $image  allow inline images?
+     * @param   bool    $br     convert linebreaks?
+     * @return  string
+     **/
+    function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
+    {
+        if ($html != 1) {
+            // html not allowed
+            $text =& $this->htmlSpecialChars($text);
+        }
+        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+        $text =& $this->makeClickable($text);
+        if ($smiley != 0) {
+            // process smiley
+            $text =& $this->smiley($text);
+        }
+        if ($xcode != 0) {
+            // decode xcode
+            if ($image != 0) {
+                // image allowed
+                $text =& $this->xoopsCodeDecode($text);
+                    } else {
+                        // image not allowed
+                        $text =& $this->xoopsCodeDecode($text, 0);
+            }
+        }
+        if ($br != 0) {
+            $text =& $this->nl2Br($text);
+        }
+        $text = $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        return $text;
+    }
+
+    /**
+     * Filters textarea form data submitted for preview
+     *
+     * @param   string  $text
+     * @param   bool    $html   allow html?
+     * @param   bool    $smiley allow smileys?
+     * @param   bool    $xcode  allow xoopscode?
+     * @param   bool    $image  allow inline images?
+     * @param   bool    $br     convert linebreaks?
+     * @return  string
+     **/
+    function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
+    {
+        $text =& $this->stripSlashesGPC($text);
+        if ($html != 1) {
+            // html not allowed
+            $text =& $this->htmlSpecialChars($text);
+        }
+        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+        $text =& $this->makeClickable($text);
+        if ($smiley != 0) {
+            // process smiley
+            $text =& $this->smiley($text);
+        }
+        if ($xcode != 0) {
+            // decode xcode
+            if ($image != 0) {
+                // image allowed
+                $text =& $this->xoopsCodeDecode($text);
+            } else {
+                // image not allowed
+                $text =& $this->xoopsCodeDecode($text, 0);
+            }
+        }
+        if ($br != 0) {
+            $text =& $this->nl2Br($text);
+        }
+        $text =& $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        return $text;
+    }
+
+    /**
+     * Replaces banned words in a string with their replacements
+     *
+     * @param   string $text
+     * @return  string
+     *
+     * @deprecated
+     **/
+    function &censorString(&$text)
+    {
+        if (!isset($this->censorConf)) {
+            $config_handler =& xoops_gethandler('config');
+            $this->censorConf =& $config_handler->getConfigsByCat(XOOPS_CONF_CENSOR);
+        }
+        if ($this->censorConf['censor_enable'] == 1) {
+            $replacement = $this->censorConf['censor_replace'];
+            foreach ($this->censorConf['censor_words'] as $bad) {
+                if ( !empty($bad) ) {
+                    $bad = quotemeta($bad);
+                    $patterns[] = "/(\s)".$bad."/siU";
+                    $replacements[] = "\\1".$replacement;
+                    $patterns[] = "/^".$bad."/siU";
+                    $replacements[] = $replacement;
+                    $patterns[] = "/(\n)".$bad."/siU";
+                    $replacements[] = "\\1".$replacement;
+                    $patterns[] = "/]".$bad."/siU";
+                    $replacements[] = "]".$replacement;
+                    $text = preg_replace($patterns, $replacements, $text);
+                }
+            }
+        }
+        return $text;
+    }
+
+
+    /**#@+
+     * Sanitizing of [code] tag
+     */
+    function codePreConv($text, $xcode = 1) {
+        if($xcode != 0){
+            $patterns = "/\[code](.*)\[\/code\]/esU";
+            $replacements = "'[code]'.base64_encode('$1').'[/code]'";
+            $text =  preg_replace($patterns, $replacements, $text);
+        }
+        return $text;
+    }
+
+    function codeConv($text, $xcode = 1, $image = 1){
+        if($xcode != 0){
+            $patterns = "/\[code](.*)\[\/code\]/esU";
+            if ($image != 0) {
+                // image allowed
+                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
+                //$text =& $this->xoopsCodeDecode($text);
+            } else {
+                // image not allowed
+                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
+                //$text =& $this->xoopsCodeDecode($text, 0);
+            }
+            $text =  preg_replace($patterns, $replacements, $text);
+        }
+        return $text;
+    }
+
+    function codeSanitizer($str, $image = 1){
+        if($image != 0){
+            $str = $this->xoopsCodeDecode(
+                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str)))
+                );
+        }else{
+            $str = $this->xoopsCodeDecode(
+                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))),0
+                );
+        }
+        return $str;
+    }
+
+
+    /**#@-*/
+
+
+##################### Deprecated Methods ######################
+
+    /**#@+
+     * @deprecated
+     */
+    function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        $text = $this->oopsStripSlashesGPC($text);
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function makeTboxData4Save($text)
+    {
+        //$text = $this->undoHtmlSpecialChars($text);
+        return $this->addSlashes($text);
+    }
+
+    function makeTboxData4Show($text, $smiley=0)
+    {
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4Edit($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTboxData4Preview($text, $smiley=0)
+    {
+        $text = $this->stripSlashesGPC($text);
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4PreviewInForm($text)
+    {
+        $text = $this->stripSlashesGPC($text);
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTareaData4Save($text)
+    {
+        return $this->addSlashes($text);
+    }
+
+    function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        $ret = $this->displayTarea($text, $html, $smiley, $xcode);
+        return $ret;
+    }
+
+    function makeTareaData4Edit($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        $ret = $this->previewTarea($text, $html, $smiley, $xcode);
+        return $ret;
+    }
+
+    function makeTareaData4PreviewInForm($text)
+    {
+        //if magic_quotes_gpc is on, do stipslashes
+        $text = $this->stripSlashesGPC($text);
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTareaData4InsideQuotes($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &oopsStripSlashesGPC($text)
+    {
+        return $this->stripSlashesGPC($text);
+    }
+
+    function &oopsStripSlashesRT($text)
+    {
+        if (get_magic_quotes_runtime()) {
+            $text =& stripslashes($text);
+        }
+        return $text;
+    }
+
+    function &oopsAddSlashes($text)
+    {
+        return $this->addSlashes($text);
+    }
+
+    function &oopsHtmlSpecialChars($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &oopsNl2Br($text)
+    {
+        return $this->nl2br($text);
+    }
+    /**#@-*/
+}
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/token.php
diff -u xoops2jp/html/class/token.php:1.3 xoops2jp/html/class/token.php:1.3.8.1
--- xoops2jp/html/class/token.php:1.3	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/token.php	Sun Feb  5 14:19:52 2006
@@ -190,7 +190,7 @@
      */
     function &create($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $token = new XoopsToken($name,$timeout);
+        $token =& new XoopsToken($name,$timeout);
         $this->register($token);
         return $token;
     }
@@ -204,12 +204,11 @@
      */
     function &fetch($name)
     {
+        $ret = null;
         if(isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name])) {
-            return $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
-        }
-        else {
-            return null;
+            $ret =& $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
         }
+        return $ret;
     }
 
     /**
@@ -285,8 +284,9 @@
     */
     function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $handler = new XoopsSingleTokenHandler();
-        return $handler->create($name,$timeout);
+        $handler =& new XoopsSingleTokenHandler();
+        $ret =& $handler->create($name,$timeout);
+        return $ret;
     }
 
     /**
@@ -311,7 +311,7 @@
 {
     function &create($name,$timeout=XOOPS_TOKEN_TIMEOUT)
     {
-        $token = new XoopsToken($name,$timeout);
+        $token =& new XoopsToken($name,$timeout);
         $token->setSerialNumber($this->getUniqueSerial($name));
         $this->register($token);
         return $token;
@@ -319,12 +319,11 @@
 
     function &fetch($name,$serial_number)
     {
+        $ret = null;
         if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number])) {
-            return $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
-        }
-        else {
-            return null;
+            $ret =& $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
         }
+        return $ret;
     }
 
     function register(&$token)
@@ -362,8 +361,9 @@
     */
     function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $handler = new XoopsMultiTokenHandler();
-        return $handler->create($name,$timeout);
+        $handler =& new XoopsMultiTokenHandler();
+        $ret =& $handler->create($name,$timeout);
+        return $ret;
     }
 
     /**
Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.4 xoops2jp/html/class/xoopsblock.php:1.4.6.1
--- xoops2jp/html/class/xoopsblock.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/xoopsblock.php	Sun Feb  5 14:19:52 2006
@@ -1,536 +1,537 @@
-<?php
-// $Id: xoopsblock.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.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
-
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
-require_once XOOPS_ROOT_PATH."/kernel/object.php";
-
-class XoopsBlock extends XoopsObject
-{
-    var $db;
-
-    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));
-            }
-        }
-    }
-
-    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;
-        $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 false;
-            }
-            // must get lang files b4 execution of the function
-            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"));
-                if ( function_exists($show_func) ) {
-                    // execute the function
-                    $block = $show_func($options);
-                    if ( !$block ) {
-                        return false;
-                    }
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } 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 false;
-            }
-        }
-        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;
-            }
-            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);
-            }
-            $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(',', $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;
-    }
-}
+<?php
+// $Id: xoopsblock.php,v 1.4.6.1 2006/02/05 05:19:52 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                                                //
+// ------------------------------------------------------------------------- //
+
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit();
+}
+require_once XOOPS_ROOT_PATH."/kernel/object.php";
+
+class XoopsBlock extends XoopsObject
+{
+    var $db;
+
+    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));
+            }
+        }
+    }
+
+    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')) ) {
+                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"));
+                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;
+            }
+            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);
+            }
+            $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(',', $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;
+    }
+}
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2291] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060205103339.32F242AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.5	Sat Feb  4 16:52:47 2006
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php	Sun Feb  5 19:33:39 2006
@@ -1,75 +1,72 @@
-<?php
-
-require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
-
-class User_UserRegisterAction extends User_Action
-{
-	var $mActionForm=null;
-	var $mConfig;
-	var $mEnableAgreeFlag=false;
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		$this->mConfig=$controller->mModuleController->getConfig();
-		
-		//
-		// If user is registered, kick to his information page.
-		//
-		if(is_object($xoopsUser))
-			$controller->executeForward(XOOPS_URL."/user.php");
-	}
-
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if($this->mActionForm->hasError()) {
-			return USER_FRAME_VIEW_INPUT;
-		}
-		else {
-			$_SESSION['user_register_actionform']=serialize(&$this->mActionForm);
-			$controller->executeForward('./index.php?action=UserRegister_confirm');
-		}
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-
-		return USER_FRAME_VIEW_INPUT;
-	}
-	
-	function _processActionForm()
-	{
-		if($this->mConfig['reg_dispdsclmr']!=0 && $this->mConfig['reg_disclaimer']!=null) {
-			$this->mEnableAgreeFlag=true;
-			$this->mActionForm=new UserRegisterAgreeEditForm();
-		}
-		else {
-			$this->mActionForm=new UserRegisterEditForm();
-		}
-		
-		$this->mActionForm->prepare($this->mConfig);
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		//
-		// Get some objects for input form.
-		//
-		$tzoneHandler =& xoops_gethandler('timezone');
-		$timezones =& $tzoneHandler->getObjects();
-		
-		$renderSystem->setAttribute('timezones', $timezones);
-
-		$renderSystem->setTemplateName("user_register_form.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("enableAgree",$this->mEnableAgreeFlag);
-		if($this->mEnableAgreeFlag)
-			$renderSystem->setAttribute("disclaimer",$this->mConfig['reg_disclaimer']);
-	}
-}
-
+<?php
+
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
+
+class User_UserRegisterAction extends User_Action
+{
+	var $mActionForm=null;
+	var $mConfig;
+	var $mEnableAgreeFlag=false;
+
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->mConfig=&$moduleConfig;
+		
+		if(is_object($xoopsUser)) { 
+			// If user is registered, kick to his information page.
+			$controller->executeForward(XOOPS_URL."/user.php");
+		}
+		if (empty($this->mConfig['allow_register'])) {
+		    redirect_header(XOOPS_URL.'/', 6, _US_NOREGISTER);
+		    exit();	
+		}
+	}
+
+	function execute(&$controller,&$xoopsUser)
+	{
+		$this->_processActionForm();
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if($this->mActionForm->hasError()) {
+			return USER_FRAME_VIEW_INPUT;
+		} else {
+			$_SESSION['user_register_actionform']=serialize(&$this->mActionForm);
+			$controller->executeForward('./index.php?action=UserRegister_confirm');
+		}
+	}
+
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		$this->_processActionForm();
+		return USER_FRAME_VIEW_INPUT;
+	}
+	
+	function _processActionForm()
+	{
+		if($this->mConfig['reg_dispdsclmr']!=0 && $this->mConfig['reg_disclaimer']!=null) {
+			$this->mEnableAgreeFlag=true;
+			$this->mActionForm=new UserRegisterAgreeEditForm();
+		} else {
+			$this->mActionForm=new UserRegisterEditForm();
+		}
+		
+		$this->mActionForm->prepare($this->mConfig);
+	}
+
+	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$renderSystem->setTemplateName("user_register_form.html");
+		// Get some objects for input form.
+		$tzoneHandler =& xoops_gethandler('timezone');
+		$timezones =& $tzoneHandler->getObjects();
+		$renderSystem->setAttribute('timezones', $timezones);
+		$renderSystem->setAttribute("actionForm",$this->mActionForm);
+		$renderSystem->setAttribute("enableAgree",$this->mEnableAgreeFlag);
+		if($this->mEnableAgreeFlag) {
+			$renderSystem->setAttribute("disclaimer",$this->mConfig['reg_disclaimer']);
+		}
+	}
+}
+
 ?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.5	Sat Feb  4 22:35:31 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Sun Feb  5 19:33:39 2006
@@ -6,18 +6,18 @@
 {
 	var $mActionForm=null;
 	var $mRegistForm=null;
-	var $mUserConfig=array();
+	var $mConfig=array();
 	
 	var $mNewUser=null;
 	
 	var $mRedirectMessage=null;
 
-	function prepare(&$controller,&$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
 	{
-		$confingHandler=&xoops_gethandler('config');
-		$this->mUserConfig=&$confingHandler->getConfigsByCat(XOOPS_CONF_USER);
+		$this->mConfig=&$moduleConfig;
 
-		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",new XCube_InstanceDelegate($this,"eventNotifyMail"));
+		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",
+												new XCube_InstanceDelegate($this,"eventNotifyMail"));
 	}
 
 	function execute(&$controller,&$xoopsUser)
@@ -31,8 +31,8 @@
 		$this->mRegistForm->update($this->mNewUser);
 		$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
 		$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
-		if($this->mUserConfig['activation_type'] == 1) {
-			$this->mNewUsersetVar('level',1,true);
+		if($this->mConfig['activation_type'] == 1) {
+			$this->mNewUser->setVar('level',1,true);
 		}
 
 		if(!$memberHandler->insertUser($this->mNewUser)) {
@@ -51,7 +51,7 @@
 		$eventArgs = array();
 		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
 		
-		return true;
+		return USER_FRAME_VIEW_SUCCESS;
 	}
 	
 	function getDefaultView(&$controller,&$xoopsUser)
@@ -83,7 +83,7 @@
 	
 	function _processMail(&$controller)
 	{
-		$activationType=$this->mUserConfig['activation_type'];
+		$activationType=$this->mConfig['activation_type'];
 		
 		if($activationType==1)
 			return;
@@ -92,7 +92,7 @@
 		$builder = ($activationType==0) ? new RegistUserActivateMailBuilder()
 		                                    : new RegistUserAdminActivateMailBuilder();
 
-		$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
+		$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mConfig);
 		$director->contruct($builder);
 		$mailer=&$builder->getResult();
 		
@@ -101,8 +101,8 @@
 	
 	function eventNotifyMail(&$controller,&$eventArgs)
 	{
-		if($this->mUserConfig['new_user_notify'] == 1 && !empty($this->mUserConfig['new_user_notify_group'])) {
-			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
+		if($this->mConfig['new_user_notify'] == 1 && !empty($this->mConfig['new_user_notify_group'])) {
+			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mConfig);
 			$builder = new RegistUserNotifyMailBuilder();
 			$director->contruct($builder);
 			$mailer=&$builder->getResult();
@@ -128,7 +128,7 @@
 	}
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
 	{
-		$activationType=$this->mUserConfig['activation_type'];
+		$activationType=$this->mConfig['activation_type'];
 
 		if($activationType==0) {
 			$renderSystem->setTemplateName("user_register_finish.html");
@@ -141,5 +141,4 @@
 		}
 	}
 }
-
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2292] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060205103339.5B0322AC036@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.3 xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.3	Thu Jan 19 21:12:51 2006
+++ xoops2jp/html/modules/user/class/AbstractEditAction.class.php	Sun Feb  5 19:33:39 2006
@@ -5,6 +5,7 @@
 	var $mObject = null;
 	var $mObjectHandler = null;
 	var $mActionForm = null;
+	var $mConfig;
 
 	function _getId()
 	{
@@ -36,8 +37,10 @@
 		return true;
 	}
 
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
 	{
+		$this->mConfig=&$moduleConfig;
+
 		$this->_setupActionForm();
 		$this->_setupObject();
 	}
Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.3 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.3	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Sun Feb  5 19:33:39 2006
@@ -38,8 +38,8 @@
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH."/modules/user/language/".$language."/mail_template/");
-		$this->mMailer->setTemplate("register.tpl");
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplate('register.tpl');
 	}
 
 	function setToUsers($user,$userConfig)
@@ -60,9 +60,9 @@
 
 	function setBody($user,$xoopsConfig)
 	{
-		$this->mMailer->assign("SITENAME",$xoopsConfig['sitename']);
-		$this->mMailer->assign("ADMINMAIL",$xoopsConfig['adminmail']);
-		$this->mMailer->assign("SITEURL",XOOPS_URL."/");
+		$this->mMailer->assign('SITENAME',$xoopsConfig['sitename']);
+		$this->mMailer->assign('ADMINMAIL',$xoopsConfig['adminmail']);
+		$this->mMailer->assign('SITEURL',XOOPS_URL.'/');
 		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
 	}
 	
@@ -78,8 +78,8 @@
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH."/modules/user/language/".$language."/mail_template/");
-		$this->mMailer->setTemplate("adminactivate.tpl");
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplate('adminactivate.tpl');
 	}
 
 	function setToUsers($user,$userConfig)
@@ -102,7 +102,7 @@
 
 	function setBody($user,$xoopsConfig)
 	{
-		parent::doAssign();
+		parent::setBody($user,$xoopsConfig);
 		$this->mMailer->assign('USERNAME', $user->getVar('uname'));
 		$this->mMailer->assign('USEREMAIL', $user->getVar('email'));
 		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
@@ -121,12 +121,6 @@
 		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
 	}
 	
-	function setFromUser($xoopsConfig)
-	{
-		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
-		$this->mMailer->setFromName($xoopsConfig['sitename']);
-	}
-	
 	function setSubject($user,$xoopsConfig)
 	{
 		$this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
@@ -138,5 +132,20 @@
 	}
 }
 
+class RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
+{
+	function setTemplate()
+	{
+		$root=&XCube_Root::getSingleton();
+		$language = $root->mController->getConfig('language');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplate('activated.tpl');
+	}
+	
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT,$xoopsConfig['sitename']));
+	}
+}
 
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2293] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060205103339.804462AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.3 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.3	Sat Feb  4 16:52:47 2006
+++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php	Sun Feb  5 19:33:39 2006
@@ -9,16 +9,23 @@
 {
 	var $mConfig = array();
 	
+	function prepare($userConfig)
+	{
+		$this->mConfig = $userConfig;
+	}
+	
 	function validateUname()
 	{
-		if($this->getVar('uname')) {
-
+		if($this->get('uname')) {
 			//
 			// uname unique check
 			//
 			$userHandler=&xoops_gethandler('user');
-			$count=$userHandler->getCount(new Criteria('uname',$this->getVar('uname')));
-			if($count!=0) {
+			$criteria =& new CriteriaCompo(new Criteria('uname', $this->get('uname')));
+			if ($this->get('uid')) {
+				$criteria->add(new Criteria('uid', $this->get('uid'), '<>'));
+			}
+			if ($userHandler->getCount($criteria) > 0) {
 				$this->addErrorMessage(_US_NICKNAMETAKEN);
 			}
 
@@ -39,16 +46,15 @@
 					$regex="//[\000-\040]/";
 					break;
 			}
-			if(preg_match($regex,$this->getVar('uname'))) {
+			if(preg_match($regex,$this->get('uname'))) {
 				$this->addErrorMessage(_US_INVALIDNICKNAME);
 			}
 
-
 			//
 			// Check bad uname patterns.
 			//
 			foreach(explode("|",$this->mConfig['bad_unames']) as $pattern) {
-				if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->getVar('uname'))) {
+				if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->get('uname'))) {
 					$this->addErrorMessage(_US_NAMERESERVED);
 					break;
 				}
@@ -74,12 +80,13 @@
 	
 	function validatePass()
 	{
-		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
-			if($this->getVar('pass')!=$this->getVar('vpass')) {
+		if (strlen($this->get('pass'))>0||strlen($this->get('vpass'))>0) {
+			if($this->get('pass')!=$this->get('vpass')) {
 				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
 				$this->set('pass',null);	// reset
 				$this->set('vpass',null);
 			}
+		}
 	}
 }
 
Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.4 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.5
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.4	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php	Sun Feb  5 19:33:39 2006
@@ -12,8 +12,9 @@
 		return "module.user.UserRegisterEditForm.TOKEN";
 	}
 
-	function prepare()
+	function prepare($userConfig)
 	{
+		parent::prepare($userConfig);
 		//
 		// Set form properties
 		//
@@ -33,14 +34,17 @@
 		// Set field properties
 		//
 		$this->mFieldProperties['uname'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['uname']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['uname']->setDependsByArray(array('required','maxlength','minlength'));
 		$this->mFieldProperties['uname']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UNAME, '25');
-		$this->mFieldProperties['uname']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_UNAME, '25');
-		$this->mFieldProperties['uname']->addVar('maxlength', 25);
+		$this->mFieldProperties['uname']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_UNAME, min(25,$this->mConfig['maxuname']));
+		$this->mFieldProperties['uname']->addMessage('minlength', _MD_USER_ERROR_MINLENGTH, _MD_USER_LANG_UNAME, $this->mConfig['minuname']);
+		$this->mFieldProperties['uname']->addVar('maxlength', min(25,$this->mConfig['maxuname']));
+		$this->mFieldProperties['uname']->addVar('minlength', $this->mConfig['minuname']);
 
 		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
 		$this->mFieldProperties['email']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, '60');
+		$this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addVar('maxlength', 60);
 
 		$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
@@ -49,13 +53,17 @@
 		$this->mFieldProperties['url']->addVar('maxlength', 100);
 
 		$this->mFieldProperties['pass'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['pass']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['pass']->setDependsByArray(array('required','minlength','maxlength'));
+		$this->mFieldProperties['pass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_PASS, '32');
+		$this->mFieldProperties['pass']->addMessage('minlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, $this->mConfig['minpass']);
 		$this->mFieldProperties['pass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32');
+		$this->mFieldProperties['pass']->addVar('minlength', $this->mConfig['minpass']);
 		$this->mFieldProperties['pass']->addVar('maxlength', 32);
 
 		$this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['vpass']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32');
+		$this->mFieldProperties['vpass']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_VERIFYPASS, '32');
+		$this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32');
 		$this->mFieldProperties['vpass']->addVar('maxlength', 32);
 
 		$this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this);

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2294] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060205103339.A60BF2AC036@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.10 xoops2jp/html/modules/user/language/english/main.php:1.1.2.11
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.10	Sat Feb  4 12:38:45 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Sun Feb  5 19:33:39 2006
@@ -10,8 +10,8 @@
 define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
 define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters.");
 define('_MD_USER_ERROR_PASSWORD', "Incorrect Password");
-define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with {2} or less characters.");
-define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with {2} or more characters.");
+define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with {0} or less characters.");
+define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with {0} or more characters.");
 define('_MD_USER_ERROR_REQUIRED', "{0} is required.");
 define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator.");
 define('_MD_USER_ERROR_TIMEZONE', "TimeZone");

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2295] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060205103339.C95D92AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/main.php
diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.11 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.12
--- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.11	Sat Feb  4 12:38:44 2006
+++ xoops2jp/html/modules/user/language/japanese/main.php	Sun Feb  5 19:33:39 2006
@@ -10,8 +10,8 @@
 define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以下にして下さい");
 define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい");
 define('_MD_USER_ERROR_PASSWORD', "確認用パスワードが異なります");
-define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "パスワードは半角");
-define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "パスワードは半角");
+define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "パスワードは半角{0}文字以下にして下さい");
+define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "パスワードは半角{0}文字以上にして下さい");
 define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。");
 define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン");
Index: xoops2jp/html/modules/user/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.10 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.11
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.10	Sat Feb  4 16:26:44 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Sun Feb  5 19:33:39 2006
@@ -7,7 +7,7 @@
 define('_MI_USER_ADMENU_NEW_RANK', "ユーザーランク新規登録");
 define('_MI_USER_ADMENU_RANK_LIST', "ユーザーランク管理");
 define('_MI_USER_ADMENU_SEARCH', "ユーザー検索");
-define('_MI_USER_CONF_ACTV_ADMIN', "Activation by administrators");
+define('_MI_USER_CONF_ACTV_ADMIN', "管理者が確認してアカウントを有効にする");
 define('_MI_USER_CONF_ACTV_AUTO', "自動的にアカウントを有効にする");
 define('_MI_USER_CONF_ACTV_GROUP', "アカウント有効化依頼のメールの送信先グループ");
 define('_MI_USER_CONF_ACTV_GROUP_DESC', "「管理者が確認してアカウントを有効にする」設定になっている場合のみ有効です");

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:39 +0900
Subject: [xoops-cvslog 2296] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060205103339.ECF6E2AC036@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.5 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.6
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.5	Sat Feb  4 16:52:48 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Sun Feb  5 19:33:39 2006
@@ -14,19 +14,19 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
-    <td class="<{cycle values="odd,even"}>"><{xoops_input name=uname}></td>
+    <td class="<{cycle values="odd,even"}>"><{xoops_input maxlength=25 name=uname value=$actionForm->get('uname')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EMAIL}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=email size=30 maxlength=60}><br />
+      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
       <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}>
       <{$smarty.const._US_ALLOWVIEWEMAIL}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_WEBSITE}></td>
-    <td class="<{cycle values="odd,even"}>"><{xoops_input name=url size=30 maxlength=100}></td>
+    <td class="<{cycle values="odd,even"}>"><{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:33:40 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:33:40 +0900
Subject: [xoops-cvslog 2297] CVS update: xoops2jp/html/modules/user
Message-ID: <20060205103340.1B6092AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.13 xoops2jp/html/modules/user/xoops_version.php:1.1.2.14
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.13	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sun Feb  5 19:33:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.13 2006/02/04 13:35:32 nobunobu Exp $
+// $Id: xoops_version.php,v 1.1.2.14 2006/02/05 10:33:39 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -76,7 +76,7 @@
 		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
 		"formtype"=>"yesno",
 		"valuetype"=>"int",
-		"default"=>0
+		"default"=>1
 	);
 
 $modversion['config'][]=array (
@@ -108,7 +108,7 @@
 		"title"=>"_MI_USER_CONF_CHGMAIL",
 		"formtype"=>"yesno",
 		"valuetype"=>"int",
-		"default"=>1
+		"default"=>0
 	);
 
 $modversion['config'][]=array (
@@ -131,7 +131,7 @@
 		"name"=>"activation_type",
 		"title"=>"_MI_USER_CONF_ACTV_TYPE",
 		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_ACTV_USER=>0,_MI_USER_CONF_ACTV_AUTO=>1,_MI_USER_CONF_ACTV_ADMIN=>2),
+		"options"=>array("_MI_USER_CONF_ACTV_USER"=>0,"_MI_USER_CONF_ACTV_AUTO"=>1,"_MI_USER_CONF_ACTV_ADMIN"=>2),
 		"valuetype"=>"int",
 		"default"=>0
 	);
@@ -149,7 +149,7 @@
 		"name"=>"uname_test_level",
 		"title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL",
 		"formtype"=>"select",
-		"options"=>array(_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG=>0,_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL=>1,_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK=>2),
+		"options"=>array("_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG"=>0,"_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL"=>1,"_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK"=>2),
 		"valuetype"=>"int",
 		"default"=>1
 	);
@@ -200,7 +200,7 @@
 		"title"=>"_MI_USER_CONF_SELF_DELETE",
 		"formtype"=>"yesno",
 		"valuetype"=>"int",
-		"default"=>1
+		"default"=>0
 	);
 
 $modversion['config'][]=array (

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 19:34:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 19:34:29 +0900
Subject: [xoops-cvslog 2297] CVS update: xoops2jp/html/class
Message-ID: <20060205103429.779E82AC02C@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsmailer.php
diff -u xoops2jp/html/class/xoopsmailer.php:1.2.8.2 xoops2jp/html/class/xoopsmailer.php:1.2.8.3
--- xoops2jp/html/class/xoopsmailer.php:1.2.8.2	Mon Nov 21 01:26:53 2005
+++ xoops2jp/html/class/xoopsmailer.php	Sun Feb  5 19:34:29 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmailer.php,v 1.2.8.2 2005/11/20 16:26:53 minahito Exp $
+// $Id: xoopsmailer.php,v 1.2.8.3 2006/02/05 10:34:29 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -485,7 +485,7 @@
 		if ( !is_array($group) ) {
 			if ( strtolower(get_class($group)) == "xoopsgroup" ) {
 				$member_handler =& xoops_gethandler('member');
-				$groups=&$member_handler->getUsersByGroup($group->getVar('groupid'));
+				$groups=&$member_handler->getUsersByGroup($group->getVar('groupid'),true);
 				$this->setToUsers($groups, true);
 			}
 		} else {

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:09:03 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:09:03 +0900
Subject: [xoops-cvslog 2298] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060205130903.004B12AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.1
--- /dev/null	Sun Feb  5 22:09:03 2006
+++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php	Sun Feb  5 22:09:03 2006
@@ -0,0 +1,69 @@
+<?php
+require_once XOOPS_MODULE_PATH."/user/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
+
+class User_UserActivateAction extends User_AbstractEditAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+	}
+	
+	function &_getHandler()
+	{
+		$handler =& xoops_gethandler('user');
+		return $handler;
+	}
+	/**
+	 *  Return false.
+	 *  If a user requests dummy uid, kick out him!
+	 */
+	function isEnableCreate()
+	{
+		return false;
+	}
+
+	/**
+	 *  Return false.
+	 *  This action would be used by a guest user.
+	 */
+	function isSecure()
+	{
+		return false;
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if ((!isset($_REQUEST['actkey'])) || (!$this->mObject)) {
+			$controller->executeForward(XOOPS_URL.'/');
+			exit();
+		}
+		if ($this->mObject->get('actkey') != $_REQUEST['actkey']) {
+			redirect_header(XOOPS_URL, 3, _US_ACTKEYNOT);
+			exit();
+		} 
+		if ($this->mObject->get('level') > 1) {
+			redirect_header(XOOPS_URL.'/user.php', 3, _US_ACONTACT);
+			exit();
+		}
+		
+		$this->mObject->setVar('level','1');
+		// Force update with GET request
+		$this->mObjectHandler->insert($this->mObject,true);
+
+		if ($this->mConfig['activation_type'] == 2) {
+			$builder = new RegistAdminCommitMailBuilder();
+			$director=new UserRegistMailDirector($this->mObject,$controller->getConfig(),$this->mConfig);
+			$director->contruct($builder);
+			$mailer=&$builder->getResult();
+			if ($mailer->send()) {
+				redirect_header(XOOPS_URL.'/' ,5, sprintf(_US_ACTVMAILOK, $this->mObject->getVar('uname')));
+			} else {
+				redirect_header(XOOPS_URL.'/' ,5, sprintf(_US_ACTVMAILNG, $this->mObject->getVar('uname')));
+			}
+		} else {
+			redirect_header(XOOPS_URL.'/user.php' ,5,_US_ACTLOGIN);
+		}
+	}
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:12:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:12:16 +0900
Subject: [xoops-cvslog 2299] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060205131216.9EC252AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostpassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostpassAction.class.php:1.1.2.1 xoops2jp/html/modules/user/actions/LostpassAction.class.php:removed
--- xoops2jp/html/modules/user/actions/LostpassAction.class.php:1.1.2.1	Tue Jan 17 19:34:23 2006
+++ xoops2jp/html/modules/user/actions/LostpassAction.class.php	Sun Feb  5 22:12:16 2006
@@ -1,84 +0,0 @@
-<?php
-
-require_once XOOPS_MODULE_PATH . "/user/forms/LostpassEditForm.class.php";
-require_once XOOPS_MODULE_PATH . "/user/class/LostpassMailBuilder.class.php";
-require_once XOOPS_MODULE_PATH . "/user/class/LostpassMailDirector.class.php";
-
-class User_LostpassAction extends User_Action
-{
-	var $mActionForm = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm =& new LostpassEditForm();
-		$this->mActionForm->prepare();
-	}
-	
-	function isSecure()
-	{
-		return false;
-	}
-	
-	function isPerm(&$controller, &$xoopsUser)
-	{
-		return !is_object($xoopsUser);
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		return USER_FRAME_VIEW_INPUT;
-	}
-	
-	function execute(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if ($this->mActionForm->hasError()) {
-			return USER_FRAME_VIEW_INPUT;
-		}
-		
-		$userHandler =& xoops_gethandler('user');
-		$lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email')));
-
-		if (is_array($lostUserArr) && count($lostUserArr) > 0) {
-			$lostUser =& $lostUserArr[0];
-		}
-		else {
-			return USER_FRAME_VIEW_SUCCESS;
-		}
-
-		$builder =& new LostpassMailBuilder();
-		$director =& new LostpassMailDirector($builder, $lostUser, $controller->mConfig);
-		$director->contruct();
-		$xoopsMailer =& $builder->getResult();
-
-		if (!$xoopsMailer->send()) {
-			// $xoopsMailer->getErrors();
-			return USER_FRAME_VIEW_ERROR;
-		}
-
-		return USER_FRAME_VIEW_SUCCESS;
-	}
-	
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("user_lostpass.html");
-		$render->setAttribute("actionForm", $this->mActionForm);
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		//
-		//
-		//
-		die("TODO");
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		redirect_header(XOOPS_URL, 3, _MD_ERROR_SEND_MAIL);
-	}
-}
-
-?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:12:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:12:16 +0900
Subject: [xoops-cvslog 2300] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060205131216.C3D9D2AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/LostpassMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/LostpassMailBuilder.class.php:1.1.2.3 xoops2jp/html/modules/user/class/LostpassMailBuilder.class.php:removed
--- xoops2jp/html/modules/user/class/LostpassMailBuilder.class.php:1.1.2.3	Tue Jan 17 19:36:25 2006
+++ xoops2jp/html/modules/user/class/LostpassMailBuilder.class.php	Sun Feb  5 22:12:16 2006
@@ -1,49 +0,0 @@
-<?php
-
-class LostpassMailBuilder
-{
-	var $mMailer;
-	
-	function LostpassMailBuilder()
-	{
-		$this->mMailer=&getMailer();
-		$this->mMailer->useMail();
-	}
-
-	function setToUsers($user,$xoopsConfig)
-	{
-		$this->mMailer->setToUsers($user);
-	}
-
-	function setFromEmail($user,$xoopsConfig)
-	{
-		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
-		$this->mMailer->setFromName($xoopsConfig['sitename']);
-	}
-	
-	function setSubject($user,$xoopsConfig)
-	{
-		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
-	}
-
-	function setTemplate()
-	{
-		$this->mMailer->setTemplate("lostpass1.tpl");
-	}
-	
-	function doAssign($user,$xoopsConfig)
-	{
-		$this->mMailer->assign("SITENAME", $xoopsConfig['sitename']);
-		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
-		$this->mMailer->assign("SITEURL", XOOPS_URL."/");
-		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostactv.php?email=".$user->get('email')."&code=".substr($user->get("pass"), 0, 5));
-	}
-		
-	function &getResult()
-	{
-		return $this->mMailer;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/class/LostpassMailDirector.class.php
diff -u xoops2jp/html/modules/user/class/LostpassMailDirector.class.php:1.1.2.3 xoops2jp/html/modules/user/class/LostpassMailDirector.class.php:removed
--- xoops2jp/html/modules/user/class/LostpassMailDirector.class.php:1.1.2.3	Tue Jan 17 19:36:25 2006
+++ xoops2jp/html/modules/user/class/LostpassMailDirector.class.php	Sun Feb  5 22:12:16 2006
@@ -1,27 +0,0 @@
-<?php
-
-class LostpassMailDirector
-{
-	var $mBuilder;
-	var $mXoopsUser;
-	var $mXoopsConfig;
-	
-	function LostpassMailDirector(&$builder,&$user,&$xoopsConfig)
-	{
-		$this->mBuilder=&$builder;
-		$this->mXoopsUser=&$user;
-		$this->mXoopsConfig=&$xoopsConfig;
-	}
-	
-	function contruct()
-	{
-		$this->mBuilder->setToUsers($this->mXoopsUser,$this->mXoopsConfig);
-		$this->mBuilder->setFromEmail($this->mXoopsUser,$this->mXoopsConfig);
-		$this->mBuilder->setSubject($this->mXoopsUser,$this->mXoopsConfig);
-		$this->mBuilder->setTemplate();
-		$this->mBuilder->doAssign($this->mXoopsUser,$this->mXoopsConfig);
-	}
-}
-
-
-?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:12:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:12:16 +0900
Subject: [xoops-cvslog 2301] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060205131216.E74182AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/LostpassEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/LostpassEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/forms/LostpassEditForm.class.php:removed
--- xoops2jp/html/modules/user/forms/LostpassEditForm.class.php:1.1.2.1	Tue Jan 17 19:37:58 2006
+++ xoops2jp/html/modules/user/forms/LostpassEditForm.class.php	Sun Feb  5 22:12:16 2006
@@ -1,38 +0,0 @@
-<?php
-
-require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- */
-class LostpassEditForm extends XCube_ActionForm
-{
-	function getTokenName()
-	{
-		return "module.user.LostpassEditForm.TOKEN";
-	}
-
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
-
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required'));
-		$this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL);
-	}
-	
-	function validateEmail()
-	{
-		if ($this->get('email') != null && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$this->get('email'))) {
-			$this->addErrorMessage(_MD_USER_ERROR_EMAIL_FORMAT);
-		}
-	}
-}
-
-?>

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:25 +0900
Subject: [xoops-cvslog 2302] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060205131425.A2B922AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_lostpass.html
diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.4
--- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.3	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_lostpass.html	Sun Feb  5 22:14:25 2006
@@ -6,7 +6,7 @@
 </ul>
 <{/if}>
 
-<form action="index.php?action=Lostpass" method="post">
+<form action="index.php?action=LostPass" method="post">
 <{xoops_token form=$actionForm}>
 <table class="outer">
   <tr>

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:25 +0900
Subject: [xoops-cvslog 2303] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060205131425.C3FC82AC07A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:25 2006
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Sun Feb  5 22:14:25 2006
@@ -0,0 +1,110 @@
+<?php
+
+require_once XOOPS_MODULE_PATH . "/user/forms/LostPassEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/class/LostPassMailBuilder.class.php";
+
+class User_LostPassAction extends User_Action
+{
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm =& new LostPassEditForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function isSecure()
+	{
+		return false;
+	}
+	
+	function isPerm(&$controller, &$xoopsUser)
+	{
+		return !is_object($xoopsUser);
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if ((!isset($_REQUEST['code']))||(!isset($_REQUEST['email']))) {
+			return USER_FRAME_VIEW_INPUT;
+		} else {
+			return $this->_updatePassword($controller);
+		}
+	}
+	function _updatePassword(&$controller) {
+		$this->mActionForm->fetch();
+
+		$userHandler =& xoops_gethandler('user');
+		$lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email')));
+		if (is_array($lostUserArr) && count($lostUserArr) > 0) {
+			$lostUser =& $lostUserArr[0];
+		}
+		else {
+			return USER_FRAME_VIEW_SUCCESS;
+		}
+
+		$newpass = xoops_makepass();
+		$extraVars['newpass'] = $newpass;
+		$builder =& new LostPass2MailBuilder();
+		$director =& new LostPassMailDirector($builder, $lostUser, $controller->mConfig, $extraVars);
+		$director->contruct();
+		$xoopsMailer =& $builder->getResult();
+		if (!$xoopsMailer->send()) {
+			// $xoopsMailer->getErrors();
+			return USER_FRAME_VIEW_ERROR;
+		}
+		$lostUser->setVar('pass',md5($newpass), true);
+		$userHandler->insert($lostUser, true);
+
+		return USER_FRAME_VIEW_SUCCESS;
+	}
+
+	function execute(&$controller, &$xoopsUser)	
+	{
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return USER_FRAME_VIEW_INPUT;
+		}
+		
+		$userHandler =& xoops_gethandler('user');
+		$lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email')));
+
+		if (is_array($lostUserArr) && count($lostUserArr) > 0) {
+			$lostUser =& $lostUserArr[0];
+		}
+		else {
+			return USER_FRAME_VIEW_SUCCESS;
+		}
+
+		$builder =& new LostPass1MailBuilder();
+		$director =& new LostPassMailDirector($builder, $lostUser, $controller->mConfig);
+		$director->contruct();
+		$xoopsMailer =& $builder->getResult();
+
+		if (!$xoopsMailer->send()) {
+			// $xoopsMailer->getErrors();
+			return USER_FRAME_VIEW_ERROR;
+		}
+
+		return USER_FRAME_VIEW_SUCCESS;
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_lostpass.html");
+		$render->setAttribute("actionForm", $this->mActionForm);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header(XOOPS_URL, 3, _MD_ERROR_SEND_MAIL);
+	}
+}
+
+?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:25 +0900
Subject: [xoops-cvslog 2304] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060205131425.E92F42AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php
diff -u /dev/null xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:25 2006
+++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php	Sun Feb  5 22:14:25 2006
@@ -0,0 +1,99 @@
+<?php
+
+class LostPassMailDirector
+{
+	var $mBuilder;
+	var $mXoopsUser;
+	var $mXoopsConfig;
+	var $mExtraVars;
+	
+	function LostPassMailDirector(&$builder,&$user,&$xoopsConfig,$extraVars=array())
+	{
+		$this->mBuilder=&$builder;
+		$this->mXoopsUser=&$user;
+		$this->mXoopsConfig=&$xoopsConfig;
+		$this->mExtraVars=$extraVars;
+	}
+	
+	function contruct()
+	{
+		$this->mBuilder->setToUsers($this->mXoopsUser,$this->mXoopsConfig);
+		$this->mBuilder->setFromEmail($this->mXoopsUser,$this->mXoopsConfig);
+		$this->mBuilder->setSubject($this->mXoopsUser,$this->mXoopsConfig);
+		$this->mBuilder->setTemplate();
+		$this->mBuilder->setBody($this->mXoopsUser,$this->mXoopsConfig,$this->mExtraVars);
+	}
+}
+class LostPass1MailBuilder
+{
+	var $mMailer;
+	
+	function LostPass1MailBuilder()
+	{
+		$this->mMailer=&getMailer();
+		$this->mMailer->useMail();
+	}
+
+	function setToUsers($user,$xoopsConfig)
+	{
+		$this->mMailer->setToUsers($user);
+	}
+
+	function setFromEmail($user,$xoopsConfig)
+	{
+		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+		$this->mMailer->setFromName($xoopsConfig['sitename']);
+	}
+	
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
+	}
+
+	function setTemplate()
+	{
+		$root=&XCube_Root::getSingleton();
+		$language = $root->mController->getConfig('language');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplate("lostpass1.tpl");
+	}
+	
+	function setBody($user,$xoopsConfig,$extraVars)
+	{
+		$this->mMailer->assign("SITENAME", $xoopsConfig['sitename']);
+		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+		$this->mMailer->assign("SITEURL", XOOPS_URL."/");
+		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL."/modules/user/index.php?action=LostPass&email=".$user->get('email')."&code=".substr($user->get("pass"), 0, 5));
+	}
+		
+	function &getResult()
+	{
+		return $this->mMailer;
+	}
+}
+class LostPass2MailBuilder extends LostPass1MailBuilder
+{
+	function setTemplate()
+	{
+		$root=&XCube_Root::getSingleton();
+		$language = $root->mController->getConfig('language');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplate("lostpass2.tpl");
+	}
+
+	function setSubject($user,$xoopsConfig)
+	{
+		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
+	}
+
+	function setBody($user,$xoopsConfig,$extraVars)
+	{
+		$this->mMailer->assign("SITENAME", $xoopsConfig['sitename']);
+		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+		$this->mMailer->assign("SITEURL", XOOPS_URL."/");
+		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+		$this->mMailer->assign("NEWPWD", $extraVars['newpass']);
+	}
+}
+?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:26 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:26 +0900
Subject: [xoops-cvslog 2305] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060205131426.1FB6D2AC07A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/LostPassEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/forms/LostPassEditForm.class.php:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:26 2006
+++ xoops2jp/html/modules/user/forms/LostPassEditForm.class.php	Sun Feb  5 22:14:25 2006
@@ -0,0 +1,40 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+
+/**
+ * This class is generated by makeActionForm tool.
+ */
+class LostPassEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.LostPassEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
+		$this->mFormProperties['code'] =& new XCube_StringProperty('code');
+		$this->mFormProperties['newpass'] =& new XCube_StringProperty('newpass');
+
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['email']->setDependsByArray(array('required'));
+		$this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL);
+	}
+	
+	function validateEmail()
+	{
+		if ($this->get('email') != null && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$this->get('email'))) {
+			$this->addErrorMessage(_MD_USER_ERROR_EMAIL_FORMAT);
+		}
+	}
+}
+
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:26 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:26 +0900
Subject: [xoops-cvslog 2306] CVS update:
	xoops2jp/html/modules/user/language/english/mail_template
Message-ID: <20060205131426.43C772AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/mail_template/lostpass1.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/english/mail_template/lostpass1.tpl:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:26 2006
+++ xoops2jp/html/modules/user/language/english/mail_template/lostpass1.tpl	Sun Feb  5 22:14:26 2006
@@ -0,0 +1,13 @@
+Hello {X_UNAME},
+
+A web user from {IP} has just requested a new password for your account at {SITENAME}.
+You can get your new password by clicking on the link below:
+
+{NEWPWD_LINK}
+
+If you didn't ask for this, don't worry. Just delete this Email.
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/english/mail_template/lostpass2.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/english/mail_template/lostpass2.tpl:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:26 2006
+++ xoops2jp/html/modules/user/language/english/mail_template/lostpass2.tpl	Sun Feb  5 22:14:26 2006
@@ -0,0 +1,15 @@
+Hello {X_UNAME},
+
+A web user from {IP} has just requested that password be sent.
+Here are your login details at {SITENAME}.
+
+Username: {X_UNAME}
+New Password: {NEWPWD}
+
+You can change it after you login at {SITEURL}user.php.
+If you didn't ask for this, don't worry. You are seeing this message, not 'them'. If this was an error, we are really sorry but please login with your new password.
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:14:26 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:14:26 +0900
Subject: [xoops-cvslog 2307] CVS update:
	xoops2jp/html/modules/user/language/japanese/mail_template
Message-ID: <20060205131426.68D6A2AC07A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/mail_template/lostpass1.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/mail_template/lostpass1.tpl:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:26 2006
+++ xoops2jp/html/modules/user/language/japanese/mail_template/lostpass1.tpl	Sun Feb  5 22:14:26 2006
@@ -0,0 +1,12 @@
+{X_UNAME}さん、こんにちは
+
+IPアドレス{IP}のユーザから、{SITENAME}におけるあなたのログイン用パスワードの新規発行リクエストがありました。もし新たにパスワードを発行する場合は下記のリンクをクリックしてください。 
+
+{NEWPWD_LINK}
+
+もしこのリクエストが手違いの場合はこのメールを破棄してください。今までのパスワードでログインすることができます。
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file
Index: xoops2jp/html/modules/user/language/japanese/mail_template/lostpass2.tpl
diff -u /dev/null xoops2jp/html/modules/user/language/japanese/mail_template/lostpass2.tpl:1.1.2.1
--- /dev/null	Sun Feb  5 22:14:26 2006
+++ xoops2jp/html/modules/user/language/japanese/mail_template/lostpass2.tpl	Sun Feb  5 22:14:26 2006
@@ -0,0 +1,13 @@
+{X_UNAME}さん、こんにちは
+
+IPアドレス{IP}のユーザから、{SITENAME}におけるログイン用パスワードの新規発行リクエストがありました。 以下があなたの新しいログイン情報です。
+
+ユーザ名： {X_UNAME}
+新パスワード： {NEWPWD}
+
+上記パスワードを使用して{SITEURL}user.phpからログインし、このパスワードを直ちに変更することをお勧めします。
+
+-----------
+{SITENAME} ({SITEURL}) 
+webmaster
+{ADMINMAIL}
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Feb  5 22:15:40 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Feb 2006 22:15:40 +0900
Subject: [xoops-cvslog 2308] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060205131540.958F62AC072@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php
diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.8 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.9
--- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.8	Thu Feb  2 17:50:12 2006
+++ xoops2jp/html/modules/user/forms/EditUserForm.class.php	Sun Feb  5 22:15:40 2006
@@ -133,7 +133,7 @@
 		$user->set('user_mailok',$this->getVar('user_mailok'));
 		
 		if($this->getVar('pass'))
-			$user->set('pass',$this->getVar('pass'));
+			$user->set('pass',md5($this->getVar('pass')));
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Mon Feb  6 00:56:36 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  6 Feb 2006 00:56:36 +0900
Subject: [xoops-cvslog 2309] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060205155636.71E8E2AC053@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.22 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.23
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.22	Fri Jan 27 23:49:57 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Mon Feb  6 00:56:36 2006
@@ -712,19 +712,12 @@
 		}
 
 		$showCenterFlag = (SHOW_CENTERBLOCK_LEFT | SHOW_CENTERBLOCK_CENTER | SHOW_CENTERBLOCK_RIGHT);
-		if (isset($_GLOBALS['xoopsOption']['show_cblock']) && !$_GLOBALS['xoopsOption']['show_cblock'])
-			$showCenterFlag = 0;
-
 		$showRightFlag = SHOW_SIDEBLOCK_RIGHT;
-		if (isset($_GLOBALS['xoopsOption']['show_rblock']) && !$_GLOBALS['xoopsOption']['show_rblock'])
-			$showRightFlag = 0;
-		
 		$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, SHOW_SIDEBLOCK_LEFT | SHOW_SIDEBLOCK_RIGHT);
+		$blockObjects=&$xoopsblock->getBlocks($groups, $mid, $showFlag);
 		
 		foreach($blockObjects as $blockObject) {
 			$controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject);

From nobunobu ＠ users.sourceforge.jp  Mon Feb  6 14:21:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  6 Feb 2006 14:21:08 +0900
Subject: [xoops-cvslog 2310] CVS update: xoops2jp/html/kernel
Message-ID: <20060206052108.250D92AC02A@users.sourceforge.jp>

Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2.8.2 xoops2jp/html/kernel/configitem.php:1.2.8.3
--- xoops2jp/html/kernel/configitem.php:1.2.8.2	Sat Feb  4 06:06:18 2006
+++ xoops2jp/html/kernel/configitem.php	Mon Feb  6 14:21:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: configitem.php,v 1.2.8.2 2006/02/03 21:06:18 ryuji_amano Exp $
+// $Id: configitem.php,v 1.2.8.3 2006/02/06 05:21:07 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,6 +99,7 @@
             break;
         case 'array':
             $ret = unserialize($this->getVar('conf_value', 'N'));
+			break;
         case 'float':
             $value = $this->getVar('conf_value', 'N');
             $ret = floatval($value);

From nobunobu ＠ users.sourceforge.jp  Mon Feb  6 14:21:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  6 Feb 2006 14:21:08 +0900
Subject: [xoops-cvslog 2311] CVS update:
	xoops2jp/html/modules/base/preload/SiteClose
Message-ID: <20060206052108.4B3E92AC061@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.3 xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.4
--- xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.3	Thu Nov 17 12:44:22 2005
+++ xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php	Mon Feb  6 14:21:08 2006
@@ -1,76 +1,73 @@
-<?php
-
-class SiteClose_Filter extends XCube_ActionFilter
-{
-	function preBlockFilter()
-	{
-		if($this->mController->mConfig['closesite']==1)
-			$this->_processSiteClose();
-
-		$delegate=new XCube_Delegate("SiteClose_Filter","callbackCheckLoginSuccess");
-		$this->mController->mRoot->mEventManager->add("Site.CheckLogin.Success",$delegate);
-	}
-
-	function _processSiteClose()
-	{
-	    $accessAllowFlag = false;
-
-		if(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) {
-					$allowed = true;
-					break;
-				}
-			}
-		}
-		elseif(!empty($_POST['xoops_login'])) {
-			// Check!
-	        require_once XOOPS_ROOT_PATH.'/include/checklogin.php';
-	        exit();
-	    }
-
-	    if (!$accessAllowFlag) {
-	        require_once XOOPS_ROOT_PATH.'/class/template.php';
-	        $xoopsTpl = new XoopsTpl();
-	        $xoopsTpl->assign( array('xoops_sitename' => htmlspecialchars($this->mController->mConfig['sitename']),
-	                                   'xoops_themecss' => xoops_getcss(),
-	                                   'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
-	                                   'lang_login' => _LOGIN,
-	                                   'lang_username' => _USERNAME,
-	                                   'lang_password' => _PASSWORD,
-	                                   'lang_siteclosemsg' => $this->mController->mConfig['closesite_text']));
-	        $xoopsTpl->xoops_setCaching(1);
-	        $xoopsTpl->display('db:system_siteclosed.html');	///< @todo depends schema
-	        exit();
-	    }
-	}
-	
-	function callbackCheckLoginSuccess(&$controller,&$eventArgs)
-	{
-		//
-		// This check is not needed. :)
-		//
-		if(!is_object($eventArgs['xoopsUser']))
-			return;
-
-		$user=&$eventArgs['xoopsUser'];
-
-		// Site close
-		if($controller->getConfig('closesite')) {
-			$accessAllowed=false;
-
-			foreach($user->getGroups() as $group) {
-				if(in_array($group,$controller->getConfig('closesite_okgrp') || $group==XOOPS_GROUP_ADMIN)) {
-					$accessAllowed=true;
-					break;
-				}
-			}
-
-			if(!$accessAllowed) {
-				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);
-			}
-		}
-	}
-}
-
+<?php
+
+class SiteClose_Filter extends XCube_ActionFilter
+{
+	function preBlockFilter()
+	{
+		if($this->mController->mConfig['closesite']==1) {
+			$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"));
+		}
+	}
+
+	function callbackSiteLogin()
+	{
+	    $accessAllowFlag = false;
+		if(!empty($_POST['xoops_login'])) {
+			// Check!
+	        require_once XOOPS_ROOT_PATH.'/include/checklogin.php';
+			return;
+	    }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;
+					break;
+				}
+			}
+		}
+
+	    if (!$accessAllowFlag) {
+	        require_once XOOPS_ROOT_PATH.'/class/template.php';
+	        $xoopsTpl = new XoopsTpl();
+	        $xoopsTpl->assign( array('xoops_sitename' => htmlspecialchars($this->mController->mConfig['sitename']),
+	                                   'xoops_themecss' => xoops_getcss(),
+	                                   'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
+	                                   'lang_login' => _LOGIN,
+	                                   'lang_username' => _USERNAME,
+	                                   'lang_password' => _PASSWORD,
+	                                   'lang_siteclosemsg' => $this->mController->mConfig['closesite_text']));
+	        $xoopsTpl->xoops_setCaching(1);
+	        $xoopsTpl->display('db:system_siteclosed.html');	///< @todo depends schema
+	        exit();
+	    }
+	}
+	
+	function callbackCheckLoginSuccess(&$controller,&$eventArgs)
+	{
+		//
+		// This check is not needed. :)
+		//
+		if(!is_object($eventArgs['xoopsUser']))
+			return;
+
+		$user=&$eventArgs['xoopsUser'];
+
+		// Site close
+		if($controller->getConfig('closesite')) {
+			$accessAllowed=false;
+
+			foreach($user->getGroups() as $group) {
+				if(in_array($group,$controller->getConfig('closesite_okgrp')) || ($group==XOOPS_GROUP_ADMIN)) {
+					$accessAllowed=true;
+					break;
+				}
+			}
+
+			if(!$accessAllowed) {
+				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);
+			}
+		}
+	}
+}
+
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2311] CVS update: xoops2jp/html/class
Message-ID: <20060206054358.0EC1C2AC082@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.6.2.1 xoops2jp/html/class/module.textsanitizer.php:1.6.2.2
--- xoops2jp/html/class/module.textsanitizer.php:1.6.2.1	Sun Feb  5 14:19:52 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Mon Feb  6 14:43:57 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.6.2.1 2006/02/05 05:19:52 onokazu Exp $
+// $Id: module.textsanitizer.php,v 1.6.2.2 2006/02/06 05:43:57 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -578,7 +578,8 @@
 
     function &oopsStripSlashesGPC($text)
     {
-        return $this->stripSlashesGPC($text);
+        $ret = $this->stripSlashesGPC($text);
+        return $ret;
     }
 
     function &oopsStripSlashesRT($text)
@@ -591,17 +592,20 @@
 
     function &oopsAddSlashes($text)
     {
-        return $this->addSlashes($text);
+        $ret = $this->addSlashes($text);
+        return $ret;
     }
 
     function &oopsHtmlSpecialChars($text)
     {
-        return $this->htmlSpecialChars($text);
+        $ret = $this->htmlSpecialChars($text);
+        return $ret;
     }
 
     function &oopsNl2Br($text)
     {
-        return $this->nl2br($text);
+        $ret = $this->nl2br($text);
+        return $ret;
     }
     /**#@-*/
 }
Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.4.6.1 xoops2jp/html/class/xoopsblock.php:1.4.6.2
--- xoops2jp/html/class/xoopsblock.php:1.4.6.1	Sun Feb  5 14:19:52 2006
+++ xoops2jp/html/class/xoopsblock.php	Mon Feb  6 14:43:57 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsblock.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
+// $Id: xoopsblock.php,v 1.4.6.2 2006/02/06 05:43:57 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -140,28 +140,29 @@
             // S : use text sanitizater (smilies enabled)
             // T : use text sanitizater (smilies disabled)
             if ( $c_type == 'H' ) {
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'N'));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'N'));
             } elseif ( $c_type == 'P' ) {
                 ob_start();
                 echo eval($this->getVar('content', 'N'));
-                    $content = ob_get_contents();
-                    ob_end_clean();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
+                $content = ob_get_contents();
+                ob_end_clean();
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
             } elseif ( $c_type == 'S' ) {
                 $myts =& MyTextSanitizer::getInstance();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 1));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 1));
             } else {
                 $myts =& MyTextSanitizer::getInstance();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 0));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 0));
             }
             break;
         case 'E':
-            return $this->getVar('content', 'E');
+            $ret = $this->getVar('content', 'E');
             break;
         default:
-            return $this->getVar('content', 'N');
+            $ret = $this->getVar('content', 'N');
             break;
         }
+        return $ret;
     }
 
     function &buildBlock()
@@ -404,7 +405,7 @@
         $ret = array();
         while( $myrow = $db->fetchArray($result) ) {
             if ( $asobject ) {
-                $ret[] = new XoopsBlock($myrow);
+                $ret[] =& new XoopsBlock($myrow);
             } else {
                 $ret[] = $myrow['bid'];
             }

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2312] CVS update: xoops2jp/html/kernel
Message-ID: <20060206054358.3B9C02AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.4 xoops2jp/html/kernel/module.php:1.4.6.1
--- xoops2jp/html/kernel/module.php:1.4	Wed Aug  3 21:39:12 2005
+++ xoops2jp/html/kernel/module.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.4 2005/08/03 12:39:12 onokazu Exp $
+// $Id: module.php,v 1.4.6.1 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -120,7 +120,8 @@
             if ( isset($this->modinfo[$name]) ) {
                 return $this->modinfo[$name];
             }
-            return false;
+            $ret = false;
+            return $ret;
         }
         return $this->modinfo;
     }
@@ -216,23 +217,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);
+            $ret = $func($term, $andor, $limit, $offset, $userid);
         }
-        return false;
+        return $ret;
     }
 
     /**#@+
@@ -254,7 +256,8 @@
     function &getByDirName($dirname)
     {
         $modhandler =& xoops_gethandler('module');
-        return $modhandler->getByDirname($dirname);
+        $ret =& $modhandler->getByDirname($dirname);
+        return $ret;
     }
     /**#@-*/
 }
@@ -297,7 +300,7 @@
      **/
     function &create($isNew = true)
     {
-        $module = new XoopsModule();
+        $module =& new XoopsModule();
         if ($isNew) {
             $module->setNew();
         }
@@ -335,7 +338,8 @@
                 }
             }
         }
-        return false;
+        $ret = false;
+        return $ret;
     }
 
     /**
@@ -349,24 +353,24 @@
     {
         static $_cachedModule_mid;
         static $_cachedModule_dirname;
+        $ret = false;
         if (!empty($_cachedModule_dirname[$dirname])) {
-            return $_cachedModule_dirname[$dirname];
+            $ret = $_cachedModule_dirname[$dirname];
         } else {
             $sql = "SELECT * FROM ".$this->db->prefix('modules')." WHERE dirname = '".trim($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;
     }
 
     /**

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2313] CVS update: xoops2jp/html/modules/system
Message-ID: <20060206054358.5E1432AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin.php
diff -u xoops2jp/html/modules/system/admin.php:1.2.16.1 xoops2jp/html/modules/system/admin.php:1.2.16.2
--- xoops2jp/html/modules/system/admin.php:1.2.16.1	Sun Feb  5 14:19:53 2006
+++ xoops2jp/html/modules/system/admin.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: admin.php,v 1.2.16.1 2006/02/05 05:19:53 onokazu Exp $
+// $Id: admin.php,v 1.2.16.2 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -78,7 +78,7 @@
             $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
             unset($modversion);
             if ($category > 0) {
-                $groups =& $xoopsUser->getGroups();
+                $groups = $xoopsUser->getGroups();
                 if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
                     if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
                         include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2314] CVS update:
	xoops2jp/html/modules/system/admin/blocksadmin
Message-ID: <20060206054358.818232AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/blocksadmin/main.php
diff -u xoops2jp/html/modules/system/admin/blocksadmin/main.php:1.4 xoops2jp/html/modules/system/admin/blocksadmin/main.php:1.4.6.1
--- xoops2jp/html/modules/system/admin/blocksadmin/main.php:1.4	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/blocksadmin/main.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.4 2005/08/03 12:39:16 onokazu Exp $
+// $Id: main.php,v 1.4.6.1 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -169,7 +169,7 @@
         $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.intval($bmid).')';
             $db->query($sql);
     }
-    $groups =& $xoopsUser->getGroups();
+    $groups = $xoopsUser->getGroups();
     $count = count($groups);
     for ($i = 0; $i < $count; $i++) {
         $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_name, gperm_modid) VALUES (".$groups[$i].", ".$newid.", 'block_read', 1)";

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2315] CVS update:
	xoops2jp/html/modules/system/admin/groups
Message-ID: <20060206054358.A6B192AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/groups/main.php
diff -u xoops2jp/html/modules/system/admin/groups/main.php:1.4 xoops2jp/html/modules/system/admin/groups/main.php:1.4.6.1
--- xoops2jp/html/modules/system/admin/groups/main.php:1.4	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/groups/main.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.4 2005/08/03 12:39:16 onokazu Exp $
+// $Id: main.php,v 1.4.6.1 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -57,8 +57,8 @@
         modifyGroup($g_id);
         break;
     case "update":
-		if(!XoopsMultiTokenHandler::quickValidate('groups_update'))
-			system_groups_error("Ticket Error");
+        if(!XoopsMultiTokenHandler::quickValidate('groups_update'))
+            system_groups_error("Ticket Error");
 
         $g_id = !empty($_POST['g_id']) ? intval($_POST['g_id']) : 0;
         if ($g_id <= 0) {
@@ -135,8 +135,8 @@
         }
         break;
     case "add":
-		if(!XoopsMultiTokenHandler::quickValidate('groups_add'))
-			system_groups_error("Ticket Error");
+        if(!XoopsMultiTokenHandler::quickValidate('groups_add'))
+            system_groups_error("Ticket Error");
 
         $name = !empty($_POST['name']) ? trim($_POST['name']) : '';
         if ($name == '') {
@@ -210,8 +210,8 @@
         xoops_cp_footer();
         break;
     case "delConf":
-		if(!xoops_confirm_validate())
-			system_groups_error("Ticket Error");
+        if(!xoops_confirm_validate())
+            system_groups_error("Ticket Error");
 
         $g_id = !empty($_POST['g_id']) ? intval($_POST['g_id']) : 0;
         if ($g_id > 0 && !in_array($g_id, array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
@@ -224,13 +224,13 @@
         redirect_header("admin.php?fct=groups&amp;op=adminMain",1,_AM_DBUPDATED);
         break;
     case "addUser":
-		if(!XoopsMultiTokenHandler::quickValidate('groups_User'))
-			system_groups_error("Ticket Error");
+        if(!XoopsMultiTokenHandler::quickValidate('groups_User'))
+            system_groups_error("Ticket Error");
 
         $member_handler =& xoops_gethandler('member');
         $groupid = intval($_POST['groupid']);
         if ($groupid > 0) {
-            $size = count($_POST['uids']);
+            $size = isset($_POST['uids']) ? count($_POST['uids']) : 0;
             for ( $i = 0; $i < $size; $i++ ) {
                 $member_handler->addUserToGroup($_POST['groupid'], $_POST['uids'][$i]);
             }
@@ -238,8 +238,8 @@
         redirect_header("admin.php?fct=groups&amp;op=modify&amp;g_id=".$groupid, 0, _AM_DBUPDATED);
         break;
     case "delUser":
-		if(!XoopsMultiTokenHandler::quickValidate('groups_User'))
-			system_groups_error("Ticket Error");
+        if(!XoopsMultiTokenHandler::quickValidate('groups_User'))
+            system_groups_error("Ticket Error");
 
         $groupid = !empty($_POST['groupid']) ? intval($_POST['groupid']) : 0;
         if ($groupid > 0) {

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2316] CVS update:
	xoops2jp/html/modules/system/admin/mailusers
Message-ID: <20060206054358.CBADE2AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4.6.1 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4.6.2
--- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.4.6.1	Sun Feb  5 14:19:53 2006
+++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mailusers.php,v 1.4.6.1 2006/02/05 05:19:53 onokazu Exp $
+// $Id: mailusers.php,v 1.4.6.2 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -72,7 +72,7 @@
                 $member_handler =& xoops_gethandler('member');
                 $user_list = array();
                 foreach ($_POST['mail_to_group'] as $groupid ) {
-                    $members =& $member_handler->getUsersByGroup($groupid, false);
+                    $members = $member_handler->getUsersByGroup($groupid, false);
                     // Mith: Changed this to not fetch user objects with getUsersByGroup 
                     // as it is resource-intensive and all we want is the userIDs
                     $user_list = array_merge($members, $user_list);

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 14:43:58 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 14:43:58 +0900
Subject: [xoops-cvslog 2317] CVS update:
	xoops2jp/html/modules/system/admin/modulesadmin
Message-ID: <20060206054358.EF8962AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php
diff -u xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.4 xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.4.6.1
--- xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.4	Wed Aug  3 21:39:16 2005
+++ xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php	Mon Feb  6 14:43:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: modulesadmin.php,v 1.4 2005/08/03 12:39:16 onokazu Exp $
+// $Id: modulesadmin.php,v 1.4.6.1 2006/02/06 05:43:58 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -427,7 +427,7 @@
                 }
             }
 
-            $groups =& $xoopsUser->getGroups();
+            $groups = $xoopsUser->getGroups();
             // retrieve all block ids for this module
             $blocks =& XoopsBlock::getByModule($newmid, false);
             $msgs[] = 'Setting group rights...';

From onokazu ＠ users.sourceforge.jp  Mon Feb  6 17:37:39 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon,  6 Feb 2006 17:37:39 +0900
Subject: [xoops-cvslog 2318] CVS update: xoops2jp/html/class
Message-ID: <20060206083739.DAF932AC08E@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.4.6.2 xoops2jp/html/class/xoopsblock.php:1.4.6.3
--- xoops2jp/html/class/xoopsblock.php:1.4.6.2	Mon Feb  6 14:43:57 2006
+++ xoops2jp/html/class/xoopsblock.php	Mon Feb  6 17:37:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsblock.php,v 1.4.6.2 2006/02/06 05:43:57 onokazu Exp $
+// $Id: xoopsblock.php,v 1.4.6.3 2006/02/06 08:37:39 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -335,7 +335,7 @@
                 if (!$asobject) {
                     $ret[] = $myrow['bid'];
                 } else {
-                    $ret[] = new XoopsBlock($myrow);
+                    $ret[] =& new XoopsBlock($myrow);
                 }
                 array_push($added, $myrow['bid']);
             }
@@ -369,16 +369,17 @@
             $sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
             $result = $db->query($sql);
             while ( $myrow = $db->fetchArray($result) ) {
-                $ret[] = new XoopsBlock($myrow);
+                $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);
+                $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":
Index: xoops2jp/html/class/xoopslists.php
diff -u xoops2jp/html/class/xoopslists.php:1.4 xoops2jp/html/class/xoopslists.php:1.4.6.1
--- xoops2jp/html/class/xoopslists.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/xoopslists.php	Mon Feb  6 17:37:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopslists.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: xoopslists.php,v 1.4.6.1 2006/02/06 08:37:39 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -46,7 +46,8 @@
          */
         function &getThemesList()
         {
-            return XoopsLists::getDirListAsArray(XOOPS_THEME_PATH.'/');
+            $ret =& XoopsLists::getDirListAsArray(XOOPS_THEME_PATH.'/');
+            return $ret;
         }
 
         /*
@@ -54,7 +55,8 @@
          */
         function &getModulesList()
         {
-            return XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/modules/");
+            $ret =& XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/modules/");
+            return $ret;
         }
 
         /*
@@ -172,10 +174,10 @@
                 foreach ( $dirlist as $dir ) {
                     $avatars[$dir] =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/images/avatar/".$dir."/", $dir."/");
                 }
-            } else {
-                return false;
+                return $avatars;
             }
-            return $avatars;
+            $ret = false;
+            return $ret;
         }
 
         /*

From onokazu ＠ users.sourceforge.jp  Tue Feb  7 12:58:40 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Tue,  7 Feb 2006 12:58:40 +0900
Subject: [xoops-cvslog 2319] CVS update:
	xoops2jp/html/modules/stdCache/language/english
Message-ID: <20060207035840.6DE4F2AC08A@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.2 xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.3
--- xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.2	Sat Feb  4 01:36:07 2006
+++ xoops2jp/html/modules/stdCache/language/english/help.html	Tue Feb  7 12:58:40 2006
@@ -1,20 +1,19 @@
 <h4>Outline</h4>
 <ul>
-  <li>This module offers the cash function to your site. It may reduce sever load especially when your site has many access.</li>
-  <li>However, there is a possibility of causing problems such as the cash expose some improper contents (like a link to admin section) open to the public.</li>
-  <li>This module makes the cash function to two types of user groups, guest user and normal registered user. We expect high effectiveness of the cash function in general site, most of the sites has two types of user, guest user and normal registered user.</li>
-  <li>The cash function does not work for special types of user group other than normal registered user and guest user.</li>
+  <li>This module adds caching functionality to your site, which can reduce the sever load considerably when your site has a lot of access.</li>
+  <li>However, there still exists some minor problems to be fixed in the future such as the cash exposing contents to those that should not have access.</li>
+  <li>This module enables the function for two types of user group (i.e. guest and registered user groups). Caching contents for other user groups is not available at this time.</li>
 </ul>
-<h4>Cash Clear Block</h4>
+<h4>Cache maintainance using the clear cache block</h4>
 <ul>
-  <li>This block clears all cash when the block get receive access.</li>
-  <li>Please set the block is accessible from the guest, and set clearance interval for one day in block preference. Then, the module clear cash once in a day.</li>
-  <li>The module may create large amount of cash files. But it is hardly becomes a problem if you use cash clear block properly..</li>
+  <li>The clear cache block will invalidate all the cached contents when the block is viewed by a user.</li>
+  <li>We recommend setting the block accessible by the guest users, and the clearance interval to "one day" in block preference, which would then purge all the cached contents once a day.</li>
+  <li>The module might create a large amount of cached files, but it hardly becomes a problem if you use the clear cache block properly as recommended.</li>
 </ul>
 
 <h4>How to set up</h4>
 <ul>
-  <li>Please add the following two lines under the [Cube] block of the configuration file.</li>
+  <li>Please add the following two lines to the the configuration file, under the [Cube] block.</li>
   <li>CacheSystem.path=/modules/stdCache/kernel</li>
   <li>CacheSystem.class=StdRenderCache</li>
 </ul>

From onokazu ＠ users.sourceforge.jp  Tue Feb  7 13:03:32 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Tue,  7 Feb 2006 13:03:32 +0900
Subject: [xoops-cvslog 2320] CVS update:
	xoops2jp/html/modules/stdCache/language/english
Message-ID: <20060207040332.41D262AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.3 xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.4
--- xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.3	Tue Feb  7 12:58:40 2006
+++ xoops2jp/html/modules/stdCache/language/english/help.html	Tue Feb  7 13:03:32 2006
@@ -1,7 +1,7 @@
 <h4>Outline</h4>
 <ul>
   <li>This module adds caching functionality to your site, which can reduce the sever load considerably when your site has a lot of access.</li>
-  <li>However, there still exists some minor problems to be fixed in the future such as the cash exposing contents to those that should not have access.</li>
+  <li>However, there still exists some minor problems to be fixed in the future such as the cache exposing contents to those that should not have access.</li>
   <li>This module enables the function for two types of user group (i.e. guest and registered user groups). Caching contents for other user groups is not available at this time.</li>
 </ul>
 <h4>Cache maintainance using the clear cache block</h4>

From minahito ＠ users.sourceforge.jp  Tue Feb  7 15:20:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Feb 2006 15:20:05 +0900
Subject: [xoops-cvslog 2321] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060207062005.E2E982AC02C@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.5 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.6
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.5	Thu Feb  2 14:34:19 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Tue Feb  7 15:20:05 2006
@@ -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}>)</small><br />
+    <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 />
   <{/foreach}>
   <!-- end results item loop -->
 

From minahito ＠ users.sourceforge.jp  Tue Feb  7 15:54:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Feb 2006 15:54:26 +0900
Subject: [xoops-cvslog 2322] CVS update: xoops2jp/html/modules/base/service
Message-ID: <20060207065426.96DB02AC016@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/service/LegacySearchService.class.php
diff -u xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.1 xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.2
--- xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.1	Tue Jan 17 19:29:58 2006
+++ xoops2jp/html/modules/base/service/LegacySearchService.class.php	Tue Feb  7 15:54:26 2006
@@ -38,6 +38,9 @@
 		// Next, fetch from $mids[], and check read permission.
 		// If user can read the module information, execute search.
 		//
+		$root =& XCube_Root::getSingleton();
+		$timezone = $root->mController->getConfig('server_TZ') * 3600;
+		
 		$i = 0;
 		foreach ($mids as $mid) {
 			if ($gpermHandler->checkRight('module_read', $mid, $groups)) {
@@ -63,7 +66,7 @@
 						// TODO If this service will come to web service, we should
 						// change format from unixtime to string by timeoffset.
 						//
-						$item['time'] = isset($result['time']) ? $result['time'] : 0;
+						$item['time'] = isset($result['time']) ? $result['time'] - $timezone : 0;
 						
 						$ret[$i]['results'][] = $item;
 					}

From nobunobu ＠ users.sourceforge.jp  Tue Feb  7 17:21:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue,  7 Feb 2006 17:21:09 +0900
Subject: [xoops-cvslog 2323] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060207082109.B0F852AC016@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.3
--- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.2	Wed Jan 25 16:13:31 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php	Tue Feb  7 17:21:09 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_LanguageManager.class.php,v 1.1.2.2 2006/01/25 07:13:31 minahito Exp $
+// $Id: Legacy_LanguageManager.class.php,v 1.1.2.3 2006/02/07 08:21:09 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,6 +99,10 @@
 	function _loadFile($filename)
 	{
 		if (file_exists($filename)) {
+			global $xoopsDB, $xoopsTpl, $xoopsRequestUri, $xoopsModule, $xoopsModuleConfig,
+				   $xoopsModuleUpdate, $xoopsUser, $xoopsUserIsAdmin, $xoopsTheme,
+				   $xoopsConfig, $xoopsOption, $xoopsCachedTemplate, $xoopsLogger, $xoopsDebugger;
+
 			require_once $filename;
 			$checks[$filename] = true;
 			return true;

From minahito ＠ users.sourceforge.jp  Tue Feb  7 17:31:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Feb 2006 17:31:54 +0900
Subject: [xoops-cvslog 2324] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060207083154.49DBF2AC0AF@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.3	Tue Feb  7 17:21:09 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php	Tue Feb  7 17:31:54 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_LanguageManager.class.php,v 1.1.2.3 2006/02/07 08:21:09 nobunobu Exp $
+// $Id: Legacy_LanguageManager.class.php,v 1.1.2.4 2006/02/07 08:31:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -104,7 +104,6 @@
 				   $xoopsConfig, $xoopsOption, $xoopsCachedTemplate, $xoopsLogger, $xoopsDebugger;
 
 			require_once $filename;
-			$checks[$filename] = true;
 			return true;
 		}
 

From minahito ＠ users.sourceforge.jp  Tue Feb  7 19:00:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Feb 2006 19:00:29 +0900
Subject: [xoops-cvslog 2325] CVS update: xoops2jp/html/class/database
Message-ID: <20060207100029.8AB252AC016@users.sourceforge.jp>

Index: xoops2jp/html/class/database/sqlutility.php
diff -u xoops2jp/html/class/database/sqlutility.php:1.2.8.3 xoops2jp/html/class/database/sqlutility.php:1.2.8.4
--- xoops2jp/html/class/database/sqlutility.php:1.2.8.3	Wed Jan 25 19:55:38 2006
+++ xoops2jp/html/class/database/sqlutility.php	Tue Feb  7 19:00:29 2006
@@ -33,9 +33,9 @@
 	// If sql file is created in Mac OS, file() can not detect the line end.
 	//    
     ini_set("auto_detect_line_endings" ,true);
-    
     $sql_query = file(XOOPS_MODULE_PATH.'/'.$dirname.'/'.$file);
-    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)/siU";
+
+    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+/siU";
     foreach ( $sql_query as $fline ) {
       $fline=trim($fline);
       if ( preg_match($pattern,$fline) ) {

From minahito ＠ users.sourceforge.jp  Tue Feb  7 19:03:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Feb 2006 19:03:08 +0900
Subject: [xoops-cvslog 2326] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060207100308.3F14D2AC0A5@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.4 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.4	Sat Feb  4 01:01:38 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Tue Feb  7 19:03:08 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.4 2006/02/03 16:01:38 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.5 2006/02/07 10:03:08 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
@@ -71,10 +71,9 @@
 
 	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
 	{
-		$renderer->setTemplateName("module_installer_licence.html");
+		$renderer->setTemplateName("module_install.html");
 		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('licence', $this->mLicence);
-		$renderer->setAttribute('licenceText', $this->mLicenceText);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
 	}
 }
 

From tom_g3x ＠ users.sourceforge.jp  Tue Feb  7 22:44:36 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue,  7 Feb 2006 22:44:36 +0900
Subject: [xoops-cvslog 2327] CVS update: xoops2jp/html/modules/user/images
Message-ID: <20060207134436.BF5E22AC046@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/images/no_avatar.gif

From tom_g3x ＠ users.sourceforge.jp  Tue Feb  7 22:45:28 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue,  7 Feb 2006 22:45:28 +0900
Subject: [xoops-cvslog 2328] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060207134528.B6A372AC046@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.6 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.7
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.6	Tue Feb  7 15:20:05 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Tue Feb  7 22:45:28 2006
@@ -32,7 +32,7 @@
           <{if $thisUser->getVar('user_avatar') != "blank.gif" }>
             <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" />
           <{else}>
-            <img src="<{$smarty.const.XOOPS_URL}>/modules/user/no_avatar.gif" alt="No Avatar" />
+            <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="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>

From nobunobu ＠ users.sourceforge.jp  Wed Feb  8 00:58:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  8 Feb 2006 00:58:07 +0900
Subject: [xoops-cvslog 2329] CVS update: xoops2jp/html/modules/newbb/templates
Message-ID: <20060207155807.AF4D62AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/newbb/templates/newbb_viewforum.html
diff -u xoops2jp/html/modules/newbb/templates/newbb_viewforum.html:1.2 xoops2jp/html/modules/newbb/templates/newbb_viewforum.html:1.2.6.1
--- xoops2jp/html/modules/newbb/templates/newbb_viewforum.html:1.2	Sat Jun 11 11:32:47 2005
+++ xoops2jp/html/modules/newbb/templates/newbb_viewforum.html	Wed Feb  8 00:58:07 2006
@@ -29,7 +29,7 @@
   </tr>
   <!-- start forum topic -->
   <{foreach item=topic from=$topics}>
-  <tr class="<{cycle values="even,odd}>">
+  <tr class="<{cycle values="even,odd"}>">
     <td align="center"><img src="<{$topic.topic_folder}>" alt="/" /></td>
     <td align="center"><{$topic.topic_icon}></td>
     <td>&nbsp;<a href="<{$topic.topic_link}>"><{$topic.topic_title}></a><{$topic.topic_page_jump}></td>

From nobunobu ＠ users.sourceforge.jp  Wed Feb  8 00:58:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  8 Feb 2006 00:58:07 +0900
Subject: [xoops-cvslog 2330] CVS update: xoops2jp/html/modules/news/templates
Message-ID: <20060207155807.D80B92AC066@users.sourceforge.jp>

Index: xoops2jp/html/modules/news/templates/news_archive.html
diff -u xoops2jp/html/modules/news/templates/news_archive.html:1.1 xoops2jp/html/modules/news/templates/news_archive.html:1.1.16.1
--- xoops2jp/html/modules/news/templates/news_archive.html:1.1	Thu Sep  9 19:03:23 2004
+++ xoops2jp/html/modules/news/templates/news_archive.html	Wed Feb  8 00:58:07 2006
@@ -24,7 +24,7 @@
 
   <{foreach item=story from=$stories}>
 
-  <tr class="<{cycle values="even, odd"}>">
+  <tr class="<{cycle values="even,odd"}>">
     <td><{$story.title}></td><td align="center"><a href="<{$story.print_link}>"><img src="images/print.gif" alt="<{$lang_printer}>" /></a> <a href="<{$story.mail_link}>" target="_top" /><img src="images/friend.gif" alt="<{$lang_sendstory}>" /></td><td align="center"><{$story.counter}></td><td align="center"><{$story.date}></td>
   </tr>
 

From nobunobu ＠ users.sourceforge.jp  Wed Feb  8 00:58:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  8 Feb 2006 00:58:08 +0900
Subject: [xoops-cvslog 2331] CVS update: xoops2jp/html/modules/system/templates
Message-ID: <20060207155808.119342AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/templates/system_notification_list.html
diff -u xoops2jp/html/modules/system/templates/system_notification_list.html:1.2 xoops2jp/html/modules/system/templates/system_notification_list.html:1.2.4.1
--- xoops2jp/html/modules/system/templates/system_notification_list.html:1.2	Mon Sep  5 05:46:12 2005
+++ xoops2jp/html/modules/system/templates/system_notification_list.html	Wed Feb  8 00:58:07 2006
@@ -17,7 +17,7 @@
   <{foreach item=item from=$category.items}>
   <{foreach item=notification from=$item.notifications}>
   <tr>
-    <{cycle values=odd,even assign=class}>
+    <{cycle values="odd,even" assign="class"}>
     <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>][]" value="<{$notification.id}>" /></td>
     <td class="<{$class}>"><{$notification.event_title}></td>
     <td class="<{$class}>"><{$notification.category_title}></td>

From minahito ＠ users.sourceforge.jp  Thu Feb  9 18:09:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Feb 2006 18:09:32 +0900
Subject: [xoops-cvslog 2332] CVS update: xoops2jp/html/kernel
Message-ID: <20060209090932.3DC912AC037@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.4 xoops2jp/html/kernel/block.php:1.2.8.5
--- xoops2jp/html/kernel/block.php:1.2.8.4	Fri Dec 30 17:21:52 2005
+++ xoops2jp/html/kernel/block.php	Thu Feb  9 18:09:32 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.4 2005/12/30 08:21:52 minahito Exp $
+// $Id: block.php,v 1.2.8.5 2006/02/09 09:09:32 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -273,7 +273,7 @@
         }
 
 		$isNew = false;
-
+		
         if ($block->isNew()) {
 			$isNew = true;
             $bid = $this->db->genId('newblocks_bid_seq');
@@ -294,7 +294,7 @@
 		//
 		if ($isNew && $autolink) {
 			$link_sql = "INSERT INTO " . $this->db->prefix('block_module_link') . " (block_id, module_id) VALUES (${bid}, -1)";
-			return $this->db->query($sql);
+			return $this->db->query($link_sql);
 		}
 
         return true;
@@ -363,7 +363,7 @@
 		$sql = "SELECT * FROM " . $this->db->prefix('newblocks');
 		if ($criteria)
 			$sql .= " " . $criteria->renderWhere();
-
+		
 		$result = $this->db->query($sql);
 		if (!$result) {
 			return $ret;
@@ -372,6 +372,9 @@
 		while ($row = $this->db->fetchArray($result)) {
 			$block = new XoopsBlock();
 			$block->assignVars($row);
+			
+			$ret[] =& $block;
+			
 			unset($block);
 		}
 		

From minahito ＠ users.sourceforge.jp  Thu Feb  9 18:10:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Feb 2006 18:10:52 +0900
Subject: [xoops-cvslog 2333] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060209091052.8A31D2AC0A7@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.6	Fri Dec 30 17:23:24 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php	Thu Feb  9 18:10:52 2006
@@ -92,12 +92,12 @@
 		$blockHandler =& xoops_gethandler('block');
 		$criteria = new Criteria('mid', $this->mModule->getVar('mid'));
 
-		$blocks =& $blockHandler->getObjects($criteria);
-
+		$blocks =& $blockHandler->getObjectsDirectly($criteria);
+		
 		$gpermHandler =& xoops_gethandler('groupperm');
 		foreach ($blocks as $block) {
 			$blockHandler->delete($block);
-			$this->mLog->addReport("Uninstall block '".$block->getName('block'));
+			$this->mLog->addReport("Uninstall block '".$block->getVar('name'));
 
 			//
 			// delete permission

From nobunobu ＠ users.sourceforge.jp  Fri Feb 17 22:47:06 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 17 Feb 2006 22:47:06 +0900
Subject: [xoops-cvslog 2334] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20060217134706.20B792AC09B@users.sourceforge.jp>

Index: xoops2jp/html/themes/cube_default/theme.html
diff -u xoops2jp/html/themes/cube_default/theme.html:1.1.2.2 xoops2jp/html/themes/cube_default/theme.html:1.1.2.3
--- xoops2jp/html/themes/cube_default/theme.html:1.1.2.2	Sat Feb  4 18:59:46 2006
+++ xoops2jp/html/themes/cube_default/theme.html	Fri Feb 17 22:47:05 2006
@@ -51,7 +51,7 @@
 <{if $xoops_showcblock == 1}>
 <table cellspacing="0">
 <tr>
-<td id="centerCcolumn" colspan="2">
+<td class="centerCcolumn" colspan="2">
 <{foreach item=block from=$xoops_ccblocks}>
 <div class="centeroutline">
 <div class="centerCblockTitle"><{$block.title}></div>

From nobunobu ＠ users.sourceforge.jp  Sat Feb 18 23:51:46 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Feb 2006 23:51:46 +0900
Subject: [xoops-cvslog 2335] CVS update: xoops2jp/html/class
Message-ID: <20060218145146.38CB72AC098@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.4 xoops2jp/html/class/module.textsanitizer.php:1.2.8.5
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.4	Fri Jan 27 23:38:08 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Sat Feb 18 23:51:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.4 2006/01/27 14:38:08 nobunobu Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.5 2006/02/18 14:51:46 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -295,7 +295,8 @@
      */
     function &nl2Br($text)
     {
-        return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        $ret = preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        return $ret;
     }
 
     /**

From nobunobu ＠ users.sourceforge.jp  Sat Feb 18 23:51:46 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Feb 2006 23:51:46 +0900
Subject: [xoops-cvslog 2336] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20060218145146.5CF102AC0B4@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.1 xoops2jp/html/class/xoopsform/form.php:1.2.8.2
--- xoops2jp/html/class/xoopsform/form.php:1.2.8.1	Wed Oct 19 02:18:33 2005
+++ xoops2jp/html/class/xoopsform/form.php	Sat Feb 18 23:51:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.php,v 1.2.8.1 2005/10/18 17:18:33 minahito Exp $
+// $Id: form.php,v 1.2.8.2 2006/02/18 14:51:46 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -319,8 +319,11 @@
      */
     function &getExtra(){
         if (isset($this->_extra)) {
-            return $this->_extra;
+            $ret =& $this->_extra;
+        } else {
+	    	$ret = '';
         }
+        return $ret;
     }
 
     /**

From minahito ＠ users.sourceforge.jp  Mon Feb 20 17:45:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Feb 2006 17:45:23 +0900
Subject: [xoops-cvslog 2337] CVS update: xoops2jp/html/include
Message-ID: <20060220084523.DF0DF2AC011@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.1 xoops2jp/html/include/comment_view.php:1.2.8.2
--- xoops2jp/html/include/comment_view.php:1.2.8.1	Wed Jan 25 16:10:46 2006
+++ xoops2jp/html/include/comment_view.php	Mon Feb 20 17:45:23 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.1 2006/01/25 07:10:46 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.2 2006/02/20 08:45:23 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -29,11 +29,15 @@
 // Project: The XOOPS Project (http://www.xoops.org/)                        //
 // ------------------------------------------------------------------------- //
 
+//
+// Kick direct access
+//
 if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
 	exit();
 }
-include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
-include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
+
+require_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+require_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 
 if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
 
@@ -41,7 +45,7 @@
 	$groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
 	$xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_COMMENT, $groups) );
 
- 	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+ 	require_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
 	$comment_config = $xoopsModule->getInfo('comments');
 	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
 
@@ -112,7 +116,7 @@
 				// Show specific thread tree
 				$comments =& $comment_handler->getThread($com_rootid, $com_id);
 				if (false != $comments) {
-					include_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
+					require_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
 					$renderer =& XoopsCommentRenderer::instance($xoopsTpl);
 					$renderer->setComments($comments);
 					$renderer->renderThreadView($com_id, $admin_view);
@@ -125,7 +129,7 @@
 					for ($i = 0; $i < $c_count; $i++) {
 						$comments =& $comment_handler->getThread($top_comments[$i]->getVar('com_rootid'), $top_comments[$i]->getVar('com_id'));
 						if (false != $comments) {
-							include_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
+							require_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
 							$renderer =& XoopsCommentRenderer::instance($xoopsTpl);
 							$renderer->setComments($comments);
 							$renderer->renderThreadView($top_comments[$i]->getVar('com_id'), $admin_view);
@@ -165,8 +169,9 @@
 		$renderTarget->setAttribute('com_itemid', $com_itemid);
 		$renderTarget->setAttribute('com_anonpost', $xoopsModuleConfig['com_anonpost']);
 		
+		$postcomment_link = "";
 		if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
-			$postcomment_link = 'comment_new.php?com_itemid=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode;
+			$postcomment_link = 'comment_new.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode;
 		}
 		
 		$link_extra = '';
@@ -193,6 +198,7 @@
 
 		$renderTarget->setAttribute("extraParams", $fetchParams);
 		$renderTarget->setAttribute("link_extra", $link_extra);
+		$renderTarget->setAttribute("postcomment_link", $postcomment_link);
 		
 		$renderer =& $root->getRenderSystem('Legacy_RenderSystem');
 		$renderer->renderWithTarget($renderTarget);

From minahito ＠ users.sourceforge.jp  Mon Feb 20 18:17:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Feb 2006 18:17:34 +0900
Subject: [xoops-cvslog 2338] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060220091734.188862AC013@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.2 xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.2	Thu Feb  2 17:40:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment_edit.html	Mon Feb 20 18:17:33 2006
@@ -37,39 +37,39 @@
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_COM_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_title value=$actionform->get('com_title') size=15 maxlength=255}>
+        <{xoops_input type=text name=com_title value=$actionForm->get('com_title') size=15 maxlength=255}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_COM_TEXT}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=com_text value=$actionform->get('com_text')}>
+        <{xoops_dhtmltarea type=text name=com_text value=$actionForm->get('com_text')}>
       </td>
     </tr>
     <{if $xoops_isadmin}>
       <tr>
         <th><{$smarty.const._MD_BASE_LANG_DOHTML}></th>
         <td class="<{cycle values="odd,even"}>">
-          <{xoops_input type=checkbox name=dohtml value=1 default=$actionform->get('dohtml')}>
+          <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->get('dohtml')}>
         </td>
       </tr>
     <{/if}>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOSMILEY}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionform->get('dosmiley')}>
+        <{xoops_input type=checkbox name=dosmiley value=1 default=$actionForm->get('dosmiley')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOXCODE}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=doxcode value=1 default=$actionform->get('doxcode')}>
+        <{xoops_input type=checkbox name=doxcode value=1 default=$actionForm->get('doxcode')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._MD_BASE_LANG_DOBR}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dobr value=1 default=$actionform->get('dobr')}>
+        <{xoops_input type=checkbox name=dobr value=1 default=$actionForm->get('dobr')}>
       </td>
     </tr>
     <tr class="foot">

From minahito ＠ users.sourceforge.jp  Mon Feb 20 18:33:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Feb 2006 18:33:58 +0900
Subject: [xoops-cvslog 2339] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060220093358.4E5262AC06D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.3	Thu Feb  2 21:27:19 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php	Mon Feb 20 18:33:58 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.3 2006/02/02 12:27:19 minahito Exp $
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.4 2006/02/20 09:33:58 minahito Exp $
  */
 
 require_once XOOPS_BASE_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
@@ -36,6 +36,11 @@
 		$renderer->setAttribute('actionForm',$this->mActionForm);
 		$renderer->setAttribute('module',$this->mModuleObject);
 	}
+
+	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
+	{
+		$this->executeViewIndex(&$controller,&$xoopsUser,&$renderer);
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Feb 20 19:52:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Feb 2006 19:52:44 +0900
Subject: [xoops-cvslog 2340] CVS update: xoops2jp/html/include
Message-ID: <20060220105244.C9DD02AC05F@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_post.php
diff -u xoops2jp/html/include/comment_post.php:1.2.8.1 xoops2jp/html/include/comment_post.php:1.2.8.2
--- xoops2jp/html/include/comment_post.php:1.2.8.1	Wed Oct 19 02:19:03 2005
+++ xoops2jp/html/include/comment_post.php	Mon Feb 20 19:52:44 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_post.php,v 1.2.8.1 2005/10/18 17:19:03 minahito Exp $
+// $Id: comment_post.php,v 1.2.8.2 2006/02/20 10:52:44 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -34,6 +34,9 @@
 }
 include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
 include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+
+require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
+
 $com_id = isset($_POST['com_id']) ? intval($_POST['com_id']) : 0;
 $extra_params = '';
 if ('system' == $xoopsModule->getVar('dirname')) {

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:37:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:37:49 +0900
Subject: [xoops-cvslog 2341] CVS update: xoops2jp/html/include
Message-ID: <20060221113749.3746E2AC03D@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.2 xoops2jp/html/include/comment_view.php:1.2.8.3
--- xoops2jp/html/include/comment_view.php:1.2.8.2	Mon Feb 20 17:45:23 2006
+++ xoops2jp/html/include/comment_view.php	Tue Feb 21 20:37:49 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.2 2006/02/20 08:45:23 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.3 2006/02/21 11:37:49 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -94,23 +94,24 @@
 		} elseif ($com_mode == 'thread') {
 			// RMV-FIX... added extraParam stuff here
 			$comment_url = $comment_config['pageName'] . '?';
+			
+			//
+			// Parse extra parameters from the request.
+			//
 			if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
-				$extra_params = '';
-				foreach ($comment_config['extraParams'] as $extra_param) {
+				foreach ($comment_config['extraParams'] as $extra_key) {
 				    // This page is included in the module hosting page -- param could be from anywhere
-					if (isset(${$extra_param})) {
-						$extra_params .= $extra_param .'='.${$extra_param}.'&amp;';
-					} elseif (isset($_POST[$extra_param])) {
-						$extra_params .= $extra_param .'='.$_POST[$extra_param].'&amp;';
-					} elseif (isset($_GET[$extra_param])) {
-						$extra_params .= $extra_param .'='.$_GET[$extra_param].'&amp;';
-					} else {
-						$extra_params .= $extra_param .'=&amp;';
+					if (isset($GLOBALS[$extra_key])) {
+						$comment_url .= $extra_key .'='. htmlspecialchars($GLOBALS[$extra_key], ENT_NOQUOTES).'&amp;';
+					} elseif (isset($_REQUEST[$extra_key])) {
+						$comment_url .= $extra_key .'='. htmlspecialchars($_REQUEST[$extra_key], ENT_NOQUOTES).'&amp;';
+					}
+					else {
+						$comment_url .= $extra_key .'=&amp;';
 					}
-					//$extra_params .= isset(${$extra_param}) ? $extra_param .'='.${$extra_param}.'&amp;' : $extra_param .'=&amp;';
 				}
-				$comment_url .= $extra_params;
 			}
+
 			$xoopsTpl->assign('comment_url', $comment_url.$comment_config['itemName'].'='.$com_itemid.'&amp;com_mode=thread&amp;com_order='.$com_order);
 			if (!empty($com_id) && !empty($com_rootid) && ($com_id != $com_rootid)) {
 				// Show specific thread tree
@@ -174,17 +175,22 @@
 			$postcomment_link = 'comment_new.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode;
 		}
 		
+		//
+		// Parse extra parameters from the request.
+		// TODO The following lines are *CODE CLONE*
+		// $link_extra is raw data and not sanitized.
+		// 
 		$link_extra = '';
 		$fetchParams = array();
 		if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
-			foreach ($comment_config['extraParams'] as $extra_param) {
+			foreach ($comment_config['extraParams'] as $extra_key) {
 				//
 				// We deprecate that a developer depends on the following line.
 				//
-				if (isset($GLOBALS[$extra_param])) {
-					$fetchParams[$extra_param] = $GLOBALS[$extra_param];
-			    } elseif (isset($_REQUEST[$extra_param])) {
-					$fetchParams[$extra_param] = xoops_getrequest($extra_param);
+				if (isset($GLOBALS[$extra_key])) {
+					$fetchParams[$extra_key] = $GLOBALS[$extra_key];
+			    } elseif (isset($_REQUEST[$extra_key])) {
+					$fetchParams[$extra_key] = xoops_getrequest($extra_key);
 			    }
 			}
 			

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:37:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:37:59 +0900
Subject: [xoops-cvslog 2342] CVS update: xoops2jp/html/kernel
Message-ID: <20060221113759.C53F62AC057@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Content.class.php
diff -u xoops2jp/html/kernel/XCube_Content.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_Content.class.php:removed
--- xoops2jp/html/kernel/XCube_Content.class.php:1.1.2.1	Thu Nov 24 18:28:42 2005
+++ xoops2jp/html/kernel/XCube_Content.class.php	Tue Feb 21 20:37:59 2006
@@ -1,53 +0,0 @@
-<?php
-/**
- * @version $Id: XCube_Content.class.php,v 1.1.2.1 2005/11/24 09:28:42 minahito Exp $
- * @package Cube
- */
-
-/**
- * @see XCube_ContentObjectManager
- */
-class XCube_ContentObject
-{
-	var $mId;
-
-	var $mModuleId;
-	var $mClassName;
-	var $mDataId;
-
-	function XCube_ContentObject($id,$modId,$className,$dataId)
-	{
-		$this->mId=$id;
-		$this->mModuleId=$modId;
-		$this->mClassName=$className;
-		$this->mDataId=$dataId;
-	}
-	
-	function getId()
-	{
-		return $this->mId;
-	}
-}
-
-/**
- * WARINING : THIS IS TEST CLASS.
- *
- * This class gives identity number to a content of a module in the system.
- * This mechanism is necessary to help that a module touches a content of other
- * modules. However, Should Cube kernel offer this?
- */
-class XCube_ContentObjectManager
-{
-	var $mRoot;
-	
-	function XCube_ContentObjectManager(&$root)
-	{
-		$this->mRoot=&$root;
-	}
-	
-	function fetchContent($modId,$className,$dataId)
-	{
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:39:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:39:08 +0900
Subject: [xoops-cvslog 2343] CVS update: xoops2jp/html/modules/base/.xml
Message-ID: <20060221113908.0C8F42AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/.xml/comment_edit.xml
diff -u xoops2jp/html/modules/base/.xml/comment_edit.xml:1.1.2.2 xoops2jp/html/modules/base/.xml/comment_edit.xml:1.1.2.3
--- xoops2jp/html/modules/base/.xml/comment_edit.xml:1.1.2.2	Tue Jan 24 23:22:06 2006
+++ xoops2jp/html/modules/base/.xml/comment_edit.xml	Tue Feb 21 20:39:07 2006
@@ -2,10 +2,6 @@
 <xoopscube-dynaactionform>
 	<form-bean name="CommentEditForm" type="XCube_ActionForm">
 		<form-property name="com_id" type="Int" />
-		<form-property name="com_pid" type="Int" />
-		<form-property name="com_rootid" type="Int" />
-		<form-property name="com_modid" type="Int" />
-		<form-property name="com_itemid" type="Int" />
 		<form-property name="com_icon" type="String" />
 		<form-property name="com_title" type="String" />
 		<form-property name="com_text" type="Text" />
@@ -23,22 +19,6 @@
 			<arg0 key="const._MD_BASE_LANG_COM_ID" />
 			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
 		</field>
-		<field property="com_pid" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_PID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_rootid" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_ROOTID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_modid" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_MODID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_itemid" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_ITEMID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
 		<field property="com_icon" depends="required,maxlength">
 			<arg0 key="const._MD_BASE_LANG_COM_ICON" />
 			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:39:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:39:21 +0900
Subject: [xoops-cvslog 2344] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20060221113921.93D092AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/menu.php
diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.7 xoops2jp/html/modules/base/admin/menu.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/menu.php:1.1.2.7	Sat Feb  4 15:39:02 2006
+++ xoops2jp/html/modules/base/admin/menu.php	Tue Feb 21 20:39:21 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: menu.php,v 1.1.2.7 2006/02/04 06:39:02 minahito Exp $
+ * @version $Id: menu.php,v 1.1.2.8 2006/02/21 11:39:21 minahito Exp $
  */
 
 $adminmenu[1]['title']=_MI_BASE_MENU_ACTIONSEARCH;
@@ -23,8 +23,7 @@
 $adminmenu[5]['keywords']=_MI_BASE_KEYWORD_SMILES_MANAGE;
 $adminmenu[5]['link']="admin/index.php?action=SmilesList";
 
-// $adminmenu[6]['title']=_MI_BASE_MENU_COMMENTMANAGE;
-// $adminmenu[6]['link']="admin/index.php?action=CommentList";
-
+$adminmenu[6]['title']=_MI_BASE_MENU_COMMENT_MANAGE;
+$adminmenu[6]['link']="admin/index.php?action=CommentList";
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:39:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:39:27 +0900
Subject: [xoops-cvslog 2345] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060221113927.55E5C2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.2
--- xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.1	Thu Jan 26 01:17:36 2006
+++ xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml	Tue Feb 21 20:39:27 2006
@@ -2,20 +2,11 @@
 <xoopscube-dynaactionform>
 	<form-bean name="CommentAdminEditForm" type="XCube_ActionForm">
 		<form-property name="com_id" type="Int" />
-		<form-property name="com_pid" type="Int" />
-		<form-property name="com_rootid" type="Int" />
-		<form-property name="com_modid" type="Int" />
-		<form-property name="com_itemid" type="Int" />
 		<form-property name="com_icon" type="String" />
-		<form-property name="com_created" type="Int" />
-		<form-property name="com_modified" type="Int" />
-		<form-property name="com_uid" type="Int" />
-		<form-property name="com_ip" type="String" />
 		<form-property name="com_title" type="String" />
 		<form-property name="com_text" type="Text" />
 		<form-property name="com_sig" type="Bool" />
 		<form-property name="com_status" type="Bool" />
-		<form-property name="com_exparams" type="String" />
 		<form-property name="dohtml" type="Bool" />
 		<form-property name="dosmiley" type="Bool" />
 		<form-property name="doxcode" type="Bool" />
@@ -27,22 +18,6 @@
 			<arg0 key="const._AD_BASE_LANG_COM_ID" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
 		</field>
-		<field property="com_pid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_PID" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_rootid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_ROOTID" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_modid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_MODID" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_itemid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_ITEMID" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
 		<field property="com_icon" depends="required,maxlength">
 			<arg0 key="const._AD_BASE_LANG_COM_ICON" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
@@ -50,25 +25,6 @@
 			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="25" />
 		</field>
-		<field property="com_created" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_CREATED" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_modified" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_MODIFIED" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_uid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_COM_UID" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_ip" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_COM_IP" />
-			<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="15" />
-		</field>
 		<field property="com_title" depends="required,maxlength">
 			<arg0 key="const._AD_BASE_LANG_COM_TITLE" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
@@ -80,12 +36,5 @@
 			<arg0 key="const._AD_BASE_LANG_COM_TEXT" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
 		</field>
-		<field property="com_exparams" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_COM_EXPARAMS" />
-			<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>
 	</form-validation>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:44:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:44:01 +0900
Subject: [xoops-cvslog 2346] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060221114401.0A34F2AC03D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.3
--- xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.2	Tue Feb 21 20:39:27 2006
+++ xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml	Tue Feb 21 20:44:00 2006
@@ -18,9 +18,8 @@
 			<arg0 key="const._AD_BASE_LANG_COM_ID" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
 		</field>
-		<field property="com_icon" depends="required,maxlength">
+		<field property="com_icon" depends="maxlength">
 			<arg0 key="const._AD_BASE_LANG_COM_ICON" />
-			<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="25" />

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:45:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:45:25 +0900
Subject: [xoops-cvslog 2347] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060221114525.209582AC03D@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.1 xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.1	Thu Jan 26 01:17:36 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php	Tue Feb 21 20:45:24 2006
@@ -24,9 +24,24 @@
 
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
+		//
+		// Load children and load their module and commentater.
+		//
+		$handler =& xoops_getmodulehandler('comment');
+		$criteria =& new Criteria('com_pid', $this->mObject->get('com_id'));
+		$children =& $handler->getObjects($criteria);
+
+		if (count($children) > 0) {
+			foreach (array_keys($children) as $key) {
+				$children[$key]->loadModule();
+				$children[$key]->loadUser();
+			}
+		}
+
 		$render->setTemplateName("comment_delete.html");
 		$render->setAttribute('actionForm', $this->mActionForm);
 		$render->setAttribute('object', $this->mObject);
+		$render->setAttribute('children', $children);
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:46:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:46:22 +0900
Subject: [xoops-cvslog 2348] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060221114622.6ACCE2AC025@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.1 xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.1	Thu Jan 26 01:17:36 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php	Tue Feb 21 20:46:22 2006
@@ -15,6 +15,11 @@
 		$handler =& xoops_getmodulehandler('comment');
 		return $handler;
 	}
+	
+	function isEnableCreate()
+	{
+		return false;
+	}
 
 	function _setupActionForm()
 	{

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:46:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:46:47 +0900
Subject: [xoops-cvslog 2349] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060221114647.4302A2AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.1	Thu Jan 26 01:17:36 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php	Tue Feb 21 20:46:47 2006
@@ -25,6 +25,14 @@
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
+		//
+		// Load the module and the comment user infomations.
+		//
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadModule();
+			$this->mObjects[$key]->loadUser();
+		}
+		
 		$render->setTemplateName("comment_list.html");
 		$render->setAttribute("objects", $this->mObjects);
 		$render->setAttribute("pageNavi", $this->mNavi);

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:47:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:47:37 +0900
Subject: [xoops-cvslog 2350] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060221114737.215F52AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.1	Thu Jan 26 01:17:45 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php	Tue Feb 21 20:47:36 2006
@@ -2,14 +2,11 @@
 
 require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
 
-/**
- * This class is generated by makeActionForm tool.
- */
 class Legacy_CommentAdminEditForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.base.XoopscommentsAdminEditForm.TOKEN";
+		return "module.base.CommentAdminEditForm.TOKEN" . $this->get('com_id');
 	}
 
 	function prepare()
@@ -18,136 +15,69 @@
 		// Set form properties
 		//
 		$this->mFormProperties['com_id'] =& new XCube_IntProperty('com_id');
-		$this->mFormProperties['com_pid'] =& new XCube_IntProperty('com_pid');
-		$this->mFormProperties['com_rootid'] =& new XCube_IntProperty('com_rootid');
-		$this->mFormProperties['com_modid'] =& new XCube_IntProperty('com_modid');
-		$this->mFormProperties['com_itemid'] =& new XCube_IntProperty('com_itemid');
 		$this->mFormProperties['com_icon'] =& new XCube_StringProperty('com_icon');
-		$this->mFormProperties['com_created'] =& new XCube_IntProperty('com_created');
-		$this->mFormProperties['com_modified'] =& new XCube_IntProperty('com_modified');
-		$this->mFormProperties['com_uid'] =& new XCube_IntProperty('com_uid');
-		$this->mFormProperties['com_ip'] =& new XCube_StringProperty('com_ip');
 		$this->mFormProperties['com_title'] =& new XCube_StringProperty('com_title');
 		$this->mFormProperties['com_text'] =& new XCube_TextProperty('com_text');
 		$this->mFormProperties['com_sig'] =& new XCube_BoolProperty('com_sig');
 		$this->mFormProperties['com_status'] =& new XCube_BoolProperty('com_status');
-		$this->mFormProperties['com_exparams'] =& new XCube_StringProperty('com_exparams');
 		$this->mFormProperties['dohtml'] =& new XCube_BoolProperty('dohtml');
 		$this->mFormProperties['dosmiley'] =& new XCube_BoolProperty('dosmiley');
 		$this->mFormProperties['doxcode'] =& new XCube_BoolProperty('doxcode');
 		$this->mFormProperties['doimage'] =& new XCube_BoolProperty('doimage');
 		$this->mFormProperties['dobr'] =& new XCube_BoolProperty('dobr');
-
+	
 		//
 		// Set field properties
 		//
+	
 		$this->mFieldProperties['com_id'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['com_id']->setDependsByArray(array('required'));
 		$this->mFieldProperties['com_id']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_ID);
-
-		$this->mFieldProperties['com_pid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_pid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_pid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_PID);
-
-		$this->mFieldProperties['com_rootid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_rootid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_rootid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_ROOTID);
-
-		$this->mFieldProperties['com_modid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_modid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_modid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_MODID);
-
-		$this->mFieldProperties['com_itemid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_itemid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_itemid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_ITEMID);
-
+	
 		$this->mFieldProperties['com_icon'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_icon']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_icon']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_ICON, '25');
+		$this->mFieldProperties['com_icon']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['com_icon']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_COM_ICON, '25');
-		$this->mFieldProperties['com_icon']->addVar('maxlength', 25);
-
-		$this->mFieldProperties['com_created'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_created']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_created']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_CREATED);
-
-		$this->mFieldProperties['com_modified'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_modified']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_modified']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_MODIFIED);
-
-		$this->mFieldProperties['com_uid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_uid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_uid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_UID);
-
-		$this->mFieldProperties['com_ip'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_ip']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_ip']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_IP, '15');
-		$this->mFieldProperties['com_ip']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_COM_IP, '15');
-		$this->mFieldProperties['com_ip']->addVar('maxlength', 15);
-
+		$this->mFieldProperties['com_icon']->addVar('maxlength', '25');
+	
 		$this->mFieldProperties['com_title'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['com_title']->setDependsByArray(array('required','maxlength'));
 		$this->mFieldProperties['com_title']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_TITLE, '255');
 		$this->mFieldProperties['com_title']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_COM_TITLE, '255');
-		$this->mFieldProperties['com_title']->addVar('maxlength', 255);
-
+		$this->mFieldProperties['com_title']->addVar('maxlength', '255');
+	
 		$this->mFieldProperties['com_text'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['com_text']->setDependsByArray(array('required'));
 		$this->mFieldProperties['com_text']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_TEXT);
-
-		$this->mFieldProperties['com_exparams'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_exparams']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_exparams']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_COM_EXPARAMS, '255');
-		$this->mFieldProperties['com_exparams']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_COM_EXPARAMS, '255');
-		$this->mFieldProperties['com_exparams']->addVar('maxlength', 255);
 	}
 
 	function load(&$obj)
 	{
-		$this->setVar('com_id', $obj->get('com_id'));
-		$this->setVar('com_pid', $obj->get('com_pid'));
-		$this->setVar('com_rootid', $obj->get('com_rootid'));
-		$this->setVar('com_modid', $obj->get('com_modid'));
-		$this->setVar('com_itemid', $obj->get('com_itemid'));
-		$this->setVar('com_icon', $obj->get('com_icon'));
-		$this->setVar('com_created', $obj->get('com_created'));
-		$this->setVar('com_modified', $obj->get('com_modified'));
-		$this->setVar('com_uid', $obj->get('com_uid'));
-		$this->setVar('com_ip', $obj->get('com_ip'));
-		$this->setVar('com_title', $obj->get('com_title'));
-		$this->setVar('com_text', $obj->get('com_text'));
-		$this->setVar('com_sig', $obj->get('com_sig'));
-		$this->setVar('com_status', $obj->get('com_status'));
-		$this->setVar('com_exparams', $obj->get('com_exparams'));
-		$this->setVar('dohtml', $obj->get('dohtml'));
-		$this->setVar('dosmiley', $obj->get('dosmiley'));
-		$this->setVar('doxcode', $obj->get('doxcode'));
-		$this->setVar('doimage', $obj->get('doimage'));
-		$this->setVar('dobr', $obj->get('dobr'));
+		$this->set('com_id', $obj->get('com_id'));
+		$this->set('com_icon', $obj->get('com_icon'));
+		$this->set('com_title', $obj->get('com_title'));
+		$this->set('com_text', $obj->get('com_text'));
+		$this->set('com_sig', $obj->get('com_sig'));
+		$this->set('com_status', $obj->get('com_status'));
+		$this->set('dohtml', $obj->get('dohtml'));
+		$this->set('dosmiley', $obj->get('dosmiley'));
+		$this->set('doxcode', $obj->get('doxcode'));
+		$this->set('doimage', $obj->get('doimage'));
+		$this->set('dobr', $obj->get('dobr'));
 	}
 
 	function update(&$obj)
 	{
-		$obj->setVar('com_id', $this->get('com_id'));
-		$obj->setVar('com_pid', $this->get('com_pid'));
-		$obj->setVar('com_rootid', $this->get('com_rootid'));
-		$obj->setVar('com_modid', $this->get('com_modid'));
-		$obj->setVar('com_itemid', $this->get('com_itemid'));
-		$obj->setVar('com_icon', $this->get('com_icon'));
-		$obj->setVar('com_created', $this->get('com_created'));
-		$obj->setVar('com_modified', $this->get('com_modified'));
-		$obj->setVar('com_uid', $this->get('com_uid'));
-		$obj->setVar('com_ip', $this->get('com_ip'));
-		$obj->setVar('com_title', $this->get('com_title'));
-		$obj->setVar('com_text', $this->get('com_text'));
-		$obj->setVar('com_sig', $this->get('com_sig'));
-		$obj->setVar('com_status', $this->get('com_status'));
-		$obj->setVar('com_exparams', $this->get('com_exparams'));
-		$obj->setVar('dohtml', $this->get('dohtml'));
-		$obj->setVar('dosmiley', $this->get('dosmiley'));
-		$obj->setVar('doxcode', $this->get('doxcode'));
-		$obj->setVar('doimage', $this->get('doimage'));
-		$obj->setVar('dobr', $this->get('dobr'));
+		$obj->set('com_id', $this->get('com_id'));
+		$obj->set('com_icon', $this->get('com_icon'));
+		$obj->set('com_title', $this->get('com_title'));
+		$obj->set('com_text', $this->get('com_text'));
+		$obj->set('com_sig', $this->get('com_sig'));
+		$obj->set('com_status', $this->get('com_status'));
+		$obj->set('dohtml', $this->get('dohtml'));
+		$obj->set('dosmiley', $this->get('dosmiley'));
+		$obj->set('doxcode', $this->get('doxcode'));
+		$obj->set('doimage', $this->get('doimage'));
+		$obj->set('dobr', $this->get('dobr'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:48:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:48:35 +0900
Subject: [xoops-cvslog 2351] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060221114835.225EB2AC01E@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.1 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.1	Thu Jan 26 01:17:45 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php	Tue Feb 21 20:48:35 2006
@@ -61,10 +61,6 @@
 			$this->mSort = COMMENT_SORT_KEY_DEFAULT;
 		}
 	
-		if (isset($_REQUEST['com_id'])) {
-			$this->_mCriteria->add(new Criteria('com_id', array(XOBJ_DTYPE_INT, xoops_getrequest('com_id'))));
-		}
-	
 		if (isset($_REQUEST['com_pid'])) {
 			$this->_mCriteria->add(new Criteria('com_pid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_pid'))));
 		}
@@ -76,6 +72,13 @@
 		if (isset($_REQUEST['com_modid'])) {
 			$this->_mCriteria->add(new Criteria('com_modid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_modid'))));
 		}
+		elseif (isset($_REQUEST['dirname'])) {
+			$handler =& xoops_gethandler('module');
+			$module =& $handler->getByDirname(xoops_getrequest('dirname'));
+			if (is_object($module)) {
+				$this->_mCriteria->add(new Criteria('com_modid', array(XOBJ_DTYPE_INT, $module->get('mid'))));
+			}
+		}
 	
 		if (isset($_REQUEST['com_itemid'])) {
 			$this->_mCriteria->add(new Criteria('com_itemid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_itemid'))));
@@ -85,14 +88,6 @@
 			$this->_mCriteria->add(new Criteria('com_icon', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_icon'))));
 		}
 	
-		if (isset($_REQUEST['com_created'])) {
-			$this->_mCriteria->add(new Criteria('com_created', array(XOBJ_DTYPE_INT, xoops_getrequest('com_created'))));
-		}
-	
-		if (isset($_REQUEST['com_modified'])) {
-			$this->_mCriteria->add(new Criteria('com_modified', array(XOBJ_DTYPE_INT, xoops_getrequest('com_modified'))));
-		}
-	
 		if (isset($_REQUEST['com_uid'])) {
 			$this->_mCriteria->add(new Criteria('com_uid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_uid'))));
 		}
@@ -102,40 +97,12 @@
 		}
 	
 		if (isset($_REQUEST['com_title'])) {
-			$this->_mCriteria->add(new Criteria('com_title', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_title'))));
-		}
-	
-		if (isset($_REQUEST['com_sig'])) {
-			$this->_mCriteria->add(new Criteria('com_sig', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_sig'))));
+			$this->_mCriteria->add(new Criteria('com_title', array(XOBJ_DTYPE_STRING, "%" . xoops_getrequest('com_title') . "%", 'LIKE')));
 		}
 	
 		if (isset($_REQUEST['com_status'])) {
 			$this->_mCriteria->add(new Criteria('com_status', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_status'))));
 		}
-	
-		if (isset($_REQUEST['com_exparams'])) {
-			$this->_mCriteria->add(new Criteria('com_exparams', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_exparams'))));
-		}
-	
-		if (isset($_REQUEST['dohtml'])) {
-			$this->_mCriteria->add(new Criteria('dohtml', array(XOBJ_DTYPE_BOOL, xoops_getrequest('dohtml'))));
-		}
-	
-		if (isset($_REQUEST['dosmiley'])) {
-			$this->_mCriteria->add(new Criteria('dosmiley', array(XOBJ_DTYPE_BOOL, xoops_getrequest('dosmiley'))));
-		}
-	
-		if (isset($_REQUEST['doxcode'])) {
-			$this->_mCriteria->add(new Criteria('doxcode', array(XOBJ_DTYPE_BOOL, xoops_getrequest('doxcode'))));
-		}
-	
-		if (isset($_REQUEST['doimage'])) {
-			$this->_mCriteria->add(new Criteria('doimage', array(XOBJ_DTYPE_BOOL, xoops_getrequest('doimage'))));
-		}
-	
-		if (isset($_REQUEST['dobr'])) {
-			$this->_mCriteria->add(new Criteria('dobr', array(XOBJ_DTYPE_BOOL, xoops_getrequest('dobr'))));
-		}
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:50:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:50:09 +0900
Subject: [xoops-cvslog 2352] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060221115009.4BE272AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.3	Thu Feb  2 22:50:45 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_delete.html	Tue Feb 21 20:50:09 2006
@@ -102,3 +102,37 @@
     </tr>
   </table>
 </form>
+
+<h3><{$smarty.const._AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER}></h3>
+
+<table class="outer">
+  <tr>
+    <th><{$smarty.const._AD_BASE_LANG_COM_ID}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_MODID}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_TITLE}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_CREATED}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_UID}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_IP}><br />
+    <th><{$smarty.const._AD_BASE_LANG_COM_STATUS}><br />
+  </tr>
+  <{foreach item=obj from=$children}>
+    <tr class="<{cycle values='odd,even'}>" style="text-align:center">
+      <td><{$obj->getVar('com_id')}></td>
+      <td><{$obj->mModule->getVar('name')}></td>
+      <td><{$obj->getVar('com_title')}></td>
+      <td><{$obj->getVar('com_created')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getVar('com_modified')|xoops_formattimestamp:l}></td>
+      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getVar('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
+      <td><{$obj->getVar('com_ip')}></td>
+      <td>
+        <{if $obj->getVar('com_status') == 1 }>
+          <img src="<{"icons/active.gif"|theme}>" />
+        <{/if}>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+
+
+

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:50:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:50:18 +0900
Subject: [xoops-cvslog 2353] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060221115018.23F772AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.5	Fri Feb  3 01:08:30 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_edit.html	Tue Feb 21 20:50:18 2006
@@ -1,6 +1,6 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENTMANAGE}></a>
+  &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENT_MANAGE}></a>
   <{if $actionForm->get('com_id')}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
   <{else}>
@@ -29,69 +29,12 @@
   <{xoops_input type=hidden name=com_id value=$actionForm->get('com_id')}>
   <table class="outer">
     <tr>
-      <th colspan="2">
-        <{if $actionForm->get('com_id')}>
-          <{$smarty.const._AD_BASE_LANG_COMMENT_EDIT}>
-        <{else}>
-          <{$smarty.const._AD_BASE_LANG_COMMENT_NEW}>
-        <{/if}>
-      </th>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_PID}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_pid value=$actionForm->get('com_pid')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ROOTID}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_rootid value=$actionForm->get('com_rootid')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODID}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modid value=$actionForm->get('com_modid')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ITEMID}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_itemid value=$actionForm->get('com_itemid')}>
-      </td>
-    </tr>
-    <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ICON}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=com_icon value=$actionForm->get('com_icon') size=15 maxlength=25}>
       </td>
     </tr>
     <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_CREATED}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_created value=$actionForm->get('com_created')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_modified value=$actionForm->get('com_modified')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_UID}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_uid value=$actionForm->get('com_uid')}>
-      </td>
-    </tr>
-    <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_IP}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_ip value=$actionForm->get('com_ip') size=15 maxlength=15}>
-      </td>
-    </tr>
-    <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=com_title value=$actionForm->get('com_title') size=60 maxlength=255}>
@@ -117,12 +60,6 @@
       </td>
     </tr>
     <tr>
-      <td class="head"><{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}></td>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=com_exparams value=$actionForm->get('com_exparams') size=15 maxlength=255}>
-      </td>
-    </tr>
-    <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_CONTROL}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->get('dohtml')}>

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:50:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:50:28 +0900
Subject: [xoops-cvslog 2354] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060221115028.B285B2AC01E@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.3 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.3	Fri Feb  3 01:08:30 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html	Tue Feb 21 20:50:28 2006
@@ -1,48 +1,46 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENTMANAGE}></a>
+  &raquo;&raquo; <a href="./index.php?action=CommentList"><{$smarty.const._MI_BASE_MENU_COMMENT_MANAGE}></a>
 </div>
 
-<h3><{$smarty.const._MI_BASE_MENU_COMMENTMANAGE}></h3>
-
-<div class="toptab">[ <a href="index.php?action=CommentEdit"><{$smarty.const._AD_BASE_LANG_CREATE_NEW}></a> ]</div>
+<h3><{$smarty.const._MI_BASE_MENU_COMMENT_MANAGE}></h3>
 
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_COM_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_MODID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_MODID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_CREATED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_UID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_IP}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_IP}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_COM_STATUS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.XOOPSCOMMENTS_SORT_KEY_COM_STATUS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.XOOPSCOMMENTS_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}>" /></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>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center">
       <td><{$obj->getVar('com_id')}></td>
-      <td><{$obj->getVar('com_modid')}></td>
+      <td><{$obj->mModule->getVar('name')}></td>
       <td><{$obj->getVar('com_title')}></td>
       <td><{$obj->getVar('com_created')|xoops_formattimestamp:l}></td>
       <td><{$obj->getVar('com_modified')|xoops_formattimestamp:l}></td>
-      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{$obj->getVar('com_uid')}></a></td>
+      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getVar('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
       <td><{$obj->getVar('com_ip')}></td>
       <td>
         <{if $obj->getVar('com_status') == 1 }>

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:50:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:50:46 +0900
Subject: [xoops-cvslog 2355] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060221115046.A4D3A2AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_AdminRenderSystem.class.php:1.1.2.16 xoops2jp/html/modules/base/class/Legacy_AdminRenderSystem.class.php:removed
--- xoops2jp/html/modules/base/class/Legacy_AdminRenderSystem.class.php:1.1.2.16	Sun Jan 29 14:58:16 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminRenderSystem.class.php	Tue Feb 21 20:50:46 2006
@@ -1,270 +0,0 @@
-<?php
-
-//
-// TODO
-//
-require_once XOOPS_ROOT_PATH."/modules/legacyRender/kernel/Legacy_RenderSystem.class.php";
-
-define('LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME', "templates");
-
-define('LEGACY_ADMIN_RENDER_FALLBACK_PATH', XOOPS_MODULE_PATH . "/base/admin/theme");
-define('LEGACY_ADMIN_RENDER_FALLBACK_URL', XOOPS_MODULE_URL . "/base/admin/theme");
-
-require_once XOOPS_ROOT_PATH."/class/smarty/Smarty.class.php";
-
-/**
- * This class extends Smarty to mediate the collision compiled file name.
- */
-class Legacy_AdminSmarty extends Smarty
-{
-	var $mModulePrefix = null;
-
-	//
-	// If you don't hope to override for theme, set false.
-	//
-	var $overrideMode = true;
-	
-	function Legacy_AdminSmarty()
-	{
-		parent::Smarty();
-
-		$this->compile_id = null;
-		$this->_canUpdateFromFile = true;
-		$this->compile_check = true;
-		$this->compile_dir = XOOPS_COMPILE_PATH;
-		$this->left_delimiter = "<{";
-		$this->right_delimiter = "}>";
-
-		$this->register_modifier("theme", "Legacy_modifier_theme");
-		$this->register_function("stylesheet", "Legacy_function_stylesheet");
-		
-		//
-		// [TODO]
-		//  If we don't set true to the following flag, a user can not recover
-		// with deleting additional theme. But, a user should to select true or
-		// false by site_custom.ini.php.
-		//
-		$this->force_compile = false;
-	}
-	
-	function setModulePrefix($prefix)
-	{
-		$this->mModulePrefix = $prefix;
-	}
-	
-	function _get_auto_filename($autoBase, $autoSource = null, $auotId = null)
-	{
-		$autoSource = $this->mModulePrefix . "_admin_" . $autoSource;
-		return parent::_get_auto_filename($autoBase, $autoSource, $auotId);
-	}
-
-	function _fetch_resource_info(&$params)
-	{
-		$_return = false;
-
-		$root =& XCube_Root::getSingleton();
-		$theme = $root->mSiteConfig['Legacy']['Theme'];
-		$dirname = $this->mModulePrefix;
-		
-		if ($dirname != null) {
-			$params['resource_base_path'] = XOOPS_THEME_PATH . "/" . $theme . "/modules/" . $dirname;
-			$params['quiet'] = true;
-			
-			$_return = parent::_fetch_resource_info($params);
-		}
-
-		if (!$_return) {
-			unset ($params['resource_base_path']);
-			$params['quiet'] = false;
-			
-			$_return = parent::_fetch_resource_info($params);
-		}
-		
-		return $_return;
-	}
-	
-}
-
-/**
- * [TODO]
- * We depends on Legacy_RenderSystem that a add-in module defines. We must stop
- * this situation.
- */
-class Legacy_AdminRenderSystem extends Legacy_RenderSystem
-{
-	var $mController;
-	var $mSmarty;
-	
-	function prepare(&$controller)
-	{
-		$this->mController =& $controller;
-		
-		$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));
-
-	}
-	
-	function renderBlock(&$target)
-	{
-		$this->mSmarty->template_dir=XOOPS_ROOT_PATH."/modules/base/admin/templates";
-
-		foreach($target->getAttributes() as $key=>$value) {
-			$this->mSmarty->assign($key,$value);
-		}
-		
-		$this->mSmarty->setModulePrefix("base");
-		$result=&$this->mSmarty->fetch("blocks/".$target->getTemplateName());
-		$target->setResult($result);
-		
-		//
-		// Reset
-		//
-		foreach($target->getAttributes() as $key=>$value) {
-			$this->mSmarty->clear_assign($key);
-		}
-	}
-	
-	function renderTheme(&$target)
-	{
-		$this->mController->mDebugger->displayLog();
-
-		//
-		// Assign from attributes of the render-target.
-		//
-		foreach($target->getAttributes() as $key=>$value) {
-			$this->mSmarty->assign($key,$value);
-		}
-
-		$this->mSmarty->assign("currentModule",$this->mController->mModuleController->mModuleObject);
-
-		//
-		// Theme rendering
-		//
-		foreach($this->mBlockContents[0] as $result) {
-			$this->mSmarty->append('xoops_lblocks',$result);
-		}
-
-		//
-		// Check Theme or Fallback
-		//
-		$root =& XCube_Root::getSingleton();
-		$theme = $root->mSiteConfig['Legacy']['Theme'];
-		
-		if (file_exists(XOOPS_ROOT_PATH."/themes/".$theme."/admin_theme.html")) {
-			$this->mSmarty->template_dir=XOOPS_THEME_PATH."/".$theme;
-		}
-		else {
-			$this->mSmarty->template_dir=LEGACY_ADMIN_RENDER_FALLBACK_PATH;
-		}
-
-		$this->mSmarty->setModulePrefix('');
-		$result=$this->mSmarty->fetch("file:admin_theme.html");
-
-		$target->setResult($result);
-	}
-
-	function renderMain(&$target)
-	{
-		//
-		// Assign from attributes of the render-target.
-		//
-		foreach($target->getAttributes() as $key=>$value) {
-			$this->mSmarty->assign($key,$value);
-		}
-
-		$result=null;
-		
-		if($target->getTemplateName()) {
-			if ($target->getModuleName()) {
-				$this->mSmarty->setModulePrefix($target->getModuleName());
-				$this->mSmarty->template_dir = XOOPS_MODULE_PATH . "/" . $target->getModuleName() . "/admin/". LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME;
-			}
-			
-			$result=$this->mSmarty->fetch("file:".$target->getTemplateName());
-		}
-		else {
-			$result=$target->getAttribute("stdout_buffer");
-		}
-		
-		$target->setResult($result);
-	}
-}
-
-/**
- * Return URL string by "overriding" rule.
- * (Now, test implement)
- * 1) Search file in specified theme directory.
- * 2) Search file in current module template directory.
- * 3) Search file in fallback theme directory.
- */
-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;
-	}
-	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;
-	}
-}
-
-function Legacy_function_stylesheet($params, &$smarty)
-{
-	$file = $params['file'];
-
-	$root =& XCube_Root::getSingleton();
-	$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}";
-	}
-	else {
-		$url = XOOPS_MODULE_URL . "/base/admin/css.php?file=${file}";
-	}
-
-	// TEMP
-	// TODO We must return FALLBACK_URL here.
-
-	print '<link rel="stylesheet" type="text/css" media="all" href="' . $url . '" />';
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:51:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:51:01 +0900
Subject: [xoops-cvslog 2356] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060221115101.896292AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u /dev/null xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.1
--- /dev/null	Tue Feb 21 20:51:01 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php	Tue Feb 21 20:51:01 2006
@@ -0,0 +1,274 @@
+<?php
+
+//
+// TODO
+//
+require_once XOOPS_ROOT_PATH."/modules/legacyRender/kernel/Legacy_RenderSystem.class.php";
+
+define('LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME', "templates");
+
+define('LEGACY_ADMIN_RENDER_FALLBACK_PATH', XOOPS_MODULE_PATH . "/base/admin/theme");
+define('LEGACY_ADMIN_RENDER_FALLBACK_URL', XOOPS_MODULE_URL . "/base/admin/theme");
+
+require_once XOOPS_ROOT_PATH."/class/smarty/Smarty.class.php";
+
+/**
+ * This class extends Smarty to mediate the collision compiled file name.
+ */
+class Legacy_AdminSmarty extends Smarty
+{
+	var $mModulePrefix = null;
+
+	//
+	// If you don't hope to override for theme, set false.
+	//
+	var $overrideMode = true;
+	
+	function Legacy_AdminSmarty()
+	{
+		parent::Smarty();
+
+		$this->compile_id = null;
+		$this->_canUpdateFromFile = true;
+		$this->compile_check = true;
+		$this->compile_dir = XOOPS_COMPILE_PATH;
+		$this->left_delimiter = "<{";
+		$this->right_delimiter = "}>";
+
+		$this->register_modifier("theme", "Legacy_modifier_theme");
+		$this->register_function("stylesheet", "Legacy_function_stylesheet");
+		
+		//
+		// [TODO]
+		//  If we don't set true to the following flag, a user can not recover
+		// with deleting additional theme. But, a user should to select true or
+		// false by site_custom.ini.php.
+		//
+		$this->force_compile = false;
+	}
+	
+	function setModulePrefix($prefix)
+	{
+		$this->mModulePrefix = $prefix;
+	}
+	
+	function _get_auto_filename($autoBase, $autoSource = null, $auotId = null)
+	{
+		$autoSource = $this->mModulePrefix . "_admin_" . $autoSource;
+		return parent::_get_auto_filename($autoBase, $autoSource, $auotId);
+	}
+
+	function _fetch_resource_info(&$params)
+	{
+		$_return = false;
+
+		$root =& XCube_Root::getSingleton();
+		$theme = $root->mSiteConfig['Legacy']['Theme'];
+		$dirname = $this->mModulePrefix;
+		
+		if ($dirname != null) {
+			$params['resource_base_path'] = XOOPS_THEME_PATH . "/" . $theme . "/modules/" . $dirname;
+			$params['quiet'] = true;
+			
+			$_return = parent::_fetch_resource_info($params);
+		}
+
+		if (!$_return) {
+			unset ($params['resource_base_path']);
+			$params['quiet'] = false;
+			
+			$_return = parent::_fetch_resource_info($params);
+		}
+		
+		return $_return;
+	}
+	
+}
+
+/**
+ * [TODO]
+ * We depends on Legacy_RenderSystem that a add-in module defines. We must stop
+ * this situation.
+ */
+class Legacy_AdminRenderSystem extends Legacy_RenderSystem
+{
+	var $mController;
+	var $mSmarty;
+	
+	function prepare(&$controller)
+	{
+		$this->mController =& $controller;
+		
+		$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));
+
+	}
+	
+	function renderBlock(&$target)
+	{
+		$this->mSmarty->template_dir=XOOPS_ROOT_PATH."/modules/base/admin/templates";
+
+		foreach($target->getAttributes() as $key=>$value) {
+			$this->mSmarty->assign($key,$value);
+		}
+		
+		$this->mSmarty->setModulePrefix("base");
+		$result=&$this->mSmarty->fetch("blocks/".$target->getTemplateName());
+		$target->setResult($result);
+		
+		//
+		// Reset
+		//
+		foreach($target->getAttributes() as $key=>$value) {
+			$this->mSmarty->clear_assign($key);
+		}
+	}
+	
+	function renderTheme(&$target)
+	{
+		$this->mController->mDebugger->displayLog();
+
+		//
+		// Assign from attributes of the render-target.
+		//
+		foreach($target->getAttributes() as $key=>$value) {
+			$this->mSmarty->assign($key,$value);
+		}
+
+		//
+		// Get a virtual current module object from the controller and assign it.
+		//
+		$moduleObject =& $this->mController->getVirtualCurrentModule();
+		$this->mSmarty->assign("currentModule", $moduleObject);
+
+		//
+		// Theme rendering
+		//
+		foreach($this->mBlockContents[0] as $result) {
+			$this->mSmarty->append('xoops_lblocks',$result);
+		}
+
+		//
+		// Check Theme or Fallback
+		//
+		$root =& XCube_Root::getSingleton();
+		$theme = $root->mSiteConfig['Legacy']['Theme'];
+		
+		if (file_exists(XOOPS_ROOT_PATH."/themes/".$theme."/admin_theme.html")) {
+			$this->mSmarty->template_dir=XOOPS_THEME_PATH."/".$theme;
+		}
+		else {
+			$this->mSmarty->template_dir=LEGACY_ADMIN_RENDER_FALLBACK_PATH;
+		}
+
+		$this->mSmarty->setModulePrefix('');
+		$result=$this->mSmarty->fetch("file:admin_theme.html");
+
+		$target->setResult($result);
+	}
+
+	function renderMain(&$target)
+	{
+		//
+		// Assign from attributes of the render-target.
+		//
+		foreach($target->getAttributes() as $key=>$value) {
+			$this->mSmarty->assign($key,$value);
+		}
+
+		$result=null;
+		
+		if($target->getTemplateName()) {
+			if ($target->getModuleName()) {
+				$this->mSmarty->setModulePrefix($target->getModuleName());
+				$this->mSmarty->template_dir = XOOPS_MODULE_PATH . "/" . $target->getModuleName() . "/admin/". LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME;
+			}
+			
+			$result=$this->mSmarty->fetch("file:".$target->getTemplateName());
+		}
+		else {
+			$result=$target->getAttribute("stdout_buffer");
+		}
+		
+		$target->setResult($result);
+	}
+}
+
+/**
+ * Return URL string by "overriding" rule.
+ * (Now, test implement)
+ * 1) Search file in specified theme directory.
+ * 2) Search file in current module template directory.
+ * 3) Search file in fallback theme directory.
+ */
+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;
+	}
+	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;
+	}
+}
+
+function Legacy_function_stylesheet($params, &$smarty)
+{
+	$file = $params['file'];
+
+	$root =& XCube_Root::getSingleton();
+	$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}";
+	}
+	else {
+		$url = XOOPS_MODULE_URL . "/base/admin/css.php?file=${file}";
+	}
+
+	// TEMP
+	// TODO We must return FALLBACK_URL here.
+
+	print '<link rel="stylesheet" type="text/css" media="all" href="' . $url . '" />';
+}
+
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:52:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:52:21 +0900
Subject: [xoops-cvslog 2357] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060221115221.46DAE2AC01E@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.23 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.24
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.23	Mon Feb  6 00:56:36 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Tue Feb 21 20:52:21 2006
@@ -651,6 +651,18 @@
 	{
 		return $this->mDialogMode;
 	}
+	
+	/**
+	 *  Return current module object. But, it's decided by the rules of the state.
+	 *  Preferences page, Help page and some pages returns the specified module by
+	 * dirname. It's useful for controlling a theme. 
+	 * 
+	 * @return XoopsModule
+	 */
+	function &getVirtualCurrentModule()
+	{
+		return $this->_mControllerState->getVirtualCurrentModule($this);
+	}
 }
 
 /**
@@ -671,6 +683,16 @@
 	function setupBlock(&$controller)
 	{
 	}
+
+	/**
+	 * @return XoopsModule
+	 * @see Legacy_Controller::getVirtualCurrentModule()
+	 */	
+	function &getVirtualCurrentModule(&$controller)
+	{
+		$ret = null;
+		return $ret;
+	}
 }
 
 class BaseControllerPublicState extends BaseControllerState
@@ -729,6 +751,14 @@
 class BaseControllerAdminState extends BaseControllerState
 {
 	var $mStatusFlag=LEGACY_CONTROLLER_STATE_ADMIN;
+	
+	/**
+	 *  If this array includes current action, getVirtualCurrentModule() returns
+	 * the module object that specified by dirname.
+	 * 
+	 * @access private
+	 */
+	var $_mSpecialActions = array("Help", "CommentList");
 
 	function BaseControllerAdminState()
 	{
@@ -753,8 +783,7 @@
 		// Controller or Root should have factory-method so that we create a 
 		// instance by a site config.
 		//
-		require_once XOOPS_BASE_PATH."/class/Legacy_AdminRenderSystem.class.php";
-		$controller->mRenderSystem=new Legacy_AdminRenderSystem($controller);
+		$renderSystem =& $this->mRoot->getRenderSystem("Legacy_AdminRenderSystem");
 		$controller->mRenderSystem->prepare();
 	}
 	
@@ -762,37 +791,28 @@
 	{
 		require_once XOOPS_BASE_PATH."/admin/blocks/AdminActionSearch.class.php";
 		require_once XOOPS_BASE_PATH."/admin/blocks/AdminSideMenu.class.php";
-		$controller->mBlockChain[]=new Legacy_AdminActionSearch();
-		$controller->mBlockChain[]=new Legacy_AdminSideMenu();
+		$controller->mBlockChain[] =& new Legacy_AdminActionSearch();
+		$controller->mBlockChain[] =& new Legacy_AdminSideMenu();
 	}
-}
-
 
-/**
- * TEST
- */
-class XCube_AdminBlockProcedure extends XCube_BlockProcedure
-{
-	function getTitle()
+	function &getVirtualCurrentModule(&$controller)
 	{
-		return "TEST BLOCK!";
-	}
-
-	function enableCached()
-	{
-		return false;
-	}
-
-	function hasResult()
-	{
-		return true;
-	}
+		$module = null;
+		
+		if ($controller->mModuleController->isModuleProcess()) {
+			$module =& $controller->mModuleController->getXoopsModule();
+			
+			if ($module->get('dirname') == "base" && isset($_REQUEST['dirname'])) {
+				if (in_array(xoops_getrequest('action'), $this->_mSpecialActions)) {
+					$handler =& xoops_gethandler('module');
+					$module =& $handler->getByDirname(xoops_getrequest('dirname'));
+				}
+			}
+		}
 
-	function &getResult()
-	{
-		$ret['comment']="hello,world!";
-		return $ret;
+		return $module;
 	}
 }
 
+
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:53:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:53:16 +0900
Subject: [xoops-cvslog 2358] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060221115316.647C92AC025@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.9 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.10
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.9	Sat Feb  4 15:39:26 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Tue Feb 21 20:53:16 2006
@@ -1,16 +1,16 @@
-<?php
-
-define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
-define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
-define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
-define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
-define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
-define('_MI_BASE_MENU_COMMENTMANAGE', "コメントの管理");
-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_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
+define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
+define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
+define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
+define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
+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/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.17 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.18
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.17	Sat Feb  4 12:37:35 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Tue Feb 21 20:53:16 2006
@@ -45,6 +45,7 @@
 define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");
 define('_AD_BASE_LANG_SMILES_NEW', "顔アイコン新規追加");
 define('_AD_BASE_LANG_SUBMIT', "送信");
+define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。<br/>管理メニューの位置を忘れたときに使いましょう (例)利用許諾文");

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:53:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:53:16 +0900
Subject: [xoops-cvslog 2359] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060221115316.8EDBE2AC03D@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.9 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.10
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.9	Sat Feb  4 15:55:21 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Tue Feb 21 20:53:16 2006
@@ -1,18 +1,18 @@
-<?php
-
-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_SMILES_MANAGE', "smilies edit change delete list");
-define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
-define('_MI_BASE_MENU_COMMENTMANAGE', "Comment management");
-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_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_SMILES_MANAGE', "smilies edit change delete list");
+define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
+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.13 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.14
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.13	Sat Feb  4 16:50:14 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Tue Feb 21 20:53:16 2006
@@ -45,6 +45,7 @@
 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_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Confirm to delete");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search....");
@@ -58,7 +59,6 @@
 define('_MD_A_BASE_ERROR_REQUIRED', "{0} is required");
 define('_MD_A_BASE_ERROR_SEARCH_REQUIRED', "Input keyword");
 define('_MD_A_BASE_LANG_ACTIONSEARCH', "Action Search");
-define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "Search information of typed keyword from admin menu and help files.<br>Please perform search when you need to know how to use the XOOPS Cube.");
 define('_MD_A_BASE_LANG_ACTIVE', "Active");
 define('_MD_A_BASE_LANG_ADMIN_MENU', "Information of Administration Menu");
 define('_MD_A_BASE_LANG_ADMINMENU_HAS_MAIN', "Administration Menu");

From minahito ＠ users.sourceforge.jp  Tue Feb 21 20:54:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Feb 2006 20:54:02 +0900
Subject: [xoops-cvslog 2360] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060221115402.8AB752AC025@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/comment.php
diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.1 xoops2jp/html/modules/base/class/comment.php:1.1.2.2
--- xoops2jp/html/modules/base/class/comment.php:1.1.2.1	Thu Jan 26 01:18:11 2006
+++ xoops2jp/html/modules/base/class/comment.php	Tue Feb 21 20:54:02 2006
@@ -2,6 +2,9 @@
 
 class BaseCommentObject extends XoopsSimpleObject
 {
+	var $mUser = null;
+	var $mModule = null;
+	
 	function BaseCommentObject()
 	{
 		$this->initVar('com_id', XOBJ_DTYPE_INT, '', true);
@@ -25,6 +28,24 @@
 		$this->initVar('doimage', XOBJ_DTYPE_BOOL, '0', true);
 		$this->initVar('dobr', XOBJ_DTYPE_BOOL, '0', true);
 	}
+	
+	/**
+	 * Load a user object who wrote this comment to $mUser. 
+	 */
+	function loadUser()
+	{
+		$handler =& xoops_gethandler('member');
+		$this->mUser =& $handler->getUser($this->get('com_uid'));
+	}
+	
+	/**
+	 * Load a module object to $mModule. 
+	 */
+	function loadModule()
+	{
+		$handler =& xoops_gethandler('module');
+		$this->mModule =& $handler->get($this->get('com_modid'));
+	}
 }
 
 class BaseCommentHandler extends XoopsObjectGenericHandler
@@ -32,6 +53,17 @@
 	var $mTable = "xoopscomments";
 	var $mPrimary = "com_id";
 	var $mClass = "BaseCommentObject";
+	
+	/**
+	 * Delete $comment and childlen of $comment.
+	 */
+	function delete(&$comment)
+	{
+		$criteria =& new Criteria('com_pid', $comment->get('com_id'));
+		$this->deleteAll($criteria);
+		
+		return parent::delete($comment);
+	}
 }
 
 ?>

From nobunobu ＠ users.sourceforge.jp  Tue Feb 28 23:29:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 28 Feb 2006 23:29:09 +0900
Subject: [xoops-cvslog 2361] CVS update: xoops2jp/html/kernel
Message-ID: <20060228142909.363342AC010@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Root.class.php
diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.10 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.11
--- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.10	Tue Jan 24 23:21:32 2006
+++ xoops2jp/html/kernel/XCube_Root.class.php	Tue Feb 28 23:29:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: XCube_Root.class.php,v 1.1.2.10 2006/01/24 14:21:32 minahito Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.11 2006/02/28 14:29:09 nobunobu Exp $
  * @package Cube
  */
 
@@ -150,6 +150,14 @@
 			if(isset($this->mSiteConfig[func_get_arg(0)][func_get_arg(1)]))
 				return $this->mSiteConfig[func_get_arg(0)][func_get_arg(1)];
 		}
+		elseif(func_num_args()==3) {
+			if(isset($this->mSiteConfig[func_get_arg(0)][func_get_arg(1)])) {
+				return $this->mSiteConfig[func_get_arg(0)][func_get_arg(1)];
+			}
+			else {
+				return func_get_arg(2); //return 3rd param as a default value;
+			}
+		}
 
 		return null;
 	}

From nobunobu ＠ users.sourceforge.jp  Tue Feb 28 23:36:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 28 Feb 2006 23:36:04 +0900
Subject: [xoops-cvslog 2362] CVS update: xoops2jp/html/class/database
Message-ID: <20060228143604.27F4B2AC03D@users.sourceforge.jp>

Index: xoops2jp/html/class/database/mysqldatabase.php
diff -u xoops2jp/html/class/database/mysqldatabase.php:1.2.8.3 xoops2jp/html/class/database/mysqldatabase.php:1.2.8.4
--- xoops2jp/html/class/database/mysqldatabase.php:1.2.8.3	Mon Jan  2 21:39:33 2006
+++ xoops2jp/html/class/database/mysqldatabase.php	Tue Feb 28 23:36:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysqldatabase.php,v 1.2.8.3 2006/01/02 12:39:33 minahito Exp $
+// $Id: mysqldatabase.php,v 1.2.8.4 2006/02/28 14:36:04 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -245,7 +245,8 @@
 			return $result;
         } else {
 			$this->logger->addQuery($sql, $this->error(), $this->errno());
-			return false;
+            $ret = false;
+            return $ret;
         }
     }
 

From nobunobu ＠ users.sourceforge.jp  Tue Feb 28 23:36:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 28 Feb 2006 23:36:04 +0900
Subject: [xoops-cvslog 2363] CVS update: xoops2jp/html/class
Message-ID: <20060228143604.586942AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/class/token.php
diff -u xoops2jp/html/class/token.php:1.3.6.1 xoops2jp/html/class/token.php:1.3.6.2
--- xoops2jp/html/class/token.php:1.3.6.1	Wed Oct 19 02:16:18 2005
+++ xoops2jp/html/class/token.php	Tue Feb 28 23:36:04 2006
@@ -190,7 +190,7 @@
      */
     function &create($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $token = new XoopsToken($name,$timeout);
+        $token =& new XoopsToken($name,$timeout);
         $this->register($token);
         return $token;
     }
@@ -204,12 +204,11 @@
      */
     function &fetch($name)
     {
+        $ret = null;
         if(isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name])) {
-            return $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
-        }
-        else {
-            return null;
+            $ret =& $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
         }
+        return $ret;
     }
 
     /**
@@ -285,7 +284,7 @@
     */
     function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $handler = new XoopsSingleTokenHandler();
+        $handler =& new XoopsSingleTokenHandler();
         return $handler->create($name,$timeout);
     }
 
@@ -311,7 +310,7 @@
 {
     function &create($name,$timeout=XOOPS_TOKEN_TIMEOUT)
     {
-        $token = new XoopsToken($name,$timeout);
+        $token =& new XoopsToken($name,$timeout);
         $token->setSerialNumber($this->getUniqueSerial($name));
         $this->register($token);
         return $token;
@@ -319,12 +318,11 @@
 
     function &fetch($name,$serial_number)
     {
+        $ret = null;
         if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number])) {
-            return $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
-        }
-        else {
-            return null;
+            $ret =& $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
         }
+        return $ret;
     }
 
     function register(&$token)
@@ -362,7 +360,7 @@
     */
     function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
     {
-        $handler = new XoopsMultiTokenHandler();
+        $handler =& new XoopsMultiTokenHandler();
         return $handler->create($name,$timeout);
     }
 
Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.2.8.5 xoops2jp/html/class/xoopsblock.php:1.2.8.6
--- xoops2jp/html/class/xoopsblock.php:1.2.8.5	Tue Jan  3 00:04:59 2006
+++ xoops2jp/html/class/xoopsblock.php	Tue Feb 28 23:36:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsblock.php,v 1.2.8.5 2006/01/02 15:04:59 minahito Exp $
+// $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                           //
@@ -354,7 +354,7 @@
                 if (!$asobject) {
                     $ret[] = $myrow['bid'];
                 } else {
-                    $ret[] = new XoopsBlock($myrow);
+                    $ret[] =& new XoopsBlock($myrow);
                 }
                 array_push($added, $myrow['bid']);
             }
@@ -388,16 +388,17 @@
             $sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
             $result = $db->query($sql);
             while ( $myrow = $db->fetchArray($result) ) {
-                $ret[] = new XoopsBlock($myrow);
+                $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);
+                $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":
@@ -424,7 +425,7 @@
         $ret = array();
         while( $myrow = $db->fetchArray($result) ) {
             if ( $asobject ) {
-                $ret[] = new XoopsBlock($myrow);
+                $ret[] =& new XoopsBlock($myrow);
             } else {
                 $ret[] = $myrow['bid'];
             }
Index: xoops2jp/html/class/xoopslists.php
diff -u xoops2jp/html/class/xoopslists.php:1.2.8.1 xoops2jp/html/class/xoopslists.php:1.2.8.2
--- xoops2jp/html/class/xoopslists.php:1.2.8.1	Wed Oct 19 02:17:20 2005
+++ xoops2jp/html/class/xoopslists.php	Tue Feb 28 23:36:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopslists.php,v 1.2.8.1 2005/10/18 17:17:20 minahito Exp $
+// $Id: xoopslists.php,v 1.2.8.2 2006/02/28 14:36:04 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -172,10 +172,10 @@
                 foreach ( $dirlist as $dir ) {
                     $avatars[$dir] =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/images/avatar/".$dir."/", $dir."/");
                 }
-            } else {
-                return false;
-            }
-            return $avatars;
+            	return $avatars;
+        	}
+            $ret = false;
+            return $ret;
         }
 
         /*

From nobunobu ＠ users.sourceforge.jp  Tue Feb 28 23:38:59 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 28 Feb 2006 23:38:59 +0900
Subject: [xoops-cvslog 2364] CVS update: xoops2jp/html/class
Message-ID: <20060228143859.9D9882AC010@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_EventManager.class.php
diff -u xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.7 xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.8
--- xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.7	Sat Feb  4 14:43:19 2006
+++ xoops2jp/html/class/XCube_EventManager.class.php	Tue Feb 28 23:38:59 2006
@@ -40,6 +40,12 @@
 	
 	function replaceEvent($eventName,&$eventHandler)
 	{
+		if(isset($this->_mReserveEventList[$eventName])) {
+			unset($this->_mReserveEventList[$eventName]);
+		}
+		if(isset($this->_mRegistedFlags[$eventName])) {
+			unset($this->_mRegistedFlags[$eventName]);
+		}
 		if(isset($this->_mEvents[$eventName])) {
 			if(strtolower(get_class($this->_mEvents[$eventName]))=="xcube_event") {
 				//