From nobunobu ＠ users.sourceforge.jp Thu Jun 1 11:41:48 2006 From: nobunobu ＠ users.sourceforge.jp (NobuNobu) Date: Thu, 1 Jun 2006 11:41:48 +0900 Subject: [xoops-cvslog 3249] CVS update: xoops2jp/html/class/database Message-ID: <20060601024148.C80062AC019@users.sourceforge.jp> Index: xoops2jp/html/class/database/sqlutility.php diff -u xoops2jp/html/class/database/sqlutility.php:1.2.8.4 xoops2jp/html/class/database/sqlutility.php:1.2.8.5 --- xoops2jp/html/class/database/sqlutility.php:1.2.8.4 Tue Feb 7 19:00:29 2006 +++ xoops2jp/html/class/database/sqlutility.php Thu Jun 1 11:41:48 2006 @@ -75,6 +75,7 @@ $patterns[] = '{dirname}'; $replacements[] = $this->dirname; $sql = str_replace($patterns,$replacements,$sql); + $sql = preg_replace('/;\s*$/s','',$sql); return $sql; } From minahito ＠ users.sourceforge.jp Sat Jun 3 21:52:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Sat, 3 Jun 2006 21:52:33 +0900 Subject: [xoops-cvslog 3250] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060603125233.648BE2AC09B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/global.php diff -u xoops2jp/html/modules/base/language/english/global.php:1.1.2.6 xoops2jp/html/modules/base/language/english/global.php:1.1.2.7 --- xoops2jp/html/modules/base/language/english/global.php:1.1.2.6 Sat May 27 23:06:23 2006 +++ xoops2jp/html/modules/base/language/english/global.php Sat Jun 3 21:52:33 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/base/language/japanese/global.php diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.6 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.7 --- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.6 Sat May 27 23:06:24 2006 +++ xoops2jp/html/modules/base/language/japanese/global.php Sat Jun 3 21:52:43 2006 @@ -74,6 +74,7 @@ define('_YES','はい'); define('_EDIT','編集'); define('_DELETE','削除'); +define('_VIEW','閲覧'); define('_SUBMIT','送信'); define('_MODULENOEXIST','選択されたページは存在しません'); define('_ALIGN','位置'); From ryuji_amano ＠ users.sourceforge.jp Mon Jun 5 00:29:15 2006 From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO) Date: Mon, 5 Jun 2006 00:29:15 +0900 Subject: [xoops-cvslog 3252] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060604152915.63F892AC075@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.6 Mon May 15 17:33:54 2006 +++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Mon Jun 5 00:29:15 2006 @@ -120,7 +120,7 @@ $themeArr = array(); $dirHandler = opendir(XOOPS_THEME_PATH . "/"); while ($file = readdir($dirHandler)) { - if (is_dir(XOOPS_THEME_PATH . "/" . $file) && preg_match("/^[a-z_]+$/", $file) && file_exists(XOOPS_THEME_PATH . "/${file}/theme.html")) { + if (is_dir(XOOPS_THEME_PATH . "/" . $file) && preg_match("/^[a-z0-9_]+$/", $file) && file_exists(XOOPS_THEME_PATH . "/${file}/theme.html")) { $themeArr[$file] = $file; } } From minahito ＠ users.sourceforge.jp Mon Jun 5 18:29:39 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:29:39 +0900 Subject: [xoops-cvslog 3253] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060605092939.CB10A2AC01E@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.6 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.6 Wed May 24 22:54:37 2006 +++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Mon Jun 5 18:29:39 2006 @@ -1,6 +1,6 @@ mController->getConfig('language'); $dirname = $moduleObject->getVar('dirname'); - $url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/helpimages/${file}"; + $url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/help/images/${file}"; if (!file_exists($url) && $language != "english") { - $url = XOOPS_MODULE_URL . "/${dirname}/language/english/helpimages/${file}"; + $url = XOOPS_MODULE_URL . "/${dirname}/language/english/help/images/${file}"; } return $url; @@ -126,9 +126,9 @@ // // file check // - $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/" . $language; + $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/help/" . $language; if (!file_exists($template_dir . "/" . $helpfile)) { - $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/english"; + $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/english/help/"; 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 Mon Jun 5 18:30:04 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:04 +0900 Subject: [xoops-cvslog 3254] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060605093006.6BCD02AC01E@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:06 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:06 +0900 Subject: [xoops-cvslog 3255] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060605093006.979562AC086@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:06 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:06 +0900 Subject: [xoops-cvslog 3256] CVS update: xoops2jp/html/modules/legacyRender/language/english/help Message-ID: <20060605093006.C48F12AC01E@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:06 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:06 +0900 Subject: [xoops-cvslog 3257] CVS update: xoops2jp/html/modules/legacyRender/language/japanese/help Message-ID: <20060605093006.F0D312AC086@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:09 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:09 +0900 Subject: [xoops-cvslog 3258] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060605093009.5E9762AC01E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help.html diff -u xoops2jp/html/modules/base/language/english/help.html:1.1.2.4 xoops2jp/html/modules/base/language/english/help.html:removed --- xoops2jp/html/modules/base/language/english/help.html:1.1.2.4 Mon May 29 13:07:58 2006 +++ xoops2jp/html/modules/base/language/english/help.html Mon Jun 5 18:30:09 2006 @@ -1,40 +0,0 @@ -

Outline

- - -

Action Search

- - -

Module administration / installation

- - -

Block administration / installation

- - -

Migration guide (from XOOPS 2.0.x)

- - -

TODO (What's coming?)

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:09 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:09 +0900 Subject: [xoops-cvslog 3259] CVS update: xoops2jp/html/modules/legacyRender/language/english Message-ID: <20060605093009.B30972AC088@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.3 xoops2jp/html/modules/legacyRender/language/english/help.html:removed --- xoops2jp/html/modules/legacyRender/language/english/help.html:1.1.2.3 Sat Feb 4 01:36:07 2006 +++ xoops2jp/html/modules/legacyRender/language/english/help.html Mon Jun 5 18:30:09 2006 @@ -1,46 +0,0 @@ -

Outline

- - -

Additional theme

- - -

Uploading of theme

- - -

Selection of theme

- - -

Uninstallation of theme

- - - -

Template management

- - -

TPLFILE management

- - -

TODO

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:09 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:09 +0900 Subject: [xoops-cvslog 3260] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060605093009.F08502AC0B5@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.6 xoops2jp/html/modules/base/language/japanese/help.html:removed --- xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.6 Mon May 29 13:07:58 2006 +++ xoops2jp/html/modules/base/language/japanese/help.html Mon Jun 5 18:30:09 2006 @@ -1,46 +0,0 @@ -

概要

- - -

コマンド検索(アクションサーチ)

- - -

モジュールの管理／インストール

- - -

ブロックの管理／インストール

- - -

XOOPS 2.0.x 操作移行リスト

- - -

Cube 2.1 alpha 既知の問題点・注意事項

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:09 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:09 +0900 Subject: [xoops-cvslog 3261] CVS update: xoops2jp/html/modules/legacyRender/language/japanese/help Message-ID: <20060605093009.8AF222AC086@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/japanese/help/index.html diff -u /dev/null xoops2jp/html/modules/legacyRender/language/japanese/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:09 2006 +++ xoops2jp/html/modules/legacyRender/language/japanese/help/index.html Mon Jun 5 18:30:09 2006 @@ -0,0 +1 @@ + \ No newline at end of file Index: xoops2jp/html/modules/legacyRender/language/japanese/help/help.html diff -u /dev/null xoops2jp/html/modules/legacyRender/language/japanese/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:09 2006 +++ xoops2jp/html/modules/legacyRender/language/japanese/help/help.html Mon Jun 5 18:30:09 2006 @@ -0,0 +1,50 @@ +

はじめに

+ + +

追加テーマの入手

+ + +

テーマのアップロード

+ + +

テーマの選択

+ + +

テーマのアンインストール

+ + +

テンプレート管理

+ + +

テンプレートファイル管理

+ + +

TODO

+ From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:10 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:10 +0900 Subject: [xoops-cvslog 3262] CVS update: xoops2jp/html/modules/legacyRender/language/japanese Message-ID: <20060605093010.2607D2AC01E@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.4 xoops2jp/html/modules/legacyRender/language/japanese/help.html:removed --- xoops2jp/html/modules/legacyRender/language/japanese/help.html:1.1.2.4 Sat Feb 4 01:15:08 2006 +++ xoops2jp/html/modules/legacyRender/language/japanese/help.html Mon Jun 5 18:30:10 2006 @@ -1,50 +0,0 @@ -

はじめに

- - -

追加テーマの入手

- - -

テーマのアップロード

- - -

テーマの選択

- - -

テーマのアンインストール

- - -

テンプレート管理

- - -

テンプレートファイル管理

- - -

TODO

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:10 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:10 +0900 Subject: [xoops-cvslog 3263] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060605093010.5184F2AC086@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u /dev/null xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1,46 @@ +

概要

+ + +

コマンド検索(アクションサーチ)

+ + +

モジュールの管理／インストール

+ + +

ブロックの管理／インストール

+ + +

XOOPS 2.0.x 操作移行リスト

+ + +

Cube 2.1 alpha 既知の問題点・注意事項

+ Index: xoops2jp/html/modules/base/language/japanese/help/index.html diff -u /dev/null xoops2jp/html/modules/base/language/japanese/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/japanese/help/index.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1 @@ + \ No newline at end of file From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:10 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:10 +0900 Subject: [xoops-cvslog 3264] CVS update: xoops2jp/html/modules/legacyRender/language/english/help Message-ID: <20060605093010.76F8F2AC088@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/english/help/help.html diff -u /dev/null xoops2jp/html/modules/legacyRender/language/english/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/legacyRender/language/english/help/help.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1,46 @@ +

Outline

+ + +

Additional theme

+ + +

Uploading of theme

+ + +

Selection of theme

+ + +

Uninstallation of theme

+ + + +

Template management

+ + +

TPLFILE management

+ + +

TODO

+ Index: xoops2jp/html/modules/legacyRender/language/english/help/index.html diff -u /dev/null xoops2jp/html/modules/legacyRender/language/english/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/legacyRender/language/english/help/index.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1 @@ + \ No newline at end of file From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:10 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:10 +0900 Subject: [xoops-cvslog 3265] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060605093010.A43F72AC01E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/index.html diff -u /dev/null xoops2jp/html/modules/base/language/english/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/english/help/index.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1 @@ + \ No newline at end of file Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u /dev/null xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Mon Jun 5 18:30:10 2006 @@ -0,0 +1,40 @@ +

Outline

+ + +

Action Search

+ + +

Module administration / installation

+ + +

Block administration / installation

+ + +

Migration guide (from XOOPS 2.0.x)

+ + +

TODO (What's coming?)

+ From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3262] CVS update: xoops2jp/html/modules/pm/language/english/help Message-ID: <20060605093028.14D842AC086@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3263] CVS update: xoops2jp/html/modules/pm/language/japanese/help Message-ID: <20060605093028.3EDA22AC088@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3264] CVS update: xoops2jp/html/modules/stdCache/language/english/help Message-ID: <20060605093028.696752AC086@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3265] CVS update: xoops2jp/html/modules/stdCache/language/japanese/help Message-ID: <20060605093028.93B212AC088@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3266] CVS update: xoops2jp/html/modules/user/language/english/help Message-ID: <20060605093028.BD6482AC086@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:28 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:28 +0900 Subject: [xoops-cvslog 3267] CVS update: xoops2jp/html/modules/user/language/japanese/help Message-ID: <20060605093028.E61D22AC01E@users.sourceforge.jp> From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:32 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:32 +0900 Subject: [xoops-cvslog 3268] CVS update: xoops2jp/html/modules/pm/language/japanese/help Message-ID: <20060605093032.8174C2AC01E@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/language/japanese/help/help.html diff -u /dev/null xoops2jp/html/modules/pm/language/japanese/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:32 2006 +++ xoops2jp/html/modules/pm/language/japanese/help/help.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1,21 @@ +

概要

+ + +

一般設定について

+ + +

TODO

+ Index: xoops2jp/html/modules/pm/language/japanese/help/index.html diff -u /dev/null xoops2jp/html/modules/pm/language/japanese/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:32 2006 +++ xoops2jp/html/modules/pm/language/japanese/help/index.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1 @@ + \ No newline at end of file From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:32 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:32 +0900 Subject: [xoops-cvslog 3269] CVS update: xoops2jp/html/modules/pm/language/english/help Message-ID: <20060605093032.C2AA22AC086@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/language/english/help/help.html diff -u /dev/null xoops2jp/html/modules/pm/language/english/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:32 2006 +++ xoops2jp/html/modules/pm/language/english/help/help.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1,19 @@ +

Outline

+ + +

Preferences

+ + +

TODO

+ Index: xoops2jp/html/modules/pm/language/english/help/index.html diff -u /dev/null xoops2jp/html/modules/pm/language/english/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:32 2006 +++ xoops2jp/html/modules/pm/language/english/help/index.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1 @@ + \ No newline at end of file From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:32 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:32 +0900 Subject: [xoops-cvslog 3270] CVS update: xoops2jp/html/modules/pm/language/english Message-ID: <20060605093032.E4D6F2AC01E@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.3 xoops2jp/html/modules/pm/language/english/help.html:removed --- xoops2jp/html/modules/pm/language/english/help.html:1.1.2.3 Sat Feb 4 01:36:07 2006 +++ xoops2jp/html/modules/pm/language/english/help.html Mon Jun 5 18:30:32 2006 @@ -1,19 +0,0 @@ -

Outline

- - -

Preferences

- - -

TODO

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3271] CVS update: xoops2jp/html/modules/user/language/english/help Message-ID: <20060605093033.138F52AC086@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/help/index.html diff -u /dev/null xoops2jp/html/modules/user/language/english/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/user/language/english/help/index.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1 @@ + \ No newline at end of file Index: xoops2jp/html/modules/user/language/english/help/help.html diff -u /dev/null xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/user/language/english/help/help.html Mon Jun 5 18:30:32 2006 @@ -0,0 +1,55 @@ +

Outline

+ + +

User Administration(Edit User)

+ + +

User Ranks

+ + +

Edit Groups

+ + +
(Tips)
+ + +

Mail Users

+ + +

Preferences

+ From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3272] CVS update: xoops2jp/html/modules/stdCache/language/english/help Message-ID: <20060605093033.366472AC088@users.sourceforge.jp> Index: xoops2jp/html/modules/stdCache/language/english/help/index.html diff -u /dev/null xoops2jp/html/modules/stdCache/language/english/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/stdCache/language/english/help/index.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1 @@ + \ No newline at end of file Index: xoops2jp/html/modules/stdCache/language/english/help/help.html diff -u /dev/null xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/stdCache/language/english/help/help.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1,20 @@ +

Outline

+ +

Cache maintainance using the clear cache block

+ + +

How to set up

+ + From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3273] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060605093033.598F62AC01E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/help.html diff -u xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.2 xoops2jp/html/modules/user/language/japanese/help.html:removed --- xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.2 Thu Apr 27 19:27:38 2006 +++ xoops2jp/html/modules/user/language/japanese/help.html Mon Jun 5 18:30:33 2006 @@ -1,56 +0,0 @@ -

概要

- - -

ユーザー管理

- - -

ユーザーランク管理

- - -

ユーザーグループ管理

- - -
(Tips)
- - -New -

一斉メール送信

-

複数のユーザーに対してメールやメッセージを送信することができます。
-XOOPS 2.0.x 系とは操作手順、処理の考え方が異なり、メールの内容と対象ユーザーを「メールジョブ」というデータに保存し、好きなときに送信することが出来ます。
-また、cronで処理することも可能です（予定）。

-
    -
  1. まず送信するユーザーをユーザー検索で絞り込みましょう。 -
  2. 検索結果を確認し、「この条件でメールを送信」をクリックしてください。 -
  3. メールの内容を入力し、保存してください。 -
  4. メールジョブの画面から送信するメールジョブを選択してください。 -
  5. ガイドに従い、送信ボタンを押してください。 -
-

-メールジョブは送信開始前であれば件名や本文を修正することができ、送信後も履歴として残すことができます。
-メールタイトルや本文では、特殊な記法を使うことで、送信先のユーザーのユーザー名などをメッセージに含めることが出来ます。
-物足りない場合は、記法や送信方法を拡張するカスタム・ファイルやモジュールが配布されていないか探してみましょう。 -

- -

一般設定

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3274] CVS update: xoops2jp/html/modules/stdCache/language/japanese Message-ID: <20060605093033.7C2CA2AC086@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.3 xoops2jp/html/modules/stdCache/language/japanese/help.html:removed --- xoops2jp/html/modules/stdCache/language/japanese/help.html:1.1.2.3 Sat Feb 4 01:05:50 2006 +++ xoops2jp/html/modules/stdCache/language/japanese/help.html Mon Jun 5 18:30:33 2006 @@ -1,32 +0,0 @@ -

概要

- - -

キャッシュクリアブロックについて

- - -

設定方法

-

設定ファイルの[Cube]ブロック下に以下の２行を記述して下さい

- - -

チューンナップについて

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3275] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060605093033.C33062AC01E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/help.html diff -u xoops2jp/html/modules/user/language/english/help.html:1.1.2.2 xoops2jp/html/modules/user/language/english/help.html:removed --- xoops2jp/html/modules/user/language/english/help.html:1.1.2.2 Mon May 29 17:02:00 2006 +++ xoops2jp/html/modules/user/language/english/help.html Mon Jun 5 18:30:33 2006 @@ -1,55 +0,0 @@ -

Outline

- - -

User Administration(Edit User)

- - -

User Ranks

- - -

Edit Groups

- - -
(Tips)
- - -

Mail Users

- - -

Preferences

- From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3276] CVS update: xoops2jp/html/modules/stdCache/language/japanese/help Message-ID: <20060605093033.E62EA2AC086@users.sourceforge.jp> Index: xoops2jp/html/modules/stdCache/language/japanese/help/index.html diff -u /dev/null xoops2jp/html/modules/stdCache/language/japanese/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/stdCache/language/japanese/help/index.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1 @@ + \ No newline at end of file Index: xoops2jp/html/modules/stdCache/language/japanese/help/help.html diff -u /dev/null xoops2jp/html/modules/stdCache/language/japanese/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:33 2006 +++ xoops2jp/html/modules/stdCache/language/japanese/help/help.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1,32 @@ +

概要

+ + +

キャッシュクリアブロックについて

+ + +

設定方法

+

設定ファイルの[Cube]ブロック下に以下の２行を記述して下さい

+ + +

チューンナップについて

+ From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:34 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:34 +0900 Subject: [xoops-cvslog 3277] CVS update: xoops2jp/html/modules/user/language/japanese/help Message-ID: <20060605093034.14E902AC0DB@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/help/help.html diff -u /dev/null xoops2jp/html/modules/user/language/japanese/help/help.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:34 2006 +++ xoops2jp/html/modules/user/language/japanese/help/help.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1,56 @@ +

概要

+ + +

ユーザー管理

+ + +

ユーザーランク管理

+ + +

ユーザーグループ管理

+ + +
(Tips)
+ + +New +

一斉メール送信

+

複数のユーザーに対してメールやメッセージを送信することができます。
+XOOPS 2.0.x 系とは操作手順、処理の考え方が異なり、メールの内容と対象ユーザーを「メールジョブ」というデータに保存し、好きなときに送信することが出来ます。
+また、cronで処理することも可能です（予定）。

+
    +
  1. まず送信するユーザーをユーザー検索で絞り込みましょう。 +
  2. 検索結果を確認し、「この条件でメールを送信」をクリックしてください。 +
  3. メールの内容を入力し、保存してください。 +
  4. メールジョブの画面から送信するメールジョブを選択してください。 +
  5. ガイドに従い、送信ボタンを押してください。 +
+

+メールジョブは送信開始前であれば件名や本文を修正することができ、送信後も履歴として残すことができます。
+メールタイトルや本文では、特殊な記法を使うことで、送信先のユーザーのユーザー名などをメッセージに含めることが出来ます。
+物足りない場合は、記法や送信方法を拡張するカスタム・ファイルやモジュールが配布されていないか探してみましょう。 +

+ +

一般設定

+ Index: xoops2jp/html/modules/user/language/japanese/help/index.html diff -u /dev/null xoops2jp/html/modules/user/language/japanese/help/index.html:1.1.2.1 --- /dev/null Mon Jun 5 18:30:34 2006 +++ xoops2jp/html/modules/user/language/japanese/help/index.html Mon Jun 5 18:30:33 2006 @@ -0,0 +1 @@ + \ No newline at end of file From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:33 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:33 +0900 Subject: [xoops-cvslog 3278] CVS update: xoops2jp/html/modules/stdCache/language/english Message-ID: <20060605093033.A07422AC088@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.4 xoops2jp/html/modules/stdCache/language/english/help.html:removed --- xoops2jp/html/modules/stdCache/language/english/help.html:1.1.2.4 Tue Feb 7 13:03:32 2006 +++ xoops2jp/html/modules/stdCache/language/english/help.html Mon Jun 5 18:30:33 2006 @@ -1,20 +0,0 @@ -

Outline

- -

Cache maintainance using the clear cache block

- - -

How to set up

- - From minahito ＠ users.sourceforge.jp Mon Jun 5 18:30:34 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 18:30:34 +0900 Subject: [xoops-cvslog 3279] CVS update: xoops2jp/html/modules/pm/language/japanese Message-ID: <20060605093034.363862AC01E@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.5 xoops2jp/html/modules/pm/language/japanese/help.html:removed --- xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.5 Sat Feb 4 01:08:42 2006 +++ xoops2jp/html/modules/pm/language/japanese/help.html Mon Jun 5 18:30:34 2006 @@ -1,21 +0,0 @@ -

概要

- - -

一般設定について

- - -

TODO

- From minahito ＠ users.sourceforge.jp Mon Jun 5 19:53:27 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 19:53:27 +0900 Subject: [xoops-cvslog 3280] CVS update: xoops2jp/html/kernel Message-ID: <20060605105327.AAD7D2AC037@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Root.class.php diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.11 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.12 --- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.11 Tue Feb 28 23:29:09 2006 +++ xoops2jp/html/kernel/XCube_Root.class.php Mon Jun 5 19:53:27 2006 @@ -1,6 +1,6 @@ setSiteConfig(parse_ini_file($file,true)); + $this->setSiteConfig(parse_ini_file($file, true)); // // Override setting. // - if(func_num_args()>1) { - for($i=1;$i 1) { + for ($i = 1; $i < func_num_args(); $i++) { + $overrideFile = func_get_arg($i); - if(file_exists($overrideFile)) - $this->overrideSiteConfig(parse_ini_file($overrideFile,true)); + if (file_exists($overrideFile)) { + $this->overrideSiteConfig(parse_ini_file($overrideFile, true)); + } } } } + /** + * Set site configs. + * + * @param array $config + */ function setSiteConfig($config) { - $this->mSiteConfig=$config; + $this->mSiteConfig = $config; } /** - * Override site config. SiteConfig is overrided by $config value. And, if $config has new key, the key is set. + * Override site config. SiteConfig is overrided by $config value. And, if + * $config has new key, that key is set. + * + * @param array $config */ function overrideSiteConfig($config) { - foreach($config as $_overKey=>$_overVal) { - if(array_key_exists($_overKey,$this->mSiteConfig)) { - $this->mSiteConfig[$_overKey]=array_merge($this->mSiteConfig[$_overKey],$_overVal); + foreach ($config as $_overKey=>$_overVal) { + if (array_key_exists($_overKey, $this->mSiteConfig)) { + $this->mSiteConfig[$_overKey] = array_merge($this->mSiteConfig[$_overKey], $_overVal); } else { - $this->mSiteConfig[$_overKey]=$_overVal; + $this->mSiteConfig[$_overKey] = $_overVal; } } } + /** + * Return the value of site config that is defined by ini files. + * + * @return mixed If the value specified by parameters is no, return null. + */ function getSiteConfig() { // // TODO Check keys with using 'isset' // - if(func_num_args()==0) { + if (func_num_args() == 0) { return $this->mSiteConfig; } - elseif(func_num_args()==1) { - if(isset($this->mSiteConfig[func_get_arg(0)])) + elseif (func_num_args() == 1) { + if (isset($this->mSiteConfig[func_get_arg(0)])) { return $this->mSiteConfig[func_get_arg(0)]; + } } - elseif(func_num_args()==2) { - if(isset($this->mSiteConfig[func_get_arg(0)][func_get_arg(1)])) + elseif (func_num_args() == 2) { + 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)])) { + 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 { @@ -163,7 +161,10 @@ } /** - * Create controller with own site setting. + * Create controller with the rule, and call member function prepare(). + * The class of creating controller is defined in ini.php files. + * + * @return void */ function setupController() { @@ -172,75 +173,110 @@ // We don't decide the style of SiteConfig. // $controllerName = $this->mSiteConfig['Cube']['Controller']; - $this->mController=&$this->_createInstance($this->mSiteConfig[$controllerName]['class'],$this->mSiteConfig[$controllerName]['path']); + $this->mController =& $this->_createInstance($this->mSiteConfig[$controllerName]['class'], $this->mSiteConfig[$controllerName]['path']); $this->mController->prepare($this); } + /** + * Return the instance of the controller. + * + * @return XCube_Controller + */ function &getController() { return $this->mController; } - function setFeatureManager(&$featureManager) - { - $this->mFeatureManager=&$featureManager; - } - - function &getFeatureManager() - { - return $this->mFeatureManager; - } - + /** + * Set the instance of the language manager. + * + * @param $languageManager XCube_LanguageManager + * @return void + */ function setLanguageManager(&$languageManager) { - $this->mLanguageManager=&$languageManager; + $this->mLanguageManager =& $languageManager; } + /** + * Return the instance of the language manager. + * + * @return XCube_LanguageManager + */ function &getLanguageManager() { return $this->mLanguageManager; } + /** + * Set the instance of the event manager. + * + * @param $eventManager XCube_EventManager + * @return void + */ function setEventManager(&$eventManager) { - $this->mEventManager=&$eventManager; + $this->mEventManager =& $eventManager; } + /** + * Return the instance of the event manager. + * + * @return XCube_EventManager + */ function &getEventManager() { return $this->mEventManager; } + /** + * Set the instance of the service manager. + * + * @param $languageManager XCube_ServiceManager + * @return void + */ function setServiceManager(&$serviceManager) { - $this->mServiceManager=&$serviceManager; + $this->mServiceManager =& $serviceManager; } + /** + * Return the instance of the service manager. + * + * @return XCube_EventManager + */ function &getServiceManager() { return $this->mServiceManager; } - - function setModifierManager(&$modifierManager) - { - $this->ModifierManager=&$modifierManager; - } - - function &getModifierManager() - { - return $this->ModifierManager; - } + /** + * Set the theme name. + * + * @param $theme string + */ function setThemeName($theme) { $this->mThemeName = $theme; } + /** + * Return the theme name. + * + * @return string + */ function getThemeName() { return $this->mThemeName; } + /** + * Return the instance of the cache system. The instance of cache system + * is singleton in XOOPS Cube. This member function is getInstance() at + * singleton pattern. + * + * @return XCube_CacheSystem + */ function &getCacheSystem() { if (!is_object($this->mCacheSystem)) { @@ -250,6 +286,14 @@ return $this->mCacheSystem; } + /** + * Return the instance of the render system by the name. If the render + * system specified by $name doesn't exist, raise fatal error. This member + * function does creating the instance and calling prepare(). + * + * @todo + * @param $name string the registed name of the render system. + */ function &getRenderSystem($name) { if (isset($this->mRenderSystems[$name])) { @@ -271,15 +315,28 @@ return $this->mRenderSystems[$name]; } + /** + * Create the instance dynamic with the rule and the string parameters. + * First, load the file from $classPath. The rule is XOOPS_ROOT_PATH + + * $classPath + $className + .class.php. Next, create the instance of the + * class if the class is defined rightly. This member function is called by + * other member functions of XCube_Root. + * + * @access private + * @param $className string the name of class. + * @param $classPath string the path that $className is defined in. + * @return void + * @todo If the file doesn't exist, require_once() raises fatal errors. + */ function &_createInstance($className, $classPath=null) { $ret = null; - if($classPath!=null) { + if ($classPath != null) { require_once XOOPS_ROOT_PATH . "/" . $classPath . "/" . $className . ".class.php"; } - if(class_exists($className)) { + if (class_exists($className)) { $ret =& new $className(); } From minahito ＠ users.sourceforge.jp Mon Jun 5 19:55:00 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 5 Jun 2006 19:55:00 +0900 Subject: [xoops-cvslog 3281] CVS update: xoops2jp/html/kernel Message-ID: <20060605105500.C39C32AC090@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Root.class.php diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.12 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.13 --- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.12 Mon Jun 5 19:53:27 2006 +++ xoops2jp/html/kernel/XCube_Root.class.php Mon Jun 5 19:55:00 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/kernel/XCube_TextModifier.class.php diff -u xoops2jp/html/kernel/XCube_TextModifier.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_TextModifier.class.php:removed --- xoops2jp/html/kernel/XCube_TextModifier.class.php:1.1.2.1 Tue Nov 29 16:14:32 2005 +++ xoops2jp/html/kernel/XCube_TextModifier.class.php Tue Jun 6 11:50:56 2006 @@ -1,65 +0,0 @@ -mModifiers[$modifier->getName()]=&$modifier; - if($this->mDefaultKey==null) { - $this->mDefaultKey=$modifier->getName(); - } - } - - function hasModifier($modifierName) - { - return array_key_exists($modifierName,$this->mModifiers); - } - - function countModifier() - { - return count($this->mModifiers); - } - - function &searchModifier($modifierName=null,$fallback=true) - { - $dmy=false; - if($modifierName!=null) { - if($this->hasModifier($modifierName)) { - return $this->mModifiers[$modifierName]; - } - elseif($fallback) { - return $this->mModifiers[$this->mDefaultKey]; - } - else { - return $dmy; - } - } - else { - return $this->mModifiers[$this->mDefaultKey]; - } - } -} - -?> \ No newline at end of file From minahito ＠ users.sourceforge.jp Tue Jun 6 12:05:53 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Tue, 6 Jun 2006 12:05:53 +0900 Subject: [xoops-cvslog 3283] CVS update: xoops2jp/html/kernel Message-ID: <20060606030553.AA15D2AC00E@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_ActionFilter.class.php diff -u /dev/null xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.1 --- /dev/null Tue Jun 6 12:05:53 2006 +++ xoops2jp/html/kernel/XCube_ActionFilter.class.php Tue Jun 6 12:05:53 2006 @@ -0,0 +1,57 @@ +mController =& $controller; + } + + /** + * Execute the logic when preFilter(). + * + * @return void + */ + function preFilter() + { + } + + /** + * Execute the logic when preBlockFilter(). + * + * @return void + */ + function preBlockFilter() + { + } +} + +?> From minahito ＠ users.sourceforge.jp Tue Jun 6 12:08:41 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Tue, 6 Jun 2006 12:08:41 +0900 Subject: [xoops-cvslog 3284] CVS update: xoops2jp/html/kernel Message-ID: <20060606030841.91D4A2AC137@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_ActionFilter.class.php diff -u xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.2 --- xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.1 Tue Jun 6 12:05:53 2006 +++ xoops2jp/html/kernel/XCube_ActionFilter.class.php Tue Jun 6 12:08:41 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/class/XCube_ActionFilter.class.php diff -u xoops2jp/html/class/XCube_ActionFilter.class.php:1.1.2.1 xoops2jp/html/class/XCube_ActionFilter.class.php:1.1.2.2 --- xoops2jp/html/class/XCube_ActionFilter.class.php:1.1.2.1 Wed Oct 26 21:06:45 2005 +++ xoops2jp/html/class/XCube_ActionFilter.class.php Tue Jun 6 12:51:59 2006 @@ -1,21 +1,13 @@ mController=&$controller; - } - - function preFilter() - { - } - - function preBlockFilter() - { - } -} +require_once XOOPS_ROOT_PATH . "/kernel/XCube_ActionFilter.class.php"; ?> \ No newline at end of file From minahito ＠ users.sourceforge.jp Tue Jun 6 12:52:17 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Tue, 6 Jun 2006 12:52:17 +0900 Subject: [xoops-cvslog 3286] CVS update: xoops2jp/html/class Message-ID: <20060606035217.5A2DC2AC00E@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_RenderSystem.class.php diff -u xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.14 xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.15 --- xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.14 Tue Mar 28 22:28:16 2006 +++ xoops2jp/html/class/XCube_RenderSystem.class.php Tue Jun 6 12:52:17 2006 @@ -1,13 +1,11 @@ Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5.2.1 --- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5 Mon May 1 11:37:30 2006 +++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php Wed Jun 7 03:25:55 2006 @@ -1,5 +1,5 @@ makeTboxData4PreviewInForm($_POST['mail_subject'])); $body_hidden = new XoopsFormHidden("mail_body", $myts->makeTareaData4PreviewInForm($_POST['mail_body'])); $start_hidden = new XoopsFormHidden("mail_start", $mail_end); - $to_hidden = new XoopsFormHidden("mail_send_to[]", "mail"); $op_hidden = new XoopsFormHidden("op", "send"); $submit_button = new XoopsFormButton("", "mail_submit", _AM_SENDNEXT, "submit"); $sent_label = new XoopsFormLabel(_AM_SENT, sprintf(_AM_SENTNUM, $_POST['mail_start']+1, $mail_end, $added_count)); @@ -233,7 +232,14 @@ $form->addElement($femail_hidden); $form->addElement($subject_hidden); $form->addElement($body_hidden); - $form->addElement($to_hidden); + if (in_array('mail', $_POST['mail_send_to'])) { + $to_hidden = new XoopsFormHidden('mail_send_to[]', 'mail'); + $form->addElement($to_hidden); + } + if (in_array('pm', $_POST['mail_send_to']) && empty($_POST['mail_inactive'])) { + $to_hidden = new XoopsFormHidden('mail_send_to[]', 'pm'); + $form->addElement($to_hidden); + } $form->addElement($op_hidden); $form->addElement($start_hidden); $form->addElement($submit_button); From minahito ＠ users.sourceforge.jp Wed Jun 7 17:59:03 2006 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 7 Jun 2006 17:59:03 +0900 Subject: [xoops-cvslog 3288] CVS update: xoops2jp/html/class Message-ID: <20060607085903.2A98D2AC017@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_ActionForm.class.php diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.34 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.35 --- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.34 Thu May 25 14:14:10 2006 +++ xoops2jp/html/class/XCube_ActionForm.class.php Wed Jun 7 17:59:03 2006 @@ -10,53 +10,89 @@ // TODO Form object should have getValue(), isNull(), toString(). // -define("XCUBE_TOKEN_TYPE_SINGLE",1); -define("XCUBE_TOKEN_TYPE_MULTI",2); - /** - * This is suggestion of a simple action form. - * We do not force a module developer to use this. - * You can learn more full-scale action forms from JAVA and .NET and other PHP. - * And, you must use auto-generating tool when you need to ActionForm that is sub-class of this class. + * This class fetches the input value from the request value and validate + * those values. It separates fetching & validating from your main logic. Such + * classes is important in web program. + * + * Plus, this action form has features of one time token. It seems one kinds of + * validations. The token is registered in templates. + * + * This is suggestion of a simple action form. We do not force a module + * developer to use this. You can learn more full-scale action forms from JAVA + * and .NET and other PHP. And, you must use auto-generating tool when you need + * to ActionForm that is sub-class of this class. */ class XCube_ActionForm { /** - * Array + * @var array of XCube_FormProperty + * @access protected */ var $mFormProperties; /** - * Array + * @var array of XCube_FieldProperty + * @access protected */ var $mFieldProperties; /** * NOTICE: This is temporary until we will decide the method of managing error. + * @access protected + * @var bool */ - var $mErrorFlag=false; + var $mErrorFlag = false; - var $mErrorMessages=array(); + /** + * @var array of string + * @access protected + */ + var $mErrorMessages = array(); + /** + * Token string as one time token. + * + * @var string + * @access private + */ var $_mToken = null; function XCube_ActionForm() { } - + + /** + * Set up form properties and field properties. + */ function prepare() { } + /** + * Return token name. If the sub-class doesn't override this member + * function, features about one time tokens aren't used. + * + * @access public + * @return string + */ function getTokenName() { return null; } + /** + * Generate token value, register it to sessions, return it. This member + * function should be called in templates. The subclass can override this + * to change the logic for generating token value. + * + * @access public + * @return string + */ function getToken() { if ($this->_mToken == null) { - srand (microtime() * 100000); + srand(microtime() * 100000); $this->_mToken = md5(XOOPS_SALT . uniqid(rand(), true)); $_SESSION['XCUBE_TOKEN'][$this->getTokenName()] = $this->_mToken; @@ -75,13 +111,23 @@ return _TOKEN_ERROR; } + /** + * Set raw value as the value of the form property. + * + * Example (1): + * $this->set('name', 'Bob'); // Set 'Bob' to 'name'. + * + * Example (2): + * $this->set('names', 0, 'Bob'); // Set 'Bob' to 'name[0]'. + */ function set() { - if(isset($this->mFormProperties[func_get_arg(0)])) { + if (isset($this->mFormProperties[func_get_arg(0)])) { if (func_num_args() == 2) { $value = func_get_arg(1); $this->mFormProperties[func_get_arg(0)]->setValue($value); - } elseif (func_num_args() == 3) { + } + elseif (func_num_args() == 3) { $index = func_get_arg(1); $value = func_get_arg(2); $this->mFormProperties[func_get_arg(0)]->setValue($index, $value); @@ -94,16 +140,25 @@ */ function setVar() { - if(isset($this->mFormProperties[func_get_arg(0)])) { + if (isset($this->mFormProperties[func_get_arg(0)])) { if (func_num_args() == 2) { $this->mFormProperties[func_get_arg(0)]->setValue(func_get_arg(1)); - } elseif (func_num_args() == 3) { + } + elseif (func_num_args() == 3) { $this->mFormProperties[func_get_arg(0)]->setValue(func_get_arg(1), func_get_arg(2)); } } } - function get($key,$index=null) + /** + * Return raw value. If the return value is used in templates, escaping has + * to be used together. + * + * @param $key string Name of form property. + * @param $index string Subscript for array. + * @return mixed + */ + function get($key, $index=null) { return isset($this->mFormProperties[$key]) ? $this->mFormProperties[$key]->getValue($index) : null; } @@ -113,11 +168,12 @@ */ function getVar($key,$index=null) { - return $this->get($key,$index); + return $this->get($key, $index); } /** * Return form properties of this member property. + * * @return XCube_AbstractProperty[] */ function &getFormProperties() @@ -125,21 +181,83 @@ return $this->mFormProperties; } + /** + * Fetch the input value, set it and form properties. Those values can be + * got, through get() method. the sub-class can define own member function + * to fetch. Define member functions whose name is "fetch" + "form name". + * For example, to fetch "message" define "fetchMessage()" function. Those + * function of the sub-class set value to this action form. + * + * Example: + * function fetchModifytime() + * { + * $this->set('modifytime', time()); + * } + * + * @return void + * @see getFromRequest + */ function fetch() { - foreach(array_keys($this->mFormProperties) as $name) { + foreach (array_keys($this->mFormProperties) as $name) { $this->mFormProperties[$name]->fetch(); + + $methodName = "fetch" . ucfirst($name); + if (method_exists($this, $methodName)) { + // call_user_func(array($this,$methodName)); + $this->$methodName(); + } + } + } + + /** + * Get the value from requests, strip slashes if magic_quotes_gps is on, + * return the value. This member function supports the sub-class that + * defines own member functions to fetch. + * + * @access protected + * @return mixed + */ + function getFromRequest($key) + { + $value = isset($_REQUEST[$key]) ? $_REQUEST[$key] : null; + + if (get_magic_quotes_gpc()) { + $token = stripslashes($value); } + + return $value; } + /** + * Execute validation, so if a input value is wrong, error messages are + * added to error message buffer. The procedure of validation is the + * following: + * + * 1. If this object have token name, validate one time tokens. + * 2. Call the validation member function of all field properties. + * 3. Call the member function that is defined in the sub-class. + * + * For a basis, validations are done by functions of each field properties. + * But, the sub-class can define own validation logic. Define member + * functions whose name is "validate" + "form name". For example, to + * validate "message" define "validateMessage()" function. + * + * @return void + */ function validate() { // // check onetime & transaction token // if ($this->getTokenName() != null) { - $token = xoops_getrequest(strtr($this->getTokenName(), '.', '_')); + $key = strtr($this->getTokenName(), '.', '_'); + $token = isset($_REQUEST[$key]) ? $_REQUEST[$key] : null; + if (get_magic_quotes_gpc()) { + $token = stripslashes($token); + } + $flag = true; if (!isset($_SESSION['XCUBE_TOKEN'][$this->getTokenName()])) { @@ -166,8 +284,8 @@ unset($_SESSION['XCUBE_TOKEN'][$this->getTokenName()]); } - foreach(array_keys($this->mFormProperties) as $name) { - if(isset($this->mFieldProperties[$name])) { + foreach (array_keys($this->mFormProperties) as $name) { + if (isset($this->mFieldProperties[$name])) { if ($this->mFormProperties[$name]->isArray()) { foreach (array_keys($this->mFormProperties[$name]->mProperties) as $_name) { $this->mFieldProperties[$name]->validate($this->mFormProperties[$name]->mProperties[$_name]); @@ -182,9 +300,9 @@ // // If this class has original validation methods, call it. // - foreach(array_keys($this->mFormProperties) as $name) { - $methodName="validate".ucfirst($name); - if(method_exists($this,$methodName)) { + foreach (array_keys($this->mFormProperties) as $name) { + $methodName = "validate" . ucfirst($name); + if (method_exists($this, $methodName)) { // call_user_func(array($this,$methodName)); $this->$methodName(); } @@ -194,22 +312,64 @@ /** * If the action form keeps error messages or the error flag, return true. * + * @access public * @return bool */ function hasError() { return (count($this->mErrorMessages) > 0 || $this->mErrorFlag); } - + + /** + * Add $message to error message buffer. + * + * @access protected + */ function addErrorMessage($message) { - $this->mErrorMessages[]=$message; + $this->mErrorMessages[] = $message; } + /** + * Return error messages. + * + * @access public + * @return array + */ function getErrorMessages() { return $this->mErrorMessages; } + + /** + * Set initial values to this action form from a object. This member + * function mediates between the logic and the validation. For example, + * developers can use this method to load values from XoopsSimpleObject. + * + * This member function is abstract. But, the sub-class of this class + * doesn't have to implement this. + * + * @param $obj mixed + * @return void + */ + function load(&$obj) + { + } + + /** + * Set input values to a object from this action form. This member function + * mediates between the logic and the result of validations. For example, + * developers can use this method to set values to XoopsSimpleObject. + * + * This member function is abstract. But, the sub-class of this class + * doesn't have to implement this. + * + * @param $obj mixed + * @return void + */ + function update(&$obj) + { + } } class XCube_PropertyInterface From onokazu ＠ users.sourceforge.jp Fri Jun 9 08:55:04 2006 From: onokazu ＠ users.sourceforge.jp (onokazu) Date: Fri, 9 Jun 2006 08:55:04 +0900 Subject: [xoops-cvslog 3289] CVS update: xoops2jp/docs Message-ID: <20060608235504.EF1442AC024@users.sourceforge.jp> Index: xoops2jp/docs/CHANGES.txt diff -u xoops2jp/docs/CHANGES.txt:1.12 xoops2jp/docs/CHANGES.txt:1.12.2.1 --- xoops2jp/docs/CHANGES.txt:1.12 Mon May 1 11:37:23 2006 +++ xoops2jp/docs/CHANGES.txt Fri Jun 9 08:55:04 2006 @@ -1,6 +1,17 @@ XOOPS v2 Changelog ============================ +2006/ 6/ 9: Version 2.0.15 JP +=============================== + - Fixed user message not being sent to PM when over 100 users to send(modules/system/mailusers/mailusers.php) + - Fixed port number always being added to the Host HTTP header(class/snoopy.php) + - Fixed some reference notice errors + - Fixed some typos + - Added patch for possible SQL injection attack(class/criteira.php) + - Added patch (of 2.0.14a) for local file inclusion vulnerability(header.php, index.php, misc.php) + - Added fix for mail encoding problems in PHP4.4.0/4.4.1(language/japanese/xoopsmailerlocal.php) + + 2006/ 4/29: Version 2.0.14 JP =============================== - Fixed installation failure problem with PHP 5.1.x From onokazu ＠ users.sourceforge.jp Fri Jun 9 09:14:14 2006 From: onokazu ＠ users.sourceforge.jp (onokazu) Date: Fri, 9 Jun 2006 09:14:14 +0900 Subject: [xoops-cvslog 3290] CVS update: xoops2jp/html/include Message-ID: <20060609001414.486A12AC024@users.sourceforge.jp> Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.13 xoops2jp/html/include/version.php:1.13.2.1 --- xoops2jp/html/include/version.php:1.13 Mon May 1 11:37:26 2006 +++ xoops2jp/html/include/version.php Fri Jun 9 09:14:14 2006 @@ -1,4 +1,4 @@ \ No newline at end of file From tom_g3x ＠ users.sourceforge.jp Sun Jun 11 23:05:34 2006 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 11 Jun 2006 23:05:34 +0900 Subject: [xoops-cvslog 3291] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060611140534.71B9A2AC034@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.6 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.6 Thu Apr 13 00:11:19 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Sun Jun 11 23:05:34 2006 @@ -8,7 +8,7 @@
[ <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> ]
<{if $actionForm->hasError()}> -