From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 17:50:10 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 17:50:10 +0900 Subject: [xoops-cvslog 6145] CVS update: xoops2jp/html/modules/user/class Message-ID: <20070202085010.562982AC1F1@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/AbstractViewAction.class.php diff -u xoops2jp/html/modules/user/class/AbstractViewAction.class.php:1.1.2.1 xoops2jp/html/modules/user/class/AbstractViewAction.class.php:1.1.2.1.4.1 --- xoops2jp/html/modules/user/class/AbstractViewAction.class.php:1.1.2.1 Fri Jul 28 17:56:52 2006 +++ xoops2jp/html/modules/user/class/AbstractViewAction.class.php Fri Feb 2 17:50:10 2007 @@ -1,9 +1,11 @@ Index: xoops2jp/html/modules/pm/language/english/main.php diff -u xoops2jp/html/modules/pm/language/english/main.php:1.1.2.8.2.1 xoops2jp/html/modules/pm/language/english/main.php:1.1.2.8.2.1.2.1 --- xoops2jp/html/modules/pm/language/english/main.php:1.1.2.8.2.1 Sat Oct 14 20:31:10 2006 +++ xoops2jp/html/modules/pm/language/english/main.php Fri Feb 2 17:52:52 2007 @@ -8,9 +8,9 @@ define('_MD_PM_ERROR_REQUIRED', "{0} is required"); define('_MD_PM_ERROR_USERNOEXIST', "The selected user doesn't exist in the database."); define('_MD_PM_ERROR_USERWROTE', "%s wrote:"); -define('_MD_PM_LANG__PREVIOUS', "Previous Message"); -define('_MD_PM_LANG__SEND', "Send"); -define('_MD_PM_LANG__SENTC', "Sent: "); +define('_MD_PM_LANG_PREVIOUS', "Previous Message"); +define('_MD_PM_LANG_SEND', "Send"); +define('_MD_PM_LANG_SENTC', "Sent: "); define('_MD_PM_LANG_CANCELSEND', "Cancel sending"); define('_MD_PM_LANG_CLEAR', "Clear"); define('_MD_PM_LANG_DATE', "Date"); From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 17:58:57 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 17:58:57 +0900 Subject: [xoops-cvslog 6147] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20070202085857.61CD92AC1F1@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php diff -u xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.7 xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.7.2.1 --- xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.7 Sun Dec 3 16:44:53 2006 +++ xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php Fri Feb 2 17:58:57 2007 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/user/templates/user_misc_online.html diff -u xoops2jp/html/modules/user/templates/user_misc_online.html:1.1.2.1.2.1 xoops2jp/html/modules/user/templates/user_misc_online.html:1.1.2.1.2.1.2.1 --- xoops2jp/html/modules/user/templates/user_misc_online.html:1.1.2.1.2.1 Sun Oct 15 17:18:18 2006 +++ xoops2jp/html/modules/user/templates/user_misc_online.html Fri Feb 2 18:00:28 2007 @@ -3,7 +3,7 @@ <{$smarty.const._MD_USER_LANG_WHOSONLINE}> <{foreach item=obj from=$objects}> - valign="middle" align="center"> + " valign="middle" align="center"> <{if $obj->get('online_uid')}> <{$obj->getShow('online_uname')}> From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 18:12:22 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 18:12:22 +0900 Subject: [xoops-cvslog 6149] CVS update: xoops2jp/html/class/smarty/plugins Message-ID: <20070202091222.F2DA52AC072@users.sourceforge.jp> Index: xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php diff -u xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.6 xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.6.2.1 --- xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.6 Sat Dec 16 23:10:29 2006 +++ xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php Fri Feb 2 18:12:22 2007 @@ -2,7 +2,7 @@ /** * * @package Legacy - * @version $Id: function.xoops_pagenavi.php,v 1.1.2.3.2.6 2006/12/16 14:10:29 nobunobu Exp $ + * @version $Id: function.xoops_pagenavi.php,v 1.1.2.3.2.6.2.1 2007/02/02 09:12:22 tom_g3x Exp $ * @copyright Copyright 2005, 2006 XOOPSCube.org * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2 * @@ -49,7 +49,7 @@ // check prev // if($navi->hasPrivPage()) { - $ret .= @sprintf("«", $navi->renderURLForPage($navi->getPrivStart())); + $ret .= @sprintf("« ", $navi->renderURLForPage($navi->getPrivStart())); } // From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 18:16:21 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 18:16:21 +0900 Subject: [xoops-cvslog 6150] CVS update: xoops2jp/html/modules/pm/templates Message-ID: <20070202091621.300702AC1F1@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/templates/readpmsg.html diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.1 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.2 --- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.1 Tue Jan 23 18:29:38 2007 +++ xoops2jp/html/modules/pm/templates/readpmsg.html Fri Feb 2 18:16:21 2007 @@ -35,8 +35,8 @@ <{$privMessage->getShow('msg_text')}>

- - hasAvatar()}>colspan="2"<{/if}> style="text-align:left;"> + + hasAvatar()}>colspan="2"<{/if}> style="text-align:left;"> ','pmlite',480,400);"><{$smarty.const._MD_PM_LANG_REPLY}> From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 18:18:27 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 18:18:27 +0900 Subject: [xoops-cvslog 6151] CVS update: xoops2jp/html/modules/pm/templates Message-ID: <20070202091827.053872AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/templates/readpmsg.html diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.2 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.3 --- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.2 Fri Feb 2 18:16:21 2007 +++ xoops2jp/html/modules/pm/templates/readpmsg.html Fri Feb 2 18:18:26 2007 @@ -46,7 +46,7 @@ <{if $previousMessage || $nextMessage}> - hasAvatar()}>colspan="2"<{/if}> style="text-align:right;"> + hasAvatar()}>colspan="2"<{/if}> style="text-align:right;"> <{if $previousMessage}> <{$smarty.const._MD_PM_LANG__PREVIOUS}> <{/if}> From tom_g3x ＠ users.sourceforge.jp Fri Feb 2 18:22:06 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 2 Feb 2007 18:22:06 +0900 Subject: [xoops-cvslog 6152] CVS update: xoops2jp/html/modules/pm/templates Message-ID: <20070202092206.AE0E02AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/templates/viewpmsg.html diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.5 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.5.2.1 --- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.5 Sun Dec 3 00:50:21 2006 +++ xoops2jp/html/modules/pm/templates/viewpmsg.html Fri Feb 2 18:22:06 2007 @@ -52,16 +52,16 @@ <{/foreach}> <{if $total_messages}> - - + +   <{else}> - - + + From minahito ＠ users.sourceforge.jp Fri Feb 16 15:07:21 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:07:21 +0900 Subject: [xoops-cvslog 6153] CVS update: xoops2jp/html/core Message-ID: <20070216060721.427472AC02B@users.sourceforge.jp> Index: xoops2jp/html/core/XCube_FormFile.class.php diff -u xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.4 xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.4.2.1 --- xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.4 Thu Dec 28 23:17:48 2006 +++ xoops2jp/html/core/XCube_FormFile.class.php Fri Feb 16 15:07:21 2007 @@ -2,12 +2,15 @@ /** * * @package XCube - * @version $Id: XCube_FormFile.class.php,v 1.1.2.4 2006/12/28 14:17:48 nobunobu Exp $ + * @version $Id: XCube_FormFile.class.php,v 1.1.2.4.2.1 2007/02/16 06:07:21 minahito Exp $ * @copyright Copyright 2005, 2006 XOOPS Cube Project * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license * */ +define("XCUBE_FORMFILE_PREVMASK", "0022"); +define("XCUBE_FORMFILE_CHMOD", "0644"); + /** * WARNING: * This class is simple wrapper class for proccessing the file uploaded. @@ -220,15 +223,25 @@ */ function saveAs($file) { + + $destFile = ""; if(preg_match("#\/$#",$file)) { - return move_uploaded_file($this->_mTmpFileName,$file.$this->getFileName()); + $destFile = $file . $this->getFileName(); } elseif(is_dir($file)) { - return move_uploaded_file($this->_mTmpFileName,$file."/".$this->getFileName()); + $destFile = $file . "/" . $this->getFileName(); } else { - return move_uploaded_file($this->_mTmpFileName,$file); + $destFile = $file; } + + $ret = move_uploaded_file($this->_mTmpFileName, $destFile); + + $prevMask = @umask(XCUBE_FORMFILE_PREVMASK); + @umask($prevMask); + @chmod($destFile, XCUBE_FORMFILE_CHMOD); + + return $ret; } /** From minahito ＠ users.sourceforge.jp Fri Feb 16 15:20:23 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:20:23 +0900 Subject: [xoops-cvslog 6154] CVS update: xoops2jp/html/modules/legacy/admin/actions Message-ID: <20070216062023.1B1792AC15B@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php diff -u xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3.2.1 xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3.2.2 --- xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3.2.1 Tue Jan 23 22:02:41 2007 +++ xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php Fri Feb 16 15:20:22 2007 @@ -94,7 +94,7 @@ function prepare(&$controller, &$xoopsUser) { - parent::prepare($controller, &$xoopsUser); + parent::prepare($controller, $xoopsUser); $db=&$controller->getDB(); From minahito ＠ users.sourceforge.jp Fri Feb 16 15:22:45 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:22:45 +0900 Subject: [xoops-cvslog 6155] CVS update: xoops2jp/html/include Message-ID: <20070216062245.C91242AC02B@users.sourceforge.jp> Index: xoops2jp/html/include/comment_new.php diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.6 xoops2jp/html/include/comment_new.php:1.2.8.3.2.6.2.1 --- xoops2jp/html/include/comment_new.php:1.2.8.3.2.6 Fri Jan 19 02:23:55 2007 +++ xoops2jp/html/include/comment_new.php Fri Feb 16 15:22:45 2007 @@ -1,5 +1,5 @@ render($renderTarget); +$renderSystem->render($renderTarget); // // Display now. From minahito ＠ users.sourceforge.jp Fri Feb 16 15:28:48 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:28:48 +0900 Subject: [xoops-cvslog 6156] CVS update: xoops2jp/html/include Message-ID: <20070216062848.5560F2AC160@users.sourceforge.jp> Index: xoops2jp/html/include/notification_functions.php diff -u xoops2jp/html/include/notification_functions.php:1.2.8.3.2.1 xoops2jp/html/include/notification_functions.php:1.2.8.3.2.1.2.1 --- xoops2jp/html/include/notification_functions.php:1.2.8.3.2.1 Mon Nov 13 19:41:33 2006 +++ xoops2jp/html/include/notification_functions.php Fri Feb 16 15:28:48 2007 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/legacy/language/japanese/main.php diff -u xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4 xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4.2.1 --- xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4 Sat Dec 30 23:42:12 2006 +++ xoops2jp/html/modules/legacy/language/japanese/main.php Fri Feb 16 15:30:19 2007 @@ -50,6 +50,7 @@ define('_MD_LEGACY_LANG_UID', "uid"); define('_MD_LEGACY_LANG_YMAIL', "あなたのEmail"); define('_MD_LEGACY_LANG_YNAME', "あなたの名前"); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE', "インストール完了！　あなたのサーバーに {0} ディレクトリが残っています。悪意のある攻撃者がこのインストールウィザードにアクセスできないようにするために、このディレクトリを削除してください。"); define('_MD_LEGACY_MESSAGE_LOGGEDOUT', "ログアウトしました。"); define('_MD_LEGACY_MESSAGE_LOGIN_SUCCESS', "{0}さん、ようこそ。ログイン処理中です"); define('_MD_LEGACY_MESSAGE_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); From minahito ＠ users.sourceforge.jp Fri Feb 16 15:30:20 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:30:20 +0900 Subject: [xoops-cvslog 6158] CVS update: xoops2jp/html/modules/legacy/language/english Message-ID: <20070216063020.36DD72AC160@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/language/english/main.php diff -u xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4 xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4.2.1 --- xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4 Sun Jan 7 00:30:44 2007 +++ xoops2jp/html/modules/legacy/language/english/main.php Fri Feb 16 15:30:20 2007 @@ -50,6 +50,7 @@ define('_MD_LEGACY_LANG_UID', "uid"); define('_MD_LEGACY_LANG_YMAIL', "Your Email"); define('_MD_LEGACY_LANG_YNAME', "Your Name"); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE', "Install Complete! Remove {0} directory to block anonymous attackers trying to use the installer."); define('_MD_LEGACY_MESSAGE_LOGGEDOUT', "You are now logged out."); define('_MD_LEGACY_MESSAGE_LOGIN_SUCCESS', "Login successful"); define('_MD_LEGACY_MESSAGE_THANKYOUFORVISIT', "Thank you for your visit to our site!"); From minahito ＠ users.sourceforge.jp Fri Feb 16 15:35:18 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:35:18 +0900 Subject: [xoops-cvslog 6159] CVS update: xoops2jp/html/modules/legacy/templates Message-ID: <20070216063518.581E12AC162@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/templates/legacy_install_completed.html diff -u /dev/null xoops2jp/html/modules/legacy/templates/legacy_install_completed.html:1.1.2.1 --- /dev/null Fri Feb 16 15:35:18 2007 +++ xoops2jp/html/modules/legacy/templates/legacy_install_completed.html Fri Feb 16 15:35:18 2007 @@ -0,0 +1,93 @@ + + + + + +<{$xoops_sitename}> + + + + + + +
<{$lang_message}>
+ + + + + \ No newline at end of file From minahito ＠ users.sourceforge.jp Fri Feb 16 15:35:48 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Fri, 16 Feb 2007 15:35:48 +0900 Subject: [xoops-cvslog 6160] CVS update: xoops2jp/html/modules/legacy/preload Message-ID: <20070216063548.37CC52AC160@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php diff -u /dev/null xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php:1.1.2.1 --- /dev/null Fri Feb 16 15:35:48 2007 +++ xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php Fri Feb 16 15:35:48 2007 @@ -0,0 +1,46 @@ + + * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license + */ + +if (!defined('XOOPS_ROOT_PATH')) exit(); + +if (!defined("LEGACY_INSTALLERCHECKER_ACTIVE")) + define("LEGACY_INSTALLERCHECKER_ACTIVE", true); + +/** + * This filter checks whether the install-wizard directory is removed. + * If it is not removed yet, this filter warns to remove the install-wizard + * directory. + */ +class Legacy_InstallerChecker extends XCube_ActionFilter +{ + function preBlockFilter() + { + if (LEGACY_INSTALLERCHECKER_ACTIVE == true && is_dir(XOOPS_ROOT_PATH . "/install")) + { + $root =& XCube_Root::getSingleton(); + $root->mLanguageManager->loadModuleMessageCatalog('legacy'); + $xoopsConfig = $root->mContext->mXoopsConfig; + + require_once XOOPS_ROOT_PATH . '/class/template.php'; + $xoopsTpl =& new XoopsTpl(); + $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']), + 'xoops_themecss' => xoops_getcss(), + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', + 'lang_message' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE, XOOPS_ROOT_PATH . "/install") + )); + + $xoopsTpl->compile_check = true; + + // @todo filebase template with absolute file path + $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/legacy/templates/legacy_install_completed.html'); + exit(); + } + } +} + +?> \ No newline at end of file From tom_g3x ＠ users.sourceforge.jp Fri Feb 16 19:54:39 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 16 Feb 2007 19:54:39 +0900 Subject: [xoops-cvslog 6161] CVS update: xoops2jp/html/modules/legacy/language/japanese Message-ID: <20070216105439.240E62AC12A@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/language/japanese/main.php diff -u xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4.2.1 xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4.2.2 --- xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4.2.1 Fri Feb 16 15:30:19 2007 +++ xoops2jp/html/modules/legacy/language/japanese/main.php Fri Feb 16 19:54:38 2007 @@ -50,7 +50,8 @@ define('_MD_LEGACY_LANG_UID', "uid"); define('_MD_LEGACY_LANG_YMAIL', "あなたのEmail"); define('_MD_LEGACY_LANG_YNAME', "あなたの名前"); -define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE', "インストール完了！　あなたのサーバーに {0} ディレクトリが残っています。悪意のある攻撃者がこのインストールウィザードにアクセスできないようにするために、このディレクトリを削除してください。"); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_CONFIRM', "インストール完了！"); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_WARNING', "あなたのサーバーに {0} ディレクトリが残っています。悪意のある攻撃者がこのインストールウィザードにアクセスできないようにする為に、このディレクトリを削除してください。"); define('_MD_LEGACY_MESSAGE_LOGGEDOUT', "ログアウトしました。"); define('_MD_LEGACY_MESSAGE_LOGIN_SUCCESS', "{0}さん、ようこそ。ログイン処理中です"); define('_MD_LEGACY_MESSAGE_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); From tom_g3x ＠ users.sourceforge.jp Fri Feb 16 19:54:39 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 16 Feb 2007 19:54:39 +0900 Subject: [xoops-cvslog 6162] CVS update: xoops2jp/html/modules/legacy/language/english Message-ID: <20070216105439.4A72C2AC162@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/language/english/main.php diff -u xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4.2.1 xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4.2.2 --- xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4.2.1 Fri Feb 16 15:30:20 2007 +++ xoops2jp/html/modules/legacy/language/english/main.php Fri Feb 16 19:54:39 2007 @@ -50,7 +50,8 @@ define('_MD_LEGACY_LANG_UID', "uid"); define('_MD_LEGACY_LANG_YMAIL', "Your Email"); define('_MD_LEGACY_LANG_YNAME', "Your Name"); -define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE', "Install Complete! Remove {0} directory to block anonymous attackers trying to use the installer."); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_CONFIRM', "Install Complete!"); +define('_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_WARNING', "Remove {0} directory to block anonymous attackers trying to use the installer."); define('_MD_LEGACY_MESSAGE_LOGGEDOUT', "You are now logged out."); define('_MD_LEGACY_MESSAGE_LOGIN_SUCCESS', "Login successful"); define('_MD_LEGACY_MESSAGE_THANKYOUFORVISIT', "Thank you for your visit to our site!"); From tom_g3x ＠ users.sourceforge.jp Fri Feb 16 19:54:55 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 16 Feb 2007 19:54:55 +0900 Subject: [xoops-cvslog 6163] CVS update: xoops2jp/html/modules/legacy/templates Message-ID: <20070216105455.2D48A2AC162@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/templates/legacy_install_completed.html diff -u xoops2jp/html/modules/legacy/templates/legacy_install_completed.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_install_completed.html:1.1.2.2 --- xoops2jp/html/modules/legacy/templates/legacy_install_completed.html:1.1.2.1 Fri Feb 16 15:35:18 2007 +++ xoops2jp/html/modules/legacy/templates/legacy_install_completed.html Fri Feb 16 19:54:55 2007 @@ -23,48 +23,32 @@ margin:0px; } -#siteclosemsg { - background-color:#ddffdf; - color:#136C99; - font-weight:bold; - text-align:center; - border-top:1px solid #ddffdf; - border-left:1px solid #DDDDFF; - border-right:1px solid #AAAAAA; - border-bottom:1px solid #AAAAAA; - padding:10px; +#installCompletedConfirm { width:80%; - margin:15px auto; -} - -#loginformTable { - border: 1px solid silver; - margin:5px auto; - border-top:1px solid #dddddd; - border-left:1px solid #dddddd; - border-right:1px solid #AAAAAA; - border-bottom:1px solid #AAAAAA; - -} -#loginformTable th, #loginformTable td { - font-size:14px; -} -#loginformTable th { - background-color: #c2cdd6; - color: #FFFFFF; - vertical-align: middle; - text-align: center; - border-top:2px solid #dddddd; - border-left:2px solid #dddddd; - border-right:2px solid #AAAAAA; - border-bottom:2px solid #AAAAAA; - padding : 3px; + font-weight:bold; + color:#000000; + font-size:15px; + padding:20px 15px 20px 35px; + margin:40px auto; + background:#fff8ee url(<{$xoops_url}>/modules/legacy/admin/theme/icons/important.gif) no-repeat 5px 15px; + border-top:1px solid #dfffdd; + border-left:1px solid #ffdddd; + border-right:1px solid #aaaaaa; + border-bottom:1px solid #aaaaaa; } -#loginformTable td { - background-color: #f8f8f8; - padding : 5px 15px; - color: #000000; +#installCompletedWarning { + width:80%; + font-weight:bold; + color:#770000; + font-size:15px; + padding:20px 15px 20px 35px; + margin:30px auto; + background:#ffaaaa url(<{$xoops_url}>/modules/legacy/admin/theme/icons/error.gif) no-repeat 5px 15px; + border-top:1px solid #dfffdd; + border-left:1px solid #ffdddd; + border-right:1px solid #aaaaaa; + border-bottom:1px solid #aaaaaa; } #footer { @@ -85,7 +69,8 @@ -
<{$lang_message}>
+
<{$lang_message_confirm}>
+
<{$lang_message_warning}>
From tom_g3x ＠ users.sourceforge.jp Fri Feb 16 19:54:55 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 16 Feb 2007 19:54:55 +0900 Subject: [xoops-cvslog 6164] CVS update: xoops2jp/html/modules/legacy/preload Message-ID: <20070216105455.534EE2AC197@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php diff -u xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php:1.1.2.1 xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php:1.1.2.2 --- xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php:1.1.2.1 Fri Feb 16 15:35:48 2007 +++ xoops2jp/html/modules/legacy/preload/InstallerChecker.class.php Fri Feb 16 19:54:55 2007 @@ -1,7 +1,7 @@ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license */ @@ -31,7 +31,8 @@ $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']), 'xoops_themecss' => xoops_getcss(), 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', - 'lang_message' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE, XOOPS_ROOT_PATH . "/install") + 'lang_message_confirm' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_CONFIRM, XOOPS_ROOT_PATH . "/install"), + 'lang_message_warning' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_WARNING, XOOPS_ROOT_PATH . "/install") )); $xoopsTpl->compile_check = true; From minahito ＠ users.sourceforge.jp Mon Feb 19 14:31:06 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 14:31:06 +0900 Subject: [xoops-cvslog 6165] CVS update: xoops2jp/html/modules/legacy/admin/theme Message-ID: <20070219053106.CB2662AC075@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.1 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.2 --- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.1 Sun Jan 28 23:33:53 2007 +++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html Mon Feb 19 14:31:06 2007 @@ -73,7 +73,11 @@ <{if $currentModule->getAdminMenu()}> <{/if}> From minahito ＠ users.sourceforge.jp Mon Feb 19 14:31:07 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 14:31:07 +0900 Subject: [xoops-cvslog 6166] CVS update: xoops2jp/html/modules/legacy/admin/templates/blocks Message-ID: <20070219053107.056672AC08C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html diff -u xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3.2.1 --- xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3 Sun Dec 3 00:50:21 2006 +++ xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html Mon Feb 19 14:31:06 2007 @@ -11,7 +11,11 @@ <{if $module->getAdminMenu()}> <{foreach item=menu from=$module->getAdminMenu()}> <{if $menu.show !== false}> -
  • <{$menu.title|xoops_escape}>
    • + <{if $menu.escaped === false}> +
  • <{$menu.title|xoops_escape}>
    • + <{else}> +
  • <{$menu.title|xoops_escape}>
    • + <{/if}> <{/if}> <{/foreach}> <{else}> From minahito ＠ users.sourceforge.jp Mon Feb 19 14:31:07 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 14:31:07 +0900 Subject: [xoops-cvslog 6167] CVS update: xoops2jp/html/modules/legacy/admin Message-ID: <20070219053107.2FA8D2AC075@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/menu.php diff -u xoops2jp/html/modules/legacy/admin/menu.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/menu.php:1.1.2.3.2.1 --- xoops2jp/html/modules/legacy/admin/menu.php:1.1.2.3 Mon Oct 16 16:38:39 2006 +++ xoops2jp/html/modules/legacy/admin/menu.php Mon Feb 19 14:31:07 2007 @@ -1,6 +1,6 @@ Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.2 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.3 --- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.2 Mon Feb 19 14:31:06 2007 +++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html Mon Feb 19 15:17:26 2007 @@ -74,9 +74,9 @@ From minahito ＠ users.sourceforge.jp Mon Feb 19 15:17:27 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:17:27 +0900 Subject: [xoops-cvslog 6169] CVS update: xoops2jp/html/modules/legacy/admin/templates/blocks Message-ID: <20070219061727.1BE062AC080@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html diff -u xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3.2.1 xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3.2.2 --- xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3.2.1 Mon Feb 19 14:31:06 2007 +++ xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html Mon Feb 19 15:17:26 2007 @@ -12,9 +12,9 @@ <{foreach item=menu from=$module->getAdminMenu()}> <{if $menu.show !== false}> <{if $menu.escaped === false}> -
  • <{$menu.title|xoops_escape}>
    • - <{else}>
  • <{$menu.title|xoops_escape}>
    • + <{else}> +
  • <{$menu.title|xoops_escape}>
    • <{/if}> <{/if}> <{/foreach}> From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:20 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:20 +0900 Subject: [xoops-cvslog 6170] CVS update: xoops2jp/html/class/xml Message-ID: <20070219065420.E39C52AC064@users.sourceforge.jp> Index: xoops2jp/html/class/xml/themesetparser.php diff -u xoops2jp/html/class/xml/themesetparser.php:1.2 xoops2jp/html/class/xml/themesetparser.php:1.2.26.1 --- xoops2jp/html/class/xml/themesetparser.php:1.2 Fri Mar 18 21:51:55 2005 +++ xoops2jp/html/class/xml/themesetparser.php Mon Feb 19 15:54:20 2007 @@ -1,5 +1,5 @@ themeSetData[$name])) { return $this->themeSetData[$name]; } - return false; + $ret = false; + return $ret; } return $this->themeSetData; } From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:44 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:44 +0900 Subject: [xoops-cvslog 6171] CVS update: xoops2jp/html/install/include Message-ID: <20070219065444.1E9522AC064@users.sourceforge.jp> Index: xoops2jp/html/install/include/functions.php diff -u xoops2jp/html/install/include/functions.php:1.1.2.3.2.1 xoops2jp/html/install/include/functions.php:1.1.2.3.2.1.2.1 --- xoops2jp/html/install/include/functions.php:1.1.2.3.2.1 Sat Dec 16 23:10:30 2006 +++ xoops2jp/html/install/include/functions.php Mon Feb 19 15:54:43 2007 @@ -1,5 +1,5 @@ Index: xoops2jp/html/core/XCube_Root.class.php diff -u xoops2jp/html/core/XCube_Root.class.php:1.1.2.7 xoops2jp/html/core/XCube_Root.class.php:1.1.2.7.2.1 --- xoops2jp/html/core/XCube_Root.class.php:1.1.2.7 Wed Jan 17 14:40:41 2007 +++ xoops2jp/html/core/XCube_Root.class.php Mon Feb 19 15:54:44 2007 @@ -2,7 +2,7 @@ /** * * @package XCube - * @version $Id: XCube_Root.class.php,v 1.1.2.7 2007/01/17 05:40:41 minahito Exp $ + * @version $Id: XCube_Root.class.php,v 1.1.2.7.2.1 2007/02/19 06:54:44 minahito Exp $ * @copyright Copyright 2005, 2006 XOOPS Cube Project * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license * @@ -315,6 +315,10 @@ $this->mController->mSetupTextFilter->call(new XCube_Ref($this->mTextFilter)); return $this->mTextFilter; } + + // Exception + $ret = null; + return $ret; } /** From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:44 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:44 +0900 Subject: [xoops-cvslog 6173] CVS update: xoops2jp/html/class/xml/rpc Message-ID: <20070219065444.6AC022AC064@users.sourceforge.jp> Index: xoops2jp/html/class/xml/rpc/xmlrpcapi.php diff -u xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.2.8.1 xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.2.8.1.4.1 --- xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.2.8.1 Wed Oct 19 02:18:06 2005 +++ xoops2jp/html/class/xml/rpc/xmlrpcapi.php Mon Feb 19 15:54:44 2007 @@ -1,5 +1,5 @@ response, $this->module); + $instance =& new XoopsApi($params, $this->response, $this->module); + return $instance; } else { return $this; } Index: xoops2jp/html/class/xml/rpc/xoopsapi.php diff -u xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2 xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2.26.1 --- xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2 Fri Mar 18 21:51:55 2005 +++ xoops2jp/html/class/xml/rpc/xoopsapi.php Mon Feb 19 15:54:44 2007 @@ -1,5 +1,5 @@ response->add($struct); } } + + $ret = null; + return ret; } } @@ -311,6 +314,9 @@ $this->response->add($arr); } } + + $ret = null; + return $ret; } } @@ -341,6 +347,9 @@ $this->response->add($arr); } } + + $ret = null; + return $ret; } } } From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:44 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:44 +0900 Subject: [xoops-cvslog 6174] CVS update: xoops2jp/html/modules/legacy/kernel Message-ID: <20070219065444.95E822AC08C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31.2.1 --- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31 Sun Jan 21 10:12:56 2007 +++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php Mon Feb 19 15:54:44 2007 @@ -1,7 +1,7 @@ Index: xoops2jp/html/install/class/textsanitizer.php diff -u xoops2jp/html/install/class/textsanitizer.php:1.2.20.2 xoops2jp/html/install/class/textsanitizer.php:1.2.20.2.2.1 --- xoops2jp/html/install/class/textsanitizer.php:1.2.20.2 Wed Oct 25 19:03:57 2006 +++ xoops2jp/html/install/class/textsanitizer.php Mon Feb 19 15:54:44 2007 @@ -1,5 +1,5 @@ ]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i"); $replacements = array("\\1\\2://\\3", "\\1www.\\2.\\3", "\\1\\2@\\3"); - return preg_replace($patterns, $replacements, $text); + $ret = preg_replace($patterns, $replacements, $text); + return $ret; } function &nl2Br($text) { - return preg_replace("/(\015\012)|(\015)|(\012)/","
    ",$text); + $ret = preg_replace("/(\015\012)|(\015)|(\012)/","
    ",$text); + return $ret; } function &addSlashes($text, $force=false) { if ($force) { - return addslashes($text); + $ret = addslashes($text); + return $ret; } if (!get_magic_quotes_gpc()) { - $text =& addslashes($text); + $text = addslashes($text); } return $text; } @@ -99,7 +102,8 @@ function &undoHtmlSpecialChars(&$text) { - return preg_replace(array("/>/i", "/</i", "/"/i", "/'/i"), array(">", "<", "\"", "'"), $text); + $ret = preg_replace(array("/>/i", "/</i", "/"/i", "/'/i"), array(">", "<", "\"", "'"), $text); + return $ret; } /* From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:44 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:44 +0900 Subject: [xoops-cvslog 6176] CVS update: xoops2jp/html/class/xoopsform Message-ID: <20070219065444.DEC882AC08C@users.sourceforge.jp> Index: xoops2jp/html/class/xoopsform/form.php diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.4 xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.4.2.1 --- xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.4 Sat Nov 11 18:34:14 2006 +++ xoops2jp/html/class/xoopsform/form.php Mon Feb 19 15:54:44 2007 @@ -1,5 +1,5 @@ getValue($value); } - return; + + $ret = null; + return $ret; } /** From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:45 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:45 +0900 Subject: [xoops-cvslog 6177] CVS update: xoops2jp/html/modules/legacy/admin/blocks Message-ID: <20070219065445.115A32AC064@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.1 --- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5 Wed Jan 17 16:50:32 2007 +++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php Mon Feb 19 15:54:44 2007 @@ -47,6 +47,9 @@ { $root =& XCube_Root::getSingleton(); + // load message catalog of legacy for _AD_LEGACY_LANG_NO_SETTING, even if the current module is not Legacy. + $root->mLanguageManager->loadModuleAdminMessageCatalog('legacy'); + $controller =& $root->mController; $user =& $root->mController->mRoot->mContext->mXoopsUser; $render =& $this->getRenderTarget(); From minahito ＠ users.sourceforge.jp Mon Feb 19 15:54:45 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 19 Feb 2007 15:54:45 +0900 Subject: [xoops-cvslog 6178] CVS update: xoops2jp/html/class/xml/rss Message-ID: <20070219065445.3F0EF2AC08C@users.sourceforge.jp> Index: xoops2jp/html/class/xml/rss/xmlrss2parser.php diff -u xoops2jp/html/class/xml/rss/xmlrss2parser.php:1.2 xoops2jp/html/class/xml/rss/xmlrss2parser.php:1.2.26.1 --- xoops2jp/html/class/xml/rss/xmlrss2parser.php:1.2 Fri Mar 18 21:51:55 2005 +++ xoops2jp/html/class/xml/rss/xmlrss2parser.php Mon Feb 19 15:54:45 2007 @@ -1,5 +1,5 @@ _channelData[$name])) { return $this->_channelData[$name]; } - return false; + $ret = false; + return $ret; } return $this->_channelData; } @@ -99,7 +100,8 @@ if (isset($this->_imageData[$name])) { return $this->_imageData[$name]; } - return false; + $ret = false; + return $ret; } return $this->_imageData; } From tom_g3x ＠ users.sourceforge.jp Mon Feb 19 18:15:31 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 19 Feb 2007 18:15:31 +0900 Subject: [xoops-cvslog 6179] CVS update: xoops2jp/html/modules/legacy/admin/templates/stylesheets Message-ID: <20070219091531.87E0F2AC0D1@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.9 xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.9.2.1 --- xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.9 Sun Dec 3 16:44:54 2006 +++ xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css Mon Feb 19 18:15:31 2007 @@ -60,6 +60,9 @@ .legacy_module_message { } +.legacy_module_return { + margin:15px 20px; +} .legacy_module_return , .legacy_module_return a , .legacy_module_return a:visited { font-weight:bold; } From tom_g3x ＠ users.sourceforge.jp Mon Feb 19 18:15:31 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 19 Feb 2007 18:15:31 +0900 Subject: [xoops-cvslog 6180] CVS update: xoops2jp/html/modules/legacy/admin/templates Message-ID: <20070219091531.B06B92AC192@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/templates/module_install_success.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.4.2.1 --- xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.4 Sun Dec 3 00:50:20 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_install_success.html Mon Feb 19 18:15:31 2007 @@ -22,3 +22,4 @@
    » <{$smarty.const._AD_LEGACY_LANG_MODLIST}>
    +
    » <{$smarty.const._AD_LEGACY_LANG_MODINSTALL}>
    From nobunobu ＠ users.sourceforge.jp Tue Feb 20 21:49:35 2007 From: nobunobu ＠ users.sourceforge.jp (NobuNobu) Date: Tue, 20 Feb 2007 21:49:35 +0900 Subject: [xoops-cvslog 6181] CVS update: xoops2jp/html/include Message-ID: <20070220124935.186522AC125@users.sourceforge.jp> Index: xoops2jp/html/include/comment_edit.php diff -u xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5 xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5.2.1 --- xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5 Wed Jan 17 16:20:54 2007 +++ xoops2jp/html/include/comment_edit.php Tue Feb 20 21:49:34 2007 @@ -1,5 +1,5 @@ render($renderTarget); + $renderSystem->render($renderTarget); // // Display now. From nobunobu ＠ users.sourceforge.jp Tue Feb 20 22:00:16 2007 From: nobunobu ＠ users.sourceforge.jp (NobuNobu) Date: Tue, 20 Feb 2007 22:00:16 +0900 Subject: [xoops-cvslog 6182] CVS update: xoops2jp/html/modules/legacy/kernel Message-ID: <20070220130016.705E12AC184@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.1 --- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13 Wed Jan 17 16:43:29 2007 +++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php Tue Feb 20 22:00:16 2007 @@ -1,7 +1,7 @@ mXoopsModule->modinfo['config'] as $config) { if(isset($config['title'])) From nobunobu ＠ users.sourceforge.jp Tue Feb 20 22:21:38 2007 From: nobunobu ＠ users.sourceforge.jp (NobuNobu) Date: Tue, 20 Feb 2007 22:21:38 +0900 Subject: [xoops-cvslog 6183] CVS update: xoops2jp/html/modules/legacy/kernel Message-ID: <20070220132138.9BB392AC19D@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.1 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.2 --- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.1 Tue Feb 20 22:00:16 2007 +++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php Tue Feb 20 22:21:38 2007 @@ -1,7 +1,7 @@ 0) { foreach($config['options'] as $key=>$val) { - $configInfos[]=$key; + $configInfos[]=(@constant($key) ? @constant($key) : $key); } } } From nobunobu ＠ users.sourceforge.jp Tue Feb 20 22:39:14 2007 From: nobunobu ＠ users.sourceforge.jp (NobuNobu) Date: Tue, 20 Feb 2007 22:39:14 +0900 Subject: [xoops-cvslog 6184] CVS update: xoops2jp/html/modules/legacy/kernel Message-ID: <20070220133914.333252AC18A@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.2 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.3 --- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13.2.2 Tue Feb 20 22:21:38 2007 +++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php Tue Feb 20 22:39:13 2007 @@ -1,7 +1,7 @@ mContext->getXoopsConfig('language'); $helpfile = $this->mXoopsModule->getHelp(); - $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language; + $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language. "/help"; if (!file_exists($dir . "/" . $helpfile)) { - $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language; + $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/english/help"; if (!file_exists($dir . "/" . $helpfile)) { return; } From minahito ＠ users.sourceforge.jp Wed Feb 21 15:05:59 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 21 Feb 2007 15:05:59 +0900 Subject: [xoops-cvslog 6185] CVS update: xoops2jp/html/modules/user/kernel Message-ID: <20070221060559.B993C2AC0D0@users.sourceforge.jp> Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.6 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.6.2.1 --- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.6 Fri Dec 8 13:47:20 2006 +++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Wed Feb 21 15:05:59 2007 @@ -1,7 +1,7 @@ Index: xoops2jp/html/class/xml/rpc/xoopsapi.php diff -u xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2.26.1 xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2.26.2 --- xoops2jp/html/class/xml/rpc/xoopsapi.php:1.2.26.1 Mon Feb 19 15:54:44 2007 +++ xoops2jp/html/class/xml/rpc/xoopsapi.php Wed Feb 21 15:09:24 2007 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php diff -u xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.3.2.1 --- xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.3 Sat Nov 18 23:10:59 2006 +++ xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php Wed Feb 21 15:10:22 2007 @@ -49,6 +49,14 @@ function getDefaultView(&$controller, &$xoopsUser) { + $root =& $controller->mRoot; + $service =& $root->mServiceManager->getService("LegacySearch"); + + if (is_object($service)) { + $client =& $root->mServiceManager->createClient($service); + $this->mModules = $client->call('getActiveModules', array()); + } + $this->mActionForm->fetch(); $this->mActionForm->validate(); @@ -59,13 +67,7 @@ // // TODO ErrorHandling // - $root =& $controller->mRoot; - $service =& $root->mServiceManager->getService("LegacySearch"); if (is_object($service)) { - $client =& $root->mServiceManager->createClient($service); - - $this->mModules = $client->call('getActiveModules', array()); - $this->mActionForm->update($params); $handler =& xoops_gethandler('module'); From minahito ＠ users.sourceforge.jp Wed Feb 21 15:15:59 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 21 Feb 2007 15:15:59 +0900 Subject: [xoops-cvslog 6188] CVS update: xoops2jp/html/modules/legacy/admin/actions Message-ID: <20070221061559.953192AC0D0@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.1 --- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6 Sat Nov 11 02:13:39 2006 +++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php Wed Feb 21 15:15:59 2007 @@ -1,7 +1,7 @@ mXoopsModule =& $handler->create(); + + if ($this->mXoopsModule->get('dirname') == "") { + return false; + } + $this->mXoopsModule->set('weight', 1); $this->mXoopsModule->loadInfoAsVar($dirname); From minahito ＠ users.sourceforge.jp Mon Feb 26 10:49:36 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 10:49:36 +0900 Subject: [xoops-cvslog 6189] CVS update: xoops2jp/html/modules/legacy/admin/actions Message-ID: <20070226014936.136F62AC0BB@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.1 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.2 --- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.1 Wed Feb 21 15:15:59 2007 +++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php Mon Feb 26 10:49:35 2007 @@ -1,7 +1,7 @@ mXoopsModule =& $handler->create(); - if ($this->mXoopsModule->get('dirname') == "") { - return false; - } - $this->mXoopsModule->set('weight', 1); $this->mXoopsModule->loadInfoAsVar($dirname); From minahito ＠ users.sourceforge.jp Mon Feb 26 10:49:54 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 10:49:54 +0900 Subject: [xoops-cvslog 6190] CVS update: xoops2jp/html/modules/legacy/admin/actions Message-ID: <20070226014954.C49A62AC039@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.2 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.3 --- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6.2.2 Mon Feb 26 10:49:35 2007 +++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php Mon Feb 26 10:49:54 2007 @@ -1,7 +1,7 @@ mXoopsModule->loadInfoAsVar($dirname); if ($this->mXoopsModule->get('dirname') == null) { - return null; + return false; } if ($this->mXoopsModule->get('dirname') == 'system') { From minahito ＠ users.sourceforge.jp Mon Feb 26 11:55:26 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 11:55:26 +0900 Subject: [xoops-cvslog 6191] CVS update: xoops2jp/html/modules/legacy/kernel Message-ID: <20070226025526.C1C422AC06A@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31.2.1 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31.2.2 --- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31.2.1 Mon Feb 19 15:54:44 2007 +++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php Mon Feb 26 11:55:26 2007 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.1 xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.2 --- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.1 Mon Feb 19 15:54:44 2007 +++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php Mon Feb 26 12:13:28 2007 @@ -71,11 +71,20 @@ $mod = $db->prefix("modules"); $perm = $db->prefix("group_permission"); $groups = implode(",", $user->getGroups()); + + // + // Users who are belong to ADMIN GROUP have every permissions, so we have to prepare two kinds of SQL. + // + if ($root->mContext->mUser->isInRole('Site.Owner')) { + $sql = "SELECT DISTINCT mid FROM ${mod} WHERE isactive=1 AND hasadmin=1 ORDER BY weight, mid"; + } + else { + $sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " . + "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " . + "AND ${mod}.hasadmin=1 " . + "ORDER BY ${mod}.weight, ${mod}.mid"; + } - $sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " . - "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " . - "AND ${mod}.hasadmin=1 " . - "ORDER BY ${mod}.weight, ${mod}.mid"; $result=$db->query($sql); From minahito ＠ users.sourceforge.jp Mon Feb 26 12:22:56 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 12:22:56 +0900 Subject: [xoops-cvslog 6193] CVS update: xoops2jp/html/modules/legacy/admin/blocks Message-ID: <20070226032256.63DF02AC081@users.sourceforge.jp> Index: xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.3.2.1 --- xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.3 Wed Jan 17 16:50:32 2007 +++ xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php Mon Feb 26 12:22:56 2007 @@ -35,6 +35,7 @@ function execute() { $render =& $this->getRenderTarget(); + $render->setAttribute('legacy_module', 'legacy'); $render->setTemplateName('legacy_admin_block_actionsearch.html'); $root =& XCube_Root::getSingleton(); Index: xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.2 xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.3 --- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.5.2.2 Mon Feb 26 12:13:28 2007 +++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php Mon Feb 26 12:22:56 2007 @@ -53,6 +53,7 @@ $controller =& $root->mController; $user =& $root->mController->mRoot->mContext->mXoopsUser; $render =& $this->getRenderTarget(); + $render->setAttribute('legacy_module', 'legacy'); $this->mCurrentModule =& $controller->mRoot->mContext->mXoopsModule; From minahito ＠ users.sourceforge.jp Mon Feb 26 13:01:30 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 13:01:30 +0900 Subject: [xoops-cvslog 6194] CVS update: xoops2jp/html/core Message-ID: <20070226040130.9362B2AC08B@users.sourceforge.jp> Index: xoops2jp/html/core/XCube_ActionForm.class.php diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.6 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.6.2.1 --- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.6 Sat Jan 20 22:23:28 2007 +++ xoops2jp/html/core/XCube_ActionForm.class.php Mon Feb 26 13:01:30 2007 @@ -2,7 +2,7 @@ /** * * @package XCube - * @version $Id: XCube_ActionForm.class.php,v 1.1.2.6 2007/01/20 13:23:28 tom_g3x Exp $ + * @version $Id: XCube_ActionForm.class.php,v 1.1.2.6.2.1 2007/02/26 04:01:30 minahito Exp $ * @copyright Copyright 2005, 2006 XOOPS Cube Project * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license * @@ -445,9 +445,8 @@ $message=$this->mMessages[$name]['message']; if(isset($this->mMessages[$name]['args'])) { - for($i=0;$imMessages[$name]['args']);$i++) { - $message=str_replace("{".$i."}",$this->mMessages[$name]['args'][$i],$message); - } + // Use an unity method. + $message = XCube_Utils::formatString($message, $this->mMessages[$name]['args']); } return $message; From minahito ＠ users.sourceforge.jp Mon Feb 26 13:01:46 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 13:01:46 +0900 Subject: [xoops-cvslog 6195] CVS update: xoops2jp/html/core Message-ID: <20070226040146.E5EB22AC07B@users.sourceforge.jp> Index: xoops2jp/html/core/XCube_Utils.class.php diff -u xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5 xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5.2.1 --- xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5 Tue Dec 26 23:30:54 2006 +++ xoops2jp/html/core/XCube_Utils.class.php Mon Feb 26 13:01:46 2007 @@ -2,7 +2,7 @@ /** * * @package XCube - * @version $Id: XCube_Utils.class.php,v 1.1.2.5 2006/12/26 14:30:54 nobunobu Exp $ + * @version $Id: XCube_Utils.class.php,v 1.1.2.5.2.1 2007/02/26 04:01:46 minahito Exp $ * @copyright Copyright 2005, 2006 XOOPS Cube Project * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license * @@ -29,8 +29,14 @@ $root =& XCube_Root::getSingleton(); $root->mController->executeRedirect($url, $time, $messages); } - - function formatMessage() + + /** + * @static + * @brief Formats string with special care for international. + * @remark This method doesn't implement the provider which knows how to + * format for each locales. So, this method is interim implement. + */ + function formatString() { $arr = func_get_args(); @@ -38,12 +44,48 @@ return null; $message = $arr[0]; - for($i = 1; $i < count($arr); $i++) { - $message = str_replace("{" . ($i-1) . "}", $arr[$i], $message); + + $variables = array(); + if (is_array($arr[1])) { + $variables = $arr[1]; + } + else { + $variables = $arr; + array_pop($variables); + } + + for ($i = 0; $i < count($variables); $i++) { + $message = str_replace("{" . ($i) . "}", $variables[$i], $message); + + // Temporary.... + $message = str_replace("{" . ($i) . ":ucfirst}", ucfirst($variables[$i]), $message); + $message = str_replace("{" . ($i) . ":strtolower}", strtolower($variables[$i]), $message); + $message = str_replace("{" . ($i) . ":strtoupper}", strtoupper($variables[$i]), $message); } return $message; } + + /** + * @deprecated + * @see XCube_Utils::formatString() + */ + function formatMessage() + { + $arr = func_get_args(); + + if (count($arr) == 0) { + return null; + } + else if (count($arr) == 1) { + return XCube_Utils::formatString($arr[0]); + } + else if (count($arr) > 1) { + $vals = $arr; + array_pop($vals); + return XCube_Utils::formatString($arr[0], $vals); + } + } /** * @deprecated From minahito ＠ users.sourceforge.jp Mon Feb 26 13:02:22 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 13:02:22 +0900 Subject: [xoops-cvslog 6196] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20070226040222.9EA452AC019@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/main.php diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.22.2.1 xoops2jp/html/modules/user/language/english/main.php:1.1.2.22.2.1.2.1 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.22.2.1 Sat Oct 7 15:30:10 2006 +++ xoops2jp/html/modules/user/language/english/main.php Mon Feb 26 13:02:22 2007 @@ -9,8 +9,8 @@ define('_MD_USER_ERROR_EMAILTAKEN', "Email has been taken."); define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong."); define('_MD_USER_ERROR_INVALID_EMAIL', "Invalid email"); -define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); -define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters."); +define('_MD_USER_ERROR_MAXLENGTH', "Input {0:strtolower} with {1} or less characters."); +define('_MD_USER_ERROR_MINLENGTH', "Input {0:strtolower} with {1} or more characters."); define('_MD_USER_ERROR_NAME_RESERVED', "Name is reserved."); define('_MD_USER_ERROR_PASSWORD', "The passwords you gave did not match."); define('_MD_USER_ERROR_REQUIRED', "{0} is required."); From minahito ＠ users.sourceforge.jp Mon Feb 26 15:42:29 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Mon, 26 Feb 2007 15:42:29 +0900 Subject: [xoops-cvslog 6197] CVS update: xoops2jp/html/core Message-ID: <20070226064229.06BCF2AC083@users.sourceforge.jp> Index: xoops2jp/html/core/XCube_Utils.class.php diff -u xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5.2.1 xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5.2.2 --- xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5.2.1 Mon Feb 26 13:01:46 2007 +++ xoops2jp/html/core/XCube_Utils.class.php Mon Feb 26 15:42:28 2007 @@ -2,7 +2,7 @@ /** * * @package XCube - * @version $Id: XCube_Utils.class.php,v 1.1.2.5.2.1 2007/02/26 04:01:46 minahito Exp $ + * @version $Id: XCube_Utils.class.php,v 1.1.2.5.2.2 2007/02/26 06:42:28 minahito Exp $ * @copyright Copyright 2005, 2006 XOOPS Cube Project * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license * @@ -51,7 +51,7 @@ } else { $variables = $arr; - array_pop($variables); + array_shift($variables); } for ($i = 0; $i < count($variables); $i++) { @@ -82,7 +82,7 @@ } else if (count($arr) > 1) { $vals = $arr; - array_pop($vals); + array_shift($vals); return XCube_Utils::formatString($arr[0], $vals); } } From tom_g3x ＠ users.sourceforge.jp Wed Feb 28 01:04:43 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 28 Feb 2007 01:04:43 +0900 Subject: [xoops-cvslog 6198] CVS update: xoops2jp/html/class/smarty/plugins Message-ID: <20070227160443.BA7162AC067@users.sourceforge.jp> Index: xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php diff -u xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.3 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.3.2.1 --- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.3 Thu Jan 18 19:20:41 2007 +++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php Wed Feb 28 01:04:43 2007 @@ -2,7 +2,7 @@ /** * * @package Legacy - * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.3 2007/01/18 10:20:41 nobunobu Exp $ + * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.3.2.1 2007/02/27 16:04:43 tom_g3x Exp $ * @copyright Copyright 2005, 2006 XOOPSCube.org * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2 * @@ -51,6 +51,7 @@ // $name = trim($params['name']); $class = isset($params['class']) ? trim($params['class']) : null; + $style = isset($params['style']) ? trim($params['style']) : null; $cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_TEXTAREA_DEFAULT_COLS; $rows = isset($params['rows']) ? intval($params['rows']) : XOOPS_TEXTAREA_DEFAULT_ROWS; $value = isset($params['value']) ? $textFilter->toEdit($params['value']) : null; @@ -66,6 +67,10 @@ $string .= " class=\"${class}\""; } + if ($style) { + $string .= " style=\"${style}\""; + } + $string .= " id=\"$id\""; if($readonly == 1) { Index: xoops2jp/html/class/smarty/plugins/function.xoops_input.php diff -u xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.4 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.4.2.1 --- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.4 Thu Jan 18 19:20:41 2007 +++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php Wed Feb 28 01:04:43 2007 @@ -2,7 +2,7 @@ /** * * @package Legacy - * @version $Id: function.xoops_input.php,v 1.1.2.9.2.4 2007/01/18 10:20:41 nobunobu Exp $ + * @version $Id: function.xoops_input.php,v 1.1.2.9.2.4.2.1 2007/02/27 16:04:43 tom_g3x Exp $ * @copyright Copyright 2005, 2006 XOOPSCube.org * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2 * @@ -56,6 +56,7 @@ $type = isset($params['type']) ? strtolower(trim($params['type'])) : "text"; $value = isset($params['value']) ? $textFilter->toEdit($params['value']) : null; $class = isset($params['class']) ? trim($params['class']) : null; + $style = isset($params['style']) ? trim($params['style']) : null; $id = isset($params['id']) ? trim($params['id']) : XOOPS_INPUT_DEFID_PREFIX . $name; $size = isset($params['size']) ? intval($params['size']) : null; $maxlength = isset($params['maxlength']) ? intval($params['maxlength']) : null; @@ -77,6 +78,10 @@ $string .= " class=\"${class}\""; } + if ($style) { + $string .= " style=\"${style}\""; + } + if ($type == "checkbox" || $type == "radio") { $string .= " id=\"{$id}_{$value}\""; }else { From tom_g3x ＠ users.sourceforge.jp Wed Feb 28 01:24:37 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 28 Feb 2007 01:24:37 +0900 Subject: [xoops-cvslog 6199] CVS update: xoops2jp/html/modules/user/templates/blocks Message-ID: <20070227162437.67C602AC0A5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/blocks/user_block_login.html diff -u xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.2 xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.2.2.1 --- xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.2 Sat Nov 11 13:30:06 2006 +++ xoops2jp/html/modules/user/templates/blocks/user_block_login.html Wed Feb 28 01:24:37 2007 @@ -4,7 +4,7 @@ <{$smarty.const._MB_USER_PASSWORD}>
    <{xoops_input type=password name=pass size=12 maxlength=32 }>
    - + <{xoops_input type=hidden name=xoops_redirect value=$xoops_requesturi}> <{xoops_input type=hidden name=op value=login}> <{xoops_input type=submit name=submit value=$smarty.const._MB_USER_LOGIN}>
    From tom_g3x ＠ users.sourceforge.jp Wed Feb 28 01:24:37 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 28 Feb 2007 01:24:37 +0900 Subject: [xoops-cvslog 6200] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20070227162437.41E822AC067@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_userform.html diff -u xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4.4.1 --- xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4 Fri Aug 18 14:35:29 2006 +++ xoops2jp/html/modules/user/templates/user_userform.html Wed Feb 28 01:24:37 2007 @@ -1,10 +1,10 @@
    <{$smarty.const._LOGIN}>
    - <{$smarty.const._USERNAME}>
    - <{$smarty.const._PASSWORD}>
    - - + <{$smarty.const._USERNAME}> <{xoops_input type=text name=uname size=26 maxlength=25 value=$usercookie}>
    + <{$smarty.const._PASSWORD}> <{xoops_input type=password name=pass size=21 maxlength=31}>
    + <{xoops_input type=hidden name=op value=login}> + <{xoops_input type=hidden name=xoops_redirect value=$redirect_page}>
    @@ -18,8 +18,8 @@

    <{$smarty.const._MD_USER_LANG_NOPROBLEM}>
    <{$smarty.const._MD_USER_LANG_YOUREMAIL}> -    - + <{xoops_input type=text name=email size=26 maxlength=60}>   + <{xoops_input type=hidden name=op value=mailpasswd}>
    Index: xoops2jp/html/modules/user/templates/user_default.html diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5.2.1 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5.2.1.2.1 --- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5.2.1 Fri Nov 10 20:30:23 2006 +++ xoops2jp/html/modules/user/templates/user_default.html Wed Feb 28 01:24:37 2007 @@ -1,6 +1,6 @@
    - - +<{xoops_input type=hidden name=op value=login}> +<{xoops_input type=hidden name=xoops_redirect value=$redirect_page}> @@ -8,13 +8,13 @@ Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.3 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.3.2.1 --- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.3 Sun Dec 3 00:50:22 2006 +++ xoops2jp/html/modules/user/templates/user_avatar_edit.html Wed Feb 28 01:24:37 2007 @@ -41,7 +41,7 @@ From minahito ＠ users.sourceforge.jp Wed Feb 28 16:27:02 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 16:27:02 +0900 Subject: [xoops-cvslog 6201] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228072702.916172AC0AD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/user_search_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.13.2.1 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.13.2.1.2.1 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.13.2.1 Thu Oct 12 23:45:32 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Wed Feb 28 16:27:02 2007 @@ -48,6 +48,7 @@ From minahito ＠ users.sourceforge.jp Wed Feb 28 16:27:41 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 16:27:41 +0900 Subject: [xoops-cvslog 6203] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20070228072741.E7E5F2AC037@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/admin.php diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5.2.1 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5 Mon Nov 6 19:17:34 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Wed Feb 28 16:27:41 2007 @@ -60,6 +60,9 @@ define('_AD_USER_LANG_LASTLOG_MORE', "Last login was more than X days ago"); define('_AD_USER_LANG_LASTLOGIN', "Last login"); define('_AD_USER_LANG_LEFT_TARGET_USER', "Remaining Recipients"); +define('_AD_USER_LANG_LEVEL_ACTIVE', "Active User"); +define('_AD_USER_LANG_LEVEL_PENDING', "Pending User"); +define('_AD_USER_LANG_LEVEL_ROOT', "Root User"); define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Only users that don't accept mail "); define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Only users that accept mail"); define('_AD_USER_LANG_MAILJOB_DELETE', "Delete Mailjob"); From minahito ＠ users.sourceforge.jp Wed Feb 28 16:27:42 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 16:27:42 +0900 Subject: [xoops-cvslog 6204] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20070228072742.1895B2AC037@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.37.2.5 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.5.2.1 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.5 Mon Nov 6 19:17:34 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Wed Feb 28 16:27:41 2007 @@ -60,6 +60,9 @@ define('_AD_USER_LANG_LASTLOG_MORE', "X日以上ログインしていない"); define('_AD_USER_LANG_LASTLOGIN', "最終ログイン"); define('_AD_USER_LANG_LEFT_TARGET_USER', "残送信数"); +define('_AD_USER_LANG_LEVEL_ACTIVE', "承認済ユーザ"); +define('_AD_USER_LANG_LEVEL_PENDING', "未承認ユーザ"); +define('_AD_USER_LANG_LEVEL_ROOT', "ルートユーザ"); define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ"); define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ"); define('_AD_USER_LANG_MAILJOB_DELETE', "メールジョブ削除"); From minahito ＠ users.sourceforge.jp Wed Feb 28 18:28:32 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 18:28:32 +0900 Subject: [xoops-cvslog 6205] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20070228092832.923142AC03F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.4.2.1 xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.4.2.1.2.1 --- xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.4.2.1 Sat Oct 14 23:17:49 2006 +++ xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php Wed Feb 28 18:28:32 2007 @@ -134,7 +134,7 @@ $xoopsMailer->setBody($mailjob->getReplaceBody($to_user, $from_user)); if (!$xoopsMailer->send(true)) { - $link->set('message', $link->get('message') . $xoopsMailer->ErrorInfo); + $link->set('message', $link->get('message') . $xoopsMailer->multimailer->ErrorInfo); } } } From minahito ＠ users.sourceforge.jp Wed Feb 28 18:30:49 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 18:30:49 +0900 Subject: [xoops-cvslog 6206] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228093049.BD24C2AC06E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4.2.1 --- xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4 Sun Dec 3 00:50:22 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html Wed Feb 28 18:30:49 2007 @@ -33,18 +33,20 @@ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{foreach item=obj from=$objects}> - - - - - - + <{if count($objects) > 0}> + <{foreach item=obj from=$objects}> + + + + + + + + <{/foreach}> + + - <{/foreach}> - - - + <{/if}>
    <{$smarty.const._LOGIN}>
    <{$smarty.const._USERNAME}> "> - + <{xoops_input type=text name=uname size=25 maxlength=25 value=$usercookie}>
    <{$smarty.const._PASSWORD}> "> - + <{xoops_input type=password name=pass size=30 maxlength=32}>
    <{$smarty.const._MD_USER_LANG_AVATAR}> "> - + <{xoops_input type=file name=uploadavatar size=30}>
    <{$user->getShow('posts')}> <{$user->getShow('level')}> + " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> From minahito ＠ users.sourceforge.jp Wed Feb 28 16:27:22 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 16:27:22 +0900 Subject: [xoops-cvslog 6202] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228072722.6F4C52AC0AD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/user_view.html diff -u xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.2 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.2.2.1 --- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.2 Sun Dec 3 00:50:22 2006 +++ xoops2jp/html/modules/user/admin/templates/user_view.html Wed Feb 28 16:27:22 2007 @@ -141,7 +141,13 @@
    <{$smarty.const._MD_USER_LANG_LEVEL}> - <{$object->getShow('level')}> + <{if $object->get('level') == 0}> + <{$smarty.const._AD_USER_LANG_LEVEL_PENDING}> + <{elseif $object->get('level') == 1}> + <{$smarty.const._AD_USER_LANG_LEVEL_ACTIVE}> + <{elseif $object->get('level') == 5}> + <{$smarty.const._AD_USER_LANG_LEVEL_ROOT}> + <{/if}>
    <{xoops_input type=checkbox name=uid key=$obj->get('uid')}><{$obj->getShow('uid')}><{$obj->get('uid')|xoops_user:uname}><{$obj->getShow('retry')}><{$obj->getShow('message')}>
    <{xoops_input type=checkbox name=uid key=$obj->get('uid')}><{$obj->getShow('uid')}><{$obj->get('uid')|xoops_user:uname}><{$obj->getShow('retry')}><{$obj->getShow('message')}>
    From tom_g3x ＠ users.sourceforge.jp Wed Feb 28 19:02:24 2007 From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 28 Feb 2007 19:02:24 +0900 Subject: [xoops-cvslog 6207] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20070228100224.AE8C42AC04D@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_userform.html diff -u xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4.4.1 xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4.4.2 --- xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4.4.1 Wed Feb 28 01:24:37 2007 +++ xoops2jp/html/modules/user/templates/user_userform.html Wed Feb 28 19:02:24 2007 @@ -2,7 +2,7 @@ <{$smarty.const._LOGIN}>
    <{$smarty.const._USERNAME}> <{xoops_input type=text name=uname size=26 maxlength=25 value=$usercookie}>
    - <{$smarty.const._PASSWORD}> <{xoops_input type=password name=pass size=21 maxlength=31}>
    + <{$smarty.const._PASSWORD}> <{xoops_input type=password name=pass size=21 maxlength=32}>
    <{xoops_input type=hidden name=op value=login}> <{xoops_input type=hidden name=xoops_redirect value=$redirect_page}> From minahito ＠ users.sourceforge.jp Wed Feb 28 19:05:28 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:05:28 +0900 Subject: [xoops-cvslog 6208] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20070228100528.E9E322AC03F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/MailjobViewAction.class.php diff -u /dev/null xoops2jp/html/modules/user/admin/actions/MailjobViewAction.class.php:1.1.2.1 --- /dev/null Wed Feb 28 19:05:28 2007 +++ xoops2jp/html/modules/user/admin/actions/MailjobViewAction.class.php Wed Feb 28 19:05:28 2007 @@ -0,0 +1,40 @@ +setTemplateName("mailjob_view.html"); + $render->setAttribute('object', $this->mObject); + } + + function executeViewError(&$controller, &$xoopsUser, &$render) + { + $controller->executeRedirect("./index.php?action=MailjobList", 1, _AD_USER_ERROR_CONTENT_IS_NOT_FOUND); + } +} + +?> From minahito ＠ users.sourceforge.jp Wed Feb 28 19:05:43 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:05:43 +0900 Subject: [xoops-cvslog 6209] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228100543.9770C2AC03F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_view.html diff -u /dev/null xoops2jp/html/modules/user/admin/templates/mailjob_view.html:1.1.2.1 --- /dev/null Wed Feb 28 19:05:43 2007 +++ xoops2jp/html/modules/user/admin/templates/mailjob_view.html Wed Feb 28 19:05:43 2007 @@ -0,0 +1,49 @@ +
    + <{$smarty.const._MI_USER_NAME}> + »» <{$smarty.const._AD_USER_LANG_MAILJOB_LIST}> + »» <{$smarty.const._AD_USER_LANG_MAILJOB_VIEW}> +
    + +

    <{$smarty.const._AD_USER_LANG_MAILJOB_VIEW}>

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    <{$smarty.const._AD_USER_LANG_MAILJOB_VIEW}>
    <{$smarty.const._AD_USER_LANG_MAILJOB_ID}>"><{$object->getShow('mailjob_id')}>
    <{$smarty.const._AD_USER_LANG_TITLE}>"><{$object->getShow('title')}>
    <{$smarty.const._AD_USER_LANG_BODY}>"><{$object->getShow('body')}>
    <{$smarty.const._AD_USER_LANG_TARGET_RETRY_NUMBER}>"><{$object->getCurrentRetry()|xoops_escape}>
    <{$smarty.const._AD_USER_LANG_FROM_NAME}>"><{$object->getShow('from_name')}>
    <{$smarty.const._AD_USER_LANG_FROM_EMAIL}>"><{$object->getShow('from_email')}>
    <{$smarty.const._AD_USER_LANG_IS_PM}>"><{if $object->getShow('is_pm') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}>
    <{$smarty.const._AD_USER_LANG_IS_MAIL}>"><{if $object->getShow('is_mail') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}>
    <{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}>"><{$object->get('create_unixtime')|xoops_formattimestamp:l}>
    From minahito ＠ users.sourceforge.jp Wed Feb 28 19:08:31 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:08:31 +0900 Subject: [xoops-cvslog 6210] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228100831.A56112AC0A7@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3.2.1 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3 Sun Dec 3 00:50:22 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Wed Feb 28 19:08:31 2007 @@ -32,7 +32,13 @@ <{foreach item=obj from=$objects}> <{$obj->getShow('mailjob_id')}> - <{$obj->getShow('title')}> + + <{if $obj->getUserCount() > 0}> + <{$obj->getShow('title')}> + <{else}> + <{$obj->getShow('title')}> + <{/if}> + <{if $obj->getShow('is_pm') == 1}> <{$smarty.const._YES}> @@ -49,15 +55,17 @@ <{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}> - <{if $obj->mUserCount > 0}> + <{if $obj->getUserCount() > 0}> <{$obj->mUserCount|xoops_escape}> <{else}> <{$smarty.const._AD_USER_LANG_COMPLETED}> <{/if}> - " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> - " alt="<{$smarty.const._SEND}>" title="<{$smarty.const._SEND}>" /> + <{if $obj->getUserCount() > 0}> + " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> + " alt="<{$smarty.const._SEND}>" title="<{$smarty.const._SEND}>" /> + <{/if}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> From minahito ＠ users.sourceforge.jp Wed Feb 28 19:09:08 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:09:08 +0900 Subject: [xoops-cvslog 6211] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228100908.5A1A72AC042@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4.2.1 xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4.2.2 --- xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4.2.1 Wed Feb 28 18:30:49 2007 +++ xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html Wed Feb 28 19:09:08 2007 @@ -33,20 +33,18 @@ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{if count($objects) > 0}> - <{foreach item=obj from=$objects}> - - <{xoops_input type=checkbox name=uid key=$obj->get('uid')}> - <{$obj->getShow('uid')}> - <{$obj->get('uid')|xoops_user:uname}> - <{$obj->getShow('retry')}> - <{$obj->getShow('message')}> - - <{/foreach}> - - + <{foreach item=obj from=$objects}> + + <{xoops_input type=checkbox name=uid key=$obj->get('uid')}> + <{$obj->getShow('uid')}> + <{$obj->get('uid')|xoops_user:uname}> + <{$obj->getShow('retry')}> + <{$obj->getShow('message')}> - <{/if}> + <{/foreach}> + + +
    From minahito ＠ users.sourceforge.jp Wed Feb 28 19:09:32 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:09:32 +0900 Subject: [xoops-cvslog 6212] CVS update: xoops2jp/html/modules/user/class Message-ID: <20070228100932.786EF2AC042@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/mailjob.php diff -u xoops2jp/html/modules/user/class/mailjob.php:1.1.2.7.2.1 xoops2jp/html/modules/user/class/mailjob.php:1.1.2.7.2.1.2.1 --- xoops2jp/html/modules/user/class/mailjob.php:1.1.2.7.2.1 Sat Oct 14 23:17:57 2006 +++ xoops2jp/html/modules/user/class/mailjob.php Wed Feb 28 19:09:32 2007 @@ -7,6 +7,7 @@ var $mUsers = array(); var $_mUsersLoadedFlag = false; var $mUserCount = 0; + var $_mUserCountLoadedFlag = false; /** * @var XCube_Delegate @@ -49,8 +50,12 @@ */ function loadUserCount() { - $handler =& xoops_getmodulehandler('mailjob_link', 'user'); - $this->mUserCount = $handler->getCount(new Criteria('mailjob_id', $this->get('mailjob_id'))); + if (!$this->_mUserCountLoadedFlag) + { + $handler =& xoops_getmodulehandler('mailjob_link', 'user'); + $this->mUserCount = $handler->getCount(new Criteria('mailjob_id', $this->get('mailjob_id'))); + $this->_mUserCountLoadedFlag = true; + } } /** @@ -82,6 +87,16 @@ return $arr; } + /** + * Gets count of users who this mailjob will send mail to. + * @return int count of users + */ + function getUserCount() + { + $this->loadUserCount(); + return $this->mUserCount; + } + function send($from_user) { $root =& XCube_Root::getSingleton(); From minahito ＠ users.sourceforge.jp Wed Feb 28 19:09:56 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:09:56 +0900 Subject: [xoops-cvslog 6213] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20070228100956.B327A2AC0A7@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/admin.php diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5.2.1 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5.2.2 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5.2.1 Wed Feb 28 16:27:41 2007 +++ xoops2jp/html/modules/user/language/english/admin.php Wed Feb 28 19:09:56 2007 @@ -72,6 +72,7 @@ define('_AD_USER_LANG_MAILJOB_LIST', "Mailjob list"); define('_AD_USER_LANG_MAILJOB_NEW', "New Mailjob"); define('_AD_USER_LANG_MAILJOB_SEND', "Send Mailjob"); +define('_AD_USER_LANG_MAILJOB_VIEW', "View Mailjob"); define('_AD_USER_LANG_MESSAGE', "Message"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than X"); From minahito ＠ users.sourceforge.jp Wed Feb 28 19:09:56 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:09:56 +0900 Subject: [xoops-cvslog 6214] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20070228100956.D7AFA2AC0AD@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.37.2.5.2.1 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.5.2.2 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.5.2.1 Wed Feb 28 16:27:41 2007 +++ xoops2jp/html/modules/user/language/japanese/admin.php Wed Feb 28 19:09:56 2007 @@ -72,6 +72,7 @@ define('_AD_USER_LANG_MAILJOB_LIST', "メールジョブ一覧"); define('_AD_USER_LANG_MAILJOB_NEW', "メールジョブ新規登録"); define('_AD_USER_LANG_MAILJOB_SEND', "一斉メールの送信"); +define('_AD_USER_LANG_MAILJOB_VIEW', "メールジョブの閲覧"); define('_AD_USER_LANG_MESSAGE', "メッセージ"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); define('_AD_USER_LANG_OVER_POSTS', "投稿数がX件以上"); From minahito ＠ users.sourceforge.jp Wed Feb 28 19:12:46 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:12:46 +0900 Subject: [xoops-cvslog 6215] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228101246.9BA5A2AC0AD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_view.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_view.html:1.1.2.1 xoops2jp/html/modules/user/admin/templates/mailjob_view.html:1.1.2.2 --- xoops2jp/html/modules/user/admin/templates/mailjob_view.html:1.1.2.1 Wed Feb 28 19:05:43 2007 +++ xoops2jp/html/modules/user/admin/templates/mailjob_view.html Wed Feb 28 19:12:46 2007 @@ -23,10 +23,6 @@ "><{$object->getShow('body')}> - <{$smarty.const._AD_USER_LANG_TARGET_RETRY_NUMBER}> - "><{$object->getCurrentRetry()|xoops_escape}> - - <{$smarty.const._AD_USER_LANG_FROM_NAME}> "><{$object->getShow('from_name')}> From minahito ＠ users.sourceforge.jp Wed Feb 28 19:33:46 2007 From: minahito ＠ users.sourceforge.jp (Minahito) Date: Wed, 28 Feb 2007 19:33:46 +0900 Subject: [xoops-cvslog 6216] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20070228103346.D50E82AC03F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3.2.1 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3.2.2 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3.2.1 Wed Feb 28 19:08:31 2007 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Wed Feb 28 19:33:46 2007 @@ -65,8 +65,8 @@ <{if $obj->getUserCount() > 0}> " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> " alt="<{$smarty.const._SEND}>" title="<{$smarty.const._SEND}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{/if}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />