valign="middle" align="center">
- | <{$user.user->getVar('uname')}> |
+
+ <{if $user.user}>
+ <{$user.user->getVar('uname')}>
+ <{else}>
+ GUEST
+ <{/if}>
+ |
<{if $user.module}>
<{$user.module}>
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:16:07 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:16:07 +0900
Subject: [xoops-cvslog 1413] CVS update: xoops2jp/html
Message-ID: <20051226121607.31CAB2AC056@users.sourceforge.jp>
Index: xoops2jp/html/misc.php
diff -u xoops2jp/html/misc.php:1.2.8.3 xoops2jp/html/misc.php:1.2.8.4
--- xoops2jp/html/misc.php:1.2.8.3 Sun Nov 6 15:33:34 2005
+++ xoops2jp/html/misc.php Mon Dec 26 21:16:07 2005
@@ -1,8 +1,8 @@
mController->setActionStrategy($miscRunner);
-$root->mController->executeAction();
+$root =& XCube_Root::getSingleton();
+$eventArgs = array();
+$root->mEventManager->raiseEvent("Legacypage.Misc.Access", $root->mController, $eventArgs);
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:16:28 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:16:28 +0900
Subject: [xoops-cvslog 1414] CVS update: xoops2jp/html
Message-ID: <20051226121628.1C10F2AC07A@users.sourceforge.jp>
Index: xoops2jp/html/pmlite.php
diff -u xoops2jp/html/pmlite.php:1.2.8.2 xoops2jp/html/pmlite.php:1.2.8.3
--- xoops2jp/html/pmlite.php:1.2.8.2 Sat Nov 12 03:54:02 2005
+++ xoops2jp/html/pmlite.php Mon Dec 26 21:16:27 2005
@@ -1,5 +1,5 @@
mEventManager->raiseEvent("Legacypage.Pmlite.Access",$root->mController,$eventArgs);
+$eventArgs = array();
+$root->mEventManager->raiseEvent("Legacypage.Pmlite.Access", $root->mController, $eventArgs);
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:17:44 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:17:44 +0900
Subject: [xoops-cvslog 1415] CVS update: xoops2jp/html/kernel
Message-ID: <20051226121744.37DE52AC056@users.sourceforge.jp>
Index: xoops2jp/html/kernel/group.php
diff -u xoops2jp/html/kernel/group.php:1.2.8.2 xoops2jp/html/kernel/group.php:1.2.8.3
--- xoops2jp/html/kernel/group.php:1.2.8.2 Sun Dec 25 16:49:29 2005
+++ xoops2jp/html/kernel/group.php Mon Dec 26 21:17:44 2005
@@ -1,5 +1,5 @@
setNew();
}
+
+ $group->setVar('group_type', 'User');
+
return $group;
}
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:18:42 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:18:42 +0900
Subject: [xoops-cvslog 1416] CVS update: xoops2jp/html/kernel
Message-ID: <20051226121842.37CEC2AC056@users.sourceforge.jp>
Index: xoops2jp/html/kernel/XCube_Root.class.php
diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.6 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.7
--- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.6 Wed Nov 30 14:01:45 2005
+++ xoops2jp/html/kernel/XCube_Root.class.php Mon Dec 26 21:18:42 2005
@@ -1,6 +1,6 @@
ModifierManager;
}
-}
+ function setThemeName($theme)
+ {
+ $this->mThemeName = $theme;
+ }
+
+ function getThemeName()
+ {
+ return $this->mThemeName;
+ }
+}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:19:59 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:19:59 +0900
Subject: [xoops-cvslog 1417] CVS update: xoops2jp/html/language/english
Message-ID: <20051226121959.6EDAC2AC056@users.sourceforge.jp>
Index: xoops2jp/html/language/english/comment.php
diff -u xoops2jp/html/language/english/comment.php:1.2 xoops2jp/html/language/english/comment.php:1.2.8.1
--- xoops2jp/html/language/english/comment.php:1.2 Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/language/english/comment.php Mon Dec 26 21:19:59 2005
@@ -1,5 +1,8 @@
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:21:58 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:21:58 +0900
Subject: [xoops-cvslog 1418] CVS update: xoops2jp/html/language/japanese
Message-ID: <20051226122158.B52FF2AC07A@users.sourceforge.jp>
Index: xoops2jp/html/language/japanese/comment.php
diff -u xoops2jp/html/language/japanese/comment.php:1.2 xoops2jp/html/language/japanese/comment.php:1.2.8.1
--- xoops2jp/html/language/japanese/comment.php:1.2 Fri Mar 18 22:00:58 2005
+++ xoops2jp/html/language/japanese/comment.php Mon Dec 26 21:21:58 2005
@@ -1,5 +1,8 @@
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:23:12 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:23:12 +0900
Subject: [xoops-cvslog 1419] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051226122312.5F1282AC07A@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.1 xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php:1.1.2.1 Fri Dec 16 18:52:31 2005
+++ xoops2jp/html/modules/base/admin/class/DeactiveModuleHandler.class.php Mon Dec 26 21:23:12 2005
@@ -30,7 +30,7 @@
while (($dir = readdir($handler)) !== false) {
if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
$module =& $this->get($dir);
- if ($module !== false) {
+ if ($module !== false ) {
$this->_mXoopsModules[] =& $module;
unset($module);
}
@@ -42,7 +42,7 @@
/**
* Return module object by $dirname that is specified module directory.
- * If specified module has been installed, not return it.
+ * If specified module has been installed or doesn't keep xoops_version, not return it.
* @param $dirname string
* @param XoopsModule or false
*/
@@ -50,6 +50,10 @@
{
$ret=false;
+ if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/xoops_version.php")) {
+ return $ret;
+ }
+
$moduleHandler =& xoops_gethandler('module');
$check =& $moduleHandler->getByDirname($dirname);
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:25:51 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:25:51 +0900
Subject: [xoops-cvslog 1420] CVS update: xoops2jp/html/modules/pm
Message-ID: <20051226122551.DEC432AC07A@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/pmlite.php
diff -u xoops2jp/html/modules/pm/pmlite.php:1.1.2.2 xoops2jp/html/modules/pm/pmlite.php:1.1.2.3
--- xoops2jp/html/modules/pm/pmlite.php:1.1.2.2 Sat Nov 12 03:54:46 2005
+++ xoops2jp/html/modules/pm/pmlite.php Mon Dec 26 21:25:51 2005
@@ -1,5 +1,5 @@
mController->getRenderSystem();
-$renderSystem->setDialogRenderMode();
+$root =& XCube_Root::getSingleton();
+$renderSystem =& $root->mController->getRenderSystem();
require_once "./class/PmActionFrame.class.php";
-$moduleRunner=new PmActionFrame();
+$moduleRunner =& new PmActionFrame();
$moduleRunner->setActionName("pmlite");
+$root->mController->setDialogMode(true);
+
//
// Regist the module level easy framework to virtual controller.
//
From minahito ＠ users.sourceforge.jp Mon Dec 26 21:27:34 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 26 Dec 2005 21:27:34 +0900
Subject: [xoops-cvslog 1421] CVS update:
xoops2jp/html/modules/user/language/japanese
Message-ID: <20051226122734.05A882AC055@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.6 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.7
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.6 Sun Dec 25 19:56:17 2005
+++ xoops2jp/html/modules/user/language/japanese/admin.php Mon Dec 26 21:27:33 2005
@@ -1,64 +1,91 @@
-_%s_ のユーザーグループを削除します。よろしいですか？");
+define("_MD_A_USER_LANG_GROUP_DELETE_ADVICE2","グループを削除してもユーザーは削除されません（オプションで選択できるべきでしょうか）");
+define('_MD_A_USER_LANG_GROUP_GID', "GID");
+define('_MD_A_USER_LANG_GROUP_NAME', "名前");
+define('_MD_A_USER_LANG_GROUP_DESC', "説明");
+define('_MD_A_USER_LANG_GROUP_TYPE', "タイプ");
+define('_MD_A_USER_LANG_GROUP_AMMO', "AMMO");
+define('_MD_A_USER_LANG_GROUP_PERMISSION', "パーミッション");
+define('_MD_A_USER_LANG_GROUP_ASSIGN', "アサイン");
+
+define('_MD_A_USER_LANG_USER_DELETE', "ユーザーの削除");
+define('_MD_A_USER_LANG_USER_DELETE_ADVICE', "_%s_ のユーザーを削除します。よろしいですか？");
+
+define('_MD_A_USER_LANG_GROUP_PROPERTY', "プロパティ");
+define('_MD_A_USER_LANG_GROUP_NOASSIN_MEMBERS', "このグループに登録されていないユーザー一覧");
+define('_MD_A_USER_LANG_GROUP_ASSIN_MEMBERS', "このグループに登録されているユーザー一覧");
+
+define('_MD_A_USER_LANG_RESET', "リセット");
+
+define('_MD_A_USER_LANG_PERM_ACCESS', "アクセス");
+define('_MD_A_USER_LANG_PERM_ADMIN', "管理");
+
+define('_MD_A_USER_LANG_PERM_LH', "LH");
+define('_MD_A_USER_LANG_PERM_RH', "RH");
+define('_MD_A_USER_LANG_PERM_CC', "CC");
+define('_MD_A_USER_LANG_PERM_CL', "CL");
+define('_MD_A_USER_LANG_PERM_CR', "CR");
+
+define('_MD_A_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限");
+define('_MD_A_USER_LANG_PERM_BLOCK_ACCESS', "ブロック アクセス権限");
+define('_MD_A_USER_LANG_PERM_MODULE_ACCESS', "システム/モジュール管理権限");
+define('_MD_A_USER_LANG_PERM_SYSTEM_PERM_MODULE', "システム管理");
+define('_MD_A_USER_LANG_PERM_GROUP_PERM_MODULE', "モジュール管理");
+define('_MD_A_USER_LANG_PERM_GROUP_PERM_BLOCK', "ブロック管理");
+
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:17:58 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:17:58 +0900
Subject: [xoops-cvslog 1422] CVS update: xoops2jp/html/class/database
Message-ID: <20051226151758.9B01B2AC06B@users.sourceforge.jp>
Index: xoops2jp/html/class/database/oldsqlutility.php
diff -u /dev/null xoops2jp/html/class/database/oldsqlutility.php:1.1.2.1
--- /dev/null Tue Dec 27 00:17:58 2005
+++ xoops2jp/html/class/database/oldsqlutility.php Tue Dec 27 00:17:58 2005
@@ -0,0 +1,160 @@
+
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ */
+
+/**
+ * provide some utility methods for databases
+ *
+ * @author Kazumi Ono
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ *
+ * @package kernel
+ * @subpackage database
+ */
+class OldSqlUtility
+{
+ /**
+ * Function from phpMyAdmin (http://phpwizard.net/projects/phpMyAdmin/)
+ *
+ * Removes comment and splits large sql files into individual queries
+ *
+ * Last revision: September 23, 2001 - gandon
+ *
+ * @param array the splitted sql commands
+ * @param string the sql commands
+ * @return boolean always true
+ * @access public
+ */
+ function splitMySqlFile(&$ret, $sql)
+ {
+ $sql = trim($sql);
+ $sql_len = strlen($sql);
+ $char = '';
+ $string_start = '';
+ $in_string = false;
+
+ for ($i = 0; $i < $sql_len; ++$i) {
+ $char = $sql[$i];
+
+ // We are in a string, check for not escaped end of
+ // strings except for backquotes that can't be escaped
+ if ($in_string) {
+ for (;;) {
+ $i = strpos($sql, $string_start, $i);
+ // No end of string found -> add the current
+ // substring to the returned array
+ if (!$i) {
+ $ret[] = $sql;
+ return true;
+ }
+ // Backquotes or no backslashes before
+ // quotes: it's indeed the end of the
+ // string -> exit the loop
+ else if ($string_start == '`' || $sql[$i-1] != '\\') {
+ $string_start = '';
+ $in_string = false;
+ break;
+ }
+ // one or more Backslashes before the presumed
+ // end of string...
+ else {
+ // first checks for escaped backslashes
+ $j = 2;
+ $escaped_backslash = false;
+ while ($i-$j > 0 && $sql[$i-$j] == '\\') {
+ $escaped_backslash = !$escaped_backslash;
+ $j++;
+ }
+ // ... if escaped backslashes: it's really the
+ // end of the string -> exit the loop
+ if ($escaped_backslash) {
+ $string_start = '';
+ $in_string = false;
+ break;
+ }
+ // ... else loop
+ else {
+ $i++;
+ }
+ } // end if...elseif...else
+ } // end for
+ } // end if (in string)
+ // We are not in a string, first check for delimiter...
+ else if ($char == ';') {
+ // if delimiter found, add the parsed part to the returned array
+ $ret[] = substr($sql, 0, $i);
+ $sql = ltrim(substr($sql, min($i + 1, $sql_len)));
+ $sql_len = strlen($sql);
+ if ($sql_len) {
+ $i = -1;
+ } else {
+ // The submited statement(s) end(s) here
+ return true;
+ }
+ } // end else if (is delimiter)
+ // ... then check for start of a string,...
+ else if (($char == '"') || ($char == '\'') || ($char == '`')) {
+ $in_string = true;
+ $string_start = $char;
+ } // end else if (is start of string)
+
+ // for start of a comment (and remove this comment if found)...
+ else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
+ // starting position of the comment depends on the comment type
+ $start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
+ // if no "\n" exits in the remaining string, checks for "\r"
+ // (Mac eol style)
+ $end_of_comment = (strpos(' ' . $sql, "\012", $i+2))
+ ? strpos(' ' . $sql, "\012", $i+2)
+ : strpos(' ' . $sql, "\015", $i+2);
+ if (!$end_of_comment) {
+ // no eol found after '#', add the parsed part to the returned
+ // array and exit
+ // RMV fix for comments at end of file
+ $last = trim(substr($sql, 0, $i-1));
+ if (!empty($last)) {
+ $ret[] = $last;
+ }
+ return true;
+ } else {
+ $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
+ $sql_len = strlen($sql);
+ $i--;
+ } // end if...else
+ } // end else if (is comment)
+ } // end for
+
+ // add any rest to the returned array
+ if (!empty($sql) && trim($sql) != '') {
+ $ret[] = $sql;
+ }
+ return true;
+ }
+
+ /**
+ * add a prefix.'_' to all tablenames in a query
+ *
+ * @param string $query valid SQL query string
+ * @param string $prefix prefix to add to all table names
+ * @return mixed FALSE on failure
+ */
+ function prefixQuery($query, $prefix)
+ {
+ $pattern = "/^(INSERT INTO|CREATE TABLE|ALTER TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
+ $pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
+ if (preg_match($pattern, $query, $matches) || preg_match($pattern2, $query, $matches)) {
+ $replace = "\\1 ".$prefix."_\\4\\5";
+ $matches[0] = preg_replace($pattern, $replace, $query);
+ return $matches;
+ }
+ return false;
+ }
+}
+?>
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:45:45 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:45:45 +0900
Subject: [xoops-cvslog 1423] CVS update: xoops2jp/html/class/database
Message-ID: <20051226154545.34E5C2AC06B@users.sourceforge.jp>
Index: xoops2jp/html/class/database/sqlutility.php
diff -u xoops2jp/html/class/database/sqlutility.php:1.2 xoops2jp/html/class/database/sqlutility.php:1.2.8.1
--- xoops2jp/html/class/database/sqlutility.php:1.2 Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/database/sqlutility.php Tue Dec 27 00:45:45 2005
@@ -1,160 +1,109 @@
- * @copyright copyright (c) 2000-2003 XOOPS.org
- */
+
/**
- * provide some utility methods for databases
- *
- * @author Kazumi Ono
- * @copyright copyright (c) 2000-2003 XOOPS.org
- *
- * @package kernel
- * @subpackage database
+ * @author Marijuana
*/
-class SqlUtility
+class sqlutility
{
- /**
- * Function from phpMyAdmin (http://phpwizard.net/projects/phpMyAdmin/)
- *
- * Removes comment and splits large sql files into individual queries
- *
- * Last revision: September 23, 2001 - gandon
- *
- * @param array the splitted sql commands
- * @param string the sql commands
- * @return boolean always true
- * @access public
- */
- function splitMySqlFile(&$ret, $sql)
- {
- $sql = trim($sql);
- $sql_len = strlen($sql);
- $char = '';
- $string_start = '';
- $in_string = false;
-
- for ($i = 0; $i < $sql_len; ++$i) {
- $char = $sql[$i];
-
- // We are in a string, check for not escaped end of
- // strings except for backquotes that can't be escaped
- if ($in_string) {
- for (;;) {
- $i = strpos($sql, $string_start, $i);
- // No end of string found -> add the current
- // substring to the returned array
- if (!$i) {
- $ret[] = $sql;
- return true;
- }
- // Backquotes or no backslashes before
- // quotes: it's indeed the end of the
- // string -> exit the loop
- else if ($string_start == '`' || $sql[$i-1] != '\\') {
- $string_start = '';
- $in_string = false;
- break;
- }
- // one or more Backslashes before the presumed
- // end of string...
- else {
- // first checks for escaped backslashes
- $j = 2;
- $escaped_backslash = false;
- while ($i-$j > 0 && $sql[$i-$j] == '\\') {
- $escaped_backslash = !$escaped_backslash;
- $j++;
- }
- // ... if escaped backslashes: it's really the
- // end of the string -> exit the loop
- if ($escaped_backslash) {
- $string_start = '';
- $in_string = false;
- break;
- }
- // ... else loop
- else {
- $i++;
- }
- } // end if...elseif...else
- } // end for
- } // end if (in string)
- // We are not in a string, first check for delimiter...
- else if ($char == ';') {
- // if delimiter found, add the parsed part to the returned array
- $ret[] = substr($sql, 0, $i);
- $sql = ltrim(substr($sql, min($i + 1, $sql_len)));
- $sql_len = strlen($sql);
- if ($sql_len) {
- $i = -1;
- } else {
- // The submited statement(s) end(s) here
- return true;
- }
- } // end else if (is delimiter)
- // ... then check for start of a string,...
- else if (($char == '"') || ($char == '\'') || ($char == '`')) {
- $in_string = true;
- $string_start = $char;
- } // end else if (is start of string)
-
- // for start of a comment (and remove this comment if found)...
- else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
- // starting position of the comment depends on the comment type
- $start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
- // if no "\n" exits in the remaining string, checks for "\r"
- // (Mac eol style)
- $end_of_comment = (strpos(' ' . $sql, "\012", $i+2))
- ? strpos(' ' . $sql, "\012", $i+2)
- : strpos(' ' . $sql, "\015", $i+2);
- if (!$end_of_comment) {
- // no eol found after '#', add the parsed part to the returned
- // array and exit
- // RMV fix for comments at end of file
- $last = trim(substr($sql, 0, $i-1));
- if (!empty($last)) {
- $ret[] = $last;
- }
- return true;
- } else {
- $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
- $sql_len = strlen($sql);
- $i--;
- } // end if...else
- } // end else if (is comment)
- } // end for
-
- // add any rest to the returned array
- if (!empty($sql) && trim($sql) != '') {
- $ret[] = $sql;
- }
- return true;
- }
-
- /**
- * add a prefix.'_' to all tablenames in a query
- *
- * @param string $query valid SQL query string
- * @param string $prefix prefix to add to all table names
- * @return mixed FALSE on failure
- */
- function prefixQuery($query, $prefix)
- {
- $pattern = "/^(INSERT INTO|CREATE TABLE|ALTER TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
- $pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
- if (preg_match($pattern, $query, $matches) || preg_match($pattern2, $query, $matches)) {
- $replace = "\\1 ".$prefix."_\\4\\5";
- $matches[0] = preg_replace($pattern, $replace, $query);
- return $matches;
- }
- return false;
- }
+ var $sql = array();
+ var $create = array();
+ var $dirname;
+ var $safetables = array(
+ 'avatar',
+ 'avatar_user_link',
+ 'block_module_link',
+ 'config',
+ 'configcategory',
+ 'configoption',
+ 'group_permission',
+ 'groups',
+ 'groups_users_link',
+ 'modules',
+ 'newblocks',
+ 'users');
+
+
+ function sqlutility($dirname,$file)
+ {
+ $this->dirname = $dirname;
+ $i = 0;
+ $sql_query = file(ORETEKI_ROOT_PATH.'/modules/'.$dirname.'/'.$file);
+ $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)/siU";
+ foreach ( $sql_query as $fline ) {
+ if ( preg_match($pattern,$fline) ) {
+ $i++;
+ $this->sql[$i] = trim($fline)."\n";
+ } else {
+ $this->sql[$i].= trim($fline)."\n";
+ }
+ }
+
+ foreach ( $this->sql as $i => $sql ) {
+ $sql = $this->prefix($sql);
+ $this->sql[$i] = $this->etcchange($sql);
+ }
+ }
+
+ function prefix($sql)
+ {
+ $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
+ if ( preg_match($pattern, $sql, $matches) ) {
+ $replace = "\\1 ".XOOPS_DB_PREFIX."_\\4\\5";
+ $sql = preg_replace($pattern, $replace, $sql);
+ if ( preg_match("/^CREATE TABLE/siU", $sql) && !in_array($matches[4],$safetables) ) {
+ $this->create[] = $matches[4];
+ }
+ }
+ return $sql;
+ }
+
+ function etcchange($sql)
+ {
+ $patterns[] = '{dirname}';
+ $replacements[] = $this->dirname;
+ $sql = str_replace($patterns,$replacements,$sql);
+ return $sql;
+ }
+
+ function get_sql()
+ {
+ return $this->sql;
+ }
+
+ function get_create()
+ {
+ return $this->create;
+ }
+
+ /*
+ function changesql($dirname,$file)
+ {
+ $sql = array();
+ $i = 0;
+ $sql_query = file(ORETEKI_ROOT_PATH.'/modules/'.$dirname.'/'.$file);
+ $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)/siU";
+ foreach ( $sql_query as $fline ) {
+ if ( preg_match($pattern,$fline) ) {
+ $i++;
+ $sql[$i] = trim($fline)."\n";
+ } else {
+ $sql[$i].= trim($fline)."\n";
+ }
+ }
+
+ $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
+ foreach ( $sql as $i => $query ) {
+ if ( preg_match($pattern, $query, $matches) ) {
+ $replace = "\\1 ".ORETEKI_DB_PREFIX."_\\4\\5";
+ $sql[$i] = preg_replace($pattern, $replace, $query);
+ }
+ }
+ $patterns[] = '{dirname}';
+ $replacements[] = $dirname;
+ $sql = str_replace($patterns,$replacements,$sql);
+ return $sql;
+ }
+ */
}
-?>
+?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:48:29 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:48:29 +0900
Subject: [xoops-cvslog 1424] CVS update: xoops2jp/html/class/database
Message-ID: <20051226154829.6BE9D2AC06B@users.sourceforge.jp>
Index: xoops2jp/html/class/database/mysqldatabase.php
diff -u xoops2jp/html/class/database/mysqldatabase.php:1.2.8.1 xoops2jp/html/class/database/mysqldatabase.php:1.2.8.2
--- xoops2jp/html/class/database/mysqldatabase.php:1.2.8.1 Wed Nov 16 01:10:55 2005
+++ xoops2jp/html/class/database/mysqldatabase.php Tue Dec 27 00:48:29 2005
@@ -1,5 +1,5 @@
prefix());
+ $prefixed_query = OldSqlUtility::prefixQuery(trim($query), $this->prefix());
if ($prefixed_query != false) {
$this->query($prefixed_query[0]);
}
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:48:44 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:48:44 +0900
Subject: [xoops-cvslog 1425] CVS update: xoops2jp/html/install/class
Message-ID: <20051226154844.36DB02AC06B@users.sourceforge.jp>
Index: xoops2jp/html/install/class/dbmanager.php
diff -u xoops2jp/html/install/class/dbmanager.php:1.2 xoops2jp/html/install/class/dbmanager.php:1.2.8.1
--- xoops2jp/html/install/class/dbmanager.php:1.2 Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/dbmanager.php Tue Dec 27 00:48:44 2005
@@ -26,13 +26,13 @@
include_once XOOPS_ROOT_PATH.'/class/logger.php';
include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
include_once XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php';
-include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
+include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php';
/**
* database manager for XOOPS installer
*
* @author Haruki Setoyama
-* @version $Id: dbmanager.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+* @version $Id: dbmanager.php,v 1.2.8.1 2005/12/26 15:48:44 minahito Exp $
* @access public
**/
class db_manager {
@@ -71,13 +71,13 @@
return false;
}
$sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
- SqlUtility::splitMySqlFile($pieces, $sql_query);
+ OldSqlUtility::splitMySqlFile($pieces, $sql_query);
$this->db->connect();
foreach ($pieces as $piece) {
$piece = trim($piece);
// [0] contains the prefixed query
// [4] contains unprefixed table name
- $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
+ $prefixed_query = OldSqlUtility::prefixQuery($piece, $this->db->prefix());
if ($prefixed_query != false ) {
$table = $this->db->prefix($prefixed_query[4]);
if($prefixed_query[1] == 'CREATE TABLE'){
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:49:18 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:49:18 +0900
Subject: [xoops-cvslog 1426] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20051226154918.4E9F72AC06B@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.7 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.8
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.7 Mon Dec 26 20:03:26 2005
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Tue Dec 27 00:49:18 2005
@@ -306,6 +306,8 @@
$this->mRoot->setThemeName($this->mConfig['theme_set']);
$GLOBALS['xoopsConfig']=&$this->mConfig;
+
+ $this->mRoot->setThemeName($this->mConfig['theme_set']);
}
/**
@@ -417,7 +419,7 @@
// Theme Control
//
$screenTarget=$this->mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget();
- $screenTarget->setTemplateName($this->mConfig['theme_set']);
+ $screenTarget->setTemplateName($this->mRoot->getThemeName());
$screenTarget->setAttribute('xoops_contents',$renderTarget->getResult());
From minahito ＠ users.sourceforge.jp Tue Dec 27 00:49:32 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 00:49:32 +0900
Subject: [xoops-cvslog 1427] CVS update:
xoops2jp/html/modules/system/admin/modulesadmin
Message-ID: <20051226154932.700352AC06B@users.sourceforge.jp>
Index: xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php
diff -u xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.2.8.1 xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.2.8.2
--- xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php:1.2.8.1 Wed Oct 19 02:21:55 2005
+++ xoops2jp/html/modules/system/admin/modulesadmin/modulesadmin.php Tue Dec 27 00:49:32 2005
@@ -1,5 +1,5 @@
$sql_file_path.
Creating tables...";
- include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
+ include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php';
$sql_query = fread(fopen($sql_file_path, 'r'), filesize($sql_file_path));
$sql_query = trim($sql_query);
- SqlUtility::splitMySqlFile($pieces, $sql_query);
+ OldSqlUtility::splitMySqlFile($pieces, $sql_query);
$created_tables = array();
foreach ($pieces as $piece) {
// [0] contains the prefixed query
// [4] contains unprefixed table name
- $prefixed_query = SqlUtility::prefixQuery($piece, $db->prefix());
+ $prefixed_query = OldSqlUtility::prefixQuery($piece, $db->prefix());
if (!$prefixed_query) {
$errs[] = "$piece is not a valid SQL!";
$error = true;
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:28:38 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:28:38 +0900
Subject: [xoops-cvslog 1428] CVS update: xoops2jp/html/class/database
Message-ID: <20051227052838.922192AC0E9@users.sourceforge.jp>
Index: xoops2jp/html/class/database/sqlutility.php
diff -u xoops2jp/html/class/database/sqlutility.php:1.2.8.1 xoops2jp/html/class/database/sqlutility.php:1.2.8.2
--- xoops2jp/html/class/database/sqlutility.php:1.2.8.1 Tue Dec 27 00:45:45 2005
+++ xoops2jp/html/class/database/sqlutility.php Tue Dec 27 14:28:38 2005
@@ -28,14 +28,20 @@
{
$this->dirname = $dirname;
$i = 0;
- $sql_query = file(ORETEKI_ROOT_PATH.'/modules/'.$dirname.'/'.$file);
+ $sql_query = file(XOOPS_MODULE_PATH.'/'.$dirname.'/'.$file);
$pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)/siU";
foreach ( $sql_query as $fline ) {
+ $fline=trim($fline);
if ( preg_match($pattern,$fline) ) {
$i++;
$this->sql[$i] = trim($fline)."\n";
- } else {
- $this->sql[$i].= trim($fline)."\n";
+ } elseif (strlen($fline)>0 && strpos($fline,"#")===false) {
+ if(isset($this->sql[$i])) {
+ $this->sql[$i] .= trim($fline)."\n";
+ }
+ else {
+ $this->sql[$i] = trim($fline)."\n";
+ }
}
}
@@ -51,7 +57,7 @@
if ( preg_match($pattern, $sql, $matches) ) {
$replace = "\\1 ".XOOPS_DB_PREFIX."_\\4\\5";
$sql = preg_replace($pattern, $replace, $sql);
- if ( preg_match("/^CREATE TABLE/siU", $sql) && !in_array($matches[4],$safetables) ) {
+ if ( preg_match("/^CREATE TABLE/siU", $sql) && !in_array($matches[4],$this->safetables) ) {
$this->create[] = $matches[4];
}
}
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:29:51 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:29:51 +0900
Subject: [xoops-cvslog 1429] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20051227052951.E55302AC0E9@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.8 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.9
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.8 Tue Dec 27 00:49:18 2005
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Tue Dec 27 14:29:51 2005
@@ -604,8 +604,8 @@
function setupModuleController(&$controller)
{
- require_once XOOPS_BASE_PATH."/class/Base_LegacyModuleController.class.php";
- $controller->mModuleController=new Base_LegacyModuleController($controller);
+ require_once XOOPS_BASE_PATH."/kernel/Legacy_ModuleController.class.php";
+ $controller->mModuleController=new Legacy_ModuleController($controller);
}
function setupRenderSystem(&$controller)
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:30:09 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:30:09 +0900
Subject: [xoops-cvslog 1430] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20051227053009.4C5ED2AC0E9@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php
diff -u /dev/null xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.1
--- /dev/null Tue Dec 27 14:30:09 2005
+++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php Tue Dec 27 14:30:09 2005
@@ -0,0 +1,134 @@
+ //
+// ------------------------------------------------------------------------ //
+// 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("LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME","./xoops_version.php");
+
+class Legacy_ModuleController extends XCube_ModuleController
+{
+ var $mModuleObject;
+
+ function prepare()
+ {
+ // Is this request module process?
+ if(!$this->isModuleProcess())
+ return;
+
+ $this->_createModuleObject();
+
+ if(!$this->isActive())
+ return;
+
+ //
+ // Set config values for this module
+ //
+ if($this->mModuleObject!=null) {
+ if($this->mModuleObject->getVar('hasconfig')==1 || $this->mModuleObject->getVar('hascomments')==1) {
+ $configHandler=&xoops_gethandler('config');
+ $this->mConfig=&$configHandler->getConfigsByCat(0,$this->mModuleObject->getVar('mid'));
+ }
+
+ define('__XC_DIRNAME__', $this->mModuleObject->getVar('dirname'));
+ }
+ }
+
+ /**
+ @return boolean
+ */
+ function isModuleProcess()
+ {
+ return file_exists(LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME);
+ }
+
+ function isActive()
+ {
+ return is_object($this->mModuleObject) && $this->mModuleObject->getVar('isactive');
+ }
+
+ /**
+ * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
+ * @return bool
+ */
+ function isPermission()
+ {
+ $xoopsUser =& $this->mController->mXoopsUser;
+ $xoopsModule=&$this->mModuleObject;
+ $modPermHandler =& xoops_gethandler('groupperm');
+
+ if(is_object($xoopsUser)) {
+ if (!$modPermHandler->checkRight('module_read', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
+ return false;
+ }
+ $GLOBALS['xoopsUserIsAdmin']=$xoopsUser->isAdmin($xoopsModule->getVar('mid'));
+ return true;
+ }
+ else {
+ return $modPermHandler->checkRight('module_read', $xoopsModule->getVar('mid'), XOOPS_GROUP_ANONYMOUS);
+ }
+ }
+
+ /**
+ @return void
+ */
+ function _createModuleObject()
+ {
+ $moduleHandler=&xoops_gethandler('module');
+ $this->mModuleObject=&$moduleHandler->getByDirname($this->_getDirname());
+ }
+
+
+ function _getDirname()
+ {
+ $url_arr = explode("/",strstr($_SERVER['REQUEST_URI'],'/modules/'));
+ return $url_arr[2];
+ }
+
+ function setupLanguage()
+ {
+ $languageManager=&$this->mController->mRoot->getLanguageManager();
+ $languageManager->loadModuleLanguage($this->mModuleObject->getVar('dirname'));
+ }
+
+ function _processErrorModuleNotExist()
+ {
+ // Wmm...
+ require_once XOOPS_ROOT_PATH ."/header.php";
+ print "" . _MODULENOEXIST . "";
+ require_once XOOPS_ROOT_PATH ."/footer.php";
+ exit();
+ }
+
+ function getModuleDir()
+ {
+ return XOOPS_ROOT_PATH."/modules/".$this->mModuleObject->getVar('dirname');
+ }
+
+ function &getXoopsModule()
+ {
+ return $this->mModuleObject;
+ }
+}
+?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:31:15 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:31:15 +0900
Subject: [xoops-cvslog 1431] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051227053115.E6A762AC0E9@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.3 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.3 Wed Dec 21 13:09:36 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php Tue Dec 27 14:31:15 2005
@@ -48,16 +48,16 @@
function installTable(&$module, &$log)
{
$sqlfileInfo =& $module->getInfo('sqlfile');
- $sqlfile = XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $sqlfileInfo[XOOPS_DB_TYPE];
- if (!file_exists($sqlfile)) {
+ $dirname = $module->getVar('dirname');
+
+ $sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
+ if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/" . $sqlfile)) {
$log->addError("SQL file not found at $sqlfile");
return false;
}
- $sqlQuery = trim(implode("", file($sqlfile)));
-
require_once XOOPS_ROOT_PATH . "/class/database/sqlutility.php";
- SqlUtility::splitMySqlFile($pieces, $sqlQuery);
+ $util =& new sqlutility($module->getVar('dirname'),$sqlfile);
$root =& XCube_Root::getSingleton();
$db =& $root->mController->getDB();
@@ -65,27 +65,13 @@
//
// TODO The following variable exists for rollback, but it is not implemented.
//
- $createdTables = array();
+ $createdTables = $util->get_create();;
- foreach ($pieces as $piece) {
- $prefixedQuery =SqlUtility::prefixQuery($piece, $db->prefix());
- if ($prefixedQuery == false) {
- $log->addError("${piece} is not a valid SQL");
- return;
- }
-
- if (!$db->query($prefixedQuery[0])) {
+ foreach ($util->get_sql() as $sql) {
+ if (!$db->query($sql)) {
$log->addError($db->error());
return;
}
-
- // TODO I don't use reserve table in this time.
- if (!in_array($prefixedQuery[4], $createdTables)) {
- $createdTables[] = $prefixedQuery[4];
- }
- else {
- $log->addReport("Data inserted to table " . $db->prefix($prefixedQuery[4]));
- }
}
$log->addReport("*Database table setup finished.*");
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:32:58 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:32:58 +0900
Subject: [xoops-cvslog 1432] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20051227053258.083142AC0EB@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.5 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.6
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.5 Thu Dec 22 20:22:39 2005
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php Tue Dec 27 14:32:57 2005
@@ -1,5 +1,5 @@
mConfig=&$configHandler->getConfigsByCat(0,$this->mModuleObject->getVar('mid'));
}
+
+ define('__XC_DIRNAME__', $this->mModuleObject->getVar('dirname'));
}
}
@@ -105,12 +107,12 @@
//
$module=null;
if($dirname!=null) {
- $module=&$moduleHandler->getByDirname($this->_getDirname());
+ $module=&$moduleHandler->getByDirname($dirname);
}
else {
$module=&$moduleHandler->getByDirname("system");
}
-
+
//
// We must set $xoopsModule to some module that use $xoopsModule in message catalog file.
//
From minahito ＠ users.sourceforge.jp Tue Dec 27 14:34:04 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 14:34:04 +0900
Subject: [xoops-cvslog 1433] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20051227053404.4F13C2AC0EB@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/class/Base_LegacyModuleController.class.php
diff -u xoops2jp/html/modules/base/class/Base_LegacyModuleController.class.php:1.1.2.5 xoops2jp/html/modules/base/class/Base_LegacyModuleController.class.php:removed
--- xoops2jp/html/modules/base/class/Base_LegacyModuleController.class.php:1.1.2.5 Thu Nov 24 01:31:52 2005
+++ xoops2jp/html/modules/base/class/Base_LegacyModuleController.class.php Tue Dec 27 14:34:04 2005
@@ -1,133 +0,0 @@
- //
-// ------------------------------------------------------------------------ //
-// 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("LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME","./xoops_version.php");
-
-class Base_LegacyModuleController extends XCube_ModuleController
-{
- var $mModuleObject;
-
- function prepare()
- {
- // Is this request module process?
- if(!$this->isModuleProcess())
- return;
-
- $this->_createModuleObject();
-
- if(!$this->isActive())
- return;
-
-
- //
- // Set config values for this module
- //
- if($this->mModuleObject!=null) {
- if($this->mModuleObject->getVar('hasconfig')==1 || $this->mModuleObject->getVar('hascomments')==1) {
- $configHandler=&xoops_gethandler('config');
- $this->mConfig=&$configHandler->getConfigsByCat(0,$this->mModuleObject->getVar('mid'));
- }
- }
- }
-
- /**
- @return boolean
- */
- function isModuleProcess()
- {
- return file_exists(LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME);
- }
-
- function isActive()
- {
- return is_object($this->mModuleObject) && $this->mModuleObject->getVar('isactive');
- }
-
- /**
- * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
- * @return bool
- */
- function isPermission()
- {
- $xoopsUser =& $this->mController->mXoopsUser;
- $xoopsModule=&$this->mModuleObject;
- $modPermHandler =& xoops_gethandler('groupperm');
-
- if(is_object($xoopsUser)) {
- if (!$modPermHandler->checkRight('module_read', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
- return false;
- }
- $GLOBALS['xoopsUserIsAdmin']=$xoopsUser->isAdmin($xoopsModule->getVar('mid'));
- return true;
- }
- else {
- return $modPermHandler->checkRight('module_read', $xoopsModule->getVar('mid'), XOOPS_GROUP_ANONYMOUS);
- }
- }
-
- /**
- @return void
- */
- function _createModuleObject()
- {
- $moduleHandler=&xoops_gethandler('module');
- $this->mModuleObject=&$moduleHandler->getByDirname($this->_getDirname());
- }
-
-
- function _getDirname()
- {
- $url_arr = explode("/",strstr($_SERVER['REQUEST_URI'],'/modules/'));
- return $url_arr[2];
- }
-
- function setupLanguage()
- {
- $languageManager=&$this->mController->mRoot->getLanguageManager();
- $languageManager->loadModuleLanguage($this->mModuleObject->getVar('dirname'));
- }
-
- function _processErrorModuleNotExist()
- {
- // Wmm...
- require_once XOOPS_ROOT_PATH ."/header.php";
- print "" . _MODULENOEXIST . "";
- require_once XOOPS_ROOT_PATH ."/footer.php";
- exit();
- }
-
- function getModuleDir()
- {
- return XOOPS_ROOT_PATH."/modules/".$this->mModuleObject->getVar('dirname');
- }
-
- function &getXoopsModule()
- {
- return $this->mModuleObject;
- }
-}
-?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:28:36 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:28:36 +0900
Subject: [xoops-cvslog 1434] CVS update:
xoops2jp/html/modules/base/language/english
Message-ID: <20051227102836.A70F52AC019@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.1 xoops2jp/html/modules/base/language/english/global.php:1.1.2.2
--- xoops2jp/html/modules/base/language/english/global.php:1.1.2.1 Mon Dec 26 18:03:11 2005
+++ xoops2jp/html/modules/base/language/english/global.php Tue Dec 27 19:28:36 2005
@@ -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.1 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.2
--- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.1 Mon Dec 26 18:03:11 2005
+++ xoops2jp/html/modules/base/language/japanese/global.php Tue Dec 27 19:28:41 2005
@@ -164,9 +164,16 @@
define('_WEEK', '1週間');
define('_MONTH', '1ヶ月');
+define('_HELP', "ヘルプ");
+
//%%%%% LANGUAGE SPECIFIC SETTINGS %%%%%
-define('_CHARSET', 'EUC-JP');
-define('_LANGCODE', 'ja');
+if (!defined('_CHARSET')) {
+ define('_CHARSET', 'EUC-JP');
+}
+
+if (!defined('_LANGCODE')) {
+ define('_LANGCODE', 'ja');
+}
// change 0 to 1 if this language is a multi-bytes language
define('XOOPS_USE_MULTIBYTES', '1');
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:29:31 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:29:31 +0900
Subject: [xoops-cvslog 1436] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20051227102931.19BA42AC019@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php:1.1.2.1
--- /dev/null Tue Dec 27 19:29:31 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php Tue Dec 27 19:29:30 2005
@@ -0,0 +1,101 @@
+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("helpurl", "Legacy_modifier_helpurl");
+ }
+
+ function _get_auto_filename($autoBase, $autoSource = null, $auotId = null)
+ {
+ $autoSource = $this->mDirname . "_help_" . $autoSource;
+ return parent::_get_auto_filename($autoBase, $autoSource, $auotId);
+ }
+}
+
+
+/**
+ * This action will show the information of a module specified to user.
+ */
+class LegacyHelpAction extends LegacyAdminAction
+{
+ var $mModuleObject = null;
+ var $mContents = null;
+
+ 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_ADMIN_FRAME_VIEW_ERROR;
+ }
+
+ if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
+ return LEGACY_ADMIN_FRAME_VIEW_ERROR;
+ }
+
+ $moduleHandler =& xoops_gethandler('module');
+ $this->mModuleObject =& $moduleHandler->getByDirname($dirname);
+
+ $language =& $controller->getConfig('language');
+
+ $helpfile = $this->mModuleObject->getHelp();
+
+ //
+ // Smarty
+ //
+ $smarty =& new Legacy_HelpSmarty();
+
+ //
+ // file check
+ //
+ $template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/" . $language;
+ if (!file_exists($template_dir . "/" . $helpfile)) {
+ $template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/english";
+ if (!file_exists($template_dir . "/" . $helpfile)) {
+ return LEGACY_ADMIN_FRAME_VIEW_ERROR;
+ }
+ }
+
+ $smarty->template_dir = $template_dir;
+ $this->mContents = $smarty->fetch("file:" . $helpfile);
+
+ return LEGACY_ADMIN_FRAME_VIEW_SUCCESS;
+ }
+
+ function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
+ {
+ $renderer->setTemplateName("help.html");
+ $renderer->setAttribute('module', $this->mModuleObject);
+ $renderer->setAttribute('contents', $this->mContents);
+ }
+
+ function executeViewError(&$controller, &$xoopsUser, &$renderer)
+ {
+ XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*Module not found*");
+ }
+}
+
+?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:30:11 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:30:11 +0900
Subject: [xoops-cvslog 1437] CVS update:
xoops2jp/html/modules/base/admin/blocks
Message-ID: <20051227103011.B6A422AC019@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.3 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.3 Mon Nov 28 22:43:29 2005
+++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php Tue Dec 27 19:30:11 2005
@@ -63,6 +63,13 @@
'title' => _PREFERENCES,
'absolute' => true);
}
+
+ if ($module->hasHelp()) {
+ $helpUrl = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&dirname=" . $module->getVar('dirname');
+ $module->adminmenu[] = array('link' => $helpUrl,
+ 'title' => _HELP,
+ 'absolute' => true);
+ }
$this->mModules[]=&$module;
unset($module);
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:35:03 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:35:03 +0900
Subject: [xoops-cvslog 1438] CVS update: xoops2jp/html/kernel
Message-ID: <20051227103504.C75862AC049@users.sourceforge.jp>
Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.3 xoops2jp/html/kernel/module.php:1.2.8.4
--- xoops2jp/html/kernel/module.php:1.2.8.3 Thu Dec 1 01:22:08 2005
+++ xoops2jp/html/kernel/module.php Tue Dec 27 19:35:02 2005
@@ -1,5 +1,5 @@
getVar('version') / 100;
}
+ /**
+ * @return bool
+ */
+ function hasHelp()
+ {
+ $info =& $this->getInfo();
+ if (isset($info['help']) && strlen($info['help']) > 0) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @return string
+ */
+ function getHelp()
+ {
+ if ($this->hasHelp()) {
+ return $this->modinfo['help'];
+ }
+
+ return null;
+ }
+
/**#@+
* For backward compatibility only!
* @deprecated
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:35:50 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:35:50 +0900
Subject: [xoops-cvslog 1439] CVS update: xoops2jp/html/kernel
Message-ID: <20051227103550.548282AC019@users.sourceforge.jp>
Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.2 xoops2jp/html/kernel/block.php:1.2.8.3
--- xoops2jp/html/kernel/block.php:1.2.8.2 Sat Dec 10 18:50:35 2005
+++ xoops2jp/html/kernel/block.php Tue Dec 27 19:35:50 2005
@@ -1,5 +1,5 @@
db->prefix('newblocks');
+ if ($criteria)
+ $sql .= " " . $criteria->renderWhere();
+
+ $result = $this->db->query($sql);
+ if (!$result) {
+ return $ret;
+ }
+
+ while ($row = $this->db->fetchArray($result)) {
+ $block = new XoopsBlock();
+ $block->assignVars($row);
+ unset($block);
+ }
+
+ return $ret;
+ }
+
/**
* get a list of blocks matchich certain conditions
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:36:26 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:36:26 +0900
Subject: [xoops-cvslog 1440] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227103626.15CEB2AC019@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/help.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.1
--- /dev/null Tue Dec 27 19:36:26 2005
+++ xoops2jp/html/modules/base/admin/templates/help.html Tue Dec 27 19:36:25 2005
@@ -0,0 +1 @@
+<{$contents}>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:37:23 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:37:23 +0900
Subject: [xoops-cvslog 1441] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227103723.936D92AC049@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.2 Mon Dec 19 23:03:15 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html Tue Dec 27 19:37:23 2005
@@ -1,56 +1,60 @@
-» <{$smarty.const._MI_BASE_MENU_MODULELIST}> » <{$smarty.const._MI_BASE_MENU_MODUPDATE_CONF}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.5 Mon Dec 19 23:03:25 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html Tue Dec 27 19:37:23 2005
@@ -1,44 +1,54 @@
-» <{$smarty.const._MI_BASE_MENU_MODULELIST}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:37:31 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:37:31 +0900
Subject: [xoops-cvslog 1442] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227103731.A9E5B2AC049@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_inst_moduleinfo.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_inst_moduleinfo.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/legacy_admin_inst_moduleinfo.html:removed
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_inst_moduleinfo.html:1.1.2.3 Mon Dec 19 23:02:50 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_inst_moduleinfo.html Tue Dec 27 19:37:31 2005
@@ -1,263 +0,0 @@
-» <{$smarty.const._MI_BASE_MENU_MODULELIST}> » <{$smarty.const._MD_A_BASE_LANG_INFORMATION}>
-
-<{$smarty.const._MD_A_BASE_LANG_MOD_BASIC_INFO}>
-
-
- }>/<{$module->modinfo.image}>)
- <{$module->modinfo.name|escape}> |
- <{$smarty.const._MD_A_BASE_LANG_NAME}> |
- <{$module->getVar('name',e)}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}> |
- <{$module->getVar('dirname',e)}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_VERSION}> |
- <{math equation="v/100" v=$module->getVar('version') format="%.2f"}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MID}> |
- <{$module->getVar('mid')}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MOD_DESC}> |
- <{$module->modinfo.description|escape}> |
-
-
-
-
-<{$smarty.const._MD_A_BASE_LANG_MOD_LICENSE_INFO}>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MODULE_LICENSE}> |
- <{$module->modinfo.license|escape}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MOD_AUTHOR}> |
- <{$module->modinfo.author|escape}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MOD_CREDITS}> |
- <{$module->modinfo.credits|escape}> |
-
-
-
-
-<{$smarty.const._MD_A_BASE_LANG_SQL_INFO}>
-<{if $module->modinfo.tables}>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_SQL_HAS_MAIN}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_SQL_ENGINE}> |
- <{$smarty.const._MD_A_BASE_LANG_SQL_MYSQL}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_SQL_FILE_NAME}> |
- <{$module->modinfo.sqlfile.mysql}> |
-
-
-
-
-
- | <{$smarty.const._MD_A_BASE_LANG_TABLE_NUM}> |
- <{$smarty.const._MD_A_BASE_LANG_TABLE_NAME}> |
- <{$smarty.const._MD_A_BASE_LANG_TABLE_PROPERTIES}> |
-
-<{foreach from=$module->modinfo.tables item=table key=table_key}>
-
- | <{$table_key}> |
- <{$table}> |
- xxxxxxxxxxxxx |
-
-<{/foreach}>
-
-<{else}>
- <{$smarty.const._MD_A_BASE_LANG_NO_SQL}>
-<{/if}>
-
-
-<{$smarty.const._MD_A_BASE_LANG_MAINMENU_INFO}>
-<{if $module->getVar('hasmain')}>
-
-
-
- | <{$smarty.const._MD_A_BASE_LANG_MAINMENU_HAS_MAIN}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-
-
-
-
- | <{$smarty.const._MD_A_BASE_LANG_SUBMENU_NAME}> |
- <{$smarty.const._MD_A_BASE_LANG_SUBMENU_URL}> |
-
- <{foreach from=$module->modinfo.sub item=sub }>
- ">
- | <{$sub.name}> |
- <{$sub.url}> |
-
- <{foreachelse}>
-
- | <{$smarty.const._MD_A_BASE_LANG_NO_SUBMENU}> |
-
- <{/foreach}>
-
-
-<{else}>
-<{$smarty.const._MD_A_BASE_LANG_NO_MAINMENU}>
-<{/if}>
-
-
-<{$smarty.const._MD_A_BASE_LANG_ADMIN_MENU}>
-<{if $module->getVar('hasadmin')}>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_HAS_MAIN}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_INDEX}> |
- <{$module->modinfo.adminindex}> |
-
-
- <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_MENU}> |
- <{$module->modinfo.adminmenu}> |
-
-
-<{if $module->adminmenu }>
-
-
-
- | <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_KEY}> |
- <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_NAME}> |
- <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_URL}> |
-
- <{foreach from=$module->adminmenu item=admin key=admin_key}>
-
- | <{$admin_key}> |
- "><{$admin.title}> |
- "><{$admin.link}> |
-
- <{/foreach}>
-
-<{/if}>
-<{else}>
- <{$smarty.const._MD_A_BASE_LANG_NO_ADMINMENU}>
-<{/if}>
-
-
-
-<{$smarty.const._MD_A_BASE_LANG_TEMPLATE_INFO}>
-<{if $module->modinfo.templates }>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_HAS_MAIN}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-
- | <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_ENGINE}> |
- <{$smarty.const._MD_A_BASE_LANG_SMARTY}> |
-
-
-
-
-
- | <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_KEY}> |
- <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_FILE}> |
- <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_DESC}> |
-
-<{foreach from=$module->modinfo.templates item=template key=template_key}>
-
- | <{$template_key}> |
- <{$template.file}> |
- <{$template.description}> |
-
-<{/foreach}>
-
-<{else}>
- <{$smarty.const._MD_A_BASE_LANG_NO_TEMPLATE}>
-<{/if}>
-
-
-<{$smarty.const._MD_A_BASE_LANG_BLOCKS_INFO}>
-
-<{foreach from=$module->modinfo.blocks item=block key=block_num }>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_BLOCK_KEY}> (<{$block_num}>) |
- <{$smarty.const._MD_A_BASE_LANG_BLOCK_VAL}> |
-
- <{foreach from=$block key=block_key item=block_val name=block }>
-
- | <{$block_key}> |
- <{if $block_key == "name" }>
- <{$block_val}> |
- <{else}>
- <{$block_val}> |
- <{/if}>
-
- <{/foreach}>
-
-
-<{foreachelse}>
- <{$smarty.const._MD_A_BASE_LANG_NO_BLOCK}>
-<{/foreach}>
-
-
-<{$smarty.const._MD_A_BASE_LANG_CONFIG_INFO}>
-
-<{foreach from=$module->modinfo.config item=config key=conf_num }>
-
-
- | <{$smarty.const._MD_A_BASE_LANG_CONFIG_KEY}> (<{$conf_num}>) |
- <{$smarty.const._MD_A_BASE_LANG_CONFIG_VAL}> |
-
- <{foreach from=$config key=config_key item=config_val name=config }>
-
- | <{$config_key}> |
- ">
- <{if $config_key == "name" }>
- <{$config_val}>
- <{elseif $config_key == options }>
- <{foreach from=$config_val item=opt key=opt_key }>
- <{$opt_key}> » <{$opt}>
- <{/foreach}>
- <{else}>
- <{$config_val}>
- <{/if}>
- |
-
- <{/foreach}>
-
-
-<{foreachelse}>
- <{$smarty.const._MD_A_BASE_LANG_NO_CONFIG}>
-<{/foreach}>
-
-
-<{$smarty.const._MD_A_BASE_LANG_FEATURE_SVC_INFO}>
-
-<{if $module->getVar('hassearch')}>
-
- | <{$smarty.const._MD_A_BASE_LANG_SEARCH_SVC}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-<{/if}>
-<{if $module->getVar('hascomments')}>
-
- | <{$smarty.const._MD_A_BASE_LANG_COMMENT_SVC}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-<{/if}>
-
-<{if $module->getVar('hasnotification')}>
-
- | <{$smarty.const._MD_A_BASE_LANG_NOTIF_SVC}> |
- <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> |
-
-<{/if}>
-
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:37:45 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:37:45 +0900
Subject: [xoops-cvslog 1443] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227103745.271152AC019@users.sourceforge.jp>
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.1 xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.1 Wed Dec 21 13:13:32 2005
+++ xoops2jp/html/modules/base/admin/templates/deactive_module_list.html Tue Dec 27 19:37:45 2005
@@ -1,25 +1,22 @@
-» <{$smarty.const._MI_BASE_MENU_MODULEINSTALL}>
+» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}>
<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE}>
From minahito ＠ users.sourceforge.jp Tue Dec 27 19:59:56 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 27 Dec 2005 19:59:56 +0900
Subject: [xoops-cvslog 1444] CVS update:
xoops2jp/html/modules/pm/language/japanese
Message-ID: <20051227105956.86D7B2AC019@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/language/japanese/help.html
diff -u /dev/null xoops2jp/html/modules/pm/language/japanese/help.html:1.1.2.1
--- /dev/null Tue Dec 27 19:59:56 2005
+++ xoops2jp/html/modules/pm/language/japanese/help.html Tue Dec 27 19:59:56 2005
@@ -0,0 +1,13 @@
+プライベートメッセージモジュール
+概要
+
+- XOOPS Cube 2.1 にプライベートメッセージ機能を付加します
+- プライベートメッセージに関する仮想サービスを提供します
+- ルートディレクトリ pmlite.php が発行するイベントにコールバックを登録し、従前動作と同じ動きを実現します
+- XOOPS 2.0.x シリーズと同様のプルダウン指定のほか、テキスト入力による宛先の指定をサポートしています
+
+
+TODO
+
+- 現在、コア機能への組み込みはハードコードされていますが修正される予定です。
+
From minahito ＠ users.sourceforge.jp Wed Dec 28 00:02:25 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 00:02:25 +0900
Subject: [xoops-cvslog 1445] CVS update:
xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20051227150225.17ED32AC048@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:1.1.2.1 Wed Nov 16 19:10:09 2005
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html Wed Dec 28 00:02:24 2005
@@ -1,4 +1,4 @@
From minahito ＠ users.sourceforge.jp Wed Dec 28 00:02:36 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 00:02:36 +0900
Subject: [xoops-cvslog 1446] CVS update:
xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20051227150236.3C88C2AC048@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.6 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.6 Fri Nov 25 00:49:55 2005
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html Wed Dec 28 00:02:36 2005
@@ -1,7 +1,7 @@
<{foreach item=module from=$block}>
<{if $module->modinfo.adminindex}>
-
+
<{if $module->adminmenu}>
@@ -16,6 +16,7 @@
- 設定はありません
<{/if}>
+
<{/if}>
<{/foreach}>
From minahito ＠ users.sourceforge.jp Wed Dec 28 00:02:53 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 00:02:53 +0900
Subject: [xoops-cvslog 1447] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227150253.7ECB42AC048@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/module_information.html
diff -u xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_information.html Wed Dec 28 00:02:53 2005
@@ -1,12 +1,12 @@
-
- <{if $installed }>
- » <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
- <{else}>
- » <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}>
- <{/if}>
-» <{$smarty.const._MD_A_BASE_LANG_INFORMATION}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+<{if $installed }>
+ <{$smarty.const._MD_A_BASE_LANG_INFORMATION}>
+<{else}>
+ <{$smarty.const._MD_A_BASE_LANG_INFO_MODINSTALL}>
+<{/if}>
+
-<{$smarty.const._MD_A_BASE_LANG_MOD_BASIC_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_MOD_BASIC_INFO}>
|
@@ -53,7 +53,7 @@
|
-<{$smarty.const._MD_A_BASE_LANG_MOD_LICENSE_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_MOD_LICENSE_INFO}>
| <{$smarty.const._MD_A_BASE_LANG_MODULE_LICENSE}> |
@@ -70,7 +70,7 @@
-<{$smarty.const._MD_A_BASE_LANG_SQL_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_SQL_INFO}>
<{if $module->modinfo.tables}>
@@ -106,7 +106,7 @@
<{/if}>
-<{$smarty.const._MD_A_BASE_LANG_MAINMENU_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_MAINMENU_INFO}>
<{if $module->getVar('hasmain')}>
@@ -138,7 +138,7 @@
<{/if}>
-<{$smarty.const._MD_A_BASE_LANG_ADMIN_MENU}>
+<{$smarty.const._MD_A_BASE_LANG_ADMIN_MENU}>
<{if $module->getVar('hasadmin')}>
@@ -177,7 +177,7 @@
-<{$smarty.const._MD_A_BASE_LANG_TEMPLATE_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_TEMPLATE_INFO}>
<{if $module->modinfo.templates }>
@@ -209,7 +209,7 @@
<{/if}>
-<{$smarty.const._MD_A_BASE_LANG_BLOCKS_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_BLOCKS_INFO}>
<{foreach from=$module->modinfo.blocks item=block key=block_num }>
@@ -234,7 +234,7 @@
<{/foreach}>
-<{$smarty.const._MD_A_BASE_LANG_CONFIG_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_CONFIG_INFO}>
<{foreach from=$module->modinfo.config item=config key=conf_num }>
@@ -265,7 +265,7 @@
<{/foreach}>
-<{$smarty.const._MD_A_BASE_LANG_FEATURE_SVC_INFO}>
+<{$smarty.const._MD_A_BASE_LANG_FEATURE_SVC_INFO}>
<{if $module->getVar('hassearch')}>
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.3 xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall_confirm.html Wed Dec 28 00:02:53 2005
@@ -1,4 +1,6 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}>
- <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
@@ -49,9 +51,8 @@
-
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.3 xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_install_success.html Wed Dec 28 00:02:53 2005
@@ -1,6 +1,8 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> » <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_SUCCESS}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
-<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LOG}>
+<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_SUCCESS}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LOG}>
<{foreach item=msg from=$log}>
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.3 xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_update_confirm.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_update_confirm.html Wed Dec 28 00:02:53 2005
@@ -1,4 +1,6 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
- <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
@@ -51,7 +53,5 @@
-
-<{* <{$module|debug_print_var}> *}>
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.3 xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_install_confirm.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_install_confirm.html Wed Dec 28 00:02:53 2005
@@ -1,4 +1,6 @@
-
» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> » <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
- <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
@@ -51,7 +53,5 @@
-
-<{* <{$module|debug_print_var}> *}>
Index: xoops2jp/html/modules/base/admin/templates/module_update_success.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.3 Thu Dec 22 20:21:58 2005
+++ xoops2jp/html/modules/base/admin/templates/module_update_success.html Wed Dec 28 00:02:53 2005
@@ -1,6 +1,8 @@
-
» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_SUCCESS}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
-<{$smarty.const._MD_A_BASE_LANG_MODUPDATE_LOG}>
+<{$smarty.const._MD_A_BASE_LANG_MODUPDATE_SUCCESS}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODUPDATE_LOG}>
<{foreach item=msg from=$log}>
From minahito ＠ users.sourceforge.jp Wed Dec 28 00:03:01 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 00:03:01 +0900
Subject: [xoops-cvslog 1448] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227150301.A065B2AC05E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.3 Tue Dec 27 19:37:23 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html Wed Dec 28 00:03:01 2005
@@ -53,7 +53,7 @@
<{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.6 Tue Dec 27 19:37:23 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html Wed Dec 28 00:03:01 2005
@@ -1,27 +1,29 @@
» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
-
From minahito ＠ users.sourceforge.jp Wed Dec 28 00:03:10 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 00:03:10 +0900
Subject: [xoops-cvslog 1449] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051227150310.0BC8B2AC048@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_input.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_input.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_input.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_input.html:1.1.2.1 Wed Nov 16 19:10:02 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_input.html Wed Dec 28 00:03:09 2005
@@ -1 +1 @@
-<{include file="legacy_admin_actionsearch_form.html"}>
\ No newline at end of file
+<{include file="legacy_admin_actionsearch_form.html"}>
Index: xoops2jp/html/modules/base/admin/templates/help.html
diff -u xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.1 Tue Dec 27 19:36:25 2005
+++ xoops2jp/html/modules/base/admin/templates/help.html Wed Dec 28 00:03:09 2005
@@ -1 +1,10 @@
-<{$contents}>
\ No newline at end of file
+
+
+
+
+<{$contents}>
+
+
+<{$module|debug_print_var}>
\ No newline at end of file
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.2 xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/deactive_module_list.html:1.1.2.2 Tue Dec 27 19:37:45 2005
+++ xoops2jp/html/modules/base/admin/templates/deactive_module_list.html Wed Dec 28 00:03:09 2005
@@ -1,4 +1,6 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}>
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+
+<{$smarty.const._MD_A_BASE_LANG_MODINSTALL}>
<{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE}>
@@ -13,8 +15,8 @@
<{$module->getVar('name')}> |
<{$module->getRenderedVersion()}> |
-  " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" />
- " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
+ " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" />
+ " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
|
<{/foreach}>
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.2 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.2 Mon Dec 19 23:02:01 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html Wed Dec 28 00:03:09 2005
@@ -2,6 +2,6 @@
<{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.2 Mon Dec 19 23:02:36 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html Wed Dec 28 00:03:09 2005
@@ -3,9 +3,9 @@
» <{$smarty.const._MB_A_BASE_LANG_RESULT}>
- <{foreach item=record from=$records}>
- - [ <{$record->mModuleName}> ] - <{$record->mTitle}>
- <{if $record->mDescription}>
( <{$record->mDescription}> )<{/if}>
-
- <{/foreach}>
+ <{foreach item=record from=$records}>
+ - [ <{$record->mModuleName}> ] - <{$record->mTitle}>
+ <{if $record->mDescription}>
( <{$record->mDescription}> )<{/if}>
+
+ <{/foreach}>
From minahito ＠ users.sourceforge.jp Wed Dec 28 01:38:09 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 01:38:09 +0900
Subject: [xoops-cvslog 1450] CVS update: xoops2jp/html/modules/pm
Message-ID: <20051227163809.73E2E2AC0C2@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.7 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.8
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.7 Wed Nov 16 19:11:14 2005
+++ xoops2jp/html/modules/pm/xoops_version.php Wed Dec 28 01:38:09 2005
@@ -34,7 +34,7 @@
$modversion['description'] = _MI_PM_NAME_DESC;
$modversion['author'] = "";
$modversion['credits'] = "The XOOPS Project";
-$modversion['help'] = "system.html";
+$modversion['help'] = "help.html";
$modversion['license'] = "GPL see LICENSE";
$modversion['official'] = 1;
$modversion['image'] = "images/pm.gif";
From minahito ＠ users.sourceforge.jp Wed Dec 28 12:38:28 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 12:38:28 +0900
Subject: [xoops-cvslog 1451] CVS update:
xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20051228033828.A94922AC029@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/language/english/help.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/language/english/help.html:1.1.2.1
--- /dev/null Wed Dec 28 12:38:28 2005
+++ xoops2jp/html/modules/legacyRender/language/english/help.html Wed Dec 28 12:38:28 2005
@@ -0,0 +1,29 @@
+Getting start
+
+ - This render-system is compatible with XOOPS 2.0.9/XOOPS JP 2.0.x theme engine. You can use many themes that follows the same format.
+ - No override function. No fallback function.
+ - This uses Smarty for rendering and managing cache. This is not fast, but is not slow.
+ - To know a detail, you can read a manifesto of this system.
+
+
+
+Get theme
+
+ - You can get additional themes from a theme designer's site.
+ - A theme is usually compressed. After extend it with using archiver, you must upload it to theme directory of your XOOPS Cube site.
+
+
+
+Upload
+
+ - Upload a theme directory that you extended to XOOPS_ROOT_PATH/themes.
+ - You should confirm that there is theme.html or manifesto.ini.php under a theme directory uncompressed.
+ - A theme that this render-system can't use is never listed up.
+
+
+
+Uninstall
+
+ - This render-system manages a theme without a database.
+ - For uninstalling, delete a theme directory that you hope to remove from the themes directory of your XOOPS Cube site.
+
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 12:38:37 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 12:38:37 +0900
Subject: [xoops-cvslog 1452] CVS update:
xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20051228033837.93F522AC061@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/language/japanese/help.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/language/japanese/help.html:1.1.2.1
--- /dev/null Wed Dec 28 12:38:37 2005
+++ xoops2jp/html/modules/legacyRender/language/japanese/help.html Wed Dec 28 12:38:37 2005
@@ -0,0 +1,29 @@
+まずはじめに
+
+ - このレンダーシステムは、XOOPS 2.0.9/XOOPS JP 2.0.x のテーマエンジンと互換性があり、同フォーマットのテーマを使用することができます。
+ - オーバーライド、およびフォールバックメカニズムを持ちません。
+ - レンダリングとキャッシュマネジメントにSmartyを使用します。速度は中速度です。
+ - 詳しい公称スペックはマニフェストをご覧下さい。
+
+
+
+追加テーマの入手
+
+ - テーマ開発者のインターネットサイトなどから、追加テーマを入手できます。
+ - 入手したテーマはたいてい圧縮されています。解凍ソフトで展開してから、使用中のXOOPS Cubeの決められた位置へ配置します。
+
+
+
+テーマのアップロード
+
+ - 展開したテーマのディレクトリをXOOPS Cubeのルートディレクトリ下にあるthemesディレクトリへアップロードして下さい。
+ - ディレクトリが二重にならないように、たとえばdefaultテーマであればdefaultディレクトリのすぐ下にtheme.htmlかmanifesto.ini.phpがある状態でアップロードします。
+ - このレンダーシステムが対応していないテーマは一覧に表示しません。ご注意下さい。
+
+
+
+テーマのアンインストール
+
+ - このレンダーシステムは、データベースを使用せずにテーマを管理しています。
+ - XOOPS Cubeのテーマディレクトリより、アンインストールしたいテーマをディレクトリごと削除して下さい。
+
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 12:39:12 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 12:39:12 +0900
Subject: [xoops-cvslog 1453] CVS update: xoops2jp/html/modules/legacyRender
Message-ID: <20051228033912.5F4A32AC061@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/xoops_version.php
diff -u xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.2 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.2 Fri Nov 25 19:27:55 2005
+++ xoops2jp/html/modules/legacyRender/xoops_version.php Wed Dec 28 12:39:12 2005
@@ -1,6 +1,6 @@
Index: xoops2jp/html/modules/legacyRender/admin/menu.php
diff -u xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.1 Fri Nov 25 19:28:16 2005
+++ xoops2jp/html/modules/legacyRender/admin/menu.php Wed Dec 28 12:40:01 2005
@@ -4,12 +4,4 @@
$adminmenu[1]['link']="admin/index.php";
$adminmenu[1]['keywords']=array(_MI_LEGACYRENDER_KEYWORD_THEME, _MI_LEGACYRENDER_KEYWORD_SELECT);
-$adminmenu[2]['title']=_MI_LEGACYRENDER_ADMENU_HELP;
-$adminmenu[2]['link']="admin/index.php?action=Help";
-$adminmenu[2]['keywords']=array(
- _MI_LEGACYRENDER_KEYWORD_THEME, _MI_LEGACYRENDER_KEYWORD_ADD, _MI_LEGACYRENDER_KEYWORD_DELETE,
- _MI_LEGACYRENDER_KEYWORD_INSTALL, _MI_LEGACYRENDER_KEYWORD_UNINSTALL, _MI_LEGACYRENDER_KEYWORD_UPLOAD,
- _MI_LEGACYRENDER_KEYWORD_DOWNLOAD
-);
-
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 12:47:16 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 12:47:16 +0900
Subject: [xoops-cvslog 1455] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20051228034716.30ECF2AC029@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/class/UserActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/UserActionFrame.class.php:1.1.2.2 xoops2jp/html/modules/user/class/UserActionFrame.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/UserActionFrame.class.php:1.1.2.2 Mon Nov 21 01:32:24 2005
+++ xoops2jp/html/modules/user/class/UserActionFrame.class.php Wed Dec 28 12:47:16 2005
@@ -1,5 +1,5 @@
Index: xoops2jp/html/modules/legacyRender/admin/templates/help.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/help.html:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/templates/help.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/help.html:1.1.2.1 Sun Dec 25 19:49:57 2005
+++ xoops2jp/html/modules/legacyRender/admin/templates/help.html Wed Dec 28 12:50:18 2005
@@ -1,27 +1,30 @@
-<{$smarty.const._MD_A_LEGACYRENDER_LANG_HELP}>
+» <{$smarty.const._MD_A_LEGACYRENDER_LANG_HELP}>
-<{$smarty.const._MD_A_LEGACYRENDER_LANG_GETTING_START}>
+<{$smarty.const._MD_A_LEGACYRENDER_LANG_GETTING_START}>
- <{$smarty.const._MD_A_LEGACYRENDER_GETTING_START_DESC1}>
- <{$smarty.const._MD_A_LEGACYRENDER_GETTING_START_DESC2}>
- <{$smarty.const._MD_A_LEGACYRENDER_GETTING_START_DESC3}>
- <{$smarty.const._MD_A_LEGACYRENDER_GETTING_START_DESC4}>
+
-<{$smarty.const._MD_A_LEGACYRENDER_LANG_GET_THEME}>
+<{$smarty.const._MD_A_LEGACYRENDER_LANG_GET_THEME}>
- <{$smarty.const._MD_A_LEGACYRENDER_GET_THEME_DESC1}>
- <{$smarty.const._MD_A_LEGACYRENDER_GET_THEME_DESC2}>
+
-<{$smarty.const._MD_A_LEGACYRENDER_LANG_UPLOAD}>
+<{$smarty.const._MD_A_LEGACYRENDER_LANG_UPLOAD}>
- <{$smarty.const._MD_A_LEGACYRENDER_UPLOAD_DESC1}>
- <{$smarty.const._MD_A_LEGACYRENDER_UPLOAD_DESC2}>
- <{$smarty.const._MD_A_LEGACYRENDER_UPLOAD_DESC3}>
+
-<{$smarty.const._MD_A_LEGACYRENDER_LANG_UNINSTALL}>
+<{$smarty.const._MD_A_LEGACYRENDER_LANG_UNINSTALL}>
- <{$smarty.const._MD_A_LEGACYRENDER_UNINSTALL_DESC1}>
- <{$smarty.const._MD_A_LEGACYRENDER_UNINSTALL_DESC2}>
Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.1 Sun Dec 25 19:49:47 2005
+++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html Wed Dec 28 12:50:18 2005
@@ -1,49 +1,47 @@
-
-
- |
- <{$smarty.const._MD_A_LEGACYRENDER_LANG_THEME}>
- |
-
- <{$smarty.const._MD_A_LEGACYRENDER_LANG_MANIFESTO}>
- |
-
- <{$smarty.const._MD_A_LEGACYRENDER_LANG_CONTROL}>
- |
-
- <{foreach item=theme from=$themes}>
- ">
-
- <{if $theme->ScreenShot}>
- 
- <{/if}>
-
- <{$theme->mDirName}>
- |
-
- <{if $theme->mManifesto}>
-
- - <{$smarty.const._MD_A_LEGACYRENDER_LANG_VERSION}> <{$theme->mManifesto.Manifesto.Version}>
- - <{$smarty.const._MD_A_LEGACYRENDER_LANG_AUTHOR}> <{$theme->mManifesto.Theme.Author}>
- - <{$smarty.const._MD_A_LEGACYRENDER_LANG_W3C}> <{$theme->mManifesto.Theme.W3C}>
- - <{$theme->mManifesto.Theme.Description}>
- <{if $theme->mManifesto.Manifesto.Url}>
- - <{$smarty.const._MD_A_LEGACYRENDER_LANG_GET_ADDRESS}>
- <{/if}>
-
- <{else}>
- <{$smarty.const._MD_A_LEGACYRENDER_MESSAGE_NO_MANIFESTO}>
- <{/if}>
- |
-
- <{if $currentThemeName!=$theme->mDirName}>
-
- <{/if}>
- 
- 
- |
-
- <{/foreach}>
+» <{$smarty.const._MD_A_LEGACYRENDER_LANG_THEME_ADMIN}>
+
+
+
+ | <{$smarty.const._MD_A_LEGACYRENDER_LANG_THEME}> |
+ <{$smarty.const._MD_A_LEGACYRENDER_LANG_MANIFESTO}> |
+ <{$smarty.const._MD_A_LEGACYRENDER_LANG_CONTROL}> |
+
+ <{foreach item=theme from=$themes}>
+ ">
+
+ <{if $theme->ScreenShot}>
+
+ <{/if}>
+
+ <{$theme->mDirName}>
+ |
+
+ <{if $theme->mManifesto}>
+
+ - <{$smarty.const._MD_A_LEGACYRENDER_LANG_VERSION}> <{$theme->mManifesto.Manifesto.Version}>
+ - <{$smarty.const._MD_A_LEGACYRENDER_LANG_AUTHOR}> <{$theme->mManifesto.Theme.Author}>
+ - <{$smarty.const._MD_A_LEGACYRENDER_LANG_W3C}> <{$theme->mManifesto.Theme.W3C}>
+ - <{$theme->mManifesto.Theme.Description}>
+ <{if $theme->mManifesto.Manifesto.Url}>
+ - <{$smarty.const._MD_A_LEGACYRENDER_LANG_GET_ADDRESS}>
+ <{/if}>
+
+ <{else}>
+ <{$smarty.const._MD_A_LEGACYRENDER_MESSAGE_NO_MANIFESTO}>
+ <{/if}>
+ |
+
+ <{if $currentThemeName!=$theme->mDirName}>
+
+ <{else}>
+ [ <{$smarty.const._MD_A_LEGACYRENDER_LANG_SELECTED}> ]
+ 
+ <{/if}>
+ |
+
+ <{/foreach}>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:47:42 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:47:42 +0900
Subject: [xoops-cvslog 1457] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051228134742.A43472AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/module_list.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.1
--- /dev/null Wed Dec 28 22:47:42 2005
+++ xoops2jp/html/modules/base/admin/templates/module_list.html Wed Dec 28 22:47:42 2005
@@ -0,0 +1,56 @@
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
+
+
+
+
+
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:47:53 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:47:53 +0900
Subject: [xoops-cvslog 1458] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051228134753.CF06A2AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html:1.1.2.1
--- /dev/null Wed Dec 28 22:47:53 2005
+++ xoops2jp/html/modules/base/admin/templates/modulelist_confirm.html Wed Dec 28 22:47:53 2005
@@ -0,0 +1,64 @@
+» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
+
+
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:48:32 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:48:32 +0900
Subject: [xoops-cvslog 1459] CVS update:
xoops2jp/html/modules/base/admin/images
Message-ID: <20051228134832.0FDE42AC05A@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/images/up.gif
Index: xoops2jp/html/modules/base/admin/images/down.gif
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:52:17 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:52:17 +0900
Subject: [xoops-cvslog 1460] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20051228135217.1954E2AC088@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:1.1.2.2 Thu Dec 1 14:17:07 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php Wed Dec 28 22:52:16 2005
@@ -1,6 +1,6 @@
setTemplateName("legacy_admin_modulelist_confirm.html");
+ $renderer->setTemplateName("modulelist_confirm.html");
$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
$renderer->setAttribute('actionForm',$this->mForm);
@@ -111,7 +111,7 @@
function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
{
- $renderer->setTemplateName("legacy_admin_modulelist_index.html");
+ $renderer->setTemplateName("module_list.html");
//
// Load adminmenu before we assign these to template.
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:53:58 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:53:58 +0900
Subject: [xoops-cvslog 1461] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051228135358.5B53C2AC04D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.2 Mon Dec 19 22:58:54 2005
+++ xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php Wed Dec 28 22:53:58 2005
@@ -58,6 +58,10 @@
if (!$this->mForceMode && $this->mLog->hasError())
return false;
+ $this->_installPreference();
+ if (!$this->mForceMode && $this->mLog->hasError())
+ return false;
+
return true;
}
@@ -105,6 +109,13 @@
}
/**
+ * Install or uninstall blocks and their preference, this function is called by own execute().
+ */
+ function _installPreference()
+ {
+ }
+
+ /**
* If set true, this class may never stop for error.
*/
function setForceMode($flag)
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:54:30 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:54:30 +0900
Subject: [xoops-cvslog 1462] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051228135430.101002AC04D@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.2 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.2 Mon Dec 19 22:59:42 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php Wed Dec 28 22:54:29 2005
@@ -26,6 +26,7 @@
return $ret;
$module =& $moduleHandler->create();
+ $module->setVar('weight', 1);
$module->loadInfoAsVar($this->mDirname);
return $module;
@@ -108,6 +109,72 @@
Legacy_ModuleUtils::installBlock($this->mModule, $newBlock, $this->mLog);
}
}
+
+ function _installPreference()
+ {
+ $configInfos = $this->mModule->getInfo('config');
+
+ //
+ // Insert comment config by old style.
+ //
+ if ($this->mModule->getVar('hascomments') !=0 ) {
+ require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
+
+ $configInfos[] = array('name' => 'com_rule',
+ 'title' => '_CM_COMRULES',
+ 'description' => '',
+ 'formtype' => 'select',
+ 'valuetype' => 'int',
+ 'default' => 1,
+ 'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
+ );
+
+ $configInfos[] = array('name' => 'com_anonpost',
+ 'title' => '_CM_COMANONPOST',
+ 'description' => '',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 0
+ );
+ }
+
+ // TODO comment
+
+ // TODO notification
+
+ $configHandler =& xoops_gethandler('config');
+
+ $count = 0;
+ foreach ($configInfos as $configInfo) {
+ $config =& $configHandler->createConfig();
+
+ $config->setVar('conf_modid', $this->mModule->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)) {
+ $this->mLog->addError("ERROR: Could not insert config " . $configInfo['name']);
+ }
+
+ unset($config);
+ }
+ }
}
?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.3 Wed Dec 21 13:08:57 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php Wed Dec 28 22:54:29 2005
@@ -13,18 +13,19 @@
*/
function &loadModuleObject($dirname)
{
- $ret = null;
+ $error = null;
$moduleHandler =& xoops_gethandler('module');
$module =& $moduleHandler->getByDirname($dirname);
if (!is_object($module)) {
$this->mLog->addError("*Module not found*");
- return $ret;
+ return $error;
}
- if ($module->getVar('isactive') == 0) {
+ if ($module->getVar('isactive') != 0) {
$this->mLog->addError("*For uninstall, turn off the active-status of the module.*");
+ return $error;
}
return $module;
@@ -114,6 +115,24 @@
$this->mLog->addError("Could not delete block templates : " . $tplHandler->db->error());
}
}
+
+ function _installPreference()
+ {
+ if ($this->mModule->getVar('hasconfig') == 0) {
+ return;
+ }
+
+ $configHandler =& xoops_gethandler('config');
+ $configs =& $configHandler->getConfigs(new Criteria('conf_modid', $this->mModule->getVar('mid')));
+
+ if (count($configs) == 0) {
+ return;
+ }
+
+ foreach ($configs as $config) {
+ $configHandler->deleteConfig($config);
+ }
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:54:39 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:54:39 +0900
Subject: [xoops-cvslog 1463] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051228135439.903CE2AC04D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:removed
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html:1.1.2.4 Wed Dec 28 00:03:01 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_confirm.html Wed Dec 28 22:54:39 2005
@@ -1,60 +0,0 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODLIST}> » <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>
-
-
Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html
diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:removed
--- xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html:1.1.2.7 Wed Dec 28 00:03:01 2005
+++ xoops2jp/html/modules/base/admin/templates/legacy_admin_modulelist_index.html Wed Dec 28 22:54:39 2005
@@ -1,56 +0,0 @@
-» <{$smarty.const._MD_A_BASE_LANG_MODLIST}>
-
-
-
-
-
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:55:22 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:55:22 +0900
Subject: [xoops-cvslog 1464] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20051228135522.131002AC04D@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.2 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.2 Mon Nov 28 22:44:32 2005
+++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php Wed Dec 28 22:55:21 2005
@@ -95,6 +95,33 @@
}
}
}
+
+ //
+ // Search help
+ //
+ if ($this->mAdaptee->hasHelp()) {
+ $root =& XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $helpfile = $this->mAdaptee->getHelp();
+ $dir = XOOPS_MODULE_PATH . "/" . $this->mAdaptee->getVar('dirname') . "/language/" . $language;
+
+ if (!file_exists($dir . "/" . $helpfile)) {
+ $dir = XOOPS_MODULE_PATH . "/" . $this->mAdaptee->getVar('dirname') . "/language/" . $language;
+ if (!file_exists($dir . "/" . $helpfile)) {
+ return;
+ }
+ }
+ $lines = file($dir . "/" . $helpfile);
+ foreach ($lines as $line) {
+ foreach($eventArgs->getKeywords() as $word) {
+ if (strpos($line, $word) !== false) {
+ $url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&dirname=" . $this->mAdaptee->getVar('dirname');
+ $eventArgs->addRecord($this->mAdaptee->getVar('name'), $url, _HELP);
+ return;
+ }
+ }
+ }
+ }
}
}
From minahito ＠ users.sourceforge.jp Wed Dec 28 22:59:15 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 22:59:15 +0900
Subject: [xoops-cvslog 1465] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20051228135915.DD0412AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/help.html
diff -u xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.2 Wed Dec 28 00:03:09 2005
+++ xoops2jp/html/modules/base/admin/templates/help.html Wed Dec 28 22:59:15 2005
@@ -1,10 +1,9 @@
-
+
<{$contents}>
-
-
-<{$module|debug_print_var}>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:16:03 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:16:03 +0900
Subject: [xoops-cvslog 1466] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051228141603.C278B2AC011@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.4 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.4 Tue Dec 27 14:31:15 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php Wed Dec 28 23:16:03 2005
@@ -278,6 +278,95 @@
return $tplHandler->insert($tplfile);
}
+
+ function insertAllConfig(&$module, &$log)
+ {
+ $configInfos = $module->getInfo('config');
+
+ //
+ // Insert comment config by old style.
+ //
+ if ($module->getVar('hascomments') !=0 ) {
+ require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
+
+ $configInfos[] = array('name' => 'com_rule',
+ 'title' => '_CM_COMRULES',
+ 'description' => '',
+ 'formtype' => 'select',
+ 'valuetype' => 'int',
+ 'default' => 1,
+ 'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
+ );
+
+ $configInfos[] = array('name' => 'com_anonpost',
+ 'title' => '_CM_COMANONPOST',
+ 'description' => '',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 0
+ );
+ }
+
+ // TODO comment
+
+ // TODO notification
+
+ $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 (!$configHandler->insertConfig($config)) {
+ $log->addError("ERROR: Could not insert config " . $configInfo['name']);
+ }
+
+ unset($config);
+ }
+ }
+
+ /**
+ * Delete all configs of $module.
+ *
+ * @param $module XoopsModule
+ */
+ function deleteAllConfig(&$module, &$log)
+ {
+ if ($this->mModule->getVar('hasconfig') == 0) {
+ return;
+ }
+
+ $configHandler =& xoops_gethandler('config');
+ $configs =& $configHandler->getConfigs(new Criteria('conf_modid', $this->mModule->getVar('mid')));
+
+ if (count($configs) == 0) {
+ return;
+ }
+
+ foreach ($configs as $config) {
+ $configHandler->deleteConfig($config);
+ }
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:16:48 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:16:48 +0900
Subject: [xoops-cvslog 1467] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20051228141648.256A42AC011@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.3 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.3 Wed Dec 28 22:54:29 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php Wed Dec 28 23:16:47 2005
@@ -112,68 +112,7 @@
function _installPreference()
{
- $configInfos = $this->mModule->getInfo('config');
-
- //
- // Insert comment config by old style.
- //
- if ($this->mModule->getVar('hascomments') !=0 ) {
- require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
-
- $configInfos[] = array('name' => 'com_rule',
- 'title' => '_CM_COMRULES',
- 'description' => '',
- 'formtype' => 'select',
- 'valuetype' => 'int',
- 'default' => 1,
- 'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
- );
-
- $configInfos[] = array('name' => 'com_anonpost',
- 'title' => '_CM_COMANONPOST',
- 'description' => '',
- 'formtype' => 'yesno',
- 'valuetype' => 'int',
- 'default' => 0
- );
- }
-
- // TODO comment
-
- // TODO notification
-
- $configHandler =& xoops_gethandler('config');
-
- $count = 0;
- foreach ($configInfos as $configInfo) {
- $config =& $configHandler->createConfig();
-
- $config->setVar('conf_modid', $this->mModule->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)) {
- $this->mLog->addError("ERROR: Could not insert config " . $configInfo['name']);
- }
-
- unset($config);
- }
+ Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
}
}
Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.4 Wed Dec 28 22:54:29 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php Wed Dec 28 23:16:48 2005
@@ -118,20 +118,7 @@
function _installPreference()
{
- if ($this->mModule->getVar('hasconfig') == 0) {
- return;
- }
-
- $configHandler =& xoops_gethandler('config');
- $configs =& $configHandler->getConfigs(new Criteria('conf_modid', $this->mModule->getVar('mid')));
-
- if (count($configs) == 0) {
- return;
- }
-
- foreach ($configs as $config) {
- $configHandler->deleteConfig($config);
- }
+ Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog);
}
}
Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.1 Fri Dec 16 18:56:11 2005
+++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php Wed Dec 28 23:16:48 2005
@@ -165,6 +165,12 @@
}
*/
}
+
+ function _installPreference()
+ {
+ Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog);
+ Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:32:35 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:32:35 +0900
Subject: [xoops-cvslog 1468] CVS update: xoops2jp/html/modules/comment/images
Message-ID: <20051228143235.8C7892AC04D@users.sourceforge.jp>
Index: xoops2jp/html/modules/comment/images/comment.gif
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:33:28 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:33:28 +0900
Subject: [xoops-cvslog 1469] CVS update: xoops2jp/html/modules/user/images
Message-ID: <20051228143328.D901F2AC04D@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/images/user.gif
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:34:50 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:34:50 +0900
Subject: [xoops-cvslog 1470] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20051228143450.BC9D42AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.5 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.6
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.5 Sun Nov 13 17:55:45 2005
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html Wed Dec 28 23:34:50 2005
@@ -4,80 +4,72 @@
"><{$smarty.const._PM_PROFILE}>
»» <{$smarty.const._PM_INBOX}>
-
-
+
-
- <{xoops_pagenavi pagenavi=$pageNavi}>
-
+<{xoops_pagenavi pagenavi=$pageNavi}>
Index: xoops2jp/html/modules/pm/templates/pm_pmlite_success.html
diff -u xoops2jp/html/modules/pm/templates/pm_pmlite_success.html:1.1.2.1 xoops2jp/html/modules/pm/templates/pm_pmlite_success.html:1.1.2.2
--- xoops2jp/html/modules/pm/templates/pm_pmlite_success.html:1.1.2.1 Sat Nov 12 17:56:51 2005
+++ xoops2jp/html/modules/pm/templates/pm_pmlite_success.html Wed Dec 28 23:34:50 2005
@@ -1,6 +1,6 @@
-
+
<{$smarty.const._PM_MESSAGEPOSTED}>
Index: xoops2jp/html/modules/pm/templates/pmlite.html
diff -u xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.3 xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.4
--- xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.3 Wed Nov 16 19:12:47 2005
+++ xoops2jp/html/modules/pm/templates/pmlite.html Wed Dec 28 23:34:50 2005
@@ -1,51 +1,51 @@
<{if $actionForm->hasError()}>
-
- <{foreach item=message from=$actionForm->getErrorMessages()}>
- - <{$message|escape}>
- <{/foreach}>
-
+
+ <{foreach item=message from=$actionForm->getErrorMessages()}>
+ - <{$message|escape}>
+ <{/foreach}>
+
<{/if}>
-
Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.11 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.12
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.11 Wed Nov 16 00:23:19 2005
+++ xoops2jp/html/modules/pm/templates/readpmsg.html Wed Dec 28 23:34:50 2005
@@ -1,54 +1,54 @@
<{$xoops_pagetitle}>
<{if $feature.user.profile}>
- <{$smarty.const._PM_PROFILE}> »»
+ <{$smarty.const._PM_PROFILE}> »»
<{/if}>
<{$smarty.const._PM_INBOX}> »» <{$privMessage->getVar('subject')}>
-
-
- | hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}> |
-
-
- <{if $sendUser->hasAvatar()}>
-
- }>)
- <{if $sendUser->getVar('user_from')}>
-
<{$sendUser->getVar('user_from')}>
- <{/if}>
- |
- <{/if}>
- <{$smarty.const._PM_FROMC}><{$sendUser->getVar('uname')}>
-
- |
-
-
- | <{$smarty.const._PM_SENTC}><{$privMessage->getVar("msg_time")|xoops_formattimestamp}> |
-
-
- <{$smarty.const._MD_PM_LANG_SUBJECTC}>}>) <{$privMessage->getVar('subject')}> |
-
-
-
- <{$privMessage->getVar('msg_text')}>
- |
-
-
-
- | hasAvatar()}>colspan='2'<{/if}> align='right'>
- <{if $previousMessage}>
- <{$smarty.const._PM_PREVIOUS}>
- <{/if}>
- <{if $nextMessage}>
- <{if $previousMessage}> | <{/if}>
- <{$smarty.const._PM_NEXT}>
- <{/if}>
- |
-
+
+
+ | hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}> |
+
+
+ <{if $sendUser->hasAvatar()}>
+
+
+ <{if $sendUser->getVar('user_from')}>
+
<{$sendUser->getVar('user_from')}>
+ <{/if}>
+ |
+ <{/if}>
+ <{$smarty.const._PM_FROMC}><{$sendUser->getVar('uname')}>
+
+ |
+
+
+ | <{$smarty.const._PM_SENTC}><{$privMessage->getVar("msg_time")|xoops_formattimestamp}> |
+
+
+ | <{$smarty.const._MD_PM_LANG_SUBJECTC}> <{$privMessage->getVar('subject')}> |
+
+
+
+ <{$privMessage->getVar('msg_text')}>
+ |
+
+
+
+ | hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
+ <{if $previousMessage}>
+ <{$smarty.const._PM_PREVIOUS}>
+ <{/if}>
+ <{if $nextMessage}>
+ <{if $previousMessage}> | <{/if}>
+ <{$smarty.const._PM_NEXT}>
+ <{/if}>
+ |
+
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:40:26 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:40:26 +0900
Subject: [xoops-cvslog 1471] CVS update: xoops2jp/html/modules/pm/images
Message-ID: <20051228144026.1BD912AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/images/pm.gif
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:40:56 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:40:56 +0900
Subject: [xoops-cvslog 1472] CVS update: xoops2jp/html/modules/base/images
Message-ID: <20051228144056.60ED42AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/images/base.gif
From minahito ＠ users.sourceforge.jp Wed Dec 28 23:41:10 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 28 Dec 2005 23:41:10 +0900
Subject: [xoops-cvslog 1473] CVS update:
xoops2jp/html/modules/legacyRender/images
Message-ID: <20051228144110.D8A3A2AC011@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/images/legacyRender.gif
From minahito ＠ users.sourceforge.jp Thu Dec 29 00:18:13 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 29 Dec 2005 00:18:13 +0900
Subject: [xoops-cvslog 1474] CVS update:
xoops2jp/html/modules/user/admin/templates
Message-ID: <20051228151813.D9C2E2AC05A@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/admin/templates/user_delete_confirm.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/user_delete_confirm.html:1.1.2.1
--- /dev/null Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/user_delete_confirm.html Thu Dec 29 00:18:13 2005
@@ -0,0 +1,49 @@
+» <{$smarty.const._MD_A_USER_LANG_USER_LIST}>
+
+<{$smarty.const._MD_A_USER_LANG_USER_DELETE}>
+
+
+ - <{$smarty.const._MD_A_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$user->getVar('uname')}>
+
+
+
+
+ | <{$smarty.const._MD_A_USER_LANG_UID}> |
+ <{$user->getVar('uid')}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_UNAME}> |
+ <{$user->getVar('uname')}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_NAME}> |
+ <{$user->getVar('name')}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_REGDATE}> |
+ <{$user->getVar('user_regdate')|xoops_formattimestamp}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_LASTLOGIN}> |
+ <{$user->getVar('last_login')|xoops_formattimestamp:l}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_POSTS}> |
+ <{$user->getVar('posts')}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_LEVEL}> |
+ <{$user->getVar('level')}> |
+
+
+ | <{$smarty.const._MD_A_USER_LANG_CONTROL}> |
+
+
+
Index: xoops2jp/html/modules/user/admin/templates/user_list.html
diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.3 Sun Dec 25 19:57:33 2005
+++ xoops2jp/html/modules/user/admin/templates/user_list.html Thu Dec 29 00:18:13 2005
@@ -1,37 +1,41 @@
» <{$smarty.const._MD_A_USER_LANG_USER_LIST}>
+<{*
+*}>
+
+
| |
<{$smarty.const._MD_A_USER_LANG_UID}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_UNAME}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_NAME}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_REGDATE}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_LASTLOGIN}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_POSTS}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_LEVEL}>
- " alt="ASC">
- " alt="DESC"> |
+ " alt="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_A_USER_LANG_CONTROL}> |
<{foreach item=user from=$users}>
- | " alt="user" /> |
+ " alt="user" /> |
<{$user->getVar('uid')}> |
<{$user->getVar('uname')}> |
<{$user->getVar('name')}> |
@@ -39,8 +43,11 @@
<{$user->getVar('last_login')|xoops_formattimestamp:l}> |
<{$user->getVar('posts')}> |
<{$user->getVar('level')}> |
- <{$smarty.const._MD_A_USER_LANG_EDIT}> |
- <{$smarty.const._MD_A_USER_LANG_DELETE}>
+ |
+ " alt="<{$smarty.const._EDIT}>" />
+ <{if $user->getVar('uid') != 1 }>
+ " alt="<{$smarty.const._DELETE}>" />
+ <{/if}>
|
<{/foreach}>
Index: xoops2jp/html/modules/user/admin/templates/group_delete_confirm.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/group_delete_confirm.html:1.1.2.1
--- /dev/null Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/group_delete_confirm.html Thu Dec 29 00:18:13 2005
@@ -0,0 +1,35 @@
+» <{$smarty.const._MD_A_USER_LANG_GROUP_LIST}>
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_DELETE}>
+
+
+ - <{$smarty.const._MD_A_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$group->getVar('name')}>
+
- <{$smarty.const._MD_A_USER_LANG_GROUP_DELETE_ADVICE2}>
+
+
+
+
+ | |
+ <{$smarty.const._MD_A_USER_LANG_GROUP_GID}> |
+ <{$smarty.const._MD_A_USER_LANG_GROUP_NAME}> |
+ <{$smarty.const._MD_A_USER_LANG_GROUP_DESC}> |
+ <{$smarty.const._MD_A_USER_LANG_GROUP_TYPE}> |
+ <{$smarty.const._MD_A_USER_LANG_GROUP_AMMO}> |
+
+
+ | " alt="group" /> |
+ <{$group->getVar('groupid')}> |
+ <{$group->getVar('name')}> |
+ <{$group->getVar('description')}> |
+ <{$group->getVar('group_type')}> |
+ <{$group->getVar('user_count')}> |
+
+
+
+
+
Index: xoops2jp/html/modules/user/admin/templates/group_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.1 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.2
--- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.1 Sat Dec 24 19:09:07 2005
+++ xoops2jp/html/modules/user/admin/templates/group_edit.html Thu Dec 29 00:18:13 2005
@@ -17,21 +17,21 @@
<{xoops_input type=hidden name=groupid value=$actionForm->getVar('groupid')}>
Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.1
--- /dev/null Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/group_member.html Thu Dec 29 00:18:13 2005
@@ -0,0 +1,69 @@
+» <{$smarty.const._MD_A_USER_LANG_GROUP_LIST}>
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_ASSIGN}> - ( <{$group->getVar('name')}> )
+
+
+
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_NOASSIN_MEMBERS}>
+
+
+
+ | |
+ <{$smarty.const._MD_A_USER_LANG_UID}> |
+ <{$smarty.const._MD_A_USER_LANG_UNAME}> |
+ <{$smarty.const._MD_A_USER_LANG_NAME}> |
+ <{$smarty.const._MD_A_USER_LANG_REGDATE}> |
+ <{$smarty.const._MD_A_USER_LANG_LASTLOGIN}> |
+ <{$smarty.const._MD_A_USER_LANG_POSTS}> |
+ <{$smarty.const._MD_A_USER_LANG_LEVEL}> |
+ <{$smarty.const._MD_A_USER_LANG_CONTROL}> |
+
+ <{foreach from=$noUsers item=user }>
+ ">
+ | " alt="user" /> |
+ <{$user->getVar('uid')}> |
+ <{$user->getVar('uname')}> |
+ <{$user->getVar('name')}> |
+ <{$user->getVar('user_regdate')|xoops_formattimestamp}> |
+ <{$user->getVar('last_login')|xoops_formattimestamp:l}> |
+ <{$user->getVar('posts')}> |
+ <{$user->getVar('level')}> |
+
+ " alt="<{$smarty.const._EDIT}>" />
+ <{if $user->getVar('uid') != 1 }>
+ " alt="<{$smarty.const._DELETE}>" />
+ <{/if}>
+ |
+
+ <{/foreach}>
+
+
+<{xoops_pagenavi pagenavi=$noPageNavi}>
Index: xoops2jp/html/modules/user/admin/templates/group_list.html
diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.2 Sun Dec 25 19:57:58 2005
+++ xoops2jp/html/modules/user/admin/templates/group_list.html Thu Dec 29 00:18:13 2005
@@ -15,19 +15,20 @@
<{foreach item=group from=$groups}>
- | " alt="group" /> |
+ " alt="group" /> |
<{$group->getVar('groupid')}> |
- <{$group->getVar('name')}> |
+ <{$group->getVar('name')}> |
<{$group->getVar('description')}> |
<{$group->getVar('group_type')}> |
<{$group->getVar('user_count')}> |
-
- <{$smarty.const._MD_A_USER_LANG_EDIT}> |
+ |
+ " alt="<{$smarty.const._EDIT}>" />
<{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
- <{$smarty.const._MD_A_USER_LANG_DELETE}> |
+ " alt="<{$smarty.const._DELETE}>" />
<{/if}>
- <{$smarty.const._MD_A_USER_LANG_GROUP_PERMISSION}> |
- <{$smarty.const._MD_A_USER_LANG_GROUP_ASSIGN}>
+ " alt="<{$smarty.const._MD_A_USER_LANG_GROUP_PROPERTY}>" />
+ " alt="<{$smarty.const._MD_A_USER_LANG_GROUP_PERMISSION}>" />
+ " alt="<{$smarty.const._MD_A_USER_LANG_GROUP_ASSIGN}>" />
|
<{/foreach}>
Index: xoops2jp/html/modules/user/admin/templates/user_admin_rankedit_input.html
diff -u xoops2jp/html/modules/user/admin/templates/user_admin_rankedit_input.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/user_admin_rankedit_input.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/user_admin_rankedit_input.html:1.1.2.4 Sun Dec 25 19:57:16 2005
+++ xoops2jp/html/modules/user/admin/templates/user_admin_rankedit_input.html Thu Dec 29 00:18:13 2005
@@ -17,40 +17,40 @@
<{xoops_input type=hidden name=rank_id value=$actionForm->getVar('rank_id')}>
Index: xoops2jp/html/modules/user/admin/templates/user_admin_rankdelete_input.html
diff -u xoops2jp/html/modules/user/admin/templates/user_admin_rankdelete_input.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/user_admin_rankdelete_input.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/user_admin_rankdelete_input.html:1.1.2.2 Sun Dec 25 19:57:16 2005
+++ xoops2jp/html/modules/user/admin/templates/user_admin_rankdelete_input.html Thu Dec 29 00:18:13 2005
@@ -1,8 +1,9 @@
» <{$smarty.const._MD_A_USER_LANG_RANK_LIST}>
<{$smarty.const._MD_A_USER_LANG_DELETE_RANK}>
-
-<{$smarty.const._MD_A_USER_MESSAGE_CONFIRM_DELETE_RANK}>
+
+ - <{$smarty.const._MD_A_USER_MESSAGE_CONFIRM_DELETE_RANK}>
+
Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.1
--- /dev/null Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html Thu Dec 29 00:18:13 2005
@@ -0,0 +1,114 @@
+» <{$smarty.const._MD_A_USER_LANG_GROUP_LIST}>
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_PERMISSION}> - ( <{$group->getVar('name')}> )
+
+
+
+
+<{$smarty.const._MD_A_USER_LANG_PERM_ACCESS_ADMIN}>
+
+<{$smarty.const._MD_A_USER_LANG_PERM_MODULE_ACCESS}>
+
+
Index: xoops2jp/html/modules/user/admin/templates/user_admin_ranklist_index.html
diff -u xoops2jp/html/modules/user/admin/templates/user_admin_ranklist_index.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/user_admin_ranklist_index.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/user_admin_ranklist_index.html:1.1.2.3 Sun Dec 25 19:57:16 2005
+++ xoops2jp/html/modules/user/admin/templates/user_admin_ranklist_index.html Thu Dec 29 00:18:13 2005
@@ -6,23 +6,23 @@
Index: xoops2jp/html/modules/user/admin/templates/group_property.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.1
--- /dev/null Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/group_property.html Thu Dec 29 00:18:13 2005
@@ -0,0 +1,76 @@
+» <{$smarty.const._MD_A_USER_LANG_GROUP_LIST}>
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_PROPERTY}> - ( <{$group->getVar('name')}> )
+
+
+
+
+<{$smarty.const._MD_A_USER_LANG_GROUP_ASSIN_MEMBERS}>
+
+
+
+ | |
+ <{$smarty.const._MD_A_USER_LANG_UID}> |
+ <{$smarty.const._MD_A_USER_LANG_UNAME}> |
+ <{$smarty.const._MD_A_USER_LANG_NAME}> |
+ <{$smarty.const._MD_A_USER_LANG_REGDATE}> |
+ <{$smarty.const._MD_A_USER_LANG_LASTLOGIN}> |
+ <{$smarty.const._MD_A_USER_LANG_POSTS}> |
+ <{$smarty.const._MD_A_USER_LANG_LEVEL}> |
+ <{$smarty.const._MD_A_USER_LANG_CONTROL}> |
+
+ <{foreach from=$users item=user }>
+ ">
+ | " alt="user" /> |
+ <{$user->getVar('uid')}> |
+ <{$user->getVar('uname')}> |
+ <{$user->getVar('name')}> |
+ <{$user->getVar('user_regdate')|xoops_formattimestamp}> |
+ <{$user->getVar('last_login')|xoops_formattimestamp:l}> |
+ <{$user->getVar('posts')}> |
+ <{$user->getVar('level')}> |
+
+ " alt="<{$smarty.const._EDIT}>" />
+ <{if $user->getVar('uid') != 1 }>
+ " alt="<{$smarty.const._DELETE}>" />
+ <{/if}>
+ |
+
+ <{/foreach}>
+
+
+<{xoops_pagenavi pagenavi=$pageNavi}>
+
+
+なにを表示しようかなぁ~~~~
+
+<{$modulePermissions|debug_print_var}>
+
+
From minahito ＠ users.sourceforge.jp Thu Dec 29 00:37:23 2005
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 29 Dec 2005 00:37:23 +0900
Subject: [xoops-cvslog 1475] CVS update:
xoops2jp/html/modules/user/admin/templates
Message-ID: <20051228153723.16E9A2AC05A@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.1 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.2
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.1 Thu Dec 29 00:18:13 2005
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html Thu Dec 29 00:37:22 2005
@@ -39,9 +39,9 @@
|