From onokazu @ users.sourceforge.jp Tue Aug 1 11:55:25 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Tue, 1 Aug 2006 11:55:25 +0900 Subject: [xoops-cvslog 3789] CVS update: xoops2jp/docs Message-ID: <20060801025525.7985C2AC2E0@users.sourceforge.jp> Index: xoops2jp/docs/CHANGES.txt diff -u xoops2jp/docs/CHANGES.txt:1.13 xoops2jp/docs/CHANGES.txt:1.14 --- xoops2jp/docs/CHANGES.txt:1.13 Thu Jul 27 09:17:17 2006 +++ xoops2jp/docs/CHANGES.txt Tue Aug 1 11:55:25 2006 @@ -1,6 +1,12 @@ XOOPS v2 Changelog ============================ +2006/ 7/27: Version 2.0.16 JP +=============================== + - Added routine to regenerate session id after succeessful login (extras/login.php, html/include/checklogin.php, html/include/session.php) + - Fixed PHP notice error (html/install/class/settingmanager.php) + + 2006/ 6/ 9: Version 2.0.15 JP =============================== - Fixed user message not being sent to PM when over 100 users to send(modules/system/mailusers/mailusers.php) From onokazu @ users.sourceforge.jp Tue Aug 1 11:55:25 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Tue, 1 Aug 2006 11:55:25 +0900 Subject: [xoops-cvslog 3790] CVS update: xoops2jp/extras Message-ID: <20060801025525.9C7662AC332@users.sourceforge.jp> Index: xoops2jp/extras/login.php diff -u xoops2jp/extras/login.php:1.4 xoops2jp/extras/login.php:1.5 --- xoops2jp/extras/login.php:1.4 Mon May 1 11:37:24 2006 +++ xoops2jp/extras/login.php Tue Aug 1 11:55:25 2006 @@ -62,6 +62,8 @@ $user->setVar('last_login', time()); if (!$member_handler->insertUser($user)) { } + require_once XOOPS_ROOT_PATH . '/include/session.php'; + xoops_session_regenerate(); $_SESSION = array(); $_SESSION['xoopsUserId'] = $user->getVar('uid'); $_SESSION['xoopsUserGroups'] = $user->getGroups(); From onokazu @ users.sourceforge.jp Tue Aug 1 11:55:25 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Tue, 1 Aug 2006 11:55:25 +0900 Subject: [xoops-cvslog 3791] CVS update: xoops2jp/html/include Message-ID: <20060801025525.D0F3C2AC2E0@users.sourceforge.jp> Index: xoops2jp/html/include/checklogin.php diff -u xoops2jp/html/include/checklogin.php:1.6 xoops2jp/html/include/checklogin.php:1.7 --- xoops2jp/html/include/checklogin.php:1.6 Thu Jul 27 09:17:17 2006 +++ xoops2jp/html/include/checklogin.php Tue Aug 1 11:55:25 2006 @@ -1,5 +1,5 @@ setVar('last_login', time()); if (!$member_handler->insertUser($user)) { } + require_once XOOPS_ROOT_PATH . '/include/session.php'; + xoops_session_regenerate(); $_SESSION = array(); $_SESSION['xoopsUserId'] = $user->getVar('uid'); $_SESSION['xoopsUserGroups'] = $user->getGroups(); Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.14 xoops2jp/html/include/version.php:1.15 --- xoops2jp/html/include/version.php:1.14 Thu Jul 27 09:17:17 2006 +++ xoops2jp/html/include/version.php Tue Aug 1 11:55:25 2006 @@ -1,4 +1,4 @@ \ No newline at end of file Index: xoops2jp/html/include/session.php diff -u /dev/null xoops2jp/html/include/session.php:1.2 --- /dev/null Tue Aug 1 11:55:25 2006 +++ xoops2jp/html/include/session.php Tue Aug 1 11:55:25 2006 @@ -0,0 +1,36 @@ + \ No newline at end of file From onokazu @ users.sourceforge.jp Tue Aug 1 11:55:25 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Tue, 1 Aug 2006 11:55:25 +0900 Subject: [xoops-cvslog 3792] CVS update: xoops2jp/html/install/class Message-ID: <20060801025525.F37C42AC332@users.sourceforge.jp> Index: xoops2jp/html/install/class/settingmanager.php diff -u xoops2jp/html/install/class/settingmanager.php:1.3 xoops2jp/html/install/class/settingmanager.php:1.4 --- xoops2jp/html/install/class/settingmanager.php:1.3 Thu Jul 27 09:17:17 2006 +++ xoops2jp/html/install/class/settingmanager.php Tue Aug 1 11:55:25 2006 @@ -29,7 +29,7 @@ * setting manager for XOOPS installer * * @author Haruki Setoyama -* @version $Id: settingmanager.php,v 1.3 2006/07/27 00:17:17 onokazu Exp $ +* @version $Id: settingmanager.php,v 1.4 2006/08/01 02:55:25 onokazu Exp $ * @access public **/ class setting_manager { @@ -72,7 +72,7 @@ if ( substr($filepath, -1) == "/" ) { $filepath = substr($filepath, 0, -1); } - $protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://'; + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'; $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST']; } } From nobunobu @ users.sourceforge.jp Tue Aug 1 17:25:16 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Tue, 1 Aug 2006 17:25:16 +0900 Subject: [xoops-cvslog 3793] CVS update: xoops2jp/html/kernel Message-ID: <20060801082516.B80C22AC0CD@users.sourceforge.jp> Index: xoops2jp/html/kernel/object.php diff -u xoops2jp/html/kernel/object.php:1.2.8.11 xoops2jp/html/kernel/object.php:1.2.8.12 --- xoops2jp/html/kernel/object.php:1.2.8.11 Wed Jul 5 11:37:54 2006 +++ xoops2jp/html/kernel/object.php Tue Aug 1 17:25:16 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.2 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.3 --- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.2 Sat Jul 1 13:18:10 2006 +++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php Tue Aug 1 17:27:05 2006 @@ -1,5 +1,5 @@ getSmileys(); + $smiles = $myts->getSmileys(); $ret = ''; if (empty($smiles)) { $db =& Database::getInstance(); From nobunobu @ users.sourceforge.jp Tue Aug 1 17:37:01 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Tue, 1 Aug 2006 17:37:01 +0900 Subject: [xoops-cvslog 3795] CVS update: xoops2jp/html/modules/base/lib/nusoap Message-ID: <20060801083701.55B0A2AC33B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/lib/nusoap/class.soapclient.php diff -u xoops2jp/html/modules/base/lib/nusoap/class.soapclient.php:1.1.2.2 xoops2jp/html/modules/base/lib/nusoap/class.soapclient.php:1.1.2.3 --- xoops2jp/html/modules/base/lib/nusoap/class.soapclient.php:1.1.2.2 Fri Jun 30 14:10:43 2006 +++ xoops2jp/html/modules/base/lib/nusoap/class.soapclient.php Tue Aug 1 17:37:01 2006 @@ -19,7 +19,7 @@ * unset($soapclient); * * @author Dietrich Ayala -* @version $Id: class.soapclient.php,v 1.1.2.2 2006/06/30 05:10:43 minahito Exp $ +* @version $Id: class.soapclient.php,v 1.1.2.3 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soap_client extends nusoap_base { @@ -89,7 +89,7 @@ * @param integer $response_timeout set the response timeout * @access public */ - function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ + function soap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ parent::nusoap_base(); $this->endpoint = $endpoint; $this->proxyhost = $proxyhost; @@ -669,7 +669,7 @@ unset($paramCommentStr); } } - $evalStr = 'class soap_proxy_'.$r.' extends soapclient { + $evalStr = 'class soap_proxy_'.$r.' extends soap_client { '.$evalStr.' }'; return $evalStr; Index: xoops2jp/html/modules/base/lib/nusoap/nusoap.php diff -u xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.1 xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.2 --- xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.1 Mon Jun 26 19:26:27 2006 +++ xoops2jp/html/modules/base/lib/nusoap/nusoap.php Tue Aug 1 17:37:01 2006 @@ -1,7 +1,7 @@ -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class nusoap_base { @@ -83,7 +83,7 @@ * @var string * @access private */ - var $revision = '$Revision: 1.1.2.1 $'; + var $revision = '$Revision: 1.1.2.2 $'; /** * Current error string (manipulated by getError/setError) * @@ -910,7 +910,7 @@ * Mainly used for returning faults from deployed functions * in a server instance. * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soap_fault extends nusoap_base { @@ -996,7 +996,7 @@ * tutorials I refer to :) * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class XMLSchema extends nusoap_base { @@ -1899,7 +1899,7 @@ * xsd:anyType and user-defined types. * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soapval extends nusoap_base { @@ -2000,7 +2000,7 @@ * NOTE: PHP must be compiled with the CURL extension for HTTPS support * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soap_transport_http extends nusoap_base { @@ -3038,7 +3038,7 @@ * NOTE: WSDL functionality is experimental * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soap_server extends nusoap_base { @@ -4069,7 +4069,7 @@ * parses a WSDL file, allows access to it's data, other utility methods * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class wsdl extends nusoap_base { @@ -5794,7 +5794,7 @@ * soap_parser class parses SOAP XML messages into native PHP values * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ class soap_parser extends nusoap_base { @@ -6401,10 +6401,10 @@ * unset($soapclient); * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.1 2006/06/26 10:26:27 minahito Exp $ +* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ * @access public */ -class soapclient extends nusoap_base { +class soap_client extends nusoap_base { var $username = ''; var $password = ''; @@ -6471,7 +6471,7 @@ * @param integer $response_timeout set the response timeout * @access public */ - function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ + function soap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ parent::nusoap_base(); $this->endpoint = $endpoint; $this->proxyhost = $proxyhost; @@ -7051,7 +7051,7 @@ unset($paramCommentStr); } } - $evalStr = 'class soap_proxy_'.$r.' extends soapclient { + $evalStr = 'class soap_proxy_'.$r.' extends soap_client { '.$evalStr.' }'; return $evalStr; From nobunobu @ users.sourceforge.jp Tue Aug 1 17:39:06 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Tue, 1 Aug 2006 17:39:06 +0900 Subject: [xoops-cvslog 3796] CVS update: xoops2jp/html/themes/cube_default Message-ID: <20060801083906.0380F2AC0CD@users.sourceforge.jp> Index: xoops2jp/html/themes/cube_default/theme.html diff -u xoops2jp/html/themes/cube_default/theme.html:1.1.2.4 xoops2jp/html/themes/cube_default/theme.html:1.1.2.5 --- xoops2jp/html/themes/cube_default/theme.html:1.1.2.4 Thu Apr 13 00:11:20 2006 +++ xoops2jp/html/themes/cube_default/theme.html Tue Aug 1 17:39:05 2006 @@ -96,7 +96,7 @@
XOOPS Cube PROJECT
-<{if $xoops_footer != 'Powered by XOOPS 2.0 © 2001-2003 The XOOPS Project'}><{$xoops_footer}><{/if}> +<{if $xoops_footer != 'Powered by XOOPS Cube 2.1© 2001-2006 The XOOPS Cube Project'}><{$xoops_footer}><{/if}>
From minahito @ users.sourceforge.jp Tue Aug 1 19:26:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:26:18 +0900 Subject: [xoops-cvslog 3797] CVS update: xoops2jp/html/modules/base/admin/.xml Message-ID: <20060801102619.048962AC054@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/.xml/block_edit.xml diff -u xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.3 --- xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.2 Thu Apr 6 16:51:50 2006 +++ xoops2jp/html/modules/base/admin/.xml/block_edit.xml Tue Aug 1 19:26:18 2006 @@ -22,17 +22,31 @@ - + + + + - + + + + - + + + + + + + + + From minahito @ users.sourceforge.jp Tue Aug 1 19:26:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:26:38 +0900 Subject: [xoops-cvslog 3798] CVS update: xoops2jp/html/modules/base/admin/.xml Message-ID: <20060801102638.6A6192AC054@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/.xml/module_update.xml diff -u xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.2 --- xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.1 Thu Feb 2 21:00:58 2006 +++ xoops2jp/html/modules/base/admin/.xml/module_update.xml Tue Aug 1 19:26:38 2006 @@ -2,7 +2,6 @@ - Index: xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml diff -u xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.3 --- xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.2 Sat Feb 4 02:12:55 2006 +++ xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml Tue Aug 1 19:26:38 2006 @@ -2,7 +2,6 @@ - Index: xoops2jp/html/modules/base/admin/.xml/module_install.xml diff -u xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.2 --- xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.1 Thu Feb 2 21:06:45 2006 +++ xoops2jp/html/modules/base/admin/.xml/module_install.xml Tue Aug 1 19:26:38 2006 @@ -2,7 +2,6 @@ - From minahito @ users.sourceforge.jp Tue Aug 1 19:27:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:27:21 +0900 Subject: [xoops-cvslog 3799] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801102721.1E51D2AC054@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.9 --- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.8 Thu Jul 27 14:58:11 2006 +++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php Tue Aug 1 19:27:20 2006 @@ -1,7 +1,7 @@ _getInstaller($dirname); $this->mModuleObject =& $installer->loadModuleObject($dirname); if (!is_object($this->mModuleObject)) { - $this->mLogLog =& $installer->getLog(); + $this->mLog =& $installer->getLog(); return LEGACY_FRAME_VIEW_ERROR; } @@ -93,7 +93,7 @@ { } - function executeViewIndex(&$controller,&$xoopsUser,&$renderer) + function executeViewError(&$controller,&$xoopsUser,&$renderer) { $renderer->setTemplateName("install_wizard_error.html"); $renderer->setAttribute('log', $this->mLog); From minahito @ users.sourceforge.jp Tue Aug 1 19:28:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:28:30 +0900 Subject: [xoops-cvslog 3800] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801102830.89CA22AC054@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.6 Mon Jul 31 19:31:40 2006 +++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php Tue Aug 1 19:28:30 2006 @@ -5,21 +5,22 @@ require_once XOOPS_BASE_PATH."/class/Legacy_ModuleAdapter.class.php"; require_once XOOPS_BASE_PATH."/admin/forms/ActionSearchForm.class.php"; -class ActionSearchEventArgs +class Legacy_ActionSearchArgs { var $mKeywords; var $mRecords; - function ActionSearchEventArgs($words) + function Legacy_ActionSearchArgs($words) { $this->setKeywords($words); } function setKeywords($words) { - foreach(explode(" ",$words) as $word) { - if(strlen($word)>0) - $this->mKeywords[]=$word; + foreach (explode(" ", $words) as $word) { + if( strlen($word) > 0) { + $this->mKeywords[] = $word; + } } } @@ -28,9 +29,9 @@ return $this->mKeywords; } - function addRecord($moduleName,$url,$title,$desc=null) + function addRecord($moduleName, $url, $title, $desc = null) { - $this->mRecords[]=new ActionSearchRecord($moduleName,$url,$title,$desc); + $this->mRecords[] =& new Legacy_ActionSearchRecord($moduleName, $url, $title, $desc); } function &getRecords() @@ -43,23 +44,28 @@ */ function hasRecord() { - return count($this->mRecords)>0; + return count($this->mRecords) > 0; } } -class ActionSearchRecord +/** + * An item on one search record. This is a class as a structure. + * + * @todo we may change it to Array. + */ +class Legacy_ActionSearchRecord { var $mModuleName; var $mActionUrl; var $mTitle; var $mDescription; - function ActionSearchRecord($moduleName,$url,$title,$desc=null) + function Legacy_ActionSearchRecord($moduleName, $url, $title, $desc=null) { - $this->mModuleName=$moduleName; - $this->mActionUrl=$url; - $this->mTitle=$title; - $this->mDescription=$desc; + $this->mModuleName = $moduleName; + $this->mActionUrl = $url; + $this->mTitle = $title; + $this->mDescription = $desc; } } @@ -71,10 +77,10 @@ */ class Legacy_ActSearchAction extends Legacy_Action { - var $mModules=array(); - var $mModuleRecords=null; - var $mRecords=null; - var $mActionForm; + var $mModules = array(); + var $mModuleRecords = null; + var $mRecords = null; + var $mActionForm = null; var $mSearchAction = null; @@ -86,11 +92,12 @@ $this->mSearchAction->register('Legacy_ActSearchAction.SearchAction'); } - function prepare(&$controller,&$xoopsUser) + function prepare(&$controller, &$xoopsUser) { - parent::prepare(&$controller,&$xoopsUser); + parent::prepare(&$controller, &$xoopsUser); $db=&$controller->getDB(); + // // TODO : We don't use handler and write sql directly. // @@ -98,21 +105,23 @@ "WHERE {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ". "ORDER BY {mod}.weight"; - $replaceMap=array("mod"=>$db->prefix("modules"), - "perm"=>$db->prefix("group_permission"), - "groups"=>implode(",",$xoopsUser->getGroups())); - - $sql=XCube_Utils::formatMessageByMap($sql,$replaceMap); - - $result=$db->query($sql); - while($row=$db->fetchArray($result)) { - $xoopsModule = new XoopsModule(); + $replaceMap = array( + "mod"=>$db->prefix("modules"), + "perm"=>$db->prefix("group_permission"), + "groups"=>implode(",",$xoopsUser->getGroups()) + ); + + $sql = XCube_Utils::formatMessageByMap($sql,$replaceMap); + + $result = $db->query($sql); + while ($row = $db->fetchArray($result)) { + $xoopsModule =& new XoopsModule(); $xoopsModule->assignVars($row); - $adapter=new Legacy_ModuleAdapter($xoopsModule); + $adapter =& new Legacy_ModuleAdapter($xoopsModule); $adapter->prepareAdmin($controller); - $this->mModules[]=&$adapter; + $this->mModules[] =& $adapter; unset($xoopsModule); unset($adapter); @@ -125,27 +134,28 @@ return $permHandler->checkRight('module_admin', -1, $xoopsUser->getGroups()); } - function getDefaultView(&$controller,&$xoopsUser) + function getDefaultView(&$controller, &$xoopsUser) { $this->_processActionForm(); return LEGACY_FRAME_VIEW_INPUT; } - function execute(&$controller,&$xoopsUser) + function execute(&$controller, &$xoopsUser) { $this->_processActionForm(); $this->mActionForm->fetch(); $this->mActionForm->validate(); - if($this->mActionForm->hasError()) + if($this->mActionForm->hasError()) { return LEGACY_FRAME_VIEW_INPUT; + } - $eventArgs=new ActionSearchEventArgs($this->mActionForm->getVar('keywords')); - $this->mSearchAction->call(new XCube_Ref($eventArgs)); + $searchArgs =& new Legacy_ActionSearchArgs($this->mActionForm->get('keywords')); + $this->mSearchAction->call(new XCube_Ref($searchArgs)); - if($eventArgs->hasRecord()) { - $this->mRecords=&$eventArgs->getRecords(); + if ($searchArgs->hasRecord()) { + $this->mRecords =& $searchArgs->getRecords(); return LEGACY_FRAME_VIEW_SUCCESS; } else { @@ -155,21 +165,21 @@ function _processActionForm() { - $this->mActionForm=new ActionSearchForm(); + $this->mActionForm =& new Legacy_ActionSearchForm(); $this->mActionForm->prepare(); } - function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem) + function executeViewSuccess(&$controller, &$xoopsUser, &$render) { - $renderSystem->setTemplateName("legacy_admin_actionsearch_success.html"); - $renderSystem->setAttribute("records",$this->mRecords); - $renderSystem->setAttribute("actionForm",$this->mActionForm); + $render->setTemplateName("legacy_admin_actionsearch_success.html"); + $render->setAttribute("records", $this->mRecords); + $render->setAttribute("actionForm", $this->mActionForm); } - function executeViewInput(&$controller,&$xoopsUser,&$renderSystem) + function executeViewInput(&$controller, &$xoopsUser, &$render) { - $renderSystem->setTemplateName("legacy_admin_actionsearch_input.html"); - $renderSystem->setAttribute("actionForm",$this->mActionForm); + $render->setTemplateName("legacy_admin_actionsearch_input.html"); + $render->setAttribute("actionForm", $this->mActionForm); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:29:10 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:29:10 +0900 Subject: [xoops-cvslog 3801] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801102910.AE92C2AC194@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.7 Mon May 29 18:12:13 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php Tue Aug 1 19:29:10 2006 @@ -1,4 +1,8 @@ executeRedirect("./index.php?action=BlockList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=BlockList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:29:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:29:21 +0900 Subject: [xoops-cvslog 3802] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801102921.2029C2AC194@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.2 Tue Apr 11 10:51:20 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php Tue Aug 1 19:29:20 2006 @@ -1,8 +1,12 @@ executeRedirect("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=BlockInstallList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:29:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:29:52 +0900 Subject: [xoops-cvslog 3803] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801102952.29F6F2AC194@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.6 --- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.5 Tue Apr 11 12:19:46 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php Tue Aug 1 19:29:52 2006 @@ -1,4 +1,8 @@ setTemplateName("block_list.html"); - #cubson::lazy_load_array('newblocks', $this->mObjects); foreach (array_keys($this->mObjects) as $key) { $this->mObjects[$key]->loadModule(); $this->mObjects[$key]->loadColumn(); @@ -89,6 +92,11 @@ { $controller->executeForward('./index.php?action=BlockList'); } + + function executeViewError(&$controller, &$xoopsUser, &$render) + { + $controller->executeRedirect("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } } ?> From minahito @ users.sourceforge.jp Tue Aug 1 19:30:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:30:08 +0900 Subject: [xoops-cvslog 3804] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103008.67ECA2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.3 Tue Apr 11 10:51:13 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php Tue Aug 1 19:30:08 2006 @@ -1,4 +1,8 @@ executeRedirect("./index.php?action=BlockList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=BlockList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:30:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:30:22 +0900 Subject: [xoops-cvslog 3805] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103022.B8CDE2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.9 --- xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.8 Mon Jul 31 19:22:42 2006 +++ xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php Tue Aug 1 19:30:22 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); } + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=CommentList"); + } + function doDelete($comment) { // From minahito @ users.sourceforge.jp Tue Aug 1 19:30:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:30:34 +0900 Subject: [xoops-cvslog 3806] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103034.E3DF52AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.9 Mon Jul 31 19:22:42 2006 +++ xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php Tue Aug 1 19:30:34 2006 @@ -18,7 +18,7 @@ function _getId() { - return isset($_REQUEST['com_id']) ? $_REQUEST['com_id'] : 0; + return isset($_REQUEST['com_id']) ? intval(xoops_getrequest('com_id')) : 0; } function &_getHandler() @@ -83,9 +83,14 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); } + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=CommentList"); + } + /** * @static * @return Return array as the informations of comments. If $comment has fatal status, return false. From minahito @ users.sourceforge.jp Tue Aug 1 19:30:50 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:30:50 +0900 Subject: [xoops-cvslog 3807] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103050.AAEFB2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.2 Tue Apr 11 10:58:42 2006 +++ xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php Tue Aug 1 19:30:50 2006 @@ -74,7 +74,17 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + if ($this->mObject->isNew()) { + $controller->executeForward("./index.php?action=BlockInstallList"); + } + else { + $controller->executeForward("./index.php?action=BlockList"); + } } } From minahito @ users.sourceforge.jp Tue Aug 1 19:31:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:31:03 +0900 Subject: [xoops-cvslog 3808] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103103.3C4432AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.3 Mon May 29 17:51:08 2006 +++ xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php Tue Aug 1 19:31:03 2006 @@ -1,4 +1,8 @@ getObjects(); $render->setAttribute('ctypeArr', $ctypeArr); } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + if ($this->mObject->isNew()) { + $controller->executeForward("./index.php?action=BlockInstallList"); + } + else { + $controller->executeForward("./index.php?action=BlockList"); + } + } } ?> From minahito @ users.sourceforge.jp Tue Aug 1 19:31:27 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:31:27 +0900 Subject: [xoops-cvslog 3809] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103127.6D1A12AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.11 --- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.10 Mon Jul 31 19:32:51 2006 +++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Tue Aug 1 19:31:27 2006 @@ -1,17 +1,37 @@ getXoopsModule(); $language = $root->mController->getConfig('language'); - $dirname = $moduleObject->getVar('dirname'); + $dirname = $moduleObject->get('dirname'); // // TODO We should check file_exists. @@ -68,7 +88,7 @@ $moduleObject =& $modController->getXoopsModule(); $language = $root->mController->getConfig('language'); - $dirname = $moduleObject->getVar('dirname'); + $dirname = $moduleObject->get('dirname'); $url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/help/images/${file}"; if (!file_exists($url) && $language != "english") { @@ -141,6 +161,8 @@ // // file check // + // TODO We should not access files in language directory directly. + // $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/${language}/help"; if (!file_exists($template_dir . "/" . $helpfile)) { $template_dir = XOOPS_MODULE_PATH . "/" . $this->_mDirname . "/language/english/help"; From minahito @ users.sourceforge.jp Tue Aug 1 19:31:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:31:37 +0900 Subject: [xoops-cvslog 3810] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103137.B57632AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ImagecategoryDeleteAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImagecategoryDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ImagecategoryDeleteAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/actions/ImagecategoryDeleteAction.class.php:1.1.2.1 Tue May 9 19:20:23 2006 +++ xoops2jp/html/modules/base/admin/actions/ImagecategoryDeleteAction.class.php Tue Aug 1 19:31:37 2006 @@ -1,4 +1,8 @@ setTemplateName("imagecategory_delete.html"); $render->setAttribute('actionForm', $this->mActionForm); - #cubson::lazy_load('imagecategory', $this->mObject); $render->setAttribute('object', $this->mObject); } @@ -39,7 +42,12 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=ImagecategoryList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=ImagecategoryList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=ImagecategoryList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:31:44 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:31:44 +0900 Subject: [xoops-cvslog 3811] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103144.D35D32AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ImagecategoryEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImagecategoryEditAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ImagecategoryEditAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/actions/ImagecategoryEditAction.class.php:1.1.2.1 Tue May 9 19:20:23 2006 +++ xoops2jp/html/modules/base/admin/actions/ImagecategoryEditAction.class.php Tue Aug 1 19:31:44 2006 @@ -1,4 +1,8 @@ executeRedirect("./index.php?action=ImagecategoryList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=ImagecategoryList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:32:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:32:01 +0900 Subject: [xoops-cvslog 3812] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103201.55B622AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.1 Tue May 9 19:20:23 2006 +++ xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php Tue Aug 1 19:32:01 2006 @@ -1,4 +1,8 @@ setTemplateName("imagecategory_list.html"); - #cubson::lazy_load_array('imagecategory', $this->mObjects); $render->setAttribute("objects", $this->mObjects); $render->setAttribute("pageNavi", $this->mNavi); From minahito @ users.sourceforge.jp Tue Aug 1 19:32:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:32:08 +0900 Subject: [xoops-cvslog 3813] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103208.3B9932AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ImageDeleteAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImageDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ImageDeleteAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/actions/ImageDeleteAction.class.php:1.1.2.1 Wed May 10 19:25:10 2006 +++ xoops2jp/html/modules/base/admin/actions/ImageDeleteAction.class.php Tue Aug 1 19:32:08 2006 @@ -1,4 +1,8 @@ setTemplateName("image_delete.html"); $render->setAttribute('actionForm', $this->mActionForm); - #cubson::lazy_load('image', $this->mObject); $render->setAttribute('object', $this->mObject); } @@ -39,7 +42,12 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=ImageList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=ImageList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=ImageList&imgcat_id=" . $this->mObject->get('imgcat_id')); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:32:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:32:18 +0900 Subject: [xoops-cvslog 3814] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103218.5D3C32AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.6 --- xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.5 Tue May 30 12:55:02 2006 +++ xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php Tue Aug 1 19:32:18 2006 @@ -1,4 +1,8 @@ get($this->mActionForm->get('imgcat_id')); + // + // [TODO] + // Should the following procedure be after parent::_doExecute()? + // if ($category->get('imgcat_storetype') == 'file') { $this->_storeFile(); } @@ -78,7 +86,12 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=ImagecategoryList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=ImagecategoryList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=ImageList&imgcat_id=" . $this->mActionForm->get('imgcat_id')); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:32:41 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:32:41 +0900 Subject: [xoops-cvslog 3815] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103241.8A77E2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php:1.1.2.3 Tue Mar 28 22:28:35 2006 +++ xoops2jp/html/modules/base/admin/actions/InstallListAction.class.php Tue Aug 1 19:32:41 2006 @@ -1,4 +1,8 @@ setTemplateName("install_list.html"); - $renderer->setAttribute('moduleObjects',$this->mModuleObjects); + $renderer->setAttribute('moduleObjects', $this->mModuleObjects); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:33:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:33:47 +0900 Subject: [xoops-cvslog 3816] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103347.4E9082AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.2 Tue Mar 28 22:28:35 2006 +++ xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php Tue Aug 1 19:33:47 2006 @@ -1,6 +1,6 @@ mModuleObject->modinfo['installer']['licence']['file']; $language = $root->mController->getConfig('language'); - $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file; + // + // TODO Replace with language manager. + // + $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->get('dirname') ."/language/" . $language . "/" . $file; if (!file_exists($path)) { - $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "pm/language/english/" . $file; + $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->get('dirname') . "/language/english/" . $file; if (!file_exists($path)) { return; } @@ -49,21 +52,21 @@ $this->mLicenceText = file_get_contents($path); } - function executeViewSuccess(&$controller,&$xoopsUser,&$renderer) + function executeViewSuccess(&$controller, &$xoopsUser, &$render) { - $renderer->setTemplateName("module_install_success.html"); - $renderer->setAttribute('log', $this->mLog->mMessages); + $render->setTemplateName("module_install_success.html"); + $render->setAttribute('log', $this->mLog->mMessages); } - function executeViewIndex(&$controller,&$xoopsUser,&$renderer) + function executeViewIndex(&$controller, &$xoopsUser, &$renderer) { - $renderer->setAttribute('module', $this->mModuleObject); - $renderer->setAttribute('actionForm', $this->mActionForm); + $render->setAttribute('module', $this->mModuleObject); + $render->setAttribute('actionForm', $this->mActionForm); if (isset($this->mModuleObject->modinfo['installer'])) { - $renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']); - $renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']); - $renderer->setTemplateName("install_wizard.html"); + $render->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']); + $render->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']); + $render->setTemplateName("install_wizard.html"); } else { $controller->executeForward("index.php?action=ModuleInstall&dirname=" . $this->mModuleObject->get('dirname')); From minahito @ users.sourceforge.jp Tue Aug 1 19:34:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:34:08 +0900 Subject: [xoops-cvslog 3817] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103408.2A09B2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.3 Mon Jul 31 19:33:06 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php Tue Aug 1 19:34:08 2006 @@ -1,6 +1,7 @@ executeRedirect('./index.php?action=ModuleList', 1, "*Module not found*"); + $controller->executeRedirect('./index.php?action=ModuleList', 1, _AD_BASE_ERROR_MODULE_NOT_FOUND); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:34:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:34:29 +0900 Subject: [xoops-cvslog 3818] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103429.6BF102AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.11 --- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.10 Thu Jul 27 14:58:51 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php Tue Aug 1 19:34:29 2006 @@ -1,6 +1,7 @@ mActionForm->prepare(); } - function _loadAgreement() - { - $root =& XCube_Root::getSingleton(); - - $this->mLicence = $this->mModuleObject->modinfo['installer']['licence']['title']; - - $file = $this->mModuleObject->modinfo['installer']['licence']['file']; - $language = $root->mController->getConfig('language'); - - // - // TODO Replace with language manager. - // - $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file; - if (!file_exists($path)) { - $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "/language/english/" . $file; - if (!file_exists($path)) { - return; - } - } - - $this->mLicenceText = file_get_contents($path); - } - function executeViewSuccess(&$controller,&$xoopsUser,&$renderer) { if (!$this->mLog->hasError()) { From minahito @ users.sourceforge.jp Tue Aug 1 19:34:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:34:48 +0900 Subject: [xoops-cvslog 3819] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103448.E0D032AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.6 Mon Jul 31 19:33:15 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php Tue Aug 1 19:34:48 2006 @@ -1,6 +1,7 @@ mDB =& $controller->getDB(); - $this->mActionForm =& new Legacy_ModuleListForm(); $this->mActionForm->prepare(); } @@ -27,13 +25,13 @@ function getDefaultView(&$controller, &$xoopsUser) { - $this->mFilter =& new ModuleListFilterForm(); + $this->mFilter =& new Legacy_ModuleListFilterForm(); $this->mFilter->fetch(); $moduleHandler =& xoops_gethandler('module'); // dmy - $criteria =& new Criteria('mid',0,'>'); + $criteria =& new Criteria('mid', 0, '>'); $criteria->setSort($this->mFilter->getSort()); $criteria->setOrder($this->mFilter->getOrder()); @@ -44,6 +42,10 @@ function execute(&$controller, &$xoopsUser) { + if (xoops_getrequest('_form_control_cancel') != null) { + return LEGACY_FRAME_VIEW_CANCEL; + } + $this->mActionForm->fetch(); $this->mActionForm->validate(); @@ -58,14 +60,14 @@ function _processConfirm(&$controller,&$xoopsUser) { $moduleHandler =& xoops_gethandler('module'); - $objects =& $moduleHandler->getObjects(); + $t_objectArr =& $moduleHandler->getObjects(); // // Do mapping. // - foreach ($objects as $modObject) { - $this->mModuleObjects[$modObject->get('mid')] =& $modObject; - unset($modObject); + foreach ($t_objectArr as $module) { + $this->mModuleObjects[$module->get('mid')] =& $module; + unset($module); } return LEGACY_FRAME_VIEW_INPUT; @@ -74,19 +76,19 @@ function _processSave(&$controller, &$xoopsUser) { $moduleHandler =& xoops_gethandler('module'); - $objects =& $moduleHandler->getObjects(); + $t_objectArr =& $moduleHandler->getObjects(); $successFlag = true; - foreach($objects as $modObject) { - $mid = $modObject->get('mid'); - $modObject->set('name', $this->mActionForm->get('name', $mid)); - $modObject->set('weight', $this->mActionForm->get('weight', $mid)); - $modObject->set('isactive', $this->mActionForm->get('isactive', $mid)); + foreach($t_objectArr as $module) { + $mid = $module->get('mid'); + $module->set('name', $this->mActionForm->get('name', $mid)); + $module->set('weight', $this->mActionForm->get('weight', $mid)); + $module->set('isactive', $this->mActionForm->get('isactive', $mid)); // // Store. // - $successFlag &= $moduleHandler->insert($modObject); + $successFlag &= $moduleHandler->insert($module); } return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR; @@ -105,8 +107,8 @@ // To support a template writer, this send the list of mid that // actionForm kept. // - $tarray=&$this->mActionForm->get('name'); - $render->setAttribute('mids', array_keys($tarray)); + $t_arr =& $this->mActionForm->get('name'); + $render->setAttribute('mids', array_keys($t_arr)); } function executeViewIndex(&$controller, &$xoopsUser, &$render) @@ -131,10 +133,12 @@ function executeViewError(&$controller, &$xoopsUser, &$renderer) { - // - // TODO removed - // - $controller->executeRedirect('./index.php?action=ModuleList', 1, "*ERROR*"); + $controller->executeRedirect('./index.php?action=ModuleList', 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller,&$xoopsUser,&$renderer) + { + $controller->executeForward('./index.php?action=ModuleList'); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:35:41 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:35:41 +0900 Subject: [xoops-cvslog 3820] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060801103542.053202AC33C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/SmilesDeleteAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/SmilesDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/SmilesDeleteAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/SmilesDeleteAction.class.php:1.1.2.2 Tue Mar 28 22:28:35 2006 +++ xoops2jp/html/modules/base/admin/actions/SmilesDeleteAction.class.php Tue Aug 1 19:35:41 2006 @@ -1,4 +1,8 @@ executeRedirect("./index.php?action=SmilesList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=SmilesList"); } } Index: xoops2jp/html/modules/base/admin/actions/SmilesEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/SmilesEditAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/SmilesEditAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/SmilesEditAction.class.php:1.1.2.2 Tue Mar 28 22:28:35 2006 +++ xoops2jp/html/modules/base/admin/actions/SmilesEditAction.class.php Tue Aug 1 19:35:41 2006 @@ -1,4 +1,8 @@ executeRedirect("./index.php?action=SmilesList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=SmilesList"); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:36:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:36:40 +0900 Subject: [xoops-cvslog 3821] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103640.310082AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ActionSearchForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ActionSearchForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ActionSearchForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/ActionSearchForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/ActionSearchForm.class.php Tue Aug 1 19:36:40 2006 @@ -9,9 +9,9 @@ * @auchor makeActionForm * @abstract */ -class ActionSearchForm extends XCube_ActionForm +class Legacy_ActionSearchForm extends XCube_ActionForm { - var $mState=null; + var $mState = null; function prepare() { @@ -26,6 +26,6 @@ function fetch() { parent::fetch(); - $this->setVar('keywords',trim($this->getVar('keywords'))); + $this->set('keywords', trim($this->get('keywords'))); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:36:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:36:56 +0900 Subject: [xoops-cvslog 3822] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103656.27B9A2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.5 --- xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.4 Mon Apr 10 21:42:32 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php Tue Aug 1 19:36:55 2006 @@ -29,7 +29,6 @@ // // Set field properties // - $this->mFieldProperties['bid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['bid']->setDependsByArray(array('required')); $this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID); @@ -41,16 +40,29 @@ $this->mFieldProperties['title']->addVar('maxlength', '255'); $this->mFieldProperties['side'] =& new XCube_FieldProperty($this); - $this->mFieldProperties['side']->setDependsByArray(array('required')); + $this->mFieldProperties['side']->setDependsByArray(array('required', 'objectExist')); $this->mFieldProperties['side']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_SIDE); + $this->mFieldProperties['side']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_SIDE); + $this->mFieldProperties['side']->addVar('handler', 'columnside'); + $this->mFieldProperties['side']->addVar('module', 'base'); $this->mFieldProperties['weight'] =& new XCube_FieldProperty($this); - $this->mFieldProperties['weight']->setDependsByArray(array('required')); + $this->mFieldProperties['weight']->setDependsByArray(array('required', 'intRange')); $this->mFieldProperties['weight']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_WEIGHT); + $this->mFieldProperties['weight']->addMessage('intRange', _AD_BASE_ERROR_INTRANGE, _AD_BASE_LANG_WEIGHT); + $this->mFieldProperties['weight']->addVar('min', '0'); + $this->mFieldProperties['weight']->addVar('max', '255'); $this->mFieldProperties['bcachetime'] =& new XCube_FieldProperty($this); - $this->mFieldProperties['bcachetime']->setDependsByArray(array('required')); + $this->mFieldProperties['bcachetime']->setDependsByArray(array('required', 'objectExist')); $this->mFieldProperties['bcachetime']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BCACHETIME); + $this->mFieldProperties['bcachetime']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_BCACHETIME); + $this->mFieldProperties['bcachetime']->addVar('handler', 'cachetime'); + + $this->mFieldProperties['groupid'] =& new XCube_FieldProperty($this); + $this->mFieldProperties['groupid']->setDependsByArray(array('objectExist')); + $this->mFieldProperties['groupid']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_GROUPID); + $this->mFieldProperties['groupid']->addVar('handler', 'group'); } function validateBmodule() @@ -59,6 +71,15 @@ if (!(count($bmodule))) { $this->addErrorMessage(_AD_BASE_ERROR_BMODULE); } + else { + $handler =& xoops_gethandler('module'); + foreach ($this->get('bmodule') as $mid) { + $module =& $handler->get($mid); + if ($mid != -1 && $mid != 0 && !is_object($module)) { + $this->addErrorMessage(XCube_Utils::formatMessage(_AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_BMODULE)); + } + } + } } function validateGroupid() From minahito @ users.sourceforge.jp Tue Aug 1 19:37:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:37:25 +0900 Subject: [xoops-cvslog 3823] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103725.DACC42AC33C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.6 Sat Apr 15 11:50:25 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php Tue Aug 1 19:37:25 2006 @@ -1,4 +1,8 @@ 'bid', NEWBLOCKS_SORT_KEY_MID => 'mid', NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num', @@ -46,63 +49,47 @@ NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime', NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified' ); - var $_mCriteria = null; function fetch() { $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT; - if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT; } - if (isset($_REQUEST['bid'])) { - $this->_mNavi->addExtra('bid', xoops_getrequest('bid')); - $this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid')))); - } - if (isset($_REQUEST['mid'])) { $this->_mNavi->addExtra('mid', xoops_getrequest('mid')); - $this->_mCriteria->add(new Criteria('mid', array(XOBJ_DTYPE_INT, xoops_getrequest('mid')))); - } - - if (isset($_REQUEST['name'])) { - $this->_mNavi->addExtra('name', xoops_getrequest('name')); - $this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name')))); - } - - if (isset($_REQUEST['title'])) { - $this->_mNavi->addExtra('title', xoops_getrequest('title')); - $this->_mCriteria->add(new Criteria('title', array(XOBJ_DTYPE_STRING, xoops_getrequest('title')))); + $this->_mCriteria->add(new Criteria('mid', xoops_getrequest('mid'))); } if (isset($_REQUEST['side'])) { $this->_mNavi->addExtra('side', xoops_getrequest('side')); - $this->_mCriteria->add(new Criteria('side', array(XOBJ_DTYPE_BOOL, xoops_getrequest('side')))); + $this->_mCriteria->add(new Criteria('side', xoops_getrequest('side'))); } if (isset($_REQUEST['weight'])) { $this->_mNavi->addExtra('weight', xoops_getrequest('weight')); - $this->_mCriteria->add(new Criteria('weight', array(XOBJ_DTYPE_INT, xoops_getrequest('weight')))); + $this->_mCriteria->add(new Criteria('weight', xoops_getrequest('weight'))); } if (isset($_REQUEST['block_type'])) { $this->_mNavi->addExtra('block_type', xoops_getrequest('block_type')); - $this->_mCriteria->add(new Criteria('block_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('block_type')))); + $this->_mCriteria->add(new Criteria('block_type', xoops_getrequest('block_type'))); } if (isset($_REQUEST['c_type'])) { $this->_mNavi->addExtra('c_type', xoops_getrequest('c_type')); - $this->_mCriteria->add(new Criteria('c_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('c_type')))); + $this->_mCriteria->add(new Criteria('c_type', xoops_getrequest('c_type'))); } if (isset($_REQUEST['dirname'])) { $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname')); - $this->_mCriteria->add(new Criteria('dirname', array(XOBJ_DTYPE_STRING, xoops_getrequest('dirname')))); + $this->_mCriteria->add(new Criteria('dirname', xoops_getrequest('dirname'))); } - $this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1))); - $this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1))); + $this->_mCriteria->add(new Criteria('visible', $this->_getVisible())); + $this->_mCriteria->add(new Criteria('isactive', 1)); // // Set sort conditions. @@ -124,6 +111,11 @@ $this->_mCriteria->addSort('weight', $this->getOrder()); } } + + function _getVisible() + { + return 1; + } } ?> From minahito @ users.sourceforge.jp Tue Aug 1 19:37:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:37:38 +0900 Subject: [xoops-cvslog 3824] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103738.8DC8B2AC2D8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php:1.1.2.1 Wed Apr 5 19:58:07 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php Tue Aug 1 19:37:38 2006 @@ -1,8 +1,12 @@ Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.6 Mon May 22 21:26:01 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php Tue Aug 1 19:38:13 2006 @@ -1,112 +1,18 @@ 'bid', - NEWBLOCKS_SORT_KEY_MID => 'mid', - NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num', - NEWBLOCKS_SORT_KEY_OPTIONS => 'options', - NEWBLOCKS_SORT_KEY_NAME => 'name', - NEWBLOCKS_SORT_KEY_TITLE => 'title', - NEWBLOCKS_SORT_KEY_CONTENT => 'content', - NEWBLOCKS_SORT_KEY_SIDE => 'side', - NEWBLOCKS_SORT_KEY_WEIGHT => 'weight', - NEWBLOCKS_SORT_KEY_VISIBLE => 'visible', - NEWBLOCKS_SORT_KEY_BLOCK_TYPE => 'block_type', - NEWBLOCKS_SORT_KEY_C_TYPE => 'c_type', - NEWBLOCKS_SORT_KEY_ISACTIVE => 'isactive', - NEWBLOCKS_SORT_KEY_DIRNAME => 'dirname', - NEWBLOCKS_SORT_KEY_FUNC_FILE => 'func_file', - NEWBLOCKS_SORT_KEY_SHOW_FUNC => 'show_func', - NEWBLOCKS_SORT_KEY_EDIT_FUNC => 'edit_func', - NEWBLOCKS_SORT_KEY_TEMPLATE => 'template', - NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime', - NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified' - ); - var $_mCriteria = null; - - function fetch() + function _getVisible() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT; - - if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) { - $this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT; - } - - if (isset($_REQUEST['mid'])) { - $this->_mNavi->addExtra('mid', xoops_getrequest('mid')); - $this->_mCriteria->add(new Criteria('mid', array(XOBJ_DTYPE_INT, xoops_getrequest('mid')))); - } - - if (isset($_REQUEST['name'])) { - $this->_mNavi->addExtra('name', xoops_getrequest('name')); - $this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name')))); - } - - if (isset($_REQUEST['title'])) { - $this->_mNavi->addExtra('title', xoops_getrequest('title')); - $this->_mCriteria->add(new Criteria('title', array(XOBJ_DTYPE_STRING, xoops_getrequest('title')))); - } - - if (isset($_REQUEST['dirname'])) { - $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname')); - $this->_mCriteria->add(new Criteria('dirname', array(XOBJ_DTYPE_STRING, xoops_getrequest('dirname')))); - } - - $this->_mNavi->addExtra('sort', $this->mSort); - - $this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 0))); - $this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1))); - - $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); - - // - // If the sort key is mid, set c_type to second sort key for list display. - // - if (abs($this->mSort) == NEWBLOCKS_SORT_KEY_MID) { - $this->_mCriteria->addSort('c_type', $this->getOrder()); - } - - if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_SIDE) { - $this->_mCriteria->addSort('side', $this->getOrder()); - } - - if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_WEIGHT) { - $this->_mCriteria->addSort('weight', $this->getOrder()); - } + return 0; } } From minahito @ users.sourceforge.jp Tue Aug 1 19:38:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:38:30 +0900 Subject: [xoops-cvslog 3826] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103830.964652AC33C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php:1.1.2.1 Fri Apr 7 17:44:55 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php Tue Aug 1 19:38:30 2006 @@ -1,10 +1,17 @@ mFieldProperties['weight'] =& new XCube_FieldProperty($this); $this->mFieldProperties['weight']->setDependsByArray(array('required','intRange')); $this->mFieldProperties['weight']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_WEIGHT); From minahito @ users.sourceforge.jp Tue Aug 1 19:38:57 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:38:57 +0900 Subject: [xoops-cvslog 3827] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103857.601992AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/CommentAdminDeleteForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/CommentAdminDeleteForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/CommentAdminDeleteForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/CommentAdminDeleteForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/CommentAdminDeleteForm.class.php Tue Aug 1 19:38:57 2006 @@ -1,4 +1,8 @@ get('com_id'); } function prepare() From minahito @ users.sourceforge.jp Tue Aug 1 19:39:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:39:12 +0900 Subject: [xoops-cvslog 3828] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103912.1C8EE2AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.6 Sat Apr 15 13:48:27 2006 +++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php Tue Aug 1 19:39:11 2006 @@ -1,4 +1,8 @@ 'com_id', COMMENT_SORT_KEY_COM_PID => 'com_pid', COMMENT_SORT_KEY_COM_ROOTID => 'com_rootid', @@ -53,19 +56,18 @@ COMMENT_SORT_KEY_DOIMAGE => 'doimage', COMMENT_SORT_KEY_DOBR => 'dobr' ); - var $_mCriteria = null; function fetch() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0; + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : COMMENT_SORT_KEY_DEFAULT; - if ($this->mSort > COMMENT_SORT_KEY_MAXVALUE) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = COMMENT_SORT_KEY_DEFAULT; } if (isset($_REQUEST['com_modid']) && intval(xoops_getrequest('com_modid')) > 0) { $this->_mNavi->addExtra('com_modid', xoops_getrequest('com_modid')); - $this->_mCriteria->add(new Criteria('com_modid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_modid')))); + $this->_mCriteria->add(new Criteria('com_modid', xoops_getrequest('com_modid'))); } elseif (isset($_REQUEST['dirname'])) { $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname')); @@ -73,28 +75,28 @@ $handler =& xoops_gethandler('module'); $module =& $handler->getByDirname(xoops_getrequest('dirname')); if (is_object($module)) { - $this->_mCriteria->add(new Criteria('com_modid', array(XOBJ_DTYPE_INT, $module->get('mid')))); + $this->_mCriteria->add(new Criteria('com_modid', $module->get('mid'))); } } if (isset($_REQUEST['com_icon'])) { $this->_mNavi->addExtra('com_icon', xoops_getrequest('com_icon')); - $this->_mCriteria->add(new Criteria('com_icon', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_icon')))); + $this->_mCriteria->add(new Criteria('com_icon', xoops_getrequest('com_icon'))); } if (isset($_REQUEST['com_uid'])) { $this->_mNavi->addExtra('com_uid', xoops_getrequest('com_uid')); - $this->_mCriteria->add(new Criteria('com_uid', array(XOBJ_DTYPE_INT, xoops_getrequest('com_uid')))); + $this->_mCriteria->add(new Criteria('com_uid', xoops_getrequest('com_uid'))); } if (isset($_REQUEST['com_ip'])) { $this->_mNavi->addExtra('com_ip', xoops_getrequest('com_ip')); - $this->_mCriteria->add(new Criteria('com_ip', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_ip')))); + $this->_mCriteria->add(new Criteria('com_ip', xoops_getrequest('com_ip'))); } if (xoops_getrequest('com_status') > 0) { $this->_mNavi->addExtra('com_status', xoops_getrequest('com_status')); - $this->_mCriteria->add(new Criteria('com_status', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_status')))); + $this->_mCriteria->add(new Criteria('com_status', xoops_getrequest('com_status'))); } $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); From minahito @ users.sourceforge.jp Tue Aug 1 19:39:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:39:34 +0900 Subject: [xoops-cvslog 3829] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801103934.C75DA2AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.6 Mon May 29 16:06:13 2006 +++ xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php Tue Aug 1 19:39:34 2006 @@ -1,4 +1,8 @@ getImgcatId(); + return "module.base.ImageAdminEditForm.TOKEN" . $this->get('image_id'); } function prepare() From minahito @ users.sourceforge.jp Tue Aug 1 19:40:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:40:05 +0900 Subject: [xoops-cvslog 3830] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104006.B90352AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.1 Tue May 9 19:31:59 2006 +++ xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php Tue Aug 1 19:40:05 2006 @@ -1,4 +1,8 @@ 'imgcat_id', IMAGECATEGORY_SORT_KEY_IMGCAT_NAME => 'imgcat_name', IMAGECATEGORY_SORT_KEY_IMGCAT_MAXSIZE => 'imgcat_maxsize', @@ -31,34 +34,33 @@ IMAGECATEGORY_SORT_KEY_IMGCAT_TYPE => 'imgcat_type', IMAGECATEGORY_SORT_KEY_IMGCAT_STORETYPE => 'imgcat_storetype' ); - var $_mCriteria = null; function fetch() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : IMAGECATEGORY_SORT_KEY_DEFAULT; + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGECATEGORY_SORT_KEY_DEFAULT; - if ($this->mSort > IMAGECATEGORY_SORT_KEY_MAXVALUE) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = IMAGECATEGORY_SORT_KEY_DEFAULT; } if (isset($_REQUEST['imgcat_name'])) { $this->_mNavi->addExtra('imgcat_name', xoops_getrequest('imgcat_name')); - $this->_mCriteria->add(new Criteria('imgcat_name', array(XOBJ_DTYPE_STRING, xoops_getrequest('imgcat_name')))); + $this->_mCriteria->add(new Criteria('imgcat_name', xoops_getrequest('imgcat_name'))); } if (isset($_REQUEST['imgcat_display'])) { $this->_mNavi->addExtra('imgcat_display', xoops_getrequest('imgcat_display')); - $this->_mCriteria->add(new Criteria('imgcat_display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('imgcat_display')))); + $this->_mCriteria->add(new Criteria('imgcat_display', xoops_getrequest('imgcat_display'))); } if (isset($_REQUEST['imgcat_type'])) { $this->_mNavi->addExtra('imgcat_type', xoops_getrequest('imgcat_type')); - $this->_mCriteria->add(new Criteria('imgcat_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('imgcat_type')))); + $this->_mCriteria->add(new Criteria('imgcat_type', xoops_getrequest('imgcat_type'))); } if (isset($_REQUEST['imgcat_storetype'])) { $this->_mNavi->addExtra('imgcat_storetype', xoops_getrequest('imgcat_storetype')); - $this->_mCriteria->add(new Criteria('imgcat_storetype', array(XOBJ_DTYPE_STRING, xoops_getrequest('imgcat_storetype')))); + $this->_mCriteria->add(new Criteria('imgcat_storetype', xoops_getrequest('imgcat_storetype'))); } // From minahito @ users.sourceforge.jp Tue Aug 1 19:40:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:40:18 +0900 Subject: [xoops-cvslog 3831] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104018.EF7F42AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.1 Wed May 10 19:25:33 2006 +++ xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php Tue Aug 1 19:40:18 2006 @@ -12,14 +12,13 @@ define('IMAGE_SORT_KEY_IMAGE_DISPLAY', 6); define('IMAGE_SORT_KEY_IMAGE_WEIGHT', 7); define('IMAGE_SORT_KEY_IMGCAT_ID', 8); -define('IMAGE_SORT_KEY_MAXVALUE', 8); define('IMAGE_SORT_KEY_DEFAULT', IMAGE_SORT_KEY_IMAGE_WEIGHT); +define('IMAGE_SORT_KEY_MAXVALUE', 8); class Legacy_ImageFilterForm extends Legacy_AbstractFilterForm { - var $mSort = 0; - var $_mSortKeys = array( + var $mSortKeys = array( IMAGE_SORT_KEY_IMAGE_ID => 'image_id', IMAGE_SORT_KEY_IMAGE_NAME => 'image_name', IMAGE_SORT_KEY_IMAGE_NICENAME => 'image_nicename', @@ -29,34 +28,22 @@ IMAGE_SORT_KEY_IMAGE_WEIGHT => 'image_weight', IMAGE_SORT_KEY_IMGCAT_ID => 'imgcat_id' ); - var $_mCriteria = null; - function fetch() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : IMAGE_SORT_KEY_DEFAULT; + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGE_SORT_KEY_DEFAULT; - if ($this->mSort > IMAGE_SORT_KEY_MAXVALUE) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = IMAGE_SORT_KEY_DEFAULT; } -// if (isset($_REQUEST['image_name'])) { -// $this->_mNavi->addExtra('image_name', xoops_getrequest('image_name')); -// $this->_mCriteria->add(new Criteria('image_name', array(XOBJ_DTYPE_STRING, xoops_getrequest('image_name')))); -// } - -// if (isset($_REQUEST['image_nicename'])) { -// $this->_mNavi->addExtra('image_nicename', xoops_getrequest('image_nicename')); -// $this->_mCriteria->add(new Criteria('image_nicename', array(XOBJ_DTYPE_STRING, xoops_getrequest('image_nicename')))); -// } - if (isset($_REQUEST['image_display'])) { $this->_mNavi->addExtra('image_display', xoops_getrequest('image_display')); - $this->_mCriteria->add(new Criteria('image_display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('image_display')))); + $this->_mCriteria->add(new Criteria('image_display', xoops_getrequest('image_display'))); } if (isset($_REQUEST['imgcat_id'])) { $this->_mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id')); - $this->_mCriteria->add(new Criteria('imgcat_id', array(XOBJ_DTYPE_INT, xoops_getrequest('imgcat_id')))); + $this->_mCriteria->add(new Criteria('imgcat_id', xoops_getrequest('imgcat_id'))); } $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); From minahito @ users.sourceforge.jp Tue Aug 1 19:40:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:40:35 +0900 Subject: [xoops-cvslog 3832] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104035.A67F92AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/ModuleInstallForm.class.php Tue Aug 1 19:40:35 2006 @@ -17,12 +17,7 @@ // Set form properties // $this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname'); - $this->mFormProperties['agree'] =& new XCube_BoolProperty('agree'); $this->mFormProperties['force'] =& new XCube_BoolProperty('force'); - - // - // Set field properties - // } function load(&$obj) From minahito @ users.sourceforge.jp Tue Aug 1 19:40:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:40:48 +0900 Subject: [xoops-cvslog 3833] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104048.CB5352AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.5 --- xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.4 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php Tue Aug 1 19:40:48 2006 @@ -1,12 +1,13 @@ "mid", + var $mSortKeys = array( MODULE_SORT_KEY_MID => "mid", MODULE_SORT_KEY_NAME => "name", MODULE_SORT_KEY_VERSION => "version", @@ -49,23 +48,17 @@ function fetch() { - $this->mSpecial=isset($_REQUEST['special']) ? intval($_REQUEST['special']) : null; - - $this->mSortKey=isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0; - - if($this->mSortKey>MODULE_SORT_KEY_MAXVALUE) - $this->mSortKey=0; - } - - function getSort() - { - $sortkey=abs($this->mSortKey); - return $this->_mSortKeys[$sortkey]; - } + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : MODULE_SORT_KEY_DEFAULT; - function getOrder() - { - return ($this->mSortKey < 0) ? "DESC" : "ASC"; + if (!isset($this->mSortKeys[abs($this->mSort)])) { + $this->mSort = MODULE_SORT_KEY_DEFAULT; + } + + if (isset($_REQUEST['special'])) { + $this->mSpecial = intval(xoops_getreqeust('special')); + } + + $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); } } From minahito @ users.sourceforge.jp Tue Aug 1 19:41:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:41:04 +0900 Subject: [xoops-cvslog 3834] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104104.BF5C22AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php:1.1.2.3 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/ModuleUninstallForm.class.php Tue Aug 1 19:41:04 2006 @@ -17,12 +17,7 @@ // Set form properties // $this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname'); - $this->mFormProperties['agree'] =& new XCube_BoolProperty('agree'); $this->mFormProperties['force'] =& new XCube_BoolProperty('force'); - - // - // Set field properties - // } function load(&$obj) From minahito @ users.sourceforge.jp Tue Aug 1 19:41:13 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:41:13 +0900 Subject: [xoops-cvslog 3835] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104113.755E12AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/ModuleUpdateForm.class.php Tue Aug 1 19:41:13 2006 @@ -17,12 +17,7 @@ // Set form properties // $this->mFormProperties['dirname'] =& new XCube_StringProperty('dirname'); - $this->mFormProperties['agree'] =& new XCube_BoolProperty('agree'); $this->mFormProperties['force'] =& new XCube_BoolProperty('force'); - - // - // Set field properties - // } function load(&$obj) From minahito @ users.sourceforge.jp Tue Aug 1 19:41:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:41:22 +0900 Subject: [xoops-cvslog 3836] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104123.0101D2AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/SmilesAdminDeleteForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/SmilesAdminDeleteForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/SmilesAdminDeleteForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/SmilesAdminDeleteForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/SmilesAdminDeleteForm.class.php Tue Aug 1 19:41:22 2006 @@ -1,4 +1,8 @@ get('id'); } function prepare() @@ -21,7 +25,6 @@ // // Set field properties // - $this->mFieldProperties['id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['id']->setDependsByArray(array('required')); $this->mFieldProperties['id']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_ID); From minahito @ users.sourceforge.jp Tue Aug 1 19:41:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:41:32 +0900 Subject: [xoops-cvslog 3837] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104132.A222D2AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php Tue Aug 1 19:41:32 2006 @@ -1,4 +1,8 @@ get('id'); } function prepare() @@ -29,7 +33,6 @@ // // Set field properties // - $this->mFieldProperties['id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['id']->setDependsByArray(array('required')); $this->mFieldProperties['id']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_ID); From minahito @ users.sourceforge.jp Tue Aug 1 19:41:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:41:48 +0900 Subject: [xoops-cvslog 3838] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060801104148.7961C2AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3 Tue Apr 11 15:12:45 2006 +++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Tue Aug 1 19:41:48 2006 @@ -4,53 +4,47 @@ require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php"; -define('SMILES_SORT_KEY_DEFAULT', 0); define('SMILES_SORT_KEY_ID', 1); define('SMILES_SORT_KEY_CODE', 2); define('SMILES_SORT_KEY_SMILE_URL', 3); define('SMILES_SORT_KEY_EMOTION', 4); define('SMILES_SORT_KEY_DISPLAY', 5); + +define('SMILES_SORT_KEY_DEFAULT', SMILES_SORT_KEY_ID); define('SMILES_SORT_KEY_MAXVALUE', 5); class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm { - var $mSort = 0; var $_mSortKeys = array( - SMILES_SORT_KEY_DEFAULT => 'id', SMILES_SORT_KEY_ID => 'id', SMILES_SORT_KEY_CODE => 'code', SMILES_SORT_KEY_SMILE_URL => 'smile_url', SMILES_SORT_KEY_EMOTION => 'emotion', SMILES_SORT_KEY_DISPLAY => 'display' ); - var $_mCriteria = null; function fetch() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0; + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : SMILES_SORT_KEY_DEFAULT; - if ($this->mSort > SMILES_SORT_KEY_MAXVALUE) { + if (!isset($this->_mSortKeys[abs($this->mSort)])) { $this->mSort = SMILES_SORT_KEY_DEFAULT; } - if (isset($_REQUEST['id'])) { - $this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id')))); - } - if (isset($_REQUEST['code'])) { - $this->_mCriteria->add(new Criteria('code', array(XOBJ_DTYPE_STRING, xoops_getrequest('code')))); + $this->_mCriteria->add(new Criteria('code', xoops_getrequest('code'))); } if (isset($_REQUEST['smile_url'])) { - $this->_mCriteria->add(new Criteria('smile_url', array(XOBJ_DTYPE_STRING, xoops_getrequest('smile_url')))); + $this->_mCriteria->add(new Criteria('smile_url', xoops_getrequest('smile_url'))); } if (isset($_REQUEST['emotion'])) { - $this->_mCriteria->add(new Criteria('emotion', array(XOBJ_DTYPE_STRING, xoops_getrequest('emotion')))); + $this->_mCriteria->add(new Criteria('emotion', xoops_getrequest('emotion'))); } if (isset($_REQUEST['display'])) { - $this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display')))); + $this->_mCriteria->add(new Criteria('display', xoops_getrequest('display'))); } $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); From minahito @ users.sourceforge.jp Tue Aug 1 19:42:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:42:40 +0900 Subject: [xoops-cvslog 3839] CVS update: xoops2jp/html/modules/base/admin/templates/blocks Message-ID: <20060801104240.3A6BF2AC342@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.12 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.12 Mon May 29 19:25:43 2006 +++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html Tue Aug 1 19:42:40 2006 @@ -1,8 +1,8 @@ <{foreach item=module from=$block.modules}> <{if $module->modinfo.adminindex}> - -
+ +
    <{if $module->adminmenu}> <{foreach item=menu from=$module->adminmenu}> @@ -10,7 +10,7 @@ <{if $menu.absolute}>
  • <{$menu.title|escape}>
  • <{else}> -
  • <{$menu.title|escape}>
  • +
  • <{$menu.title|escape}>
  • <{/if}> <{/if}> <{/foreach}> From minahito @ users.sourceforge.jp Tue Aug 1 19:43:17 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:43:17 +0900 Subject: [xoops-cvslog 3840] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104317.55C572AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/block_edit.html diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.8 Tue Jul 11 12:43:27 2006 +++ xoops2jp/html/modules/base/admin/templates/block_edit.html Tue Aug 1 19:43:17 2006 @@ -18,7 +18,7 @@
    <{xoops_token form=$actionForm}> - <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}> + <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}> @@ -26,7 +26,7 @@ @@ -40,7 +40,7 @@ @@ -78,7 +78,7 @@
    <{$smarty.const._AD_BASE_LANG_BLOCK_EDIT}>
    <{$smarty.const._AD_BASE_LANG_TITLE}> "> - <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}> + <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>
    <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}>
    - +
    From minahito @ users.sourceforge.jp Tue Aug 1 19:43:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:43:38 +0900 Subject: [xoops-cvslog 3841] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104338.3E4CD2AC342@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.6 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html Tue Aug 1 19:43:37 2006 @@ -17,44 +17,44 @@ <{$smarty.const._AD_BASE_LANG_IMGCAT_ID}> - "><{$object->getVar('imgcat_id')}> + "><{$object->getShow('imgcat_id')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_NAME}> - "><{$object->getVar('imgcat_name')}> + "><{$object->getShow('imgcat_name')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_MAXSIZE}> - "><{$object->getVar('imgcat_maxsize')|number_format}> + "><{$object->get('imgcat_maxsize')|number_format}> <{$smarty.const._AD_BASE_LANG_IMGCAT_MAXWIDTH}> - "><{$object->getVar('imgcat_maxwidth')|number_format}> + "><{$object->get('imgcat_maxwidth')|number_format}> <{$smarty.const._AD_BASE_LANG_IMGCAT_MAXHEIGHT}> - "><{$object->getVar('imgcat_maxheight')|number_format}> + "><{$object->get('imgcat_maxheight')|number_format}> <{$smarty.const._AD_BASE_LANG_IMGCAT_DISPLAY}> - "><{$object->getVar('imgcat_display')}> + "><{$object->getShow('imgcat_display')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_WEIGHT}> - "><{$object->getVar('imgcat_weight')}> + "><{$object->getShow('imgcat_weight')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_TYPE}> - "><{$object->getVar('imgcat_type')}> + "><{$object->getShow('imgcat_type')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_STORETYPE}> - "><{$object->getVar('imgcat_storetype')}> + "><{$object->getShow('imgcat_storetype')}> - - + + Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html Tue Aug 1 19:43:38 2006 @@ -1,8 +1,8 @@
    <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_BLOCKLIST}> - <{if $actionForm->getVar('content')}> - <{if $object->getVar('visible') == 1 }> + <{if $actionForm->get('content')}> + <{if $object->get('visible') == 1 }> »» <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}> <{else}> »» <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}> @@ -13,8 +13,8 @@

    - <{if $actionForm->getVar('content')}> - <{if $object->getVar('visible') == 1 }> + <{if $actionForm->get('content')}> + <{if $object->get('visible') == 1 }> <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}> <{else}> <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}> @@ -36,12 +36,12 @@ <{xoops_token form=$actionForm}> - <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}> + <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}> @@ -68,13 +68,13 @@ @@ -112,7 +112,7 @@
    - <{if $actionForm->getVar('content')}> - <{if $object->getVar('visible') == 1 }> + <{if $actionForm->get('content')}> + <{if $object->get('visible') == 1 }> »» <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}> <{else}> »» <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}> @@ -54,7 +54,7 @@
    <{$smarty.const._AD_BASE_LANG_TITLE}> "> - <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}> + <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>
    <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}>
    <{$smarty.const._AD_BASE_LANG_CONTENT}> "> - <{xoops_dhtmltarea type=text name=content value=$actionForm->getVar('content') rows=20 cols=60}> + <{xoops_dhtmltarea type=text name=content value=$actionForm->get('content') rows=20 cols=60}>
    - +
    Index: xoops2jp/html/modules/base/admin/templates/image_delete.html diff -u xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.5 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/base/admin/templates/image_delete.html Tue Aug 1 19:43:38 2006 @@ -1,7 +1,7 @@ @@ -20,40 +20,40 @@ <{$smarty.const._AD_BASE_LANG_IMAGE_ID}> - "><{$object->getVar('image_id')}> + "><{$object->getShow('image_id')}> <{$smarty.const._AD_BASE_LANG_IMAGE_NAME}> - "><{$object->getVar('image_name')}> + "><{$object->getShow('image_name')}> <{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}> - "><{$object->getVar('image_nicename')}> + "><{$object->getShow('image_nicename')}> <{$smarty.const._AD_BASE_LANG_IMAGE_MIMETYPE}> - "><{$object->getVar('image_mimetype')}> + "><{$object->getShow('image_mimetype')}> <{$smarty.const._AD_BASE_LANG_IMAGE_CREATED}> - "><{$object->getVar('image_created')|xoops_formattimestamp:l}> + "><{$object->get('image_created')|xoops_formattimestamp:l}> <{$smarty.const._AD_BASE_LANG_IMAGE_DISPLAY}> - "><{$object->getVar('image_display')}> + "><{$object->getShow('image_display')}> <{$smarty.const._AD_BASE_LANG_IMAGE_WEIGHT}> - "><{$object->getVar('image_weight')}> + "><{$object->getShow('image_weight')}> <{$smarty.const._AD_BASE_LANG_IMGCAT_ID}> - "><{$object->getVar('imgcat_id')}> + "><{$object->getShow('imgcat_id')}> - - + + Index: xoops2jp/html/modules/base/admin/templates/image_edit.html diff -u xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/image_edit.html Tue Aug 1 19:43:38 2006 @@ -1,7 +1,7 @@
    <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_IMAGE_MANAGE}> - »» <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> + »» <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> <{if $actionForm->get('image_id')}> »» <{$smarty.const._AD_BASE_LANG_IMAGE_EDIT}> <{else}> @@ -77,7 +77,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.10 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_edit.html Tue Aug 1 19:43:38 2006 @@ -40,9 +40,8 @@ <{$smarty.const._AD_BASE_LANG_COM_ICON}> "> <{foreach item=icon from=$subjectIconArr}> - <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('com_icon')}> + <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('com_icon')}> <{/foreach}> - @@ -62,13 +61,7 @@ <{$smarty.const._AD_BASE_LANG_COM_STATUS}> "> @@ -90,7 +83,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.10 Mon Jul 31 19:28:54 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_delete.html Tue Aug 1 19:43:38 2006 @@ -45,11 +45,11 @@ <{$smarty.const._AD_BASE_LANG_COM_CREATED}> - "><{$object->getShow('com_created')|xoops_formattimestamp:l}> + "><{$object->get('com_created')|xoops_formattimestamp:l}> <{$smarty.const._AD_BASE_LANG_COM_MODIFIED}> - "><{$object->getShow('com_modified')|xoops_formattimestamp:l}> + "><{$object->get('com_modified')|xoops_formattimestamp:l}> <{$smarty.const._AD_BASE_LANG_COM_UID}> @@ -70,8 +70,8 @@ <{$smarty.const._AD_BASE_LANG_COM_SIG}> "> - <{xoops_input type=radio name=com_sig value=1 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._YES}> - <{xoops_input type=radio name=com_sig value=0 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._NO}> + <{xoops_input type=radio name=com_sig value=1 default=$object->get('com_sig') disabled=true}><{$smarty.const._YES}> + <{xoops_input type=radio name=com_sig value=0 default=$object->get('com_sig') disabled=true}><{$smarty.const._NO}> @@ -85,22 +85,22 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> "> - <{xoops_input type=checkbox name=dohtml value=1 default=$object->getShow('dohtml') disabled=true}> + <{xoops_input type=checkbox name=dohtml value=1 default=$object->get('dohtml') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOHTML}>
    - <{xoops_input type=checkbox name=dosmiley value=1 default=$object->getShow('dosmiley') disabled=true}> + <{xoops_input type=checkbox name=dosmiley value=1 default=$object->get('dosmiley') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOSMILEY}>
    - <{xoops_input type=checkbox name=doxcode value=1 default=$object->getShow('doxcode') disabled=true}> + <{xoops_input type=checkbox name=doxcode value=1 default=$object->get('doxcode') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOXCODE}>
    - <{xoops_input type=checkbox name=doimage value=1 default=$object->getShow('doimage') disabled=true}> + <{xoops_input type=checkbox name=doimage value=1 default=$object->get('doimage') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOIMAGE}>
    - <{xoops_input type=checkbox name=dobr value=1 default=$object->getShow('dobr') disabled=true}> + <{xoops_input type=checkbox name=dobr value=1 default=$object->get('dobr') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOBR}> - - + + @@ -133,7 +133,7 @@ <{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}> <{$obj->getShow('com_ip')}> - <{if $obj->get('com_status') == 1 }> + <{if $obj->get('com_status') == 2}> " /> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/smiles_edit.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.6 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_edit.html Tue Aug 1 19:43:38 2006 @@ -71,7 +71,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/smiles_delete.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.5 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_delete.html Tue Aug 1 19:43:38 2006 @@ -16,27 +16,27 @@ <{$smarty.const._AD_BASE_LANG_SMILES_DELETE}> <{$smarty.const._AD_BASE_LANG_ID}> - "><{$object->getVar('id')}> + "><{$object->getShow('id')}> <{$smarty.const._AD_BASE_LANG_CODE}> - "><{$object->getVar('code')}> + "><{$object->getShow('code')}> <{$smarty.const._AD_BASE_LANG_SMILE_URL}> "> - - ( <{$object->getVar('smile_url')}> ) + + ( <{$object->getShow('smile_url')}> ) <{$smarty.const._AD_BASE_LANG_EMOTION}> - "><{$object->getVar('emotion')}> + "><{$object->getShow('emotion')}> <{$smarty.const._AD_BASE_LANG_DISPLAY}> "> - <{if $object->getVar('display') == 1 }> + <{if $object->get('display') == 1 }> <{$smarty.const._YES}> <{else}> <{$smarty.const._NO}> @@ -45,8 +45,8 @@ - - + + Index: xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.5 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html Tue Aug 1 19:43:38 2006 @@ -101,7 +101,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.5 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html Tue Aug 1 19:43:38 2006 @@ -18,7 +18,7 @@ <{xoops_token form=$actionForm}> - <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}> + <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}> @@ -26,23 +26,21 @@ @@ -57,9 +55,7 @@ @@ -67,9 +63,7 @@ @@ -84,7 +78,7 @@
    <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
    <{$smarty.const._AD_BASE_LANG_TITLE}> "> - <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}> + <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>
    <{$smarty.const._AD_BASE_LANG_SIDE}> ">
    <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}>
    <{$smarty.const._AD_BASE_LANG_TARGET_MODULES}> ">
    <{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}> ">
    - +
    Index: xoops2jp/html/modules/base/admin/templates/customblock_delete.html diff -u xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.4 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/base/admin/templates/customblock_delete.html Tue Aug 1 19:43:38 2006 @@ -17,92 +17,92 @@ <{$smarty.const._AD_BASE_LANG_BID}> - "><{$object->getVar('bid')}> + "><{$object->getShow('bid')}> <{$smarty.const._AD_BASE_LANG_MID}> - "><{$object->getVar('mid')}> + "><{$object->getShow('mid')}> <{$smarty.const._AD_BASE_LANG_FUNC_NUM}> - "><{$object->getVar('func_num')}> + "><{$object->getShow('func_num')}> <{$smarty.const._AD_BASE_LANG_OPTIONS}> - "><{$object->getVar('options')}> + "><{$object->getShow('options')}> <{$smarty.const._AD_BASE_LANG_NAME}> - "><{$object->getVar('name')}> + "><{$object->getShow('name')}> <{$smarty.const._AD_BASE_LANG_TITLE}> - "><{$object->getVar('title')}> + "><{$object->getShow('title')}> <{$smarty.const._AD_BASE_LANG_CONTENT}> - "><{$object->getVar('content')}> + "><{$object->getShow('content')}> <{$smarty.const._AD_BASE_LANG_SIDE}> "> - <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}> + <{if $object->mColumn}><{$object->mColumn->getShow('name')}><{/if}> <{$smarty.const._AD_BASE_LANG_WEIGHT}> - "><{$object->getVar('weight')}> + "><{$object->getShow('weight')}> <{$smarty.const._AD_BASE_LANG_VISIBLE}> - "><{$object->getVar('visible')}> + "><{$object->getShow('visible')}> <{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}> - "><{$object->getVar('block_type')}> + "><{$object->getShow('block_type')}> <{$smarty.const._AD_BASE_LANG_C_TYPE}> - "><{$object->getVar('c_type')}> + "><{$object->getShow('c_type')}> <{$smarty.const._AD_BASE_LANG_ISACTIVE}> - "><{$object->getVar('isactive')}> + "><{$object->getShow('isactive')}> <{$smarty.const._AD_BASE_LANG_DIRNAME}> - "><{$object->getVar('dirname')}> + "><{$object->getShow('dirname')}> <{$smarty.const._AD_BASE_LANG_FUNC_FILE}> - "><{$object->getVar('func_file')}> + "><{$object->getShow('func_file')}> <{$smarty.const._AD_BASE_LANG_SHOW_FUNC}> - "><{$object->getVar('show_func')}> + "><{$object->getShow('show_func')}> <{$smarty.const._AD_BASE_LANG_EDIT_FUNC}> - "><{$object->getVar('edit_func')}> + "><{$object->getShow('edit_func')}> <{$smarty.const._AD_BASE_LANG_TEMPLATE}> - "><{$object->getVar('template')}> + "><{$object->getShow('template')}> <{$smarty.const._AD_BASE_LANG_BCACHETIME}> "> - <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}> + <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}> <{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}> - "><{$object->getVar('last_modified')|xoops_formattimestamp:l}> + "><{$object->get('last_modified')|xoops_formattimestamp:l}> - - + + From minahito @ users.sourceforge.jp Tue Aug 1 19:43:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:43:55 +0900 Subject: [xoops-cvslog 3842] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104355.072A22AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/block_list.html diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.14 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.15 --- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.14 Tue Jul 11 12:43:27 2006 +++ xoops2jp/html/modules/base/admin/templates/block_list.html Tue Aug 1 19:43:54 2006 @@ -59,10 +59,10 @@ <{foreach item=obj from=$objects}> - <{$obj->getVar('bid')}> + <{$obj->getShow('bid')}> <{if $obj->mModule}> - <{$obj->mModule->getVar('name')}> + <{$obj->mModule->getShow('name')}> <{else}> <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}> <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}> @@ -72,9 +72,9 @@ <{/if}> <{* - <{$obj->getVar('name')}> + <{$obj->getShow('name')}> *}> - <{$obj->getVar('title')}> + <{$obj->getShow('title')}> <{strip}> <{if $obj->get('side') == 0}> <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>- @@ -106,18 +106,18 @@ <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}> - <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}> - <{$obj->getVar('last_modified')|xoops_formattimestamp:l}> + <{$obj->getShow('last_modified')|xoops_formattimestamp:l}> <{if $obj->get('block_type') == 'C'}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{else}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{/if}> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{/foreach}> From minahito @ users.sourceforge.jp Tue Aug 1 19:44:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:44:08 +0900 Subject: [xoops-cvslog 3843] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104408.717292AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.5 Wed Jun 14 00:55:25 2006 +++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html Tue Aug 1 19:44:08 2006 @@ -25,92 +25,92 @@ <{$smarty.const._AD_BASE_LANG_BID}> - "><{$object->getVar('bid')}> + "><{$object->getShow('bid')}> <{$smarty.const._AD_BASE_LANG_MID}> - "><{$object->getVar('mid')}> + "><{$object->getShow('mid')}> <{$smarty.const._AD_BASE_LANG_FUNC_NUM}> - "><{$object->getVar('func_num')}> + "><{$object->getShow('func_num')}> <{$smarty.const._AD_BASE_LANG_OPTIONS}> - "><{$object->getVar('options')}> + "><{$object->getShow('options')}> <{$smarty.const._AD_BASE_LANG_NAME}> - "><{$object->getVar('name')}> + "><{$object->getShow('name')}> <{$smarty.const._AD_BASE_LANG_TITLE}> - "><{$object->getVar('title')}> + "><{$object->getShow('title')}> <{$smarty.const._AD_BASE_LANG_CONTENT}> - "><{$object->getVar('content')}> + "><{$object->getShow('content')}> <{$smarty.const._AD_BASE_LANG_SIDE}> "> - <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}> + <{if $object->mColumn}><{$object->mColumn->getShow('name')}><{/if}> <{$smarty.const._AD_BASE_LANG_WEIGHT}> - "><{$object->getVar('weight')}> + "><{$object->getShow('weight')}> <{$smarty.const._AD_BASE_LANG_VISIBLE}> - "><{$object->getVar('visible')}> + "><{$object->getShow('visible')}> <{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}> - "><{$object->getVar('block_type')}> + "><{$object->getShow('block_type')}> <{$smarty.const._AD_BASE_LANG_C_TYPE}> - "><{$object->getVar('c_type')}> + "><{$object->getShow('c_type')}> <{$smarty.const._AD_BASE_LANG_ISACTIVE}> - "><{$object->getVar('isactive')}> + "><{$object->getShow('isactive')}> <{$smarty.const._AD_BASE_LANG_DIRNAME}> - "><{$object->getVar('dirname')}> + "><{$object->getShow('dirname')}> <{$smarty.const._AD_BASE_LANG_FUNC_FILE}> - "><{$object->getVar('func_file')}> + "><{$object->getShow('func_file')}> <{$smarty.const._AD_BASE_LANG_SHOW_FUNC}> - "><{$object->getVar('show_func')}> + "><{$object->getShow('show_func')}> <{$smarty.const._AD_BASE_LANG_EDIT_FUNC}> - "><{$object->getVar('edit_func')}> + "><{$object->getShow('edit_func')}> <{$smarty.const._AD_BASE_LANG_TEMPLATE}> - "><{$object->getVar('template')}> + "><{$object->getShow('template')}> <{$smarty.const._AD_BASE_LANG_BCACHETIME}> "> - <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}> + <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}> <{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}> - "><{$object->getVar('last_modified')|xoops_formattimestamp:l}> + "><{$object->get('last_modified')|xoops_formattimestamp:l}> - - + + From minahito @ users.sourceforge.jp Tue Aug 1 19:44:24 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:44:24 +0900 Subject: [xoops-cvslog 3844] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104424.515B22AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.10 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html Tue Aug 1 19:44:24 2006 @@ -37,10 +37,10 @@ <{foreach item=obj from=$objects}> - <{$obj->getVar('bid')}> + <{$obj->getShow('bid')}> <{if $obj->mModule}> - <{$obj->mModule->getVar('name')}> + <{$obj->mModule->getShow('name')}> <{else}> <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}> <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}> @@ -50,16 +50,16 @@ <{/if}> <{* - <{$obj->getVar('name')}> + <{$obj->getShow('name')}> *}> - <{$obj->getVar('title')}> - <{$obj->getVar('template')}> + <{$obj->getShow('title')}> + <{$obj->getShow('template')}> <{if $obj->get('block_type') == 'C'}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{else}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> <{/if}> From minahito @ users.sourceforge.jp Tue Aug 1 19:44:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:44:32 +0900 Subject: [xoops-cvslog 3845] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104432.BEA322AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/comment_list.html diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.12 Mon Jul 31 19:28:54 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_list.html Tue Aug 1 19:44:32 2006 @@ -76,8 +76,9 @@ <{$obj->getShow('com_ip')}> <{$obj->mStatus->getShow('name')}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> From minahito @ users.sourceforge.jp Tue Aug 1 19:44:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:44:39 +0900 Subject: [xoops-cvslog 3846] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104439.066952AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/comment_view.html diff -u xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.4 --- xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.3 Fri Mar 31 00:14:01 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_view.html Tue Aug 1 19:44:38 2006 @@ -8,83 +8,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -105,15 +105,15 @@ <{foreach item=obj from=$children}> - - - - - - - + + + + + + + From minahito @ users.sourceforge.jp Tue Aug 1 19:44:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:44:52 +0900 Subject: [xoops-cvslog 3847] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104452.D3ED82AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/imagecategory_list.html diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.7 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/base/admin/templates/imagecategory_list.html Tue Aug 1 19:44:52 2006 @@ -44,20 +44,20 @@ <{foreach item=obj from=$objects}> - - - - - - - - - + + + + + + + + + <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/image_list.html diff -u xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.7 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/base/admin/templates/image_list.html Tue Aug 1 19:44:52 2006 @@ -4,10 +4,10 @@ »» <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> -

    <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> (<{$category->getVar('imgcat_name')}>)

    +

    <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> (<{$category->getShow('imgcat_name')}>)

    Please decide the message which we should display here<{$smarty.const._AD_BASE_LANG_COMMENT_VIEW}>
    <{$smarty.const._AD_BASE_LANG_COM_ID}>"><{$object->getVar('com_id')}>"><{$object->getShow('com_id')}>
    <{$smarty.const._AD_BASE_LANG_COM_PID}>"><{$object->getVar('com_pid')}>"><{$object->getShow('com_pid')}>
    <{$smarty.const._AD_BASE_LANG_COM_ROOTID}>"><{$object->getVar('com_rootid')}>"><{$object->getShow('com_rootid')}>
    <{$smarty.const._AD_BASE_LANG_COM_MODID}>"><{$object->mModule->getVar('name')}>"><{$object->mModule->getShow('name')}>
    <{$smarty.const._AD_BASE_LANG_COM_ITEMID}>"><{$object->getVar('com_itemid')}>"><{$object->getShow('com_itemid')}>
    <{$smarty.const._AD_BASE_LANG_COM_ICON}>">">
    <{$smarty.const._AD_BASE_LANG_COM_CREATED}>"><{$object->getVar('com_created')|xoops_formattimestamp:l}>"><{$object->get('com_created')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_BASE_LANG_COM_MODIFIED}>"><{$object->getVar('com_modified')|xoops_formattimestamp:l}>"><{$object->get('com_modified')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_BASE_LANG_COM_UID}>"><{$object->mUser->getVar('uname')}>"><{$object->mUser->getShow('uname')}>
    <{$smarty.const._AD_BASE_LANG_COM_IP}>"><{$object->getVar('com_ip')}>"><{$object->getShow('com_ip')}>
    <{$smarty.const._AD_BASE_LANG_COM_TITLE}>"><{$object->getVar('com_title')}>"><{$object->getShow('com_title')}>
    <{$smarty.const._AD_BASE_LANG_COM_TEXT}>"><{$object->getVar('com_text')}>"><{$object->getShow('com_text')}>
    <{$smarty.const._AD_BASE_LANG_COM_SIG}> "> - <{xoops_input type=radio name=com_sig value=1 default=$object->getVar('com_sig') disabled=true}><{$smarty.const._YES}> - <{xoops_input type=radio name=com_sig value=0 default=$object->getVar('com_sig') disabled=true}><{$smarty.const._NO}> + <{xoops_input type=radio name=com_sig value=1 default=$object->get('com_sig') disabled=true}><{$smarty.const._YES}> + <{xoops_input type=radio name=com_sig value=0 default=$object->get('com_sig') disabled=true}><{$smarty.const._NO}>
    <{$smarty.const._AD_BASE_LANG_COM_STATUS}>"><{$object->mStatus->getVar('name')}>"><{$object->mStatus->getShow('name')}>
    <{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}>"><{$object->getVar('com_exparams')}>"><{$object->getShow('com_exparams')}>
    <{$smarty.const._AD_BASE_LANG_CONTROL}> "> - <{xoops_input type=checkbox name=dohtml value=1 default=$object->getVar('dohtml') disabled=true}> + <{xoops_input type=checkbox name=dohtml value=1 default=$object->get('dohtml') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOHTML}>
    - <{xoops_input type=checkbox name=dosmiley value=1 default=$object->getVar('dosmiley') disabled=true}> + <{xoops_input type=checkbox name=dosmiley value=1 default=$object->get('dosmiley') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOSMILEY}>
    - <{xoops_input type=checkbox name=doxcode value=1 default=$object->getVar('doxcode') disabled=true}> + <{xoops_input type=checkbox name=doxcode value=1 default=$object->get('doxcode') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOXCODE}>
    - <{xoops_input type=checkbox name=doimage value=1 default=$object->getVar('doimage') disabled=true}> + <{xoops_input type=checkbox name=doimage value=1 default=$object->get('doimage') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOIMAGE}>
    - <{xoops_input type=checkbox name=dobr value=1 default=$object->getVar('dobr') disabled=true}> + <{xoops_input type=checkbox name=dobr value=1 default=$object->get('dobr') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOBR}>
    <{$obj->getVar('com_id')}><{$obj->mModule->getVar('name')}><{$obj->getVar('com_title')}><{$obj->getVar('com_created')|xoops_formattimestamp:l}><{$obj->getVar('com_modified')|xoops_formattimestamp:l}><{if $obj->mUser}><{$obj->mUser->getVar('uname')}><{else}><{$smarty.const._GUESTS}><{/if}><{$obj->getVar('com_ip')}><{$obj->getShow('com_id')}><{$obj->mModule->getShow('name')}><{$obj->getShow('com_title')}><{$obj->get('com_created')|xoops_formattimestamp:l}><{$obj->get('com_modified')|xoops_formattimestamp:l}><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}><{$obj->getShow('com_ip')}> - <{if $obj->getVar('com_status') == 1 }> + <{if $obj->get('com_status') == 2 }> " /> <{/if}>
    <{$obj->getVar('imgcat_id')}><{$obj->getVar('imgcat_name')}><{$obj->getVar('imgcat_maxsize')|number_format}><{$obj->getVar('imgcat_maxwidth')|number_format}><{$obj->getVar('imgcat_maxheight')|number_format}><{$obj->getVar('imgcat_display')}><{$obj->getVar('imgcat_weight')}><{$obj->getVar('imgcat_type')}><{$obj->getVar('imgcat_storetype')}><{$obj->getShow('imgcat_id')}><{$obj->getShow('imgcat_name')}><{$obj->get('imgcat_maxsize')|number_format}><{$obj->get('imgcat_maxwidth')|number_format}><{$obj->get('imgcat_maxheight')|number_format}><{$obj->getShow('imgcat_display')}><{$obj->getShow('imgcat_weight')}><{$obj->getShow('imgcat_type')}><{$obj->getShow('imgcat_storetype')}> <{$obj->getImageCount()|escape}> - " alt="<{$smarty.const._AD_BASE_LANG_LIST}>" title="<{$smarty.const._AD_BASE_LANG_LIST}>" /> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_LIST}>" title="<{$smarty.const._AD_BASE_LANG_LIST}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
    @@ -40,25 +40,25 @@ <{foreach item=obj from=$objects}> - + - - - - - - + + + + + + <{/foreach}> From minahito @ users.sourceforge.jp Tue Aug 1 19:45:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:45:07 +0900 Subject: [xoops-cvslog 3848] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104507.98FE02AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/install_wizard_error.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.2 --- xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.1 Sat Feb 4 01:00:58 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard_error.html Tue Aug 1 19:45:07 2006 @@ -3,11 +3,11 @@
      <{foreach item=msg from=$log}> <{if $msg.type=="error"}> -
    • <{$msg.message}>
    • +
    • <{$msg.message|escape}>
    • <{elseif $msg.type=="warning"}> -
    • <{$msg.message}>
    • +
    • <{$msg.message|escape}>
    • <{else}> -
    • <{$msg.message}>
    • +
    • <{$msg.message|escape}>
    • <{/if}> <{/foreach}>
    From minahito @ users.sourceforge.jp Tue Aug 1 19:45:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:45:21 +0900 Subject: [xoops-cvslog 3849] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104521.A3A192AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/module_list.html diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.10 Wed Jun 14 21:45:24 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Tue Aug 1 19:45:21 2006 @@ -45,25 +45,25 @@ <{foreach item=module from=$moduleObjects}> - - + + - + - + <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.5 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Tue Aug 1 19:45:21 2006 @@ -29,25 +29,25 @@ <{foreach item=obj from=$objects}> - <{if $obj->getVar('display') == 1 }> + <{if $obj->get('display') == 1 }> <{else}> <{/if}> - - - - + + + + From minahito @ users.sourceforge.jp Tue Aug 1 19:45:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:45:35 +0900 Subject: [xoops-cvslog 3850] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104535.8D45A2AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.4 Wed Jun 14 21:45:24 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Tue Aug 1 19:45:35 2006 @@ -17,13 +17,13 @@ <{foreach item=module from=$moduleObjects}> <{/foreach}> From minahito @ users.sourceforge.jp Tue Aug 1 19:45:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:45:46 +0900 Subject: [xoops-cvslog 3851] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104546.BFDF92AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/install_wizard.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.2 --- xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.1 Sat Feb 4 01:00:58 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard.html Tue Aug 1 19:45:46 2006 @@ -8,22 +8,22 @@

    <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>

      -
    • <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}> +
    • <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}>
    <{xoops_token form=$actionForm}> - +
    <{$obj->getVar('image_id')}><{$obj->getShow('image_id')}> <{if $obj->mImageCategory != null}> <{if $obj->mImageCategory->get('imgcat_storetype') == 'file'}> - + <{else}> - + <{/if}> <{/if}> <{$obj->getVar('image_nicename')}><{$obj->getVar('image_mimetype')}><{$obj->getVar('image_created')|xoops_formattimestamp:l}><{if $obj->getVar('image_display') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._YES}><{/if}><{$obj->getVar('image_weight')}><{$obj->getVar('imgcat_id')}><{$obj->getShow('image_nicename')}><{$obj->getShow('image_mimetype')}><{$obj->getShow('image_created')|xoops_formattimestamp:l}><{if $obj->get('image_display') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._YES}><{/if}><{$obj->getShow('image_weight')}><{$obj->getShow('imgcat_id')}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
    <{$module->getVar('mid')}><{$module->getVar('name','e')}>
    -
    <{$module->getShow('mid')}><{$module->getShow('name')}>
    +
    <{$module->getRenderedVersion()}><{$module->getVar('last_update')|xoops_formattimestamp:l}><{$module->get('last_update')|xoops_formattimestamp:l}> - <{if $module->getVar('hasmain')}> - + <{if $module->get('hasmain')}> + <{else}> - + <{/if}> getVar('isactive')}>checked<{/if}> />get('isactive')}>checked<{/if}> /> - " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> - <{if $module->getVar('isactive') == 0 }> - " alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> + <{if $module->get('isactive') == 0 }> + " alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /> <{/if}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
    <{$smarty.const._AD_BASE_LANG_CONTROL}>
    <{$obj->getVar('id')}><{$obj->getVar('code')}><{$obj->getVar('emotion')}><{$obj->getShow('id')}><{$obj->getShow('code')}><{$obj->getShow('emotion')}> - <{if $obj->getVar('display') == 1 }> + <{if $obj->get('display') == 1 }> <{$smarty.const._YES}> <{else}> <{$smarty.const._NO}> <{/if}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> - " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
    - <{$module->getVar('name','e')}>
    - <{$module->getVar('name')}> + <{$module->getShow('name','e')}>
    + <{$module->getShow('name')}>
    <{$module->getRenderedVersion()}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
    - + - + - @@ -37,8 +37,8 @@ - + <{/foreach}> @@ -115,7 +115,7 @@
    <{$smarty.const._MD_A_BASE_LANG_MAINMENU_INFO}>
    -<{if $module->getVar('hasmain')}> +<{if $module->get('hasmain')}>
    <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>
    - + -

    <{$module->getVar('name')}>

    +

    <{$module->getShow('name')}>

      <{foreach item=item from=$module->modinfo.installer.description}>
    • <{$item|escape}> From minahito @ users.sourceforge.jp Tue Aug 1 19:45:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:45:55 +0900 Subject: [xoops-cvslog 3852] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104555.4E89A2AC343@users.sourceforge.jp> 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.4 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.4 Mon Jan 30 23:53:50 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html Tue Aug 1 19:45:55 2006 @@ -4,8 +4,8 @@
        <{foreach item=record from=$records}> -
      • [ <{$record->mModuleName}> ] - <{$record->mTitle}> - <{if $record->mDescription}>
        ( <{$record->mDescription}> )<{/if}> +
      • [ <{$record->mModuleName|escape}> ] - <{$record->mTitle|escape}> + <{if $record->mDescription}>
        ( <{$record->mDescription|escape}> )<{/if}>
      • <{/foreach}>
      From minahito @ users.sourceforge.jp Tue Aug 1 19:46:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:46:22 +0900 Subject: [xoops-cvslog 3853] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104622.D74CB2AC344@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.7 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.7 Fri Feb 3 17:33:15 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Tue Aug 1 19:46:22 2006 @@ -16,20 +16,20 @@
    - +
    <{$module->modinfo.name|escape}>
    <{$smarty.const._MD_A_BASE_LANG_NAME}><{$module->getVar('name',e)}><{$module->getShow('name')}>
    <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}><{$module->getVar('dirname',e)}><{$module->getShow('dirname')}>
    <{$smarty.const._MD_A_BASE_LANG_VERSION}><{math equation="v/100" v=$module->getVar('version') format="%.2f"}> - <{if $module->getVar('version') != $module->modinfo.version * 100 }> + <{math equation="v/100" v=$module->get('version') format="%.2f"}> + <{if $module->get('version') != $module->modinfo.version * 100 }> » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}>
    <{$smarty.const._MD_A_BASE_LANG_MID}> - <{if $module->getVar('mid')}> - <{$module->getVar('mid')}> + <{if $module->get('mid')}> + <{$module->getShow('mid')}> <{else}> -- <{/if}> @@ -47,8 +47,8 @@
    <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}> - <{if $module->getVar('last_update')}> - <{$module->getVar('last_update')|xoops_formattimestamp:l}> + <{if $module->get('last_update')}> + <{$module->get('last_update')|xoops_formattimestamp:l}> <{else}> -- <{/if}> @@ -104,7 +104,7 @@ <{foreach from=$module->modinfo.tables item=table key=table_key}>
    <{$table_key}><{$table}><{$table|escape}> xxxxxxxxxxxxx
    @@ -148,7 +148,7 @@
    <{$smarty.const._MD_A_BASE_LANG_ADMIN_MENU}>
    -<{if $module->getVar('hasadmin')}> +<{if $module->get('hasadmin')}>
    @@ -156,18 +156,18 @@ - + - + - +
    <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_HAS_MAIN}>
    <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_INDEX}><{$module->modinfo.adminindex}><{$module->modinfo.adminindex|escape}>
    <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_MENU}><{$module->modinfo.adminmenu}><{$module->modinfo.adminmenu|escape}>
    <{$smarty.const._HELP}><{$module->modinfo.help}><{$module->modinfo.help|escape}>
    -<{if $module->adminmenu }> +<{if $module->adminmenu}>
    @@ -177,9 +177,9 @@ <{foreach from=$module->adminmenu item=admin key=admin_key}> - - - + + + <{/foreach}>
    <{$admin_key}>"><{$admin.title}>"><{$admin.link}><{$admin_key|escape}>"><{$admin.title|escape}>"><{$admin.link|escape}>
    @@ -191,7 +191,7 @@
    <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_INFO}>
    -<{if $module->modinfo.templates }> +<{if $module->modinfo.templates}> @@ -212,8 +212,8 @@ <{foreach from=$module->modinfo.templates item=template key=template_key}> - - + + <{/foreach}>
    <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_HAS_MAIN}>
    <{$template_key}><{$template.file}><{$template.description}><{$template.file|escape}><{$template.description|escape}>
    @@ -227,16 +227,16 @@ <{foreach from=$module->modinfo.blocks item=block key=block_num }> - + <{foreach from=$block key=block_key item=block_val name=block }> - + <{if $block_key == "name" }> - + <{else}> - + <{/if}> <{/foreach}> @@ -249,24 +249,24 @@
    <{$smarty.const._MD_A_BASE_LANG_CONFIG_INFO}>
    -<{foreach from=$module->modinfo.config item=config key=conf_num }> +<{foreach from=$module->modinfo.config item=config key=conf_num}>
    <{$smarty.const._MD_A_BASE_LANG_BLOCK_KEY}> (<{$block_num}>)<{$smarty.const._MD_A_BASE_LANG_BLOCK_KEY}> (<{$block_num|escape}>) <{$smarty.const._MD_A_BASE_LANG_BLOCK_VAL}>
    <{$block_key}><{$block_key|escape}><{$block_val}><{$block_val|escape}><{$block_val}><{$block_val|escape}>
    - <{foreach from=$config key=config_key item=config_val name=config }> + <{foreach from=$config key=config_key item=config_val name=config}> - + @@ -280,20 +280,20 @@
    <{$smarty.const._MD_A_BASE_LANG_FEATURE_SVC_INFO}>
    <{$smarty.const._MD_A_BASE_LANG_CONFIG_KEY}> (<{$conf_num}>) <{$smarty.const._MD_A_BASE_LANG_CONFIG_VAL}>
    <{$config_key}><{$config_key|escape}> "> <{if $config_key == "name" }> - <{$config_val}> + <{$config_val|escape}> <{elseif $config_key == options }> <{foreach from=$config_val item=opt key=opt_key }> - <{$opt_key}> » <{$opt}>
    + <{$opt_key}> » <{$opt|escape}>
    <{/foreach}> <{else}> - <{$config_val}> + <{$config_val|escape}> <{/if}>
    -<{if $module->getVar('hassearch')}> +<{if $module->get('hassearch')}> <{/if}> -<{if $module->getVar('hascomments')}> +<{if $module->get('hascomments')}> <{/if}> -<{if $module->getVar('hasnotification')}> +<{if $module->get('hasnotification')}> From minahito @ users.sourceforge.jp Tue Aug 1 19:47:17 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:47:17 +0900 Subject: [xoops-cvslog 3854] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104717.43CE72AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.5 Wed Jun 14 21:45:24 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html Tue Aug 1 19:47:17 2006 @@ -6,16 +6,6 @@

    <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>

    -<{if $actionForm->hasError()}> -
    -
      - <{foreach item=message from=$actionForm->getErrorMessages()}> -
    • <{$message|escape}>
    • - <{/foreach}> -
    -
    -<{/if}> - <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=confirm value=1}> @@ -34,14 +24,14 @@ <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}> <{$actionForm->get('name',$mid)|escape}> <{else}> - (<{$moduleObjects[$mid]->getVar('name',e)}>) » <{$actionForm->get('name',$mid)|escape}> + (<{$moduleObjects[$mid]->getShow('name')}>) » <{$actionForm->get('name',$mid)|escape}> <{/if}>
    <{$smarty.const._MD_A_BASE_LANG_SEARCH_SVC}> <{$smarty.const._MD_A_BASE_LANG_ACTIVE}>
    <{$smarty.const._MD_A_BASE_LANG_COMMENT_SVC}> <{$smarty.const._MD_A_BASE_LANG_ACTIVE}>
    <{$smarty.const._MD_A_BASE_LANG_NOTIF_SVC}> <{$smarty.const._MD_A_BASE_LANG_ACTIVE}> <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}> <{$actionForm->get('weight',$mid)|escape}> <{else}> - (<{$moduleObjects[$mid]->getVar('weight')}>) » <{$actionForm->get('weight',$mid)|escape}> + (<{$moduleObjects[$mid]->getShow('weight')}>) » <{$actionForm->get('weight',$mid)|escape}> <{/if}> @@ -74,7 +64,7 @@
    - +
    From minahito @ users.sourceforge.jp Tue Aug 1 19:47:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:47:29 +0900 Subject: [xoops-cvslog 3855] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060801104729.78C572AC33E@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.4 xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.4 Mon Jan 30 12:58:00 2006 +++ xoops2jp/html/modules/base/admin/templates/help.html Tue Aug 1 19:47:29 2006 @@ -1,10 +1,10 @@

    <{$smarty.const._HELP}> - ( <{$module->modinfo.name}> ) + ( <{$module->modinfo.name|escape}> )

    <{$contents}>
    From minahito @ users.sourceforge.jp Tue Aug 1 19:48:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:48:00 +0900 Subject: [xoops-cvslog 3856] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060801104800.7BD822AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/non_installation_module.php diff -u xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.2 xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.3 --- xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.2 Tue Mar 28 22:29:44 2006 +++ xoops2jp/html/modules/base/class/non_installation_module.php Tue Aug 1 19:48:00 2006 @@ -2,12 +2,19 @@ if (!defined('XOOPS_ROOT_PATH')) exit(); +/** + * This handler handles XoopsModule objects without DB. So it doesn't implement + * some methods for difficult query. Only override methods are usable. + */ class BaseNon_installation_moduleHandler extends XoopsObjectHandler { + /** + * object cache. + * + * @var Array + */ var $_mXoopsModules = array(); - var $mModHandler = null; - /** * readonly property */ @@ -47,7 +54,7 @@ */ function &get($dirname) { - $ret=false; + $ret = false; if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/xoops_version.php")) { return $ret; From minahito @ users.sourceforge.jp Tue Aug 1 19:48:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:48:16 +0900 Subject: [xoops-cvslog 3857] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060801104816.5874E2AC33E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.41 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.42 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.41 Wed Jul 26 19:55:26 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Tue Aug 1 19:48:16 2006 @@ -27,12 +27,14 @@ define('_AD_BASE_ERROR_OBJECTEXIST', "{0}の値が不正です"); define('_AD_BASE_ERROR_OPTIONS', "オプションの値が不正です"); define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください"); +define('_AD_BASE_ERROR_READGROUPS', "最低1グループ以上に使用権限を与えてください"); define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい"); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "sql file not found"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました"); +define('_AD_BASE_ERROR_UPLOADGROUPS', "最低1グループ以上にアップロード権限を与えてください"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加"); define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール"); define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス"); @@ -152,7 +154,7 @@ define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "ブロック {0} をアンインストールしました"); define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "ブロック {0} をインストールしました"); define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ"); -define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認"); +define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "以下のデータを本当に削除しますか?"); define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "データベーステーブルのセットアップを終了しました"); define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除しました"); define('_AD_BASE_MESSAGE_DROP_TABLE', "テーブル {0} をドロップしました"); From minahito @ users.sourceforge.jp Tue Aug 1 19:48:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 1 Aug 2006 19:48:16 +0900 Subject: [xoops-cvslog 3858] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060801104816.886B22AC343@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.34 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.35 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.34 Wed Jul 26 19:55:26 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Tue Aug 1 19:48:16 2006 @@ -27,12 +27,14 @@ define('_AD_BASE_ERROR_OBJECTEXIST', "{0} is wrong."); define('_AD_BASE_ERROR_OPTIONS', "Options"); define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree the following licence."); +define('_AD_BASE_ERROR_READGROUPS', "readgroups"); define('_AD_BASE_ERROR_REQUIRED', "{0} is required."); define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "Upload the image file of smilies."); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Uninstallation of '{1}' module has been failure"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Updating '{1}' module has been failure"); +define('_AD_BASE_ERROR_UPLOADGROUPS', "uploadgroups"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block"); define('_AD_BASE_LANG_ALL_MODULES', "All modules"); define('_AD_BASE_LANG_ALL_STATUS', "All status"); From minahito @ users.sourceforge.jp Wed Aug 2 12:04:42 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 12:04:42 +0900 Subject: [xoops-cvslog 3859] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060802030442.5A7F12AC0F3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.3 Tue Aug 1 19:33:47 2006 +++ xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php Wed Aug 2 12:04:42 2006 @@ -1,6 +1,6 @@ setAttribute('log', $this->mLog->mMessages); } - function executeViewIndex(&$controller, &$xoopsUser, &$renderer) + function executeViewIndex(&$controller, &$xoopsUser, &$render) { $render->setAttribute('module', $this->mModuleObject); $render->setAttribute('actionForm', $this->mActionForm); @@ -73,13 +73,13 @@ } } - function executeViewInput(&$controller, &$xoopsUser, &$renderer) + function executeViewInput(&$controller, &$xoopsUser, &$render) { - $renderer->setTemplateName("install_wizard_licence.html"); - $renderer->setAttribute('module', $this->mModuleObject); - $renderer->setAttribute('actionForm', $this->mActionForm); - $renderer->setAttribute('licence', $this->mLicence); - $renderer->setAttribute('licenceText', $this->mLicenceText); + $render->setTemplateName("install_wizard_licence.html"); + $render->setAttribute('module', $this->mModuleObject); + $render->setAttribute('actionForm', $this->mActionForm); + $render->setAttribute('licence', $this->mLicence); + $render->setAttribute('licenceText', $this->mLicenceText); } } From minahito @ users.sourceforge.jp Wed Aug 2 18:34:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:34:46 +0900 Subject: [xoops-cvslog 3860] CVS update: xoops2jp/html/kernel Message-ID: <20060802093446.79D682AC623@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Theme.class.php diff -u /dev/null xoops2jp/html/kernel/XCube_Theme.class.php:1.1.2.1 --- /dev/null Wed Aug 2 18:34:46 2006 +++ xoops2jp/html/kernel/XCube_Theme.class.php Wed Aug 2 18:34:46 2006 @@ -0,0 +1,95 @@ +_mManifesto = parse_ini_file($file, true); + $this->mName = $this->_mManifesto['Manifesto']['Name']; + $this->mDepends = $this->_mManifesto['Manifesto']['Depends']; + $this->mVersion = $this->_mManifesto['Manifesto']['Version']; + $this->mUrl = $this->_mManifesto['Manifesto']['Url']; + + $this->mRenderSystemName = $this->_mManifesto['Theme']['RenderSystem']; + $this->mAuthor = $this->_mManifesto['Theme']['Author']; + + if (isset($this->_mManifesto['Theme']['ScreenShot'])) { + $this->mScreenShot = $this->_mManifesto['Theme']['ScreenShot']; + } + + if (isset($this->_mManifesto['Theme']['Description'])) { + $this->mDescription = $this->_mManifesto['Theme']['Description']; + } + + $this->mFormat = $this->_mManifesto['Theme']['Format']; + + return true; + } + else { + return false; + } + } +} + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 2 18:35:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:35:01 +0900 Subject: [xoops-cvslog 3861] CVS update: xoops2jp/html/include Message-ID: <20060802093501.D71BB2AC5FE@users.sourceforge.jp> Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.4.8.4 xoops2jp/html/include/version.php:1.4.8.5 --- xoops2jp/html/include/version.php:1.4.8.4 Thu May 25 14:15:53 2006 +++ xoops2jp/html/include/version.php Wed Aug 2 18:35:01 2006 @@ -1,5 +1,5 @@ \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 2 18:35:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:35:56 +0900 Subject: [xoops-cvslog 3862] CVS update: xoops2jp/html/modules/base Message-ID: <20060802093556.9C6762AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/xoops_version.php diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.25 xoops2jp/html/modules/base/xoops_version.php:1.1.2.26 --- xoops2jp/html/modules/base/xoops_version.php:1.1.2.25 Wed Jul 26 19:52:46 2006 +++ xoops2jp/html/modules/base/xoops_version.php Wed Aug 2 18:35:56 2006 @@ -1,5 +1,5 @@ From minahito @ users.sourceforge.jp Wed Aug 2 18:36:13 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:36:13 +0900 Subject: [xoops-cvslog 3863] CVS update: xoops2jp/html/modules/base/admin Message-ID: <20060802093613.813832AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/menu.php diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.11 xoops2jp/html/modules/base/admin/menu.php:1.1.2.12 --- xoops2jp/html/modules/base/admin/menu.php:1.1.2.11 Fri May 12 19:12:24 2006 +++ xoops2jp/html/modules/base/admin/menu.php Wed Aug 2 18:36:13 2006 @@ -1,43 +1,46 @@ - + From minahito @ users.sourceforge.jp Wed Aug 2 18:36:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:36:35 +0900 Subject: [xoops-cvslog 3864] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060802093635.990D72AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php:1.1.2.1 --- /dev/null Wed Aug 2 18:36:35 2006 +++ xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php Wed Aug 2 18:36:35 2006 @@ -0,0 +1,124 @@ +_setupObject(); + $this->_setupActionForm(); + $this->mMainTheme =& $controller->getMainTheme(); + } + + function _setupObject() + { + $handler =& xoops_getmodulehandler('theme'); + $this->mThemes =& $handler->getObjects(); + } + + function _setupActionForm() + { + $this->mActionForm =& new Legacy_ThemeSelectForm(); + $this->mActionForm->prepare(); + } + + function getDefaultView(&$controller, &$xoopsUser) + { + $configHandler =& xoops_gethandler('config'); + + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('conf_name', 'theme_set_allowed')); + $criteria->add(new Criteria('conf_catid', XOOPS_CONF)); + + $configs =& $configHandler->getConfigs($criteria); + $selectedThemeArr = unserialize($configs[0]->get('conf_value')); + + $this->mActionForm->load($selectedThemeArr); + + return LEGACY_FRAME_VIEW_INDEX; + } + + function execute(&$controller, &$xoopsUser) + { + $this->mActionForm->fetch(); + $this->mActionForm->validate(); + + if ($this->mActionForm->hasError()) { + return $this->getDefaultView($controller, $xoopsUser); + } + + // + // save selectable themes. + // + $configHandler =& xoops_gethandler('config'); + + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('conf_name', 'theme_set_allowed')); + $criteria->add(new Criteria('conf_catid', XOOPS_CONF)); + + $configs =& $configHandler->getConfigs($criteria); + $t_themeArr = $this->mActionForm->getSelectableTheme(); + $configs[0]->set('conf_value', serialize($t_themeArr)); + if (!$configHandler->insertConfig($configs[0])) { + print_r($configs[0]); + die(); + } + + // + // save selected theme. + // + $themeName = $this->mActionForm->getChooseTheme(); + + if ($themeName != null) { + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('conf_name', 'theme_set')); + $criteria->add(new Criteria('conf_catid', XOOPS_CONF)); + + $configs =& $configHandler->getConfigs($criteria); + + $configs[0]->set('conf_value', $themeName); + if ($configHandler->insertConfig($configs[0])) { + $controller->mRoot->setThemeName($themeName); + $this->mMainTheme = $themeName; + } + } + + return $this->getDefaultView($controller, $xoopsUser); + } + + function executeViewIndex(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("theme_list.html"); + $render->setAttribute("themes", $this->mThemes); + $render->setAttribute("actionForm", $this->mActionForm); + $render->setAttribute("currentThemeName", $this->mMainTheme); + } +} + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 2 18:36:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:36:48 +0900 Subject: [xoops-cvslog 3865] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060802093648.E7DD62AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ThemeSelectForm.class.php diff -u /dev/null xoops2jp/html/modules/base/admin/forms/ThemeSelectForm.class.php:1.1.2.1 --- /dev/null Wed Aug 2 18:36:48 2006 +++ xoops2jp/html/modules/base/admin/forms/ThemeSelectForm.class.php Wed Aug 2 18:36:48 2006 @@ -0,0 +1,63 @@ +mFormProperties['select'] =& new XCube_BoolArrayProperty('select'); + $this->mFormProperties['choose'] =& new XCube_StringArrayProperty('choose'); + } + + /** + * @access public + */ + function getChooseTheme() + { + foreach ($this->get('choose') as $dirname => $dmy) { + return $dirname; + } + + return null; + } + + function getSelectableTheme() + { + $ret = array(); + + foreach ($this->get('select') as $themeName => $isSelect) { + if ($isSelect == 1) { + $ret[] = $themeName; + } + } + + return $ret; + } + + function load(&$themeArr) + { + foreach ($themeArr as $themeName) { + $this->set('select', $themeName, 1); + } + } +} + +?> From minahito @ users.sourceforge.jp Wed Aug 2 18:37:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:37:03 +0900 Subject: [xoops-cvslog 3866] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060802093703.CECF52AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u /dev/null xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.1 --- /dev/null Wed Aug 2 18:37:03 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Wed Aug 2 18:37:03 2006 @@ -0,0 +1,74 @@ + + +

    <{$smarty.const._AD_BASE_LANG_THEME_ADMIN}>

    + +
    <{$smarty.const._AD_BASE_TIPS_THEME_ADMIN}>
    + +<{if $actionForm->hasError()}> +
    +
      + <{foreach item=message from=$actionForm->getErrorMessages()}> +
    • <{$message|escape}>
    • + <{/foreach}> +
    +
    +<{/if}> + + +<{xoops_token form=$actionForm}> + + + + + + + <{foreach item=theme from=$themes}> + <{if $currentThemeName == $theme->get('name')}> + + <{else}> + " style="text-align:center;"> + <{/if}> + + + + + + <{/foreach}> + + + + + +
    <{$smarty.const._AD_BASE_LANG_THEME}><{$smarty.const._AD_BASE_LANG_PACKAGE}><{$smarty.const._AD_BASE_LANG_CONTROL}>
    + <{if $theme->get('screenshot')}> +
    + <{/if}> + + <{$theme->getShow('name')}> +
    +

    <{$theme->getShow('description') != null}>

    +
      +
    • <{$smarty.const._AD_BASE_LANG_VERSION}> : <{$theme->getShow('version')}> +
    • <{$smarty.const._AD_BASE_LANG_RENDER}> : <{$theme->getShow('render_system')}> +
    • <{$smarty.const._AD_BASE_LANG_FORMAT}> : <{$theme->getShow('format')}> +
    • <{$smarty.const._AD_BASE_LANG_AUTHOR}> : <{$theme->getShow('author')}> + <{if $theme->get('url') != null}> +
    • <{$smarty.const._AD_BASE_LANG_GET_THE_LATEST_VERSION}> + <{/if}> +
    +
    + get('select', $theme->get('dirname'))}>checked<{/if}>/> + + <{if $currentThemeName != $theme->get('dirname')}> + + <{else}> + " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" /> + <{/if}> + <{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}> +
    + +
    + From minahito @ users.sourceforge.jp Wed Aug 2 18:37:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:37:11 +0900 Subject: [xoops-cvslog 3867] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060802093711.8C4802AC631@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.5 xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/help.html:1.1.2.5 Tue Aug 1 19:47:29 2006 +++ xoops2jp/html/modules/base/admin/templates/help.html Wed Aug 2 18:37:11 2006 @@ -1,10 +1,10 @@

    <{$smarty.const._HELP}> - ( <{$module->modinfo.name|escape}> ) + ( <{$module->getShow('name')}> )

    <{$contents}>
    From minahito @ users.sourceforge.jp Wed Aug 2 18:37:27 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:37:27 +0900 Subject: [xoops-cvslog 3868] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060802093728.019302AC642@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.12 Mon Jul 10 13:13:52 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Wed Aug 2 18:37:27 2006 @@ -203,7 +203,7 @@ - + From minahito @ users.sourceforge.jp Wed Aug 2 18:37:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:37:38 +0900 Subject: [xoops-cvslog 3869] CVS update: xoops2jp/html/modules/base/blocks Message-ID: <20060802093738.97E6A2AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/blocks/legacy_themes.php diff -u /dev/null xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1 --- /dev/null Wed Aug 2 18:37:38 2006 +++ xoops2jp/html/modules/base/blocks/legacy_themes.php Wed Aug 2 18:37:38 2006 @@ -0,0 +1,41 @@ + '._YES; + $chk = ""; + if ( $options[0] == 0 ) { + $chk = ' checked="checked"'; + } + $form .= ' '._NO; + $form .= '
    '._MB_BASE_LANG_THWIDTH.' '; + $form .= ''; + return $form; +} +?> From minahito @ users.sourceforge.jp Wed Aug 2 18:37:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:37:52 +0900 Subject: [xoops-cvslog 3870] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060802093753.014EB2AC631@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/theme.php diff -u /dev/null xoops2jp/html/modules/base/class/theme.php:1.1.2.1 --- /dev/null Wed Aug 2 18:37:52 2006 +++ xoops2jp/html/modules/base/class/theme.php Wed Aug 2 18:37:52 2006 @@ -0,0 +1,101 @@ +initVar('name', XOBJ_DTYPE_STRING, '', true, 255); + $this->initVar('dirname', XOBJ_DTYPE_STRING, '', true, 255); + $this->initVar('screenshot', XOBJ_DTYPE_STRING, '', false, 255); + $this->initVar('description', XOBJ_DTYPE_STRING, '', false, 255); + $this->initVar('format', XOBJ_DTYPE_STRING, '', true, 255); + $this->initVar('render_system', XOBJ_DTYPE_STRING, '', true, 255); + $this->initVar('version', XOBJ_DTYPE_STRING, '', true, 32); + $this->initVar('author', XOBJ_DTYPE_STRING, '', true, 64); + $this->initVar('url', XOBJ_DTYPE_STRING, '', true, 255); + } +} + +class BaseThemeHandler extends XoopsObjectHandler +{ + var $_mResults = array(); + + /** + * @var XCube_NewDelegate + */ + var $mGetInstalledThemes = null; + + function BaseThemeHandler(&$db) + { + $this->mGetInstalledThemes =& new XCube_NewDelegate(); + $this->mGetInstalledThemes->register('BaseThemeHandler.GetInstalledThemes'); + } + + function &create() + { + $ret =& new BaseThemeObject(); + return $ret; + } + + function &get($name) + { + $this->_makeCache(); + + foreach (array_keys($this->_mResults) as $key) { + if ($this->_mResults[$key]->get('dirname') == $name) { + return $this->_mResults[$key]; + } + } + + return null; + } + + function &getObjects($criteria = null, $id_as_key = false) + { + $this->_makeCache(); + return $this->_mResults; + } + + /** + * Create cache at $this->mResult by Delegate, if cache is empty. + */ + function _makeCache() + { + if (count($this->_mResults) == 0) { + $t_themeArr = array(); + $this->mGetInstalledThemes->call(new XCube_Ref($t_themeArr)); + + foreach ($t_themeArr as $theme) { + $obj =& $this->create(); + $obj->set('name', $theme->mName); + $obj->set('dirname', $theme->mDirname); + $obj->set('screenshot', $theme->mScreenShot); + $obj->set('description', $theme->mDescription); + $obj->set('format', $theme->mFormat); + $obj->set('render_system', $theme->mRenderSystemName); + $obj->set('version', $theme->mVersion); + $obj->set('author', $theme->mAuthor); + $obj->set('url', $theme->mUrl); + $this->_mResults[] =& $obj; + unset($obj); + } + } + } + + function insert(&$obj, $force = false) + { + return false; + } + + function delete(&$obj, $force = false) + { + return false; + } +} + +?> From minahito @ users.sourceforge.jp Wed Aug 2 18:38:24 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:38:24 +0900 Subject: [xoops-cvslog 3871] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060802093824.3FD112AC631@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.57 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.58 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.57 Mon Jul 31 19:34:02 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Wed Aug 2 18:38:24 2006 @@ -1,7 +1,7 @@ mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget(); + $screenTarget = $this->mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget(); $screenTarget->setTemplateName($this->getMainTheme()); - - $screenTarget->setAttribute('xoops_contents',$resultRenderTarget->getResult()); + $screenTarget->setAttribute('xoops_contents', $resultRenderTarget->getResult()); - $this->mRenderSystem->renderWithTarget($screenTarget); + // + // Get the render-system through theme object. + // + // [TODO] + // Because get() of the virtual handler is heavy, we have to consider + // the new solution about this process. + // + $handler =& xoops_getmodulehandler('theme', 'base'); + $theme =& $handler->get($this->getMainTheme()); + + $renderSystem =& $this->mRoot->getRenderSystem($theme->get('render_system')); + + // + // Rendering. + // + $renderSystem->renderWithTarget($screenTarget); // // Debug Process From minahito @ users.sourceforge.jp Wed Aug 2 18:38:44 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:38:44 +0900 Subject: [xoops-cvslog 3872] CVS update: xoops2jp/html/modules/base/preload Message-ID: <20060802093844.954C42AC642@users.sourceforge.jp> Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.5 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.6 --- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.5 Mon Jul 31 19:34:14 2006 +++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php Wed Aug 2 18:38:44 2006 @@ -1,7 +1,7 @@ mIsSelectableTheme =& new XCube_NewDelegate(); $this->mIsSelectableTheme->register('Base_ThemeSelect.IsSelectableTheme'); @@ -51,10 +54,7 @@ function _isSelectableTheme($theme_name) { - $flag = false; - $this->mIsSelectableTheme->call(new XCube_Ref($flag), $theme_name); - - return $flag; + return in_array($theme_name, $this->mController->mConfig['theme_set_allowed']); } } From minahito @ users.sourceforge.jp Wed Aug 2 18:41:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:41:55 +0900 Subject: [xoops-cvslog 3873] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060802094155.75C772AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/xoops2.html diff -u /dev/null xoops2jp/html/modules/base/language/english/help/xoops2.html:1.1.2.1 --- /dev/null Wed Aug 2 18:41:55 2006 +++ xoops2jp/html/modules/base/language/english/help/xoops2.html Wed Aug 2 18:41:55 2006 @@ -0,0 +1,33 @@ +

    Migration from XOOPS2 to XOOPS Cube 2.1 Legacy

    +
    Getting first
    +

    All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles. These features will be ported to 'Legacy module' until stable release.

    + +
    Module management
    +
      +
    • You can manage modules on 'Legacy system' module.
    • +
    • 'Install module' and 'Module management' has each control page.
    • +
    • Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.
    • +
    • Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.
    • +
    • Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.
    • +
    + +
    User management
    +
      +
    • 'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to user module.
    • +
    • However, 'Sending mail' hasn't ported yet.
    • +
    + +
    Theme management
    +
      +
    • Each renderer systems (Theme engine) are used for management themes.
    • +
    • We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.
    • +
    + +
    New!
    +
    Block management
    +
      +
    • XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need install block before you set block to your site. New Legacy system handles it by visible flag.
    • +
    • If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.
    • +
    • If you uninstall the block, it returns to the list of 'Install block' page.
    • +
    • You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters. +
    Index: xoops2jp/html/modules/base/language/english/help/block.html diff -u /dev/null xoops2jp/html/modules/base/language/english/help/block.html:1.1.2.1 --- /dev/null Wed Aug 2 18:41:55 2006 +++ xoops2jp/html/modules/base/language/english/help/block.html Wed Aug 2 18:41:55 2006 @@ -0,0 +1,39 @@ +

    How to use Blocks

    +

    Blocks is small content that is displayed to modules you specified. +It is installed with modules that have blocks.

    + +
    Install Blocks
    +

    At first, you have to install blocks to use it. +Click here to start installing blocks. +In the form, you can change the name of the block and apply groups that can see the block. +Weight is order in the column that you specify.

    + +
    Column
    +

    Most themes have three panes. +The central panes has more two panes. +These panes are called Left column, Center-Left column, Center column, Center-right column and Right column. +You can display the block to the column that you specify of the module that you specify.

    + +

    Some themes don't have Left column or Right column. +In such case, one column might be inseted to another column. +You need to read the manual of those themes to understand the feature of them.

    + +
    Note
    +

    The special Render System may give special functions to you about blocks. +If you have installed it, read the manual of your RenderSystem.

    + +
    Block Managing
    +

    You can change the setting of the block anytime in Block Manage. +Click here. +The usage is based on other control functions. +Click the edit icon to change the setting.

    + +
    Uninstall Block
    +

    If you hope to lay off the display of the block, click the uninstall icon. +The block returns into the list of uninstall blocks. +The setting of the block is kept until you uninstall the module that has the block. +You can re-install the block anytime.

    + +
    FOR XOOPS2 USERS
    +

    XOOPS Cube Legacy 2.1 has separated the list of un-used blocks from Block Manage. +It is like Module Manage.

    From minahito @ users.sourceforge.jp Wed Aug 2 18:41:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:41:55 +0900 Subject: [xoops-cvslog 3874] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060802094155.9A6712AC64C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/xoops2.html diff -u xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.3 xoops2jp/html/modules/base/language/english/xoops2.html:removed --- xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.3 Sat Apr 15 14:32:51 2006 +++ xoops2jp/html/modules/base/language/english/xoops2.html Wed Aug 2 18:41:55 2006 @@ -1,33 +0,0 @@ -

    Migration from XOOPS2 to XOOPS Cube 2.1 Legacy

    -
    Getting first
    -

    All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles. These features will be ported to 'Legacy module' until stable release.

    - -
    Module management
    -
      -
    • You can manage modules on 'Legacy system' module.
    • -
    • 'Install module' and 'Module management' has each control page.
    • -
    • Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.
    • -
    • Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.
    • -
    • Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.
    • -
    - -
    User management
    -
      -
    • 'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to user module.
    • -
    • However, 'Sending mail' hasn't ported yet.
    • -
    - -
    Theme management
    -
      -
    • Each renderer systems (Theme engine) are used for management themes.
    • -
    • We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.
    • -
    - -
    New!
    -
    Block management
    -
      -
    • XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need install block before you set block to your site. New Legacy system handles it by visible flag.
    • -
    • If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.
    • -
    • If you uninstall the block, it returns to the list of 'Install block' page.
    • -
    • You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters. -
    Index: xoops2jp/html/modules/base/language/english/block.html diff -u xoops2jp/html/modules/base/language/english/block.html:1.1.2.1 xoops2jp/html/modules/base/language/english/block.html:removed --- xoops2jp/html/modules/base/language/english/block.html:1.1.2.1 Mon May 29 13:08:11 2006 +++ xoops2jp/html/modules/base/language/english/block.html Wed Aug 2 18:41:55 2006 @@ -1,39 +0,0 @@ -

    How to use Blocks

    -

    Blocks is small content that is displayed to modules you specified. -It is installed with modules that have blocks.

    - -
    Install Blocks
    -

    At first, you have to install blocks to use it. -Click here to start installing blocks. -In the form, you can change the name of the block and apply groups that can see the block. -Weight is order in the column that you specify.

    - -
    Column
    -

    Most themes have three panes. -The central panes has more two panes. -These panes are called Left column, Center-Left column, Center column, Center-right column and Right column. -You can display the block to the column that you specify of the module that you specify.

    - -

    Some themes don't have Left column or Right column. -In such case, one column might be inseted to another column. -You need to read the manual of those themes to understand the feature of them.

    - -
    Note
    -

    The special Render System may give special functions to you about blocks. -If you have installed it, read the manual of your RenderSystem.

    - -
    Block Managing
    -

    You can change the setting of the block anytime in Block Manage. -Click here. -The usage is based on other control functions. -Click the edit icon to change the setting.

    - -
    Uninstall Block
    -

    If you hope to lay off the display of the block, click the uninstall icon. -The block returns into the list of uninstall blocks. -The setting of the block is kept until you uninstall the module that has the block. -You can re-install the block anytime.

    - -
    FOR XOOPS2 USERS
    -

    XOOPS Cube Legacy 2.1 has separated the list of un-used blocks from Block Manage. -It is like Module Manage.

    From minahito @ users.sourceforge.jp Wed Aug 2 18:41:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:41:55 +0900 Subject: [xoops-cvslog 3875] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060802094155.CA26F2AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/xoops2.html diff -u xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.5 xoops2jp/html/modules/base/language/japanese/xoops2.html:removed --- xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.5 Sat Apr 15 14:32:50 2006 +++ xoops2jp/html/modules/base/language/japanese/xoops2.html Wed Aug 2 18:41:55 2006 @@ -1,46 +0,0 @@ -

    XOOPS2移行リスト

    -
    まずはじめに
    -

    - systemモジュールの管理機能もすべて有効ですが、これは開発途中のためです。
    - すべての管理機能は各モジュールの管理機能へ適切に移行する予定です。 -

    - -
    モジュールの管理
    -
      -
    • baseモジュールの管理からモジュールの管理を行うことが出来ます。
    • -
    • 今回、未インストールのモジュールとインストール済のモジュールは操作が分けられました。
    • -
    • インストール済みのモジュールを管理する場合は「モジュールの管理」、新たにモジュールをインストールする場合は、「モジュールのインストール」を使ってください。
    • -
    • インストーラはコールバックを行っていないなど、現在不完全な点があります。
    • -
    • 従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。baseモジュールでは、管理者に対してのみ権限を振っています。
    • -
    - -
    ユーザーの管理
    -
      -
    • ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。
    • -
    • このうち、メールに関しては移行を終えていません。
    • -
    - -
    テーマの管理
    -
      -
    • テーマの管理は、各テーマエンジン(レンダーシステム)で行います。
    • -
    • DBテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。
    • -
    - -
    New!
    -
    ブロックの管理
    -
      -
    • XOOPS Cube 2.1 + Legacy モジュールでは、ブロックの考え方を整理し、「可視/不可視」をモジュール同様、インストールという概念で考えています。
    • -
    • モジュールをインストールするとブロックも XOOPS Cube + Legacy に登録されますが、使用可能な状態ではありません。モジュールと同様に、ブロックのインストールリストへ進み、導入したいブロックのインストールアイコンをクリックしてください。
    • -
    • アンインストールすると、そのブロックはインストール候補リストに戻ります。
    • -
    • XOOPS Cube 2.1 では非インストールブロックには権限の概念も、アサイン列の概念も、アサインモジュールの概念もありません。ただし、設定は記憶されており、再インストール時の初期値は最後のパラメータが使用されます。
    • -
    - -
    TODO
    -
      -
    • baseモジュールからlegacyモジュールへ名称を変更する予定です。
    • -
    • コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。
    • -
    • イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。
    • -
    • XOOPS 2.0.x からのデータ移行(現在はデータベーステーブルを定義しないことでインストールを可能としている)
    • -
    - - Index: xoops2jp/html/modules/base/language/japanese/block.html diff -u xoops2jp/html/modules/base/language/japanese/block.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/block.html:removed --- xoops2jp/html/modules/base/language/japanese/block.html:1.1.2.1 Mon May 29 13:08:11 2006 +++ xoops2jp/html/modules/base/language/japanese/block.html Wed Aug 2 18:41:55 2006 @@ -1,38 +0,0 @@ -

    ブロックの使い方

    -

    ブロックはあなたが指定したモジュールに表示される小さなコンテンツです。 -それはブロックを持つモジュールと一緒にインストールされます。

    - -
    ブロックのインストール
    -

    まずはじめに、あなたはブロックを使うためにブロックをインストールしなければなりません。 -ブロックのインストールを始めるために、ここをクリックしてください。 -入力フォームで、ブロックの名前やブロックにアクセス可能なグループを指定することが出来ます。 -優先度はあなたが指定したカラムにおける表示順序です。

    - -
    カラム
    -

    ほとんどのテーマは3ペイン方式をとっています。 -中央ペインはさらに2つのペインを持っています。 -これらのペインは、左カラム、中央左カラム、中央カラム、中央右カラム、右カラムと呼ばれています。 -あなたは指定モジュールの指定カラムにブロックを表示させることが出来ます。

    - -

    いくつかのテーマは左カラムか右カラムを持っていません。 -そのようなケースでは、片方のカラムはもう片方のカラムに挿入されています。 -そのようなテーマの特徴を理解するために、テーマのマニュアルを読んでください。

    - -
    -

    特別なレンダーシステムはブロックに関して特別な機能を付与するかもしれません。 -もしそのようなものをインストールしているのであれば、そのレンダーシステムのマニュアルを読んでください。

    - -
    ブロック管理
    -

    ブロック管理で、いつでもブロックの設定を変更できます。 -ここをクリックしてください。その使い方は、他の操作機能に基づいており、ほとんど違いはありません。 -設定を変更する場合は編集アイコンをクリックしてください。

    - -
    ブロックのアンインストール
    -

    ブロックの表示を一時停止したい場合は、アンインストールアイコンをクリックしてください。 -ブロックはアンインストールブロックのリストへ戻ります。 -ブロックの設定はあなたがそのブロックを含むモジュールをアンインストールするまで、保持されます。 -あなたはいつでもそのブロックを再インストールできます。

    - -
    FOR XOOPS2 USERS
    -

    XOOPS Cube Legacy 2.1 では、ブロック管理から未使用ブロックのリストを切り離しました。 -モジュール管理のようなコンセプトになっています。

    From minahito @ users.sourceforge.jp Wed Aug 2 18:41:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:41:55 +0900 Subject: [xoops-cvslog 3876] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060802094155.EF7A52AC64C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/xoops2.html diff -u /dev/null xoops2jp/html/modules/base/language/japanese/help/xoops2.html:1.1.2.1 --- /dev/null Wed Aug 2 18:41:55 2006 +++ xoops2jp/html/modules/base/language/japanese/help/xoops2.html Wed Aug 2 18:41:55 2006 @@ -0,0 +1,46 @@ +

    XOOPS2移行リスト

    +
    まずはじめに
    +

    + systemモジュールの管理機能もすべて有効ですが、これは開発途中のためです。
    + すべての管理機能は各モジュールの管理機能へ適切に移行する予定です。 +

    + +
    モジュールの管理
    +
      +
    • baseモジュールの管理からモジュールの管理を行うことが出来ます。
    • +
    • 今回、未インストールのモジュールとインストール済のモジュールは操作が分けられました。
    • +
    • インストール済みのモジュールを管理する場合は「モジュールの管理」、新たにモジュールをインストールする場合は、「モジュールのインストール」を使ってください。
    • +
    • インストーラはコールバックを行っていないなど、現在不完全な点があります。
    • +
    • 従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。baseモジュールでは、管理者に対してのみ権限を振っています。
    • +
    + +
    ユーザーの管理
    +
      +
    • ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。
    • +
    • このうち、メールに関しては移行を終えていません。
    • +
    + +
    テーマの管理
    +
      +
    • テーマの管理は、各テーマエンジン(レンダーシステム)で行います。
    • +
    • DBテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。
    • +
    + +
    New!
    +
    ブロックの管理
    +
      +
    • XOOPS Cube 2.1 + Legacy モジュールでは、ブロックの考え方を整理し、「可視/不可視」をモジュール同様、インストールという概念で考えています。
    • +
    • モジュールをインストールするとブロックも XOOPS Cube + Legacy に登録されますが、使用可能な状態ではありません。モジュールと同様に、ブロックのインストールリストへ進み、導入したいブロックのインストールアイコンをクリックしてください。
    • +
    • アンインストールすると、そのブロックはインストール候補リストに戻ります。
    • +
    • XOOPS Cube 2.1 では非インストールブロックには権限の概念も、アサイン列の概念も、アサインモジュールの概念もありません。ただし、設定は記憶されており、再インストール時の初期値は最後のパラメータが使用されます。
    • +
    + +
    TODO
    +
      +
    • baseモジュールからlegacyモジュールへ名称を変更する予定です。
    • +
    • コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。
    • +
    • イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。
    • +
    • XOOPS 2.0.x からのデータ移行(現在はデータベーステーブルを定義しないことでインストールを可能としている)
    • +
    + + Index: xoops2jp/html/modules/base/language/japanese/help/block.html diff -u /dev/null xoops2jp/html/modules/base/language/japanese/help/block.html:1.1.2.1 --- /dev/null Wed Aug 2 18:41:55 2006 +++ xoops2jp/html/modules/base/language/japanese/help/block.html Wed Aug 2 18:41:55 2006 @@ -0,0 +1,38 @@ +

    ブロックの使い方

    +

    ブロックはあなたが指定したモジュールに表示される小さなコンテンツです。 +それはブロックを持つモジュールと一緒にインストールされます。

    + +
    ブロックのインストール
    +

    まずはじめに、あなたはブロックを使うためにブロックをインストールしなければなりません。 +ブロックのインストールを始めるために、ここをクリックしてください。 +入力フォームで、ブロックの名前やブロックにアクセス可能なグループを指定することが出来ます。 +優先度はあなたが指定したカラムにおける表示順序です。

    + +
    カラム
    +

    ほとんどのテーマは3ペイン方式をとっています。 +中央ペインはさらに2つのペインを持っています。 +これらのペインは、左カラム、中央左カラム、中央カラム、中央右カラム、右カラムと呼ばれています。 +あなたは指定モジュールの指定カラムにブロックを表示させることが出来ます。

    + +

    いくつかのテーマは左カラムか右カラムを持っていません。 +そのようなケースでは、片方のカラムはもう片方のカラムに挿入されています。 +そのようなテーマの特徴を理解するために、テーマのマニュアルを読んでください。

    + +
    +

    特別なレンダーシステムはブロックに関して特別な機能を付与するかもしれません。 +もしそのようなものをインストールしているのであれば、そのレンダーシステムのマニュアルを読んでください。

    + +
    ブロック管理
    +

    ブロック管理で、いつでもブロックの設定を変更できます。 +ここをクリックしてください。その使い方は、他の操作機能に基づいており、ほとんど違いはありません。 +設定を変更する場合は編集アイコンをクリックしてください。

    + +
    ブロックのアンインストール
    +

    ブロックの表示を一時停止したい場合は、アンインストールアイコンをクリックしてください。 +ブロックはアンインストールブロックのリストへ戻ります。 +ブロックの設定はあなたがそのブロックを含むモジュールをアンインストールするまで、保持されます。 +あなたはいつでもそのブロックを再インストールできます。

    + +
    FOR XOOPS2 USERS
    +

    XOOPS Cube Legacy 2.1 では、ブロック管理から未使用ブロックのリストを切り離しました。 +モジュール管理のようなコンセプトになっています。

    From minahito @ users.sourceforge.jp Wed Aug 2 18:42:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:07 +0900 Subject: [xoops-cvslog 3877] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060802094207.560082AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/theme.html diff -u /dev/null xoops2jp/html/modules/base/language/japanese/help/theme.html:1.1.2.1 --- /dev/null Wed Aug 2 18:42:07 2006 +++ xoops2jp/html/modules/base/language/japanese/help/theme.html Wed Aug 2 18:42:07 2006 @@ -0,0 +1,46 @@ +

    +テーマとは XOOPS Cube におけるスキン(外観)です。メイン・テーマを変更すると、着せ替え人形のように、あなたのサイトの見た目は大きく変わります。
    +XOOPS Cube のためにテーマを配布しているテーマデザイナーのサイトから新しいテーマを入手して、サイトの見た目をカスタマイズしましょう。 +

    + +

    メインテーマを変更してみよう

    +

    +メインテーマとは、あなたのサイトにおけるデフォルトのテーマです。ひとつのサイトにつき、ひとつのメインテーマを指定できます。 +

    +
      +
    1. 互換モジュールのサイドメニューから「テーマの管理」をクリックしてください。 +
    2. メインテーマとして使用したいテーマの「選択」ボタンをクリックしてください。 +
    +

    +設定が終わったら、公開サイトにアクセスしてみてみましょう。新しいデザインのサイトがあなたを待っています。 +

    + +

    新しいテーマをインストールしてみよう

    +

    +テーマデザイナーのサイトで新しいテーマを手に入れましょう。 +配布されているテーマはたいてい圧縮されています。解凍ソフトでファイルを展開してから、使用中の XOOPS Cube の themes ディレクトリへアップロードします。 +

    + +
    テーマディレクトリに注意しましょう
    +
      +
    • 展開したテーマのディレクトリをXOOPS Cubeのルートディレクトリ下にあるthemesディレクトリへアップロードして下さい。
    • +
    • ディレクトリが二重にならないように、たとえばdefaultテーマであればdefaultディレクトリのすぐ下にtheme.htmlかpackage.ini.phpがある状態でアップロードします。
    • +
    + +
    テーマの注意書きをよく読んで!
    +

    +特定のテーマは、特定の「レンダーシステム」を必要とする場合があります。 +デフォルトで含まれている「互換レンダーシステム」は XOOPS2 のテーマ形式を扱うことができますが、レンダーシステムを追加すれば、異なるフォーマットのテーマを読み込んで使用することができるようになります。 +テーマに注意書きがある場合は、それをよく読んでから、テーマをインストールしてください。 +

    + +

    訪問客に好きなテーマを選んでもらおう

    +

    +訪問客に、あなたが指定したテーマリストから好きなテーマを選択させることができます。 +そのために、選択可能なテーマをリストアップして、「テーマ選択」ブロックをインストールする必要があります。 +

    +
      +
    1. まず、テーマリストを作りましょう。互換モジュールのサイドメニューから「テーマの管理」をクリックしてください。
    2. +
    3. 選択可能にしたいテーマをチェックして、送信ボタンをクリックしてください。
    4. +
    5. 「テーマ選択」ブロックをインストールしてください。もし XOOPS Cube のブロックについて分らなければ、それについてのヘルプを参照してください。
    6. +
    From minahito @ users.sourceforge.jp Wed Aug 2 18:42:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:07 +0900 Subject: [xoops-cvslog 3878] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060802094207.77B7F2AC64C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/theme.html diff -u /dev/null xoops2jp/html/modules/base/language/english/help/theme.html:1.1.2.1 --- /dev/null Wed Aug 2 18:42:07 2006 +++ xoops2jp/html/modules/base/language/english/help/theme.html Wed Aug 2 18:42:07 2006 @@ -0,0 +1,48 @@ +

    +Themes are the skin(Looks) at XOOPS Cube. +You may change the looks of your site by changing the main theme like a dress-up doll. +Let's customize the looks of your site. Download themes from sites of theme designers who have published themes for XOOPS Cube. +

    + +

    How to change the main theme

    +

    +The main theme is the default theme at your site. You can specify one main theme in one your site. +

    +
      +
    1. Click 'Theme management' in the side menu of Legacy module.
    2. +
    3. Click 'Select' button of the theme which you want to use as the main theme.
    4. +
    +

    +After setting, let's go to your site. New design site welcomes you. +

    + +

    How to install new themes

    +

    +An additional theme can be obtained on theme developer's website etc. +The distributed theme is mostly compressed. +To use the theme, please upload it to /themes directory after decompression of files. +

    + +
    Be careful about the theme directory!
    +
      +
    • Please upload the folder of the decompressed theme to the themes directory under the root directory of XOOPS Cube. The folder should include theme.html or package.ini.php.
    • +
    + +
    Let's read the note of the theme
    +

    +A theme may need the special render-system. +'Legacy Render System' which is included as default, can handle the theme format of XOOPS2. +If you install other render systems, XOOPS Cube get able to new theme formats. +Please, read the note of the theme for installing theme correctly, if the note is there. +

    + +

    How to use Theme Select

    +

    +Users may select their favorite theme from theme list which you specified. +To that end, you need to list up selectable themes and install 'Theme Select' block for visitors. +

    +
      +
    1. At first, let's make theme list. Click 'Theme management' in the side menu of Legacy module.
    2. +
    3. Check themes which you want to specify as selectable themes. Next, Click 'Submit' button.
    4. +
    5. Install 'Theme Select' block. If you don't know about blocks of XOOPS Cube, read help about it.
    6. +
    From minahito @ users.sourceforge.jp Wed Aug 2 18:42:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:18 +0900 Subject: [xoops-cvslog 3879] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060802094218.A861C2AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.2 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.1 Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Wed Aug 2 18:42:18 2006 @@ -27,6 +27,11 @@
  • 詳しくはこちらをご覧下さい。
+

テーマの管理/インストール

+
    +
  • 詳しくはこちらをご覧下さい。
  • +
+

XOOPS 2.0.x 操作移行リスト

  • こちらをご覧ください
  • From minahito @ users.sourceforge.jp Wed Aug 2 18:42:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:18 +0900 Subject: [xoops-cvslog 3880] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060802094218.CB2B02AC64C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.2 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.1 Mon Jun 5 18:30:10 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Wed Aug 2 18:42:18 2006 @@ -11,6 +11,11 @@
  • Please perform search when you need to know how to use the XOOPS Cube.
+

インデックス

+ +

Module administration / installation

  • When you go to this area, you see a list of installed module in your XOOPS Cube.
  • @@ -24,6 +29,11 @@
  • Click here to understand this feature.
+

Themes administration / installation

+
    +
  • Click here to understand this feature.
  • +
+

Migration guide (from XOOPS 2.0.x)

  • Please refer here.
  • From minahito @ users.sourceforge.jp Wed Aug 2 18:42:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:33 +0900 Subject: [xoops-cvslog 3881] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060802094233.DB4112AC5FE@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/modinfo.php diff -u xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.16 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.17 --- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.16 Mon May 29 16:34:45 2006 +++ xoops2jp/html/modules/base/language/japanese/modinfo.php Wed Aug 2 18:42:33 2006 @@ -10,6 +10,8 @@ define('_MI_BASE_BLOCK_SEARCH_NAME', "検索"); define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します"); define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報"); +define('_MI_BASE_BLOCK_THEMES_DESC', "テーマ選択フォームを表示します"); +define('_MI_BASE_BLOCK_THEMES_NAME', "テーマ選択"); define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します"); define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー"); define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します"); @@ -42,6 +44,7 @@ define('_MI_BASE_MENU_MODULELIST', "モジュールの管理"); define('_MI_BASE_MENU_PREFERENCE', "一般設定"); define('_MI_BASE_MENU_SMILES_MANAGE', "顔アイコンの管理"); +define('_MI_BASE_MENU_THEME_MANAGE', "テーマの管理"); define('_MI_BASE_NAME', "互換モジュール"); define('_MI_BASE_NAME_DESC', "XOOPS Cube にXOOPS 2.0.x シリーズの互換性を与えます"); Index: xoops2jp/html/modules/base/language/japanese/blocks.php diff -u xoops2jp/html/modules/base/language/japanese/blocks.php:1.1.2.1 xoops2jp/html/modules/base/language/japanese/blocks.php:1.1.2.2 --- xoops2jp/html/modules/base/language/japanese/blocks.php:1.1.2.1 Sun Mar 26 15:07:43 2006 +++ xoops2jp/html/modules/base/language/japanese/blocks.php Wed Aug 2 18:42:33 2006 @@ -26,4 +26,8 @@ define("_MB_BASE_LOGO", "%s ディレクトリ内のロゴファイル名"); // %s is your root image directory name define("_MB_BASE_SADMIN", "管理者グループを表示する"); define("_MB_BASE_DISPLAYC","%s 件表示する"); + +define("_MB_BASE_LANG_NUMTHEME", "%s テーマ"); +define("_MB_BASE_LANG_THSHOW", "スクリーンショット画像の表示"); +define("_MB_BASE_LANG_THWIDTH", "スクリーンショット画像のピクセル幅"); ?> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.42 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.43 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.42 Tue Aug 1 19:48:16 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Wed Aug 2 18:42:33 2006 @@ -38,6 +38,7 @@ define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加"); define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール"); define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス"); +define('_AD_BASE_LANG_AUTHOR', "作者"); define('_AD_BASE_LANG_BCACHETIME', "キャッシュ"); define('_AD_BASE_LANG_BID', "BID"); define('_AD_BASE_LANG_BLOCK_EDIT', "ブロック編集"); @@ -92,8 +93,10 @@ define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする"); define('_AD_BASE_LANG_EDIT_FUNC', "編集用コールバック関数"); define('_AD_BASE_LANG_EMOTION', "意味"); +define('_AD_BASE_LANG_FORMAT', "形式"); define('_AD_BASE_LANG_FUNC_FILE', "コールバック関数定義ファイル"); define('_AD_BASE_LANG_FUNC_NUM', "関数ナンバ"); +define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "最新版を入手する"); define('_AD_BASE_LANG_ID', "ID"); define('_AD_BASE_LANG_IMAGE_COUNT', "画像数"); define('_AD_BASE_LANG_IMAGE_CREATED', "作成日"); @@ -134,6 +137,8 @@ define('_AD_BASE_LANG_ONLINE_UNAME', "uname"); define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated"); define('_AD_BASE_LANG_OPTIONS', "オプション"); +define('_AD_BASE_LANG_PACKAGE', "パッケージ情報"); +define('_AD_BASE_LANG_RENDER', "レンダーシステム"); define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス"); define('_AD_BASE_LANG_SHOW_FUNC', "表示用コールバック関数"); define('_AD_BASE_LANG_SIDE', "表示サイド"); @@ -147,8 +152,11 @@ define('_AD_BASE_LANG_TARGET_GROUPS', "アクセス権のあるグループ"); define('_AD_BASE_LANG_TARGET_MODULES', "表示先のモジュール"); define('_AD_BASE_LANG_TEMPLATE', "テンプレート"); +define('_AD_BASE_LANG_THEME', "テーマ"); +define('_AD_BASE_LANG_THEME_ADMIN', "テーマ管理"); define('_AD_BASE_LANG_TITLE', "タイトル"); define('_AD_BASE_LANG_TOPPAGE', "トップページ"); +define('_AD_BASE_LANG_VERSION', "バージョン"); define('_AD_BASE_LANG_VISIBLE', "可視"); define('_AD_BASE_LANG_WEIGHT', "並び順"); define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "ブロック {0} をアンインストールしました"); @@ -169,6 +177,7 @@ define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Q:カスタムブロックをアンインストールすると?
    A:削除されずに、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。"); define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "イメージ・ファイルの保存先に、ファイルシステムもしくはデータベースを選択できます。この設定は後から変更できません。
    データベースへの保存はBLOBというバックアップやリストアに不向きなフォーマットが用いられることに注意しましょう。"); define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。
    ウェルカムメッセージなど、文章を表示したい場合は、カスタムブロックを追加しましょう。"); +define('_AD_BASE_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。
    ユーザーにテーマを選択させたいですか? チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。"); define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ"); define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。
    管理メニューの位置を忘れたときに使いましょう (例)利用許諾文"); define('_MB_A_BASE_LANG_MENU', "メニュー"); From minahito @ users.sourceforge.jp Wed Aug 2 18:42:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:42:34 +0900 Subject: [xoops-cvslog 3882] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060802094234.105D22AC64C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/modinfo.php diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.15 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.16 --- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.15 Fri May 12 19:16:53 2006 +++ xoops2jp/html/modules/base/language/english/modinfo.php Wed Aug 2 18:42:33 2006 @@ -1,50 +1,53 @@ -Pre-road mechanism of this module is very flexible, but it is low speed.
    "); -define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.
    This system can use themes of Xoops2.0.x rightly."); - -?> +Pre-road mechanism of this module is very flexible, but it is low speed.
    "); +define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.
    This system can use themes of Xoops2.0.x rightly."); + +?> Index: xoops2jp/html/modules/base/language/english/blocks.php diff -u xoops2jp/html/modules/base/language/english/blocks.php:1.1.2.1 xoops2jp/html/modules/base/language/english/blocks.php:1.1.2.2 --- xoops2jp/html/modules/base/language/english/blocks.php:1.1.2.1 Sun Mar 26 15:07:43 2006 +++ xoops2jp/html/modules/base/language/english/blocks.php Wed Aug 2 18:42:33 2006 @@ -26,4 +26,8 @@ define("_MB_BASE_LOGO", "Logo image file under %s directory"); // %s is your root image directory name define("_MB_BASE_SADMIN", "Show admin groups"); define("_MB_BASE_DISPLAYC","Display %s comments"); + +define("_MB_BASE_LANG_NUMTHEME", "%s themes"); +define('_MB_BASE_LANG_THSHOW', "Display screenshot image"); +define('_MB_BASE_LANG_THWIDTH', "Screenshot image width"); ?> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.35 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.36 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.35 Tue Aug 1 19:48:16 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Wed Aug 2 18:42:33 2006 @@ -38,6 +38,7 @@ define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block"); define('_AD_BASE_LANG_ALL_MODULES', "All modules"); define('_AD_BASE_LANG_ALL_STATUS', "All status"); +define('_AD_BASE_LANG_AUTHOR', "author"); define('_AD_BASE_LANG_BCACHETIME', "Cache time"); define('_AD_BASE_LANG_BID', "BID"); define('_AD_BASE_LANG_BLOCK_EDIT', "Block edit"); @@ -92,8 +93,10 @@ define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code"); define('_AD_BASE_LANG_EDIT_FUNC', "Callback edit function name"); define('_AD_BASE_LANG_EMOTION', "Emotion"); +define('_AD_BASE_LANG_FORMAT', "format"); define('_AD_BASE_LANG_FUNC_FILE', "Callback file name"); define('_AD_BASE_LANG_FUNC_NUM', "Function number"); +define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "Get the latest version"); define('_AD_BASE_LANG_ID', "ID"); define('_AD_BASE_LANG_IMAGE_COUNT', "Image count"); define('_AD_BASE_LANG_IMAGE_CREATED', "image created"); @@ -134,6 +137,8 @@ define('_AD_BASE_LANG_ONLINE_UNAME', "Online uname"); define('_AD_BASE_LANG_ONLINE_UPDATED', "Online updated"); define('_AD_BASE_LANG_OPTIONS', "Options"); +define('_AD_BASE_LANG_PACKAGE', "package"); +define('_AD_BASE_LANG_RENDER', "render"); define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment"); define('_AD_BASE_LANG_SHOW_FUNC', "Callback show function"); define('_AD_BASE_LANG_SIDE', "Side"); @@ -147,8 +152,11 @@ define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups"); define('_AD_BASE_LANG_TARGET_MODULES', "Target modules"); define('_AD_BASE_LANG_TEMPLATE', "Template"); +define('_AD_BASE_LANG_THEME', "theme"); +define('_AD_BASE_LANG_THEME_ADMIN', "Theme admin"); define('_AD_BASE_LANG_TITLE', "Title"); define('_AD_BASE_LANG_TOPPAGE', "Toppage"); +define('_AD_BASE_LANG_VERSION', "version"); define('_AD_BASE_LANG_VISIBLE', "Visible"); define('_AD_BASE_LANG_WEIGHT', "Weight"); define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled"); @@ -169,6 +177,7 @@ define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at 'install block' page."); define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "imgcat storetype"); define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); +define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
    Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search"); define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search...."); define('_MB_A_BASE_LANG_MENU', "Menu"); From minahito @ users.sourceforge.jp Wed Aug 2 18:44:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:44:37 +0900 Subject: [xoops-cvslog 3883] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060802094437.4A0EF2AC5FE@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.9 Tue Jul 25 19:03:15 2006 +++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Wed Aug 2 18:44:37 2006 @@ -152,7 +152,12 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - redirect_header("./index.php?action=PreferenceList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=PreferenceList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=PreferenceList"); } } From minahito @ users.sourceforge.jp Wed Aug 2 18:45:02 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:45:02 +0900 Subject: [xoops-cvslog 3884] CVS update: xoops2jp/html/modules/legacyRender/preload Message-ID: <20060802094502.977682AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php diff -u xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php:1.1.2.2 --- xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php:1.1.2.1 Tue Jul 11 14:11:10 2006 +++ xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php Wed Aug 2 18:45:02 2006 @@ -1,7 +1,7 @@ mRoot->mDelegateManager->add('Base_ThemeSelect.IsSelectableTheme', 'legacyRender_ThemeSelect::isSelectableTheme'); + $controller->mRoot->mDelegateManager->add('BaseThemeHandler.GetInstalledThemes', 'LegacyRender_DelegateFunctions::getInstalledThemes', XOOPS_ROOT_PATH . "/modules/legacyRender/kernel/DelegateFunctions.class.php"); } function isSelectableTheme(&$flag, $theme_name) From minahito @ users.sourceforge.jp Wed Aug 2 18:45:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:45:47 +0900 Subject: [xoops-cvslog 3885] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060802094547.8DA6B2AC5FE@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php diff -u /dev/null xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1 --- /dev/null Wed Aug 2 18:45:47 2006 +++ xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php Wed Aug 2 18:45:47 2006 @@ -0,0 +1,51 @@ +mDirname = $dirname; + + if ($theme->loadManifesto($themeDir . "/package.ini.php")) { + if ($theme->mRenderSystemName == 'Legacy_RenderSystem') { + $results[] =& $theme; + } + } + else { + if (file_exists($themeDir . "/theme.html")) { + $theme->mName = $dirname; + $theme->mRenderSystemName = 'Legacy_RenderSystem'; + $theme->mFormat = "XOOPS2 Legacy Style"; + $results[] =& $theme; + } + } + + unset($theme); + } + } + closedir($handler); + } + } +} + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 2 18:46:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:46:08 +0900 Subject: [xoops-cvslog 3886] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060802094608.4167F2AC648@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/AbstractFilterForm.class.php diff -u xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.5 xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6 --- xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.5 Tue Apr 11 15:13:20 2006 +++ xoops2jp/html/modules/base/class/AbstractFilterForm.class.php Wed Aug 2 18:46:08 2006 @@ -22,7 +22,7 @@ function getSort() { $sortkey = abs($this->mSort); - return isset($this->_mSortKeys[$sortkey]) ? $this->_mSortKeys[$sortkey] : null; + return isset($this->mSortKeys[$sortkey]) ? $this->mSortKeys[$sortkey] : null; } function getOrder() From minahito @ users.sourceforge.jp Wed Aug 2 18:46:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:46:28 +0900 Subject: [xoops-cvslog 3887] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060802094628.A7E0A2AC656@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/AbstractEditAction.class.php diff -u xoops2jp/html/modules/base/class/AbstractEditAction.class.php:1.1.2.4 xoops2jp/html/modules/base/class/AbstractEditAction.class.php:1.1.2.5 --- xoops2jp/html/modules/base/class/AbstractEditAction.class.php:1.1.2.4 Thu May 25 18:31:08 2006 +++ xoops2jp/html/modules/base/class/AbstractEditAction.class.php Wed Aug 2 18:46:28 2006 @@ -1,4 +1,8 @@ mActionForm->load($this->mObject); $this->mActionForm->fetch(); From minahito @ users.sourceforge.jp Wed Aug 2 18:46:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:46:49 +0900 Subject: [xoops-cvslog 3888] CVS update: xoops2jp/html/themes/cube_default Message-ID: <20060802094649.3829D2AC5FE@users.sourceforge.jp> Index: xoops2jp/html/themes/cube_default/package.ini.php diff -u xoops2jp/html/themes/cube_default/package.ini.php:1.1.2.1 xoops2jp/html/themes/cube_default/package.ini.php:1.1.2.2 --- xoops2jp/html/themes/cube_default/package.ini.php:1.1.2.1 Fri Dec 30 17:32:04 2005 +++ xoops2jp/html/themes/cube_default/package.ini.php Wed Aug 2 18:46:49 2006 @@ -2,12 +2,14 @@ /** [Manifesto] -Name="Default Theme" -Depends=Legacy_RenderSystem +Name="Default theme of Cube" +Depends=Legacy_RenderSystem,base Url="http://xoopscube.org" -Version="1.00" +Version="1.0.0" [Theme] +RenderSystem=Legacy_RenderSystem +Format="XOOPS2 Legacy Style" Author=XOOPS Cube Project Team ScreenShot="screenshot.png" Description="Default theme of XOOPS Cube 2.1" From minahito @ users.sourceforge.jp Wed Aug 2 18:46:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:46:49 +0900 Subject: [xoops-cvslog 3889] CVS update: xoops2jp/html/themes/default Message-ID: <20060802094649.5B2212AC648@users.sourceforge.jp> Index: xoops2jp/html/themes/default/package.ini.php diff -u xoops2jp/html/themes/default/package.ini.php:1.1.2.1 xoops2jp/html/themes/default/package.ini.php:1.1.2.2 --- xoops2jp/html/themes/default/package.ini.php:1.1.2.1 Thu Dec 29 00:43:31 2005 +++ xoops2jp/html/themes/default/package.ini.php Wed Aug 2 18:46:49 2006 @@ -5,9 +5,11 @@ Name="Default Theme" Depends=Legacy_RenderSystem Url="http://www.xoops.org" -Version="1.00" +Version="1.0.0" [Theme] +RenderSystem=Legacy_RenderSystem +Format="XOOPS2 Legacy Style" Author=XOOPS Project Team ScreenShot="screenshot.png" Description="This is the theme that was a standard of XOOPS2 once" From minahito @ users.sourceforge.jp Wed Aug 2 18:47:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 2 Aug 2006 18:47:25 +0900 Subject: [xoops-cvslog 3890] CVS update: xoops2jp/html/modules/base/templates/blocks Message-ID: <20060802094725.393132AC5FE@users.sourceforge.jp> Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html diff -u /dev/null xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html:1.1.2.1 --- /dev/null Wed Aug 2 18:47:25 2006 +++ xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html Wed Aug 2 18:47:25 2006 @@ -0,0 +1,18 @@ +
    +
    +<{if $block.mode==1}> + screenshot
    + +<{/if}> +<{foreach item=theme_option from=$block.theme_options}> + +<{/foreach}> + +<{if $block.mode==1}> + +<{/if}> +
    (<{""|cat:$block.count|cat:""|string_format:$smarty.const._MB_BASE_LANG_NUMTHEME}>)
    +
    +
    From minahito @ users.sourceforge.jp Thu Aug 3 01:45:58 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 01:45:58 +0900 Subject: [xoops-cvslog 3891] CVS update: xoops2jp/html/themes/admin Message-ID: <20060802164558.445342ACA4C@users.sourceforge.jp> Index: xoops2jp/html/themes/admin/package.ini.php diff -u xoops2jp/html/themes/admin/package.ini.php:1.1.2.1 xoops2jp/html/themes/admin/package.ini.php:removed --- xoops2jp/html/themes/admin/package.ini.php:1.1.2.1 Thu Dec 29 00:44:23 2005 +++ xoops2jp/html/themes/admin/package.ini.php Thu Aug 3 01:45:58 2006 @@ -1,11 +0,0 @@ - \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 3 02:01:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 02:01:51 +0900 Subject: [xoops-cvslog 3892] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060802170151.A55172AC03F@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.58 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.59 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.58 Wed Aug 2 18:38:24 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Aug 3 02:01:51 2006 @@ -1,7 +1,7 @@ mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget(); - $screenTarget->setTemplateName($this->getMainTheme()); $screenTarget->setAttribute('xoops_contents', $resultRenderTarget->getResult()); // // Get the render-system through theme object. // - // [TODO] - // Because get() of the virtual handler is heavy, we have to consider - // the new solution about this process. - // - $handler =& xoops_getmodulehandler('theme', 'base'); - $theme =& $handler->get($this->getMainTheme()); + $theme =& $this->_mControllerState->getMainThemeObject($this); $renderSystem =& $this->mRoot->getRenderSystem($theme->get('render_system')); + $screenTarget->setTemplateName($theme->get('dirname')); // // Rendering. @@ -1076,6 +1071,10 @@ $ret = null; return $ret; } + + function &getMainThemeObject(&$controller) + { + } } class BaseControllerPublicState extends BaseControllerState @@ -1126,6 +1125,18 @@ unset($blockObject); } } + + function &getMainThemeObject(&$controller) + { + // [TODO] + // Because get() of the virtual handler is heavy, we have to consider + // the new solution about this process. + // + $handler =& xoops_getmodulehandler('theme', 'base'); + $theme =& $handler->get($controller->getMainTheme()); + + return $theme; + } } class BaseControllerAdminState extends BaseControllerState @@ -1192,6 +1203,20 @@ return $module; } + + function &getMainThemeObject(&$controller) + { + $handler =& xoops_getmodulehandler('theme', 'base'); + $theme =& $handler->create(); + + // + // TODO Load manifesto here. + // + $theme->set('dirname', $controller->mRoot->mSiteConfig['Legacy']['Theme']); + $theme->set('render_system', 'Legacy_AdminRenderSystem'); + + return $theme; + } } ?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 3 02:45:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 02:45:00 +0900 Subject: [xoops-cvslog 3893] CVS update: xoops2jp/html/modules/base/admin Message-ID: <20060802174500.AFF7F2AC6BF@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/css.php diff -u xoops2jp/html/modules/base/admin/css.php:1.1.2.6 xoops2jp/html/modules/base/admin/css.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/css.php:1.1.2.6 Fri Jun 23 10:28:10 2006 +++ xoops2jp/html/modules/base/admin/css.php Thu Aug 3 02:45:00 2006 @@ -3,6 +3,22 @@ require_once "../../../mainfile.php"; require_once XOOPS_ROOT_PATH . "/header.php"; +function Legacy_modifier_css_theme($string) +{ + $infoArr = Legacy_get_ovveride_file($string, null, true); + + if ($infoArr['theme'] != null && $infoArr['dirname'] != null) { + return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/modules/" . $infoArr['dirname'] . "/" . $string; + } + elseif ($infoArr['theme'] != null) { + return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/" . $string; + } + elseif ($infoArr['dirname'] != null) { + return XOOPS_MODULE_URL . "/" . $infoArr['dirname'] . "/admin/templates/" . $string; + } + + return LEGACY_ADMIN_RENDER_FALLBACK_URL . "/" . $string; +} $theme = isset($_GET['theme']) ? trim($_GET['theme']) : null; $dirname = isset($_GET['dirname']) ? trim($_GET['dirname']) : null; @@ -12,7 +28,9 @@ exit(); } -$smarty = new Legacy_AdminSmarty(); +$smarty =& new Legacy_AdminSmarty(); +$smarty->register_modifier("theme", "Legacy_modifier_css_theme"); +$smarty->register_function("stylesheet", "Legacy_function_stylesheet"); if ($theme != null && $dirname != null) { $path = XOOPS_THEME_PATH . "/${theme}/modules/${dirname}"; From minahito @ users.sourceforge.jp Thu Aug 3 02:47:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 02:47:25 +0900 Subject: [xoops-cvslog 3894] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060802174725.B1E6E2AC6BF@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.6 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.7 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.6 Fri Apr 28 18:28:33 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Thu Aug 3 02:47:25 2006 @@ -37,9 +37,6 @@ $this->left_delimiter = "<{"; $this->right_delimiter = "}>"; - $this->register_modifier("theme", "Legacy_modifier_theme"); - $this->register_function("stylesheet", "Legacy_function_stylesheet"); - // // [TODO] // If we don't set true to the following flag, a user can not recover @@ -102,6 +99,8 @@ $this->mController =& $controller; $this->mSmarty =& new Legacy_AdminSmarty(); + $this->mSmarty->register_modifier("theme", "Legacy_modifier_theme"); + $this->mSmarty->register_function("stylesheet", "Legacy_function_stylesheet"); $this->mSmarty->assign(array( "xoops_url" => XOOPS_URL, @@ -249,12 +248,19 @@ } } -function Legacy_get_ovveride_file($file, $prefix = null) +function Legacy_get_ovveride_file($file, $prefix = null, $isSpDirname = false) { $root =& XCube_Root::getSingleton(); $modController =& $root->mController->getModuleController(); $moduleObject =& $modController->getXoopsModule(); + if ($isSpDirname && is_object($moduleObject) && $moduleObject->get('dirname') == 'base' && isset($_REQUEST['dirname'])) { + if (preg_match("/^[a-z0-9_]+$/i", xoops_getrequest('dirname'))) { + $handler =& xoops_gethandler('module'); + $moduleObject =& $handler->getByDirname(xoops_getrequest('dirname')); + } + } + $theme = $root->mSiteConfig['Legacy']['Theme']; $ret = array(); From minahito @ users.sourceforge.jp Thu Aug 3 18:30:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:30:34 +0900 Subject: [xoops-cvslog 3895] CVS update: xoops2jp/html/class Message-ID: <20060803093034.4B53E2AC705@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_BlockProcedure.class.php diff -u xoops2jp/html/class/XCube_BlockProcedure.class.php:1.1.2.3 xoops2jp/html/class/XCube_BlockProcedure.class.php:1.1.2.4 --- xoops2jp/html/class/XCube_BlockProcedure.class.php:1.1.2.3 Tue Nov 15 21:43:10 2005 +++ xoops2jp/html/class/XCube_BlockProcedure.class.php Thu Aug 3 18:30:34 2006 @@ -1,12 +1,23 @@ mAdapteeBlockObject=&$blockObject; - } - - function execute(&$controller,&$user) - { - $this->mResultData=&$this->mAdapteeBlockObject->buildBlock(); - } - - function getId() - { - return $this->mAdapteeBlockObject->getVar('bid'); - } - - function enableCached() - { - return true; - } /** - * Return cache time - * @return int + * Return a name of the render-system which this object requests to render. + * + * @return string */ - function getCacheTime() - { - return $this->mAdapteeBlockObject->getVar('bcachetime'); - } - - function getTitle() - { - return $this->mAdapteeBlockObject->getVar('title'); - } - - function getEntryIndex() - { - return $this->mAdapteeBlockObject->getVar('side'); - } - - function getWeight() - { - return $this->mAdapteeBlockObject->getVar('weight'); - } - - function getTemplateName() - { - return $this->mAdapteeBlockObject->getVar('template'); - } - - function hasResult() - { - return !empty($this->mResultData); - } - - function &getResult() + function getRenderSystemName() { - return $this->mResultData; } } From minahito @ users.sourceforge.jp Thu Aug 3 18:32:17 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:32:17 +0900 Subject: [xoops-cvslog 3896] CVS update: xoops2jp/html/class Message-ID: <20060803093217.2A4232AC717@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_RenderSystem.class.php diff -u xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.16 xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.17 --- xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.16 Fri Jun 23 10:26:52 2006 +++ xoops2jp/html/class/XCube_RenderSystem.class.php Thu Aug 3 18:32:17 2006 @@ -1,7 +1,7 @@ mController =& $controller; - } - /** - * Set main render target. + * Prepare. * - * @param $renderTarget XCube_RenderTarget + * @param XCube_Controller $controller */ - function setRenderTarget(&$renderTarget) + function prepare(&$controller) { - $this->mRenderTarget=&$renderTarget; + $this->mController =& $controller; } - + /** - * Return main render target. + * Create an object of the render-target, and return it. * + * @param int $type The number which shows the type of the render-target. Use constants. * @return XCube_RenderTarget */ - function &getRenderTarget() - { - return $this->mRenderTarget; - } - - function setTemplateName($name) - { - $this->mTemplateName=$name; - } - - function setAttribute($key,$value) - { - } - - function getAttribute($key) - { - } - - /** - * @deprecated - */ - function setThemeName($name) + function &createRenderTarget($type = XCUBE_RENDER_TARGET_TYPE_MAIN) { - $this->mThemeName=$name; - } - - /** - * @deprecated - */ - function getThemeName($name) - { - $this->mThemeName=$name; - } + $renderTarget =& new XCube_RenderTarget(); + $renderTarget->setType($type); - function renderBlock(&$blockProcedure) - { - } - - function render() - { - $this->renderWithTarget($this->mRenderTarget); - } - - function renderWithTarget(&$renderTarget) - { + return $renderTarget; } /** - * If you set false, the render system may don't display the theme that have 3 columns layout. - * However, XOOPS Cube don't force sub-class to implement this feature. - * There is this feature for compatibility with XOOPS 2.0.x. - * Base_LegacyRenderSystem will implement this feature. - * @param $flag bool - */ - function setDisplayTheme($flag) - { - $this->mDisplayThemeFlag=$flag; - } - - /** - * @deprecated + * Render to $target. + * + * @param XCube_RenderTarget $target */ - function renderMessageBox(&$messageBox) + function render(&$target) { - return null; + $this->renderWithTarget($target); } /** - * @deprecated - */ - function renderConfirmBox(&$messageBox) + * @deprecated see render() + */ + function renderWithTarget(&$renderTarget) { - return null; } } From minahito @ users.sourceforge.jp Thu Aug 3 18:33:27 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:33:27 +0900 Subject: [xoops-cvslog 3897] CVS update: xoops2jp/html/modules/base/admin/blocks Message-ID: <20060803093327.32DAF2AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php diff -u xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.3 Tue Mar 28 22:28:48 2006 +++ xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php Thu Aug 3 18:33:27 2006 @@ -12,6 +12,11 @@ */ class Legacy_AdminActionSearch extends XCube_BlockProcedure { + function getName() + { + return "action_search"; + } + function getTitle() { return "TEST: AdminActionSearch"; @@ -27,8 +32,9 @@ return false; } - function execute(&$controller,&$user) + function execute(&$controller, &$user, &$render) { + $render->setTemplateName('legacy_admin_block_actionsearch.html'); } function hasResult() @@ -38,13 +44,13 @@ function &getResult() { - $dmy="dummy"; + $dmy = "dummy"; return $dmy; } - function getTemplateName() + function getRenderSystemName() { - return "legacy_admin_block_actionsearch.html"; + return 'Legacy_AdminRenderSystem'; } } Index: xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php diff -u xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.9 Fri May 26 18:02:46 2006 +++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php Thu Aug 3 18:33:27 2006 @@ -14,7 +14,7 @@ */ class Legacy_AdminSideMenu extends XCube_BlockProcedure { - var $mModules=array(); + var $mModules = array(); /** * protected, but read OK. @@ -23,6 +23,11 @@ */ var $mCurrentModule = null; + function getName() + { + return "sidemenu"; + } + function getTitle() { return "TEST: AdminSideMenu"; @@ -38,7 +43,7 @@ return false; } - function execute(&$controller, &$user) + function execute(&$controller, &$user, &$render) { $this->mCurrentModule =& $controller->mModuleController->mModuleObject; if ($this->mCurrentModule->get('dirname') == 'base') { @@ -96,6 +101,10 @@ $this->mModules[]=&$module; unset($module); } + + $render->setTemplateName('legacy_admin_block_sidemenu.html'); + $render->setAttribute('modules', $this->mModules); + $render->setAttribute('currentModule', $this->mCurrentModule); } function hasResult() @@ -103,19 +112,9 @@ return true; } - function &getResult() - { - $t_arr = array(); - - $t_arr['modules'] =& $this->mModules; - $t_arr['currentModule'] =& $this->mCurrentModule; - - return $t_arr; - } - - function getTemplateName() + function getRenderSystemName() { - return "legacy_admin_block_sidemenu.html"; + return 'Legacy_AdminRenderSystem'; } } From minahito @ users.sourceforge.jp Thu Aug 3 18:34:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:34:03 +0900 Subject: [xoops-cvslog 3898] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060803093403.4D5332AC713@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.2 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.1 Wed Aug 2 18:37:03 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Thu Aug 3 18:34:03 2006 @@ -59,7 +59,6 @@ <{else}> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" /> <{/if}> - <{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}> <{/foreach}> From minahito @ users.sourceforge.jp Thu Aug 3 18:34:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:34:22 +0900 Subject: [xoops-cvslog 3899] CVS update: xoops2jp/html/modules/base/admin/templates/blocks Message-ID: <20060803093422.D32222AC705@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.13 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.14 --- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.13 Tue Aug 1 19:42:40 2006 +++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html Thu Aug 3 18:34:22 2006 @@ -1,5 +1,4 @@ - -<{foreach item=module from=$block.modules}> +<{foreach item=module from=$modules}> <{if $module->modinfo.adminindex}>
    From minahito @ users.sourceforge.jp Thu Aug 3 18:34:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:34:55 +0900 Subject: [xoops-cvslog 3900] CVS update: xoops2jp/html/modules/base/admin/theme Message-ID: <20060803093455.44A3B2AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.2 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.3 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.2 Fri Apr 28 18:22:25 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Thu Aug 3 18:34:55 2006 @@ -49,7 +49,7 @@ <{foreach item=obj from=$objects}> "> - - + + <{/foreach}> Index: xoops2jp/html/modules/base/templates/legacy_search_form.html diff -u xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.6 xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.7 --- xoops2jp/html/modules/base/templates/legacy_search_form.html:1.1.2.6 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/templates/legacy_search_form.html Thu Aug 3 18:43:39 2006 @@ -31,7 +31,7 @@ Index: xoops2jp/html/modules/base/templates/legacy_comment_edit.html diff -u xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.7 xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.8 --- xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/templates/legacy_comment_edit.html Thu Aug 3 18:43:39 2006 @@ -42,7 +42,7 @@ Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.5 xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.6 --- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.5 Thu Jul 27 18:36:00 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_online.html Thu Aug 3 18:43:39 2006 @@ -6,21 +6,21 @@ valign="middle" align="center"> Index: xoops2jp/html/modules/base/templates/legacy_image_list.html diff -u xoops2jp/html/modules/base/templates/legacy_image_list.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_image_list.html:1.1.2.5 --- xoops2jp/html/modules/base/templates/legacy_image_list.html:1.1.2.4 Tue May 30 12:58:15 2006 +++ xoops2jp/html/modules/base/templates/legacy_image_list.html Thu Aug 3 18:43:39 2006 @@ -26,7 +26,7 @@ <{if $hasUploadPerm}> - [ <{$smarty.const._MD_BASE_LANG_IMAGE_UPLOAD}> ] + [ <{$smarty.const._MD_BASE_LANG_IMAGE_UPLOAD}> ] <{/if}>
    -<{foreach name=lblock item=block from=$xoops_lblocks}><{if !$smarty.foreach.lblock.first}> +<{foreach name=lblock item=block from=$xoops_lblocks}><{if $block.name != 'action_search'}>
    <{$block.content}>
    <{/if}><{/foreach}>
    From minahito @ users.sourceforge.jp Thu Aug 3 18:35:14 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:35:14 +0900 Subject: [xoops-cvslog 3901] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060803093514.B840B2AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/ActionFrame.class.php diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.10 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.11 --- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.10 Thu Jul 27 18:33:51 2006 +++ xoops2jp/html/modules/base/class/ActionFrame.class.php Thu Aug 3 18:35:14 2006 @@ -123,27 +123,27 @@ switch($viewStatus) { case LEGACY_FRAME_VIEW_SUCCESS: - $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACY_FRAME_VIEW_ERROR: - $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACY_FRAME_VIEW_INDEX: - $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACY_FRAME_VIEW_INPUT: - $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACY_FRAME_VIEW_PREVIEW: - $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACY_FRAME_VIEW_CANCEL: - $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; } } From minahito @ users.sourceforge.jp Thu Aug 3 18:36:06 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:36:06 +0900 Subject: [xoops-cvslog 3902] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060803093606.352942AC705@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.16 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.17 --- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.16 Thu Jul 20 17:20:22 2006 +++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php Thu Aug 3 18:36:06 2006 @@ -1,29 +1,8 @@ // -// ------------------------------------------------------------------------ // -// 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 // -// ------------------------------------------------------------------------ // +/** + * @package Legacy + * @version $Id: Legacy_AdminModuleController.class.php,v 1.1.2.17 2006/08/03 09:36:06 minahito Exp $ + */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -35,27 +14,9 @@ */ class Legacy_AdminModuleController extends Legacy_ModuleController { - function prepare() + function _isActiveCheck() { - // Is this request module process? - if(!$this->isModuleProcess()) - return; - - $this->_createModuleObject(); - - - // - // 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')); - } - - if(!defined('__XC_DIRNAME__')) - define('__XC_DIRNAME__', $this->mModuleObject->getVar('dirname')); - } + return false; } /** From minahito @ users.sourceforge.jp Thu Aug 3 18:36:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:36:36 +0900 Subject: [xoops-cvslog 3903] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060803093636.8DFA92AC713@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php diff -u /dev/null xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php:1.1.2.1 --- /dev/null Thu Aug 3 18:36:36 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php Thu Aug 3 18:36:36 2006 @@ -0,0 +1,90 @@ +mAdapteeBlockObject=&$blockObject; + } + + function execute(&$controller, &$user, &$render) + { + $this->mResultData =& $this->mAdapteeBlockObject->buildBlock(); + $render->setAttribute("mid", $this->getId()); + + if ($this->mAdapteeBlockObject->get('template') == null) { + $render->setTemplateName('system_dummy.html'); + $render->setAttribute('dummy_content', $this->mResultData['content']); + } + else { + $render->setTemplateName($this->mAdapteeBlockObject->get('template')); + $render->setAttribute('block', $this->mResultData); + } + } + + function getId() + { + return $this->mAdapteeBlockObject->get('bid'); + } + + function enableCached() + { + return true; + } + + /** + * Return cache time + * @return int + */ + function getCacheTime() + { + return $this->mAdapteeBlockObject->get('bcachetime'); + } + + function getTitle() + { + return $this->mAdapteeBlockObject->get('title'); + } + + function getEntryIndex() + { + return $this->mAdapteeBlockObject->getVar('side'); + } + + function getWeight() + { + return $this->mAdapteeBlockObject->get('weight'); + } + + function hasResult() + { + return !empty($this->mResultData); + } + + function &getResult() + { + return $this->mResultData; + } + + function getRenderSystemName() + { + return 'Legacy_RenderSystem'; + } +} + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 3 18:39:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:39:12 +0900 Subject: [xoops-cvslog 3904] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060803093912.CE5852AC713@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.7 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.8 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.7 Thu Aug 3 02:47:25 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Thu Aug 3 18:39:12 2006 @@ -1,4 +1,7 @@ mSmarty->template_dir=XOOPS_ROOT_PATH."/modules/base/admin/templates"; + $this->mSmarty->template_dir = XOOPS_ROOT_PATH . "/modules/base/admin/templates"; - foreach($target->getAttributes() as $key=>$value) { - $this->mSmarty->assign($key,$value); + foreach ($target->getAttributes() as $key => $value) { + $this->mSmarty->assign($key, $value); } $this->mSmarty->setModulePrefix("base"); - $result = $this->mSmarty->fetch("blocks/".$target->getTemplateName()); + $result = $this->mSmarty->fetch("blocks/" . $target->getTemplateName()); $target->setResult($result); - + // // Reset // - foreach($target->getAttributes() as $key=>$value) { + foreach($target->getAttributes() as $key => $value) { $this->mSmarty->clear_assign($key); } } @@ -151,9 +154,12 @@ // // Theme rendering // - foreach($this->mBlockContents[0] as $result) { - $this->mSmarty->append('xoops_lblocks',$result); + $blocks = array(); + foreach($this->mController->mBlockContents[0] as $key => $result) { + // $this->mSmarty->append('xoops_lblocks', $result); + $blocks[$result['name']] = $result; } + $this->mSmarty->assign('xoops_lblocks', $blocks); // // Check Theme or Fallback @@ -179,13 +185,13 @@ // // Assign from attributes of the render-target. // - foreach($target->getAttributes() as $key=>$value) { - $this->mSmarty->assign($key,$value); + foreach ($target->getAttributes() as $key=>$value) { + $this->mSmarty->assign($key, $value); } - - $result=null; - if($target->getTemplateName()) { + $result = null; + + if ($target->getTemplateName()) { if ($target->getModuleName()) { $this->mSmarty->setModulePrefix($target->getModuleName()); $this->mSmarty->template_dir = XOOPS_MODULE_PATH . "/" . $target->getModuleName() . "/admin/". LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME; @@ -198,6 +204,13 @@ } $target->setResult($result); + + // + // Clear assign. + // + foreach ($target->getAttributes() as $key=>$value) { + $this->mSmarty->clear_assign($key); + } } } From minahito @ users.sourceforge.jp Thu Aug 3 18:40:27 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:40:27 +0900 Subject: [xoops-cvslog 3905] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060803094027.777142AC705@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.59 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.60 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.59 Thu Aug 3 02:01:51 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Aug 3 18:40:27 2006 @@ -1,7 +1,7 @@ _mControllerState= $adminStateFlag ? new BaseControllerAdminState() : new BaseControllerPublicState(); + $this->_mStrategy = $adminStateFlag ? new Legacy_AdminControllerStrategy($this) : new Legacy_PublicControllerStrategy($this); } /** @@ -136,9 +146,6 @@ $this->_processPreBlockFilter(); // What's !? - // $languageManager =& $this->_createLanguageManager(); - // $this->mRoot->setLanguageManager($languageManager); - $this->_processHostAbstractLayer(); $this->_setupSession(); @@ -147,8 +154,6 @@ $this->_setupModuleController(); - $this->_setupRenderSystem(); - $this->_processModuleController(); } @@ -224,28 +229,44 @@ function _setupBlock() { - $this->_mControllerState->setupBlock($this); + $this->_mStrategy->setupBlock(); } + /** + * Process of Block. Fetch objects from $this->mBlockChain, render the + * result of the object with html data, and set those result to member + * property. + * + * In this member function, the cache mechanism has to be important. If the + * object has its cache, this function loads the cache data instead of + * calling the business logic of the block. + * + * @access protected + */ function _processBlock() { $i=0; - $blockTarget=new XCube_RenderTarget(); - $blockTarget->setType(XCUBE_RENDER_TARGET_TYPE_BLOCK); + // + // Create render-target for blocks. We use reset() to re-cycle this + // object in the foreach loop. + // + $renderTarget =& new XCube_RenderTarget(); + $renderTarget->setType(XCUBE_RENDER_TARGET_TYPE_BLOCK); $cache =& $this->mRoot->getCacheSystem(); - foreach($this->mBlockChain as $blockProcedure) { + foreach ($this->mBlockChain as $blockProcedure) { $cache->reset(); - $blockTarget->reset(); + $renderTarget->reset(); $cache->setResourceName("block" . $blockProcedure->getId()); if ($cache->isCache($blockProcedure->getCacheTime())) { $content = $cache->load(); if ($content) { - $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true; - $this->mRenderSystem->mBlockContents[$blockProcedure->getEntryIndex()][] = array( + $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true; + $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array( + 'name' => $blockProcedure->getName(), 'title' => $blockProcedure->getTitle(), 'content' => $content, 'weight' => $blockProcedure->getWeight() @@ -253,41 +274,25 @@ } } else { - $blockProcedure->execute($this,$this->getXoopsUser()); + $blockProcedure->execute($this, $this->getXoopsUser(), $renderTarget); if (!$blockProcedure->hasResult()) { continue; } - - $blockTarget->setAttribute("mid",$blockProcedure->getId()); - - if ($blockProcedure->getTemplateName() == null) { - $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true; - $result = $blockProcedure->getResult(); - - $blockTarget->setTemplateName('system_dummy.html'); - $blockTarget->setAttribute('dummy_content', $result['content']); - } - else { - $blockTarget->setTemplateName($blockProcedure->getTemplateName()); - $blockTarget->setAttribute("block",$blockProcedure->getResult()); - } - - $this->mRenderSystem->renderBlock($blockTarget); - $content = $blockTarget->getResult(); + $renderSystem =& $this->mRoot->getRenderSystem($blockProcedure->getRenderSystemName()); + $renderSystem->renderBlock($renderTarget); - if ($content) { - $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true; - $this->mRenderSystem->mBlockContents[$blockProcedure->getEntryIndex()][] = array( - 'title'=>$blockProcedure->getTitle(), - 'content'=>$content, - 'weight'=>$blockProcedure->getWeight() - ); - } + $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true; + $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array( + 'name' => $blockProcedure->getName(), + 'title'=>$blockProcedure->getTitle(), + 'content'=>$renderTarget->getResult(), + 'weight'=>$blockProcedure->getWeight() + ); if ($blockProcedure->getCacheTime() > 0) { - $cache->save($blockTarget); + $cache->save($renderTarget); } } @@ -307,7 +312,7 @@ function _setupModuleController() { - $this->_mControllerState->setupModuleController($this); + $this->_mStrategy->setupModuleController(); } function _processModuleController() @@ -574,26 +579,12 @@ session_start(); } - /** - * @deprecated - */ - function _setupRenderSystem() - { - // TODO remove this method. - } function executeHeader() { // // TODO Now, I done for working admin panel. // - $renderSystem =& $this->mRoot->getRenderSystem($this->mModuleController->getDependRenderSystem()); - - // TODO - $this->mRenderSystem =& $renderSystem; - - $this->mRenderSystem->prepare($this); - parent::executeHeader(); // @@ -615,14 +606,13 @@ $cacheSystem =& $this->mRoot->getCacheSystem(); $xoopsModule =& $this->mModuleController->getXoopsModule(); - $renderTarget=new Legacy_RenderTargetMain(); - if ($this->_isModuleCache($xoopsModule)) { $url = xoops_getenv('REQUEST_URI'); $cacheSystem->setResourceName($url); if ($cacheSystem->isCache($this->_getModuleCacheTime($xoopsModule))) { - $renderTarget =& new Legacy_RenderTargetMain(); + $renderSystem =& $this->mRoot->getRenderSystem($this->mModuleController->getDependRenderSystem()); + $renderTarget =& $renderSystem->createRenderTarget(XCUBE_RENDER_TARGET_TYPE_MAIN); $renderTarget->setResult($cacheSystem->load()); $this->_executeViewTheme($renderTarget); @@ -632,8 +622,6 @@ } ob_start(); - - $this->mRenderSystem->setRenderTarget($renderTarget); } /** @@ -663,44 +651,47 @@ function executeView() { + $renderSystem =& $this->mRoot->getRenderSystem($this->mModuleController->getDependRenderSystem()); + $renderTarget =& $this->mModuleController->getRenderTarget(); + // // Buffering handling of standard output for main render target is responsibility // of a controller. Of course all controllers do not have to implement this. // The following lines are movement for compatibility and the feature of // this controller. // - if(!$this->mRenderSystem->mTemplateName) - $this->mRenderSystem->mTemplateName = isset($GLOBALS['xoopsOption']['template_main']) ? $GLOBALS['xoopsOption']['template_main'] : null; - $renderTarget=&$this->mRenderSystem->getRenderTarget(); // require_once XOOPS_ROOT_PATH . '/include/notification_select.php'; // Wmm... - if($renderTarget->getTemplateName()==null) { - $renderTarget->setTemplateName($this->mRenderSystem->mTemplateName); - if ($this->mModuleController->isModuleProcess()) { - $renderTarget->setModuleName($this->mModuleController->getDirname()); + if (is_object($renderTarget)) { + if ($renderTarget->getTemplateName() == null) { + if (isset($GLOBALS['xoopsOption']['template_main'])) { + $renderTarget->setTemplateName($GLOBALS['xoopsOption']['template_main']); + } } + + $renderTarget->setAttribute("stdout_buffer", ob_get_contents()); } - $renderTarget->setAttribute("stdout_buffer",ob_get_contents()); ob_end_clean(); -// $this->mRenderSystem->mRenderTarget->copyAttributes($mainRenderTarget); - - $this->mRenderSystem->renderWithTarget($renderTarget); + if (is_object($renderTarget)) { + $renderSystem->renderWithTarget($renderTarget); - // - // Cache Control - // - $xoopsModule =& $this->mModuleController->getXoopsModule(); - if ($this->_isModuleCache($xoopsModule)) { - $url = xoops_getenv('REQUEST_URI'); - $cacheSystem =& $this->mRoot->getCacheSystem(); - $cacheSystem->setResourceName($url); - $cacheSystem->save($renderTarget); + // + // Cache Control + // + $xoopsModule =& $this->mModuleController->getXoopsModule(); + if ($this->_isModuleCache($xoopsModule)) { + $url = xoops_getenv('REQUEST_URI'); + $cacheSystem =& $this->mRoot->getCacheSystem(); + $cacheSystem->setResourceName($url); + $cacheSystem->save($renderTarget); + } } + $this->_executeViewTheme($renderTarget); } @@ -714,12 +705,15 @@ // Theme Control // $screenTarget = $this->mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget(); - $screenTarget->setAttribute('xoops_contents', $resultRenderTarget->getResult()); + + if (is_object($resultRenderTarget)) { + $screenTarget->setAttribute('xoops_contents', $resultRenderTarget->getResult()); + } // // Get the render-system through theme object. // - $theme =& $this->_mControllerState->getMainThemeObject($this); + $theme =& $this->_mStrategy->getMainThemeObject(); $renderSystem =& $this->mRoot->getRenderSystem($theme->get('render_system')); $screenTarget->setTemplateName($theme->get('dirname')); @@ -863,20 +857,18 @@ * Because this method changes state after executeCommon, this resets now property. * It depends on XCube_Controller steps. * - * @param $state BaseControllerState* + * @param Legacy_AbstractControllerStrategy $strategy */ - function switchStateCompulsory($state) + function switchStateCompulsory($strategy) { - if($state->mStatusFlag != $this->_mControllerState->mStatusFlag) { - unset($this->mRenderSystem); - $this->_mControllerState=&$state; + if($state->mStatusFlag != $this->_mStrategy->mStatusFlag) { + $this->_mStrategy =& $strategy; // // The following line depends on XCube_Controller process of executeCommon. // But, There is no other method. // $this->_setupModuleController(); - $this->_setupRenderSystem(); $this->_processModuleController(); } } @@ -915,7 +907,7 @@ */ function &getVirtualCurrentModule() { - $ret =& $this->_mControllerState->getVirtualCurrentModule($this); + $ret =& $this->_mStrategy->getVirtualCurrentModule(); return $ret; } @@ -1040,9 +1032,19 @@ /** * @abstract */ -class BaseControllerState +class Legacy_AbstractControllerStrategy { + /** + * @var Legacy_Controller + */ + var $mController = null; + var $mStatusFlag; + + function Legacy_AbstractControllerStrategy(&$controller) + { + $this->mController =& $controller; + } /** * Create a instance of ModuleController, and set it to mModuleController @@ -1050,15 +1052,11 @@ * * @param $controller Legacy_Controller */ - function setupModuleController(&$controller) + function setupModuleController() { } - function setupRenderSystem(&$controller) - { - } - - function setupBlock(&$controller) + function setupBlock() { } @@ -1066,45 +1064,44 @@ * @return XoopsModule * @see Legacy_Controller::getVirtualCurrentModule() */ - function &getVirtualCurrentModule(&$controller) + function &getVirtualCurrentModule() { $ret = null; return $ret; } - function &getMainThemeObject(&$controller) + function &getMainThemeObject() { } } -class BaseControllerPublicState extends BaseControllerState +class Legacy_PublicControllerStrategy extends Legacy_AbstractControllerStrategy { - var $mStatusFlag=LEGACY_CONTROLLER_STATE_PUBLIC; + var $mStatusFlag = LEGACY_CONTROLLER_STATE_PUBLIC; - function BaseControllerPublicState() + function Legacy_PublicControllerStrategy(&$controller) { - @define("LEGACY_DEPENDENCE_RENDERER", "Legacy_RenderSystem"); + parent::Legacy_AbstractControllerStrategy($controller); + + if (!defined("LEGACY_DEPENDENCE_RENDERER")) { + define("LEGACY_DEPENDENCE_RENDERER", "Legacy_RenderSystem"); + } } - function setupModuleController(&$controller) + function setupModuleController() { require_once XOOPS_BASE_PATH . "/kernel/Legacy_ModuleController.class.php"; - $controller->mModuleController =& new Legacy_ModuleController($controller); + $this->mController->mModuleController =& new Legacy_ModuleController($this->mController); } - function setupRenderSystem(&$controller) - { - // TODO remove this method. - } - - function setupBlock(&$controller) + function setupBlock() { $showFlag =0; $mid=0; - if($controller->mModuleController->isModuleProcess()) { - $showFlag = (preg_match("/index\.php$/i", xoops_getenv('PHP_SELF')) && $controller->mConfig['startpage'] == $controller->mModuleController->mModuleObject->getVar('dirname')); - $mid = $controller->mModuleController->mModuleObject->getVar('mid'); + if($this->mController->mModuleController->isModuleProcess()) { + $showFlag = (preg_match("/index\.php$/i", xoops_getenv('PHP_SELF')) && $this->mController->mConfig['startpage'] == $this->mController->mModuleController->mModuleObject->getVar('dirname')); + $mid = $this->mController->mModuleController->mModuleObject->getVar('mid'); } else { // @@ -1117,31 +1114,31 @@ $showCenterFlag = (SHOW_CENTERBLOCK_LEFT | SHOW_CENTERBLOCK_CENTER | SHOW_CENTERBLOCK_RIGHT); $showRightFlag = SHOW_SIDEBLOCK_RIGHT; $showFlag = SHOW_SIDEBLOCK_LEFT | $showRightFlag | $showCenterFlag; - $groups = is_object($controller->mXoopsUser) ? $controller->mXoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS; + $groups = is_object($this->mController->mXoopsUser) ? $this->mController->mXoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS; $blockObjects=&$blockHandler->getBlocks($groups, $mid, $showFlag); foreach($blockObjects as $blockObject) { - $controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject); + $this->mController->mBlockChain[] =& new Legacy_AdaptBlockProcedure($blockObject); unset($blockObject); } } - function &getMainThemeObject(&$controller) + function &getMainThemeObject() { // [TODO] // Because get() of the virtual handler is heavy, we have to consider // the new solution about this process. // $handler =& xoops_getmodulehandler('theme', 'base'); - $theme =& $handler->get($controller->getMainTheme()); + $theme =& $handler->get($this->mController->getMainTheme()); return $theme; } } -class BaseControllerAdminState extends BaseControllerState +class Legacy_AdminControllerStrategy extends Legacy_AbstractControllerStrategy { - var $mStatusFlag=LEGACY_CONTROLLER_STATE_ADMIN; + var $mStatusFlag = LEGACY_CONTROLLER_STATE_ADMIN; /** * If this array includes current action, getVirtualCurrentModule() returns @@ -1151,47 +1148,38 @@ */ var $_mSpecialActions = array("Help", "CommentList"); - function BaseControllerAdminState() + function Legacy_AdminControllerStrategy(&$controller) { + parent::Legacy_AbstractControllerStrategy($controller); + // // TODO We have to develop complated-switching-controller-mechanizm. // - @define("LEGACY_DEPENDENCE_RENDERER", "Legacy_AdminRenderSystem"); + if (!defined("LEGACY_DEPENDENCE_RENDERER")) { + define("LEGACY_DEPENDENCE_RENDERER", "Legacy_AdminRenderSystem"); + } } - function setupModuleController(&$controller) + function setupModuleController() { require_once XOOPS_BASE_PATH . "/class/Legacy_AdminModuleController.class.php"; - $controller->mModuleController =& new Legacy_AdminModuleController($controller); + $this->mController->mModuleController =& new Legacy_AdminModuleController($this->mController); } - function setupRenderSystem(&$controller) + function setupBlock() { - // TODO remove this method. - - // - // [TODO] - // Controller or Root should have factory-method so that we create a - // instance by a site config. - // - $renderSystem =& $this->mRoot->getRenderSystem("Legacy_AdminRenderSystem"); - $controller->mRenderSystem->prepare(); - } - - function setupBlock(&$controller) - { - require_once XOOPS_BASE_PATH."/admin/blocks/AdminActionSearch.class.php"; - require_once XOOPS_BASE_PATH."/admin/blocks/AdminSideMenu.class.php"; - $controller->mBlockChain[] =& new Legacy_AdminActionSearch(); - $controller->mBlockChain[] =& new Legacy_AdminSideMenu(); + require_once XOOPS_BASE_PATH . "/admin/blocks/AdminActionSearch.class.php"; + require_once XOOPS_BASE_PATH . "/admin/blocks/AdminSideMenu.class.php"; + $this->mController->mBlockChain[] =& new Legacy_AdminActionSearch(); + $this->mController->mBlockChain[] =& new Legacy_AdminSideMenu(); } - function &getVirtualCurrentModule(&$controller) + function &getVirtualCurrentModule() { $module = null; - if ($controller->mModuleController->isModuleProcess()) { - $module =& $controller->mModuleController->getXoopsModule(); + if ($this->mController->mModuleController->isModuleProcess()) { + $module =& $this->mController->mModuleController->getXoopsModule(); if ($module->get('dirname') == "base" && isset($_REQUEST['dirname'])) { if (in_array(xoops_getrequest('action'), $this->_mSpecialActions)) { @@ -1204,7 +1192,7 @@ return $module; } - function &getMainThemeObject(&$controller) + function &getMainThemeObject() { $handler =& xoops_getmodulehandler('theme', 'base'); $theme =& $handler->create(); @@ -1212,7 +1200,7 @@ // // TODO Load manifesto here. // - $theme->set('dirname', $controller->mRoot->mSiteConfig['Legacy']['Theme']); + $theme->set('dirname', $this->mController->mRoot->mSiteConfig['Legacy']['Theme']); $theme->set('render_system', 'Legacy_AdminRenderSystem'); return $theme; From minahito @ users.sourceforge.jp Thu Aug 3 18:42:06 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:42:06 +0900 Subject: [xoops-cvslog 3906] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060803094207.01A7D2AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.7 xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.8 --- xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.7 Wed Jul 26 11:54:44 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php Thu Aug 3 18:42:06 2006 @@ -1,45 +1,36 @@ // -// ------------------------------------------------------------------------ // -// 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 // -// ------------------------------------------------------------------------ // if (!defined('XOOPS_ROOT_PATH')) exit(); define("LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME", "./xoops_version.php"); +/** + * This class is the part of Legacy_Controller. Because that controller class + * is too large, this class has been separated. And, this class is the strategy + * at Legacy_Controller. + */ class Legacy_ModuleController { - var $mModuleObject; - + /** + * @var Legacy_Controller + */ var $mController; + var $mModuleObject; + var $mConfig; + /** + * The render buffer for this module. + * + * @var XCube_RenderTarget + */ + var $mRenderTarget = null; + function Legacy_ModuleController(&$controller) { $this->mController =& $controller; @@ -55,6 +46,11 @@ } } + function _isActiveCheck() + { + return true; + } + function prepare() { // Is this request module process? @@ -64,7 +60,7 @@ $this->_createModuleObject(); - if (!$this->isActive()) { + if (!$this->isActive() && $this->_isActiveCheck()) { return; } @@ -79,6 +75,13 @@ define('__XC_DIRNAME__', $this->mModuleObject->getVar('dirname')); } + + // + // Setup render buffer. + // + $renderSystem =& $this->mController->mRoot->getRenderSystem($this->getRenderSystemName()); + $this->mRenderTarget =& $renderSystem->createRenderTarget(XCUBE_RENDER_TARGET_TYPE_MAIN); + $this->mRenderTarget->setModuleName($this->mModuleObject->get('dirname')); } /** @@ -173,6 +176,19 @@ return $this->mModuleObject; } + function &getRenderTarget() + { + return $this->mRenderTarget; + } + + function getRenderSystemName() + { + return $this->getDependRenderSystem(); + } + + /** + * @deprecated + */ function getDependRenderSystem() { return "Legacy_RenderSystem"; From minahito @ users.sourceforge.jp Thu Aug 3 18:43:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:43:16 +0900 Subject: [xoops-cvslog 3907] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060803094316.137612AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php diff -u xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php:1.1.2.1 xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php:removed --- xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php:1.1.2.1 Wed Jul 26 19:55:07 2006 +++ xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php Thu Aug 3 18:43:16 2006 @@ -1,107 +0,0 @@ -setMode(LEGACY_FRAME_MODE_NOTIFY); - $moduleRunner->setActionName($actionName); - - $root->mController->setActionStrategy($moduleRunner); - - $root->mController->executeAction(); - - $root->mController->executeView(); - } - - /** - * This functions is add to 'Legacyfunction.Notificatins.Select'. - * - * @param XCube_RenderBuffer $render - */ - function notifications_select(&$render) - { - require_once XOOPS_ROOT_PATH . '/include/notification_constants.php'; - require_once XOOPS_ROOT_PATH . '/include/notification_functions.php'; - - $root =& XCube_Root::getSingleton(); - $xoopsModule =& $root->mController->mModuleController->mModuleObject; - $moduleConfig =& $root->mController->mModuleController->mConfig; - $xoopsUser =& $root->mController->getXoopsUser(); - - $xoops_notification = array(); - $xoops_notification['show'] = is_object($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0; - - if ($xoops_notification['show']) { - $root->mLanguageManager->loadPageTypeMessageCatalog('notification'); - $categories =& notificationSubscribableCategoryInfo(); - $event_count = 0; - if (!empty($categories)) { - $notification_handler =& xoops_gethandler('notification'); - foreach ($categories as $category) { - $section['name'] = $category['name']; - $section['title'] = $category['title']; - $section['description'] = $category['description']; - $section['itemid'] = $category['item_id']; - $section['events'] = array(); - $subscribed_events =& $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoopsModule->get('mid'), $xoopsUser->get('uid')); - foreach (notificationEvents($category['name'], true) as $event) { - if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) { - continue; - } - if (!empty($event['invisible'])) { - continue; - } - $subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0; - $section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed); - $event_count ++; - } - $xoops_notification['categories'][$category['name']] = $section; - } - $xoops_notification['target_page'] = "notification_update.php"; - $xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF'); - $render->setAttribute('editprofile_url', XOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid')); - switch ($xoopsUser->getVar('notify_method')) { - case XOOPS_NOTIFICATION_METHOD_DISABLE: - $render->setAttribute('user_method', _NOT_DISABLE); - break; - case XOOPS_NOTIFICATION_METHOD_PM: - $render->setAttribute('user_method', _NOT_PM); - break; - case XOOPS_NOTIFICATION_METHOD_EMAIL: - $render->setAttribute('user_method', _NOT_EMAIL); - break; - } - } else { - $xoops_notification['show'] = 0; - } - if ($event_count == 0) { - $xoops_notification['show'] = 0; - } - } - - $render->setAttribute('xoops_notification', $xoops_notification); - } -} - -?> \ No newline at end of file Index: xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php diff -u xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.5 xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:removed --- xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php:1.1.2.5 Thu May 25 18:32:27 2006 +++ xoops2jp/html/modules/base/kernel/MiscEventFunctions.class.php Thu Aug 3 18:43:16 2006 @@ -1,29 +0,0 @@ -setActionName($actionName); - - $controller->setActionStrategy($moduleRunner); - - $controller->setDialogMode(true); - - $controller->executeAction(); - - $controller->executeView(); - } -} - -?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 3 18:43:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:43:39 +0900 Subject: [xoops-cvslog 3908] CVS update: xoops2jp/html/modules/base/templates Message-ID: <20060803094339.B432B2AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/base/templates/legacy_misc_smilies.html diff -u xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.5 --- xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.4 Thu Apr 13 00:11:20 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_smilies.html Thu Aug 3 18:43:39 2006 @@ -18,10 +18,10 @@
    <{$obj->getVar('code')}><{$obj->getVar('emotion')}><{$obj->getShow('code')}><{$obj->getShow('emotion')}> - ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('smile_url')}>' alt='<{$obj->getVar('emotion')}>' title='<{$obj->getVar('emotion')}>' /> + ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('smile_url')}>' alt='<{$obj->getShow('emotion')}>' title='<{$obj->getShow('emotion')}>' />
    <{$smarty.const._SR_SEARCHIN}> "> <{foreach item=module from=$moduleArr}> - getVar('mid'), $selectedMidArr)}>checked<{/if}>><{$module->getVar('name')}> + getShow('mid'), $selectedMidArr)}>checked<{/if}>><{$module->getShow('name')}> <{/foreach}>
    <{$smarty.const._MD_BASE_LANG_COM_ICON}> "> <{foreach item=icon from=$subjectIcons}> - <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('filename')}> + <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('filename')}> <{/foreach}>
    <{if $obj->get('uid')}> - <{$obj->getVar('uname')}> + <{$obj->getShow('uname')}> <{else}> <{$smarty.const._MD_BASE_LANG_GUEST}> <{/if}> <{if $obj->mModule}> - <{$obj->mModule->getVar('name')}> + <{$obj->mModule->getShow('name')}> <{else}> --- <{/if}> <{if $xoops_isadmin}> - <{$obj->getVar('online_ip')}> + <{$obj->getShow('online_ip')}> <{/if}>
    @@ -38,26 +38,26 @@ <{foreach item=obj from=$objects}> - + - + From minahito @ users.sourceforge.jp Thu Aug 3 18:46:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:46:12 +0900 Subject: [xoops-cvslog 3909] CVS update: xoops2jp/html/modules/legacyRender/class Message-ID: <20060803094612.0C1EB2AC713@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6 --- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.5 Mon Jul 10 20:02:25 2006 +++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php Thu Aug 3 18:46:11 2006 @@ -87,27 +87,27 @@ switch($viewStatus) { case LEGACYRENDER_FRAME_VIEW_SUCCESS: - $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACYRENDER_FRAME_VIEW_ERROR: - $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACYRENDER_FRAME_VIEW_INDEX: - $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACYRENDER_FRAME_VIEW_INPUT: - $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACYRENDER_FRAME_VIEW_PREVIEW: - $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case LEGACYRENDER_FRAME_VIEW_CANCEL: - $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; } } From minahito @ users.sourceforge.jp Thu Aug 3 18:48:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:48:01 +0900 Subject: [xoops-cvslog 3910] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060803094801.E41A22AC705@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.19 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.20 --- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.19 Wed Jul 26 19:56:35 2006 +++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Thu Aug 3 18:48:01 2006 @@ -1,6 +1,6 @@ getType()) { + switch ($target->getType()) { case XCUBE_RENDER_TARGET_TYPE_BLOCK: $this->renderTheme($target); break; @@ -225,8 +225,8 @@ // // Assign from attributes of the render-target. // - foreach($target->getAttributes() as $key=>$value) { - $this->mXoopsTpl->assign($key,$value); + foreach($target->getAttributes() as $key => $value) { + $this->mXoopsTpl->assign($key, $value); } // @@ -263,9 +263,9 @@ foreach($assignNameMap as $key=>$val) { $this->mXoopsTpl->assign($val['showflag'],$this->_getBlockShowFlag($val['showflag'])); - if(isset($this->mBlockContents[$key])) { - foreach($this->mBlockContents[$key] as $result) { - $this->mXoopsTpl->append($val['block'],$result); + if(isset($this->mController->mBlockContents[$key])) { + foreach($this->mController->mBlockContents[$key] as $result) { + $this->mXoopsTpl->append($val['block'], $result['content']); } } } @@ -290,17 +290,17 @@ switch($area) { case 'xoops_showrblock' : if (isset($GLOBALS['show_rblock']) && empty($GLOBALS['show_rblock'])) return 0; - return (!empty($this->mBlockShowFlags[XOOPS_SIDEBLOCK_RIGHT])) ? 1 : 0; + return (!empty($this->mController->mBlockShowFlags[XOOPS_SIDEBLOCK_RIGHT])) ? 1 : 0; break; case 'xoops_showlblock' : if (isset($GLOBALS['show_lblock']) && empty($GLOBALS['show_lblock'])) return 0; - return (!empty($this->mBlockShowFlags[XOOPS_SIDEBLOCK_LEFT])) ? 1 : 0; + return (!empty($this->mController->mBlockShowFlags[XOOPS_SIDEBLOCK_LEFT])) ? 1 : 0; break; case 'xoops_showcblock' : if (isset($GLOBALS['show_cblock']) && empty($GLOBALS['show_cblock'])) return 0; - return (!empty($this->mBlockShowFlags[XOOPS_CENTERBLOCK_LEFT])|| - !empty($this->mBlockShowFlags[XOOPS_CENTERBLOCK_RIGHT])|| - !empty($this->mBlockShowFlags[XOOPS_CENTERBLOCK_CENTER])) ? 1 : 0; + return (!empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_LEFT])|| + !empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_RIGHT])|| + !empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_CENTER])) ? 1 : 0; break; default : return 0; @@ -392,6 +392,23 @@ { $this->_renderFooter(); } + + function &createRenderTarget($type = XCUBE_RENDER_TARGET_TYPE_MAIN) + { + $renderTarget = null; + switch ($type) { + case XCUBE_RENDER_TARGET_TYPE_MAIN: + $renderTarget =& new Legacy_RenderTargetMain(); + break; + + default: + $renderTarget =& new XCube_RenderTarget(); + $renderTarget->setType($type); + break; + } + + return $renderTarget; + } } function LegacyRender_smartyfunction_notifications_select($params, &$smarty) From minahito @ users.sourceforge.jp Thu Aug 3 18:48:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 3 Aug 2006 18:48:49 +0900 Subject: [xoops-cvslog 3911] CVS update: xoops2jp/html/modules/pm/class Message-ID: <20060803094849.0F8E22AC4A7@users.sourceforge.jp> Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.3 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.4 --- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.3 Mon Jul 31 19:40:36 2006 +++ xoops2jp/html/modules/pm/class/ActionFrame.class.php Thu Aug 3 18:48:49 2006 @@ -1,7 +1,7 @@ mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case PM_FRAME_VIEW_ERROR: - $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case PM_FRAME_VIEW_INDEX: - $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case PM_FRAME_VIEW_INPUT: - $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case PM_FRAME_VIEW_PREVIEW: - $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case PM_FRAME_VIEW_CANCEL: - $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; } } From nobunobu @ users.sourceforge.jp Thu Aug 3 23:05:41 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 3 Aug 2006 23:05:41 +0900 Subject: [xoops-cvslog 3912] CVS update: xoops2jp/html/modules/legacyRender/class Message-ID: <20060803140542.022FA2AC71C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/class/theme.php diff -u xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.4 xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5 --- xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.4 Tue Mar 28 22:30:48 2006 +++ xoops2jp/html/modules/legacyRender/class/theme.php Thu Aug 3 23:05:41 2006 @@ -79,7 +79,7 @@ // // If this system can use this theme, add this to list. // - if(isset($manifesto['Manifesto']) && isset($manifesto['Manifesto']['Depends']) && $manifesto['Manifesto']['Depends'] == "Legacy_RenderSystem") { + if(isset($manifesto['Manifesto']) && isset($manifesto['Manifesto']['Depends']) && preg_match('/Legacy_RenderSystem(\s|,|$)/', $manifesto['Manifesto']['Depends'])) { $themeList[]=$dir; } } From nobunobu @ users.sourceforge.jp Thu Aug 3 23:29:20 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 3 Aug 2006 23:29:20 +0900 Subject: [xoops-cvslog 3913] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060803142920.C83672AC0AA@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.20 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.21 --- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.20 Thu Aug 3 18:48:01 2006 +++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Thu Aug 3 23:29:20 2006 @@ -1,6 +1,6 @@ mXoopsTpl->assign($val['showflag'],$this->_getBlockShowFlag($val['showflag'])); if(isset($this->mController->mBlockContents[$key])) { foreach($this->mController->mBlockContents[$key] as $result) { - $this->mXoopsTpl->append($val['block'], $result['content']); + $this->mXoopsTpl->append($val['block'], $result); } } } From nobunobu @ users.sourceforge.jp Thu Aug 3 23:48:58 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 3 Aug 2006 23:48:58 +0900 Subject: [xoops-cvslog 3914] CVS update: xoops2jp/html/kernel Message-ID: <20060803144858.6A2B22AC6E3@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Theme.class.php diff -u xoops2jp/html/kernel/XCube_Theme.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_Theme.class.php:1.1.2.2 --- xoops2jp/html/kernel/XCube_Theme.class.php:1.1.2.1 Wed Aug 2 18:34:46 2006 +++ xoops2jp/html/kernel/XCube_Theme.class.php Thu Aug 3 23:48:58 2006 @@ -26,6 +26,8 @@ */ var $mDepends = array(); + var $mVersion = null; + var $mUrl = null; /** From minahito @ users.sourceforge.jp Fri Aug 4 11:12:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 11:12:54 +0900 Subject: [xoops-cvslog 3915] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060804021254.248362AC789@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/ActionFrame.class.php diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.8 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9 --- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.8 Thu Jul 13 19:54:03 2006 +++ xoops2jp/html/modules/user/class/ActionFrame.class.php Fri Aug 4 11:12:53 2006 @@ -91,27 +91,27 @@ switch($viewStatus) { case USER_FRAME_VIEW_SUCCESS: - $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case USER_FRAME_VIEW_ERROR: - $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case USER_FRAME_VIEW_INDEX: - $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case USER_FRAME_VIEW_INPUT: - $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case USER_FRAME_VIEW_PREVIEW: - $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; case USER_FRAME_VIEW_CANCEL: - $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem); + $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget); break; } } From minahito @ users.sourceforge.jp Fri Aug 4 13:32:24 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:32:24 +0900 Subject: [xoops-cvslog 3916] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060804043224.6CF022AC7A4@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/BackendAction.class.php diff -u xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.5 xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.6 --- xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.5 Mon Jul 31 19:04:53 2006 +++ xoops2jp/html/modules/base/actions/BackendAction.class.php Fri Aug 4 13:32:24 2006 @@ -93,7 +93,8 @@ // // Rendering // - $controller->mRenderSystem->renderWithTarget($renderTarget); + $renderSystem =& $controller->mRoot->getRenderSystem('Legacy_RenderSystem'); + $renderSystem->renderWithTarget($renderTarget); if (function_exists('mb_http_output')) { mb_http_output('pass'); From minahito @ users.sourceforge.jp Fri Aug 4 13:33:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:33:01 +0900 Subject: [xoops-cvslog 3917] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060804043301.A950F2AC7A1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.7 Tue Aug 1 19:34:48 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php Fri Aug 4 13:33:01 2006 @@ -1,7 +1,7 @@ mFilter =& new Legacy_ModuleListFilterForm(); + $this->mFilter =& new Legacy_ModuleListFilterForm($this->mNavi); $this->mFilter->fetch(); $moduleHandler =& xoops_gethandler('module'); From minahito @ users.sourceforge.jp Fri Aug 4 13:34:43 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:34:43 +0900 Subject: [xoops-cvslog 3918] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060804043444.00D682AC7A1@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.17 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.18 --- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.17 Thu Aug 3 18:36:06 2006 +++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php Fri Aug 4 13:34:43 2006 @@ -1,7 +1,7 @@ _getDirname(); - $moduleHandler=&xoops_gethandler('module'); + if ($dirname == null) { + $dirname = $this->_getDirname(); + } + + $moduleHandler =& xoops_gethandler('module'); // // When user accesses to root/admin.php, $dirname is null. // - $module=null; - if($dirname!=null) { + $module = null; + if($dirname != null) { $module=&$moduleHandler->getByDirname($dirname); } else { - $module=&$moduleHandler->getByDirname("base"); + $module =& $moduleHandler->getByDirname("base"); } // @@ -95,7 +98,7 @@ // $GLOBALS['xoopsModule']=&$module; - $dmy=&$module->getInfo(); + $dmy =& $module->getInfo(); // // Load admin menu, and add preference menu by own judge. @@ -105,12 +108,12 @@ || ($module->getInfo('config') && is_array($module->getInfo('config'))) || ($module->getInfo('comments') && is_array($module->getInfo('comments')))) { $module->adminmenu[] = array( - 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id='.$module->getVar('mid'), + 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getVar('mid'), 'title' => _PREFERENCES, 'absolute' => true); } - $this->mModuleObject=&$module; + $this->mModuleObject =& $module; } From minahito @ users.sourceforge.jp Fri Aug 4 13:35:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:35:01 +0900 Subject: [xoops-cvslog 3919] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060804043501.39C862AC7A1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/online.php diff -u xoops2jp/html/modules/base/class/online.php:1.1.2.2 xoops2jp/html/modules/base/class/online.php:1.1.2.3 --- xoops2jp/html/modules/base/class/online.php:1.1.2.2 Tue Mar 28 22:29:44 2006 +++ xoops2jp/html/modules/base/class/online.php Fri Aug 4 13:35:01 2006 @@ -18,7 +18,7 @@ function loadModule() { if ($this->get('online_module')) { - $handler =& xoops_gethandler('modules'); + $handler =& xoops_gethandler('module'); $this->mModule =& $handler->get($this->get('online_module')); } } From minahito @ users.sourceforge.jp Fri Aug 4 13:35:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:35:25 +0900 Subject: [xoops-cvslog 3920] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060804043525.5D26D2AC7A1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.8 xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.9 --- xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.8 Thu Aug 3 18:42:06 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php Fri Aug 4 13:35:25 2006 @@ -1,7 +1,7 @@ _createModuleObject(); + // + // Set up module object + // + $this->setupModuleObject($this->_getDirName()); - if (!$this->isActive() && $this->_isActiveCheck()) { + if ($this->_isActiveCheck() && !$this->isActive()) { return; } // - // Set config values for this module + // Setup render buffer. // - 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')); + $this->setupRenderTarget(); + } + + /** + * Create an object of the specified module, and set it to member property + * $mModuleObject. And load the config of the module, too. + * + * This member function is useful in the case that active module and + * current module are different. + * + * @param string $dirname + * @see prepare() + * @see setupRenderTarget() + */ + function setupModuleObject($dirname) + { + $handler =& xoops_gethandler('module'); + $this->mModuleObject =& $handler->getByDirname($dirname); + + if ($this->mModuleObject != null) { + if ($this->mModuleObject->get('hasconfig') == 1 || $this->mModuleObject->get('hascomments') == 1) { + $configHandler =& xoops_gethandler('config'); + $this->mConfig =& $configHandler->getConfigsByCat(0, $this->mModuleObject->get('mid')); } - - define('__XC_DIRNAME__', $this->mModuleObject->getVar('dirname')); } - - // - // Setup render buffer. - // + } + + /** + * Create an object of the render-target, and set it to member property + * $mRenderTarget. If $dirname is empty, fetch dirname from current module + * object and use it. + * + * This member function is useful to regenerate the render-target. For + * example, if active module and current module are different, the active + * module needs regenerating the render-target. + * + * @param string $dirname + * @see prepare() + */ + function setupRenderTarget($dirname = null) + { $renderSystem =& $this->mController->mRoot->getRenderSystem($this->getRenderSystemName()); $this->mRenderTarget =& $renderSystem->createRenderTarget(XCUBE_RENDER_TARGET_TYPE_MAIN); - $this->mRenderTarget->setModuleName($this->mModuleObject->get('dirname')); + if ($dirname == null) { + if (is_object($this->mModuleObject)) { + $this->mRenderTarget->setModuleName($this->mModuleObject->get('dirname')); + } + } + else { + $this->mRenderTarget->setModuleName($dirname); + } } /** @@ -142,10 +181,15 @@ return (isset($url_arr[2])) ? $url_arr[2] : null; } - function setupLanguage() + function setupLanguage($dirname = null) { - $languageManager=&$this->mController->mRoot->getLanguageManager(); - $languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname')); + $languageManager =& $this->mController->mRoot->getLanguageManager(); + if ($dirname == null) { + $languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname')); + } + else { + $languageManager->loadModuleMessageCatalog($dirname); + } } function _processErrorModuleNotExist() From minahito @ users.sourceforge.jp Fri Aug 4 13:36:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:36:39 +0900 Subject: [xoops-cvslog 3921] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060804043639.BEF932AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.9 xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.10 --- xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.9 Fri Jul 28 17:58:27 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php Fri Aug 4 13:36:39 2006 @@ -1,7 +1,7 @@ mController->mModuleController->setupModuleObject('base'); + $root->mController->mModuleController->setupRenderTarget(); $moduleRunner =& new Legacy_ActionFrame(false); @@ -32,6 +34,8 @@ require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php"; $root =& XCube_Root::getSingleton(); + $root->mController->mModuleController->setupModuleObject('base'); + $root->mController->mModuleController->setupRenderTarget(); $moduleRunner =& new Legacy_ActionFrame(false); $moduleRunner->setActionName('Backend'); @@ -48,6 +52,8 @@ require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php"; $root =& XCube_Root::getSingleton(); + $root->mController->mModuleController->setupModuleObject('base'); + $root->mController->mModuleController->setupRenderTarget(); $moduleRunner =& new Legacy_ActionFrame(false); $moduleRunner->setMode(LEGACY_FRAME_MODE_SEARCH); @@ -66,6 +72,8 @@ require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php"; $root =& XCube_Root::getSingleton(); + $root->mController->mModuleController->setupModuleObject('base'); + $root->mController->mModuleController->setupRenderTarget(); $actionName = isset($_REQUEST['type']) ? ucfirst(xoops_getrequest('type')) : "Smilies"; @@ -87,6 +95,8 @@ require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php"; $root =& XCube_Root::getSingleton(); + $root->mController->mModuleController->setupModuleObject('base'); + $root->mController->mModuleController->setupRenderTarget(); // // 'Notify' is prefix to guard accessing from misc.php. From minahito @ users.sourceforge.jp Fri Aug 4 13:36:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:36:56 +0900 Subject: [xoops-cvslog 3922] CVS update: xoops2jp/html/modules/base/service Message-ID: <20060804043656.9F62A2AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/service/LegacySearchService.class.php diff -u xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.5 xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.6 --- xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.5 Thu Jul 27 18:35:08 2006 +++ xoops2jp/html/modules/base/service/LegacySearchService.class.php Fri Aug 4 13:36:56 2006 @@ -63,7 +63,7 @@ continue; } - $results =& $module->search($queries, $andor, $maxhit, $start, $uid); + $results =& $module->search($queries, $andor, $max_hit, $start, $uid); $ret[$i]['mid'] = $mid; $ret[$i]['name'] = $module->get('name'); @@ -91,7 +91,7 @@ $ret[$i]['results'][] = $item; } - $ret[$i]['has_more'] = (count($results) == $maxhit); + $ret[$i]['has_more'] = (count($results) == $max_hit); } else { $ret[$i]['results'] = array(); From minahito @ users.sourceforge.jp Fri Aug 4 13:37:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:37:08 +0900 Subject: [xoops-cvslog 3923] CVS update: xoops2jp/html/modules/base/templates Message-ID: <20060804043708.93E7E2AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/templates/legacy_image_upload.html diff -u xoops2jp/html/modules/base/templates/legacy_image_upload.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_image_upload.html:1.1.2.5 --- xoops2jp/html/modules/base/templates/legacy_image_upload.html:1.1.2.4 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/base/templates/legacy_image_upload.html Fri Aug 4 13:37:08 2006 @@ -8,7 +8,7 @@ <{/if}> - + <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=imgcat_id value=$actionForm->get('imgcat_id')}> <{xoops_input type=hidden name=target value=$target}> From minahito @ users.sourceforge.jp Fri Aug 4 13:38:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:38:30 +0900 Subject: [xoops-cvslog 3924] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060804043830.CD7AD2AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.6 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.7 --- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.6 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php Fri Aug 4 13:38:30 2006 @@ -1,7 +1,7 @@ mObject == null) { + return USER_FRAME_VIEW_ERROR; + } + + $this->mActionForm->load($this->mObject); + + $this->mActionForm->fetch(); + $this->mActionForm->validate(); + + if($this->mActionForm->hasError()) { + return $this->getDefaultView($controller, $xoopsUser); + } + + $this->mActionForm->update($this->mObject); + + return $this->_doExecute($this->mObject) ? USER_FRAME_VIEW_SUCCESS + : USER_FRAME_VIEW_ERROR; + } + /** * 1) Save avatar file which has been uploaded. * 2) If old avatar file exists, remove it. From minahito @ users.sourceforge.jp Fri Aug 4 13:38:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:38:45 +0900 Subject: [xoops-cvslog 3925] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060804043845.0E3072AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.6 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.7 --- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.6 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php Fri Aug 4 13:38:44 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.5 --- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.4 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/LostPassAction.class.php Fri Aug 4 13:39:10 2006 @@ -1,7 +1,7 @@ executeRedirect(XOOPS_URL, 3, _MD_MESSAGE_SEND_PASSWORD); + $controller->executeRedirect(XOOPS_URL, 3, _MD_USER_MESSAGE_SEND_PASSWORD); } function executeViewError(&$controller, &$xoopsUser, &$render) { - $controller->executeRedirect(XOOPS_URL, 3, _MD_ERROR_SEND_MAIL); + $controller->executeRedirect(XOOPS_URL, 3, _MD_USER_ERROR_SEND_MAIL); } } From minahito @ users.sourceforge.jp Fri Aug 4 13:39:31 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:39:31 +0900 Subject: [xoops-cvslog 3927] CVS update: xoops2jp/html/modules/user/admin/forms Message-ID: <20060804043931.36F702AC7A3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.3 Thu Jul 13 19:48:57 2006 +++ xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php Fri Aug 4 13:39:31 2006 @@ -1,7 +1,7 @@ mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0; - if (!isset($this->mSortKeys[abs($this->mSort)]) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = AVATAR_SORT_KEY_DEFAULT; } From minahito @ users.sourceforge.jp Fri Aug 4 13:39:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:39:40 +0900 Subject: [xoops-cvslog 3928] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060804043940.CCAC22AC7A4@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.13 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.14 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.13 Wed Jul 19 19:22:35 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Fri Aug 4 13:39:40 2006 @@ -46,7 +46,7 @@ define('_MD_USER_LANG_UNAME', "ユーザー名"); define('_MD_USER_LANG_URL', "URL"); define('_MD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか?"); -define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password"); +define('_MD_USER_MESSAGE_SEND_PASSWORD', "メールを送信しました"); define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。"); define('_US_ACTKEYNOT', "承認キーが間違っています。"); define('_US_ACTLOGIN', "アカウントを承認しました。登録の際に記入したパスワードを使用してログインしてください。"); From minahito @ users.sourceforge.jp Fri Aug 4 13:39:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 13:39:54 +0900 Subject: [xoops-cvslog 3929] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060804043954.965962AC7A4@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.8 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.9 --- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.8 Wed Jul 19 19:21:40 2006 +++ xoops2jp/html/modules/user/templates/user_avatar_edit.html Fri Aug 4 13:39:54 2006 @@ -1,5 +1,5 @@
    -<{$smarty.const._US_PROFILE}> +<{$smarty.const._US_PROFILE}>  »» <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
    From minahito @ users.sourceforge.jp Fri Aug 4 19:32:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:32:12 +0900 Subject: [xoops-cvslog 3930] CVS update: xoops2jp/html/include Message-ID: <20060804103212.AABE42AC0BB@users.sourceforge.jp> Index: xoops2jp/html/include/cp_functions.php diff -u xoops2jp/html/include/cp_functions.php:1.2.8.2 xoops2jp/html/include/cp_functions.php:1.2.8.3 --- xoops2jp/html/include/cp_functions.php:1.2.8.2 Wed Nov 16 01:39:03 2005 +++ xoops2jp/html/include/cp_functions.php Fri Aug 4 19:32:12 2006 @@ -1,5 +1,5 @@ mController->switchStateCompulsory(new BaseControllerAdminState()); + $strategy =& new Legacy_AdminControllerStrategy($root->mController); + $root->mController->setStrategy($strategy); require_once XOOPS_ROOT_PATH."/header.php"; } Index: xoops2jp/html/include/cp_header.php diff -u xoops2jp/html/include/cp_header.php:1.2.8.3 xoops2jp/html/include/cp_header.php:1.2.8.4 --- xoops2jp/html/include/cp_header.php:1.2.8.3 Mon Nov 21 01:27:29 2005 +++ xoops2jp/html/include/cp_header.php Fri Aug 4 19:32:12 2006 @@ -1,5 +1,5 @@ mController->switchStateCompulsory(new BaseControllerAdminState()); - +$strategy =& new Legacy_AdminControllerStrategy($root->mController); +$root->mController->setStrategy($strategy); ?> \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 4 19:32:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:32:55 +0900 Subject: [xoops-cvslog 3931] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060804103255.10BE72AC7B1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/smiles.php diff -u xoops2jp/html/modules/base/class/smiles.php:1.1.2.2 xoops2jp/html/modules/base/class/smiles.php:1.1.2.3 --- xoops2jp/html/modules/base/class/smiles.php:1.1.2.2 Tue Mar 28 22:29:44 2006 +++ xoops2jp/html/modules/base/class/smiles.php Fri Aug 4 19:32:54 2006 @@ -24,7 +24,7 @@ { @unlink(XOOPS_UPLOAD_PATH . "/" . $obj->get('smile_url')); - parent::delete($obj); + return parent::delete($obj); } } From minahito @ users.sourceforge.jp Fri Aug 4 19:33:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:33:07 +0900 Subject: [xoops-cvslog 3932] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060804103307.5E78D2AC7B1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.5 --- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.4 Tue Aug 1 19:41:48 2006 +++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Fri Aug 4 19:33:07 2006 @@ -15,7 +15,7 @@ class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm { - var $_mSortKeys = array( + var $mSortKeys = array( SMILES_SORT_KEY_ID => 'id', SMILES_SORT_KEY_CODE => 'code', SMILES_SORT_KEY_SMILE_URL => 'smile_url', @@ -27,23 +27,27 @@ { $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : SMILES_SORT_KEY_DEFAULT; - if (!isset($this->_mSortKeys[abs($this->mSort)])) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = SMILES_SORT_KEY_DEFAULT; } if (isset($_REQUEST['code'])) { + $this->_mNavi->addExtra('code', xoops_getrequest('code')); $this->_mCriteria->add(new Criteria('code', xoops_getrequest('code'))); } if (isset($_REQUEST['smile_url'])) { + $this->_mNavi->addExtra('smile_url', xoops_getrequest('smile_url')); $this->_mCriteria->add(new Criteria('smile_url', xoops_getrequest('smile_url'))); } if (isset($_REQUEST['emotion'])) { + $this->_mNavi->addExtra('emotion', xoops_getrequest('emotion')); $this->_mCriteria->add(new Criteria('emotion', xoops_getrequest('emotion'))); } if (isset($_REQUEST['display'])) { + $this->_mNavi->addExtra('display', xoops_getrequest('display')); $this->_mCriteria->add(new Criteria('display', xoops_getrequest('display'))); } From minahito @ users.sourceforge.jp Fri Aug 4 19:45:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:45:09 +0900 Subject: [xoops-cvslog 3933] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060804104509.DFF972AC0C9@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/image_edit.html diff -u xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.8 Tue Aug 1 19:43:38 2006 +++ xoops2jp/html/modules/base/admin/templates/image_edit.html Fri Aug 4 19:45:09 2006 @@ -1,7 +1,7 @@
    <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_IMAGE_MANAGE}> - »» <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> + »» <{$smarty.const._AD_BASE_LANG_IMAGE_LIST}> <{if $actionForm->get('image_id')}> »» <{$smarty.const._AD_BASE_LANG_IMAGE_EDIT}> <{else}> From minahito @ users.sourceforge.jp Fri Aug 4 19:54:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:54:45 +0900 Subject: [xoops-cvslog 3934] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060804105445.3EFB02AC0AE@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/imagebody.php diff -u xoops2jp/html/modules/base/class/imagebody.php:1.1.2.2 xoops2jp/html/modules/base/class/imagebody.php:1.1.2.3 --- xoops2jp/html/modules/base/class/imagebody.php:1.1.2.2 Tue May 30 12:55:26 2006 +++ xoops2jp/html/modules/base/class/imagebody.php Fri Aug 4 19:54:45 2006 @@ -4,31 +4,11 @@ class BaseImagebodyObject extends XoopsSimpleObject { - var $mImageBody = null; - var $_mImageBodyLoadedFlag = false; - function BaseImagebodyObject() { $this->initVar('image_id', XOBJ_DTYPE_INT, '', false); $this->initVar('image_body', XOBJ_DTYPE_TEXT, '', true); } - - function loadImagebody() - { - if ($this->_mImageBodyLoadedFlag == false) { - $handler =& xoops_getmodulehandler('imagebody', 'base'); - $this->mImageBody =& $handler->get($this->get('image_id')); - $this->_mImageBodyLoadedFlag = true; - } - } - - function &createImagebody() - { - $handler =& xoops_getmodulehandler('imagebody', 'base'); - $obj =& $handler->create(); - $obj->set('image_id', $this->get('image_id')); - return $obj; - } } class BaseImagebodyHandler extends XoopsObjectGenericHandler @@ -36,25 +16,6 @@ var $mTable = "imagebody"; var $mPrimary = "image_id"; var $mClass = "BaseImagebodyObject"; - - function insert(&$obj, $force = false) - { - if (!parent::insert($obj, $force)) { - print_r($this->db); - die(); - } - - return true; - } - - function delete(&$obj, $force = false) - { - $handler =& xoops_getmodulehandler('imagebody', 'base'); - $handler->delete($obj->get('image_id')); - unset($handler); - - return parent::delete($obj, $force); - } } ?> From minahito @ users.sourceforge.jp Fri Aug 4 19:55:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 19:55:01 +0900 Subject: [xoops-cvslog 3935] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060804105501.A35A42AC0AE@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/image.php diff -u xoops2jp/html/modules/base/class/image.php:1.1.2.4 xoops2jp/html/modules/base/class/image.php:1.1.2.5 --- xoops2jp/html/modules/base/class/image.php:1.1.2.4 Tue May 30 12:55:26 2006 +++ xoops2jp/html/modules/base/class/image.php Fri Aug 4 19:55:01 2006 @@ -79,14 +79,18 @@ */ function delete(&$obj, $force = false) { + $obj->loadImagebody(); + if (parent::delete($obj, $force)) { $filepath = XOOPS_UPLOAD_PATH . "/" . $obj->get('image_name'); if (file_exists($filepath)) { @unlink($filepath); } - $handler =& xoops_gethandler('imagebody', 'base'); - $handler->delete($this->get('image_id')); + if (is_object($obj->mImageBody)) { + $handler =& xoops_getmodulehandler('imagebody', 'base'); + $handler->delete($obj->mImageBody, $force); + } return true; } From minahito @ users.sourceforge.jp Fri Aug 4 20:43:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 20:43:56 +0900 Subject: [xoops-cvslog 3936] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060804114356.734892AC0AE@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.60 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.61 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.60 Thu Aug 3 18:40:27 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Aug 4 20:43:56 2006 @@ -1,7 +1,7 @@ setStrategy($strategy); + } + + /** * CAUTION!! * This method has a special mission. * Because this method changes state after executeCommon, this resets now property. @@ -859,9 +868,9 @@ * * @param Legacy_AbstractControllerStrategy $strategy */ - function switchStateCompulsory($strategy) + function setStrategy(&$strategy) { - if($state->mStatusFlag != $this->_mStrategy->mStatusFlag) { + if($strategy->mStatusFlag != $this->_mStrategy->mStatusFlag) { $this->_mStrategy =& $strategy; // From minahito @ users.sourceforge.jp Fri Aug 4 23:33:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 23:33:33 +0900 Subject: [xoops-cvslog 3937] CVS update: xoops2jp/html/modules/legacyRender/admin Message-ID: <20060804143333.51DCA2AC0D0@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/menu.php diff -u xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.5 --- xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.4 Mon Apr 24 16:30:55 2006 +++ xoops2jp/html/modules/legacyRender/admin/menu.php Fri Aug 4 23:33:33 2006 @@ -1,16 +1,16 @@ From minahito @ users.sourceforge.jp Fri Aug 4 23:34:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 4 Aug 2006 23:34:38 +0900 Subject: [xoops-cvslog 3938] CVS update: xoops2jp/html/modules/legacyRender/admin Message-ID: <20060804143438.5FDD42AC027@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/index.php diff -u xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.3 --- xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.2 Mon Jul 10 14:55:58 2006 +++ xoops2jp/html/modules/legacyRender/admin/index.php Fri Aug 4 23:34:38 2006 @@ -1,7 +1,7 @@ setActionName($actionName); From minahito @ users.sourceforge.jp Sat Aug 5 00:19:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 00:19:55 +0900 Subject: [xoops-cvslog 3939] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060804151955.4F2972AC0DD@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.9 --- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.8 Tue Jul 11 12:43:27 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html Sat Aug 5 00:19:55 2006 @@ -43,7 +43,7 @@ <{if $actionForm->get('htmlbanner')}> <{$actionForm->get('htmlcode')}> <{else}> - Banner + Banner <{/if}> From nobunobu @ users.sourceforge.jp Sat Aug 5 10:03:57 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sat, 5 Aug 2006 10:03:57 +0900 Subject: [xoops-cvslog 3940] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805010357.EAC742AC0EF@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.9 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.10 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.9 Mon Jul 31 19:38:40 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Sat Aug 5 10:03:57 2006 @@ -1,7 +1,7 @@ _processMail($controller); $this->_eventNotifyMail($controller); - XCube_DelegateUtils::call('Legacy.Event.ResgistUser.Success') + XCube_DelegateUtils::call('Legacy.Event.ResgistUser.Success'); return USER_FRAME_VIEW_SUCCESS; } From nobunobu @ users.sourceforge.jp Sat Aug 5 10:54:35 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sat, 5 Aug 2006 10:54:35 +0900 Subject: [xoops-cvslog 3941] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805015435.0CB1E2AC103@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.10 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.11 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.10 Sat Aug 5 10:03:57 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Sat Aug 5 10:54:34 2006 @@ -1,7 +1,7 @@ mConfig['new_user_notify'] == 1 && !empty($this->mConfig['new_user_notify_group'])) { - $director =& new User_UserRegistMailDirector($this->mNewUser, $controller->getConfig(), $this->mConfig); $builder =& new User_RegistUserNotifyMailBuilder(); - $director->contruct($builder); + $director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->getConfig(), $this->mConfig); + $director->contruct(); $mailer =& $builder->getResult(); $mailer->send(); } From nobunobu @ users.sourceforge.jp Sat Aug 5 10:54:48 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sat, 5 Aug 2006 10:54:48 +0900 Subject: [xoops-cvslog 3942] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805015448.E81932AC101@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.3 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php Sat Aug 5 10:54:48 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.11 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.12 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.11 Sat Aug 5 10:54:34 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Sat Aug 5 11:30:47 2006 @@ -1,7 +1,7 @@ _processMail($controller); $this->_eventNotifyMail($controller); - XCube_DelegateUtils::call('Legacy.Event.ResgistUser.Success'); + XCube_DelegateUtils::call('Legacy.Event.RegistUser.Success'); return USER_FRAME_VIEW_SUCCESS; } From minahito @ users.sourceforge.jp Sat Aug 5 15:16:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:16:55 +0900 Subject: [xoops-cvslog 3944] CVS update: xoops2jp/html/kernel Message-ID: <20060805061655.3EF792AC109@users.sourceforge.jp> Index: xoops2jp/html/kernel/groupperm.php diff -u xoops2jp/html/kernel/groupperm.php:1.2.8.2 xoops2jp/html/kernel/groupperm.php:1.2.8.3 --- xoops2jp/html/kernel/groupperm.php:1.2.8.2 Tue May 16 22:25:07 2006 +++ xoops2jp/html/kernel/groupperm.php Sat Aug 5 15:16:55 2006 @@ -1,5 +1,5 @@ setVar('gperm_modid', $gperm_modid); return $this->insert($perm); } + + /** + * Remove a permission + * + * @param string $gperm_name Name of permission + * @param int $gperm_itemid ID of an item + * @param int $gperm_groupid ID of a group + * @param int $gperm_modid ID of a module + * + * @return bool TRUE jf success + */ + function removeRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid = 1) + { + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('gperm_name', $gperm_name)); + $criteria->add(new Criteria('gperm_itemid', $gperm_itemid)); + $criteria->add(new Criteria('gperm_groupid', $gperm_groupid)); + $criteria->add(new Criteria('gperm_modid', $gperm_modid)); + + return $this->deleteAll($criteria); + } /** * Get all item IDs that a group is assigned a specific permission From minahito @ users.sourceforge.jp Sat Aug 5 15:17:41 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:17:41 +0900 Subject: [xoops-cvslog 3945] CVS update: xoops2jp/html/modules/base Message-ID: <20060805061741.A0D8D2AC10D@users.sourceforge.jp> Index: xoops2jp/html/modules/base/xoops_version.php diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.26 xoops2jp/html/modules/base/xoops_version.php:1.1.2.27 --- xoops2jp/html/modules/base/xoops_version.php:1.1.2.26 Wed Aug 2 18:35:56 2006 +++ xoops2jp/html/modules/base/xoops_version.php Sat Aug 5 15:17:41 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.11 --- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.10 Wed Aug 2 18:44:37 2006 +++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Sat Aug 5 15:18:02 2006 @@ -120,14 +120,8 @@ // // Make the list of theme. // - $themeArr = array(); - $dirHandler = opendir(XOOPS_THEME_PATH . "/"); - while ($file = readdir($dirHandler)) { - if (is_dir(XOOPS_THEME_PATH . "/" . $file) && preg_match("/^[a-z0-9_]+$/", $file) && file_exists(XOOPS_THEME_PATH . "/${file}/theme.html")) { - $themeArr[$file] = $file; - } - } - closedir($dirHandler); + $handler =& xoops_getmodulehandler('theme'); + $themeArr =& $handler->getObjects(); $render->setAttribute('themeArr', $themeArr); // From minahito @ users.sourceforge.jp Sat Aug 5 15:18:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:18:18 +0900 Subject: [xoops-cvslog 3947] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060805061818.BCD302AC109@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6 --- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.5 Fri Aug 4 19:33:07 2006 +++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Sat Aug 5 15:18:18 2006 @@ -10,7 +10,7 @@ define('SMILES_SORT_KEY_EMOTION', 4); define('SMILES_SORT_KEY_DISPLAY', 5); -define('SMILES_SORT_KEY_DEFAULT', SMILES_SORT_KEY_ID); +define('SMILES_SORT_KEY_DEFAULT', -SMILES_SORT_KEY_DISPLAY); define('SMILES_SORT_KEY_MAXVALUE', 5); class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm From minahito @ users.sourceforge.jp Sat Aug 5 15:18:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:18:40 +0900 Subject: [xoops-cvslog 3948] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060805061840.5212D2AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/image_list.html diff -u xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.8 Tue Aug 1 19:44:52 2006 +++ xoops2jp/html/modules/base/admin/templates/image_list.html Sat Aug 5 15:18:40 2006 @@ -15,9 +15,7 @@
    - + From minahito @ users.sourceforge.jp Sat Aug 5 15:19:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:19:00 +0900 Subject: [xoops-cvslog 3949] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060805061900.37FF02AC0FB@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.14 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.13 Wed Aug 2 18:37:27 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Sat Aug 5 15:19:00 2006 @@ -87,21 +87,13 @@ <{elseif $config->get('conf_formtype') == 'theme'}> <{elseif $config->get('conf_formtype') == 'theme_multi'}> From minahito @ users.sourceforge.jp Sat Aug 5 15:19:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:19:34 +0900 Subject: [xoops-cvslog 3950] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060805061934.0FBE32AC072@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.61 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.62 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.61 Fri Aug 4 20:43:56 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sat Aug 5 15:19:33 2006 @@ -1,7 +1,7 @@ getByDirname(xoops_getrequest('dirname')); } } + elseif ($module->get('dirname') == "base" && xoops_getrequest('action') == 'PreferenceEdit' && isset($_REQUEST['confmod_id'])) { + $handler =& xoops_gethandler('module'); + $module =& $handler->get(intval(xoops_getrequest('confmod_id'))); + } } return $module; From minahito @ users.sourceforge.jp Sat Aug 5 15:19:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:19:47 +0900 Subject: [xoops-cvslog 3951] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060805061947.CD7DE2AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.2 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.3 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.2 Wed Aug 2 18:42:18 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Sat Aug 5 15:19:47 2006 @@ -49,3 +49,12 @@
  • 旧来のシステムモジュールは、その機能が他の新しいモジュールへの移行が完了するまでのあいだそのまま残されています。移行が完了するまでの間、新しいモジュールとシステムモジュールの間で機能が重複する部分がありますがご了承下さい。
  • IISを利用した環境の場合、.sqlファイルを持つモジュールのインストールが上手く行かないケースがあります。IISを利用されている方からの動作状況の報告をお待ちしております。
  • + +

    Cube 2.1 Legacy alpha4 コアチーム ToDo

    +
      +
    • メインメニューがないモジュールも、優先度を決定できなれば、管理画面におけるサイドメニューの順番を制御できない。
    • +
    • モジュールをアップデートすると、そのモジュールに関する諸設定が失われてしまう。
    • +
    • モジュール管理に新型の SQL パーサを搭載できていない。現在の SQL パーサは若干のファイルで問題がある。
    • +
    • カスタムブロックにプレビュー機能がなく、実装されなくてはならない。
    • +
    • ユーザー検索において、前方一致や後方一致の指定ができなくなっている。
    • +
    From minahito @ users.sourceforge.jp Sat Aug 5 15:19:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:19:47 +0900 Subject: [xoops-cvslog 3952] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060805061947.F16FE2AC0FB@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.2 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.3 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.2 Wed Aug 2 18:42:18 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Sat Aug 5 15:19:47 2006 @@ -11,9 +11,9 @@
  • Please perform search when you need to know how to use the XOOPS Cube.
  • -

    インデックス

    +

    Index

    Module administration / installation

    @@ -48,3 +48,12 @@
  • Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)
  • Adding some disabled function in misc.php .
  • + +

    Cube 2.1 Legacy alpha4 Problems (ToDo) of the core team

    +
      +
    • The weight of any modules should be editable. Because, users can change order in the side menu of the control panel, by that.
    • +
    • When a module is updated in the module management, the configuration of that module is removed. Users hope to keep active configurations.
    • +
    • We haven't committed new type SQL parser class into this module. Current SQL parser in the module install feature often triggers errors in some SQL files.
    • +
    • The preview feature in custom blocks has to be implemented.
    • +
    • Users can't use forward-match and backward-match in the user search. These search options are available in XOOPS2.
    • +
    From minahito @ users.sourceforge.jp Sat Aug 5 15:19:57 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:19:57 +0900 Subject: [xoops-cvslog 3953] CVS update: xoops2jp/html/modules/base/templates Message-ID: <20060805061957.B53982AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/base/templates/legacy_misc_avatars.html diff -u xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:removed --- xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.4 Thu Apr 13 00:11:20 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_avatars.html Sat Aug 5 15:19:57 2006 @@ -1,30 +0,0 @@ - - -

    <{$smarty.const._MSC_AVAVATARS}>

    - -<{xoops_token form=$actionForm}> -
    <{$obj->getVar('image_nicename')}><{$obj->getShow('image_nicename')}> <{if $obj->mImageCategory != null}> <{if $obj->mImageCategory->get('imgcat_storetype') == 'file'}> - + <{else}> - + <{/if}> <{/if}> <{$obj->getVar('image_mimetype')}><{$obj->getShow('image_mimetype')}> <{if $obj->mImageCategory->get('imgcat_storetype') == 'file'}> - Left - Center - Left + Left + Center + Left <{else}> - Left - Center - Left + Left + Center + Left <{/if}>
    <{$smarty.const._AD_BASE_LANG_IMAGE_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_BASE_LANG_IMAGE_NAME}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_BASE_LANG_IMAGE_NAME}> <{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    - - <{foreach key=key item=avatar from=$avatarsList}> - - <{if $key && $key is div by 8}><{/if}> - <{/foreach}> - -
    - <{$avatar.avatarName}>
    - <{$avatar.avatarName}>
    - -
    - From minahito @ users.sourceforge.jp Sat Aug 5 15:20:19 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:20:19 +0900 Subject: [xoops-cvslog 3954] CVS update: xoops2jp/html/modules/legacyRender Message-ID: <20060805062019.DE7832AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/xoops_version.php diff -u xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.8 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.9 --- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.8 Mon May 22 15:50:36 2006 +++ xoops2jp/html/modules/legacyRender/xoops_version.php Sat Aug 5 15:20:19 2006 @@ -1,6 +1,6 @@ From minahito @ users.sourceforge.jp Sat Aug 5 15:21:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:21:05 +0900 Subject: [xoops-cvslog 3955] CVS update: xoops2jp/html/modules/legacyRender/admin/forms Message-ID: <20060805062105.47CA52AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.7 --- xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.6 Mon Jul 10 20:12:11 2006 +++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php Sat Aug 5 15:21:05 2006 @@ -26,9 +26,9 @@ function fetch() { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0; + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : TPLSET_SORT_KEY_DEFAULT; - if (!isset($this->mSort[abs($this->mSort)])) { + if (!isset($this->mSortKeys[abs($this->mSort)])) { $this->mSort = TPLSET_SORT_KEY_DEFAULT; } From minahito @ users.sourceforge.jp Sat Aug 5 15:21:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:21:35 +0900 Subject: [xoops-cvslog 3956] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060805062135.67FA52AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.14 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.15 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.14 Tue Jul 11 12:00:39 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html Sat Aug 5 15:21:35 2006 @@ -145,7 +145,6 @@ <{elseif $obj->mOverride == null && $targetTplset != null && $targetTplset != 'default'}> " alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /> - " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" />   <{else}> <{if $obj->get('tpl_tplset') == 'default'}> From minahito @ users.sourceforge.jp Sat Aug 5 15:21:53 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:21:53 +0900 Subject: [xoops-cvslog 3957] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060805062153.6C9F12AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.18 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.19 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.18 Mon Jul 10 20:05:08 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html Sat Aug 5 15:21:53 2006 @@ -84,7 +84,7 @@ <{/if}> - " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /> + " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /> " alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" />
    <{if $obj->get('tplset_name') != "default"}> From minahito @ users.sourceforge.jp Sat Aug 5 15:22:06 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:22:06 +0900 Subject: [xoops-cvslog 3958] CVS update: xoops2jp/html/modules/legacyRender/sql Message-ID: <20060805062206.5DE192AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/sql/mysql.sql diff -u xoops2jp/html/modules/legacyRender/sql/mysql.sql:1.1.2.3 xoops2jp/html/modules/legacyRender/sql/mysql.sql:removed --- xoops2jp/html/modules/legacyRender/sql/mysql.sql:1.1.2.3 Sat Jan 14 02:34:26 2006 +++ xoops2jp/html/modules/legacyRender/sql/mysql.sql Sat Aug 5 15:22:06 2006 @@ -1,8 +0,0 @@ -CREATE TABLE legacyrender_theme ( - `id` int(10) NOT NULL auto_increment, - `name` varchar(255) NOT NULL default '', - `tplset_id` int(10) NOT NULL default '0', - `enable_select` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM; - From minahito @ users.sourceforge.jp Sat Aug 5 15:22:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:22:36 +0900 Subject: [xoops-cvslog 3959] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805062236.A3B412AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/DefaultAction.class.php diff -u xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.3 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/DefaultAction.class.php Sat Aug 5 15:22:36 2006 @@ -1,7 +1,7 @@ _mAllowRegister = $moduleConfig['allow_register']; + } function getDefaultView(&$controller, &$xoopsUser) { @@ -25,6 +33,7 @@ function executeViewInput(&$controller, &$xoopsUser, &$render) { $render->setTemplateName("user_default.html"); + $render->setAttribute('allowRegister', $this->_mAllowRegister); } function executeViewError(&$controller, &$xoopsUser, &$render) From minahito @ users.sourceforge.jp Sat Aug 5 15:22:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:22:51 +0900 Subject: [xoops-cvslog 3960] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060805062251.735622AC0FB@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.6 xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.7 --- xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.6 Wed Jul 19 19:20:53 2006 +++ xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php Sat Aug 5 15:22:51 2006 @@ -1,7 +1,7 @@ deleteBasicPermission($this->mGroup->getVar('groupid')); - foreach ($this->mActionForm->get('system') as $sid => $value) - { + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('gperm_groupid', $this->mGroup->get('groupid'))); + $criteria->add(new Criteria('gperm_modid', 1)); + $criteria->add(new Criteria('gperm_name', 'system_admin')); + $gpermHandler->deleteAll($criteria); + + foreach ($this->mActionForm->get('system') as $sid => $value) { $item =& new User_PermissionSystemAdminItem($sid, null); - $perm =& new User_Permission($this->mGroup->getVar('groupid'), $item); + $perm =& new User_Permission($this->mGroup->get('groupid'), $item); $perm->save(); @@ -60,29 +64,39 @@ // // Store module read permission // - foreach ($this->mActionForm->get('module') as $mid => $value) - { - $module =& $moduleHandler->get($mid); - if (is_object($module) && $value) { - $gpermHandler->addRight('module_read', $mid, $this->mGroup->getVar('groupid')); + $this->_loadActiveModules(); + foreach ($this->_mActiveModules as $module) { + $value = $this->mActionForm->get('module', $module->get('mid')); + if ($value) { + $gpermHandler->addRight('module_read', $module->get('mid'), $this->mGroup->get('groupid')); + } + else { + $gpermHandler->removeRight('module_read', $module->get('mid'), $this->mGroup->get('groupid')); } } - foreach ($this->mActionForm->get('module_admin') as $mid => $value) - { - $module =& $moduleHandler->get($mid); - if (is_object($module) && $value) { - $gpermHandler->addRight('module_admin', $mid, $this->mGroup->getVar('groupid')); + foreach ($this->_mActiveModules as $module) { + $value = $this->mActionForm->get('module_admin', $module->get('mid')); + if ($value) { + $gpermHandler->addRight('module_admin', $module->get('mid'), $this->mGroup->get('groupid')); + } + else { + $gpermHandler->removeRight('module_admin', $module->get('mid'), $this->mGroup->get('groupid')); } } $blockHandler =& xoops_gethandler('block'); - foreach ($this->mActionForm->get('block') as $bid => $value) - { - $block =& $blockHandler->get($bid); - if (is_object($block) && $value) { - $gpermHandler->addRight('block_read', $bid, $this->mGroup->getVar('groupid')); + $this->_loadActiveBlocks(); + foreach ($this->_mActiveBlocks as $side => $blocks) { + foreach ($blocks as $block) { + $value = $this->mActionForm->get('block', $block->get('bid')); + if ($value) { + $gpermHandler->addRight('block_read', $block->get('bid'), $this->mGroup->get('groupid')); + } + elseif (is_object($block) && !$value) { + $gpermHandler->removeRight('block_read', $block->get('bid'), $this->mGroup->get('groupid')); + } } } Index: xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.8 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.9 --- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.8 Thu Jul 20 17:14:05 2006 +++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php Sat Aug 5 15:22:51 2006 @@ -1,7 +1,7 @@ getObjects(); - - foreach ($modules as $module) { + $this->_loadActiveModules(); + + $t_activeModuleIDs = array(); + + foreach ($this->_mActiveModules as $module) { $item =& new User_PermissionModuleItem($module); $this->mPermissions[] =& new User_Permission($this->mGroup->getVar('groupid'), $item); + + $t_activeModuleIDs[] = $module->get('mid'); unset($module); unset($item); @@ -89,17 +97,15 @@ // Get block list // $blockHandler = xoops_gethandler('block'); - + $this->_loadActiveBlocks(); $idx = 0; foreach (array(0, 1, 3, 4, 5) as $side) { $this->mBlockPermissions[$idx] = array(); - $blocks =& $blockHandler->getAllBlocks("object", $side, null); - foreach ($blocks as $block) { + foreach ($this->_mActiveBlocks[$side] as $block) { $item =& new User_PermissionBlockItem($block); - $this->mBlockPermissions[$idx][] =& new User_Permission($this->mGroup->getVar('groupid'), $item); - - unset($block); + $this->mBlockPermissions[$idx][] =& new User_Permission($this->mGroup->get('groupid'), $item); + unset ($block); } $idx++; @@ -107,6 +113,49 @@ return USER_FRAME_VIEW_INDEX; } + + function _loadActiveModules() + { + if ($this->_mActiveModulesLoadedFlag) { + return; + } + + $moduleHandler =& xoops_gethandler('module'); + $this->_mActiveModules =& $moduleHandler->getObjects(new Criteria('isactive', 1)); + + $this->_mActiveModulesLoadedFlag = true; + } + + function _loadActiveBlocks() + { + if ($this->_mActiveBlocksLoadedFlag) { + return; + } + + $this->_loadActiveModules(); + + $t_activeModuleIDs = array(); + foreach ($this->_mActiveModules as $module) { + $t_activeModuleIDs[] = $module->get('mid'); + } + + $blockHandler = xoops_gethandler('block'); + foreach (array(0, 1, 3, 4, 5) as $side) { + $this->_mActiveBlocks[$side] = array(); + $blockArr =& $blockHandler->getAllBlocks("object", $side, null); + + foreach ($blockArr as $block) { + if ($block->get('visible') && in_array($block->get('mid'), $t_activeModuleIDs)) { + $this->_mActiveBlocks[$side][] =& $block; + } + unset ($block); + } + + unset($blockArr); + } + + $this->_mActiveBlocksLoadedFlag = true; + } function _loadGroup() { From minahito @ users.sourceforge.jp Sat Aug 5 15:23:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:23:04 +0900 Subject: [xoops-cvslog 3961] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060805062304.ED17A2AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.3 Thu Jul 13 19:46:13 2006 +++ xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php Sat Aug 5 15:23:04 2006 @@ -1,7 +1,7 @@ mObject)); $handler =& xoops_gethandler('member'); - return $handler->delete($this->mObject) ? USER_FRAME_VIEW_SUCCESS - : USER_FRAME_VIEW_ERROR; + if ($handler->delete($this->mObject)) { + XCube_DelegateUtils::call('Legacy.Admin.Event.UserDelete.Success', new XCube_Ref($this->mObject)); + return USER_FRAME_VIEW_SUCCESS; + } + else { + XCube_DelegateUtils::call('Legacy.Admin.Event.UserDelete.Fail', new XCube_Ref($this->mObject)); + return USER_FRAME_VIEW_ERROR; + } } function executeViewInput(&$controller, &$xoopsUser, &$render) From minahito @ users.sourceforge.jp Sat Aug 5 15:23:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:23:34 +0900 Subject: [xoops-cvslog 3962] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060805062334.10BB92AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.8 Thu Jul 13 19:53:25 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Sat Aug 5 15:23:33 2006 @@ -14,9 +14,7 @@ <{$smarty.const._AD_USER_LANG_AVATAR_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{$smarty.const._AD_USER_LANG_AVATAR_FILE}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + <{$smarty.const._AD_USER_LANG_AVATAR_FILE}> <{$smarty.const._AD_USER_LANG_AVATAR_NAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> From minahito @ users.sourceforge.jp Sat Aug 5 15:23:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:23:51 +0900 Subject: [xoops-cvslog 3963] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060805062351.D04B32AC072@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.13 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.13 Thu Jul 13 19:53:25 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Sat Aug 5 15:23:51 2006 @@ -127,6 +127,6 @@
    <{xoops_input type=hidden name=groupid value=$group->get('groupid')}> - +
    From minahito @ users.sourceforge.jp Sat Aug 5 15:24:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:24:07 +0900 Subject: [xoops-cvslog 3964] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060805062407.344042AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/avatar.php diff -u xoops2jp/html/modules/user/class/avatar.php:1.1.2.4 xoops2jp/html/modules/user/class/avatar.php:1.1.2.5 --- xoops2jp/html/modules/user/class/avatar.php:1.1.2.4 Wed Jul 19 19:22:04 2006 +++ xoops2jp/html/modules/user/class/avatar.php Sat Aug 5 15:24:07 2006 @@ -11,7 +11,7 @@ $this->initVar('avatar_name', XOBJ_DTYPE_STRING, '', true, 100); $this->initVar('avatar_mimetype', XOBJ_DTYPE_STRING, '', true, 30); $this->initVar('avatar_created', XOBJ_DTYPE_INT, time(), true); - $this->initVar('avatar_display', XOBJ_DTYPE_BOOL, '0', true); + $this->initVar('avatar_display', XOBJ_DTYPE_BOOL, '1', true); $this->initVar('avatar_weight', XOBJ_DTYPE_INT, '0', true); $this->initVar('avatar_type', XOBJ_DTYPE_STRING, 'S', true, 1); } From minahito @ users.sourceforge.jp Sat Aug 5 15:24:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:24:22 +0900 Subject: [xoops-cvslog 3965] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060805062422.658722AC072@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.18 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.19 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.18 Fri Jul 28 17:57:07 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Sat Aug 5 15:24:22 2006 @@ -130,6 +130,7 @@ define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than X days ago"); define('_AD_USER_LANG_REGISTDATE', "Registered date"); define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag"); +define('_AD_USER_LANG_RESET', "Reset"); define('_AD_USER_LANG_SEARCH_AGAIN', "Search again"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition"); define('_AD_USER_LANG_SENDER', "Sender"); From minahito @ users.sourceforge.jp Sat Aug 5 15:24:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:24:22 +0900 Subject: [xoops-cvslog 3966] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060805062422.8930A2AC0FB@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.27 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.28 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.27 Fri Jul 28 17:57:07 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Sat Aug 5 15:24:22 2006 @@ -130,6 +130,7 @@ define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時がX日以上前"); define('_AD_USER_LANG_REGISTDATE', "登録日時"); define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag"); +define('_AD_USER_LANG_RESET', "リセット"); define('_AD_USER_LANG_SEARCH_AGAIN', "条件を修正して再検索"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信"); define('_AD_USER_LANG_SENDER', "送信者"); From minahito @ users.sourceforge.jp Sat Aug 5 15:24:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:24:35 +0900 Subject: [xoops-cvslog 3967] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060805062435.6283B2AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/modinfo.php diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.14 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.15 --- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.14 Thu Apr 27 19:27:02 2006 +++ xoops2jp/html/modules/user/language/japanese/modinfo.php Sat Aug 5 15:24:35 2006 @@ -32,9 +32,9 @@ define('_MI_USER_CONF_AVATAR_WIDTH', "アバター画像の最大幅(ピクセル)"); define('_MI_USER_CONF_AVTR_ALLOW_UP', "アバター画像のアップロードを許可する"); define('_MI_USER_CONF_BAD_EMAILS', "ユーザのemailアドレスとして使用できない文字列"); -define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は"); +define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); define('_MI_USER_CONF_BAD_UNAMES', "ユーザ名として使用できない文字列"); -define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は"); +define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); define('_MI_USER_CONF_CHGMAIL', "ユーザ自身のEmailアドレス変更を許可する"); define('_MI_USER_CONF_DISCLAIMER', "利用許諾文"); define('_MI_USER_CONF_DISCLAIMER_DESC', "ユーザの新規登録ページに表示する利用許諾文を入力してください。"); From minahito @ users.sourceforge.jp Sat Aug 5 15:24:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 15:24:48 +0900 Subject: [xoops-cvslog 3968] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060805062448.227CE2AC072@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_default.html diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.4 --- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.3 Thu Feb 2 14:34:19 2006 +++ xoops2jp/html/modules/user/templates/user_default.html Sat Aug 5 15:24:47 2006 @@ -25,5 +25,7 @@ -
    <{$smarty.const._US_NOTREGISTERED}>
    +<{if $allowRegister}> + +<{/if}> From minahito @ users.sourceforge.jp Sat Aug 5 22:20:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:20:34 +0900 Subject: [xoops-cvslog 3969] CVS update: xoops2jp/html/modules/base Message-ID: <20060805132034.1651B2AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/base/xoops_version.php diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.27 xoops2jp/html/modules/base/xoops_version.php:1.1.2.28 --- xoops2jp/html/modules/base/xoops_version.php:1.1.2.27 Sat Aug 5 15:17:41 2006 +++ xoops2jp/html/modules/base/xoops_version.php Sat Aug 5 22:20:33 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/base/.xml/misc_friend.xml diff -u /dev/null xoops2jp/html/modules/base/.xml/misc_friend.xml:1.1.2.1 --- /dev/null Sat Aug 5 22:20:44 2006 +++ xoops2jp/html/modules/base/.xml/misc_friend.xml Sat Aug 5 22:20:44 2006 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From minahito @ users.sourceforge.jp Sat Aug 5 22:20:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:20:56 +0900 Subject: [xoops-cvslog 3971] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060805132056.12EC62AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/MiscFriendAction.class.php diff -u /dev/null xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.1 --- /dev/null Sat Aug 5 22:20:56 2006 +++ xoops2jp/html/modules/base/actions/MiscFriendAction.class.php Sat Aug 5 22:20:55 2006 @@ -0,0 +1,80 @@ +mRoot->mLanguageManager->loadPageTypeMessageCatalog('misc'); + + $this->mActionForm =& new Legacy_MiscFriendForm(); + $this->mActionForm->prepare(); + } + + function getDefaultView(&$controller, &$xoopsUser) + { + $this->mActionForm->load($xoopsUser); + return LEGACY_FRAME_VIEW_INPUT; + } + + function execute(&$controller, &$xoopsUser) + { + $this->mActionForm->fetch(); + $this->mActionForm->validate(); + + if ($this->mActionForm->hasError()) { + return LEGACY_FRAME_VIEW_INPUT; + } + + $this->mMailer =& getMailer(); + $this->mMailer->setTemplate("tellfriend.tpl"); + $this->mMailer->assign("SITENAME", $controller->getConfig('sitename')); + $this->mMailer->assign("ADMINMAIL", $controller->getConfig('adminmail')); + $this->mMailer->assign("SITEURL", XOOPS_URL . '/'); + + $this->mActionForm->update($this->mMailer); + + $this->mMailer->setSubject(sprintf(_MSC_INTSITE, $xoopsConfig['sitename'])); + + return $this->mMailer->send() ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR; + } + + function executeViewInput(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("legacy_misc_friend.html"); + $render->setAttribute('actionForm', $this->mActionForm); + } + + function executeViewSuccess(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("legacy_misc_friend_success.html"); + } + + function executeViewError(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("legacy_misc_friend_error.html"); + $render->setTemplate('xoopsMailer', $this->mMailer); + } +} + +?> From minahito @ users.sourceforge.jp Sat Aug 5 22:21:06 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:21:06 +0900 Subject: [xoops-cvslog 3972] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060805132106.CA05C2AC121@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php diff -u xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.1 Thu Jul 27 18:31:02 2006 +++ xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php Sat Aug 5 22:21:06 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/base/forms/MiscFriendForm.class.php diff -u /dev/null xoops2jp/html/modules/base/forms/MiscFriendForm.class.php:1.1.2.1 --- /dev/null Sat Aug 5 22:21:18 2006 +++ xoops2jp/html/modules/base/forms/MiscFriendForm.class.php Sat Aug 5 22:21:18 2006 @@ -0,0 +1,64 @@ +mFormProperties['yname'] =& new XCube_StringProperty('yname'); + $this->mFormProperties['ymail'] =& new XCube_StringProperty('ymail'); + $this->mFormProperties['fname'] =& new XCube_StringProperty('fname'); + $this->mFormProperties['fmail'] =& new XCube_StringProperty('fmail'); + + // + // Set field properties + // + + $this->mFieldProperties['yname'] =& new XCube_FieldProperty($this); + $this->mFieldProperties['yname']->setDependsByArray(array('required')); + $this->mFieldProperties['yname']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_YNAME); + + $this->mFieldProperties['ymail'] =& new XCube_FieldProperty($this); + $this->mFieldProperties['ymail']->setDependsByArray(array('required','email')); + $this->mFieldProperties['ymail']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_YMAIL); + $this->mFieldProperties['ymail']->addMessage('required', _MD_BASE_ERROR_EMAIL, _MD_BASE_LANG_YMAIL); + + $this->mFieldProperties['fname'] =& new XCube_FieldProperty($this); + $this->mFieldProperties['fname']->setDependsByArray(array('required')); + $this->mFieldProperties['fname']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_FNAME); + + $this->mFieldProperties['fmail'] =& new XCube_FieldProperty($this); + $this->mFieldProperties['fmail']->setDependsByArray(array('required','email')); + $this->mFieldProperties['fmail']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_FMAIL); + $this->mFieldProperties['fmail']->addMessage('email', _MD_BASE_ERROR_EMAIL, _MD_BASE_LANG_FMAIL); + } + + function load(&$user) + { + $this->set('yname', $user->get('uname')); + $this->set('ymail', $user->get('email')); + } + + function update(&$mailer) + { + $mailer->assign("YOUR_NAME", $this->get('yname')); + $mailer->assign("FRIEND_NAME", $this->get('fname')); + $mailer->setToEmails($this->get('fmail')); + $mailer->setFromEmail($this->get('ymail')); + $mailer->setFromName($this->get('yname')); + } +} + +?> From minahito @ users.sourceforge.jp Sat Aug 5 22:21:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:21:34 +0900 Subject: [xoops-cvslog 3974] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060805132134.7BAFE2AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.19 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.20 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.19 Thu Jul 27 18:35:18 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Sat Aug 5 22:21:34 2006 @@ -1,6 +1,7 @@ Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.18 xoops2jp/html/modules/base/language/english/main.php:1.1.2.19 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.18 Thu Jul 27 18:35:19 2006 +++ xoops2jp/html/modules/base/language/english/main.php Sat Aug 5 22:21:34 2006 @@ -1,6 +1,7 @@ Index: xoops2jp/html/modules/base/templates/legacy_misc_friend.html diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_misc_friend.html:1.1.2.1 --- /dev/null Sat Aug 5 22:21:46 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_friend.html Sat Aug 5 22:21:46 2006 @@ -0,0 +1,51 @@ +<{if $actionForm->hasError()}> +
    +
      + <{foreach item=message from=$actionForm->getErrorMessages()}> +
    • <{$message}>
    • + <{/foreach}> +
    +
    +<{/if}> +
    + <{xoops_token form=$actionForm}> + + + + + + + + + + + + + + + + + + + + + + + + +
    <{$smarty.const._MSC_RECOMMENDSITE}>
    + + <{$smarty.const._MD_BASE_LANG_YNAME}> + + <{xoops_input type=text name=yname value=$actionForm->get('yname')}> +
    <{$smarty.const._MD_BASE_LANG_YMAIL}> + <{xoops_input type=text name=ymail value=$actionForm->get('ymail')}> +
    <{$smarty.const._MD_BASE_LANG_FNAME}> + <{xoops_input type=text name=fname value=$actionForm->get('fname')}> +
    <{$smarty.const._MD_BASE_LANG_FMAIL}> + <{xoops_input type=text name=fmail value=$actionForm->get('fmail')}> +
      +   + +
    +
    \ No newline at end of file Index: xoops2jp/html/modules/base/templates/legacy_misc_friend_success.html diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_misc_friend_success.html:1.1.2.1 --- /dev/null Sat Aug 5 22:21:46 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_friend_success.html Sat Aug 5 22:21:46 2006 @@ -0,0 +1,3 @@ +
    +

    <{$smarty.const._MSC_REFERENCESENT}>

    +
    Index: xoops2jp/html/modules/base/templates/legacy_misc_friend_error.html diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_misc_friend_error.html:1.1.2.1 --- /dev/null Sat Aug 5 22:21:46 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_friend_error.html Sat Aug 5 22:21:46 2006 @@ -0,0 +1 @@ +<{$xoopsMailer->getErrors()}> From minahito @ users.sourceforge.jp Sat Aug 5 22:21:58 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:21:58 +0900 Subject: [xoops-cvslog 3977] CVS update: xoops2jp/html/modules/base/templates Message-ID: <20060805132158.4E5AD2AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.6 xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.7 --- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.6 Thu Aug 3 18:43:39 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_online.html Sat Aug 5 22:21:58 2006 @@ -5,8 +5,8 @@ <{foreach item=obj from=$objects}> valign="middle" align="center"> - <{if $obj->get('uid')}> - <{$obj->getShow('uname')}> + <{if $obj->get('online_uid')}> + <{$obj->getShow('online_uname')}> <{else}> <{$smarty.const._MD_BASE_LANG_GUEST}> <{/if}> From minahito @ users.sourceforge.jp Sat Aug 5 22:22:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:22:28 +0900 Subject: [xoops-cvslog 3978] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060805132228.96C892AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.2 Thu Jul 13 19:45:01 2006 +++ xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php Sat Aug 5 22:22:28 2006 @@ -1,7 +1,7 @@ mObject->isNew(); $ret = parent::execute($controller, $xoopsUser); From minahito @ users.sourceforge.jp Sat Aug 5 22:23:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:23:00 +0900 Subject: [xoops-cvslog 3979] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060805132300.A8CD62AC041@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.3 xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.3 Thu Jul 13 19:45:42 2006 +++ xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php Sat Aug 5 22:23:00 2006 @@ -44,6 +44,10 @@ return USER_FRAME_VIEW_ERROR; } + if (xoops_getrequest('_form_control_cancel') != null) { + return USER_FRAME_VIEW_CANCEL; + } + $this->mActionForm->fetch(); $this->mActionForm->validate(); @@ -83,6 +87,11 @@ $render->setAttribute('object', $this->mMailjob); $render->setAttribute('actionForm', $this->mActionForm); } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward('./index.php?action=MailjobList'); + } /** * [Notice] From minahito @ users.sourceforge.jp Sat Aug 5 22:23:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:23:35 +0900 Subject: [xoops-cvslog 3980] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060805132335.4E4562AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/users.php diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.5 xoops2jp/html/modules/user/class/users.php:1.1.2.6 --- xoops2jp/html/modules/user/class/users.php:1.1.2.5 Wed Jul 19 19:22:04 2006 +++ xoops2jp/html/modules/user/class/users.php Sat Aug 5 22:23:35 2006 @@ -125,8 +125,6 @@ $limit=$criteria->getLimit(); $start=$criteria->getStart(); - - $ret =& $this->getObjects($sql, $limit, $start, $param1); } else { $limit = $param1; From minahito @ users.sourceforge.jp Sat Aug 5 22:23:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:23:47 +0900 Subject: [xoops-cvslog 3981] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060805132347.E800A2AC041@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.12 xoops2jp/html/modules/user/language/english/main.php:1.1.2.13 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.12 Wed Jul 19 19:22:35 2006 +++ xoops2jp/html/modules/user/language/english/main.php Sat Aug 5 22:23:47 2006 @@ -5,7 +5,7 @@ define('_MD_USER_ERROR_AVATAR_SELECT', "ERROR - Please select valid avatar."); define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar."); define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database"); -define('_MD_USER_ERROR_EMAIL_FORMAT', "Incorrect email address"); +define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address"); define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong."); define('_MD_USER_ERROR_INTRANGE', "Incorrect input on {0}."); define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); From minahito @ users.sourceforge.jp Sat Aug 5 22:23:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 5 Aug 2006 22:23:56 +0900 Subject: [xoops-cvslog 3982] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060805132356.13F062AC041@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.14 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.15 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.14 Fri Aug 4 13:39:40 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Sat Aug 5 22:23:55 2006 @@ -5,7 +5,7 @@ define('_MD_USER_ERROR_AVATAR_SELECT', "ERROR - 指定したアバターは不正です"); define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています"); define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); -define('_MD_USER_ERROR_EMAIL_FORMAT', "不正なメールアドレスです"); +define('_MD_USER_ERROR_EMAIL_FORMAT', "{0}は不正なメールアドレスです"); define('_MD_USER_ERROR_INJURY', "{0}に指定された値が不正です"); define('_MD_USER_ERROR_INTRANGE', "{0}に対して不正な入力です"); define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以下にして下さい"); From nobunobu @ users.sourceforge.jp Sun Aug 6 00:46:28 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sun, 6 Aug 2006 00:46:28 +0900 Subject: [xoops-cvslog 3983] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805154628.883C52AC102@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.6 --- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.5 Fri Aug 4 13:39:10 2006 +++ xoops2jp/html/modules/user/actions/LostPassAction.class.php Sun Aug 6 00:46:28 2006 @@ -1,7 +1,7 @@ mActionForm->fetch(); - $userHandler =& xoops_getmodulehandler('users'); + $userHandler =& xoops_gethandler('user'); $lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email'))); if (is_array($lostUserArr) && count($lostUserArr) > 0) { $lostUser =& $lostUserArr[0]; @@ -87,7 +87,7 @@ return USER_FRAME_VIEW_INPUT; } - $userHandler =& xoops_getmodulehandler('users'); + $userHandler =& xoops_gethandler('user'); $lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email'))); if (is_array($lostUserArr) && count($lostUserArr) > 0) { From minahito @ users.sourceforge.jp Sun Aug 6 00:58:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 00:58:33 +0900 Subject: [xoops-cvslog 3984] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060805155833.8555C2AC06A@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/MiscFriendAction.class.php diff -u xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.1 Sat Aug 5 22:20:55 2006 +++ xoops2jp/html/modules/base/actions/MiscFriendAction.class.php Sun Aug 6 00:58:33 2006 @@ -22,11 +22,6 @@ function prepare(&$controller, &$xoopsUser) { - // - // TODO We will remove the following loading. - // - $controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('misc'); - $this->mActionForm =& new Legacy_MiscFriendForm(); $this->mActionForm->prepare(); } @@ -54,7 +49,7 @@ $this->mActionForm->update($this->mMailer); - $this->mMailer->setSubject(sprintf(_MSC_INTSITE, $xoopsConfig['sitename'])); + $this->mMailer->setSubject(sprintf(_MSC_INTSITE, $controller->getConfig('sitename'))); return $this->mMailer->send() ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR; } @@ -73,7 +68,7 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { $render->setTemplateName("legacy_misc_friend_error.html"); - $render->setTemplate('xoopsMailer', $this->mMailer); + $render->setAttribute('xoopsMailer', $this->mMailer); } } From minahito @ users.sourceforge.jp Sun Aug 6 01:44:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:44:34 +0900 Subject: [xoops-cvslog 3985] CVS update: xoops2jp/html/modules/base Message-ID: <20060805164434.E44932AC112@users.sourceforge.jp> Index: xoops2jp/html/modules/base/xoops_version.php diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.28 xoops2jp/html/modules/base/xoops_version.php:1.1.2.29 --- xoops2jp/html/modules/base/xoops_version.php:1.1.2.28 Sat Aug 5 22:20:33 2006 +++ xoops2jp/html/modules/base/xoops_version.php Sun Aug 6 01:44:34 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.7 xoops2jp/html/modules/base/templates/legacy_misc_online.html:removed --- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.7 Sat Aug 5 22:21:58 2006 +++ xoops2jp/html/modules/base/templates/legacy_misc_online.html Sun Aug 6 01:44:55 2006 @@ -1,30 +0,0 @@ - - - - - <{foreach item=obj from=$objects}> - valign="middle" align="center"> - - - - - <{/foreach}> -
    <{$smarty.const._WHOSONLINE}>
    - <{if $obj->get('online_uid')}> - <{$obj->getShow('online_uname')}> - <{else}> - <{$smarty.const._MD_BASE_LANG_GUEST}> - <{/if}> - - <{if $obj->mModule}> - <{$obj->mModule->getShow('name')}> - <{else}> - --- - <{/if}> - - <{if $xoops_isadmin}> - <{$obj->getShow('online_ip')}> - <{/if}> -
    -
    -
    <{xoops_pagenavi pagenavi=$pageNavi}>
    From minahito @ users.sourceforge.jp Sun Aug 6 01:44:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:44:55 +0900 Subject: [xoops-cvslog 3987] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060805164455.3755E2AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php diff -u xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:removed --- xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.2 Sat Aug 5 22:21:06 2006 +++ xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php Sun Aug 6 01:44:55 2006 @@ -1,45 +0,0 @@ -setTemplateName("legacy_misc_online.html"); - - foreach (array_keys($this->mObjects) as $key) { - $this->mObjects[$key]->loadModule(); - } - - $render->setAttribute("objects", $this->mObjects); - $render->setAttribute("pageNavi", $this->mNavi); - } -} - -?> From minahito @ users.sourceforge.jp Sun Aug 6 01:44:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:44:55 +0900 Subject: [xoops-cvslog 3988] CVS update: xoops2jp/html/modules/base/forms Message-ID: <20060805164455.5AF092AC112@users.sourceforge.jp> Index: xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php diff -u xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:removed --- xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.3 Tue Apr 11 15:12:54 2006 +++ xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php Sun Aug 6 01:44:55 2006 @@ -1,60 +0,0 @@ - 'online_uid', - ONLINE_SORT_KEY_ONLINE_UNAME => 'online_uname', - ONLINE_SORT_KEY_ONLINE_UPDATED => 'online_updated', - ONLINE_SORT_KEY_ONLINE_MODULE => 'online_module', - ONLINE_SORT_KEY_ONLINE_IP => 'online_ip' - ); - var $_mCriteria = null; - - function fetch() - { - $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : ONLINE_SORT_KEY_DEFAULT; - - if ($this->mSort > ONLINE_SORT_KEY_MAXVALUE) { - $this->mSort = ONLINE_SORT_KEY_DEFAULT; - } - - if (isset($_REQUEST['online_uid'])) { - $this->_mCriteria->add(new Criteria('online_uid', array(XOBJ_DTYPE_INT, xoops_getrequest('online_uid')))); - } - - if (isset($_REQUEST['online_uname'])) { - $this->_mCriteria->add(new Criteria('online_uname', array(XOBJ_DTYPE_STRING, xoops_getrequest('online_uname')))); - } - - if (isset($_REQUEST['online_updated'])) { - $this->_mCriteria->add(new Criteria('online_updated', array(XOBJ_DTYPE_INT, xoops_getrequest('online_updated')))); - } - - if (isset($_REQUEST['online_module'])) { - $this->_mCriteria->add(new Criteria('online_module', array(XOBJ_DTYPE_INT, xoops_getrequest('online_module')))); - } - - if (isset($_REQUEST['online_ip'])) { - $this->_mCriteria->add(new Criteria('online_ip', array(XOBJ_DTYPE_STRING, xoops_getrequest('online_ip')))); - } - - $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); - } -} - -?> From minahito @ users.sourceforge.jp Sun Aug 6 01:45:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:45:56 +0900 Subject: [xoops-cvslog 3989] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060805164556.A876A2AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php diff -u /dev/null xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php:1.1.2.1 --- /dev/null Sun Aug 6 01:45:56 2006 +++ xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php Sun Aug 6 01:45:56 2006 @@ -0,0 +1,40 @@ + 'online_uid', + ONLINE_SORT_KEY_ONLINE_UNAME => 'online_uname', + ONLINE_SORT_KEY_ONLINE_UPDATED => 'online_updated', + ONLINE_SORT_KEY_ONLINE_MODULE => 'online_module', + ONLINE_SORT_KEY_ONLINE_IP => 'online_ip' + ); + var $_mCriteria = null; + + function fetch() + { + $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : ONLINE_SORT_KEY_DEFAULT; + + if (!isset($this->mSortKeys[abs($this->mSort)])) { + $this->mSort = ONLINE_SORT_KEY_DEFAULT; + } + + $this->_mCriteria->addSort($this->getSort(), $this->getOrder()); + } +} + +?> From minahito @ users.sourceforge.jp Sun Aug 6 01:45:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:45:56 +0900 Subject: [xoops-cvslog 3990] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060805164556.CF28A2AC126@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/online.php diff -u /dev/null xoops2jp/html/modules/user/class/online.php:1.1.2.1 --- /dev/null Sun Aug 6 01:45:56 2006 +++ xoops2jp/html/modules/user/class/online.php Sun Aug 6 01:45:56 2006 @@ -0,0 +1,34 @@ +initVar('online_uid', XOBJ_DTYPE_INT, '0', true); + $this->initVar('online_uname', XOBJ_DTYPE_STRING, '', true, 25); + $this->initVar('online_updated', XOBJ_DTYPE_INT, '0', true); + $this->initVar('online_module', XOBJ_DTYPE_INT, '0', true); + $this->initVar('online_ip', XOBJ_DTYPE_STRING, '', true, 15); + } + + function loadModule() + { + if ($this->get('online_module')) { + $handler =& xoops_gethandler('module'); + $this->mModule =& $handler->get($this->get('online_module')); + } + } +} + +class UserOnlineHandler extends XoopsObjectGenericHandler +{ + var $mTable = "online"; + var $mPrimary = ""; + var $mClass = "UserOnlineObject"; +} + +?> From minahito @ users.sourceforge.jp Sun Aug 6 01:45:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:45:56 +0900 Subject: [xoops-cvslog 3991] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060805164556.000852AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php diff -u /dev/null xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1 --- /dev/null Sun Aug 6 01:45:56 2006 +++ xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php Sun Aug 6 01:45:56 2006 @@ -0,0 +1,50 @@ +mRoot->mLanguageManager->loadModuleMessageCatalog('user'); + } + + function &_getHandler() + { + $handler =& xoops_getmodulehandler('online', 'user'); + return $handler; + } + + function &_getFilterForm(&$navi) + { + $filter =& new User_OnlineFilterForm($navi); + return $filter; + } + + function _getBaseUrl() + { + return "./misc.php?type=Online"; + } + + function executeViewIndex(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("user_misc_online.html"); + + foreach (array_keys($this->mObjects) as $key) { + $this->mObjects[$key]->loadModule(); + } + + $render->setAttribute("objects", $this->mObjects); + $render->setAttribute("pageNavi", $this->mNavi); + } +} + +?> From minahito @ users.sourceforge.jp Sun Aug 6 01:46:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:46:08 +0900 Subject: [xoops-cvslog 3992] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060805164608.AB1B92AC112@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.13 xoops2jp/html/modules/user/language/english/main.php:1.1.2.14 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.13 Sat Aug 5 22:23:47 2006 +++ xoops2jp/html/modules/user/language/english/main.php Sun Aug 6 01:46:08 2006 @@ -35,6 +35,7 @@ define('_MD_USER_LANG_CREATE_NEW', "Create new"); define('_MD_USER_LANG_EMAIL', "Email"); define('_MD_USER_LANG_GROUPID', "Group ID"); +define('_MD_USER_LANG_GUEST', "Guest"); define('_MD_USER_LANG_NOTIFY_METHOD', "Notify method"); define('_MD_USER_LANG_NOTIFY_MODE', "Notify mode"); define('_MD_USER_LANG_PASS', "Password"); @@ -45,6 +46,7 @@ define('_MD_USER_LANG_UID', "UID"); define('_MD_USER_LANG_UNAME', "uname"); define('_MD_USER_LANG_URL', "URL"); +define('_MD_USER_LANG_WHOSONLINE', "Who's Online"); define('_MD_USER_MESSAGE_CONFIRM_DELETE', "Do you delete the following data?"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password"); define('_US_ACONTACT', "Selected account is already activated!"); From minahito @ users.sourceforge.jp Sun Aug 6 01:46:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:46:08 +0900 Subject: [xoops-cvslog 3993] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060805164608.CCB442AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.15 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.16 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.15 Sat Aug 5 22:23:55 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Sun Aug 6 01:46:08 2006 @@ -35,6 +35,7 @@ define('_MD_USER_LANG_CREATE_NEW', "新規作成"); define('_MD_USER_LANG_EMAIL', "電子メール"); define('_MD_USER_LANG_GROUPID', "グループID"); +define('_MD_USER_LANG_GUEST', "ゲスト"); define('_MD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法"); define('_MD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング"); define('_MD_USER_LANG_PASS', "パスワード"); @@ -45,6 +46,7 @@ define('_MD_USER_LANG_UID', "UID"); define('_MD_USER_LANG_UNAME', "ユーザー名"); define('_MD_USER_LANG_URL', "URL"); +define('_MD_USER_LANG_WHOSONLINE', "オンライン状況"); define('_MD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか?"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "メールを送信しました"); define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。"); From minahito @ users.sourceforge.jp Sun Aug 6 01:46:20 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:46:20 +0900 Subject: [xoops-cvslog 3994] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060805164620.42EC22AC112@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_misc_online.html diff -u /dev/null xoops2jp/html/modules/user/templates/user_misc_online.html:1.1.2.1 --- /dev/null Sun Aug 6 01:46:20 2006 +++ xoops2jp/html/modules/user/templates/user_misc_online.html Sun Aug 6 01:46:20 2006 @@ -0,0 +1,30 @@ + + + + + <{foreach item=obj from=$objects}> + valign="middle" align="center"> + + + + + <{/foreach}> +
    <{$smarty.const._MD_USER_LANG_WHOSONLINE}>
    + <{if $obj->get('online_uid')}> + <{$obj->getShow('online_uname')}> + <{else}> + <{$smarty.const._MD_USER_LANG_GUEST}> + <{/if}> + + <{if $obj->mModule}> + <{$obj->mModule->getShow('name')}> + <{else}> + --- + <{/if}> + + <{if $xoops_isadmin}> + <{$obj->getShow('online_ip')}> + <{/if}> +
    +
    +
    <{xoops_pagenavi pagenavi=$pageNavi}>
    From minahito @ users.sourceforge.jp Sun Aug 6 01:46:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:46:39 +0900 Subject: [xoops-cvslog 3995] CVS update: xoops2jp/html/modules/user/preload/Primary Message-ID: <20060805164639.8A3012AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/user/preload/Primary/Primary.class.php diff -u xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.5 xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.6 --- xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.5 Wed Jul 19 19:28:27 2006 +++ xoops2jp/html/modules/user/preload/Primary/Primary.class.php Sun Aug 6 01:46:39 2006 @@ -23,6 +23,8 @@ $root->mDelegateManager->add("Site.CheckLogin", "User_LegacypageFunctions::checkLogin", $file); $root->mDelegateManager->add("Site.CheckLogin.Success", "User_LegacypageFunctions::checkLoginSuccess", $file); $root->mDelegateManager->add("Site.Logout", "User_LegacypageFunctions::logout", $file); + + $root->mDelegateManager->add("Legacypage.Misc.Access", "User_LegacypageFunctions::misc", XCUBE_DELEGATE_PRIORITY_NORMAL - 5, $file); } } From minahito @ users.sourceforge.jp Sun Aug 6 01:46:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:46:48 +0900 Subject: [xoops-cvslog 3996] CVS update: xoops2jp/html/modules/user/kernel Message-ID: <20060805164648.DAC0A2AC124@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.5 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.6 --- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.5 Thu Jul 27 15:54:48 2006 +++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Sun Aug 6 01:46:48 2006 @@ -1,7 +1,7 @@ mController->mModuleController->setupModuleObject('user'); + $root->mController->mModuleController->setupRenderTarget(); + + $actionName = "MiscOnline"; + + $moduleRunner = new User_ActionFrame(false); + $moduleRunner->setActionName($actionName); + + $root->mController->setActionStrategy($moduleRunner); + + $root->mController->setDialogMode(true); + + $root->mController->executeAction(); + + $root->mController->executeView(); + } } ?> \ No newline at end of file From minahito @ users.sourceforge.jp Sun Aug 6 01:47:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:47:03 +0900 Subject: [xoops-cvslog 3997] CVS update: xoops2jp/html/modules/user Message-ID: <20060805164703.216E62AC124@users.sourceforge.jp> Index: xoops2jp/html/modules/user/xoops_version.php diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.19 xoops2jp/html/modules/user/xoops_version.php:1.1.2.20 --- xoops2jp/html/modules/user/xoops_version.php:1.1.2.19 Tue May 16 21:47:19 2006 +++ xoops2jp/html/modules/user/xoops_version.php Sun Aug 6 01:47:02 2006 @@ -1,285 +1,288 @@ - // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // - -$modversion['name'] = _MI_USER_NAME; -$modversion['version'] = 1.00; -$modversion['description'] = _MI_USER_NAME_DESC; -$modversion['author'] = ""; -$modversion['credits'] = "The XOOPS Project"; -$modversion['help'] = "help.html"; -$modversion['license'] = "GPL see LICENSE"; -$modversion['official'] = 1; -$modversion['image'] = "images/user.gif"; -$modversion['dirname'] = "user"; - -// SQL -$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; - + // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + +$modversion['name'] = _MI_USER_NAME; +$modversion['version'] = 1.00; +$modversion['description'] = _MI_USER_NAME_DESC; +$modversion['author'] = ""; +$modversion['credits'] = "The XOOPS Project"; +$modversion['help'] = "help.html"; +$modversion['license'] = "GPL see LICENSE"; +$modversion['official'] = 1; +$modversion['image'] = "images/user.gif"; +$modversion['dirname'] = "user"; + +// SQL +$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; + // Tables created by sql file (without prefix!) $modversion['tables'][0] = "user_mailjob"; $modversion['tables'][1] = "user_mailjob_link"; - // Admin things -$modversion['hasAdmin'] = 1; -$modversion['adminindex'] = "admin/index.php"; -$modversion['adminmenu'] = "admin/menu.php"; - -// Templates -$modversion['templates'][1]['file'] = 'user_userinfo.html'; -$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php'; - -$modversion['templates'][2]['file'] = 'user_userform.html'; -$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user'; - -$modversion['templates'][3]['file'] = 'user_edituser.html'; -$modversion['templates'][3]['description'] = 'When user edit own information, display this'; - -$modversion['templates'][4]['file'] = 'user_register_form.html'; -$modversion['templates'][4]['description'] = ''; - -$modversion['templates'][5]['file'] = 'user_register_confirm.html'; -$modversion['templates'][5]['description'] = ''; - -$modversion['templates'][6]['file'] = 'user_lostpass.html'; -$modversion['templates'][6]['description'] = ''; - -$modversion['templates'][7]['file'] = 'user_default.html'; -$modversion['templates'][7]['description'] = ''; - -$modversion['templates'][8]['file'] = 'user_avatar_edit.html'; -$modversion['templates'][8]['description'] = ''; - -$modversion['templates'][9]['file'] = 'user_register_finish.html'; -$modversion['templates'][9]['description'] = ''; - -//Preference -$modversion['config'][]=array ( - "name"=>"allow_register", - "title"=>"_MI_USER_CONF_ALLOW_REGISTER", - "description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>1 - ); - -$modversion['config'][]=array ( - "name"=>"minpass", - "title"=>"_MI_USER_CONF_MINPASS", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>5 - ); - -$modversion['config'][]=array ( - "name"=>"minuname", - "title"=>"_MI_USER_CONF_MINUNAME", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>3 - ); - -$modversion['config'][]=array ( - "name"=>"maxuname", - "title"=>"_MI_USER_CONF_MAXUNAME", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>10 - ); - -$modversion['config'][]=array ( - "name"=>"allow_chgmail", - "title"=>"_MI_USER_CONF_CHGMAIL", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"new_user_notify", - "title"=>"_MI_USER_CONF_NEW_USER_NOTIFY", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>1 - ); - -$modversion['config'][]=array ( - "name"=>"new_user_notify_group", - "title"=>"_MI_USER_CONF_NEW_NTF_GROUP", - "formtype"=>"group", - "valuetype"=>"int", - "default"=>1 - ); - -$modversion['config'][]=array ( - "name"=>"activation_type", - "title"=>"_MI_USER_CONF_ACTV_TYPE", - "formtype"=>"select", - "options"=>array("_MI_USER_CONF_ACTV_USER"=>0,"_MI_USER_CONF_ACTV_AUTO"=>1,"_MI_USER_CONF_ACTV_ADMIN"=>2), - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"activation_group", - "title"=>"_MI_USER_CONF_ACTV_GROUP", - "description"=>"_MI_USER_CONF_ACTV_GROUP_DESC", - "formtype"=>"group", - "valuetype"=>"int", - "default"=>1 - ); - -$modversion['config'][]=array ( - "name"=>"uname_test_level", - "title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL", - "formtype"=>"select", - "options"=>array("_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG"=>0,"_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL"=>1,"_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK"=>2), - "valuetype"=>"int", - "default"=>1 - ); - -$modversion['config'][]=array ( - "name"=>"avatar_allow_upload", - "title"=>"_MI_USER_CONF_AVTR_ALLOW_UP", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"avatar_minposts", - "title"=>"_MI_USER_CONF_AVATAR_MINPOSTS", - "description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"avatar_width", - "title"=>"_MI_USER_CONF_AVATAR_WIDTH", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>80 - ); - -$modversion['config'][]=array ( - "name"=>"avatar_height", - "title"=>"_MI_USER_CONF_AVATAR_HEIGHT", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>80 - ); - -$modversion['config'][]=array ( - "name"=>"avatar_maxsize", - "title"=>"_MI_USER_CONF_AVATAR_MAXSIZE", - "formtype"=>"textbox", - "valuetype"=>"int", - "default"=>35000 - ); - -$modversion['config'][]=array ( - "name"=>"self_delete", - "title"=>"_MI_USER_CONF_SELF_DELETE", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"bad_unames", - "title"=>"_MI_USER_CONF_BAD_UNAMES", - "description"=>"_MI_USER_CONF_BAD_UNAMES_DESC", - "formtype"=>"textarea", - "valuetype"=>"string", - "default"=>"webmaster|^xoops|^admin" - ); - -$modversion['config'][]=array ( - "name"=>"bad_emails", - "title"=>"_MI_USER_CONF_BAD_EMAILS", - "description"=>"_MI_USER_CONF_BAD_EMAILS_DESC", - "formtype"=>"textarea", - "valuetype"=>"string", - "default"=>"xoopscube.org$|xoopscube.jp$" - ); - -$modversion['config'][]=array ( - "name"=>"reg_dispdsclmr", - "title"=>"_MI_USER_CONF_DISPDSCLMR", - "description"=>"_MI_USER_CONF_DISPDSCLMR_DESC", - "formtype"=>"yesno", - "valuetype"=>"int", - "default"=>0 - ); - -$modversion['config'][]=array ( - "name"=>"reg_disclaimer", - "title"=>"_MI_USER_CONF_DISCLAIMER", - "description"=>"_MI_USER_CONF_DISCLAIMER_DESC", - "formtype"=>"textarea", - "valuetype"=>"string", - "default"=>"" - ); - -// Menu -$modversion['hasMain'] = 1; -$modversion['read_any'] = true; - -// Block -$modversion['blocks'][1]['file'] = "user_login.php"; -$modversion['blocks'][1]['name'] = _MI_USER_BLOCK_LOGIN_NAME; -$modversion['blocks'][1]['description'] = _MI_USER_BLOCK_LOGIN_DESC; -$modversion['blocks'][1]['show_func'] = "b_user_login_show"; -$modversion['blocks'][1]['template'] = 'user_block_login.html'; -$modversion['blocks'][1]['visible_any'] = true; -$modversion['blocks'][1]['show_all_module'] = true; - -$modversion['blocks'][2]['file'] = "user_online.php"; -$modversion['blocks'][2]['name'] = _MI_USER_BLOCK_ONLINE_NAME; -$modversion['blocks'][2]['description'] = _MI_USER_BLOCK_ONLINE_DESC; -$modversion['blocks'][2]['show_func'] = "b_user_online_show"; -$modversion['blocks'][2]['template'] = 'user_block_online.html'; -$modversion['blocks'][3]['show_all_module'] = true; - -$modversion['blocks'][3]['file'] = "user_newusers.php"; -$modversion['blocks'][3]['name'] = _MI_USER_BLOCK_NEWUSERS_NAME; -$modversion['blocks'][3]['description'] = _MI_USER_BLOCK_NEWUSERS_DESC; -$modversion['blocks'][3]['show_func'] = "b_user_newusers_show"; -$modversion['blocks'][3]['template'] = 'user_block_newusers.html'; -$modversion['blocks'][3]['edit_func'] = "b_user_newusers_edit"; -$modversion['blocks'][3]['options'] = "10|1"; -$modversion['blocks'][3]['show_all_module'] = true; - -$modversion['blocks'][4]['file'] = "user_topusers.php"; -$modversion['blocks'][4]['name'] = _MI_USER_BLOCK_TOPUSERS_NAME; -$modversion['blocks'][4]['description'] = _MI_USER_BLOCK_TOPUSERS_DESC; -$modversion['blocks'][4]['show_func'] = "b_user_topusers_show"; -$modversion['blocks'][4]['template'] = 'user_block_topusers.html'; -$modversion['blocks'][4]['edit_func'] = "b_user_topusers_edit"; -$modversion['blocks'][4]['options'] = "10|1"; -$modversion['blocks'][4]['show_all_module'] = true; -?> + // Admin things +$modversion['hasAdmin'] = 1; +$modversion['adminindex'] = "admin/index.php"; +$modversion['adminmenu'] = "admin/menu.php"; + +// Templates +$modversion['templates'][1]['file'] = 'user_userinfo.html'; +$modversion['templates'][1]['description'] = 'Display a user information in userinfo.php'; + +$modversion['templates'][2]['file'] = 'user_userform.html'; +$modversion['templates'][2]['description'] = 'Display login and register page to anonymouse user'; + +$modversion['templates'][3]['file'] = 'user_edituser.html'; +$modversion['templates'][3]['description'] = 'When user edit own information, display this'; + +$modversion['templates'][4]['file'] = 'user_register_form.html'; +$modversion['templates'][4]['description'] = ''; + +$modversion['templates'][5]['file'] = 'user_register_confirm.html'; +$modversion['templates'][5]['description'] = ''; + +$modversion['templates'][6]['file'] = 'user_lostpass.html'; +$modversion['templates'][6]['description'] = ''; + +$modversion['templates'][7]['file'] = 'user_default.html'; +$modversion['templates'][7]['description'] = ''; + +$modversion['templates'][8]['file'] = 'user_avatar_edit.html'; +$modversion['templates'][8]['description'] = ''; + +$modversion['templates'][9]['file'] = 'user_register_finish.html'; +$modversion['templates'][9]['description'] = ''; + +$modversion['templates'][10]['file'] = 'user_misc_online.html'; +$modversion['templates'][10]['description'] = ''; + +//Preference +$modversion['config'][]=array ( + "name"=>"allow_register", + "title"=>"_MI_USER_CONF_ALLOW_REGISTER", + "description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>1 + ); + +$modversion['config'][]=array ( + "name"=>"minpass", + "title"=>"_MI_USER_CONF_MINPASS", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>5 + ); + +$modversion['config'][]=array ( + "name"=>"minuname", + "title"=>"_MI_USER_CONF_MINUNAME", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>3 + ); + +$modversion['config'][]=array ( + "name"=>"maxuname", + "title"=>"_MI_USER_CONF_MAXUNAME", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>10 + ); + +$modversion['config'][]=array ( + "name"=>"allow_chgmail", + "title"=>"_MI_USER_CONF_CHGMAIL", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"new_user_notify", + "title"=>"_MI_USER_CONF_NEW_USER_NOTIFY", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>1 + ); + +$modversion['config'][]=array ( + "name"=>"new_user_notify_group", + "title"=>"_MI_USER_CONF_NEW_NTF_GROUP", + "formtype"=>"group", + "valuetype"=>"int", + "default"=>1 + ); + +$modversion['config'][]=array ( + "name"=>"activation_type", + "title"=>"_MI_USER_CONF_ACTV_TYPE", + "formtype"=>"select", + "options"=>array("_MI_USER_CONF_ACTV_USER"=>0,"_MI_USER_CONF_ACTV_AUTO"=>1,"_MI_USER_CONF_ACTV_ADMIN"=>2), + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"activation_group", + "title"=>"_MI_USER_CONF_ACTV_GROUP", + "description"=>"_MI_USER_CONF_ACTV_GROUP_DESC", + "formtype"=>"group", + "valuetype"=>"int", + "default"=>1 + ); + +$modversion['config'][]=array ( + "name"=>"uname_test_level", + "title"=>"_MI_USER_CONF_UNAME_TEST_LEVEL", + "formtype"=>"select", + "options"=>array("_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG"=>0,"_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL"=>1,"_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK"=>2), + "valuetype"=>"int", + "default"=>1 + ); + +$modversion['config'][]=array ( + "name"=>"avatar_allow_upload", + "title"=>"_MI_USER_CONF_AVTR_ALLOW_UP", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"avatar_minposts", + "title"=>"_MI_USER_CONF_AVATAR_MINPOSTS", + "description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"avatar_width", + "title"=>"_MI_USER_CONF_AVATAR_WIDTH", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>80 + ); + +$modversion['config'][]=array ( + "name"=>"avatar_height", + "title"=>"_MI_USER_CONF_AVATAR_HEIGHT", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>80 + ); + +$modversion['config'][]=array ( + "name"=>"avatar_maxsize", + "title"=>"_MI_USER_CONF_AVATAR_MAXSIZE", + "formtype"=>"textbox", + "valuetype"=>"int", + "default"=>35000 + ); + +$modversion['config'][]=array ( + "name"=>"self_delete", + "title"=>"_MI_USER_CONF_SELF_DELETE", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"bad_unames", + "title"=>"_MI_USER_CONF_BAD_UNAMES", + "description"=>"_MI_USER_CONF_BAD_UNAMES_DESC", + "formtype"=>"textarea", + "valuetype"=>"string", + "default"=>"webmaster|^xoops|^admin" + ); + +$modversion['config'][]=array ( + "name"=>"bad_emails", + "title"=>"_MI_USER_CONF_BAD_EMAILS", + "description"=>"_MI_USER_CONF_BAD_EMAILS_DESC", + "formtype"=>"textarea", + "valuetype"=>"string", + "default"=>"xoopscube.org$|xoopscube.jp$" + ); + +$modversion['config'][]=array ( + "name"=>"reg_dispdsclmr", + "title"=>"_MI_USER_CONF_DISPDSCLMR", + "description"=>"_MI_USER_CONF_DISPDSCLMR_DESC", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>0 + ); + +$modversion['config'][]=array ( + "name"=>"reg_disclaimer", + "title"=>"_MI_USER_CONF_DISCLAIMER", + "description"=>"_MI_USER_CONF_DISCLAIMER_DESC", + "formtype"=>"textarea", + "valuetype"=>"string", + "default"=>"" + ); + +// Menu +$modversion['hasMain'] = 1; +$modversion['read_any'] = true; + +// Block +$modversion['blocks'][1]['file'] = "user_login.php"; +$modversion['blocks'][1]['name'] = _MI_USER_BLOCK_LOGIN_NAME; +$modversion['blocks'][1]['description'] = _MI_USER_BLOCK_LOGIN_DESC; +$modversion['blocks'][1]['show_func'] = "b_user_login_show"; +$modversion['blocks'][1]['template'] = 'user_block_login.html'; +$modversion['blocks'][1]['visible_any'] = true; +$modversion['blocks'][1]['show_all_module'] = true; + +$modversion['blocks'][2]['file'] = "user_online.php"; +$modversion['blocks'][2]['name'] = _MI_USER_BLOCK_ONLINE_NAME; +$modversion['blocks'][2]['description'] = _MI_USER_BLOCK_ONLINE_DESC; +$modversion['blocks'][2]['show_func'] = "b_user_online_show"; +$modversion['blocks'][2]['template'] = 'user_block_online.html'; +$modversion['blocks'][3]['show_all_module'] = true; + +$modversion['blocks'][3]['file'] = "user_newusers.php"; +$modversion['blocks'][3]['name'] = _MI_USER_BLOCK_NEWUSERS_NAME; +$modversion['blocks'][3]['description'] = _MI_USER_BLOCK_NEWUSERS_DESC; +$modversion['blocks'][3]['show_func'] = "b_user_newusers_show"; +$modversion['blocks'][3]['template'] = 'user_block_newusers.html'; +$modversion['blocks'][3]['edit_func'] = "b_user_newusers_edit"; +$modversion['blocks'][3]['options'] = "10|1"; +$modversion['blocks'][3]['show_all_module'] = true; + +$modversion['blocks'][4]['file'] = "user_topusers.php"; +$modversion['blocks'][4]['name'] = _MI_USER_BLOCK_TOPUSERS_NAME; +$modversion['blocks'][4]['description'] = _MI_USER_BLOCK_TOPUSERS_DESC; +$modversion['blocks'][4]['show_func'] = "b_user_topusers_show"; +$modversion['blocks'][4]['template'] = 'user_block_topusers.html'; +$modversion['blocks'][4]['edit_func'] = "b_user_topusers_edit"; +$modversion['blocks'][4]['options'] = "10|1"; +$modversion['blocks'][4]['show_all_module'] = true; +?> From minahito @ users.sourceforge.jp Sun Aug 6 01:48:44 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 01:48:44 +0900 Subject: [xoops-cvslog 3998] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060805164844.C274D2AC0FA@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/online.php diff -u xoops2jp/html/modules/base/class/online.php:1.1.2.3 xoops2jp/html/modules/base/class/online.php:removed --- xoops2jp/html/modules/base/class/online.php:1.1.2.3 Fri Aug 4 13:35:01 2006 +++ xoops2jp/html/modules/base/class/online.php Sun Aug 6 01:48:44 2006 @@ -1,34 +0,0 @@ -initVar('online_uid', XOBJ_DTYPE_INT, '0', true); - $this->initVar('online_uname', XOBJ_DTYPE_STRING, '', true, 25); - $this->initVar('online_updated', XOBJ_DTYPE_INT, '0', true); - $this->initVar('online_module', XOBJ_DTYPE_INT, '0', true); - $this->initVar('online_ip', XOBJ_DTYPE_STRING, '', true, 15); - } - - function loadModule() - { - if ($this->get('online_module')) { - $handler =& xoops_gethandler('module'); - $this->mModule =& $handler->get($this->get('online_module')); - } - } -} - -class BaseOnlineHandler extends XoopsObjectGenericHandler -{ - var $mTable = "online"; - var $mPrimary = ""; - var $mClass = "BaseOnlineObject"; -} - -?> From minahito @ users.sourceforge.jp Sun Aug 6 09:52:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 09:52:56 +0900 Subject: [xoops-cvslog 3999] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060806005256.52ED62AC111@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.3 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.4 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.3 Sat Aug 5 15:19:47 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Sun Aug 6 09:52:56 2006 @@ -42,11 +42,8 @@
  • 「base module」の名称(ディレクトリ名を含む)は、正式版までに「Legacy module」に変更の予定です。
  • 「互換モジュール」のモジュールインストーラが一部のモジュールのSQLを正しく処理できないという問題があります。その場合「system module」を使ってインストールしてください。
  • 幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。
  • -
  • モジュールアップデートの際には、モジュールの設定情報が初期値に戻ります。
  • -
  • misc.phpに依存した機能の「SSLログイン」「友達に知らせる」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。
  • -
  • テンプレートマネージャーは現在開発試験中です。使用中のテンプレートと、defaultテンプレートの数に違いが生じたとき、作成や削除を行うことが出来ません。また、テンプレートファイルのアップロード・ダウンロードを管理画面上から行う事は出来ません。
  • +
  • misc.phpに依存した機能の「SSLログイン」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。
  • 旧バージョンからのアップグレードスクリプトは、本バージョンには含まれません。アップグレードスクリプトは、β版から提供される予定です。
  • -
  • 旧来のシステムモジュールは、その機能が他の新しいモジュールへの移行が完了するまでのあいだそのまま残されています。移行が完了するまでの間、新しいモジュールとシステムモジュールの間で機能が重複する部分がありますがご了承下さい。
  • IISを利用した環境の場合、.sqlファイルを持つモジュールのインストールが上手く行かないケースがあります。IISを利用されている方からの動作状況の報告をお待ちしております。
@@ -57,4 +54,8 @@
  • モジュール管理に新型の SQL パーサを搭載できていない。現在の SQL パーサは若干のファイルで問題がある。
  • カスタムブロックにプレビュー機能がなく、実装されなくてはならない。
  • ユーザー検索において、前方一致や後方一致の指定ができなくなっている。
  • +
  • メールジョブ送信において、送信後、 headers already sent が発生する。
  • +
  • XOOPS Cube における新しい SSL ログインが実装されていない。旧 SSL ログインは再考の余地があります。
  • +
  • モジュールコンフィグにポートされた設定項目が一部、全体の設定項目に残っている。
  • +
  • モジュールコンフィグの大きな初期値をうまく設定する方法を考えなければならない。(ユーザーモジュールなどで)
  • From minahito @ users.sourceforge.jp Sun Aug 6 09:52:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 09:52:56 +0900 Subject: [xoops-cvslog 4000] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060806005256.7818E2AC15C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.3 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.4 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.3 Sat Aug 5 15:19:47 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Sun Aug 6 09:52:56 2006 @@ -41,12 +41,12 @@

    TODO (What's coming?)

      -
    • 'Legacy module' cann't install some modules' SQL file correctly. If you meet this problem, use old module installer of 'system'.
    • Name of this module would be changed to 'Legacy module' form 'Base module'.
    • -
    • Comment function (Legacy files(in 2.0.x) for comments is used in this release.)
    • -
    • Function of Event notify (It is disabled in this release.)
    • +
    • 'Legacy module' cann't install some modules' SQL file correctly. If you meet this problem, use old module installer of 'system'.
    • +
    • Some modules which depend on minor global variables of XOOPS2, can not be installed in XOOPS Cube Legacy 2.1. +
    • 'SSL Login' and 'Avatar list' isn't available in misc.php. Avatar list has been ported to the user module.
    • Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)
    • -
    • Adding some disabled function in misc.php .
    • +
    • IIS may not install modules which have SQL file. If you meet such troubles, please report to us.

    Cube 2.1 Legacy alpha4 Problems (ToDo) of the core team

    @@ -56,4 +56,8 @@
  • We haven't committed new type SQL parser class into this module. Current SQL parser in the module install feature often triggers errors in some SQL files.
  • The preview feature in custom blocks has to be implemented.
  • Users can't use forward-match and backward-match in the user search. These search options are available in XOOPS2.
  • +
  • Sending mailjob triggers 'headers already sent'. We have to fix it.
  • +
  • SSL Login feature of XOOPS Cube Legacy 2.1 hasn't been implemented. Old SSL Login is bad.
  • +
  • Some config items have been ported from general settings. But, we still haven't removed these items in general setting.
  • +
  • We have to decide the method that users install large initialize values into module config items. (user module)
  • From minahito @ users.sourceforge.jp Sun Aug 6 10:00:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 10:00:09 +0900 Subject: [xoops-cvslog 4001] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060806010009.EF0032AC111@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.4 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.5 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.4 Sun Aug 6 09:52:56 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Sun Aug 6 10:00:09 2006 @@ -58,4 +58,5 @@
  • XOOPS Cube における新しい SSL ログインが実装されていない。旧 SSL ログインは再考の余地があります。
  • モジュールコンフィグにポートされた設定項目が一部、全体の設定項目に残っている。
  • モジュールコンフィグの大きな初期値をうまく設定する方法を考えなければならない。(ユーザーモジュールなどで)
  • +
  • XCube_NewDelegate クラスを XCube_Delegate クラスで置き換える
  • From minahito @ users.sourceforge.jp Sun Aug 6 10:00:10 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 10:00:10 +0900 Subject: [xoops-cvslog 4002] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060806010010.35DEA2AC15A@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.4 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.5 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.4 Sun Aug 6 09:52:56 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Sun Aug 6 10:00:10 2006 @@ -60,4 +60,5 @@
  • SSL Login feature of XOOPS Cube Legacy 2.1 hasn't been implemented. Old SSL Login is bad.
  • Some config items have been ported from general settings. But, we still haven't removed these items in general setting.
  • We have to decide the method that users install large initialize values into module config items. (user module)
  • +
  • We shall replace XCube_NewDelegate with XCube_Delegate.
  • From minahito @ users.sourceforge.jp Sun Aug 6 10:00:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 6 Aug 2006 10:00:52 +0900 Subject: [xoops-cvslog 4003] CVS update: xoops2jp/html/kernel Message-ID: <20060806010052.0C79A2AC111@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Delegate.class.php diff -u xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.10 xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.11 --- xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.10 Mon Jul 10 12:06:28 2006 +++ xoops2jp/html/kernel/XCube_Delegate.class.php Sun Aug 6 10:00:51 2006 @@ -1,6 +1,6 @@ 0) { $this->_setSignatures(func_get_args()); @@ -290,6 +290,13 @@ } /** + * Compatibility class name. + */ +class XCube_NewDelegate extends XCube_Delegate +{ +} + +/** * This is the agent of un-registered delegate objects. Usually, connected * functions can't be added to un-registered delegates. When destination * delegates are un-registered yet, this manager is keeping those functions From onokazu @ users.sourceforge.jp Sun Aug 6 22:07:08 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Sun, 6 Aug 2006 22:07:08 +0900 Subject: [xoops-cvslog 4004] CVS update: xoops2jp/html/include Message-ID: <20060806130708.285942AC068@users.sourceforge.jp> Index: xoops2jp/html/include/session.php diff -u xoops2jp/html/include/session.php:1.2 xoops2jp/html/include/session.php:1.3 --- xoops2jp/html/include/session.php:1.2 Tue Aug 1 11:55:25 2006 +++ xoops2jp/html/include/session.php Sun Aug 6 22:07:08 2006 @@ -31,6 +31,9 @@ $sess_handler =& xoops_gethandler('session'); session_set_save_handler(array(&$sess_handler, 'open'), array(&$sess_handler, 'close'), array(&$sess_handler, 'read'), array(&$sess_handler, 'write'), array(&$sess_handler, 'destroy'), array(&$sess_handler, 'gc')); session_start(); - $_SESSION = $old_session; + $_SESSION = array(); + foreach (array_keys($old_session) as $key) { + $_SESSION[$key] = $old_session[$key]; + } } ?> \ No newline at end of file Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.15 xoops2jp/html/include/version.php:1.16 --- xoops2jp/html/include/version.php:1.15 Tue Aug 1 11:55:25 2006 +++ xoops2jp/html/include/version.php Sun Aug 6 22:07:08 2006 @@ -1,4 +1,4 @@ \ No newline at end of file From onokazu @ users.sourceforge.jp Sun Aug 6 22:45:53 2006 From: onokazu @ users.sourceforge.jp (onokazu) Date: Sun, 6 Aug 2006 22:45:53 +0900 Subject: [xoops-cvslog 4005] CVS update: xoops2jp/docs Message-ID: <20060806134553.590782AC04C@users.sourceforge.jp> Index: xoops2jp/docs/CHANGES.txt diff -u xoops2jp/docs/CHANGES.txt:1.14 xoops2jp/docs/CHANGES.txt:1.15 --- xoops2jp/docs/CHANGES.txt:1.14 Tue Aug 1 11:55:25 2006 +++ xoops2jp/docs/CHANGES.txt Sun Aug 6 22:45:53 2006 @@ -1,6 +1,10 @@ XOOPS v2 Changelog ============================ +2006/ 8/ 6: Version 2.0.16a JP +=============================== + - Fixed problem with the handling of $_SESSION in xoops_regenerate_session() not being able to login on some hosts + 2006/ 7/27: Version 2.0.16 JP =============================== - Added routine to regenerate session id after succeessful login (extras/login.php, html/include/checklogin.php, html/include/session.php) From minahito @ users.sourceforge.jp Mon Aug 7 20:24:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:24:25 +0900 Subject: [xoops-cvslog 4006] CVS update: xoops2jp/html/kernel Message-ID: <20060807112425.7B10D2AC1C1@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Delegate.class.php diff -u xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.11 xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.12 --- xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.11 Sun Aug 6 10:00:51 2006 +++ xoops2jp/html/kernel/XCube_Delegate.class.php Mon Aug 7 20:24:25 2006 @@ -1,6 +1,6 @@ mDelegateManager->register($delegateName, $delegate); } } From minahito @ users.sourceforge.jp Mon Aug 7 20:25:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:25:00 +0900 Subject: [xoops-cvslog 4007] CVS update: xoops2jp/html/class Message-ID: <20060807112500.D6EA02AC1C1@users.sourceforge.jp> Index: xoops2jp/html/class/module.textsanitizer.php diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.6 xoops2jp/html/class/module.textsanitizer.php:1.2.8.7 --- xoops2jp/html/class/module.textsanitizer.php:1.2.8.6 Mon Jul 31 18:52:26 2006 +++ xoops2jp/html/class/module.textsanitizer.php Mon Aug 7 20:25:00 2006 @@ -1,5 +1,5 @@ mMakeClickablePre =& new XCube_NewDelegate(); + $this->mMakeClickablePre =& new XCube_Delegate(); $this->mMakeClickablePre->register('MyTextSanitizer.MakeClickablePre'); - $this->mMakeClickablePostFilter =& new XCube_NewDelegate(); + $this->mMakeClickablePostFilter =& new XCube_Delegate(); $this->mMakeClickablePostFilter->register('MyTextSanitizer.MakeClickablePostFilter'); - $this->mXoopsCodePre =& new XCube_NewDelegate(); + $this->mXoopsCodePre =& new XCube_Delegate(); $this->mXoopsCodePre->register('MyTextSanitizer.XoopsCodePre'); - $this->mXoopsCodePostFilter =& new XCube_NewDelegate(); + $this->mXoopsCodePostFilter =& new XCube_Delegate(); $this->mXoopsCodePostFilter->register('MyTextSanitizer.XoopsCodePostFilter'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:26:01 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:26:01 +0900 Subject: [xoops-cvslog 4008] CVS update: xoops2jp/html/class Message-ID: <20060807112601.D37502AC1C1@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_Event.class.php diff -u xoops2jp/html/class/XCube_Event.class.php:1.1.2.9 xoops2jp/html/class/XCube_Event.class.php:removed --- xoops2jp/html/class/XCube_Event.class.php:1.1.2.9 Fri Jan 27 17:25:36 2006 +++ xoops2jp/html/class/XCube_Event.class.php Mon Aug 7 20:26:01 2006 @@ -1,184 +0,0 @@ -_register($major,$minor); - } - - function _register($major,$minor=null) - { - if(is_string($major) && $minor===null) { - $this->mType=XCUBE_CALLBACK_TYPE_STATIC_FUNCTION; - $this->mMethodName=$major; - } - elseif(is_string($major) && is_string($minor)) { - $this->mType=XCUBE_CALLBACK_TYPE_STATIC_METHOD; - $this->mClassName=$major; - $this->mMethodName=$minor; - } - } -} - -/** - * *An experiment class* - * This class abstracts the instance method. - */ -class XCube_InstanceDelegate extends XCube_Delegate -{ - function XCube_InstanceDelegate(&$major,$minor) - { - $this->_register($major,$minor); - } - - function _register(&$major,$minor) - { - if(is_object($major)&&is_string($minor)) { - $this->mType=XCUBE_CALLBACK_TYPE_INSTANCE_METHOD; - $this->mInstance=&$major; - $this->mMethodName=$minor; - } - } -} - -/** - * This class is a collector of Delegate object. - * The registrant can use Array instead of Delegate instance for speed. - */ -class XCube_Event -{ - var $mName; - var $_mDelegates=array(); - - var $_mAnchorDelegate=array(); - - function XCube_Event($name) - { - $this->mName=$name; - } - - /** - * @param $Delegate Delegate object or Array. - */ - function add(&$delegate) - { - $this->_mDelegates[]=&$delegate; - } - - function setAnchorDelegate(&$delegate) - { - $this->_mAnchorDelegate=&$delegate; - } - - function &getDelegates() - { - $this->_mDelegates; - } - - function raiseEvent(&$sender,&$eventArgs) - { - if(count($this->_mDelegates)) { - for($i=0;$i_mDelegates);$i++) { - $this->_callback($this->_mDelegates[$i],$sender,$eventArgs); - } - } - - if($this->_mAnchorDelegate!=null) - $this->_callback($this->_mAnchorDelegate,$sender,$eventArgs); - } - - function _callback(&$delegate,&$sender,&$eventArgs) - { - if(is_object($delegate)) { - $this->_callbackDelegate($delegate,$sender,$eventArgs); - } - elseif(is_array($delegate)) { - $this->_callbackArray($delegate,$sender,$eventArgs); - } - } - - function _callbackDelegate(&$delegate,&$sender,&$eventArgs) - { - switch($delegate->mType) { - case XCUBE_CALLBACK_TYPE_STATIC_METHOD: -// if(method_exists($delegate->mClassName,$delegate->mMethodName)) { - // [PHP BUG] call_user_func can not reference parameter!! - // http://bugs.php.net/bug.php?id=17309 - // http://bugs.php.net/bug.php?id=17246 - // call_user_func(array($delegate->mClassName,$Delegate->mMethodName),$sender,$eventArgs); - $operation = $delegate->mClassName."::".$delegate->mMethodName.'($sender,$eventArgs);'; - eval($operation); -// } - break; - - case XCUBE_CALLBACK_TYPE_INSTANCE_METHOD: - if(method_exists($delegate->mInstance,$delegate->mMethodName)) { - // [PHP BUG] - // call_user_func(array($delegate->mInstance,$Delegate->mMethodName),$sender,$eventArgs); - $methodName=$delegate->mMethodName; - $delegate->mInstance->$methodName($sender,$eventArgs); - } - else { - // - // TODO raise NOTICE - // - } - break; - - case XCUBE_CALLBACK_TYPE_STATIC_FUNCTION: - if(function_exists($delegate->mMethodName)) { - // [PHP BUG] - // call_user_func($delegate->mMethodName,$sender,$eventArgs); - $operation = $delegate->mMethodName.'($sender,$eventArgs);'; - eval($operation); - } - else { - // - // TODO raise NOTICE - // - } - break; - } - } - - function _callbackArray(&$arr,&$sender,&$eventArgs) - { - if(isset($arr['class'])&&is_object($arr['class'])) { - // [PHP BUG] - // call_user_func(array($arr['class'],$arr['function']),$sender,$eventArgs); - $methodName=$arr['function']; - $arr['class']->$methodName($sender,$eventArgs); - } - elseif(isset($arr['class'])&&isset($arr['function'])) { - // [PHP BUG] - // call_user_func(array($arr['class'],$arr['function']),$sender,$eventArgs); - $operation = $arr['class']."::".$arr['function'].'($sender,$eventArgs);'; - eval($operation); - } - elseif(isset($arr['function'])) { - // [PHP BUG] - // call_user_func($arr['function'],$sender,$eventArgs); - $operation = $arr['function'].'($sender,$eventArgs);'; - eval($operation); - } - } -} - -?> \ No newline at end of file Index: xoops2jp/html/class/XCube_EventManager.class.php diff -u xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.11 xoops2jp/html/class/XCube_EventManager.class.php:removed --- xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.11 Fri Apr 21 12:15:31 2006 +++ xoops2jp/html/class/XCube_EventManager.class.php Mon Aug 7 20:26:01 2006 @@ -1,172 +0,0 @@ -_mEvents[$eventName])) - $this->_mEvents[$eventName] = new XCube_Event($eventName); - - $this->_mEvents[$eventName]->add($delegate); - } - - function setAnchorDelegate($eventName,&$delegate) - { - if(!isset($this->_mEvents[$eventName])) - $this->_mEvents[$eventName] = new XCube_Event($eventName); - - $this->_mEvents[$eventName]->setAnchorDelegate($delegate); - } - - function replaceEvent($eventName,&$eventHandler) - { - if(isset($this->_mReserveEventList[$eventName])) { - unset($this->_mReserveEventList[$eventName]); - } - if(isset($this->_mRegistedFlags[$eventName])) { - unset($this->_mRegistedFlags[$eventName]); - } - if(isset($this->_mEvents[$eventName])) { - if(strtolower(get_class($this->_mEvents[$eventName]))=="xcube_event") { - // - // TODO : omg! We access private property. - // - foreach($this->_mEvents[$eventName]->_mDelegates as $delegate) { - $eventHandler->_mDelegates[]=$delegate; - unset($delegate); - } - unset($this->_mEvents[$eventName]); - $this->_mEvents[$eventName]=&$eventHandler; - } - } - else { - $this->_mEvents[$eventName]=&$eventHandler; - } - } - - function raiseEvent($eventName,&$sender,&$eventArgs) - { - if(isset($this->_mReserveEventList[$eventName])&&$this->_mRegistedFlags[$eventName]==false) { - $this->_processProxyRegist($eventName); - } - - if(isset($this->_mEvents[$eventName])) { - $this->_mEvents[$eventName]->raiseEvent($sender,$eventArgs); - - return true; - } - return false; - } - - function addProxyRegister(&$register) - { - $i=count($this->_mProxyRegisters)+1; - $this->_mProxyRegisters[$i]=&$register; - - $list=$register->getEventNameList(); - foreach($list as $name) { - if(!isset($this->_mReserveEventList[$name])) { - $this->_mReserveEventList[$name]=array(); - $this->_mRegistedFlags[$name]=false; - } - - $this->_mReserveEventList[$name][]=$i; - } - } - - function _processProxyRegist($eventName) - { - $this->_mRegistedFlags[$eventName]=true; - foreach($this->_mReserveEventList[$eventName] as $i) { - $this->add($eventName,$this->_mProxyRegisters[$i]->createDelegate($eventName)); - } - } -} - -/** - * This class tells a manager about a list of the event that the Delegate which this class can create. - * And this class creates Delegate when the manager needs Delegate. - * Developer does not need to use this by all means. - */ -class XCube_EventProxyRegister -{ - /** - * @return array - */ - function getEventNameList() - { - } - - function &createDelegate($name) - { - $ret =null; - $methodName=str_replace(".","_","create".ucfirst($name)."Delegate"); - if(method_exists($this,$methodName)) { - // - // Couldn't use user_call_func to receive reference. - // - $ret =& $this->$methodName(); - } - - return $ret; - } -} - -/** - * - * Static Utility methods for XCube_EventManager - * - */ -class XCube_EventUtils -{ - /** - Simple Raise Event method; - */ - function &quickRaiseEvent($event, $eventArgs = array()) - { - $root=&XCube_Root::getSingleton(); - if ($root->mEventManager->raiseEvent($event, $root->mController, $eventArgs)) { - return $eventArgs; - } else { - $ret = null; - return $ret; - } - } - - /** - Simple Text Filterling with Event mechanism - */ - function quickApplyFilter($filter, $string, $optionArgs = array()) - { - $root=&XCube_Root::getSingleton(); - $eventArgs = array_merge(array('string' => $string), $optionArgs); - if ($root->mEventManager->raiseEvent($filter, $root->mController, $eventArgs)) { - return $eventArgs['string']; - } else { - return $string; - } - } -} -?> \ No newline at end of file Index: xoops2jp/html/class/XCube_EventArgs.class.php diff -u xoops2jp/html/class/XCube_EventArgs.class.php:1.1.2.1 xoops2jp/html/class/XCube_EventArgs.class.php:removed --- xoops2jp/html/class/XCube_EventArgs.class.php:1.1.2.1 Wed Nov 9 20:53:01 2005 +++ xoops2jp/html/class/XCube_EventArgs.class.php Mon Aug 7 20:26:01 2006 @@ -1,81 +0,0 @@ -mUser!=null; - } - - function hasXoopsUser() - { - return $this->mUser!=null; - } - - function setUser(&$user) - { - $this->mUser=&$user; - } - - function &getUser() - { - return $this->mUser; - } - - function setXoopsUser(&$user) - { - $this->mXoopsUser=&$user; - } - - function &getXoopsUser() - { - return $this->mXoopsUser; - } -} - -class CheckLoginEventArgs extends LoginEventArgs -{ - var $mSuccessFlag=false; - var $mRedirectUrl=XOOPS_URL; - var $mRedirectMessage=null; - - function setSuccessFlag($flag) - { - $this->mSuccessFlag=$flag; - } - - function getSuccessFlag() - { - return $this->mSuccessFlag; - } - - function isSuccess() - { - return $this->mSuccessFlag; - } - - function setRedirectUrl($url) - { - $this->mRedirectMessage=$url; - } - - function getRedirectUrl() - { - return $this->mRedirectUrl; - } - - function setRedirectMessage($message) - { - $this->mRedirectMessage=$message; - } - - function getRedirectMessage() - { - return $this->mRedirectMessage; - } -} - -?> \ No newline at end of file From minahito @ users.sourceforge.jp Mon Aug 7 20:26:44 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:26:44 +0900 Subject: [xoops-cvslog 4009] CVS update: xoops2jp/html/class Message-ID: <20060807112644.837FC2AC1C1@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_ServiceManager.class.php diff -u xoops2jp/html/class/XCube_ServiceManager.class.php:1.1.2.3 xoops2jp/html/class/XCube_ServiceManager.class.php:1.1.2.4 --- xoops2jp/html/class/XCube_ServiceManager.class.php:1.1.2.3 Wed Jun 28 14:44:21 2006 +++ xoops2jp/html/class/XCube_ServiceManager.class.php Mon Aug 7 20:26:44 2006 @@ -1,4 +1,8 @@ mCreateClient =& new XCube_NewDelegate(); + $this->mCreateClient =& new XCube_Delegate(); $this->mCreateClient->register("XCube_ServiceManager.CreateClient"); } From minahito @ users.sourceforge.jp Mon Aug 7 20:27:26 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:27:26 +0900 Subject: [xoops-cvslog 4010] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060807112726.F271D2AC1C2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/BackendAction.class.php diff -u xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.6 xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.6 Fri Aug 4 13:32:24 2006 +++ xoops2jp/html/modules/base/actions/BackendAction.class.php Mon Aug 7 20:27:26 2006 @@ -18,7 +18,7 @@ * $item['category'] ... not required. * $item['author'] ... not required. * - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mGetRSSItems = null; @@ -26,7 +26,7 @@ { parent::Legacy_Action($flag); - $this->mGetRSSItems =& new XCube_NewDelegate(); + $this->mGetRSSItems =& new XCube_Delegate(); $this->mGetRSSItems->register('Legacy_BackendAction.GetRSSItems'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:27:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:27:35 +0900 Subject: [xoops-cvslog 4011] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060807112735.0951B2AC1C2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.1 Wed Apr 5 19:57:52 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php Mon Aug 7 20:27:34 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.7 Tue Aug 1 19:28:30 2006 +++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php Mon Aug 7 20:27:47 2006 @@ -88,7 +88,7 @@ { parent::Legacy_Action($flag); - $this->mSearchAction =& new XCube_NewDelegate(); + $this->mSearchAction =& new XCube_Delegate(); $this->mSearchAction->register('Legacy_ActSearchAction.SearchAction'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:28:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:28:04 +0900 Subject: [xoops-cvslog 4013] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060807112804.01E782AC1C2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.11 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.12 --- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.11 Tue Aug 1 19:31:27 2006 +++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Mon Aug 7 20:28:04 2006 @@ -1,7 +1,7 @@ mCreateHelpSmarty =& new XCube_NewDelegate(); + $this->mCreateHelpSmarty =& new XCube_Delegate(); $this->mCreateHelpSmarty->add(array(&$this, '_createHelpSmarty')); $this->mCreateHelpSmarty->register('Legacy_HelpAction.CreateHelpSmarty'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:28:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:28:29 +0900 Subject: [xoops-cvslog 4014] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060807112829.7B22C2AC1C2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.6 Thu Jul 27 14:58:56 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php Mon Aug 7 20:28:29 2006 @@ -1,7 +1,7 @@ mUpdateSuccess =& new XCube_NewDelegate(); + $this->mUpdateSuccess =& new XCube_Delegate(); $this->mUpdateSuccess->register('Legacy_ModuleUpdateAction.UpdateSuccess'); - $this->mUpdateFail =& new XCube_NewDelegate(); + $this->mUpdateFail =& new XCube_Delegate(); $this->mUpdateFail->register('Legacy_ModuleUpdateAction.UpdateFail'); } Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.11 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.12 --- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.11 Tue Aug 1 19:34:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php Mon Aug 7 20:28:29 2006 @@ -1,7 +1,7 @@ mInstallSuccess =& new XCube_NewDelegate(); + $this->mInstallSuccess =& new XCube_Delegate(); $this->mInstallSuccess->register('Legacy_ModuleInstallAction.InstallSuccess'); - $this->mInstallFail =& new XCube_NewDelegate(); + $this->mInstallFail =& new XCube_Delegate(); $this->mInstallFail->register('Legacy_ModuleInstallAction.InstallFail'); } Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.6 Thu Jul 27 14:58:56 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php Mon Aug 7 20:28:29 2006 @@ -1,6 +1,7 @@ mUninstallSuccess =& new XCube_NewDelegate(); + $this->mUninstallSuccess =& new XCube_Delegate(); $this->mUninstallSuccess->register('Legacy_ModuleUninstallAction.UninstallSuccess'); - $this->mUninstallFail =& new XCube_NewDelegate(); + $this->mUninstallFail =& new XCube_Delegate(); $this->mUninstallFail->register('Legacy_ModuleUninstallAction.UninstallFail'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:28:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:28:45 +0900 Subject: [xoops-cvslog 4015] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060807112845.708F22AC1C1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.11 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.12 --- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.11 Sat Aug 5 15:18:02 2006 +++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Mon Aug 7 20:28:45 2006 @@ -13,14 +13,16 @@ var $mObjects = array(); var $mActionForm = null; + + var $mState = null; function prepare(&$controller, &$xoopsUser) { $controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('comment'); $controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('notification'); - $state = (xoops_getrequest('confmod_id') > 0) ? new Legacy_ModulePreferenceEditState($this) : new Legacy_PreferenceEditState($this); - $state->prepare($controller, $xoopsUser); + $this->mState = (xoops_getrequest('confmod_id') > 0) ? new Legacy_ModulePreferenceEditState($this) : new Legacy_PreferenceEditState($this); + $this->mState->prepare($controller, $xoopsUser); if ($this->mPreparedFlag) { $handler =& xoops_gethandler('config'); @@ -49,6 +51,10 @@ return LEGACY_FRAME_VIEW_ERROR; } + if (xoops_getrequest('_form_control_cancel') != null) { + return LEGACY_FRAME_VIEW_CANCEL; + } + $this->mActionForm->fetch(); $this->mActionForm->validate(); @@ -141,7 +147,7 @@ function executeViewSuccess(&$controller, &$xoopsUser, &$render) { - $controller->executeForward("./index.php?action=PreferenceList"); + $this->mState->executeViewSuccess($controller, $xoopsUser, $render); } function executeViewError(&$controller, &$xoopsUser, &$render) @@ -151,7 +157,7 @@ function executeViewCancel(&$controller, &$xoopsUser, &$render) { - $controller->executeForward("./index.php?action=PreferenceList"); + $this->mState->executeViewCancel($controller, $xoopsUser, $render); } } @@ -167,6 +173,14 @@ function prepare(&$controller, &$xoopsUser) { } + + function executeViewSuccess(&$controller, &$xoopsUser, &$render) + { + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + } } class Legacy_PreferenceEditState extends Legacy_AbstractPreferenceEditState @@ -186,6 +200,16 @@ $this->_mMaster->mPreparedFlag = true; } + + function executeViewSuccess(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=PreferenceList"); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + $controller->executeForward("./index.php?action=PreferenceList"); + } } class Legacy_ModulePreferenceEditState extends Legacy_AbstractPreferenceEditState @@ -211,6 +235,22 @@ $this->_mMaster->mPreparedFlag = true; } + + function executeViewSuccess(&$controller, &$xoopsUser, &$render) + { + // + // TODO The following URL is a wrong for some module which hasn't admin directory. + // + $controller->executeForward(XOOPS_MODULE_URL . '/' . $this->_mMaster->mModule->get('dirname') . '/admin/'); + } + + function executeViewCancel(&$controller, &$xoopsUser, &$render) + { + // + // TODO The following URL is a wrong for some module which hasn't admin directory. + // + $controller->executeForward(XOOPS_MODULE_URL . '/' . $this->_mMaster->mModule->get('dirname') . '/admin/'); + } } ?> From minahito @ users.sourceforge.jp Mon Aug 7 20:29:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:29:29 +0900 Subject: [xoops-cvslog 4016] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060807112929.DF7DC2AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.1 Fri May 12 19:14:22 2006 +++ xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php Mon Aug 7 20:29:29 2006 @@ -17,7 +17,7 @@ function getTokenName() { - return "module.base.PreferenceEditForm.TOKEN" . $this->mId; + return "module.base.PreferenceEditForm.TOKEN" . $this->getCategoryId(); } function getCategoryId() @@ -125,7 +125,7 @@ function getTokenName() { - return "module.base.ModulePreferenceEditForm.TOKEN" . $this->mId; + return "module.base.ModulePreferenceEditForm.TOKEN" . $this->getModuleId(); } function getCategoryId() From minahito @ users.sourceforge.jp Mon Aug 7 20:29:43 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:29:43 +0900 Subject: [xoops-cvslog 4017] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060807112943.9B6592AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/comment.php diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.9 xoops2jp/html/modules/base/class/comment.php:1.1.2.10 --- xoops2jp/html/modules/base/class/comment.php:1.1.2.9 Mon Jul 31 19:22:13 2006 +++ xoops2jp/html/modules/base/class/comment.php Mon Aug 7 20:29:43 2006 @@ -75,12 +75,12 @@ var $mClass = "BaseCommentObject"; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mUpdateSuccess; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mDeleteSuccess; @@ -88,8 +88,8 @@ { parent::XoopsObjectGenericHandler($db); - $this->mUpdateSuccess =& new XCube_NewDelegate(); - $this->mDeleteSuccess =& new XCube_NewDelegate(); + $this->mUpdateSuccess =& new XCube_Delegate(); + $this->mDeleteSuccess =& new XCube_Delegate(); } function insert(&$comment, $force = false) From minahito @ users.sourceforge.jp Mon Aug 7 20:29:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:29:51 +0900 Subject: [xoops-cvslog 4018] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060807112951.91B002AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/theme.php diff -u xoops2jp/html/modules/base/class/theme.php:1.1.2.1 xoops2jp/html/modules/base/class/theme.php:1.1.2.2 --- xoops2jp/html/modules/base/class/theme.php:1.1.2.1 Wed Aug 2 18:37:52 2006 +++ xoops2jp/html/modules/base/class/theme.php Mon Aug 7 20:29:51 2006 @@ -26,13 +26,13 @@ var $_mResults = array(); /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mGetInstalledThemes = null; function BaseThemeHandler(&$db) { - $this->mGetInstalledThemes =& new XCube_NewDelegate(); + $this->mGetInstalledThemes =& new XCube_Delegate(); $this->mGetInstalledThemes->register('BaseThemeHandler.GetInstalledThemes'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:29:59 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:29:59 +0900 Subject: [xoops-cvslog 4019] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060807112959.BC72E2AC1C5@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.8 xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.9 --- xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.8 Mon Jul 31 19:32:24 2006 +++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php Mon Aug 7 20:29:59 2006 @@ -12,14 +12,14 @@ var $mAdaptee; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mSearchAction = null; function Legacy_ModuleAdapter(&$xoopsModule) { $this->mAdaptee =& $xoopsModule; - $this->mSearchAction =& new XCube_NewDelegate(); + $this->mSearchAction =& new XCube_Delegate(); $this->mSearchAction->register('Legacy_ModuleAdapter.SearchAction'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:30:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:30:16 +0900 Subject: [xoops-cvslog 4020] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060807113016.8B8E52AC1C5@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.62 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.63 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.62 Sat Aug 5 15:19:33 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Mon Aug 7 20:30:16 2006 @@ -1,7 +1,7 @@ mSiteLogin =& new XCube_NewDelegate(); + $this->mSiteLogin =& new XCube_Delegate(); $this->mSiteLogin->register("Site.Login"); - $this->mGetCountUnreadPM =& new XCube_NewDelegate(); - $this->mGetPMInboxUrl =& new XCube_NewDelegate(); + $this->mGetCountUnreadPM =& new XCube_Delegate(); + $this->mGetPMInboxUrl =& new XCube_Delegate(); - $this->mCheckLogin =& new XCube_NewDelegate(); + $this->mCheckLogin =& new XCube_Delegate(); $this->mCheckLogin->register("Site.CheckLogin"); - $this->mLogout =& new XCube_NewDelegate(); + $this->mLogout =& new XCube_Delegate(); $this->mLogout->register("Site.Logout"); - $this->mCreateLanguageManager =& new XCube_NewDelegate(); + $this->mCreateLanguageManager =& new XCube_Delegate(); $this->mCreateLanguageManager->register("Legacy_Controller.CreateLanguageManager"); set_magic_quotes_runtime(0); // ^^; From minahito @ users.sourceforge.jp Mon Aug 7 20:30:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:30:35 +0900 Subject: [xoops-cvslog 4021] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060807113035.BC59E2AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.8 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.8 Thu Aug 3 18:39:12 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Mon Aug 7 20:30:35 2006 @@ -114,6 +114,9 @@ "xoops_upload_url" => XOOPS_UPLOAD_URL) ); + if ($controller->getConfig('theme_fromfile')) { + $this->mSmarty->force_compile = true; + } } function renderBlock(&$target) From minahito @ users.sourceforge.jp Mon Aug 7 20:30:59 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:30:59 +0900 Subject: [xoops-cvslog 4022] CVS update: xoops2jp/html/modules/base/preload Message-ID: <20060807113059.5E9392AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.6 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.7 --- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.6 Wed Aug 2 18:38:44 2006 +++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php Mon Aug 7 20:30:59 2006 @@ -1,7 +1,7 @@ mIsSelectableTheme =& new XCube_NewDelegate(); + $this->mIsSelectableTheme =& new XCube_Delegate(); $this->mIsSelectableTheme->register('Base_ThemeSelect.IsSelectableTheme'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:32:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:32:00 +0900 Subject: [xoops-cvslog 4023] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060807113200.58DED2AC1C7@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.2 --- xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.1 Fri Jul 28 17:55:38 2006 +++ xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php Mon Aug 7 20:32:00 2006 @@ -10,14 +10,14 @@ var $mActionForm = null; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mGetUserPosts = null; function User_UserViewAction() { parent::User_AbstractViewAction(); - $this->mGetUserPosts =& new XCube_NewDelegate(); + $this->mGetUserPosts =& new XCube_Delegate(); $this->mGetUserPosts->register('User_UserViewAction.GetUserPosts'); } From minahito @ users.sourceforge.jp Mon Aug 7 20:32:17 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:32:17 +0900 Subject: [xoops-cvslog 4024] CVS update: xoops2jp/html/modules/user/admin/forms Message-ID: <20060807113217.BB8802AC1C7@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.10 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.11 --- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.10 Wed Jul 19 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php Mon Aug 7 20:32:17 2006 @@ -1,7 +1,7 @@ _mIsNew = $obj->isNew(); $groups =& $obj->getGroups(); - $i = 0; - foreach ($groups as $gid) { - $this->set('groups', $i++, $gid); + + if ($this->_mIsNew) { + $this->set('groups', 0, XOOPS_GROUP_USERS); + } + else { + $i = 0; + foreach ($groups as $gid) { + $this->set('groups', $i++, $gid); + } } } From minahito @ users.sourceforge.jp Mon Aug 7 20:32:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 7 Aug 2006 20:32:25 +0900 Subject: [xoops-cvslog 4025] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060807113225.DDB6B2AC1C7@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/mailjob.php diff -u xoops2jp/html/modules/user/class/mailjob.php:1.1.2.6 xoops2jp/html/modules/user/class/mailjob.php:1.1.2.7 --- xoops2jp/html/modules/user/class/mailjob.php:1.1.2.6 Thu Jul 13 19:54:47 2006 +++ xoops2jp/html/modules/user/class/mailjob.php Mon Aug 7 20:32:25 2006 @@ -9,17 +9,17 @@ var $mUserCount = 0; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mGetReplaceTitle = null; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mGetReplaceBody = null; /** - * @var XCube_NewDelegate + * @var XCube_Delegate */ var $mSend = null; @@ -34,13 +34,13 @@ $this->initVar('is_mail', XOBJ_DTYPE_BOOL, '0', true); $this->initVar('create_unixtime', XOBJ_DTYPE_INT, time(), true); - $this->mGetReplaceTitle =& new XCube_NewDelegate(); + $this->mGetReplaceTitle =& new XCube_Delegate(); $this->mGetReplaceTitle->register('UserMailjobObject.GetReplaceTitle'); - $this->mGetReplaceBody =& new XCube_NewDelegate(); + $this->mGetReplaceBody =& new XCube_Delegate(); $this->mGetReplaceBody->register('UserMailjobObject.GetReplaceBody'); - $this->mSend =& new XCube_NewDelegate(); + $this->mSend =& new XCube_Delegate(); $this->mSend->register('UserMailjobObject.Send'); } From minahito @ users.sourceforge.jp Tue Aug 8 13:48:24 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 13:48:24 +0900 Subject: [xoops-cvslog 4026] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060808044825.03BCA2AC08C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.21 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.22 --- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.21 Thu Aug 3 23:29:20 2006 +++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Tue Aug 8 13:48:24 2006 @@ -1,6 +1,6 @@ getConfigsByCat(0, $legacyRender->get('mid')); - foreach ($configs as $name => $value) { - // prefix each tag with 'xoops_' - $this->mXoopsTpl->assign('xoops_' . $name, $value); - } + $this->mXoopsTpl->assign('xoops_meta_keywords', $configs['meta_keywords']); + $this->mXoopsTpl->assign('xoops_meta_description', $configs['meta_description']); + $this->mXoopsTpl->assign('xoops_meta_robots', $configs['meta_robots']); + $this->mXoopsTpl->assign('xoops_meta_rating', $configs['meta_rating']); + $this->mXoopsTpl->assign('xoops_meta_author', $configs['meta_author']); + $this->mXoopsTpl->assign('xoops_meta_copyright', $configs['meta_copyright']); + $this->mXoopsTpl->assign('xoops_footer', $configs['footer']); } // -------------------------------------- From minahito @ users.sourceforge.jp Tue Aug 8 16:36:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 16:36:03 +0900 Subject: [xoops-cvslog 4027] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060808073603.EDA002AC1D3@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.18 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:removed --- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.18 Fri Aug 4 13:34:43 2006 +++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php Tue Aug 8 16:36:03 2006 @@ -1,170 +0,0 @@ -mModuleObject) && $this->mModuleObject->getVar('isactive'); - } - - /** - * Check current user's permission, return boolean as its result. If current - * module's dirname is Base or System, check whether current user has one of - * the permissions of administrator. - * - * The check of this method is loose for Base module and System module only. - * But, In Base module's controller, system must check his permission strictly. - * - * @access public - * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm... - * @return bool - */ - function hasPermission() - { - $xoopsUser =& $this->mController->getXoopsUser(); - - // - // The guest user is never administrator. - // - if (!is_object($xoopsUser)) - return false; - - // - // Decide $mid as a argument for checkRight() by current module's dirname. - // - $mid = 0; - if ($this->mModuleObject->get('dirname') == 'base' || $this->mModuleObject->get('dirname') == 'system') { - $mid = -1; - } - else { - $mid = $this->mModuleObject->get('mid'); - } - - $modPermHandler =& xoops_gethandler('groupperm'); - return $modPermHandler->checkRight('module_admin', $mid, $xoopsUser->getGroups()); - } - - /** - @return void - */ - function setupModuleObject($dirname = null) - { - if ($dirname == null) { - $dirname = $this->_getDirname(); - } - - $moduleHandler =& xoops_gethandler('module'); - - // - // When user accesses to root/admin.php, $dirname is null. - // - $module = null; - if($dirname != null) { - $module=&$moduleHandler->getByDirname($dirname); - } - else { - $module =& $moduleHandler->getByDirname("base"); - } - - // - // We must set $xoopsModule to some module that use $xoopsModule in message catalog file. - // - $GLOBALS['xoopsModule']=&$module; - - $dmy =& $module->getInfo(); - - // - // Load admin menu, and add preference menu by own judge. - // - $module->loadAdminMenu(); - if ($module->getVar('hasnotification') - || ($module->getInfo('config') && is_array($module->getInfo('config'))) - || ($module->getInfo('comments') && is_array($module->getInfo('comments')))) { - $module->adminmenu[] = array( - 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getVar('mid'), - 'title' => _PREFERENCES, - 'absolute' => true); - } - - $this->mModuleObject =& $module; - } - - - /** - * @access private - */ - function _getDirname() - { - $url_arr = explode("/",strstr($_SERVER['REQUEST_URI'],'/modules/')); - return isset($url_arr[2]) ? $url_arr[2] : null; - } - - function setupLanguage() - { - $languageManager =& $this->mController->mRoot->getLanguageManager(); - $languageManager->loadModuleAdminMessageCatalog($this->mModuleObject->getVar('dirname')); - $languageManager->loadModinfoMessageCatalog($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')."/admin"; - } - - /** - * Return module's directory name. This function is dependent on the design - * of Legacy. - */ - function getDirname() - { - return is_object($this->mModuleObject) ? $this->mModuleObject->get('dirname') : null; - } - - function &getXoopsModule() - { - return $this->mModuleObject; - } - - function getDependRenderSystem() - { - return "Legacy_AdminRenderSystem"; - } -} - -?> \ No newline at end of file From minahito @ users.sourceforge.jp Tue Aug 8 16:36:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 16:36:18 +0900 Subject: [xoops-cvslog 4028] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060808073618.72E3A2AC1D2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php diff -u /dev/null xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.1 --- /dev/null Tue Aug 8 16:36:18 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php Tue Aug 8 16:36:18 2006 @@ -0,0 +1,170 @@ +mModuleObject) && $this->mModuleObject->getVar('isactive'); + } + + /** + * Check current user's permission, return boolean as its result. If current + * module's dirname is Base or System, check whether current user has one of + * the permissions of administrator. + * + * The check of this method is loose for Base module and System module only. + * But, In Base module's controller, system must check his permission strictly. + * + * @access public + * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm... + * @return bool + */ + function hasPermission() + { + $xoopsUser =& $this->mController->getXoopsUser(); + + // + // The guest user is never administrator. + // + if (!is_object($xoopsUser)) + return false; + + // + // Decide $mid as a argument for checkRight() by current module's dirname. + // + $mid = 0; + if ($this->mModuleObject->get('dirname') == 'base' || $this->mModuleObject->get('dirname') == 'system') { + $mid = -1; + } + else { + $mid = $this->mModuleObject->get('mid'); + } + + $modPermHandler =& xoops_gethandler('groupperm'); + return $modPermHandler->checkRight('module_admin', $mid, $xoopsUser->getGroups()); + } + + /** + @return void + */ + function setupModuleObject($dirname = null) + { + if ($dirname == null) { + $dirname = $this->_getDirname(); + } + + $moduleHandler =& xoops_gethandler('module'); + + // + // When user accesses to root/admin.php, $dirname is null. + // + $module = null; + if($dirname != null) { + $module=&$moduleHandler->getByDirname($dirname); + } + else { + $module =& $moduleHandler->getByDirname("base"); + } + + // + // We must set $xoopsModule to some module that use $xoopsModule in message catalog file. + // + $GLOBALS['xoopsModule']=&$module; + + $dmy =& $module->getInfo(); + + // + // Load admin menu, and add preference menu by own judge. + // + $module->loadAdminMenu(); + if ($module->getVar('hasnotification') + || ($module->getInfo('config') && is_array($module->getInfo('config'))) + || ($module->getInfo('comments') && is_array($module->getInfo('comments')))) { + $module->adminmenu[] = array( + 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getVar('mid'), + 'title' => _PREFERENCES, + 'absolute' => true); + } + + $this->mModuleObject =& $module; + } + + + /** + * @access private + */ + function _getDirname() + { + $url_arr = explode("/",strstr($_SERVER['REQUEST_URI'],'/modules/')); + return isset($url_arr[2]) ? $url_arr[2] : null; + } + + function setupLanguage() + { + $languageManager =& $this->mController->mRoot->getLanguageManager(); + $languageManager->loadModuleAdminMessageCatalog($this->mModuleObject->getVar('dirname')); + $languageManager->loadModinfoMessageCatalog($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')."/admin"; + } + + /** + * Return module's directory name. This function is dependent on the design + * of Legacy. + */ + function getDirname() + { + return is_object($this->mModuleObject) ? $this->mModuleObject->get('dirname') : null; + } + + function &getXoopsModule() + { + return $this->mModuleObject; + } + + function getDependRenderSystem() + { + return "Legacy_AdminRenderSystem"; + } +} + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Tue Aug 8 16:45:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 16:45:55 +0900 Subject: [xoops-cvslog 4029] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060808074555.E47242AC1D2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.1 xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.2 --- xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.1 Tue Aug 8 16:36:18 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php Tue Aug 8 16:45:55 2006 @@ -1,7 +1,7 @@ mController->mRoot->getLanguageManager(); + $languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname')); $languageManager->loadModuleAdminMessageCatalog($this->mModuleObject->getVar('dirname')); $languageManager->loadModinfoMessageCatalog($this->mModuleObject->getVar('dirname')); } From minahito @ users.sourceforge.jp Tue Aug 8 16:46:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 16:46:08 +0900 Subject: [xoops-cvslog 4030] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060808074608.696C32AC1D2@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.63 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.64 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.63 Mon Aug 7 20:30:16 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Tue Aug 8 16:46:08 2006 @@ -1,7 +1,7 @@ mController->mModuleController =& new Legacy_AdminModuleController($this->mController); } From tom_g3x @ users.sourceforge.jp Tue Aug 8 17:27:17 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Tue, 8 Aug 2006 17:27:17 +0900 Subject: [xoops-cvslog 4031] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060808082717.2D6D22AC1D9@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.8 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.8 Tue Aug 1 19:46:22 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Tue Aug 8 17:27:16 2006 @@ -16,7 +16,7 @@ - + <{$module->getShow('name')}>
    <{$module->modinfo.name|escape}>
    <{$smarty.const._MD_A_BASE_LANG_NAME}> @@ -158,11 +158,11 @@ <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_INDEX}> <{$module->modinfo.adminindex|escape}> - + <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_MENU}> <{$module->modinfo.adminmenu|escape}> - + <{$smarty.const._HELP}> <{$module->modinfo.help|escape}> Index: xoops2jp/html/modules/base/admin/templates/module_list.html diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.11 Tue Aug 1 19:45:21 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Tue Aug 8 17:27:17 2006 @@ -19,35 +19,35 @@
    <{/if}> -
    + <{xoops_token form=$actionForm}> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> + " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> + " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> <{foreach item=module from=$moduleObjects}> + <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/preference_list.html diff -u xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.6 Tue May 30 17:16:54 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_list.html Tue Aug 8 17:27:17 2006 @@ -16,7 +16,7 @@ <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/install_wizard.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.3 --- xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.2 Tue Aug 1 19:45:46 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard.html Tue Aug 8 17:27:17 2006 @@ -11,7 +11,7 @@
  • <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}> - + <{xoops_token form=$actionForm}>
  • <{$smarty.const._MD_A_BASE_LANG_MID}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_NAME}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_VERSION}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_WEIGHT}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
    - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>">
    <{$smarty.const._MD_A_BASE_LANG_CONTROL}>
    <{$module->getShow('mid')}> <{$module->getShow('name')}>
    -
    <{$module->getRenderedVersion()}> <{$module->get('last_update')|xoops_formattimestamp:l}> @@ -59,11 +59,11 @@ get('isactive')}>checked<{/if}> /> - " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> <{if $module->get('isactive') == 0 }> - " alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /> <{/if}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
    <{$obj->getVar('confcat_id')}> <{$obj->getName()|escape}> - " alt="<{$smarty.const._EDIT}> title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" />
    @@ -20,7 +20,7 @@ <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.14 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.15 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.14 Sat Aug 5 15:19:00 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Tue Aug 8 17:27:17 2006 @@ -62,7 +62,7 @@ <{elseif $config->get('conf_formtype') == 'select'}> @@ -74,7 +74,7 @@ <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> <{if $option->getOptionKey() == $selected}><{assign var=flag value=1}><{/if}> <{/foreach}> - + <{/foreach}> @@ -119,7 +119,7 @@ <{elseif $config->get('conf_formtype') == 'startpage'}> Index: xoops2jp/html/modules/base/admin/templates/module_update.html diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.4 Thu Jul 27 14:59:14 2006 +++ xoops2jp/html/modules/base/admin/templates/module_update.html Tue Aug 8 17:27:17 2006 @@ -8,7 +8,7 @@
    <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getShow('name')}>
    - + <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=dirname value=$module->get('dirname')}>
    - + <{$module->getShow('name')}>

    <{$module->getShow('name')}>

    Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.5 Tue Aug 1 19:45:35 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Tue Aug 8 17:27:17 2006 @@ -22,8 +22,8 @@
    <{$module->getRenderedVersion()}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" />
    @@ -17,7 +17,7 @@ From tom_g3x @ users.sourceforge.jp Tue Aug 8 17:27:34 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Tue, 8 Aug 2006 17:27:34 +0900 Subject: [xoops-cvslog 4032] CVS update: xoops2jp/html/modules/base/admin/theme Message-ID: <20060808082734.66F7A2AC1D3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.3 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.4 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.3 Thu Aug 3 18:34:55 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Tue Aug 8 17:27:34 2006 @@ -74,7 +74,7 @@
    - + <{$module->getShow('name')}>
    <{$module->modinfo.name|escape}>
    <{$smarty.const._MD_A_BASE_LANG_NAME}>
    - + From tom_g3x @ users.sourceforge.jp Tue Aug 8 17:28:32 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Tue, 8 Aug 2006 17:28:32 +0900 Subject: [xoops-cvslog 4033] CVS update: xoops2jp/html/class/smarty/plugins Message-ID: <20060808082832.6637C2AC048@users.sourceforge.jp> Index: xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php diff -u xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.2 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.3 --- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.2 Thu Apr 6 13:20:53 2006 +++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php Tue Aug 8 17:28:32 2006 @@ -32,10 +32,10 @@ $selected = ""; if (is_array($default) && in_array($object->get($params['value']), $default)) { - $selected = " selected"; + $selected = " selected='selected'"; } elseif (!is_array($default) && $object->get($params['value']) == $default) { - $selected = " selected"; + $selected = " selected='selected'"; } $tags .= "\n"; From tom_g3x @ users.sourceforge.jp Tue Aug 8 17:29:00 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Tue, 8 Aug 2006 17:29:00 +0900 Subject: [xoops-cvslog 4034] CVS update: xoops2jp/html/class/smarty/plugins Message-ID: <20060808082900.F03192AC1D3@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.4 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5 --- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.4 Sat Jul 1 13:20:24 2006 +++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php Tue Aug 8 17:29:00 2006 @@ -7,7 +7,7 @@ * $params['script']... This function have not impletented that yet. At * implementing, we will have to define the rule about sanitizing. * - * @version $Id: function.xoops_textarea.php,v 1.1.2.4 2006/07/01 04:20:24 minahito Exp $ + * @version $Id: function.xoops_textarea.php,v 1.1.2.5 2006/08/08 08:29:00 tom_g3x Exp $ */ /* @@ -64,7 +64,7 @@ $string .= " readonly=\"readonly\""; } - $string .= " />" . $value . ""; + $string .= ">" . $value . ""; // // Output. From minahito @ users.sourceforge.jp Tue Aug 8 18:47:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 8 Aug 2006 18:47:04 +0900 Subject: [xoops-cvslog 4035] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060808094704.C87FE2AC096@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.7 Thu Mar 30 23:56:35 2006 +++ xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php Tue Aug 8 18:47:04 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/actions/CommentViewAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/CommentViewAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/CommentViewAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/CommentViewAction.class.php:1.1.2.2 Thu Mar 30 23:56:35 2006 +++ xoops2jp/html/modules/base/admin/actions/CommentViewAction.class.php Tue Aug 8 18:47:11 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.3 Wed May 17 12:09:34 2006 +++ xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php Tue Aug 8 18:47:17 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.2 Tue Mar 28 22:28:35 2006 +++ xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php Tue Aug 8 18:47:25 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.2 Fri Apr 7 13:47:35 2006 +++ xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php Tue Aug 8 18:47:41 2006 @@ -1,4 +1,8 @@ mFieldProperties['bid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['bid']->setDependsByArray(array('required')); $this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID); Index: xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.6 --- xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php:1.1.2.5 Thu Mar 30 23:56:09 2006 +++ xoops2jp/html/modules/base/admin/forms/CommentAdminEditForm.class.php Tue Aug 8 18:47:41 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006 +++ xoops2jp/html/modules/base/admin/forms/InstallWizardForm.class.php Tue Aug 8 18:48:03 2006 @@ -1,4 +1,8 @@ mFieldProperties['imgcat_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['imgcat_id']->setDependsByArray(array('required')); $this->mFieldProperties['imgcat_id']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMGCAT_ID); Index: xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php:1.1.2.1 Thu Apr 6 16:53:20 2006 +++ xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php Tue Aug 8 18:48:04 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ mLog->hasError()) { - $this->mUpdateSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mUpdateSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mUpdateFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mUpdateFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_update_success.html"); - $renderer->setAttribute('module', $this->mLog->mModuleObject); + $renderer->setAttribute('module', $this->mModuleObject); $renderer->setAttribute('log', $this->mLog->mMessages); } Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.12 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.13 --- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.12 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ mLog->hasError()) { - $this->mInstallSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mInstallSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mInstallFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mInstallFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_install_success.html"); - $renderer->setAttribute('module', $this->mLog->mModuleObject); + $renderer->setAttribute('module', $this->mModuleObject); $renderer->setAttribute('log', $this->mLog->mMessages); } Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.7 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ mLog->hasError()) { - $this->mUninstallSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mUninstallSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mUninstallFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mUninstallFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_uninstall_success.html"); From minahito @ users.sourceforge.jp Wed Aug 9 18:29:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:29:47 +0900 Subject: [xoops-cvslog 4042] CVS update: xoops2jp/html/class Message-ID: <20060809092947.C46522AC045@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_ActionStrategy.class.php diff -u xoops2jp/html/class/XCube_ActionStrategy.class.php:1.1.2.1 xoops2jp/html/class/XCube_ActionStrategy.class.php:1.1.2.2 --- xoops2jp/html/class/XCube_ActionStrategy.class.php:1.1.2.1 Fri Nov 4 19:07:35 2005 +++ xoops2jp/html/class/XCube_ActionStrategy.class.php Wed Aug 9 18:29:47 2006 @@ -1,9 +1,15 @@ Index: xoops2jp/html/class/XCube_FormFile.class.php diff -u xoops2jp/html/class/XCube_FormFile.class.php:1.1.2.6 xoops2jp/html/class/XCube_FormFile.class.php:1.1.2.7 --- xoops2jp/html/class/XCube_FormFile.class.php:1.1.2.6 Wed May 17 20:13:22 2006 +++ xoops2jp/html/class/XCube_FormFile.class.php Wed Aug 9 18:30:10 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/class/XCube_PageNavigator.class.php diff -u xoops2jp/html/class/XCube_PageNavigator.class.php:1.1.2.7 xoops2jp/html/class/XCube_PageNavigator.class.php:1.1.2.8 --- xoops2jp/html/class/XCube_PageNavigator.class.php:1.1.2.7 Sun Jan 15 21:11:11 2006 +++ xoops2jp/html/class/XCube_PageNavigator.class.php Wed Aug 9 18:31:07 2006 @@ -1,4 +1,8 @@ Index: xoops2jp/html/include/comment_delete.php diff -u xoops2jp/html/include/comment_delete.php:1.2.8.2 xoops2jp/html/include/comment_delete.php:1.2.8.3 --- xoops2jp/html/include/comment_delete.php:1.2.8.2 Thu Jul 20 17:17:15 2006 +++ xoops2jp/html/include/comment_delete.php Wed Aug 9 18:31:59 2006 @@ -1,5 +1,5 @@ isAdmin($com_modid)) { $sysperm_handler =& xoops_gethandler('groupperm'); - if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) { + if (!$sysperm_handler->checkRight('system_admin', LEGACY_SYSTEM_COMMENT, $xoopsUser->getGroups())) { $accesserror = true; } } From minahito @ users.sourceforge.jp Wed Aug 9 18:32:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:32:18 +0900 Subject: [xoops-cvslog 4046] CVS update: xoops2jp/html/include Message-ID: <20060809093218.E16AB2AC013@users.sourceforge.jp> Index: xoops2jp/html/include/comment_post.php diff -u xoops2jp/html/include/comment_post.php:1.2.8.3 xoops2jp/html/include/comment_post.php:1.2.8.4 --- xoops2jp/html/include/comment_post.php:1.2.8.3 Thu Jul 20 17:17:59 2006 +++ xoops2jp/html/include/comment_post.php Wed Aug 9 18:32:18 2006 @@ -1,5 +1,5 @@ getVar('dirname')) { @@ -124,7 +119,7 @@ if (is_object($xoopsUser)) { if (!$xoopsUser->isAdmin($com_modid)) { $sysperm_handler =& xoops_gethandler('groupperm'); - if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) { + if (!$sysperm_handler->checkRight('system_admin', LEGACY_SYSTEM_COMMENT, $xoopsUser->getGroups())) { $dohtml = 0; } } @@ -160,7 +155,7 @@ if (is_object($xoopsUser)) { $sysperm_handler =& xoops_gethandler('groupperm'); - if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) { + if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', LEGACY_SYSTEM_COMMENT, $xoopsUser->getGroups())) { if (!empty($com_status) && $com_status != XOOPS_COMMENT_PENDING) { $old_com_status = $comment->getVar('com_status'); $comment->setVar('com_status', $com_status); @@ -204,7 +199,7 @@ $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR')); if (is_object($xoopsUser)) { $sysperm_handler =& xoops_gethandler('groupperm'); - if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) { + if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', LEGACY_SYSTEM_COMMENT, $xoopsUser->getGroups())) { $comment->setVar('com_status', XOOPS_COMMENT_ACTIVE); $add_userpost = true; $call_approvefunc = true; From minahito @ users.sourceforge.jp Wed Aug 9 18:32:31 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:32:31 +0900 Subject: [xoops-cvslog 4047] CVS update: xoops2jp/html/include Message-ID: <20060809093231.99C7F2AC013@users.sourceforge.jp> Index: xoops2jp/html/include/comment_view.php diff -u xoops2jp/html/include/comment_view.php:1.2.8.4 xoops2jp/html/include/comment_view.php:1.2.8.5 --- xoops2jp/html/include/comment_view.php:1.2.8.4 Thu Jul 20 17:18:16 2006 +++ xoops2jp/html/include/comment_view.php Wed Aug 9 18:32:31 2006 @@ -1,5 +1,5 @@ getGroups() : XOOPS_GROUP_ANONYMOUS; - $xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_COMMENT, $groups) ); + $xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', LEGACY_SYSTEM_COMMENT, $groups) ); $root =& XCube_Root::getSingleton(); $root->mLanguageManager->loadPageTypeMessageCatalog('comment'); From minahito @ users.sourceforge.jp Wed Aug 9 18:33:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:33:46 +0900 Subject: [xoops-cvslog 4048] CVS update: xoops2jp/html/include Message-ID: <20060809093346.5B97B2AC013@users.sourceforge.jp> Index: xoops2jp/html/include/common.php diff -u xoops2jp/html/include/common.php:1.4.8.14 xoops2jp/html/include/common.php:1.4.8.15 --- xoops2jp/html/include/common.php:1.4.8.14 Thu Jul 13 19:59:24 2006 +++ xoops2jp/html/include/common.php Wed Aug 9 18:33:46 2006 @@ -1,29 +1,8 @@ // -// ------------------------------------------------------------------------ // -// 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 // -// ------------------------------------------------------------------------ // +/** + * @package Legacy + * @version $Id: common.php,v 1.4.8.15 2006/08/09 09:33:46 minahito Exp $ + */ // // Prohibition of a direct kick @@ -32,6 +11,12 @@ die(); } +/** + * This constant is the sign which this system is XOOPS Cube, for module + * developers. + */ +define('XOOPS_CUBE_LEGACY', true); + require_once XOOPS_ROOT_PATH . "/kernel/XCube_Root.class.php"; require_once XOOPS_ROOT_PATH . "/kernel/XCube_Controller.class.php"; From minahito @ users.sourceforge.jp Wed Aug 9 18:34:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:34:00 +0900 Subject: [xoops-cvslog 4049] CVS update: xoops2jp/html/include Message-ID: <20060809093400.2B9EA2AC013@users.sourceforge.jp> Index: xoops2jp/html/include/cp_functions.php diff -u xoops2jp/html/include/cp_functions.php:1.2.8.3 xoops2jp/html/include/cp_functions.php:1.2.8.4 --- xoops2jp/html/include/cp_functions.php:1.2.8.3 Fri Aug 4 19:32:12 2006 +++ xoops2jp/html/include/cp_functions.php Wed Aug 9 18:34:00 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/include/functions.php diff -u xoops2jp/html/include/functions.php:1.2.8.15 xoops2jp/html/include/functions.php:1.2.8.16 --- xoops2jp/html/include/functions.php:1.2.8.15 Fri Apr 21 12:15:00 2006 +++ xoops2jp/html/include/functions.php Wed Aug 9 18:34:19 2006 @@ -1,5 +1,5 @@ 3 && $phpv[1] > 0) { // $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key]; //} else { - $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key]; + if (isset($_SERVER[$key]) || isset($_ENV[$key])) { + $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key]; + } //} switch($key) { From minahito @ users.sourceforge.jp Wed Aug 9 18:34:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:34:52 +0900 Subject: [xoops-cvslog 4051] CVS update: xoops2jp/html/kernel Message-ID: <20060809093452.18E072AC013@users.sourceforge.jp> Index: xoops2jp/html/kernel/module.php diff -u xoops2jp/html/kernel/module.php:1.2.8.13 xoops2jp/html/kernel/module.php:1.2.8.14 --- xoops2jp/html/kernel/module.php:1.2.8.13 Thu Jul 20 17:18:39 2006 +++ xoops2jp/html/kernel/module.php Wed Aug 9 18:34:51 2006 @@ -1,5 +1,5 @@ getInfo(); - if (isset($info['help']) && strlen($info['help']) > 0) { + if (isset($info['cube_style']) && $info['cube_style'] != false && isset($info['help']) && strlen($info['help']) > 0) { return true; } From minahito @ users.sourceforge.jp Wed Aug 9 18:35:15 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:35:15 +0900 Subject: [xoops-cvslog 4052] CVS update: xoops2jp/html/kernel Message-ID: <20060809093515.EFD962AC013@users.sourceforge.jp> Index: xoops2jp/html/kernel/notification.php diff -u xoops2jp/html/kernel/notification.php:1.2.8.3 xoops2jp/html/kernel/notification.php:1.2.8.4 --- xoops2jp/html/kernel/notification.php:1.2.8.3 Mon Jul 31 19:01:28 2006 +++ xoops2jp/html/kernel/notification.php Wed Aug 9 18:35:15 2006 @@ -1,5 +1,5 @@ mTrigger =& new XCube_NewDelegate(); + $this->mTrigger =& new XCube_Delegate(); $this->mTrigger->register('XoopsNotificationHandler.Trigger'); } From minahito @ users.sourceforge.jp Wed Aug 9 18:35:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:35:56 +0900 Subject: [xoops-cvslog 4053] CVS update: xoops2jp/html/modules/base Message-ID: <20060809093556.B29F42AC0AC@users.sourceforge.jp> Index: xoops2jp/html/modules/base/xoops_version.php diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.29 xoops2jp/html/modules/base/xoops_version.php:1.1.2.30 --- xoops2jp/html/modules/base/xoops_version.php:1.1.2.29 Sun Aug 6 01:44:34 2006 +++ xoops2jp/html/modules/base/xoops_version.php Wed Aug 9 18:35:56 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/pm/xoops_version.php diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.14 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.15 --- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.14 Thu Jul 27 18:39:31 2006 +++ xoops2jp/html/modules/pm/xoops_version.php Wed Aug 9 18:36:04 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/stdCache/xoops_version.php diff -u xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.2 xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3 --- xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.2 Fri Jan 6 12:07:40 2006 +++ xoops2jp/html/modules/stdCache/xoops_version.php Wed Aug 9 18:36:12 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/user/xoops_version.php diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.20 xoops2jp/html/modules/user/xoops_version.php:1.1.2.21 --- xoops2jp/html/modules/user/xoops_version.php:1.1.2.20 Sun Aug 6 01:47:02 2006 +++ xoops2jp/html/modules/user/xoops_version.php Wed Aug 9 18:36:19 2006 @@ -1,5 +1,5 @@ "_MI_USER_CONF_DISCLAIMER_DESC", "formtype"=>"textarea", "valuetype"=>"string", - "default"=>"" + "default"=>_MI_USER_CONF_DISCLAIMER_DESC_DEFAULT ); // Menu From minahito @ users.sourceforge.jp Wed Aug 9 18:36:42 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:36:42 +0900 Subject: [xoops-cvslog 4057] CVS update: xoops2jp/html/settings Message-ID: <20060809093642.DA1572AC0A9@users.sourceforge.jp> Index: xoops2jp/html/settings/definition.inc.php diff -u xoops2jp/html/settings/definition.inc.php:1.1.4.3 xoops2jp/html/settings/definition.inc.php:1.1.4.4 --- xoops2jp/html/settings/definition.inc.php:1.1.4.3 Tue Oct 25 20:05:48 2005 +++ xoops2jp/html/settings/definition.inc.php Wed Aug 9 18:36:42 2006 @@ -41,4 +41,6 @@ define("XCUBE_CORE_PM_MODULE_NAME","pm"); +define('LEGACY_SYSTEM_COMMENT', 14); + ?> \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 9 18:37:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:37:36 +0900 Subject: [xoops-cvslog 4058] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060809093736.A2DFF2AC0A9@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/modinfo.php diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.15 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.16 --- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.15 Sat Aug 5 15:24:35 2006 +++ xoops2jp/html/modules/user/language/japanese/modinfo.php Wed Aug 9 18:37:36 2006 @@ -38,6 +38,7 @@ define('_MI_USER_CONF_CHGMAIL', "ユーザ自身のEmailアドレス変更を許可する"); define('_MI_USER_CONF_DISCLAIMER', "利用許諾文"); define('_MI_USER_CONF_DISCLAIMER_DESC', "ユーザの新規登録ページに表示する利用許諾文を入力してください。"); +define('_MI_USER_CONF_DISCLAIMER_DESC_DEFAULT', "本規約は、当サイトにより提供されるコンテンツの利用条件を定めるものです。以下の利用条件をよくお読みになり、これに同意される場合にのみご登録いただきますようお願いいたします。\n\n当サイトを利用するにあたり、以下に該当する又はその恐れのある行為を行ってはならないものとします。 \n\n・公序良俗に反する行為 \n・法令に違反する行為 \n・犯罪行為及び犯罪行為に結びつく行為 \n・他の利用者、第三者、当サイトの権利を侵害する行為 \n・他の利用者、第三者、当サイトを誹謗、中傷する行為及び名誉・信用を傷つける行為 \n・他の利用者、第三者、当サイトに不利益を与える行為 \n・当サイトの運営を妨害する行為 \n・事実でない情報を発信する行為 \n・プライバシー侵害の恐れのある個人情報の投稿 \n・その他、当サイトが不適当と判断する行為 \n\n【免責】\n\n利用者が当サイト及び当サイトに関連するコンテンツ、リンク先サイトにおける一切のサービス等をご利用されたことに起因または関連して生じた一切の損害(間接的であると直接的であるとを問わない)について、当サイトは責任を負いません。"); define('_MI_USER_CONF_DISPDSCLMR', "利用許諾文を表示する"); define('_MI_USER_CONF_DISPDSCLMR_DESC', "「はい」にするとユーザの新規登録ページに利用許諾の文章を表示します。"); define('_MI_USER_CONF_MAXUNAME', "ユーザ名の最大文字数(byte)"); From minahito @ users.sourceforge.jp Wed Aug 9 18:37:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:37:36 +0900 Subject: [xoops-cvslog 4059] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060809093736.C7E312AC0AC@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/modinfo.php diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.11 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.12 --- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.11 Thu Apr 27 19:26:53 2006 +++ xoops2jp/html/modules/user/language/english/modinfo.php Wed Aug 9 18:37:36 2006 @@ -38,6 +38,7 @@ define('_MI_USER_CONF_CHGMAIL', "Allow users to change email address?"); define('_MI_USER_CONF_DISCLAIMER', "Registration disclaimer"); define('_MI_USER_CONF_DISCLAIMER_DESC', "Enter text to be displayed as registration disclaimer."); +define('_MI_USER_CONF_DISCLAIMER_DESC_DEFAULT', "While the administrators and moderators of this site will attempt to remove\nor edit any generally objectionable material as quickly as possible, it is\nimpossible to review every message. Therefore you acknowledge that all posts\nmade to this site express the views and opinions of the author and not the\nadministrators, moderators or webmaster (except for posts by these people)\nand hence will not be held liable. \n\nYou agree not to post any abusive, obscene, vulgar, slanderous, hateful,\nthreatening, sexually-orientated or any other material that may violate any\napplicable laws. Doing so may lead to you being immediately and permanently\nbanned (and your service provider being informed). The IP address of all\nposts is recorded to aid in enforcing these conditions. Creating multiple\naccounts for a single user is not allowed. You agree that the webmaster,\nadministrator and moderators of this site have the right to remove, edit,\nmove or close any topic at any time should they see fit. As a user you agree\nto any information you have entered above being stored in a database. While\nthis information will not be disclosed to any third party without your\nconsent the webmaster, administrator and moderators cannot be held\nresponsible for any hacking attempt that may lead to the data being\ncompromised. \n\nThis site system uses cookies to store information on your local computer.\nThese cookies do not contain any of the information you have entered above,\nthey serve only to improve your viewing pleasure. The email address is used\nonly for confirming your registration details and password (and for sending\nnew passwords should you forget your current one). \n\nBy clicking Register below you agree to be bound by these conditions."); define('_MI_USER_CONF_DISPDSCLMR', "Display disclaimer?"); define('_MI_USER_CONF_DISPDSCLMR_DESC', "Select yes to display disclaimer in registration page"); define('_MI_USER_CONF_MAXUNAME', "Maximum length of username"); From minahito @ users.sourceforge.jp Wed Aug 9 18:38:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:38:04 +0900 Subject: [xoops-cvslog 4060] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060809093804.C8B7B2AC0A9@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.11 Thu Jul 13 19:53:25 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Wed Aug 9 18:38:04 2006 @@ -133,7 +133,7 @@ <{$user->getShow('posts')}> <{$user->getShow('level')}> - " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{/if}> From minahito @ users.sourceforge.jp Wed Aug 9 18:38:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:38:29 +0900 Subject: [xoops-cvslog 4061] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060809093829.A4AFC2AC0A9@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.12 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.13 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.12 Sat Aug 5 11:30:47 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Wed Aug 9 18:38:29 2006 @@ -1,7 +1,7 @@ _processMail($controller); $this->_eventNotifyMail($controller); - XCube_DelegateUtils::call('Legacy.Event.RegistUser.Success'); + XCube_DelegateUtils::call('Legacy.Event.RegistUser.Success', new XCube_Ref($this->mNewUser)); return USER_FRAME_VIEW_SUCCESS; } From minahito @ users.sourceforge.jp Wed Aug 9 18:38:43 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:38:43 +0900 Subject: [xoops-cvslog 4062] CVS update: xoops2jp/html/modules/stdCache/language/english Message-ID: <20060809093843.89F9A2AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/stdCache/language/english/modinfo.php diff -u xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.2 xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.3 --- xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.2 Fri Jan 6 12:05:13 2006 +++ xoops2jp/html/modules/stdCache/language/english/modinfo.php Wed Aug 9 18:38:43 2006 @@ -1,6 +1,6 @@ From minahito @ users.sourceforge.jp Wed Aug 9 18:39:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:39:39 +0900 Subject: [xoops-cvslog 4064] CVS update: xoops2jp/html/modules/base/include Message-ID: <20060809093939.21C692AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php diff -u /dev/null xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php:1.1.2.1 --- /dev/null Wed Aug 9 18:39:39 2006 +++ xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php Wed Aug 9 18:39:39 2006 @@ -0,0 +1,29 @@ + From minahito @ users.sourceforge.jp Wed Aug 9 18:40:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:40:35 +0900 Subject: [xoops-cvslog 4065] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060809094035.3EDC22AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.3 --- xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.2 Tue Aug 8 16:45:55 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php Wed Aug 9 18:40:35 2006 @@ -1,7 +1,7 @@ mController->mRoot->getLanguageManager(); - $languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname')); + if (isset($this->mModuleObject->modinfo['cube_style']) && $this->mModuleObject->modinfo['cube_style'] != false) { + $languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname')); + } $languageManager->loadModuleAdminMessageCatalog($this->mModuleObject->getVar('dirname')); $languageManager->loadModinfoMessageCatalog($this->mModuleObject->getVar('dirname')); } From minahito @ users.sourceforge.jp Wed Aug 9 18:40:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:40:49 +0900 Subject: [xoops-cvslog 4066] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060809094049.1BAEF2AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/object.php diff -u xoops2jp/html/modules/base/kernel/object.php:1.1.2.6 xoops2jp/html/modules/base/kernel/object.php:1.1.2.7 --- xoops2jp/html/modules/base/kernel/object.php:1.1.2.6 Wed Jul 5 11:38:59 2006 +++ xoops2jp/html/modules/base/kernel/object.php Wed Aug 9 18:40:48 2006 @@ -1,5 +1,8 @@ mVars[$key])) { + return; + } + switch ($this->mVars[$key]['data_type']) { case XOBJ_DTYPE_BOOL: $this->mVars[$key]['value'] = $value ? 1 : 0; From minahito @ users.sourceforge.jp Wed Aug 9 18:41:22 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:41:22 +0900 Subject: [xoops-cvslog 4067] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060809094122.D8D1D2AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/handler.php diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.19 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.20 --- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.19 Mon Jul 10 19:57:40 2006 +++ xoops2jp/html/modules/base/kernel/handler.php Wed Aug 9 18:41:22 2006 @@ -1,4 +1,8 @@ _makeCriteria4sql($criteria); if (trim($where)) { - $sql .= " WHERE ".$where; + $sql .= " WHERE " . $where; } $sorts = array(); From minahito @ users.sourceforge.jp Wed Aug 9 18:41:44 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:41:44 +0900 Subject: [xoops-cvslog 4068] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060809094144.3355D2AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/theme.php diff -u xoops2jp/html/modules/base/class/theme.php:1.1.2.2 xoops2jp/html/modules/base/class/theme.php:1.1.2.3 --- xoops2jp/html/modules/base/class/theme.php:1.1.2.2 Mon Aug 7 20:29:51 2006 +++ xoops2jp/html/modules/base/class/theme.php Wed Aug 9 18:41:44 2006 @@ -3,7 +3,6 @@ if (!defined('XOOPS_ROOT_PATH')) exit(); require_once XOOPS_ROOT_PATH . '/include/comment_constants.php'; -require_once XOOPS_ROOT_PATH . '/modules/system/constants.php'; class BaseThemeObject extends XoopsSimpleObject { From minahito @ users.sourceforge.jp Wed Aug 9 18:41:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:41:54 +0900 Subject: [xoops-cvslog 4069] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060809094154.8C4982AC013@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.2 Mon Aug 7 20:29:29 2006 +++ xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php Wed Aug 9 18:41:54 2006 @@ -38,6 +38,7 @@ foreach ($configArr as $config) { switch ($config->get('conf_valuetype')) { case 'text': + case 'string': if ($config->get('conf_formtype') == 'textarea') { $this->mFormProperties[$config->get('conf_name')] =& new XCube_TextProperty($config->get('conf_name')); } From minahito @ users.sourceforge.jp Wed Aug 9 18:42:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:42:56 +0900 Subject: [xoops-cvslog 4070] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060809094256.775292AC045@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.9 Sat Jul 1 16:24:56 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php Wed Aug 9 18:42:56 2006 @@ -7,6 +7,19 @@ class Legacy_ModuleUninstaller extends Legacy_AbstractModuleInstaller { /** + * @var XCube_Delegate + */ + var $mProcessScript = null; + + function Legacy_ModuleUninstaller($dirname) + { + parent::Legacy_AbstractModuleInstaller($dirname); + + $this->mProcessScript =& new XCube_Delegate(); + $this->mProcessScript->register('Legacy_ModuleUninstaller.ProcessScript'); + } + + /** * Load xoops module object that isn't installed and return it. * @static * @access public @@ -137,6 +150,8 @@ } } } + + $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.9 --- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.8 Sat Jul 1 16:24:56 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php Wed Aug 9 18:42:56 2006 @@ -9,6 +9,19 @@ var $mPreVersion = 0; /** + * @var XCube_Delegate + */ + var $mProcessScript = null; + + function Legacy_ModuleUpdater($dirname) + { + parent::Legacy_AbstractModuleInstaller($dirname); + + $this->mProcessScript =& new XCube_Delegate(); + $this->mProcessScript->register('Legacy_ModuleUpdater.ProcessScript'); + } + + /** * @return bool */ function execute() @@ -180,6 +193,8 @@ } } } + + $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.15 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.16 --- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.15 Tue Jul 25 19:10:44 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php Wed Aug 9 18:42:56 2006 @@ -11,6 +11,19 @@ class Legacy_ModuleInstaller extends Legacy_AbstractModuleInstaller { var $mAgree = false; + + /** + * @var XCube_Delegate + */ + var $mProcessScript = null; + + function Legacy_ModuleInstaller($dirname) + { + parent::Legacy_AbstractModuleInstaller($dirname); + + $this->mProcessScript =& new XCube_Delegate(); + $this->mProcessScript->register('Legacy_ModuleInstaller.ProcessScript'); + } /** * Load xoops module object that isn't installed and return it. @@ -197,6 +210,8 @@ } } } + + $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() From minahito @ users.sourceforge.jp Wed Aug 9 18:47:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:47:37 +0900 Subject: [xoops-cvslog 4071] CVS update: xoops2jp/html/modules/base/include Message-ID: <20060809094737.166042AC045@users.sourceforge.jp> Index: xoops2jp/html/modules/base/include/groupperm.php diff -u /dev/null xoops2jp/html/modules/base/include/groupperm.php:1.1.2.1 --- /dev/null Wed Aug 9 18:47:37 2006 +++ xoops2jp/html/modules/base/include/groupperm.php Wed Aug 9 18:47:36 2006 @@ -0,0 +1,76 @@ +isAdmin($modid)) { + redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM); + exit(); +} +$module_handler =& xoops_gethandler('module'); +$module =& $module_handler->get($modid); +if (!is_object($module) || !$module->getVar('isactive')) { + redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST); + exit(); +} +$member_handler =& xoops_gethandler('member'); +$group_list =& $member_handler->getGroupList(); +if (is_array($_POST['perms']) && !empty($_POST['perms'])) { + $gperm_handler = xoops_gethandler('groupperm'); + foreach ($_POST['perms'] as $perm_name => $perm_data) { + if (false != $gperm_handler->deleteByModule($modid, $perm_name)) { + foreach ($perm_data['groups'] as $group_id => $item_ids) { + foreach ($item_ids as $item_id => $selected) { + if ($selected == 1) { + // make sure that all parent ids are selected as well + if ($perm_data['parents'][$item_id] != '') { + $parent_ids = explode(':', $perm_data['parents'][$item_id]); + foreach ($parent_ids as $pid) { + if ($pid != 0 && !in_array($pid, array_keys($item_ids))) { + // one of the parent items were not selected, so skip this item + $msg[] = sprintf(_MD_AM_PERMADDNG, ''.$perm_name.'', ''.$perm_data['itemname'][$item_id].'', ''.$group_list[$group_id].'').' ('._MD_AM_PERMADDNGP.')'; + continue 2; + } + } + } + $gperm =& $gperm_handler->create(); + $gperm->setVar('gperm_groupid', $group_id); + $gperm->setVar('gperm_name', $perm_name); + $gperm->setVar('gperm_modid', $modid); + $gperm->setVar('gperm_itemid', $item_id); + if (!$gperm_handler->insert($gperm)) { + $msg[] = sprintf(_MD_AM_PERMADDNG, ''.$perm_name.'', ''.$perm_data['itemname'][$item_id].'', ''.$group_list[$group_id].''); + } else { + $msg[] = sprintf(_MD_AM_PERMADDOK, ''.$perm_name.'', ''.$perm_data['itemname'][$item_id].'', ''.$group_list[$group_id].''); + } + unset($gperm); + } + } + } + } else { ++ $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name').'('.$perm_name.')'); + } + } +} + +$backlink = XOOPS_URL.'/admin.php'; +if ($module->getVar('hasadmin')) { + $adminindex = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : $module->getInfo('adminindex'); + if ($adminindex) { + $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex; + } +} + +$msg[] = '

    '._BACK.''; +xoops_cp_header(); +xoops_result($msg); +xoops_cp_footer(); +?> \ No newline at end of file From minahito @ users.sourceforge.jp Wed Aug 9 18:48:10 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 9 Aug 2006 18:48:10 +0900 Subject: [xoops-cvslog 4072] CVS update: xoops2jp/html/class/xoopsform Message-ID: <20060809094810.47A882AC045@users.sourceforge.jp> Index: xoops2jp/html/class/xoopsform/grouppermform.php diff -u xoops2jp/html/class/xoopsform/grouppermform.php:1.2 xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.1 --- xoops2jp/html/class/xoopsform/grouppermform.php:1.2 Fri Mar 18 21:51:55 2005 +++ xoops2jp/html/class/xoopsform/grouppermform.php Wed Aug 9 18:48:10 2006 @@ -1,5 +1,5 @@ XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/system/admin/groupperm.php', 'post'); + $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/base/include/groupperm.php', 'post'); $this->_modid = intval($modid); $this->_permName = $permname; $this->_permDesc = $permdesc; From minahito @ users.sourceforge.jp Thu Aug 10 12:56:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 12:56:12 +0900 Subject: [xoops-cvslog 4073] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060810035612.0D26D2AC0F2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.11 --- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.10 Wed Aug 9 18:42:56 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php Thu Aug 10 12:56:11 2006 @@ -161,10 +161,10 @@ } else { if (is_object($this->mModule)) { - $this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name'))); + $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name'))); } else { - $this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname)); + $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname)); } } } Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.9 Wed Aug 9 18:42:56 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php Thu Aug 10 12:56:11 2006 @@ -204,10 +204,10 @@ } else { if (is_object($this->mModule)) { - $this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mModule->get('name'))); + $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mModule->get('name'))); } else { - $this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mDirname)); + $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mDirname)); } } } From minahito @ users.sourceforge.jp Thu Aug 10 18:41:23 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:41:23 +0900 Subject: [xoops-cvslog 4074] CVS update: xoops2jp/html/class Message-ID: <20060810094123.BC85A2AC100@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_ModuleController.class.php diff -u xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.7 xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.8 --- xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.7 Sun Apr 2 22:06:01 2006 +++ xoops2jp/html/class/XCube_ModuleController.class.php Thu Aug 10 18:41:23 2006 @@ -1,30 +1,12 @@ // -// ------------------------------------------------------------------------ // -// 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 // -// ------------------------------------------------------------------------ // - +/** + * @package XCube + * @version $Id: XCube_ModuleController.class.php,v 1.1.2.8 2006/08/10 09:41:23 minahito Exp $ + */ + +/** + * @deprecated + */ class XCube_ModuleController { var $mController; From minahito @ users.sourceforge.jp Thu Aug 10 18:41:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:41:34 +0900 Subject: [xoops-cvslog 4075] CVS update: xoops2jp/html/class Message-ID: <20060810094134.E211B2AC100@users.sourceforge.jp> Index: xoops2jp/html/class/XCube_RenderSystem.class.php diff -u xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.17 xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.18 --- xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.17 Thu Aug 3 18:32:17 2006 +++ xoops2jp/html/class/XCube_RenderSystem.class.php Thu Aug 10 18:41:34 2006 @@ -1,7 +1,7 @@ mAttributes[$key]; + return isset($this->mAttributes[$key]) ? $this->mAttributes[$key] : null; } function getAttributes() From minahito @ users.sourceforge.jp Thu Aug 10 18:42:24 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:42:24 +0900 Subject: [xoops-cvslog 4076] CVS update: xoops2jp/html/install/templates Message-ID: <20060810094224.5C9A32AC100@users.sourceforge.jp> Index: xoops2jp/html/install/templates/install_checkDB.tpl.php diff -u xoops2jp/html/install/templates/install_checkDB.tpl.php:1.1.2.1 xoops2jp/html/install/templates/install_checkDB.tpl.php:1.1.2.2 --- xoops2jp/html/install/templates/install_checkDB.tpl.php:1.1.2.1 Tue Mar 7 22:11:40 2006 +++ xoops2jp/html/install/templates/install_checkDB.tpl.php Thu Aug 10 18:42:24 2006 @@ -5,6 +5,6 @@ -v('msgs') as $msg) { ?> +v('msgs'))) foreach($this->v('msgs') as $msg) { ?>

    From minahito @ users.sourceforge.jp Thu Aug 10 18:42:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:42:35 +0900 Subject: [xoops-cvslog 4077] CVS update: xoops2jp/html/kernel Message-ID: <20060810094235.AE8B62AC100@users.sourceforge.jp> Index: xoops2jp/html/kernel/configcategory.php diff -u xoops2jp/html/kernel/configcategory.php:1.2.8.2 xoops2jp/html/kernel/configcategory.php:1.2.8.3 --- xoops2jp/html/kernel/configcategory.php:1.2.8.2 Tue May 16 22:25:07 2006 +++ xoops2jp/html/kernel/configcategory.php Thu Aug 10 18:42:35 2006 @@ -1,5 +1,5 @@ db->prefix('configcategory'), $configcategory->getVar('confcat_id')); + $sql = sprintf("DELETE FROM %s WHERE confcat_id = %u", $this->db->prefix('configcategory'), $confcat->getVar('confcat_id')); if (!$result = $this->db->query($sql)) { return false; } From minahito @ users.sourceforge.jp Thu Aug 10 18:44:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:44:54 +0900 Subject: [xoops-cvslog 4078] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060810094454.2ADC72AC100@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php:1.1.2.3 Wed Aug 9 18:41:54 2006 +++ xoops2jp/html/modules/base/admin/forms/PreferenceEditForm.class.php Thu Aug 10 18:44:54 2006 @@ -79,8 +79,10 @@ else { $this->mFormProperties[$config->get('conf_name')] =& new XCube_StringArrayProperty($config->get('conf_name')); $t_arr = unserialize($config->get('conf_value')); - foreach ($t_arr as $_key => $_value) { - $this->set($config->get('conf_name'), $_key, $_value); + if (is_array($t_arr)) { + foreach ($t_arr as $_key => $_value) { + $this->set($config->get('conf_name'), $_key, $_value); + } } } break; From minahito @ users.sourceforge.jp Thu Aug 10 18:45:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:45:07 +0900 Subject: [xoops-cvslog 4079] CVS update: xoops2jp/html/modules/base/admin/theme Message-ID: <20060810094507.53F3C2AC100@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.4 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.5 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.4 Tue Aug 8 17:27:34 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Thu Aug 10 18:45:07 2006 @@ -78,3 +78,4 @@ +<{$stdout_buffer}> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 10 18:45:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:45:51 +0900 Subject: [xoops-cvslog 4080] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060810094551.A229A2AC115@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.10 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9 Mon Aug 7 20:30:35 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Thu Aug 10 18:45:51 2006 @@ -97,6 +97,15 @@ var $mController; var $mSmarty; + /** + * This is the buffer which stores standard output when the render-target + * in renderMain() doesn't use a template. + * + * @access private + * @var string + */ + var $_mStdoutBuffer = null; + function prepare(&$controller) { $this->mController =& $controller; @@ -147,6 +156,8 @@ foreach($target->getAttributes() as $key=>$value) { $this->mSmarty->assign($key,$value); } + + $this->mSmarty->assign('stdout_buffer', $this->_mStdoutBuffer); // // Get a virtual current module object from the controller and assign it. @@ -201,6 +212,9 @@ } $result=$this->mSmarty->fetch("file:".$target->getTemplateName()); + $buffer = $target->getAttribute("stdout_buffer"); + + $this->_mStdoutBuffer .= $buffer; } else { $result=$target->getAttribute("stdout_buffer"); From minahito @ users.sourceforge.jp Thu Aug 10 18:46:43 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:46:43 +0900 Subject: [xoops-cvslog 4081] CVS update: xoops2jp/html/modules/legacyRender Message-ID: <20060810094643.79D9E2AC24C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/xoops_version.php diff -u xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.9 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.10 --- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.9 Sat Aug 5 15:20:19 2006 +++ xoops2jp/html/modules/legacyRender/xoops_version.php Thu Aug 10 18:46:43 2006 @@ -1,6 +1,6 @@ "text", "default"=>"Powered by XOOPS Cube 2.1© 2001-2006 The XOOPS Cube Project" ); + +$modversion['config'][]=array ( + "name"=>"banners", + "title"=>"_MI_USER_CONF_BANNERS", + "formtype"=>"yesno", + "valuetype"=>"int", + "default"=>0 + ); + // Menu $modversion['hasMain']=0; From minahito @ users.sourceforge.jp Thu Aug 10 18:47:26 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 10 Aug 2006 18:47:26 +0900 Subject: [xoops-cvslog 4082] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060810094726.ECC572AC211@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.22 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.23 --- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.22 Tue Aug 8 13:48:24 2006 +++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Thu Aug 10 18:47:26 2006 @@ -1,6 +1,6 @@ '//--> - + get('select', $theme->get('dirname'))}>checked<{/if}>/> + get('select', $theme->get('dirname'))}>checked="checked"<{/if}> /> <{if $currentThemeName != $theme->get('dirname')}> Index: xoops2jp/html/modules/base/admin/templates/module_list.html diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.12 Tue Aug 8 17:27:17 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Thu Aug 10 20:06:25 2006 @@ -57,7 +57,7 @@ <{/if}> - get('isactive')}>checked<{/if}> /> + get('isactive')}>checked="checked"<{/if}> /> " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> <{if $module->get('isactive') == 0 }> Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.11 Tue Aug 1 19:44:24 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html Thu Aug 10 20:06:25 2006 @@ -59,7 +59,7 @@ " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{else}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.6 Tue Aug 1 19:45:21 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Thu Aug 10 20:06:25 2006 @@ -36,7 +36,7 @@ <{/if}> <{$obj->getShow('id')}> <{$obj->getShow('code')}> - + <{$obj->getShow('emotion')}> <{$obj->getShow('emotion')}> <{if $obj->get('display') == 1 }> @@ -50,7 +50,6 @@ " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> - <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/smiles_delete.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.7 Thu Aug 10 19:52:01 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_delete.html Thu Aug 10 20:06:25 2006 @@ -15,6 +15,7 @@ <{$smarty.const._AD_BASE_LANG_SMILES_DELETE}> + <{$smarty.const._AD_BASE_LANG_ID}> "><{$object->getShow('id')}> @@ -25,7 +26,7 @@ <{$smarty.const._AD_BASE_LANG_SMILE_URL}> "> - + <{$object->getShow('emotion')}> ( <{$object->getShow('smile_url')}> ) From tom_g3x @ users.sourceforge.jp Thu Aug 10 20:06:25 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 10 Aug 2006 20:06:25 +0900 Subject: [xoops-cvslog 4095] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060810110625.C3FCC2AC0C0@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.7 --- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.6 Wed Jul 12 19:50:56 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_list.html Thu Aug 10 20:06:25 2006 @@ -42,7 +42,6 @@ " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> - <{/foreach}> Index: xoops2jp/html/modules/user/admin/templates/group_perm.html diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.15 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.16 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.15 Thu Aug 10 19:52:02 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Thu Aug 10 20:06:25 2006 @@ -62,7 +62,7 @@ <{foreach item=perm from=$systemPermissions key="perm_key"}>  <{$perm->mItem->getName()|escape}> <{assign var="getId" value=$perm->getId() }> - mValue==2}>checked<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}> + mValue==2}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}> <{cycle values="," name="systr"}> <{/foreach}> @@ -80,8 +80,8 @@ <{foreach item=perm from=$modulePermissions }>  <{$perm->mItem->getName()|escape}> <{assign var="getId" value=$perm->getId() }> - mValue & 1}>checked<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ACCESS}> - mValue & 2}>checked<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}> + mValue & 1}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ACCESS}> + mValue & 2}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}> <{cycle values="," name="systr"}> <{/foreach}> @@ -114,7 +114,7 @@ <{/if}> <{assign var="getId" value=$perm->getId() }> - mValue==1}>checked<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ACCESS}> + mValue==1}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ACCESS}> <{cycle values="," name="blktr"}> <{/foreach}> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.9 Sat Aug 5 15:23:33 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Thu Aug 10 20:06:25 2006 @@ -52,7 +52,6 @@ " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> - <{/foreach}> Index: xoops2jp/html/modules/user/admin/templates/user_view.html diff -u xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.1 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.2 --- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.1 Fri Jul 28 17:56:07 2006 +++ xoops2jp/html/modules/user/admin/templates/user_view.html Thu Aug 10 20:06:25 2006 @@ -104,7 +104,7 @@ <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=uid value=$actionForm->get('uid')}> - +
    From tom_g3x @ users.sourceforge.jp Thu Aug 10 20:06:25 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 10 Aug 2006 20:06:25 +0900 Subject: [xoops-cvslog 4096] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060810110625.EFA5A2AC02F@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.16 xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.17 --- xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.16 Tue Jul 11 11:59:03 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html Thu Aug 10 20:06:25 2006 @@ -54,7 +54,7 @@ <{/if}> - get('select', $theme->get('id'))}>checked<{/if}>/> + get('select', $theme->get('id'))}>checked="checked"<{/if}>/> <{if $currentThemeName!=$theme->get('name')}> From minahito @ users.sourceforge.jp Fri Aug 11 10:54:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 10:54:21 +0900 Subject: [xoops-cvslog 4097] CVS update: xoops2jp/html/include Message-ID: <20060811015421.E294F2AC128@users.sourceforge.jp> Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.4.8.5 xoops2jp/html/include/version.php:1.4.8.6 --- xoops2jp/html/include/version.php:1.4.8.5 Wed Aug 2 18:35:01 2006 +++ xoops2jp/html/include/version.php Fri Aug 11 10:54:21 2006 @@ -1,5 +1,5 @@ \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 11 10:55:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 10:55:07 +0900 Subject: [xoops-cvslog 4098] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060811015507.2BF012AC128@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.7 xoops2jp/html/modules/base/language/english/global.php:1.1.2.8 --- xoops2jp/html/modules/base/language/english/global.php:1.1.2.7 Sat Jun 3 21:52:33 2006 +++ xoops2jp/html/modules/base/language/english/global.php Fri Aug 11 10:55:07 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.6 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.7 --- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.6 Sun Aug 6 01:46:48 2006 +++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Fri Aug 11 13:13:02 2006 @@ -1,7 +1,7 @@ mLanguageManager->loadModuleMessageCatalog('user'); - $userHandler =& xoops_gethandler('user'); + $userHandler =& xoops_getmodulehandler('users', 'user'); $criteria =& new CriteriaCompo(); $criteria->add(new Criteria('uname', xoops_getrequest('uname'))); @@ -141,12 +141,15 @@ return; } - $xoopsUser = $userArr[0]; - - if ($xoopsUser->get('level') == 0) { + if ($userArr[0]->get('level') == 0) { // TODO We should use message "_US_NOACTTPADM" return; } + + $handler =& xoops_gethandler('user'); + $user =& $handler->get($userArr[0]->get('uid')); + + $xoopsUser = $user; // // Regist to session From minahito @ users.sourceforge.jp Fri Aug 11 20:01:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 20:01:45 +0900 Subject: [xoops-cvslog 4100] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060811110145.B04412AC15C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.43 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.44 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.43 Wed Aug 2 18:42:33 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Fri Aug 11 20:01:45 2006 @@ -1,5 +1,7 @@ Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.36 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.37 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.36 Wed Aug 2 18:42:33 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Fri Aug 11 20:01:50 2006 @@ -1,5 +1,7 @@ Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.5 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.6 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.5 Thu Aug 10 18:45:07 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Fri Aug 11 20:02:10 2006 @@ -37,7 +37,8 @@ - From minahito @ users.sourceforge.jp Fri Aug 11 20:02:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 20:02:28 +0900 Subject: [xoops-cvslog 4103] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060811110228.AC8A22AC100@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html diff -u /dev/null xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html:1.1.2.1 --- /dev/null Fri Aug 11 20:02:28 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html Fri Aug 11 20:02:28 2006 @@ -0,0 +1,10 @@ +<{include file="legacy_admin_actionsearch_form.html"}> + +

    <{$smarty.const._MB_A_BASE_LANG_RESULT}>

    + +
    +
      +
    • <{$smarty.const._AD_BASE_ERROR_ACTION_SEARCH_NORESULT}>
    • +
    • <{$smarty.const._AD_BASE_ERROR_ACTION_SEARCH_TRY_AGAIN}>
    • +
    +
    From minahito @ users.sourceforge.jp Fri Aug 11 20:02:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 20:02:39 +0900 Subject: [xoops-cvslog 4104] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060811110239.2561E2AC100@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.8 Fri Feb 3 01:37:30 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html Fri Aug 11 20:02:39 2006 @@ -6,7 +6,8 @@

    <{$smarty.const._MI_BASE_MENU_ACTIONSEARCH}>

    <{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}>
    -
    + + <{xoops_input type=hidden name=action value=ActSearch}> <{xoops_token form=$actionForm}> value="<{$actionForm->get('keywords')|escape}>"<{/if}> /> From minahito @ users.sourceforge.jp Fri Aug 11 20:03:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 20:03:03 +0900 Subject: [xoops-cvslog 4105] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060811110303.231622AC100@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.9 --- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.8 Mon Aug 7 20:27:47 2006 +++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php Fri Aug 11 20:03:02 2006 @@ -137,12 +137,6 @@ function getDefaultView(&$controller, &$xoopsUser) { $this->_processActionForm(); - return LEGACY_FRAME_VIEW_INPUT; - } - - function execute(&$controller, &$xoopsUser) - { - $this->_processActionForm(); $this->mActionForm->fetch(); $this->mActionForm->validate(); @@ -159,10 +153,15 @@ return LEGACY_FRAME_VIEW_SUCCESS; } else { - return LEGACY_FRAME_VIEW_INPUT; + return LEGACY_FRAME_VIEW_ERROR; } } + function execute(&$controller, &$xoopsUser) + { + return $this->getDefaultView($controller, $xoopsUser); + } + function _processActionForm() { $this->mActionForm =& new Legacy_ActionSearchForm(); @@ -181,6 +180,12 @@ $render->setTemplateName("legacy_admin_actionsearch_input.html"); $render->setAttribute("actionForm", $this->mActionForm); } + + function executeViewError(&$controller, &$xoopsUser, &$render) + { + $render->setTemplateName("legacy_admin_actionsearch_error.html"); + $render->setAttribute("actionForm", $this->mActionForm); + } } ?> \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 11 20:34:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 11 Aug 2006 20:34:12 +0900 Subject: [xoops-cvslog 4106] CVS update: xoops2jp/html/modules/legacyRender/kernel Message-ID: <20060811113412.ED2D02AC136@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.23 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.24 --- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.23 Thu Aug 10 18:47:26 2006 +++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Fri Aug 11 20:34:12 2006 @@ -1,6 +1,6 @@ mXoopsTpl->xoops_setDebugging(true); } - $this->mXoopsTpl->assign(array('xoops_theme' => $this->mController->mConfig['theme_set'], - 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/', - 'xoops_themecss'=> xoops_getcss($this->mController->mConfig['theme_set']), - 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), //@todo ????????????? + $this->mXoopsTpl->assign(array('xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), //@todo ????????????? 'xoops_sitename' => htmlspecialchars($this->mController->mConfig['sitename'], ENT_QUOTES), 'xoops_slogan' => htmlspecialchars($this->mController->mConfig['slogan'], ENT_QUOTES), // set JavaScript/Weird, but need extra \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 17 19:11:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:12 +0900 Subject: [xoops-cvslog 4164] CVS update: xoops2jp/html/modules/legacyRender/admin/actions Message-ID: <20060817101112.F18C02AC189@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php diff -u xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:removed --- xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.6 Wed Jul 12 16:16:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php Thu Aug 17 19:11:12 2006 @@ -1,115 +0,0 @@ -_setupObject(); - $this->_setupActionForm(); - } - - function _setupObject() - { - $this->mObjectHandler =& xoops_getmodulehandler('theme'); - $this->mObjectHandler->updateThemeList(); - - $this->mThemes =& $this->mObjectHandler->getObjects(); - } - - function _setupActionForm() - { - $this->mActionForm =& new LegacyRender_ThemeSelectForm(); - $this->mActionForm->prepare(); - } - - function getDefaultView(&$controller, &$xoopsUser) - { - $this->mActionForm->load($this->mThemes); - - return LEGACYRENDER_FRAME_VIEW_INDEX; - } - - function execute(&$controller, &$xoopsUser) - { - $this->mActionForm->fetch(); - $this->mActionForm->validate(); - - $this->mActionForm->update($this->mThemes); - - if ($this->mActionForm->hasError()) { - return $this->getDefaultView($controller, $xoopsUser); - } - - // - // save - // - foreach ($this->mThemes as $theme) { - $this->mObjectHandler->insert($theme); - } - - // - // save selected theme. - // - $themeName = $this->mActionForm->getChooseTheme(); - - if ($themeName != null) { - $configHandler =& xoops_gethandler('config'); - - $criteria =& new CriteriaCompo(); - $criteria->add(new Criteria('conf_name', 'theme_set')); - $criteria->add(new Criteria('conf_catid', XOOPS_CONF)); - - $configs =& $configHandler->getConfigs($criteria); - - $configs[0]->set('conf_value', $themeName); - if ($configHandler->insertConfig($configs[0])) { - $controller->mRoot->setThemeName($this->mActionForm->getChooseTheme()); - } - } - - return $this->getDefaultView($controller, $xoopsUser); - } - - function executeViewIndex(&$controller, &$xoopsUser, &$render) - { - foreach (array_keys($this->mThemes) as $name) { - $this->mThemes[$name]->loadPackage(); - } - - $render->setTemplateName("theme_list.html"); - $render->setAttribute("themes", $this->mThemes); - $render->setAttribute("actionForm", $this->mActionForm); - - $mainTheme =& $controller->getMainTheme(); - $render->setAttribute("currentThemeName", $mainTheme); - } -} - -?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 17 19:11:13 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:13 +0900 Subject: [xoops-cvslog 4165] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060817101113.201FF2AC184@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.20 xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:removed --- xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.20 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html Thu Aug 17 19:11:13 2006 @@ -1,77 +0,0 @@ - - -

    <{$smarty.const._AD_LEGACYRENDER_LANG_THEME_ADMIN}>

    - -
    <{$smarty.const._AD_LEGACYRENDER_TIPS_THEME_ADMIN}>
    - -<{if $actionForm->hasError()}> -
    -
      - <{foreach item=message from=$actionForm->getErrorMessages()}> -
    • <{$message|escape}>
    • - <{/foreach}> -
    -
    -<{/if}> - - - - - - - - - <{foreach item=theme from=$themes}> - <{xoops_token form=$actionForm}> - <{if $currentThemeName == $theme->get('name')}> - legacyRender_Template_active" style="text-align:center;"> - <{else}> - " style="text-align:center;"> - <{/if}> - - - - - - <{/foreach}> - - - - - -
    <{$smarty.const._AD_LEGACYRENDER_LANG_THEME}><{$smarty.const._AD_LEGACYRENDER_LANG_PACKAGE}><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}>
    - <{if $theme->mPackage.Theme.ScreenShot}> - <{$theme->get('name')}>
    - <{/if}> - - <{$theme->getShow('name')}> -
    - <{if $theme->mPackage}> -
      -
    • <{$smarty.const._AD_LEGACYRENDER_LANG_VERSION}> <{$theme->mPackage.Manifesto.Version}>
    • -
    • <{$smarty.const._AD_LEGACYRENDER_LANG_AUTHOR}> <{$theme->mPackage.Theme.Author}>
    • -
    • <{$smarty.const._AD_LEGACYRENDER_LANG_W3C}> <{$theme->mPackage.Theme.W3C}>
    • -
    • <{$theme->mPackage.Theme.Description}>
    • - <{if $theme->mPackage.Manifesto.Url}> -
    • <{$smarty.const._AD_LEGACYRENDER_LANG_GET_ADDRESS}>
    • - <{/if}> -
    - <{else}> - <{$smarty.const._AD_LEGACYRENDER_MESSAGE_NO_PACKAGE}> - <{/if}> -
    - get('select', $theme->get('id'))}>checked="checked"<{/if}>/> - - <{if $currentThemeName!=$theme->get('name')}> - - <{else}> - " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" /> - <{/if}> - <{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}> -
    - -
    -
    From minahito @ users.sourceforge.jp Thu Aug 17 19:11:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:25 +0900 Subject: [xoops-cvslog 4166] CVS update: xoops2jp/html/modules/legacyRender/language/english Message-ID: <20060817101125.679412AC169@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/english/admin.php diff -u xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.20 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.21 --- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.20 Sat May 27 01:11:45 2006 +++ xoops2jp/html/modules/legacyRender/language/english/admin.php Thu Aug 17 19:11:25 2006 @@ -1,6 +1,5 @@ Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); define('_AD_LEGACYRENDER_TIPS_TPLSET_UPLOAD', "If you don't input template set name, the name is got from the uploaded file. Upload TAR.GZ Format file that this system can accept."); ?> From minahito @ users.sourceforge.jp Thu Aug 17 19:11:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:33 +0900 Subject: [xoops-cvslog 4167] CVS update: xoops2jp/html/modules/legacyRender/language/english Message-ID: <20060817101133.AA1822AC169@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/english/blocks.php diff -u xoops2jp/html/modules/legacyRender/language/english/blocks.php:1.1.2.1 xoops2jp/html/modules/legacyRender/language/english/blocks.php:removed --- xoops2jp/html/modules/legacyRender/language/english/blocks.php:1.1.2.1 Fri Mar 24 22:05:45 2006 +++ xoops2jp/html/modules/legacyRender/language/english/blocks.php Thu Aug 17 19:11:33 2006 @@ -1,6 +0,0 @@ - From minahito @ users.sourceforge.jp Thu Aug 17 19:11:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:33 +0900 Subject: [xoops-cvslog 4168] CVS update: xoops2jp/html/modules/legacyRender/language/japanese Message-ID: <20060817101133.D075B2AC189@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/japanese/blocks.php diff -u xoops2jp/html/modules/legacyRender/language/japanese/blocks.php:1.1.2.1 xoops2jp/html/modules/legacyRender/language/japanese/blocks.php:removed --- xoops2jp/html/modules/legacyRender/language/japanese/blocks.php:1.1.2.1 Fri Mar 24 22:05:45 2006 +++ xoops2jp/html/modules/legacyRender/language/japanese/blocks.php Thu Aug 17 19:11:33 2006 @@ -1,6 +0,0 @@ - From minahito @ users.sourceforge.jp Thu Aug 17 19:11:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:45 +0900 Subject: [xoops-cvslog 4169] CVS update: xoops2jp/html/modules/legacyRender/language/japanese Message-ID: <20060817101145.9D01F2AC169@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php diff -u xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.9 xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.10 --- xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.9 Thu Aug 10 18:48:00 2006 +++ xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php Thu Aug 17 19:11:45 2006 @@ -1,34 +1,10 @@ ユーザーにテーマを選択させたいですか? チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。"); define('_AD_LEGACYRENDER_TIPS_TPLSET_UPLOAD', "もしこの場で名前を指定しなかった場合は、アップロードされたファイルからテンプレートセット名が取得されます。
    このシステムが対応しているTAR.GZ形式のファイルをアップロードしてください。"); ?> From minahito @ users.sourceforge.jp Thu Aug 17 19:11:45 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:11:45 +0900 Subject: [xoops-cvslog 4170] CVS update: xoops2jp/html/modules/legacyRender/language/english Message-ID: <20060817101145.BEC482AC189@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/language/english/modinfo.php diff -u xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.10 xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.11 --- xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.10 Thu Aug 10 18:47:55 2006 +++ xoops2jp/html/modules/legacyRender/language/english/modinfo.php Thu Aug 17 19:11:45 2006 @@ -1,34 +1,10 @@ Index: xoops2jp/html/modules/legacyRender/templates/blocks/index.html diff -u xoops2jp/html/modules/legacyRender/templates/blocks/index.html:1.1.2.1 xoops2jp/html/modules/legacyRender/templates/blocks/index.html:removed --- xoops2jp/html/modules/legacyRender/templates/blocks/index.html:1.1.2.1 Fri Mar 24 22:05:46 2006 +++ xoops2jp/html/modules/legacyRender/templates/blocks/index.html Thu Aug 17 19:11:52 2006 @@ -1 +0,0 @@ - \ No newline at end of file Index: xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html diff -u xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:1.1.2.2 xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:removed --- xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:1.1.2.2 Thu Apr 13 00:11:21 2006 +++ xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html Thu Aug 17 19:11:52 2006 @@ -1,18 +0,0 @@ -
    -
    -<{if $block.mode==1}> - screenshot
    - -<{/if}> -<{foreach item=theme_option from=$block.theme_options}> - -<{/foreach}> - -<{if $block.mode==1}> - -<{/if}> -
    (<{""|cat:$block.count|cat:""|string_format:$smarty.const._MB_LEGACYRENDER_NUMTHEME}>)
    -
    -
    From minahito @ users.sourceforge.jp Thu Aug 17 19:21:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:04 +0900 Subject: [xoops-cvslog 4172] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060817102104.9914B2AC15F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_list.html Thu Aug 17 19:21:04 2006 @@ -11,7 +11,7 @@ - - + Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html Thu Aug 17 19:21:04 2006 @@ -16,7 +16,7 @@ - + Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.16 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.17 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.16 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Thu Aug 17 19:21:04 2006 @@ -61,8 +61,8 @@ - - + + @@ -112,8 +112,8 @@ - - + + 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.9 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Thu Aug 17 19:21:04 2006 @@ -14,10 +14,10 @@
    <{$smarty.const._AD_USER_LANG_RANK_ID}>
    +
    <{$smarty.const._MD_USER_LANG_RANK_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_TITLE}>
    Index: xoops2jp/html/modules/user/admin/templates/avatar_delete.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_delete.html Thu Aug 17 19:21:04 2006 @@ -18,7 +18,7 @@
    <{$smarty.const._AD_USER_LANG_AVATAR_DELETE}>
    <{$smarty.const._AD_USER_LANG_AVATAR_ID}><{$smarty.const._MD_USER_LANG_AVATAR_ID}> "><{$object->getShow('avatar_id')}>
    <{$smarty.const._AD_USER_LANG_DELETE_RANK}>
    <{$smarty.const._AD_USER_LANG_RANK_ID}><{$smarty.const._MD_USER_LANG_RANK_ID}> "><{$object->getShow('rank_id')}>
    <{$smarty.const._REGISTER}>  <{$smarty.const._AD_USER_LANG_UID}><{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UID}><{$smarty.const._MD_USER_LANG_UNAME}> <{$smarty.const._AD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}>
    <{$smarty.const._DELETE}>  <{$smarty.const._AD_USER_LANG_UID}><{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UID}><{$smarty.const._MD_USER_LANG_UNAME}> <{$smarty.const._AD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}>
    - - <{if $actionForm->get('avatar_id')}> - + <{/if}> Index: xoops2jp/html/modules/user/admin/templates/user_edit.html diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.17 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.18 --- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.17 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_edit.html Thu Aug 17 19:21:04 2006 @@ -39,7 +39,7 @@ - + @@ -51,7 +51,7 @@ - + - + - + - + - + @@ -164,7 +164,7 @@ - + Index: xoops2jp/html/modules/user/admin/templates/user_view.html diff -u xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.4 --- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.3 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_view.html Thu Aug 17 19:21:04 2006 @@ -10,13 +10,13 @@
     <{$smarty.const._AD_USER_LANG_UID}>
    +
    <{$smarty.const._MD_USER_LANG_UID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_UNAME}>
    +
    <{$smarty.const._MD_USER_LANG_UNAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_NAME}>
    Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html Thu Aug 17 19:21:04 2006 @@ -3,14 +3,14 @@ »» <{$smarty.const._MI_USER_ADMENU_AVATAR_MANAGE}> »» <{if $actionForm->get('avatar_id')}> - <{$smarty.const._AD_USER_LANG_AVATAR_EDIT}> + <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> <{else}> <{$smarty.const._AD_USER_LANG_AVATAR_NEW}> <{/if}> <{if $actionForm->get('avatar_id')}> -

    <{$smarty.const._AD_USER_LANG_AVATAR_EDIT}>

    +

    <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>

    <{else}>

    <{$smarty.const._AD_USER_LANG_AVATAR_NEW}>

    <{/if}> @@ -32,7 +32,7 @@
    <{if $actionForm->get('avatar_id')}> - <{$smarty.const._AD_USER_LANG_AVATAR_EDIT}> + <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> <{else}> <{$smarty.const._AD_USER_LANG_AVATAR_NEW}> <{/if}> @@ -40,7 +40,7 @@
    <{$smarty.const._AD_USER_LANG_AVATAR_ID}><{$smarty.const._MD_USER_LANG_AVATAR_ID}> "><{$actionForm->get('avatar_id')}>
    <{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UNAME}> "> <{xoops_input type=text name=uname value=$actionForm->get('uname') size=25 maxlength=25}>
    <{$smarty.const._AD_USER_LANG_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{xoops_input type=text name=email value=$actionForm->get('email') size=30 maxlength=60}>
    @@ -60,13 +60,13 @@
    <{$smarty.const._AD_USER_LANG_URL}><{$smarty.const._MD_USER_LANG_URL}> "> <{xoops_input type=text name=url value=$actionForm->get('url') size=50 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_TIMEZONE_OFFSET}><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}> ">
    <{$smarty.const._AD_USER_LANG_NOTIFY_METHOD}><{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}> "> <{html_options name=notify_method options=$notify_methodOptions selected=$actionForm->get('notify_method')}>
    <{$smarty.const._AD_USER_LANG_NOTIFY_MODE}><{$smarty.const._MD_USER_LANG_NOTIFY_MODE}> "> <{html_options name=notify_mode options=$notify_modeOptions selected=$actionForm->get('notify_mode')}>
    <{$smarty.const._AD_USER_LANG_PASS}><{$smarty.const._MD_USER_LANG_PASS}> "> <{xoops_input type=password name=pass size=25 maxlength=32}>
    - + - + @@ -28,13 +28,13 @@ - + - + @@ -136,7 +136,7 @@ - + - + - + Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.15 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.14 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Thu Aug 17 19:21:04 2006 @@ -41,8 +41,8 @@
    <{$smarty.const._AD_USER_LANG_UID}><{$smarty.const._MD_USER_LANG_UID}> <{$object->getShow('uid')}>
    <{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UNAME}> <{$object->getShow('uname')}>
    <{$smarty.const._AD_USER_LANG_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> <{$object->getShow('email')}>
    <{$smarty.const._AD_USER_LANG_URL}><{$smarty.const._MD_USER_LANG_URL}> <{$object->getShow('url')}>
    <{$smarty.const._AD_USER_LANG_TIMEZONE_OFFSET}><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}> <{if $timezone}> <{$timezone->getShow('zone_name')}> @@ -164,13 +164,13 @@
    <{$smarty.const._AD_USER_LANG_NOTIFY_METHOD}><{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}> <{$notify_method|escape}>
    <{$smarty.const._AD_USER_LANG_NOTIFY_MODE}><{$smarty.const._MD_USER_LANG_NOTIFY_MODE}> <{$notify_mode|escape}>
    - - + + Index: xoops2jp/html/modules/user/admin/templates/user_search.html diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.8 --- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search.html Thu Aug 17 19:21:04 2006 @@ -22,7 +22,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -64,7 +64,7 @@ - + Index: xoops2jp/html/modules/user/admin/templates/user_delete.html diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_delete.html Thu Aug 17 19:21:04 2006 @@ -26,11 +26,11 @@ - + - + Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.16 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.17 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.16 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Thu Aug 17 19:21:04 2006 @@ -12,10 +12,10 @@
     <{$smarty.const._AD_USER_LANG_UID}><{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UID}><{$smarty.const._MD_USER_LANG_UNAME}> <{$smarty.const._AD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}>
    <{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UNAME}> "> <{xoops_input type=text name=uname value=$actionForm->get('uname') size=25 maxlength=25}>
    <{$smarty.const._AD_USER_LANG_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{xoops_input type=text name=email value=$actionForm->get('email') size=30 maxlength=60}>
    <{$smarty.const._AD_USER_LANG_URL}><{$smarty.const._MD_USER_LANG_URL}> "> <{xoops_input type=text name=url value=$actionForm->get('url') size=50 maxlength=100}> <{$smarty.const._AD_USER_LANG_USER_DELETE}>
    <{$smarty.const._AD_USER_LANG_UID}><{$smarty.const._MD_USER_LANG_UID}> "><{$object->getShow('uid')}>
    <{$smarty.const._AD_USER_LANG_UNAME}><{$smarty.const._MD_USER_LANG_UNAME}> "><{$object->getShow('uname')}>
    - - - - Index: xoops2jp/html/modules/base/admin/templates/module_list.html diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.16 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.17 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.16 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Fri Aug 18 20:29:46 2006 @@ -6,7 +6,7 @@

    <{$smarty.const._MI_BASE_MENU_MODULELIST}>

    <{if $actionForm->hasError()}> @@ -23,25 +23,25 @@ <{xoops_token form=$actionForm}>
     <{$smarty.const._AD_USER_LANG_UID}>
    +
    <{$smarty.const._MD_USER_LANG_UID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_UNAME}>
    +
    <{$smarty.const._MD_USER_LANG_UNAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_NAME}>
    Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.12 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Thu Aug 17 19:21:04 2006 @@ -11,7 +11,7 @@ - From minahito @ users.sourceforge.jp Thu Aug 17 19:21:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:04 +0900 Subject: [xoops-cvslog 4173] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060817102104.DB6B02AC169@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.20 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.21 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.20 Thu Aug 17 12:08:41 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Thu Aug 17 19:21:04 2006 @@ -1,27 +1,20 @@ X"); -define('_AD_USER_LANG_PASS', "Password"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "Only inactive users"); define('_AD_USER_LANG_PERM_ACCESS', "Access"); define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Privilege of access control"); @@ -116,7 +102,6 @@ define('_AD_USER_LANG_POSTS', "Posts"); define('_AD_USER_LANG_RANK', "Rank"); define('_AD_USER_LANG_RANK_EDIT', "Edit user rank"); -define('_AD_USER_LANG_RANK_ID', "ID"); define('_AD_USER_LANG_RANK_IMAGE', "Image"); define('_AD_USER_LANG_RANK_LIST', "User rank administration"); define('_AD_USER_LANG_RANK_MAX', "Maximum posts"); @@ -135,17 +120,12 @@ define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition"); define('_AD_USER_LANG_SENDER', "Sender"); define('_AD_USER_LANG_SUBJECT', "Subject"); -define('_AD_USER_LANG_SUBMIT', "Submit"); define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar"); define('_AD_USER_LANG_THEME', "theme"); -define('_AD_USER_LANG_TIMEZONE_OFFSET', "TimeZone"); define('_AD_USER_LANG_TITLE', "title"); -define('_AD_USER_LANG_UID', "UID"); define('_AD_USER_LANG_UMODE', "Comments Display Mode"); -define('_AD_USER_LANG_UNAME', "User name"); define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); define('_AD_USER_LANG_UORDER', "Comments Sort Order"); -define('_AD_USER_LANG_URL', "Website"); define('_AD_USER_LANG_USER', "User"); define('_AD_USER_LANG_USER_AIM', "AIM"); define('_AD_USER_LANG_USER_AVATAR', "user avatar"); @@ -175,5 +155,6 @@ define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif."); define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters."); define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button."); +define('_MD_USER_LANG_UNAME', "User name"); ?> Index: xoops2jp/html/modules/user/language/english/main.php diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.15 xoops2jp/html/modules/user/language/english/main.php:1.1.2.16 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.15 Thu Aug 17 12:08:41 2006 +++ xoops2jp/html/modules/user/language/english/main.php Thu Aug 17 19:21:04 2006 @@ -7,7 +7,6 @@ define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address"); define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong."); -define('_MD_USER_ERROR_INTRANGE', "Incorrect input on {0}."); define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters."); define('_MD_USER_ERROR_PASSWORD', "The passwords you gave did not match."); @@ -17,22 +16,14 @@ define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator."); define('_MD_USER_ERROR_TIMEZONE', "TimeZone"); define('_MD_USER_LANG_AVATAR', "Avatar"); -define('_MD_USER_LANG_AVATAR_CREATED', "Created"); -define('_MD_USER_LANG_AVATAR_DISPLAY', "Display"); define('_MD_USER_LANG_AVATAR_EDIT', "Edit avatar"); -define('_MD_USER_LANG_AVATAR_FILE', "Image file"); define('_MD_USER_LANG_AVATAR_HEIGHT', "Height"); define('_MD_USER_LANG_AVATAR_ID', "ID"); define('_MD_USER_LANG_AVATAR_LIST', "avatar list"); define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Max file size"); -define('_MD_USER_LANG_AVATAR_MIMETYPE', "Mime Type"); define('_MD_USER_LANG_AVATAR_NAME', "Name"); -define('_MD_USER_LANG_AVATAR_TYPE', "Type"); -define('_MD_USER_LANG_AVATAR_WEIGHT', "Weight"); define('_MD_USER_LANG_AVATAR_WIDTH', "Width"); define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "avatar width hight"); -define('_MD_USER_LANG_CONTROL', "Control"); -define('_MD_USER_LANG_CREATE_NEW', "Create new"); define('_MD_USER_LANG_EMAIL', "Email address"); define('_MD_USER_LANG_GROUPID', "Group ID"); define('_MD_USER_LANG_GUEST', "Guest"); @@ -47,7 +38,6 @@ define('_MD_USER_LANG_UNAME', "User name"); define('_MD_USER_LANG_URL', "Website"); define('_MD_USER_LANG_WHOSONLINE', "Who's Online"); -define('_MD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password"); define('_US_ACONTACT', "Selected account is already activated!"); define('_US_ACTKEYNOT', "Activation key is not correct!"); From minahito @ users.sourceforge.jp Thu Aug 17 19:21:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:05 +0900 Subject: [xoops-cvslog 4174] CVS update: xoops2jp/html/modules/user/admin/.xml Message-ID: <20060817102105.2A1112AC15F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml diff -u xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml:1.1.2.1 Thu Apr 27 19:23:27 2006 +++ xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml Thu Aug 17 19:21:04 2006 @@ -6,7 +6,7 @@ - + Index: xoops2jp/html/modules/user/admin/.xml/ranks_delete.xml diff -u xoops2jp/html/modules/user/admin/.xml/ranks_delete.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/ranks_delete.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/ranks_delete.xml:1.1.2.1 Thu Jan 19 21:05:08 2006 +++ xoops2jp/html/modules/user/admin/.xml/ranks_delete.xml Thu Aug 17 19:21:04 2006 @@ -5,8 +5,8 @@ - - + + Index: xoops2jp/html/modules/user/admin/.xml/user_search.xml diff -u xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.1 Tue Apr 11 18:16:07 2006 +++ xoops2jp/html/modules/user/admin/.xml/user_search.xml Thu Aug 17 19:21:04 2006 @@ -27,69 +27,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -136,14 +136,14 @@ - + - + Index: xoops2jp/html/modules/user/admin/.xml/groups_edit.xml diff -u xoops2jp/html/modules/user/admin/.xml/groups_edit.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/groups_edit.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/groups_edit.xml:1.1.2.1 Thu Jul 13 19:41:21 2006 +++ xoops2jp/html/modules/user/admin/.xml/groups_edit.xml Thu Aug 17 19:21:04 2006 @@ -7,14 +7,14 @@ - - + + - + - + Index: xoops2jp/html/modules/user/admin/.xml/user_delete.xml diff -u xoops2jp/html/modules/user/admin/.xml/user_delete.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/user_delete.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/user_delete.xml:1.1.2.1 Thu Jan 19 21:05:08 2006 +++ xoops2jp/html/modules/user/admin/.xml/user_delete.xml Thu Aug 17 19:21:04 2006 @@ -5,8 +5,8 @@ - - + + Index: xoops2jp/html/modules/user/admin/.xml/user_recount.xml diff -u xoops2jp/html/modules/user/admin/.xml/user_recount.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/user_recount.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/user_recount.xml:1.1.2.1 Fri Jul 28 18:00:51 2006 +++ xoops2jp/html/modules/user/admin/.xml/user_recount.xml Thu Aug 17 19:21:04 2006 @@ -5,8 +5,8 @@ - - + + Index: xoops2jp/html/modules/user/admin/.xml/group_delete.xml diff -u xoops2jp/html/modules/user/admin/.xml/group_delete.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/group_delete.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/group_delete.xml:1.1.2.1 Thu Jan 19 21:05:08 2006 +++ xoops2jp/html/modules/user/admin/.xml/group_delete.xml Thu Aug 17 19:21:04 2006 @@ -5,8 +5,8 @@ - - + + Index: xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml diff -u xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.2 xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.3 --- xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.2 Wed Jul 12 19:50:23 2006 +++ xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml Thu Aug 17 19:21:04 2006 @@ -10,26 +10,26 @@ - - + + - + - + - + - + Index: xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml diff -u xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml:1.1.2.1 Thu Apr 27 19:23:27 2006 +++ xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml Thu Aug 17 19:21:04 2006 @@ -6,7 +6,7 @@ - + Index: xoops2jp/html/modules/user/admin/.xml/avatar_edit.xml diff -u xoops2jp/html/modules/user/admin/.xml/avatar_edit.xml:1.1.2.2 xoops2jp/html/modules/user/admin/.xml/avatar_edit.xml:1.1.2.3 --- xoops2jp/html/modules/user/admin/.xml/avatar_edit.xml:1.1.2.2 Thu Jan 26 20:10:43 2006 +++ xoops2jp/html/modules/user/admin/.xml/avatar_edit.xml Thu Aug 17 19:21:04 2006 @@ -9,24 +9,24 @@ - - + + - + - + - + - + Index: xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml diff -u xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml:1.1.2.1 Thu Apr 27 19:23:27 2006 +++ xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml Thu Aug 17 19:21:04 2006 @@ -12,27 +12,27 @@ - + - + - + - + - + - + Index: xoops2jp/html/modules/user/admin/.xml/avatar_delete.xml diff -u xoops2jp/html/modules/user/admin/.xml/avatar_delete.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/avatar_delete.xml:1.1.2.2 --- xoops2jp/html/modules/user/admin/.xml/avatar_delete.xml:1.1.2.1 Thu Jan 19 21:05:08 2006 +++ xoops2jp/html/modules/user/admin/.xml/avatar_delete.xml Thu Aug 17 19:21:04 2006 @@ -5,8 +5,8 @@ - - + + Index: xoops2jp/html/modules/user/admin/.xml/users.xml diff -u xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.2 xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.3 --- xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.2 Thu Jan 12 13:20:55 2006 +++ xoops2jp/html/modules/user/admin/.xml/users.xml Thu Aug 17 19:21:04 2006 @@ -38,49 +38,49 @@ - - + + - + - - + + - + - + - + - + - + - + - + - + @@ -88,77 +88,77 @@ - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - - + + + - - - + + + @@ -166,7 +166,7 @@ - + @@ -175,7 +175,7 @@ - + From minahito @ users.sourceforge.jp Thu Aug 17 19:21:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:05 +0900 Subject: [xoops-cvslog 4175] CVS update: xoops2jp/html/modules/user/admin/forms Message-ID: <20060817102105.656DF2AC15F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.2 Thu Jul 13 19:50:40 2006 +++ xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['mailjob_id']->setDependsByArray(array('required')); - $this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); + $this->mFieldProperties['mailjob_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); } function load(&$obj) Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.2 Thu Jul 13 19:50:32 2006 +++ xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['mailjob_id']->setDependsByArray(array('required')); - $this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); + $this->mFieldProperties['mailjob_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); $this->mFieldProperties['title'] =& new XCube_FieldProperty($this); $this->mFieldProperties['title']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['title']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_TITLE, '255'); - $this->mFieldProperties['title']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_TITLE, '255'); + $this->mFieldProperties['title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_TITLE, '255'); + $this->mFieldProperties['title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_TITLE, '255'); $this->mFieldProperties['title']->addVar('maxlength', '255'); $this->mFieldProperties['body'] =& new XCube_FieldProperty($this); $this->mFieldProperties['body']->setDependsByArray(array('required')); - $this->mFieldProperties['body']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_BODY); + $this->mFieldProperties['body']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_BODY); $this->mFieldProperties['from_name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['from_name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['from_name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255'); + $this->mFieldProperties['from_name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, '255'); $this->mFieldProperties['from_name']->addVar('maxlength', '255'); $this->mFieldProperties['from_email'] =& new XCube_FieldProperty($this); $this->mFieldProperties['from_email']->setDependsByArray(array('maxlength', 'email')); - $this->mFieldProperties['from_email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255'); + $this->mFieldProperties['from_email']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, '255'); $this->mFieldProperties['from_email']->addVar('maxlength', '255'); $this->mFieldProperties['from_email']->addMessage('email', _AD_USER_ERROR_EMAIL, _AD_USER_LANG_FROM_EMAIL); } @@ -61,7 +61,7 @@ function validateFrom_email() { if ($this->get('is_mail') && strlen($this->get('from_email')) == 0) { - $this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_REQUIRED, _AD_USER_LANG_FROM_EMAIL)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_REQUIRED, _AD_USER_LANG_FROM_EMAIL)); } } Index: xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.4 Thu Jul 13 19:51:43 2006 +++ xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['uid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uid']->setDependsByArray(array('required')); - $this->mFieldProperties['uid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UID); + $this->mFieldProperties['uid']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UID); } function load(&$obj) Index: xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.4 Thu Jul 13 19:48:48 2006 +++ xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php Thu Aug 17 19:21:05 2006 @@ -34,22 +34,22 @@ // $this->mFieldProperties['avatar_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['avatar_id']->setDependsByArray(array('required')); - $this->mFieldProperties['avatar_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_ID); + $this->mFieldProperties['avatar_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_AVATAR_ID); $this->mFieldProperties['avatar_file'] =& new XCube_FieldProperty($this); $this->mFieldProperties['avatar_file']->setDependsByArray(array('extension')); - $this->mFieldProperties['avatar_file']->addMessage('extension', _AD_USER_ERROR_AVATAR_EXTENSION, _AD_USER_LANG_AVATAR_FILE); + $this->mFieldProperties['avatar_file']->addMessage('extension', _MD_USER_ERROR_AVATAR_EXTENSION, _AD_USER_LANG_AVATAR_FILE); $this->mFieldProperties['avatar_file']->addVar('extension', "gif,png,jpg"); $this->mFieldProperties['avatar_name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['avatar_name']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['avatar_name']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_NAME, '100'); - $this->mFieldProperties['avatar_name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_AVATAR_NAME, '100'); + $this->mFieldProperties['avatar_name']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_NAME, '100'); + $this->mFieldProperties['avatar_name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_AVATAR_NAME, '100'); $this->mFieldProperties['avatar_name']->addVar('maxlength', 100); $this->mFieldProperties['avatar_weight'] =& new XCube_FieldProperty($this); $this->mFieldProperties['avatar_weight']->setDependsByArray(array('required')); - $this->mFieldProperties['avatar_weight']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_WEIGHT); + $this->mFieldProperties['avatar_weight']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_WEIGHT); } function validateAvatar_file() Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.2 Thu Jul 13 19:50:22 2006 +++ xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['mailjob_id']->setDependsByArray(array('required')); - $this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); + $this->mFieldProperties['mailjob_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID); } function load(&$obj) Index: xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php:1.1.2.2 --- xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php:1.1.2.1 Thu Jul 13 19:49:15 2006 +++ xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['groupid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['groupid']->setDependsByArray(array('required')); - $this->mFieldProperties['groupid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUPID); + $this->mFieldProperties['groupid']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_GROUPID); $this->mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['name']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUP_NAME, '50'); - $this->mFieldProperties['name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_GROUP_NAME, '50'); + $this->mFieldProperties['name']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUP_NAME, '50'); + $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_GROUP_NAME, '50'); $this->mFieldProperties['name']->addVar('maxlength', '50'); } Index: xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php:1.1.2.2 --- xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php:1.1.2.1 Fri Jul 28 17:55:58 2006 +++ xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['uid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uid']->setDependsByArray(array('required','objectExist')); - $this->mFieldProperties['uid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UID); - $this->mFieldProperties['uid']->addMessage('objectExist', _AD_USER_ERROR_OBJECTEXIST, _AD_USER_LANG_UID); + $this->mFieldProperties['uid']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UID); + $this->mFieldProperties['uid']->addMessage('objectExist', _AD_USER_ERROR_OBJECTEXIST, _MD_USER_LANG_UID); $this->mFieldProperties['uid']->addVar('handler', 'users'); $this->mFieldProperties['uid']->addVar('module', 'user'); } Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.4 Thu Jul 13 14:15:05 2006 +++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['rank_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_id']->setDependsByArray(array('required')); - $this->mFieldProperties['rank_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_ID); + $this->mFieldProperties['rank_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_ID); $this->mFieldProperties['rank_title'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_title']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['rank_title']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_TITLE, '50'); - $this->mFieldProperties['rank_title']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_RANK_TITLE, '50'); $this->mFieldProperties['rank_title']->addVar('maxlength', 50); $this->mFieldProperties['rank_min'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_min']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_min']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN); + $this->mFieldProperties['rank_min']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN); $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MIN, 0); $this->mFieldProperties['rank_min']->addVar('min', 0); $this->mFieldProperties['rank_max'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_max']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_max']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX); + $this->mFieldProperties['rank_max']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX); $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MAX, 0); $this->mFieldProperties['rank_max']->addVar('min', 0); } @@ -63,7 +63,7 @@ function validateRank_max() { if ($this->get('rank_max') < $this->get('rank_min')) { - $this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX); + $this->addErrorMessage(_MD_USER_ERROR_INJURY_MIN_MAX); } } Index: xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.4 Thu Jul 13 19:49:06 2006 +++ xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['groupid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['groupid']->setDependsByArray(array('required')); - $this->mFieldProperties['groupid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUPID); + $this->mFieldProperties['groupid']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_GROUPID); } function load(&$obj) Index: xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.4 Thu Jul 13 19:48:38 2006 +++ xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['avatar_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['avatar_id']->setDependsByArray(array('required')); - $this->mFieldProperties['avatar_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_AVATAR_ID); + $this->mFieldProperties['avatar_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_AVATAR_ID); } function load(&$obj) Index: xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.2 Thu Jul 13 19:52:53 2006 +++ xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php Thu Aug 17 19:21:05 2006 @@ -37,57 +37,57 @@ // $this->mFieldProperties['uname'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uname']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['uname']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_UNAME, '25'); + $this->mFieldProperties['uname']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_UNAME, '25'); $this->mFieldProperties['uname']->addVar('maxlength', '25'); $this->mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); + $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); $this->mFieldProperties['name']->addVar('maxlength', '60'); $this->mFieldProperties['email'] =& new XCube_FieldProperty($this); $this->mFieldProperties['email']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_EMAIL, '60'); + $this->mFieldProperties['email']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, '60'); $this->mFieldProperties['email']->addVar('maxlength', '60'); $this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_icq']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); + $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); $this->mFieldProperties['user_icq']->addVar('maxlength', '15'); $this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_aim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); + $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); $this->mFieldProperties['user_aim']->addVar('maxlength', '18'); $this->mFieldProperties['user_yim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_yim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_yim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); + $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); $this->mFieldProperties['user_yim']->addVar('maxlength', '25'); $this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_msnm']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); + $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); $this->mFieldProperties['user_msnm']->addVar('maxlength', '100'); $this->mFieldProperties['url'] =& new XCube_FieldProperty($this); $this->mFieldProperties['url']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['url']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_URL, '100'); + $this->mFieldProperties['url']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_URL, '100'); $this->mFieldProperties['url']->addVar('maxlength', '100'); $this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_from']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_from']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); + $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); $this->mFieldProperties['user_from']->addVar('maxlength', '100'); $this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_occ']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); + $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); $this->mFieldProperties['user_occ']->addVar('maxlength', '100'); $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', '150'); $this->mFieldProperties['lastlog_more'] =& new XCube_FieldProperty($this); @@ -128,14 +128,14 @@ $this->mFieldProperties['mail_condition'] =& new XCube_FieldProperty($this); $this->mFieldProperties['mail_condition']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['mail_condition']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION); + $this->mFieldProperties['mail_condition']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION); $this->mFieldProperties['mail_condition']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION); $this->mFieldProperties['mail_condition']->addVar('min', '1'); $this->mFieldProperties['mail_condition']->addVar('max', '3'); $this->mFieldProperties['user_level'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_level']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['user_level']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_LEVEL); + $this->mFieldProperties['user_level']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_LEVEL); $this->mFieldProperties['user_level']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_DISPLAY_USER_LEVEL); $this->mFieldProperties['user_level']->addVar('min', '1'); $this->mFieldProperties['user_level']->addVar('max', '3'); Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.12 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.13 --- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.12 Thu Aug 17 12:14:04 2006 +++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['uid'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uid']->setDependsByArray(array('required')); - $this->mFieldProperties['uid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UID); + $this->mFieldProperties['uid']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UID); $this->mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); + $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); $this->mFieldProperties['name']->addVar('maxlength', 60); $this->mFieldProperties['uname'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uname']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['uname']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UNAME, '25'); - $this->mFieldProperties['uname']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_UNAME, '25'); + $this->mFieldProperties['uname']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UNAME, '25'); + $this->mFieldProperties['uname']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_UNAME, '25'); $this->mFieldProperties['uname']->addVar('maxlength', 25); $this->mFieldProperties['email'] =& new XCube_FieldProperty($this); - $this->mFieldProperties['email']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_EMAIL, '60'); + $this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL, '60'); $this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email')); - $this->mFieldProperties['email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_EMAIL, '60'); + $this->mFieldProperties['email']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, '60'); $this->mFieldProperties['email']->addVar('maxlength', 60); - $this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT, _AD_USER_LANG_EMAIL); + $this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT, _MD_USER_LANG_EMAIL); $this->mFieldProperties['url'] =& new XCube_FieldProperty($this); $this->mFieldProperties['url']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['url']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_URL, '100'); + $this->mFieldProperties['url']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_URL, '100'); $this->mFieldProperties['url']->addVar('maxlength', 100); $this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_icq']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); + $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); $this->mFieldProperties['user_icq']->addVar('maxlength', 15); $this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_from']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_from']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); + $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); $this->mFieldProperties['user_from']->addVar('maxlength', 100); $this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_aim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); + $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); $this->mFieldProperties['user_aim']->addVar('maxlength', 18); $this->mFieldProperties['user_yim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_yim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_yim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); + $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); $this->mFieldProperties['user_yim']->addVar('maxlength', 25); $this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_msnm']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); + $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); $this->mFieldProperties['user_msnm']->addVar('maxlength', 100); $this->mFieldProperties['pass'] =& new XCube_FieldProperty($this); $this->mFieldProperties['pass']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['pass']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_PASS, '32'); + $this->mFieldProperties['pass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32'); $this->mFieldProperties['pass']->addVar('maxlength', 32); $this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this); $this->mFieldProperties['vpass']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['vpass']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_PASS, '32'); + $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32'); $this->mFieldProperties['vpass']->addVar('maxlength', 32); $this->mFieldProperties['posts'] =& new XCube_FieldProperty($this); $this->mFieldProperties['posts']->setDependsByArray(array('required')); - $this->mFieldProperties['posts']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_POSTS); + $this->mFieldProperties['posts']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_POSTS); $this->mFieldProperties['rank'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank']->setDependsByArray(array('required')); - $this->mFieldProperties['rank']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK); + $this->mFieldProperties['rank']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK); $this->mFieldProperties['level'] =& new XCube_FieldProperty($this); $this->mFieldProperties['level']->setDependsByArray(array('required')); - $this->mFieldProperties['level']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_LEVEL); + $this->mFieldProperties['level']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_LEVEL); $this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this); $this->mFieldProperties['timezone_offset']->setDependsByArray(array('required')); - $this->mFieldProperties['timezone_offset']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_TIMEZONE_OFFSET); + $this->mFieldProperties['timezone_offset']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_TIMEZONE_OFFSET); $this->mFieldProperties['umode'] =& new XCube_FieldProperty($this); $this->mFieldProperties['umode']->setDependsByArray(array('required')); - $this->mFieldProperties['umode']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UMODE); + $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_UMODE); $this->mFieldProperties['uorder'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uorder']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['uorder']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UORDER); - $this->mFieldProperties['uorder']->addMessage('intRange', _AD_USER_ERROR_INJURY, _AD_USER_LANG_UORDER); + $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_UORDER); + $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _AD_USER_LANG_UORDER); $this->mFieldProperties['uorder']->addVar('min', 0); $this->mFieldProperties['uorder']->addVar('max', 1); $this->mFieldProperties['notify_method'] =& new XCube_FieldProperty($this); $this->mFieldProperties['notify_method']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['notify_method']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_NOTIFY_METHOD); - $this->mFieldProperties['notify_method']->addMessage('intRange', _AD_USER_ERROR_INJURY, _AD_USER_LANG_NOTIFY_METHOD); + $this->mFieldProperties['notify_method']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_NOTIFY_METHOD); + $this->mFieldProperties['notify_method']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_NOTIFY_METHOD); $this->mFieldProperties['notify_method']->addVar('min', 0); $this->mFieldProperties['notify_method']->addVar('max', 2); $this->mFieldProperties['notify_mode'] =& new XCube_FieldProperty($this); $this->mFieldProperties['notify_mode']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['notify_mode']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_NOTIFY_MODE); - $this->mFieldProperties['notify_mode']->addMessage('intRange', _AD_USER_ERROR_INJURY, _AD_USER_LANG_NOTIFY_MODE); + $this->mFieldProperties['notify_mode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_NOTIFY_MODE); + $this->mFieldProperties['notify_mode']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_NOTIFY_MODE); $this->mFieldProperties['notify_mode']->addVar('min', 0); $this->mFieldProperties['notify_mode']->addVar('max', 2); $this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_occ']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); + $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); $this->mFieldProperties['user_occ']->addVar('maxlength', 100); $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } @@ -192,7 +192,7 @@ $t_url = $this->get('url'); if (strlen($t_url) > 0) { if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $t_url)) { - $this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_URL)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL)); } } } @@ -212,13 +212,13 @@ { if (strlen($this->get('pass'))) { if ($this->get('pass') != $this->get('vpass')) { - $this->addErrorMessage(_AD_USER_ERROR_PASSWORD); + $this->addErrorMessage(_MD_USER_ERROR_PASSWORD); $this->set('pass', ''); $this->set('vpass', ''); } } elseif($this->_mIsNew) { - $this->addErrorMessage(_AD_USER_ERROR_PASSWORD_REQUIRED); + $this->addErrorMessage(_MD_USER_ERROR_PASSWORD_REQUIRED); } } @@ -231,10 +231,10 @@ $rank =& $handler->get($t_rank); if (!is_object($rank)) { - $this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); } elseif ($rank->get('rank_special') != 1) { - $this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); } } } Index: xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.4 Thu Jul 13 19:51:16 2006 +++ xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ mFieldProperties['rank_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_id']->setDependsByArray(array('required')); - $this->mFieldProperties['rank_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_ID); + $this->mFieldProperties['rank_id']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_ID); } function load(&$obj) From minahito @ users.sourceforge.jp Thu Aug 17 19:21:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:05 +0900 Subject: [xoops-cvslog 4176] CVS update: xoops2jp/html/modules/user/admin/actions Message-ID: <20060817102105.9C9312AC169@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.3 Thu Jul 13 19:43:19 2006 +++ xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=GroupList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=GroupList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.3 --- xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.2 Thu Jul 13 19:44:51 2006 +++ xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=MailjobList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.3 Sat Aug 5 22:22:28 2006 +++ xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=MailjobList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.4 Thu Jul 13 19:42:45 2006 +++ xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=AvatarList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.4 Sat Aug 5 15:23:04 2006 +++ xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=UserList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=UserList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.5 --- xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.4 Thu Jul 13 19:43:31 2006 +++ xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("index.php?action=GroupList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("index.php?action=GroupList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.3 Thu Jul 13 19:45:54 2006 +++ xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=RanksList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.6 --- xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.5 Thu Jul 20 17:14:12 2006 +++ xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("index.php", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("index.php", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.3 Wed Jul 12 19:50:37 2006 +++ xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php Thu Aug 17 19:21:05 2006 @@ -50,7 +50,7 @@ function executeViewError(&$controller, &$xoopsUser, &$render) { - $controller->executeRedirect("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=RanksList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) Index: xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php diff -u xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.6 --- xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.5 Thu Jul 13 19:42:57 2006 +++ xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php Thu Aug 17 19:21:05 2006 @@ -1,7 +1,7 @@ executeRedirect("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED); + $controller->executeRedirect("./index.php?action=AvatarList", 1, _MD_USER_ERROR_DBUPDATE_FAILED); } function executeViewCancel(&$controller, &$xoopsUser, &$render) From minahito @ users.sourceforge.jp Thu Aug 17 19:21:05 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 17 Aug 2006 19:21:05 +0900 Subject: [xoops-cvslog 4177] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060817102105.C6B0F2AC15F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.17 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.18 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.17 Thu Aug 17 12:09:02 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Thu Aug 17 19:21:05 2006 @@ -7,7 +7,6 @@ define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0}は不正なメールアドレスです"); define('_MD_USER_ERROR_INJURY', "{0}の入力値が不正です"); -define('_MD_USER_ERROR_INTRANGE', "{0}に対して不正な入力です"); define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以内で入力して下さい"); define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい"); define('_MD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません"); @@ -17,22 +16,14 @@ define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。"); define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン"); define('_MD_USER_LANG_AVATAR', "アバター"); -define('_MD_USER_LANG_AVATAR_CREATED', "作成日時"); -define('_MD_USER_LANG_AVATAR_DISPLAY', "表示"); define('_MD_USER_LANG_AVATAR_EDIT', "アバター編集"); -define('_MD_USER_LANG_AVATAR_FILE', "画像ファイル"); define('_MD_USER_LANG_AVATAR_HEIGHT', "高さ"); define('_MD_USER_LANG_AVATAR_ID', "ID"); define('_MD_USER_LANG_AVATAR_LIST', "使用可能アバター一覧"); define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "最大ファイルサイズ"); -define('_MD_USER_LANG_AVATAR_MIMETYPE', "Mime Type"); define('_MD_USER_LANG_AVATAR_NAME', "名前"); -define('_MD_USER_LANG_AVATAR_TYPE', "タイプ"); -define('_MD_USER_LANG_AVATAR_WEIGHT', "優先度"); define('_MD_USER_LANG_AVATAR_WIDTH', "幅"); define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "幅 x 高さ"); -define('_MD_USER_LANG_CONTROL', "操作"); -define('_MD_USER_LANG_CREATE_NEW', "新規作成"); define('_MD_USER_LANG_EMAIL', "メールアドレス"); define('_MD_USER_LANG_GROUPID', "グループID"); define('_MD_USER_LANG_GUEST', "ゲスト"); @@ -47,7 +38,6 @@ define('_MD_USER_LANG_UNAME', "ユーザー名"); define('_MD_USER_LANG_URL', "ホームページ"); define('_MD_USER_LANG_WHOSONLINE', "オンライン状況"); -define('_MD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか?"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "メールを送信しました"); define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。"); define('_US_ACTKEYNOT', "承認キーが間違っています。"); Index: xoops2jp/html/modules/user/language/japanese/admin.php diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.29 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.30 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.29 Thu Aug 17 12:09:02 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Thu Aug 17 19:21:05 2006 @@ -1,27 +1,20 @@ X件以上"); -define('_AD_USER_LANG_PASS', "パスワード"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "承認が済んでいないユーザのみ"); define('_AD_USER_LANG_PERM_ACCESS', "アクセス"); define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限"); @@ -116,7 +102,6 @@ define('_AD_USER_LANG_POSTS', "投稿数"); define('_AD_USER_LANG_RANK', "ランク"); define('_AD_USER_LANG_RANK_EDIT', "ユーザーランク編集"); -define('_AD_USER_LANG_RANK_ID', "ID"); define('_AD_USER_LANG_RANK_IMAGE', "画像"); define('_AD_USER_LANG_RANK_LIST', "ユーザーランク管理"); define('_AD_USER_LANG_RANK_MAX', "最高投稿数"); @@ -135,17 +120,12 @@ define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信"); define('_AD_USER_LANG_SENDER', "送信者"); define('_AD_USER_LANG_SUBJECT', "件名"); -define('_AD_USER_LANG_SUBMIT', "送信"); define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター"); define('_AD_USER_LANG_THEME', "テーマ"); -define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン"); define('_AD_USER_LANG_TITLE', "タイトル"); -define('_AD_USER_LANG_UID', "UID"); define('_AD_USER_LANG_UMODE', "コメント表示モード"); -define('_AD_USER_LANG_UNAME', "ユーザー名"); define('_AD_USER_LANG_UNDER_POSTS', "投稿数がX件以下"); define('_AD_USER_LANG_UORDER', "コメントの並び順"); -define('_AD_USER_LANG_URL', "ホームページ"); define('_AD_USER_LANG_USER', "ユーザー"); define('_AD_USER_LANG_USER_AIM', "AIM"); define('_AD_USER_LANG_USER_AVATAR', "アバター"); @@ -175,5 +155,6 @@ define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます"); define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース(真っ白になるなど)があります。
    その場合はブラウザでリロード(再読込)操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。"); define('_AD_USER_TIPS_RECOUNT_POSTS', "もし投稿数が間違っているようであれば、再計算することができます。"); +define('_MD_USER_LANG_UNAME', "ユーザー名"); ?> From tom_g3x @ users.sourceforge.jp Thu Aug 17 21:47:56 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 17 Aug 2006 21:47:56 +0900 Subject: [xoops-cvslog 4178] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060817124756.A621F2AC0B3@users.sourceforge.jp> From tom_g3x @ users.sourceforge.jp Thu Aug 17 21:47:57 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 17 Aug 2006 21:47:57 +0900 Subject: [xoops-cvslog 4179] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060817124757.BCCAB2AC0B3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u /dev/null xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.1 --- /dev/null Thu Aug 17 21:47:57 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Thu Aug 17 21:47:57 2006 @@ -0,0 +1,7 @@ +.user_list_id { + text-align:center; +} + +.user_list_control { + text-align:center; +} From tom_g3x @ users.sourceforge.jp Thu Aug 17 21:48:54 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 17 Aug 2006 21:48:54 +0900 Subject: [xoops-cvslog 4180] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060817124854.482952AC0B3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.10 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_list.html Thu Aug 17 21:48:54 2006 @@ -30,14 +30,14 @@
    <{foreach item=obj from=$objects}> - - + + - Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.17 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.18 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.17 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Thu Aug 17 21:48:54 2006 @@ -23,7 +23,7 @@ - - "> - - + + - <{foreach item=user from=$objects}> - - + + - <{foreach item=group from=$objects}> - - - + + + - - <{foreach from=$users item=user }> " style="text-align:center;"> - - + + - - - - + + + - <{foreach item=obj from=$objects}> - - + + @@ -47,7 +47,7 @@ - Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Thu Aug 17 21:48:54 2006 @@ -31,7 +31,7 @@ <{foreach item=obj from=$objects}> - + @@ -43,7 +43,7 @@ <{$smarty.const._AD_USER_LANG_COMPLETED}> <{/if}> - 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.10 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.10 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Thu Aug 17 21:48:54 2006 @@ -39,15 +39,15 @@ <{foreach item=user from=$objects}> - - + + - - + @@ -40,7 +40,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -146,19 +146,19 @@ - + - + - + @@ -176,25 +176,25 @@ - + - + - + - + From minahito @ users.sourceforge.jp Fri Aug 18 18:05:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:05:16 +0900 Subject: [xoops-cvslog 4190] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060818090516.4D4932AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.14 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.15 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.14 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Fri Aug 18 18:05:16 2006 @@ -1,7 +1,7 @@ contruct(); $mailer =& $builder->getResult(); - $mailer->send(); // TODO CHECKS + if (!$mailer->send()) { + } // TODO CHECKS and use '_MD_USER_ERROR_YOURREGMAILNG' } function _eventNotifyMail(&$controller) From minahito @ users.sourceforge.jp Fri Aug 18 18:05:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:05:39 +0900 Subject: [xoops-cvslog 4191] CVS update: xoops2jp/html/modules/user/admin/.xml Message-ID: <20060818090539.32CAC2AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/.xml/user_search.xml diff -u xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.2 xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.3 --- xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.2 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/.xml/user_search.xml Fri Aug 18 18:05:39 2006 @@ -33,7 +33,7 @@ - + @@ -45,25 +45,25 @@ - + - + - + - + @@ -75,19 +75,19 @@ - + - + - + Index: xoops2jp/html/modules/user/admin/.xml/users.xml diff -u xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.3 xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.4 --- xoops2jp/html/modules/user/admin/.xml/users.xml:1.1.2.3 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/.xml/users.xml Fri Aug 18 18:05:39 2006 @@ -42,7 +42,7 @@ - + @@ -67,38 +67,38 @@ - + - + - + - + - + - + - + @@ -118,17 +118,17 @@ - + - + - + @@ -137,11 +137,11 @@ - + - + @@ -164,22 +164,22 @@ - + - + - + - + Index: xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml diff -u xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.3 xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.4 --- xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.3 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml Fri Aug 18 18:05:39 2006 @@ -14,21 +14,21 @@ - + - + - + From minahito @ users.sourceforge.jp Fri Aug 18 18:05:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:05:54 +0900 Subject: [xoops-cvslog 4192] CVS update: xoops2jp/html/modules/user/admin/forms Message-ID: <20060818090554.7D0342AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.4 --- xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.3 Thu Aug 17 19:21:05 2006 +++ xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php Fri Aug 18 18:05:54 2006 @@ -42,7 +42,7 @@ $this->mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); + $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_NAME, '60'); $this->mFieldProperties['name']->addVar('maxlength', '60'); $this->mFieldProperties['email'] =& new XCube_FieldProperty($this); @@ -52,22 +52,22 @@ $this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); + $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_ICQ, '15'); $this->mFieldProperties['user_icq']->addVar('maxlength', '15'); $this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); + $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_AIM, '18'); $this->mFieldProperties['user_aim']->addVar('maxlength', '18'); $this->mFieldProperties['user_yim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_yim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); + $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_YIM, '25'); $this->mFieldProperties['user_yim']->addVar('maxlength', '25'); $this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); + $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_MSNM, '100'); $this->mFieldProperties['user_msnm']->addVar('maxlength', '100'); $this->mFieldProperties['url'] =& new XCube_FieldProperty($this); @@ -77,17 +77,17 @@ $this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_from']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); + $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_FROM, '100'); $this->mFieldProperties['user_from']->addVar('maxlength', '100'); $this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); + $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_OCC, '100'); $this->mFieldProperties['user_occ']->addVar('maxlength', '100'); $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', '150'); $this->mFieldProperties['lastlog_more'] =& new XCube_FieldProperty($this); Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.13 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.14 --- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.13 Thu Aug 17 19:21:05 2006 +++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php Fri Aug 18 18:05:54 2006 @@ -1,7 +1,7 @@ mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60'); + $this->mFieldProperties['name']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_NAME, '60'); $this->mFieldProperties['name']->addVar('maxlength', 60); $this->mFieldProperties['uname'] =& new XCube_FieldProperty($this); @@ -88,27 +88,27 @@ $this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15'); + $this->mFieldProperties['user_icq']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_ICQ, '15'); $this->mFieldProperties['user_icq']->addVar('maxlength', 15); $this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_from']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100'); + $this->mFieldProperties['user_from']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_FROM, '100'); $this->mFieldProperties['user_from']->addVar('maxlength', 100); $this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18'); + $this->mFieldProperties['user_aim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_AIM, '18'); $this->mFieldProperties['user_aim']->addVar('maxlength', 18); $this->mFieldProperties['user_yim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_yim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25'); + $this->mFieldProperties['user_yim']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_YIM, '25'); $this->mFieldProperties['user_yim']->addVar('maxlength', 25); $this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100'); + $this->mFieldProperties['user_msnm']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_MSNM, '100'); $this->mFieldProperties['user_msnm']->addVar('maxlength', 100); $this->mFieldProperties['pass'] =& new XCube_FieldProperty($this); @@ -123,15 +123,15 @@ $this->mFieldProperties['posts'] =& new XCube_FieldProperty($this); $this->mFieldProperties['posts']->setDependsByArray(array('required')); - $this->mFieldProperties['posts']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_POSTS); + $this->mFieldProperties['posts']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_POSTS); $this->mFieldProperties['rank'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank']->setDependsByArray(array('required')); - $this->mFieldProperties['rank']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK); + $this->mFieldProperties['rank']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK); $this->mFieldProperties['level'] =& new XCube_FieldProperty($this); $this->mFieldProperties['level']->setDependsByArray(array('required')); - $this->mFieldProperties['level']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_LEVEL); + $this->mFieldProperties['level']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_LEVEL); $this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this); $this->mFieldProperties['timezone_offset']->setDependsByArray(array('required')); @@ -139,12 +139,12 @@ $this->mFieldProperties['umode'] =& new XCube_FieldProperty($this); $this->mFieldProperties['umode']->setDependsByArray(array('required')); - $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_UMODE); + $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UMODE); $this->mFieldProperties['uorder'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uorder']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_UORDER); - $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _AD_USER_LANG_UORDER); + $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UORDER); + $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_UORDER); $this->mFieldProperties['uorder']->addVar('min', 0); $this->mFieldProperties['uorder']->addVar('max', 1); @@ -164,12 +164,12 @@ $this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100'); + $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_OCC, '100'); $this->mFieldProperties['user_occ']->addVar('maxlength', 100); $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } @@ -231,10 +231,10 @@ $rank =& $handler->get($t_rank); if (!is_object($rank)) { - $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_RANK)); } elseif ($rank->get('rank_special') != 1) { - $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_RANK)); } } } Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.6 --- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.5 Thu Aug 17 19:21:05 2006 +++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php Fri Aug 18 18:05:54 2006 @@ -1,7 +1,7 @@ mFieldProperties['rank_title'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_title']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['rank_title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_TITLE, '50'); - $this->mFieldProperties['rank_title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_RANK_TITLE, '50'); $this->mFieldProperties['rank_title']->addVar('maxlength', 50); $this->mFieldProperties['rank_min'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_min']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_min']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN); - $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MIN, 0); + $this->mFieldProperties['rank_min']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_MIN); + $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _MD_USER_LANG_RANK_MIN, 0); $this->mFieldProperties['rank_min']->addVar('min', 0); $this->mFieldProperties['rank_max'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_max']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_max']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX); - $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MAX, 0); + $this->mFieldProperties['rank_max']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_MAX); + $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _MD_USER_LANG_RANK_MAX, 0); $this->mFieldProperties['rank_max']->addVar('min', 0); } From minahito @ users.sourceforge.jp Fri Aug 18 18:06:04 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:06:04 +0900 Subject: [xoops-cvslog 4193] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060818090604.EE5262AC1C6@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.11 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_list.html Fri Aug 18 18:06:04 2006 @@ -1,9 +1,9 @@ -

    <{$smarty.const._AD_USER_LANG_RANK_LIST}>

    +

    <{$smarty.const._MD_USER_LANG_RANK_LIST}>

    - - - - - + <{foreach item=obj from=$objects}> Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.18 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.19 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.18 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Fri Aug 18 18:06:04 2006 @@ -63,11 +63,11 @@ - + - - + + <{foreach from=$noUsers item=user }> @@ -114,11 +114,11 @@ - + - - + + <{foreach from=$users item=user }> Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.18 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.19 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.18 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Fri Aug 18 18:06:04 2006 @@ -18,7 +18,7 @@ - - - Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.16 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.17 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.16 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Fri Aug 18 18:06:04 2006 @@ -43,11 +43,11 @@ - + - - + + <{foreach from=$users item=user }> 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.11 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.11 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Fri Aug 18 18:06:04 2006 @@ -20,7 +20,7 @@ - - - Index: xoops2jp/html/modules/user/admin/templates/user_edit.html diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.18 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.19 --- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.18 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_edit.html Fri Aug 18 18:06:04 2006 @@ -45,7 +45,7 @@ - + @@ -56,7 +56,7 @@ <{xoops_input type=text name=email value=$actionForm->get('email') size=30 maxlength=60}>
    <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}> - <{$smarty.const._AD_USER_LANG_USER_VIEWEMAIL}> + <{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}> @@ -74,64 +74,64 @@ - + - + - + - + - + - + - + - + - + - + @@ -149,13 +149,13 @@ - + - + - + - + - + Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html Fri Aug 18 18:06:04 2006 @@ -1,18 +1,18 @@
    <{$smarty.const._MI_USER_NAME}> - »» <{$smarty.const._AD_USER_LANG_RANK_LIST}> + »» <{$smarty.const._MD_USER_LANG_RANK_LIST}> »» <{if $actionForm->get('rank_id') }> - <{$smarty.const._AD_USER_LANG_RANK_EDIT}> + <{$smarty.const._MD_USER_LANG_RANK_EDIT}> <{else}> - <{$smarty.const._AD_USER_LANG_RANK_NEW}> + <{$smarty.const._MD_USER_LANG_RANK_NEW}> <{/if}>
    <{if $actionForm->get('rank_id') }> -

    <{$smarty.const._AD_USER_LANG_RANK_EDIT}>

    +

    <{$smarty.const._MD_USER_LANG_RANK_EDIT}>

    <{else}> -

    <{$smarty.const._AD_USER_LANG_RANK_NEW}>

    +

    <{$smarty.const._MD_USER_LANG_RANK_NEW}>

    <{/if}> <{if $actionForm->hasError()}> @@ -32,39 +32,39 @@ - + - + - + - + - + Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.12 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html Fri Aug 18 18:06:04 2006 @@ -1,6 +1,6 @@ @@ -20,23 +20,23 @@ - + - + - + - + - + Index: xoops2jp/html/modules/user/admin/templates/user_search.html diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.8 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search.html Fri Aug 18 18:06:04 2006 @@ -28,7 +28,7 @@ - + @@ -40,25 +40,25 @@ - + - + - + - + @@ -70,19 +70,19 @@ - + - + - + Index: xoops2jp/html/modules/user/admin/templates/user_delete.html diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.12 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_delete.html Fri Aug 18 18:06:04 2006 @@ -34,7 +34,7 @@ - + @@ -46,11 +46,11 @@ - + - + From minahito @ users.sourceforge.jp Fri Aug 18 18:06:19 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:06:19 +0900 Subject: [xoops-cvslog 4194] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060818090619.A79362AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.12 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.13 --- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.12 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Fri Aug 18 18:06:19 2006 @@ -143,7 +143,7 @@ $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTEREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.7 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.8 --- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.7 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Fri Aug 18 18:06:19 2006 @@ -86,6 +86,9 @@ } } + /** + * @todo 'HANKAKU' check. + */ function validatePass() { if (strlen($this->get('pass'))>0||strlen($this->get('vpass'))>0) { From minahito @ users.sourceforge.jp Fri Aug 18 18:06:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:06:32 +0900 Subject: [xoops-cvslog 4195] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060818090632.2885F2AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/modinfo.php diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.17 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.18 --- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.17 Thu Aug 10 18:48:07 2006 +++ xoops2jp/html/modules/user/language/japanese/modinfo.php Fri Aug 18 18:06:31 2006 @@ -5,9 +5,7 @@ define('_MI_USER_ADMENU_LIST', "ユーザー管理"); define('_MI_USER_ADMENU_MAIL', "一斉メール送信"); define('_MI_USER_ADMENU_MAILJOB_MANAGE', "メールジョブ管理"); -define('_MI_USER_ADMENU_NEW_RANK', "ユーザーランク新規登録"); define('_MI_USER_ADMENU_RANK_LIST', "ユーザーランク管理"); -define('_MI_USER_ADMENU_SEARCH', "ユーザー検索"); define('_MI_USER_ADMENU_USER_SEARCH', "ユーザー検索"); define('_MI_USER_BLOCK_LOGIN_DESC', "ログインフォームを表示します"); define('_MI_USER_BLOCK_LOGIN_NAME', "ログイン"); @@ -53,7 +51,6 @@ define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "中"); define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "強(アルファベットおよび数字のみ)←推奨"); define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "弱(漢字・平仮名も使用可)"); -define('_MI_USER_CONF_USE_MYSESSION', "Use mysession"); define('_MI_USER_CONF_USE_SSL', "ログインにSSLを使用する"); define('_MI_USER_CONF_USERCOOKIE', "ユーザ名の保存に使用するクッキーの名称"); define('_MI_USER_CONF_USERCOOKIE_DESC', "このクッキーにはユーザ名のみが保存され、ユーザのPCのハードディスク中に1年間保管されます。このクッキーを使用するかしないかはユーザ自身が選択できます。"); @@ -63,13 +60,9 @@ define('_MI_USER_KEYWORD_CREATE_RANK', "ランク ユーザーランク"); define('_MI_USER_KEYWORD_CREATE_USER', "新規登録"); define('_MI_USER_KEYWORD_GROUP_LIST', "グループ 一覧 リスト 編集 変更 削除 ユーザー ユーザグループ 権限 パーミッション 追加 メンバー"); -define('_MI_USER_KEYWORD_MAILJOB_CREATE', "Mailjob create"); -define('_MI_USER_KEYWORD_MAILJOB_LIST', "Mailjob list"); define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage"); define('_MI_USER_KEYWORD_USER_LIST', "一覧 リスト 編集 変更 削除"); define('_MI_USER_KEYWORD_USER_SEARCH', "User search"); -define('_MI_USER_LANG_MAILJOB_CREATE', "Mailjob create"); -define('_MI_USER_LANG_MAILJOB_LIST', "Mailjob list"); define('_MI_USER_MENU_CREATE_AVATAR', "アバターの新規作成"); define('_MI_USER_MENU_CREATE_GROUP', "グループの新規作成"); define('_MI_USER_MENU_CREATE_RANK', "ランクの新規作成"); Index: xoops2jp/html/modules/user/language/japanese/admin.php diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.31 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.32 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.31 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Fri Aug 18 18:06:32 2006 @@ -1,28 +1,19 @@ X日以内にログインしている"); define('_AD_USER_LANG_LASTLOG_MORE', "X日以上ログインしていない"); define('_AD_USER_LANG_LASTLOGIN', "最終ログイン"); -define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag"); define('_AD_USER_LANG_LEFT_TARGET_USER', "残送信数"); -define('_AD_USER_LANG_LEVEL', "レベル"); define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ"); define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ"); define('_AD_USER_LANG_MAILJOB_DELETE', "メールジョブ削除"); @@ -84,11 +65,7 @@ define('_AD_USER_LANG_MAILJOB_LIST', "メールジョブ一覧"); define('_AD_USER_LANG_MAILJOB_NEW', "メールジョブ新規登録"); define('_AD_USER_LANG_MAILJOB_SEND', "一斉メールの送信"); -define('_AD_USER_LANG_MAILOK', "当サイトの新着情報などをメールで受け取る"); -define('_AD_USER_LANG_NAME', "本名"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); -define('_AD_USER_LANG_OFF', "オフ"); -define('_AD_USER_LANG_ON', "オン"); define('_AD_USER_LANG_OVER_POSTS', "投稿数がX件以上"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "承認が済んでいないユーザのみ"); define('_AD_USER_LANG_PERM_ACCESS', "アクセス"); @@ -99,62 +76,29 @@ define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "モジュール管理"); define('_AD_USER_LANG_PERM_MODULE_ACCESS', "システム/モジュール管理権限"); define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "システム管理"); -define('_AD_USER_LANG_POSTS', "投稿数"); -define('_AD_USER_LANG_RANK', "ランク"); -define('_AD_USER_LANG_RANK_EDIT', "ユーザーランク編集"); -define('_AD_USER_LANG_RANK_IMAGE', "画像"); -define('_AD_USER_LANG_RANK_LIST', "ユーザーランク管理"); -define('_AD_USER_LANG_RANK_MAX', "最高投稿数"); -define('_AD_USER_LANG_RANK_MIN', "最低投稿数"); -define('_AD_USER_LANG_RANK_NEW', "ユーザーランク新規登録"); -define('_AD_USER_LANG_RANK_SPECIAL', "特別ランク"); -define('_AD_USER_LANG_RANK_TITLE', "ランク名"); define('_AD_USER_LANG_RECOUNT', "再集計"); define('_AD_USER_LANG_REGDATE', "登録日"); define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時がX日以内"); define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時がX日以上前"); -define('_AD_USER_LANG_REGISTDATE', "登録日時"); -define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag"); define('_AD_USER_LANG_RESET', "リセット"); define('_AD_USER_LANG_SEARCH_AGAIN', "条件を修正して再検索"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信"); -define('_AD_USER_LANG_SENDER', "送信者"); -define('_AD_USER_LANG_SUBJECT', "件名"); -define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター"); -define('_AD_USER_LANG_THEME', "テーマ"); define('_AD_USER_LANG_TITLE', "タイトル"); -define('_AD_USER_LANG_UMODE', "コメント表示モード"); define('_AD_USER_LANG_UNDER_POSTS', "投稿数がX件以下"); -define('_AD_USER_LANG_UORDER', "コメントの並び順"); define('_AD_USER_LANG_USER', "ユーザー"); -define('_AD_USER_LANG_USER_AIM', "AIM"); -define('_AD_USER_LANG_USER_AVATAR', "アバター"); define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除"); define('_AD_USER_LANG_USER_DELETE_ADVICE', "_%s_ のユーザーを削除します。よろしいですか?"); define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集"); -define('_AD_USER_LANG_USER_FROM', "居住地"); -define('_AD_USER_LANG_USER_ICQ', "ICQ"); -define('_AD_USER_LANG_USER_INTREST', "趣味"); define('_AD_USER_LANG_USER_LIST', "ユーザー管理"); -define('_AD_USER_LANG_USER_MAILOK', "当サイトの新着情報などをメールで受け取る"); -define('_AD_USER_LANG_USER_MSNM', "MSNM"); define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録"); -define('_AD_USER_LANG_USER_OCC', "職業"); -define('_AD_USER_LANG_USER_REGDATE', "登録日時"); define('_AD_USER_LANG_USER_SEARCH_LIST', "ユーザー検索結果"); -define('_AD_USER_LANG_USER_SIG', "署名"); define('_AD_USER_LANG_USER_VIEW', "ユーザー閲覧"); -define('_AD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する"); -define('_AD_USER_LANG_USER_YIM', "YIM"); define('_AD_USER_LANG_VPASS', "パスワード確認"); define('_AD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか?"); define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "このユーザーランクを本当に削除しますか?"); -define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "指定ユーザーランクを削除しました"); define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "再集計に成功しました"); -define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "ユーザーランクを保存しました"); define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます"); define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース(真っ白になるなど)があります。
    その場合はブラウザでリロード(再読込)操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。"); define('_AD_USER_TIPS_RECOUNT_POSTS', "もし投稿数が間違っているようであれば、再計算することができます。"); -define('_AD_USER_LANG_UNAME', "ユーザー名"); ?> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.19 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.20 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.19 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Fri Aug 18 18:06:32 2006 @@ -6,16 +6,15 @@ define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています"); define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0}は不正なメールアドレスです"); -define('_MD_USER_ERROR_INCORRECTLOGIN', "ログイン情報が間違っています。"); define('_MD_USER_ERROR_INJURY', "{0}の入力値が不正です"); define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以内で入力して下さい"); define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい"); -define('_MD_USER_ERROR_PASSNOTSAME', "パスワードが正しくありません。同じパスワードを二度入力してください。"); define('_MD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません"); define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい"); define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。"); define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン"); define('_MD_USER_ERROR_UNEEDAGREE', "申し訳ございませんが、登録するためには免責事項にご同意いただく必要があります。"); +define('_MD_USER_ERROR_YOURREGMAILNG', "登録が完了しました。しかし、サーバ内部エラーにより承認キーが記載されたメールを送信することができませんでした。大変申し訳ありませんが、サイト管理者までお問い合わせください。"); define('_MD_USER_LANG_ALLABOUT', "%sさんの基本情報"); define('_MD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する"); define('_MD_USER_LANG_AVATAR', "アバター"); @@ -30,70 +29,42 @@ define('_MD_USER_LANG_DISCLAIMER', "免責"); define('_MD_USER_LANG_EDITPROFILE', "プロフィールの編集"); define('_MD_USER_LANG_EMAIL', "メールアドレス"); -define('_MD_USER_LANG_ENTERPWD', "パスワードを記入してください。"); define('_MD_USER_LANG_FINISH', "送信"); define('_MD_USER_LANG_GROUPID', "グループID"); -define('_MD_USER_LANG_GROUPS', "所属グループ"); define('_MD_USER_LANG_GUEST', "ゲスト"); define('_MD_USER_LANG_HASJUSTREG', "新規登録ユーザがありました! ユーザ名:%s"); -define('_MD_USER_LANG_INBOX', "受信箱"); -define('_MD_USER_LANG_INVALIDMAIL', "不正なメールアドレスです。"); define('_MD_USER_LANG_INVALIDNICKNAME', "不正なユーザ名です。"); define('_MD_USER_LANG_LAST_LOGIN', "最終ログイン日時"); define('_MD_USER_LANG_LEVEL', "レベル"); -define('_MD_USER_LANG_LOGGEDOUT', "ログアウトしました。"); -define('_MD_USER_LANG_LOGGINGU', "%sさん、ようこそ。ログイン処理中です。"); -define('_MD_USER_LANG_LOGOUT', "ログアウト"); define('_MD_USER_LANG_LOSTPASSWORD', "パスワードを紛失されましたか?"); -define('_MD_USER_LANG_MAILPWDNG', "mail_password: ユーザ情報の更新に失敗しました。お手数ですが、サイト管理者までお問合せください。"); -define('_MD_USER_LANG_MAXIMGSZ', "最大ファイルサイズ"); -define('_MD_USER_LANG_MAXPIXEL', "最大ピクセル数"); -define('_MD_USER_LANG_MOREABOUT', "個人情報詳細"); -define('_MD_USER_LANG_MYAVATAR', "アップロード済みアバター"); -define('_MD_USER_LANG_MYINFO', "個人情報"); define('_MD_USER_LANG_NAME', "本名"); define('_MD_USER_LANG_NAMERESERVED', "このユーザ名は使用できません。"); define('_MD_USER_LANG_NEWPWDREQ', "新規パスワードのリクエスト@%s"); define('_MD_USER_LANG_NEWUSERREGAT', "新規登録ユーザ@%s"); define('_MD_USER_LANG_NICKNAME', "ユーザ名"); -define('_MD_USER_LANG_NICKNAMENOSPACES', "ユーザ名に空白を含めないでください。"); define('_MD_USER_LANG_NICKNAMETAKEN', "このユーザ名は既に使用されています。"); -define('_MD_USER_LANG_NICKNAMETOOLONG', "ユーザ名が長すぎます。半角 %s 文字以内に収めてください。"); -define('_MD_USER_LANG_NICKNAMETOOSHORT', "ユーザ名が短すぎます。半角 %s 文字以上にしてください。"); define('_MD_USER_LANG_NO', "いいえ"); define('_MD_USER_LANG_NOACTTPADM', "選択されたユーザはまだ存在しないか、承認が完了していません。"); -define('_MD_USER_LANG_NOEDITRIGHT', "このユーザ情報を変更する権限がありません。"); -define('_MD_USER_LANG_NOPERMISS', "このユーザ情報を変更することはできません。"); define('_MD_USER_LANG_NOPROBLEM', "ご心配なく。まずはあなたが登録に使用したメールアドレスを入力し、ボタンをクリックしてください。 パスワード取得用のリンクが記載されたメールがあなたの登録メールアドレス宛に送られます。"); define('_MD_USER_LANG_NOREGISTER', "申し訳ございませんが、現在このサイトでは新規ユーザの登録受付を行っておりません。"); define('_MD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法"); define('_MD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング"); define('_MD_USER_LANG_NOTREGISTERED', "今すぐ登録?"); -define('_MD_USER_LANG_OLDDELETED', "古いアバター画像は上書きされます。"); define('_MD_USER_LANG_PASS', "パスワード"); define('_MD_USER_LANG_PASSWORD', "パスワード"); define('_MD_USER_LANG_PM', "PM"); define('_MD_USER_LANG_POSTS', "投稿数"); -define('_MD_USER_LANG_PRESSLOGIN', "下記ボタンをクリックしてログインしてください。"); define('_MD_USER_LANG_PROFILE', "プロフィール"); -define('_MD_USER_LANG_PROFUPDATED', "プロフィールを更新しました。"); -define('_MD_USER_LANG_PWDMAILED', "%sさん宛にパスワードを送信しました。"); -define('_MD_USER_LANG_PWDTOOSHORT', "パスワードは半角"); define('_MD_USER_LANG_RANK', "ランク"); define('_MD_USER_LANG_RANK_ID', "ID"); define('_MD_USER_LANG_REGISTERNG', "登録できませんでした"); define('_MD_USER_LANG_REMOVEINFO', "アカウントを削除した場合、全てのユーザ情報が失われます。"); define('_MD_USER_LANG_SAVECHANGES', "変更を保存"); define('_MD_USER_LANG_SELECT', "選択"); -define('_MD_USER_LANG_SELECTNG', "ユーザが選択されていません"); -define('_MD_USER_LANG_SELFILE', "ファイル選択"); define('_MD_USER_LANG_SENDPASSWORD', "送信"); define('_MD_USER_LANG_SHOWALL', "すべて表示"); -define('_MD_USER_LANG_SORRYNOTFOUND', "ユーザ情報が見つかりませんでした。"); define('_MD_USER_LANG_STATISTICS', "統計情報"); define('_MD_USER_LANG_SUBMIT', "送信"); -define('_MD_USER_LANG_SURETODEL', "ユーザアカウントを本当に削除しても良いですか?"); -define('_MD_USER_LANG_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); define('_MD_USER_LANG_THEME', "テーマ"); define('_MD_USER_LANG_TIMEZONE', "タイムゾーン"); define('_MD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン"); @@ -102,7 +73,6 @@ define('_MD_USER_LANG_UMODE', "コメント表示モード"); define('_MD_USER_LANG_UNAME', "ユーザー名"); define('_MD_USER_LANG_UORDER', "コメントの並び順"); -define('_MD_USER_LANG_UPLOADMYAVATAR', "アバターをアップロードする"); define('_MD_USER_LANG_URL', "ホームページ"); define('_MD_USER_LANG_USECOOKIE', "ユーザ名を1年間クッキーに保存する"); define('_MD_USER_LANG_USER_AIM', "AIM"); @@ -118,7 +88,6 @@ define('_MD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する"); define('_MD_USER_LANG_USER_YIM', "YIM"); define('_MD_USER_LANG_USERKEYFOR', "%sさんの承認キーです"); -define('_MD_USER_LANG_USERNAME', "ユーザ名"); define('_MD_USER_LANG_USERREG', "ユーザ登録"); define('_MD_USER_LANG_VERIFYPASS', "パスワード確認"); define('_MD_USER_LANG_WEBSITE', "ホームページ"); @@ -131,9 +100,10 @@ define('_MD_USER_MESSAGE_ACTVMAILNG', "%sさんへのメール送信に失敗しました。"); define('_MD_USER_MESSAGE_ACTVMAILOK', "%sさんへメールを送信しました。"); define('_MD_USER_MESSAGE_IAGREE', "私は上記事項に同意します。"); -define('_MD_USER_MESSAGE_SEND_PASSWORD', "メールを送信しました"); +define('_MD_USER_MESSAGE_OLDDELETED', "古いアバター画像は上書きされます。"); +define('_MD_USER_MESSAGE_SEND_PASSWORD', "パスワードをメールで送信しました"); +define('_MD_USER_MESSAGE_SURETODEL', "ユーザアカウントを本当に削除しても良いですか?"); define('_MD_USER_MESSAGE_YOURREGISTERED', "登録が完了しました。記載されたメールを登録メールアドレス宛に承認キーを送信しました。メールの指示に従い、承認を完了してください。"); define('_MD_USER_MESSAGE_YOURREGISTERED2', "登録が完了しました。サイト管理者がアカウントを承認するまでお待ちください。承認完了時にはメールにてお知らせします。"); -define('_MD_USER_MESSAGE_YOURREGMAILNG', "登録が完了しました。しかし、サーバ内部エラーにより承認キーが記載されたメールを送信することができませんでした。大変申し訳ありませんが、サイト管理者までお問い合わせください。"); ?> From minahito @ users.sourceforge.jp Fri Aug 18 18:06:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:06:32 +0900 Subject: [xoops-cvslog 4196] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060818090632.507FA2AC1BF@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.17 xoops2jp/html/modules/user/language/english/main.php:1.1.2.18 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.17 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/language/english/main.php Fri Aug 18 18:06:32 2006 @@ -6,16 +6,15 @@ define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar."); define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address"); -define('_MD_USER_ERROR_INCORRECTLOGIN', "Invalid Login!"); define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong."); 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_PASSNOTSAME', "Both passwords are different. They must be identical."); define('_MD_USER_ERROR_PASSWORD', "The passwords you gave did not match."); define('_MD_USER_ERROR_REQUIRED', "{0} is required."); define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator."); define('_MD_USER_ERROR_TIMEZONE', "TimeZone"); define('_MD_USER_ERROR_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered."); +define('_MD_USER_ERROR_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation."); define('_MD_USER_LANG_ALLABOUT', "All about %s"); define('_MD_USER_LANG_ATTACHSIG', "Always attach my signature"); define('_MD_USER_LANG_AVATAR', "Avatar"); @@ -30,70 +29,42 @@ define('_MD_USER_LANG_DISCLAIMER', "Disclaimer"); define('_MD_USER_LANG_EDITPROFILE', "Edit Profile"); define('_MD_USER_LANG_EMAIL', "Email address"); -define('_MD_USER_LANG_ENTERPWD', "ERROR: You must provide a password."); define('_MD_USER_LANG_FINISH', "Finish"); define('_MD_USER_LANG_GROUPID', "Group ID"); -define('_MD_USER_LANG_GROUPS', "User\'s Groups"); define('_MD_USER_LANG_GUEST', "Guest"); define('_MD_USER_LANG_HASJUSTREG', "%s has just registered!"); -define('_MD_USER_LANG_INBOX', "Inbox"); -define('_MD_USER_LANG_INVALIDMAIL', "ERROR: Invalid email address"); define('_MD_USER_LANG_INVALIDNICKNAME', "ERROR: Invalid Username"); define('_MD_USER_LANG_LAST_LOGIN', "Last Login"); define('_MD_USER_LANG_LEVEL', "Level"); -define('_MD_USER_LANG_LOGGEDOUT', "You are now logged out"); -define('_MD_USER_LANG_LOGGINGU', "Thank you for logging in, %s."); -define('_MD_USER_LANG_LOGOUT', "Logout"); define('_MD_USER_LANG_LOSTPASSWORD', "Lost your Password?"); -define('_MD_USER_LANG_MAILPWDNG', "mail_password: could not update user entry. Contact the Administrator"); -define('_MD_USER_LANG_MAXIMGSZ', "Max Image Size (Bytes)"); -define('_MD_USER_LANG_MAXPIXEL', "Max Pixels"); -define('_MD_USER_LANG_MOREABOUT', "More About Me"); -define('_MD_USER_LANG_MYAVATAR', "My Avatar"); -define('_MD_USER_LANG_MYINFO', "My Info"); define('_MD_USER_LANG_NAME', "Real Name"); define('_MD_USER_LANG_NAMERESERVED', "ERROR: Username is reserved."); define('_MD_USER_LANG_NEWPWDREQ', "New Password Request at %s"); define('_MD_USER_LANG_NEWUSERREGAT', "New user registration at %s"); define('_MD_USER_LANG_NICKNAME', "Username"); -define('_MD_USER_LANG_NICKNAMENOSPACES', "There cannot be any spaces in the Username."); define('_MD_USER_LANG_NICKNAMETAKEN', "ERROR: Username has been taken."); -define('_MD_USER_LANG_NICKNAMETOOLONG', "Username is too long. It must be %s or less characters."); -define('_MD_USER_LANG_NICKNAMETOOSHORT', "Username is too short. It must be %s or more characters."); define('_MD_USER_LANG_NO', "No"); define('_MD_USER_LANG_NOACTTPADM', "The selected user has been deactivated or has not been activated yet."); -define('_MD_USER_LANG_NOEDITRIGHT', "You do not have permisson to edit this account."); -define('_MD_USER_LANG_NOPERMISS', "Sorry, you do not have the permission to perform this action!"); define('_MD_USER_LANG_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account."); define('_MD_USER_LANG_NOREGISTER', "Sorry, we are currently closed for new user registrations."); define('_MD_USER_LANG_NOTIFY_METHOD', "Notification Method : When you monitor e.g. a forum, how would you like to receive notifications of updates?"); define('_MD_USER_LANG_NOTIFY_MODE', "Default Notification Mode"); define('_MD_USER_LANG_NOTREGISTERED', "Not registered?"); -define('_MD_USER_LANG_OLDDELETED', "Your old avatar will be deleted!"); define('_MD_USER_LANG_PASS', "Password"); define('_MD_USER_LANG_PASSWORD', "Password"); define('_MD_USER_LANG_PM', "PM"); define('_MD_USER_LANG_POSTS', "Comments/Posts"); -define('_MD_USER_LANG_PRESSLOGIN', "Press the button below to login"); define('_MD_USER_LANG_PROFILE', "Profile"); -define('_MD_USER_LANG_PROFUPDATED', "Your Profile Updated!"); -define('_MD_USER_LANG_PWDMAILED', "Password for %s has been sent."); -define('_MD_USER_LANG_PWDTOOSHORT', "Sorry, your password must be at least "); define('_MD_USER_LANG_RANK', "Rank"); define('_MD_USER_LANG_RANK_ID', "ID"); define('_MD_USER_LANG_REGISTERNG', "Could not register new user."); define('_MD_USER_LANG_REMOVEINFO', "This will remove all your information from our database."); define('_MD_USER_LANG_SAVECHANGES', "Save Changes"); define('_MD_USER_LANG_SELECT', "Select"); -define('_MD_USER_LANG_SELECTNG', "No User Selected! Please go back and try again."); -define('_MD_USER_LANG_SELFILE', "Select a file"); define('_MD_USER_LANG_SENDPASSWORD', "Send Password"); define('_MD_USER_LANG_SHOWALL', "Show All"); -define('_MD_USER_LANG_SORRYNOTFOUND', "Sorry, no corresponding user info was found."); define('_MD_USER_LANG_STATISTICS', "Statistics"); define('_MD_USER_LANG_SUBMIT', "Submit"); -define('_MD_USER_LANG_SURETODEL', "Are you sure you want to delete your account?"); -define('_MD_USER_LANG_THANKYOUFORVISIT', "Thank you for your visit to our site!"); define('_MD_USER_LANG_THEME', "Theme"); define('_MD_USER_LANG_TIMEZONE', "TimeZone"); define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone"); @@ -102,7 +73,6 @@ define('_MD_USER_LANG_UMODE', "Comments Display Mode"); define('_MD_USER_LANG_UNAME', "User name"); define('_MD_USER_LANG_UORDER', "Comments Sort Order"); -define('_MD_USER_LANG_UPLOADMYAVATAR', "Upload Avatar"); define('_MD_USER_LANG_URL', "Website"); define('_MD_USER_LANG_USECOOKIE', "Store my user name in a cookie for 1 year"); define('_MD_USER_LANG_USER_AIM', "AIM"); @@ -118,7 +88,6 @@ define('_MD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address"); define('_MD_USER_LANG_USER_YIM', "YIM"); define('_MD_USER_LANG_USERKEYFOR', "User activation key for %s"); -define('_MD_USER_LANG_USERNAME', "Username"); define('_MD_USER_LANG_USERREG', "User Registration"); define('_MD_USER_LANG_VERIFYPASS', "Verify Password"); define('_MD_USER_LANG_WEBSITE', "Website"); @@ -131,9 +100,10 @@ define('_MD_USER_MESSAGE_ACTVMAILNG', "Failed sending notification mail to %s"); define('_MD_USER_MESSAGE_ACTVMAILOK', "Notification mail to %s sent."); define('_MD_USER_MESSAGE_IAGREE', "I agree to the above"); +define('_MD_USER_MESSAGE_OLDDELETED', "Your old avatar will be deleted!"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password"); +define('_MD_USER_MESSAGE_SURETODEL', "Are you sure you want to delete your account?"); define('_MD_USER_MESSAGE_YOURREGISTERED', "You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the mail to activate your account. "); define('_MD_USER_MESSAGE_YOURREGISTERED2', "You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient."); -define('_MD_USER_MESSAGE_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation."); ?> Index: xoops2jp/html/modules/user/language/english/admin.php diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.22 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.23 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.22 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Fri Aug 18 18:06:32 2006 @@ -1,28 +1,19 @@ X days ago"); define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than X days ago"); define('_AD_USER_LANG_LASTLOGIN', "Last login"); -define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag"); define('_AD_USER_LANG_LEFT_TARGET_USER', "Left target user"); -define('_AD_USER_LANG_LEVEL', "Level"); 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', "Mailjob delete"); @@ -84,11 +65,7 @@ define('_AD_USER_LANG_MAILJOB_LIST', "Mailjob list"); define('_AD_USER_LANG_MAILJOB_NEW', "Mailjob new"); define('_AD_USER_LANG_MAILJOB_SEND', "Mailjob send"); -define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?"); -define('_AD_USER_LANG_NAME', "Real name"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); -define('_AD_USER_LANG_OFF', "Off"); -define('_AD_USER_LANG_ON', "On"); define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than X"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "Only inactive users"); define('_AD_USER_LANG_PERM_ACCESS', "Access"); @@ -99,62 +76,29 @@ define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "Module Administration"); define('_AD_USER_LANG_PERM_MODULE_ACCESS', "Privilege of System/module administration"); define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "System administration"); -define('_AD_USER_LANG_POSTS', "Posts"); -define('_AD_USER_LANG_RANK', "Rank"); -define('_AD_USER_LANG_RANK_EDIT', "Edit user rank"); -define('_AD_USER_LANG_RANK_IMAGE', "Image"); -define('_AD_USER_LANG_RANK_LIST', "User rank administration"); -define('_AD_USER_LANG_RANK_MAX', "Maximum posts"); -define('_AD_USER_LANG_RANK_MIN', "Minimum posts"); -define('_AD_USER_LANG_RANK_NEW', "Add a new rank"); -define('_AD_USER_LANG_RANK_SPECIAL', "Special rank"); -define('_AD_USER_LANG_RANK_TITLE', "Title"); define('_AD_USER_LANG_RECOUNT', "Recount"); define('_AD_USER_LANG_REGDATE', "Registered date"); define('_AD_USER_LANG_REGDATE_LESS', "Joined date is less than X days ago"); define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than X days ago"); -define('_AD_USER_LANG_REGISTDATE', "Registered date"); -define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag"); define('_AD_USER_LANG_RESET', "Reset"); define('_AD_USER_LANG_SEARCH_AGAIN', "Search again"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition"); -define('_AD_USER_LANG_SENDER', "Sender"); -define('_AD_USER_LANG_SUBJECT', "Subject"); -define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar"); -define('_AD_USER_LANG_THEME', "theme"); define('_AD_USER_LANG_TITLE', "title"); -define('_AD_USER_LANG_UMODE', "Comments Display Mode"); define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); -define('_AD_USER_LANG_UORDER', "Comments Sort Order"); define('_AD_USER_LANG_USER', "User"); -define('_AD_USER_LANG_USER_AIM', "AIM"); -define('_AD_USER_LANG_USER_AVATAR', "user avatar"); define('_AD_USER_LANG_USER_DELETE', "Delete a user"); define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete "); define('_AD_USER_LANG_USER_EDIT', "Edit a user"); -define('_AD_USER_LANG_USER_FROM', "Location"); -define('_AD_USER_LANG_USER_ICQ', "ICQ"); -define('_AD_USER_LANG_USER_INTREST', "Interest"); define('_AD_USER_LANG_USER_LIST', "User administration"); -define('_AD_USER_LANG_USER_MAILOK', "user_mailok"); -define('_AD_USER_LANG_USER_MSNM', "MSNM"); define('_AD_USER_LANG_USER_NEW', "Add a new user"); -define('_AD_USER_LANG_USER_OCC', "Occupation"); -define('_AD_USER_LANG_USER_REGDATE', "user regdate"); define('_AD_USER_LANG_USER_SEARCH_LIST', "User search list"); -define('_AD_USER_LANG_USER_SIG', "Signature"); define('_AD_USER_LANG_USER_VIEW', "user view"); -define('_AD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address."); -define('_AD_USER_LANG_USER_YIM', "YIM"); define('_AD_USER_LANG_VPASS', "Verify password"); define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?"); define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you delete the user rank?"); -define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "The user rank has been deleted."); define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recount success"); -define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "The user rank has been saved."); define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif."); define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters."); define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button."); -define('_AD_USER_LANG_UNAME', "User name"); ?> Index: xoops2jp/html/modules/user/language/english/modinfo.php diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.13 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.14 --- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.13 Thu Aug 10 18:48:08 2006 +++ xoops2jp/html/modules/user/language/english/modinfo.php Fri Aug 18 18:06:32 2006 @@ -5,9 +5,7 @@ define('_MI_USER_ADMENU_LIST', "User Management"); define('_MI_USER_ADMENU_MAIL', "Mail Users"); define('_MI_USER_ADMENU_MAILJOB_MANAGE', "Mailjob management"); -define('_MI_USER_ADMENU_NEW_RANK', "Add a New Rank"); define('_MI_USER_ADMENU_RANK_LIST', "User Rank Manager"); -define('_MI_USER_ADMENU_SEARCH', "Find a User"); define('_MI_USER_ADMENU_USER_SEARCH', "User search"); define('_MI_USER_BLOCK_LOGIN_DESC', "Shows login form"); define('_MI_USER_BLOCK_LOGIN_NAME', "Login"); @@ -53,7 +51,6 @@ define('_MI_USER_CONF_UNAME_TEST_LEVEL_NORMAL', "Medium"); define('_MI_USER_CONF_UNAME_TEST_LEVEL_STRONG', "Strict (Only alphabets and numbers)"); define('_MI_USER_CONF_UNAME_TEST_LEVEL_WEAK', "Light (Allow 2byte characters)"); -define('_MI_USER_CONF_USE_MYSESSION', "Use mysession"); define('_MI_USER_CONF_USE_SSL', "Use SSL for login?"); define('_MI_USER_CONF_USERCOOKIE', "Name for user cookies."); define('_MI_USER_CONF_USERCOOKIE_DESC', "This cookie contains only a user name and is saved in a user pc for a year (if the user wishes). If a user have this cookie, username will be automatically inserted in the login box."); @@ -63,13 +60,9 @@ define('_MI_USER_KEYWORD_CREATE_RANK', "create rank"); define('_MI_USER_KEYWORD_CREATE_USER', "Create user"); define('_MI_USER_KEYWORD_GROUP_LIST', "list edit modify delete user permission add remove member"); -define('_MI_USER_KEYWORD_MAILJOB_CREATE', "Mailjob create"); -define('_MI_USER_KEYWORD_MAILJOB_LIST', "Mailjob list"); define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage"); define('_MI_USER_KEYWORD_USER_LIST', "user list"); define('_MI_USER_KEYWORD_USER_SEARCH', "User search"); -define('_MI_USER_LANG_MAILJOB_CREATE', "Mailjob create"); -define('_MI_USER_LANG_MAILJOB_LIST', "Mailjob list"); define('_MI_USER_MENU_CREATE_AVATAR', "Create avatar"); define('_MI_USER_MENU_CREATE_GROUP', "Create group"); define('_MI_USER_MENU_CREATE_RANK', "user rank create new"); From minahito @ users.sourceforge.jp Fri Aug 18 18:06:57 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:06:57 +0900 Subject: [xoops-cvslog 4197] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060818090657.3C00B2AC1BF@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.11 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.12 --- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.11 Fri Aug 18 14:35:29 2006 +++ xoops2jp/html/modules/user/templates/user_avatar_edit.html Fri Aug 18 18:06:57 2006 @@ -22,6 +22,11 @@ + + - + @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ @@ -141,6 +141,13 @@ + + + + - + @@ -88,7 +88,7 @@ - + From minahito @ users.sourceforge.jp Fri Aug 18 18:09:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:09:11 +0900 Subject: [xoops-cvslog 4200] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060818090911.4EC1B2AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.20 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.21 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.20 Sat Aug 5 22:21:34 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Fri Aug 18 18:09:11 2006 @@ -1,7 +1,8 @@ %s件のデータが見つかりました。"); -define('_SR_IGNOREDWORDS', "次の語句は短すぎる(%u 文字以下)ため検索に使用されていません。"); -define('_SR_KEYIGNORE', "文字数が "); -define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。"); -define('_SR_KEYWORDS', "キーワード"); -define('_SR_NEXT', "次のページ >>"); -define('_SR_NOMATCH', "該当データなし。"); -define('_SR_PLZENTER', "必要なデータを全て入力してください。"); -define('_SR_PREVIOUS', "<< 前のページ"); -define('_SR_SEARCH', "検索"); -define('_SR_SEARCHIN', "検索対象のモジュール"); -define('_SR_SEARCHRESULTS', "検索結果"); -define('_SR_SEARCHRULE', "検索のルール"); -define('_SR_SHOWALLR', "すべて表示"); -define('_SR_SHOWING', "(%d 〜 %d 件目を表示)"); -define('_SR_TYPE', "検索の種類"); +define('_MD_BASE_MESSAGE_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); ?> From minahito @ users.sourceforge.jp Fri Aug 18 18:09:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:09:11 +0900 Subject: [xoops-cvslog 4201] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060818090911.724052AC1BF@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.19 xoops2jp/html/modules/base/language/english/main.php:1.1.2.20 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.19 Sat Aug 5 22:21:34 2006 +++ xoops2jp/html/modules/base/language/english/main.php Fri Aug 18 18:09:11 2006 @@ -1,7 +1,8 @@ >"); -define('_SR_NOMATCH', "No entries found that match your query."); -define('_SR_PLZENTER', "Please enter all required data!"); -define('_SR_PREVIOUS', "<< Previous"); -define('_SR_SEARCH', "Search"); -define('_SR_SEARCHIN', "Search in"); -define('_SR_SEARCHRESULTS', "Search Results"); -define('_SR_SEARCHRULE', "Seach Rule"); -define('_SR_SHOWALLR', "Show all results"); -define('_SR_SHOWING', "(Showing %d - %d)"); -define('_SR_TYPE', "Type"); +define('_MD_BASE_MESSAGE_THANKYOUFORVISIT', "Thank you for your visit to our site!"); ?> From minahito @ users.sourceforge.jp Fri Aug 18 18:09:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:09:11 +0900 Subject: [xoops-cvslog 4202] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060818090911.955C72AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.5 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.6 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.5 Sun Aug 6 10:00:09 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Fri Aug 18 18:09:11 2006 @@ -40,7 +40,6 @@

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

    • 「base module」の名称(ディレクトリ名を含む)は、正式版までに「Legacy module」に変更の予定です。
    • -
    • 「互換モジュール」のモジュールインストーラが一部のモジュールのSQLを正しく処理できないという問題があります。その場合「system module」を使ってインストールしてください。
    • 幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。
    • misc.phpに依存した機能の「SSLログイン」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。
    • 旧バージョンからのアップグレードスクリプトは、本バージョンには含まれません。アップグレードスクリプトは、β版から提供される予定です。
    • @@ -51,12 +50,10 @@
      • メインメニューがないモジュールも、優先度を決定できなれば、管理画面におけるサイドメニューの順番を制御できない。
      • モジュールをアップデートすると、そのモジュールに関する諸設定が失われてしまう。
      • -
      • モジュール管理に新型の SQL パーサを搭載できていない。現在の SQL パーサは若干のファイルで問題がある。
      • カスタムブロックにプレビュー機能がなく、実装されなくてはならない。
      • ユーザー検索において、前方一致や後方一致の指定ができなくなっている。
      • -
      • メールジョブ送信において、送信後、 headers already sent が発生する。
      • XOOPS Cube における新しい SSL ログインが実装されていない。旧 SSL ログインは再考の余地があります。
      • モジュールコンフィグにポートされた設定項目が一部、全体の設定項目に残っている。
      • -
      • モジュールコンフィグの大きな初期値をうまく設定する方法を考えなければならない。(ユーザーモジュールなどで)
      • -
      • XCube_NewDelegate クラスを XCube_Delegate クラスで置き換える
      • +
      • [New!] ユーザー自身によるアカウント削除機能を実装しなくてはならない。
      • +
      • [New!] implement USECOOKIE
      From minahito @ users.sourceforge.jp Fri Aug 18 18:09:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:09:11 +0900 Subject: [xoops-cvslog 4203] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060818090911.BA3BA2AC1BF@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.5 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.6 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.5 Sun Aug 6 10:00:10 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Fri Aug 18 18:09:11 2006 @@ -42,7 +42,6 @@

      TODO (What's coming?)

      • Name of this module would be changed to 'Legacy module' form 'Base module'.
      • -
      • 'Legacy module' cann't install some modules' SQL file correctly. If you meet this problem, use old module installer of 'system'.
      • Some modules which depend on minor global variables of XOOPS2, can not be installed in XOOPS Cube Legacy 2.1.
      • 'SSL Login' and 'Avatar list' isn't available in misc.php. Avatar list has been ported to the user module.
      • Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)
      • @@ -53,12 +52,10 @@
        • The weight of any modules should be editable. Because, users can change order in the side menu of the control panel, by that.
        • When a module is updated in the module management, the configuration of that module is removed. Users hope to keep active configurations.
        • -
        • We haven't committed new type SQL parser class into this module. Current SQL parser in the module install feature often triggers errors in some SQL files.
        • The preview feature in custom blocks has to be implemented.
        • Users can't use forward-match and backward-match in the user search. These search options are available in XOOPS2.
        • -
        • Sending mailjob triggers 'headers already sent'. We have to fix it.
        • SSL Login feature of XOOPS Cube Legacy 2.1 hasn't been implemented. Old SSL Login is bad.
        • Some config items have been ported from general settings. But, we still haven't removed these items in general setting.
        • -
        • We have to decide the method that users install large initialize values into module config items. (user module)
        • -
        • We shall replace XCube_NewDelegate with XCube_Delegate.
        • +
        • [New!] We have to implement user delete function for user.
        • +
        • [New!] implement USECOOKIE
        From minahito @ users.sourceforge.jp Fri Aug 18 18:10:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:10:28 +0900 Subject: [xoops-cvslog 4204] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060818091028.932722AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.4 --- xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php:1.1.2.3 Wed Aug 9 18:40:35 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminModuleController.class.php Fri Aug 18 18:10:28 2006 @@ -1,7 +1,7 @@ get('hasconfig') == 1 || $module->get('hascomments') == 1) { + $configHandler =& xoops_gethandler('config'); + $this->mConfig =& $configHandler->getConfigsByCat(0, $module->get('mid')); + } + $GLOBALS['xoopsModuleConfig'] =& $this->mConfig; $dmy =& $module->getInfo(); From minahito @ users.sourceforge.jp Fri Aug 18 18:10:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:10:51 +0900 Subject: [xoops-cvslog 4205] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060818091051.8AEC32AC1C3@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.67 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.68 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.67 Fri Aug 18 12:54:11 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Aug 18 18:10:51 2006 @@ -1,7 +1,7 @@ mXoopsUser)) { $this->mCheckLogin->call(new XCube_Ref($this->mXoopsUser)); + + $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); if(is_object($this->mXoopsUser)) { // RMV-NOTIFY @@ -811,8 +813,6 @@ } } - $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); - $this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_BASE_MESSAGE_LOGIN_SUCCESS, $this->mXoopsUser->get('uname'))); } else { @@ -821,7 +821,7 @@ // // Fall back process for login fail. // - $this->executeRedirect(XOOPS_URL . "/user.php", 1, _US_INCORRECTLOGIN); + $this->executeRedirect(XOOPS_URL . "/user.php", 1, _MD_BASE_ERROR_INCORRECTLOGIN); } } else { @@ -839,11 +839,14 @@ $successFlag = false; $xoopsUser =& $this->getXoopsUser(); + if (is_object($xoopsUser)) { + $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); + $this->mLogout->call(new XCube_Ref($successFlag), $xoopsUser); if ($successFlag) { XCube_DelegateUtils::call("Site.Logout.Success", $xoopsUser); - $this->executeRedirect(XOOPS_URL, 1, array(_US_LOGGEDOUT, _US_THANKYOUFORVISIT)); + $this->executeRedirect(XOOPS_URL, 1, array(_MD_BASE_MESSAGE_LOGGEDOUT, _MD_BASE_MESSAGE_THANKYOUFORVISIT)); } else { XCube_DelegateUtils::call("Site.Logout.Fail", $xoopsUser); @@ -873,7 +876,7 @@ */ function setStrategy(&$strategy) { - if($strategy->mStatusFlag != $this->_mStrategy->mStatusFlag) { + if ($strategy->mStatusFlag != $this->_mStrategy->mStatusFlag) { $this->_mStrategy =& $strategy; // From minahito @ users.sourceforge.jp Fri Aug 18 18:11:17 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:11:17 +0900 Subject: [xoops-cvslog 4206] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060818091117.5B7392AC1BF@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.9 xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.10 --- xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.9 Fri Aug 4 13:35:25 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php Fri Aug 18 18:11:17 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.4.8.6 xoops2jp/html/include/version.php:1.4.8.7 --- xoops2jp/html/include/version.php:1.4.8.6 Fri Aug 11 10:54:21 2006 +++ xoops2jp/html/include/version.php Fri Aug 18 18:11:54 2006 @@ -1,5 +1,5 @@ \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 18 18:12:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:12:25 +0900 Subject: [xoops-cvslog 4208] CVS update: xoops2jp/html/include Message-ID: <20060818091225.AF0F72AC1BF@users.sourceforge.jp> Index: xoops2jp/html/include/cp_header.php diff -u xoops2jp/html/include/cp_header.php:1.2.8.4 xoops2jp/html/include/cp_header.php:1.2.8.5 --- xoops2jp/html/include/cp_header.php:1.2.8.4 Fri Aug 4 19:32:12 2006 +++ xoops2jp/html/include/cp_header.php Fri Aug 18 18:12:25 2006 @@ -1,42 +1,29 @@ // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // - -require_once '../../../mainfile.php'; +/** + * @package Legacy + * @version $Id: cp_header.php,v 1.2.8.5 2006/08/18 09:12:25 minahito Exp $ + * @deprecated This file was a shortcut for XOOPS2 developers who don't want to load header.php + */ -if(!defined('XOOPS_CPFUNC_LOADED')) - require_once XOOPS_ROOT_PATH."/include/cp_functions.php"; +if (!defined('XOOPS_ROOT_PATH')) { + require_once "../../../mainfile.php"; +} + +if (!defined('XOOPS_CPFUNC_LOADED')) { + require_once XOOPS_ROOT_PATH . "/include/cp_functions.php"; +} // // [Special Mission] Additional CHECK!! // Old modules may call this file from other admin directory. // In this case, the controller does not have Admin ModuleController and Admin RenderSystem. // -$root=&XCube_Root::getSingleton(); +$root =& XCube_Root::getSingleton(); $strategy =& new Legacy_AdminControllerStrategy($root->mController); $root->mController->setStrategy($strategy); +// +// TODO +// + ?> \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 18 18:13:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:13:29 +0900 Subject: [xoops-cvslog 4209] CVS update: xoops2jp/html/include Message-ID: <20060818091329.943522AC1BF@users.sourceforge.jp> Index: xoops2jp/html/include/functions.php diff -u xoops2jp/html/include/functions.php:1.2.8.16 xoops2jp/html/include/functions.php:1.2.8.17 --- xoops2jp/html/include/functions.php:1.2.8.16 Wed Aug 9 18:34:19 2006 +++ xoops2jp/html/include/functions.php Fri Aug 18 18:13:29 2006 @@ -1,5 +1,5 @@ mController->getRenderSystem(); - if($renderSystem!=null) + $root =& XCube_Root::getSingleton(); + $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem'); + if ($renderSystem != null) { $renderSystem->showXoopsHeader($closehead); + } } +/** + * @deprecated + */ function xoops_footer() { - $root=&XCube_Root::getSingleton(); - $renderSystem=&$root->mController->getRenderSystem(); - if($renderSystem!=null) + $root =& XCube_Root::getSingleton(); + $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem'); + if ($renderSystem != null) { $renderSystem->showXoopsFooter(); + } } function xoops_error($message, $title='', $style='errorMsg') @@ -528,11 +533,25 @@ return $ret; } +/** + * This function is Fly-Weight to get an instance of XoopsObject in Legacy + * Kernel. + */ function &xoops_gethandler($name, $optional = false ) { static $handlers; $name = strtolower(trim($name)); if (!isset($handlers[$name])) { + // + // The following delegate is test at Alpha4-c. + // + $handler = null; + XCube_DelegateUtils::call('Legacy.Event.GetHandler', new XCube_Ref($handler), $optional); + if (is_object($handler)) { + $handlers[$name] =& $handler; + return $handlers[$name]; + } + if ( file_exists( $hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php' ) ) { require_once $hnd_file; } @@ -572,10 +591,16 @@ if ( file_exists( $hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/{$name}.php" ) ) { include_once $hnd_file; } - $class = ucfirst(strtolower($module_dir)).ucfirst($name).'Handler'; - if (class_exists($class)) { - $handlers[$module_dir][$name] = new $class($GLOBALS['xoopsDB']); - } + $className = ucfirst(strtolower($module_dir)) . "_" . ucfirst($name) . 'Handler'; + if (class_exists($className)) { + $handlers[$module_dir][$name] =& new $className($GLOBALS['xoopsDB']); + } + else { + $className = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Handler'; + if (class_exists($className)) { + $handlers[$module_dir][$name] = new $className($GLOBALS['xoopsDB']); + } + } } if (!isset($handlers[$module_dir][$name]) && !$optional) { trigger_error('Handler does not exist
        Module: '.$module_dir.'
        Name: '.$name, E_USER_ERROR); From tom_g3x @ users.sourceforge.jp Fri Aug 18 20:25:04 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 18 Aug 2006 20:25:04 +0900 Subject: [xoops-cvslog 4210] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060818112505.599B52AC093@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.1 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.2 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.1 Sat Aug 12 22:26:06 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Fri Aug 18 20:25:04 2006 @@ -1,17 +1,60 @@ -.base_theme_active { - background-color:pink; +/* theme list */ +tr.base_theme_active td { + background-color:#ff9999; } -.base_theme_inactive { +tr.base_theme_inactive td { } -.base_smiles_active { - background-color:pink; +/* smiles list */ +tr.base_smiles_active td { + background-color:#ffaaaa; } -.base_smiles_inactive { +tr.base_smiles_inactive td { color:#666666; } +/* block list */ +.base_blocktype_module { + font-weight:bold; +} +.base_blocktype_custom { + font-weight:bold; + color:#0000cc; +} +.base_blockside { + width:125px; +} .base_blockside_active { + float:left; background-color:#66ff66; + border:1px solid #333333; +} +.base_blockside_inactive { + float:left; + background-color:#ffffff; + border:1px solid #333333; +} +.base_blockside_separator { + float:left; +} + +/* for list table */ +.base_list_id { + text-align:center; +} +.base_list_title { + text-align:left; +} +.base_list_number { + text-align:right; +} +.base_list_select { + text-align:center; +} +.base_list_date { + text-align:right; +} +.base_list_controll { + text-align:center; } From tom_g3x @ users.sourceforge.jp Fri Aug 18 20:25:05 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 18 Aug 2006 20:25:05 +0900 Subject: [xoops-cvslog 4211] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060818112505.806F12AC208@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/block_list.html diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.20 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.21 --- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.20 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/block_list.html Fri Aug 18 20:25:05 2006 @@ -53,57 +53,63 @@
    <{foreach item=obj from=$objects}> - - - + + - - + - - + - - +
    <{$smarty.const._AD_USER_LANG_AVATAR_ID}>
    +
    <{$smarty.const._MD_USER_LANG_AVATAR_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_AVATAR_FILE}> <{$smarty.const._AD_USER_LANG_CONTROL}>
    <{$obj->getShow('rank_id')}>
    <{$obj->getShow('rank_id')}> <{$obj->getShow('rank_title')}> <{$obj->getShow('rank_min')}> <{$obj->getShow('rank_max')}> <{$obj->getShow('rank_special')}> <{$obj->getShow('rank_title')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{$group->getShow('description')}> <{$group->getShow('group_type')}> <{$group->getUserCount()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> @@ -81,7 +81,7 @@ <{$user->get('last_login')|xoops_formattimestamp:l}> <{$user->getShow('posts')}> <{$user->getShow('level')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> @@ -124,15 +124,15 @@ <{foreach from=$users item=user }>
    " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}> <{$user->getShow('uname')}> <{$user->getShow('name')}> <{$user->get('user_regdate')|xoops_formattimestamp}> <{$user->get('last_login')|xoops_formattimestamp:l}> <{$user->getShow('posts')}> <{$user->getShow('level')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.17 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.18 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.17 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Thu Aug 17 21:48:54 2006 @@ -37,15 +37,15 @@
    " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}> <{$user->getShow('uname')}> <{$user->getShow('name')}> <{$user->get('user_regdate')|xoops_formattimestamp}> <{$user->get('last_login')|xoops_formattimestamp:l}> <{$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 }> Index: xoops2jp/html/modules/user/admin/templates/group_list.html diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.12 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_list.html Thu Aug 17 21:48:54 2006 @@ -28,14 +28,14 @@ <{$smarty.const._AD_USER_LANG_CONTROL}>
    " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /><{$group->getShow('groupid')}>
    " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /><{$group->getShow('groupid')}> <{$group->getShow('name')}> <{$group->getShow('description')}> <{$group->getShow('group_type')}> <{$group->getUserCount()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.15 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.16 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.15 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Thu Aug 17 21:48:54 2006 @@ -23,7 +23,7 @@ <{$group->getShow('description')}> <{$group->getShow('group_type')}> <{$group->getUserCount()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> @@ -52,15 +52,15 @@
    " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}> <{$user->getShow('uname')}> <{$user->getShow('name')}> <{$user->getShow('user_regdate')|xoops_formattimestamp}> <{$user->getShow('last_login')|xoops_formattimestamp:l}> <{$user->getShow('posts')}> <{$user->getShow('level')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/group_perm.html diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.20 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.21 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.20 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Thu Aug 17 21:48:54 2006 @@ -16,14 +16,14 @@ <{$smarty.const._AD_USER_LANG_GROUP_AMMO}> <{$smarty.const._AD_USER_LANG_CONTROL}>
    " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /><{$group->getShow('groupid')}>
    " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /><{$group->getShow('groupid')}> <{$group->getShow('name')}> <{$group->getShow('description')}> <{$group->getShow('group_type')}> <{$group->getUserCount()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.13 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Thu Aug 17 21:48:54 2006 @@ -37,8 +37,8 @@ <{$smarty.const._AD_USER_LANG_CONTROL}>
    <{$obj->getShow('avatar_id')}>
    <{$obj->getShow('avatar_id')}> <{$obj->getShow('avatar_name')}> <{$obj->getShow('avatar_name')}> <{$obj->getShow('avatar_mimetype')}><{$obj->getShow('avatar_weight')}> <{$obj->getShow('avatar_type')}> <{$obj->getUsingCount()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
    <{$obj->getShow('mailjob_id')}><{$obj->getShow('mailjob_id')}> <{$obj->getShow('title')}> <{$obj->getShow('is_pm')}> <{$obj->getShow('is_mail')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
    " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /><{$user->getShow('uid')}> <{$user->getShow('uname')}> <{$user->getShow('name')}> <{$user->get('user_regdate')|xoops_formattimestamp}> <{$user->get('last_login')|xoops_formattimestamp:l}> <{$user->getShow('posts')}> <{$user->getShow('level')}> + " 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 Fri Aug 18 12:54:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 12:54:11 +0900 Subject: [xoops-cvslog 4181] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060818035411.E64042AC1B0@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.66 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.67 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.66 Thu Aug 17 11:08:38 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Aug 18 12:54:11 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.10 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.11 --- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.10 Thu Aug 10 19:52:01 2006 +++ xoops2jp/html/modules/user/templates/user_avatar_edit.html Fri Aug 18 14:35:29 2006 @@ -1,5 +1,5 @@
    -<{$smarty.const._US_PROFILE}> +<{$smarty.const._MD_USER_LANG_PROFILE}>  »» <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
    Index: xoops2jp/html/modules/user/templates/user_edituser.html diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.9 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.10 --- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.9 Wed Jul 19 19:21:40 2006 +++ xoops2jp/html/modules/user/templates/user_edituser.html Fri Aug 18 14:35:29 2006 @@ -1,6 +1,6 @@
    -<{$smarty.const._US_PROFILE}>»» <{$smarty.const._US_EDITPROFILE}> +<{$smarty.const._MD_USER_LANG_PROFILE}>»» <{$smarty.const._MD_USER_LANG_EDITPROFILE}>
    <{if $actionForm->hasError()}> @@ -18,29 +18,29 @@ <{xoops_input name=uid type=hidden value=$actionForm->get('uid')}> - + - + - + <{if $allow_chgmail}> - + <{/if}> - + @@ -54,62 +54,62 @@ - + - + - + - + - + - + - + - + - + - + @@ -127,21 +127,21 @@ - + - + - +
    <{$smarty.const._US_EDITPROFILE}><{$smarty.const._MD_USER_LANG_EDITPROFILE}>
    <{$smarty.const._US_NICKNAME}><{$smarty.const._MD_USER_LANG_NICKNAME}> "><{$thisUser->getShow('uname')}>
    <{$smarty.const._US_REALNAME}><{$smarty.const._MD_USER_LANG_NAME}> "> <{xoops_input name=name size=30 maxlength=60 value=$actionForm->get('name')}>
    <{$smarty.const._US_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}>
    - <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._US_ALLOWVIEWEMAIL}> + <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}>
    <{$smarty.const._US_WEBSITE}><{$smarty.const._MD_USER_LANG_WEBSITE}> "> <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
    <{$smarty.const._US_ICQ}><{$smarty.const._MD_USER_LANG_USER_ICQ}> "> <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->get('user_icq')}>
    <{$smarty.const._US_AIM}><{$smarty.const._MD_USER_LANG_USER_AIM}> "> <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->get('user_aim')}>
    <{$smarty.const._US_YIM}><{$smarty.const._MD_USER_LANG_YIM}> "> <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->get('user_yim')}>
    <{$smarty.const._US_MSNM}><{$smarty.const._MD_USER_LANG_USER_MSNM}> "> <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->get('user_msnm')}>
    <{$smarty.const._US_LOCATION}><{$smarty.const._MD_USER_LANG_USER_FROM}> "> <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->get('user_from')}>
    <{$smarty.const._US_OCCUPATION}><{$smarty.const._MD_USER_LANG_USER_OCC}> "> <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->get('user_occ')}>
    <{$smarty.const._US_INTEREST}><{$smarty.const._MD_USER_LANG_USER_INTEREST}> "> <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->get('user_intrest')}>
    <{$smarty.const._US_SIGNATURE}><{$smarty.const._MD_USER_LANG_USER_SIG}> "> <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}>
    - <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._US_SHOWSIG}> + <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._MD_USER_LANG_ATTACHESIG}>
    <{$smarty.const._US_CDISPLAYMODE}><{$smarty.const._MD_USER_LANG_UMODE}> "> <{html_options name=umode options=$umodeOptions selected=$actionForm->get('umode')}>
    <{$smarty.const._US_CSORTORDER}><{$smarty.const._MD_USER_LANG_UORDER}> "> <{html_options name=uorder options=$uorderOptions selected=$actionForm->get('uorder')}>
    <{$smarty.const._US_EXTRAINFO}><{$smarty.const._MD_USER_LANG_BIO}> "> <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50}>
    <{$smarty.const._US_PASSWORD}>
    - <{$smarty.const._US_TYPEPASSTWICE}>
    <{$smarty.const._MD_USER_LANG_PASSWORD}>
    + <{$smarty.const._MD_USER_LANG_TYPEPASSTWICE}>
    "> <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->get('pass')}> <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->get('vpass')}>
    <{$smarty.const._US_MAILOK}><{$smarty.const._MD_USER_LANG_USER_MAILOK}> "> <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}><{$smarty.const._YES}> <{xoops_input type=radio name=user_mailok value=0 default=$actionForm->get('user_mailok')}><{$smarty.const._NO}> @@ -150,7 +150,7 @@
      "> - +
    Index: xoops2jp/html/modules/user/templates/user_lostpass.html diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.6 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7 --- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.6 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/templates/user_lostpass.html Fri Aug 18 14:35:29 2006 @@ -12,15 +12,15 @@ <{xoops_token form=$actionForm}> - + - + Index: xoops2jp/html/modules/user/templates/user_userinfo.html diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.12 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.13 --- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.12 Wed Jul 19 19:21:40 2006 +++ xoops2jp/html/modules/user/templates/user_userinfo.html Fri Aug 18 14:35:29 2006 @@ -1,11 +1,11 @@ <{if $user_ownpage == true && $user_candelete == true}> <{elseif $xoops_isadmin == true}> <{/if}> @@ -16,18 +16,18 @@
    <{$smarty.const._US_LOSTPASSWORD}><{$smarty.const._MD_USER_LANG_LOSTPASSWORD}>
    "> - <{$smarty.const._US_NOPROBLEM}> + <{$smarty.const._MD_USER_LANG_NOPROBLEM}>
    <{$smarty.const._US_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}>
    <{if $user_ownpage == true}> <{/if}> - + - + - + - + - + - + - + - + - + - + - + - + - +
    - <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getShow('uname')}> + <{$smarty.const._MD_USER_LANG_ALLABOUT|replace:"%s":$thisUser->getShow('uname')}>
    - <{$smarty.const._US_EDITPROFILE}> + <{$smarty.const._MD_USER_LANG_EDITPROFILE}>
    <{$smarty.const._US_AVATAR}><{$smarty.const._MD_USER_LANG_AVATAR}> <{if $thisUser->get('user_avatar') != "blank.gif" }> Avatar @@ -40,15 +40,15 @@
    <{$smarty.const._US_REALNAME}><{$smarty.const._MD_USER_LANG_NAME}> <{$thisUser->getShow('name')}>
    <{$smarty.const._US_WEBSITE}><{$smarty.const._MD_USER_LANG_WEBSITE}> <{$thisUser->getShow('url')}>
    <{$smarty.const._US_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> <{if $thisUser->get('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }> <{mailto address=$thisUser->get('email') encode="javascript"}> @@ -56,7 +56,7 @@
    <{$smarty.const._US_PM}><{$smarty.const._MD_USER_LANG_PM}> <{$smarty.const._SENDPMTO|replace:getShow('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" /> @@ -64,35 +64,35 @@
    <{$smarty.const._US_ICQ}><{$smarty.const._MD_USER_LANG_USER_ICQ}> <{$thisUser->getShow('user_icq')}>
    <{$smarty.const._US_AIM}><{$smarty.const._MD_USER_LANG_USER_AIM}> <{$thisUser->getShow('user_aim')}>
    <{$smarty.const._US_YIM}><{$smarty.const._MD_USER_LANG_YIM}> <{$thisUser->getShow('user_yim')}>
    <{$smarty.const._US_MSNM}><{$smarty.const._MD_USER_LANG_USER_MSNM}> <{$thisUser->getShow('user_msnm')}>
    <{$smarty.const._US_LOCATION}><{$smarty.const._MD_USER_LANG_USER_FROM}> <{$thisUser->getShow('user_from')}>
    <{$smarty.const._US_OCCUPATION}><{$smarty.const._MD_USER_LANG_USER_OCC}> <{$thisUser->getShow('user_occ')}>
    <{$smarty.const._US_INTEREST}><{$smarty.const._MD_USER_LANG_USER_INTEREST}> <{$thisUser->getShow('user_intrest')}>
    <{$smarty.const._US_EXTRAINFO}><{$smarty.const._MD_USER_LANG_BIO}> <{$thisUser->getShow('bio')}>
    @@ -100,15 +100,15 @@
    - + - + <{if $rank != null}> - + <{/if}> - + - +
    <{$smarty.const._US_STATISTICS}><{$smarty.const._MD_USER_LANG_STATISTICS}>
    <{$smarty.const._US_MEMBERSINCE}><{$smarty.const._MD_USER_LANG_USER_REGDATE}> <{$thisUser->get('user_regdate')|xoops_formattimestamp:l}>
    <{$smarty.const._US_RANK}><{$smarty.const._MD_USER_LANG_RANK}> <{$rank->getShow('rank_title')}>
    <{$rank->getShow('rank_title')}> @@ -116,18 +116,18 @@
    <{$smarty.const._US_POSTS}><{$smarty.const._MD_USER_LANG_POSTS}> <{$thisUser->getShow('posts')}>
    <{$smarty.const._US_LASTLOGIN}><{$smarty.const._MD_USER_LANG_LAST_LOGIN}> <{$thisUser->get('last_login')|xoops_formattimestamp:l}>

    - + @@ -149,7 +149,7 @@ <{if $module.has_more}> - <{$smarty.const._US_SHOWALL}> + <{$smarty.const._MD_USER_LANG_SHOWALL}> <{/if}>

    <{/foreach}> Index: xoops2jp/html/modules/user/templates/user_register_confirm.html diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.5 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.6 --- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.5 Wed Jul 19 19:21:40 2006 +++ xoops2jp/html/modules/user/templates/user_register_confirm.html Fri Aug 18 14:35:29 2006 @@ -1,20 +1,20 @@
    <{$smarty.const._US_SIGNATURE}><{$smarty.const._MD_USER_LANG_USER_SIG}>
    <{$user_signature}>
    - + - +
    <{$smarty.const._US_NICKNAME}><{$smarty.const._MD_USER_LANG_NICKNAME}> "> <{$registForm->get('uname')|escape}>
    <{$smarty.const._US_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{$registForm->get('email')|escape}>
    - +
    Index: xoops2jp/html/modules/user/templates/user_default.html diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5 --- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.4 Sat Aug 5 15:24:47 2006 +++ xoops2jp/html/modules/user/templates/user_default.html Fri Aug 18 14:35:29 2006 @@ -26,6 +26,6 @@ <{if $allowRegister}> - + <{/if}> Index: xoops2jp/html/modules/user/templates/user_userform.html diff -u xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.4 --- xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.3 Thu Feb 2 14:34:19 2006 +++ xoops2jp/html/modules/user/templates/user_userform.html Fri Aug 18 14:35:29 2006 @@ -8,18 +8,18 @@ -
    <{$smarty.const._US_NOTREGISTERED}>
    +
    <{$smarty.const._MD_USER_LANG_NOTREGISTERED}>

    - <{$smarty.const._US_LOSTPASSWORD}> -

    <{$smarty.const._US_NOPROBLEM}>
    + <{$smarty.const._MD_USER_LANG_LOSTPASSWORD}> +

    <{$smarty.const._MD_USER_LANG_NOPROBLEM}>
    - <{$smarty.const._US_YOUREMAIL}> + <{$smarty.const._MD_USER_LANG_YOUREMAIL}>    - +
    Index: xoops2jp/html/modules/user/templates/user_register_form.html diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.9 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.10 --- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.9 Wed Jul 19 19:21:40 2006 +++ xoops2jp/html/modules/user/templates/user_register_form.html Fri Aug 18 14:35:29 2006 @@ -12,22 +12,22 @@ <{xoops_token form=$actionForm}> - + - + - + - + @@ -39,30 +39,30 @@ - + - + <{if $enableAgree}> - + <{/if}>
    <{$smarty.const._US_USERREG}><{$smarty.const._MD_USER_LANG_USERREG}>
    <{$smarty.const._US_NICKNAME}><{$smarty.const._MD_USER_LANG_NICKNAME}> "><{xoops_input maxlength=25 name=uname value=$actionForm->get('uname')}>
    <{$smarty.const._US_EMAIL}><{$smarty.const._MD_USER_LANG_EMAIL}> "> <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}>
    <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}> - <{$smarty.const._US_ALLOWVIEWEMAIL}> + <{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}>
    <{$smarty.const._US_WEBSITE}><{$smarty.const._MD_USER_LANG_WEBSITE}> "><{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
    <{$smarty.const._US_PASSWORD}><{$smarty.const._MD_USER_LANG_PASSWORD}> "> <{xoops_input type=password name=pass value=$actionForm->get('pass') size=10 maxlength=32}>
    <{$smarty.const._US_VERIFYPASS}><{$smarty.const._MD_USER_LANG_VERIFYPASS}> "> <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=10 maxlength=32}>
    <{$smarty.const._US_DISCLAIMER}><{$smarty.const._MD_USER_LANG_DISCLAIMER}> "> <{xoops_textarea name=disclaimer rows=8 cols=50 readonly=true value=$disclaimer}>
    <{xoops_input type=checkbox name=agree value=1 default=$actionForm->get('agree')}> - <{$smarty.const._US_IAGREE}> + <{$smarty.const._MD_USER_MESSAGE_IAGREE}>
    - +
    From minahito @ users.sourceforge.jp Fri Aug 18 14:35:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:30 +0900 Subject: [xoops-cvslog 4183] CVS update: xoops2jp/html/modules/user/kernel Message-ID: <20060818053530.448022AC1B8@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.7 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.8 --- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.7 Fri Aug 11 13:13:02 2006 +++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ get('level') == 0) { - // TODO We should use message "_US_NOACTTPADM" + // TODO We should use message "_MD_USER_LANG_NOACTTPADM" return; } From minahito @ users.sourceforge.jp Fri Aug 18 14:35:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:30 +0900 Subject: [xoops-cvslog 4184] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060818053530.71A7C2AC056@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.13 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.14 --- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.13 Wed Aug 9 18:38:29 2006 +++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ insertUser($this->mNewUser)) { - $this->mRedirectMessage = _US_REGISTERNG; + $this->mRedirectMessage = _MD_USER_LANG_REGISTERNG; return USER_FRAME_VIEW_ERROR; } if (!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS, $this->mNewUser->get('uid'))) { - $this->mRedirectMessage = _US_REGISTERNG; + $this->mRedirectMessage = _MD_USER_LANG_REGISTERNG; return USER_FRAME_VIEW_ERROR; } @@ -147,21 +147,21 @@ if ($activationType == 0) { $render->setTemplateName("user_register_finish.html"); - $render->setAttribute("complete_message", _US_YOURREGISTERED); + $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED); } elseif ($activationType == 1) { - $controller->executeRedirect(XOOPS_URL, 4, _US_ACTLOGIN); + $controller->executeRedirect(XOOPS_URL, 4, _MD_USER_MESSAGE_ACTLOGIN); } elseif($activationType == 2) { $render->setTemplateName("user_register_finish.html"); - $render->setAttribute("complete_message", _US_YOURREGISTERED2); + $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED2); } else { // // This case is never. // $render->setTemplateName("user_register_finish.html"); - $render->setAttribute("complete_message", _US_YOURREGISTERED2); + $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED2); } } } Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.5 --- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.4 Sat Aug 5 10:54:48 2006 +++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ mObject->get('actkey') != xoops_getrequest('actkey')) { - $controller->executeRedirect(XOOPS_URL, 3, _US_ACTKEYNOT); + $controller->executeRedirect(XOOPS_URL, 3, _MD_USER_MESSAGE_ACTKEYNOT); } if ($this->mObject->get('level') > 1) { - $controller->executeRedirect(XOOPS_URL . '/user.php', 3, _US_ACONTACT); + $controller->executeRedirect(XOOPS_URL . '/user.php', 3, _MD_USER_MESSAGE_ACONTACT); } $this->mObject->set('level', '1'); @@ -67,12 +67,12 @@ $director->contruct($builder); $mailer=&$builder->getResult(); if ($mailer->send()) { - $controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILOK, $this->mObject->get('uname'))); + $controller->executeRedirect(XOOPS_URL, 5, sprintf(_MD_USER_MESSAGE_ACTVMAILOK, $this->mObject->get('uname'))); } else { - $controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILNG, $this->mObject->get('uname'))); + $controller->executeRedirect(XOOPS_URL, 5, sprintf(_MD_USER_MESSAGE_ACTVMAILNG, $this->mObject->get('uname'))); } } else { - $controller->executeRedirect(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN); + $controller->executeRedirect(XOOPS_URL . '/user.php', 5, _MD_USER_MESSAGE_ACTLOGIN); } } } Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.8 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.9 --- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.8 Wed Jul 19 19:20:33 2006 +++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ executeForward(XOOPS_URL . "/user.php"); } if (empty($this->mConfig['allow_register'])) { - $controller->executeRedirect(XOOPS_URL, 6, _US_NOREGISTER); + $controller->executeRedirect(XOOPS_URL, 6, _MD_USER_LANG_NOREGISTER); } } From minahito @ users.sourceforge.jp Fri Aug 18 14:35:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:30 +0900 Subject: [xoops-cvslog 4185] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060818053530.993782AC1B8@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.7 --- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.6 Wed Jul 19 19:21:25 2006 +++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Fri Aug 18 14:35:30 2006 @@ -31,7 +31,7 @@ $criteria->add(new Criteria('uid', $this->get('uid'), '<>')); } if ($userHandler->getCount($criteria) > 0) { - $this->addErrorMessage(_US_NICKNAMETAKEN); + $this->addErrorMessage(_MD_USER_LANG_NICKNAMETAKEN); } // @@ -52,7 +52,7 @@ break; } if(preg_match($regex,$this->get('uname'))) { - $this->addErrorMessage(_US_INVALIDNICKNAME); + $this->addErrorMessage(_MD_USER_LANG_INVALIDNICKNAME); } // @@ -60,7 +60,7 @@ // foreach(explode("|",$this->mConfig['bad_unames']) as $pattern) { if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->get('uname'))) { - $this->addErrorMessage(_US_NAMERESERVED); + $this->addErrorMessage(_MD_USER_LANG_NAMERESERVED); break; } } Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.11 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.12 --- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.11 Wed Jul 19 19:21:25 2006 +++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Fri Aug 18 14:35:30 2006 @@ -58,41 +58,41 @@ // $this->mFieldProperties['name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['name']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['name']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_REALNAME, "60"); + $this->mFieldProperties['name']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_NAME, "60"); $this->mFieldProperties['name']->addVar("maxlength", 60); if ($this->mConfig['allow_chgmail']) { $this->mFieldProperties['email'] =& new XCube_FieldProperty($this); $this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email')); - $this->mFieldProperties['email']->addMessage("required", _MD_USER_ERROR_REQUIRED, _US_EMAIL, "60"); - $this->mFieldProperties['email']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_EMAIL, "60"); + $this->mFieldProperties['email']->addMessage("required", _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL, "60"); + $this->mFieldProperties['email']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, "60"); $this->mFieldProperties['email']->addVar("maxlength", 60); $this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT); } $this->mFieldProperties['url'] =& new XCube_FieldProperty($this); $this->mFieldProperties['url']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['url']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_WEBSITE, "100"); + $this->mFieldProperties['url']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_WEBSITE, "100"); $this->mFieldProperties['url']->addVar("maxlength", 100); $this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_icq']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_ICQ, "15"); + $this->mFieldProperties['user_icq']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_ICQ, "15"); $this->mFieldProperties['user_icq']->addVar("maxlength", 15); $this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_from']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_from']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_LOCATION, "100"); + $this->mFieldProperties['user_from']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_FROM, "100"); $this->mFieldProperties['user_from']->addVar("maxlength", 100); $this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_aim']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_AIM, "18"); + $this->mFieldProperties['user_aim']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_AIM, "18"); $this->mFieldProperties['user_aim']->addVar("maxlength", 18); $this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_msnm']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_MSNM, "100"); + $this->mFieldProperties['user_msnm']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_MSNM, "100"); $this->mFieldProperties['user_msnm']->addVar("maxlength", 100); $this->mFieldProperties['pass'] =& new XCube_FieldProperty($this); @@ -104,7 +104,7 @@ $this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this); $this->mFieldProperties['vpass']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32'); + $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_VERIFYPASS, '32'); $this->mFieldProperties['vpass']->addVar('maxlength', 32); $this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this); @@ -113,12 +113,12 @@ $this->mFieldProperties['umode'] =& new XCube_FieldProperty($this); $this->mFieldProperties['umode']->setDependsByArray(array('required')); - $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CDISPLAYMODE); + $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UMODE); $this->mFieldProperties['uorder'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uorder']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CSORTORDER); - $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _US_CSORTORDER); + $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UORDER); + $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_UORDER); $this->mFieldProperties['uorder']->addVar('min', 0); $this->mFieldProperties['uorder']->addVar('max', 1); @@ -138,12 +138,12 @@ $this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_OCCUPATION, '100'); + $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_OCC, '100'); $this->mFieldProperties['user_occ']->addVar('maxlength', 100); $this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this); $this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength')); - $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_INTEREST, '150'); + $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTEREST, '150'); $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.7 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.8 --- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.7 Wed Jul 19 19:21:25 2006 +++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php Fri Aug 18 14:35:30 2006 @@ -65,8 +65,8 @@ $this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this); $this->mFieldProperties['vpass']->setDependsByArray(array('required', 'maxlength')); - $this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_VERIFYPASS, '32'); - $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32'); + $this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_VERIFYPASS, '32'); + $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_VERIFYPASS, '32'); $this->mFieldProperties['vpass']->addVar('maxlength', 32); $this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this); @@ -108,8 +108,8 @@ // set fields $this->mFieldProperties['agree']=new XCube_FieldProperty($this); $this->mFieldProperties['agree']->setDependsByArray(array('required','intRange')); - $this->mFieldProperties['agree']->addMessage("required",_US_UNEEDAGREE); - $this->mFieldProperties['agree']->addMessage("intRange",_US_UNEEDAGREE); + $this->mFieldProperties['agree']->addMessage("required",_MD_USER_ERROR_UNEEDAGREE); + $this->mFieldProperties['agree']->addMessage("intRange",_MD_USER_ERROR_UNEEDAGREE); $this->mFieldProperties['agree']->addVar("min",1); $this->mFieldProperties['agree']->addVar("max",1); } From minahito @ users.sourceforge.jp Fri Aug 18 14:35:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:30 +0900 Subject: [xoops-cvslog 4186] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060818053530.C19AD2AC056@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.21 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.22 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.21 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Fri Aug 18 14:35:30 2006 @@ -155,6 +155,6 @@ define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif."); define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters."); define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button."); -define('_MD_USER_LANG_UNAME', "User name"); +define('_AD_USER_LANG_UNAME', "User name"); ?> Index: xoops2jp/html/modules/user/language/english/main.php diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.16 xoops2jp/html/modules/user/language/english/main.php:1.1.2.17 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.16 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/language/english/main.php Fri Aug 18 14:35:30 2006 @@ -6,145 +6,134 @@ define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar."); define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address"); +define('_MD_USER_ERROR_INCORRECTLOGIN', "Invalid Login!"); define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong."); 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_PASSNOTSAME', "Both passwords are different. They must be identical."); define('_MD_USER_ERROR_PASSWORD', "The passwords you gave did not match."); -define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "Input password with {0} or less characters."); -define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "Input password with {0} or more characters."); define('_MD_USER_ERROR_REQUIRED', "{0} is required."); define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator."); define('_MD_USER_ERROR_TIMEZONE', "TimeZone"); +define('_MD_USER_ERROR_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered."); +define('_MD_USER_LANG_ALLABOUT', "All about %s"); +define('_MD_USER_LANG_ATTACHSIG', "Always attach my signature"); define('_MD_USER_LANG_AVATAR', "Avatar"); define('_MD_USER_LANG_AVATAR_EDIT', "Edit avatar"); -define('_MD_USER_LANG_AVATAR_HEIGHT', "Height"); define('_MD_USER_LANG_AVATAR_ID', "ID"); define('_MD_USER_LANG_AVATAR_LIST', "avatar list"); define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "Max file size"); -define('_MD_USER_LANG_AVATAR_NAME', "Name"); define('_MD_USER_LANG_AVATAR_WIDTH', "Width"); define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "avatar width hight"); +define('_MD_USER_LANG_BIO', "Extra Info"); +define('_MD_USER_LANG_DELACCOUNT', "Delete Account"); +define('_MD_USER_LANG_DISCLAIMER', "Disclaimer"); +define('_MD_USER_LANG_EDITPROFILE', "Edit Profile"); define('_MD_USER_LANG_EMAIL', "Email address"); +define('_MD_USER_LANG_ENTERPWD', "ERROR: You must provide a password."); +define('_MD_USER_LANG_FINISH', "Finish"); define('_MD_USER_LANG_GROUPID', "Group ID"); +define('_MD_USER_LANG_GROUPS', "User\'s Groups"); define('_MD_USER_LANG_GUEST', "Guest"); +define('_MD_USER_LANG_HASJUSTREG', "%s has just registered!"); +define('_MD_USER_LANG_INBOX', "Inbox"); +define('_MD_USER_LANG_INVALIDMAIL', "ERROR: Invalid email address"); +define('_MD_USER_LANG_INVALIDNICKNAME', "ERROR: Invalid Username"); +define('_MD_USER_LANG_LAST_LOGIN', "Last Login"); +define('_MD_USER_LANG_LEVEL', "Level"); +define('_MD_USER_LANG_LOGGEDOUT', "You are now logged out"); +define('_MD_USER_LANG_LOGGINGU', "Thank you for logging in, %s."); +define('_MD_USER_LANG_LOGOUT', "Logout"); +define('_MD_USER_LANG_LOSTPASSWORD', "Lost your Password?"); +define('_MD_USER_LANG_MAILPWDNG', "mail_password: could not update user entry. Contact the Administrator"); +define('_MD_USER_LANG_MAXIMGSZ', "Max Image Size (Bytes)"); +define('_MD_USER_LANG_MAXPIXEL', "Max Pixels"); +define('_MD_USER_LANG_MOREABOUT', "More About Me"); +define('_MD_USER_LANG_MYAVATAR', "My Avatar"); +define('_MD_USER_LANG_MYINFO', "My Info"); +define('_MD_USER_LANG_NAME', "Real Name"); +define('_MD_USER_LANG_NAMERESERVED', "ERROR: Username is reserved."); +define('_MD_USER_LANG_NEWPWDREQ', "New Password Request at %s"); +define('_MD_USER_LANG_NEWUSERREGAT', "New user registration at %s"); +define('_MD_USER_LANG_NICKNAME', "Username"); +define('_MD_USER_LANG_NICKNAMENOSPACES', "There cannot be any spaces in the Username."); +define('_MD_USER_LANG_NICKNAMETAKEN', "ERROR: Username has been taken."); +define('_MD_USER_LANG_NICKNAMETOOLONG', "Username is too long. It must be %s or less characters."); +define('_MD_USER_LANG_NICKNAMETOOSHORT', "Username is too short. It must be %s or more characters."); +define('_MD_USER_LANG_NO', "No"); +define('_MD_USER_LANG_NOACTTPADM', "The selected user has been deactivated or has not been activated yet."); +define('_MD_USER_LANG_NOEDITRIGHT', "You do not have permisson to edit this account."); +define('_MD_USER_LANG_NOPERMISS', "Sorry, you do not have the permission to perform this action!"); +define('_MD_USER_LANG_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account."); +define('_MD_USER_LANG_NOREGISTER', "Sorry, we are currently closed for new user registrations."); define('_MD_USER_LANG_NOTIFY_METHOD', "Notification Method : When you monitor e.g. a forum, how would you like to receive notifications of updates?"); define('_MD_USER_LANG_NOTIFY_MODE', "Default Notification Mode"); +define('_MD_USER_LANG_NOTREGISTERED', "Not registered?"); +define('_MD_USER_LANG_OLDDELETED', "Your old avatar will be deleted!"); define('_MD_USER_LANG_PASS', "Password"); +define('_MD_USER_LANG_PASSWORD', "Password"); +define('_MD_USER_LANG_PM', "PM"); +define('_MD_USER_LANG_POSTS', "Comments/Posts"); +define('_MD_USER_LANG_PRESSLOGIN', "Press the button below to login"); +define('_MD_USER_LANG_PROFILE', "Profile"); +define('_MD_USER_LANG_PROFUPDATED', "Your Profile Updated!"); +define('_MD_USER_LANG_PWDMAILED', "Password for %s has been sent."); +define('_MD_USER_LANG_PWDTOOSHORT', "Sorry, your password must be at least "); +define('_MD_USER_LANG_RANK', "Rank"); define('_MD_USER_LANG_RANK_ID', "ID"); +define('_MD_USER_LANG_REGISTERNG', "Could not register new user."); +define('_MD_USER_LANG_REMOVEINFO', "This will remove all your information from our database."); +define('_MD_USER_LANG_SAVECHANGES', "Save Changes"); define('_MD_USER_LANG_SELECT', "Select"); +define('_MD_USER_LANG_SELECTNG', "No User Selected! Please go back and try again."); +define('_MD_USER_LANG_SELFILE', "Select a file"); +define('_MD_USER_LANG_SENDPASSWORD', "Send Password"); +define('_MD_USER_LANG_SHOWALL', "Show All"); +define('_MD_USER_LANG_SORRYNOTFOUND', "Sorry, no corresponding user info was found."); +define('_MD_USER_LANG_STATISTICS', "Statistics"); define('_MD_USER_LANG_SUBMIT', "Submit"); +define('_MD_USER_LANG_SURETODEL', "Are you sure you want to delete your account?"); +define('_MD_USER_LANG_THANKYOUFORVISIT', "Thank you for your visit to our site!"); +define('_MD_USER_LANG_THEME', "Theme"); +define('_MD_USER_LANG_TIMEZONE', "TimeZone"); define('_MD_USER_LANG_TIMEZONE_OFFSET', "Timezone"); +define('_MD_USER_LANG_TYPEPASSTWICE', "(type a new password twice to change it)"); define('_MD_USER_LANG_UID', "UID"); +define('_MD_USER_LANG_UMODE', "Comments Display Mode"); define('_MD_USER_LANG_UNAME', "User name"); +define('_MD_USER_LANG_UORDER', "Comments Sort Order"); +define('_MD_USER_LANG_UPLOADMYAVATAR', "Upload Avatar"); define('_MD_USER_LANG_URL', "Website"); +define('_MD_USER_LANG_USECOOKIE', "Store my user name in a cookie for 1 year"); +define('_MD_USER_LANG_USER_AIM', "AIM"); +define('_MD_USER_LANG_USER_AVATAR', "Avatar"); +define('_MD_USER_LANG_USER_FROM', "Location"); +define('_MD_USER_LANG_USER_ICQ', "ICQ"); +define('_MD_USER_LANG_USER_INTREST', "Interest"); +define('_MD_USER_LANG_USER_MAILOK', "Receive occasional email notices "); +define('_MD_USER_LANG_USER_MSNM', "MSNM"); +define('_MD_USER_LANG_USER_OCC', "Occupation"); +define('_MD_USER_LANG_USER_REGDATE', "Member Since"); +define('_MD_USER_LANG_USER_SIG', "Signature"); +define('_MD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address"); +define('_MD_USER_LANG_USER_YIM', "YIM"); +define('_MD_USER_LANG_USERKEYFOR', "User activation key for %s"); +define('_MD_USER_LANG_USERNAME', "Username"); +define('_MD_USER_LANG_USERREG', "User Registration"); +define('_MD_USER_LANG_VERIFYPASS', "Verify Password"); +define('_MD_USER_LANG_WEBSITE', "Website"); define('_MD_USER_LANG_WHOSONLINE', "Who's Online"); +define('_MD_USER_LANG_YOURACCOUNT', "Your account at %s"); +define('_MD_USER_LANG_YOUREMAIL', "Your Email: "); +define('_MD_USER_MESSAGE_ACONTACT', "Selected account is already activated!"); +define('_MD_USER_MESSAGE_ACTKEYNOT', "Activation key is not correct!"); +define('_MD_USER_MESSAGE_ACTLOGIN', "Your account has been activated. Please login with the registered password."); +define('_MD_USER_MESSAGE_ACTVMAILNG', "Failed sending notification mail to %s"); +define('_MD_USER_MESSAGE_ACTVMAILOK', "Notification mail to %s sent."); +define('_MD_USER_MESSAGE_IAGREE', "I agree to the above"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password"); -define('_US_ACONTACT', "Selected account is already activated!"); -define('_US_ACTKEYNOT', "Activation key is not correct!"); -define('_US_ACTLOGIN', "Your account has been activated. Please login with the registered password."); -define('_US_ACTVMAILNG', "Failed sending notification mail to %s"); -define('_US_ACTVMAILOK', "Notification mail to %s sent."); -define('_US_ADMINNO', "User in the webmasters group cannot be removed."); -define('_US_AIM', "AIM"); -define('_US_ALLABOUT', "All about %s"); -define('_US_ALLOWVIEWEMAIL', "Allow other users to view my email address"); -define('_US_AVATAR', "Avatar"); -define('_US_BASICINFO', "Basic information"); -define('_US_BEENDELED', "Your account has been deleted."); -define('_US_CDISPLAYMODE', "Comments Display Mode"); -define('_US_CHOOSEAVT', "Choose avatar from the available list"); -define('_US_CONFMAIL', "Confirmation Mail for %s has been sent."); -define('_US_CSORTORDER', "Comments Sort Order"); -define('_US_DELACCOUNT', "Delete Account"); -define('_US_DISCLAIMER', "Disclaimer"); -define('_US_EDITPROFILE', "Edit Profile"); -define('_US_EMAIL', "Email"); -define('_US_EMAILNOSPACES', "ERROR: Email addresses do not contain spaces."); -define('_US_EMAILTAKEN', "ERROR: Email address already registered."); -define('_US_ENTERPWD', "ERROR: You must provide a password."); -define('_US_EXTRAINFO', "Extra Info"); -define('_US_FINISH', "Finish"); -define('_US_GROUPS', "User\'s Groups"); -define('_US_HASJUSTREG', "%s has just registered!"); -define('_US_IAGREE', "I agree to the above"); -define('_US_ICQ', "ICQ"); -define('_US_INBOX', "Inbox"); -define('_US_INCORRECTLOGIN', "Invalid Login!"); -define('_US_INTEREST', "Interest"); -define('_US_INVALIDMAIL', "ERROR: Invalid email address"); -define('_US_INVALIDNICKNAME', "ERROR: Invalid Username"); -define('_US_LASTLOGIN', "Last Login"); -define('_US_LOCATION', "Location"); -define('_US_LOGGEDOUT', "You are now logged out"); -define('_US_LOGGINGU', "Thank you for logging in, %s."); -define('_US_LOGOUT', "Logout"); -define('_US_LOSTPASSWORD', "Lost your Password?"); -define('_US_MAILOK', "Receive occasional email notices "); -define('_US_MAILPWDNG', "mail_password: could not update user entry. Contact the Administrator"); -define('_US_MAXIMGSZ', "Max Image Size (Bytes)"); -define('_US_MAXPIXEL', "Max Pixels"); -define('_US_MEMBERSINCE', "Member Since"); -define('_US_MOREABOUT', "More About Me"); -define('_US_MSNM', "MSNM"); -define('_US_MYAVATAR', "My Avatar"); -define('_US_MYINFO', "My Info"); -define('_US_NAMERESERVED', "ERROR: Username is reserved."); -define('_US_NEWPWDREQ', "New Password Request at %s"); -define('_US_NEWUSERREGAT', "New user registration at %s"); -define('_US_NICKNAME', "Username"); -define('_US_NICKNAMENOSPACES', "There cannot be any spaces in the Username."); -define('_US_NICKNAMETAKEN', "ERROR: Username has been taken."); -define('_US_NICKNAMETOOLONG', "Username is too long. It must be %s or less characters."); -define('_US_NICKNAMETOOSHORT', "Username is too short. It must be %s or more characters."); -define('_US_NO', "No"); -define('_US_NOACTTPADM', "The selected user has been deactivated or has not been activated yet."); -define('_US_NOEDITRIGHT', "You do not have permisson to edit this account."); -define('_US_NOPERMISS', "Sorry, you do not have the permission to perform this action!"); -define('_US_NOPROBLEM', "No problem. Simply enter the e-mail address we have on file for your account."); -define('_US_NOREGISTER', "Sorry, we are currently closed for new user registrations."); -define('_US_NOTREGISTERED', "Not registered?"); -define('_US_OCCUPATION', "Occupation"); -define('_US_OLDDELETED', "Your old avatar will be deleted!"); -define('_US_PASSNOTSAME', "Both passwords are different. They must be identical."); -define('_US_PASSWORD', "Password"); -define('_US_PM', "PM"); -define('_US_POSTS', "Comments/Posts"); -define('_US_PRESSLOGIN', "Press the button below to login"); -define('_US_PROFILE', "Profile"); -define('_US_PROFUPDATED', "Your Profile Updated!"); -define('_US_PWDMAILED', "Password for %s has been sent."); -define('_US_PWDTOOSHORT', "Sorry, your password must be at least "); -define('_US_RANK', "Rank"); -define('_US_REALNAME', "Real Name"); -define('_US_REGISTERNG', "Could not register new user."); -define('_US_REMOVEINFO', "This will remove all your information from our database."); -define('_US_SAVECHANGES', "Save Changes"); -define('_US_SELECTNG', "No User Selected! Please go back and try again."); -define('_US_SELFILE', "Select a file"); -define('_US_SENDPASSWORD', "Send Password"); -define('_US_SHOWALL', "Show All"); -define('_US_SHOWSIG', "Always attach my signature"); -define('_US_SIGNATURE', "Signature"); -define('_US_SORRYNOTFOUND', "Sorry, no corresponding user info was found."); -define('_US_STATISTICS', "Statistics"); -define('_US_SUBMIT', "Submit"); -define('_US_SURETODEL', "Are you sure you want to delete your account?"); -define('_US_THANKYOUFORVISIT', "Thank you for your visit to our site!"); -define('_US_TIMEZONE', "TimeZone"); -define('_US_TYPEPASSTWICE', "(type a new password twice to change it)"); -define('_US_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered."); -define('_US_UPLOADMYAVATAR', "Upload Avatar"); -define('_US_USECOOKIE', "Store my user name in a cookie for 1 year"); -define('_US_USERKEYFOR', "User activation key for %s"); -define('_US_USERNAME', "Username"); -define('_US_USERREG', "User Registration"); -define('_US_VERIFYPASS', "Verify Password"); -define('_US_WEBSITE', "Website"); -define('_US_YIM', "YIM"); -define('_US_YOURACCOUNT', "Your account at %s"); -define('_US_YOUREMAIL', "Your Email: "); -define('_US_YOURREGISTERED', "You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the mail to activate your account. "); -define('_US_YOURREGISTERED2', "You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient."); -define('_US_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation."); +define('_MD_USER_MESSAGE_YOURREGISTERED', "You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the mail to activate your account. "); +define('_MD_USER_MESSAGE_YOURREGISTERED2', "You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient."); +define('_MD_USER_MESSAGE_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation."); ?> From minahito @ users.sourceforge.jp Fri Aug 18 14:35:30 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:30 +0900 Subject: [xoops-cvslog 4187] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060818053530.EBCEF2AC1B8@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php diff -u xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.4 xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.5 --- xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.4 Wed Jul 19 20:00:51 2006 +++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ mMailer->setSubject(sprintf(_US_NEWPWDREQ, $xoopsConfig['sitename'])); + $this->mMailer->setSubject(sprintf(_MD_USER_LANG_NEWPWDREQ, $xoopsConfig['sitename'])); } /** @@ -110,7 +110,7 @@ function setSubject($user, $xoopsConfig) { - $this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL)); + $this->mMailer->setSubject(sprintf(_MD_USER_LANG_NEWPWDREQ,XOOPS_URL)); } function setBody($user, $xoopsConfig, $extraVars) Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.7 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8 --- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.7 Wed Jul 19 20:01:51 2006 +++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php Fri Aug 18 14:35:30 2006 @@ -1,7 +1,7 @@ mMailer->setSubject(@sprintf(_US_USERKEYFOR, $user->getShow('uname'))); + $this->mMailer->setSubject(@sprintf(_MD_USER_LANG_USERKEYFOR, $user->getShow('uname'))); } function setBody($user,$xoopsConfig) @@ -136,7 +136,7 @@ function setSubject($user, $xoopsConfig) { - $this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname'))); + $this->mMailer->setSubject(@sprintf(_MD_USER_LANG_USERKEYFOR,$user->getVar('uname'))); } function setBody($user, $xoopsConfig) @@ -168,12 +168,12 @@ function setSubject($user, $xoopsConfig) { - $this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT, $xoopsConfig['sitename'])); + $this->mMailer->setSubject(@sprintf(_MD_USER_LANG_NEWUSERREGAT, $xoopsConfig['sitename'])); } function setBody($user, $xoopsConfig) { - $this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname'))); + $this->mMailer->setBody(@sprintf(_MD_USER_LANG_HASJUSTREG, $user->getVar('uname'))); } } @@ -193,7 +193,7 @@ function setSubject($user, $xoopsConfig) { - $this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename'])); + $this->mMailer->setSubject(@sprintf(_MD_USER_LANG_YOURACCOUNT, $xoopsConfig['sitename'])); } } From minahito @ users.sourceforge.jp Fri Aug 18 14:35:31 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:31 +0900 Subject: [xoops-cvslog 4188] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060818053531.1D8352AC056@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.30 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.31 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.30 Thu Aug 17 19:21:05 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Fri Aug 18 14:35:30 2006 @@ -155,6 +155,6 @@ define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます"); define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース(真っ白になるなど)があります。
    その場合はブラウザでリロード(再読込)操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。"); define('_AD_USER_TIPS_RECOUNT_POSTS', "もし投稿数が間違っているようであれば、再計算することができます。"); -define('_MD_USER_LANG_UNAME', "ユーザー名"); +define('_AD_USER_LANG_UNAME', "ユーザー名"); ?> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.18 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.19 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.18 Thu Aug 17 19:21:05 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Fri Aug 18 14:35:30 2006 @@ -6,145 +6,134 @@ define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています"); define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0}は不正なメールアドレスです"); +define('_MD_USER_ERROR_INCORRECTLOGIN', "ログイン情報が間違っています。"); define('_MD_USER_ERROR_INJURY', "{0}の入力値が不正です"); define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以内で入力して下さい"); define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい"); +define('_MD_USER_ERROR_PASSNOTSAME', "パスワードが正しくありません。同じパスワードを二度入力してください。"); define('_MD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません"); -define('_MD_USER_ERROR_PASSWORD_MAXLENGTH', "パスワードは半角{0}文字以下にして下さい"); -define('_MD_USER_ERROR_PASSWORD_MINLENGTH', "パスワードは半角{0}文字以上にして下さい"); define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい"); define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。"); define('_MD_USER_ERROR_TIMEZONE', "タイムゾーン"); +define('_MD_USER_ERROR_UNEEDAGREE', "申し訳ございませんが、登録するためには免責事項にご同意いただく必要があります。"); +define('_MD_USER_LANG_ALLABOUT', "%sさんの基本情報"); +define('_MD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する"); define('_MD_USER_LANG_AVATAR', "アバター"); define('_MD_USER_LANG_AVATAR_EDIT', "アバター編集"); -define('_MD_USER_LANG_AVATAR_HEIGHT', "高さ"); define('_MD_USER_LANG_AVATAR_ID', "ID"); define('_MD_USER_LANG_AVATAR_LIST', "使用可能アバター一覧"); define('_MD_USER_LANG_AVATAR_MAXFILESIZE', "最大ファイルサイズ"); -define('_MD_USER_LANG_AVATAR_NAME', "名前"); define('_MD_USER_LANG_AVATAR_WIDTH', "幅"); define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "幅 x 高さ"); +define('_MD_USER_LANG_BIO', "その他"); +define('_MD_USER_LANG_DELACCOUNT', "アカウントを削除する"); +define('_MD_USER_LANG_DISCLAIMER', "免責"); +define('_MD_USER_LANG_EDITPROFILE', "プロフィールの編集"); define('_MD_USER_LANG_EMAIL', "メールアドレス"); +define('_MD_USER_LANG_ENTERPWD', "パスワードを記入してください。"); +define('_MD_USER_LANG_FINISH', "送信"); define('_MD_USER_LANG_GROUPID', "グループID"); +define('_MD_USER_LANG_GROUPS', "所属グループ"); define('_MD_USER_LANG_GUEST', "ゲスト"); +define('_MD_USER_LANG_HASJUSTREG', "新規登録ユーザがありました! ユーザ名:%s"); +define('_MD_USER_LANG_INBOX', "受信箱"); +define('_MD_USER_LANG_INVALIDMAIL', "不正なメールアドレスです。"); +define('_MD_USER_LANG_INVALIDNICKNAME', "不正なユーザ名です。"); +define('_MD_USER_LANG_LAST_LOGIN', "最終ログイン日時"); +define('_MD_USER_LANG_LEVEL', "レベル"); +define('_MD_USER_LANG_LOGGEDOUT', "ログアウトしました。"); +define('_MD_USER_LANG_LOGGINGU', "%sさん、ようこそ。ログイン処理中です。"); +define('_MD_USER_LANG_LOGOUT', "ログアウト"); +define('_MD_USER_LANG_LOSTPASSWORD', "パスワードを紛失されましたか?"); +define('_MD_USER_LANG_MAILPWDNG', "mail_password: ユーザ情報の更新に失敗しました。お手数ですが、サイト管理者までお問合せください。"); +define('_MD_USER_LANG_MAXIMGSZ', "最大ファイルサイズ"); +define('_MD_USER_LANG_MAXPIXEL', "最大ピクセル数"); +define('_MD_USER_LANG_MOREABOUT', "個人情報詳細"); +define('_MD_USER_LANG_MYAVATAR', "アップロード済みアバター"); +define('_MD_USER_LANG_MYINFO', "個人情報"); +define('_MD_USER_LANG_NAME', "本名"); +define('_MD_USER_LANG_NAMERESERVED', "このユーザ名は使用できません。"); +define('_MD_USER_LANG_NEWPWDREQ', "新規パスワードのリクエスト@%s"); +define('_MD_USER_LANG_NEWUSERREGAT', "新規登録ユーザ@%s"); +define('_MD_USER_LANG_NICKNAME', "ユーザ名"); +define('_MD_USER_LANG_NICKNAMENOSPACES', "ユーザ名に空白を含めないでください。"); +define('_MD_USER_LANG_NICKNAMETAKEN', "このユーザ名は既に使用されています。"); +define('_MD_USER_LANG_NICKNAMETOOLONG', "ユーザ名が長すぎます。半角 %s 文字以内に収めてください。"); +define('_MD_USER_LANG_NICKNAMETOOSHORT', "ユーザ名が短すぎます。半角 %s 文字以上にしてください。"); +define('_MD_USER_LANG_NO', "いいえ"); +define('_MD_USER_LANG_NOACTTPADM', "選択されたユーザはまだ存在しないか、承認が完了していません。"); +define('_MD_USER_LANG_NOEDITRIGHT', "このユーザ情報を変更する権限がありません。"); +define('_MD_USER_LANG_NOPERMISS', "このユーザ情報を変更することはできません。"); +define('_MD_USER_LANG_NOPROBLEM', "ご心配なく。まずはあなたが登録に使用したメールアドレスを入力し、ボタンをクリックしてください。 パスワード取得用のリンクが記載されたメールがあなたの登録メールアドレス宛に送られます。"); +define('_MD_USER_LANG_NOREGISTER', "申し訳ございませんが、現在このサイトでは新規ユーザの登録受付を行っておりません。"); define('_MD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法"); define('_MD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング"); +define('_MD_USER_LANG_NOTREGISTERED', "今すぐ登録?"); +define('_MD_USER_LANG_OLDDELETED', "古いアバター画像は上書きされます。"); define('_MD_USER_LANG_PASS', "パスワード"); +define('_MD_USER_LANG_PASSWORD', "パスワード"); +define('_MD_USER_LANG_PM', "PM"); +define('_MD_USER_LANG_POSTS', "投稿数"); +define('_MD_USER_LANG_PRESSLOGIN', "下記ボタンをクリックしてログインしてください。"); +define('_MD_USER_LANG_PROFILE', "プロフィール"); +define('_MD_USER_LANG_PROFUPDATED', "プロフィールを更新しました。"); +define('_MD_USER_LANG_PWDMAILED', "%sさん宛にパスワードを送信しました。"); +define('_MD_USER_LANG_PWDTOOSHORT', "パスワードは半角"); +define('_MD_USER_LANG_RANK', "ランク"); define('_MD_USER_LANG_RANK_ID', "ID"); +define('_MD_USER_LANG_REGISTERNG', "登録できませんでした"); +define('_MD_USER_LANG_REMOVEINFO', "アカウントを削除した場合、全てのユーザ情報が失われます。"); +define('_MD_USER_LANG_SAVECHANGES', "変更を保存"); define('_MD_USER_LANG_SELECT', "選択"); +define('_MD_USER_LANG_SELECTNG', "ユーザが選択されていません"); +define('_MD_USER_LANG_SELFILE', "ファイル選択"); +define('_MD_USER_LANG_SENDPASSWORD', "送信"); +define('_MD_USER_LANG_SHOWALL', "すべて表示"); +define('_MD_USER_LANG_SORRYNOTFOUND', "ユーザ情報が見つかりませんでした。"); +define('_MD_USER_LANG_STATISTICS', "統計情報"); define('_MD_USER_LANG_SUBMIT', "送信"); +define('_MD_USER_LANG_SURETODEL', "ユーザアカウントを本当に削除しても良いですか?"); +define('_MD_USER_LANG_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); +define('_MD_USER_LANG_THEME', "テーマ"); +define('_MD_USER_LANG_TIMEZONE', "タイムゾーン"); define('_MD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン"); +define('_MD_USER_LANG_TYPEPASSTWICE', "(パスワードを変更する場合のみ記入してください)"); define('_MD_USER_LANG_UID', "UID"); +define('_MD_USER_LANG_UMODE', "コメント表示モード"); define('_MD_USER_LANG_UNAME', "ユーザー名"); +define('_MD_USER_LANG_UORDER', "コメントの並び順"); +define('_MD_USER_LANG_UPLOADMYAVATAR', "アバターをアップロードする"); define('_MD_USER_LANG_URL', "ホームページ"); +define('_MD_USER_LANG_USECOOKIE', "ユーザ名を1年間クッキーに保存する"); +define('_MD_USER_LANG_USER_AIM', "AIM"); +define('_MD_USER_LANG_USER_AVATAR', "アバター"); +define('_MD_USER_LANG_USER_FROM', "居住地"); +define('_MD_USER_LANG_USER_ICQ', "ICQ"); +define('_MD_USER_LANG_USER_INTREST', "趣味"); +define('_MD_USER_LANG_USER_MAILOK', "当サイトの新着情報などをメールで受け取る"); +define('_MD_USER_LANG_USER_MSNM', "MSNM"); +define('_MD_USER_LANG_USER_OCC', "職業"); +define('_MD_USER_LANG_USER_REGDATE', "登録日"); +define('_MD_USER_LANG_USER_SIG', "署名"); +define('_MD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する"); +define('_MD_USER_LANG_USER_YIM', "YIM"); +define('_MD_USER_LANG_USERKEYFOR', "%sさんの承認キーです"); +define('_MD_USER_LANG_USERNAME', "ユーザ名"); +define('_MD_USER_LANG_USERREG', "ユーザ登録"); +define('_MD_USER_LANG_VERIFYPASS', "パスワード確認"); +define('_MD_USER_LANG_WEBSITE', "ホームページ"); define('_MD_USER_LANG_WHOSONLINE', "オンライン状況"); +define('_MD_USER_LANG_YOURACCOUNT', "%sでのユーザアカウント"); +define('_MD_USER_LANG_YOUREMAIL', "登録メールアドレス:"); +define('_MD_USER_MESSAGE_ACONTACT', "選択されたアカウントは既に承認が完了しています。"); +define('_MD_USER_MESSAGE_ACTKEYNOT', "承認キーが間違っています。"); +define('_MD_USER_MESSAGE_ACTLOGIN', "アカウントを承認しました。登録の際に記入したパスワードを使用してログインしてください。"); +define('_MD_USER_MESSAGE_ACTVMAILNG', "%sさんへのメール送信に失敗しました。"); +define('_MD_USER_MESSAGE_ACTVMAILOK', "%sさんへメールを送信しました。"); +define('_MD_USER_MESSAGE_IAGREE', "私は上記事項に同意します。"); define('_MD_USER_MESSAGE_SEND_PASSWORD', "メールを送信しました"); -define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。"); -define('_US_ACTKEYNOT', "承認キーが間違っています。"); -define('_US_ACTLOGIN', "アカウントを承認しました。登録の際に記入したパスワードを使用してログインしてください。"); -define('_US_ACTVMAILNG', "%sさんへのメール送信に失敗しました。"); -define('_US_ACTVMAILOK', "%sさんへメールを送信しました。"); -define('_US_ADMINNO', "管理者グループに属するユーザは削除できません"); -define('_US_AIM', "AIM"); -define('_US_ALLABOUT', "%sさんの基本情報"); -define('_US_ALLOWVIEWEMAIL', "このメールアドレスを公開する"); -define('_US_AVATAR', "アバター"); -define('_US_BASICINFO', "基本情報"); -define('_US_BEENDELED', "アカウントを削除しました。"); -define('_US_CDISPLAYMODE', "コメント表示モード"); -define('_US_CHOOSEAVT', "アバターを一覧から選択してください。"); -define('_US_CONFMAIL', "パスワード取得用リンクが記載されたメールを%sさん宛に送信しました。"); -define('_US_CSORTORDER', "コメントの並び順"); -define('_US_DELACCOUNT', "アカウントを削除する"); -define('_US_DISCLAIMER', "免責"); -define('_US_EDITPROFILE', "プロフィールの編集"); -define('_US_EMAIL', "メールアドレス"); -define('_US_EMAILNOSPACES', "メールアドレスに空白を含めないでください。"); -define('_US_EMAILTAKEN', "このメールアドレスは既に使用されています。"); -define('_US_ENTERPWD', "パスワードを記入してください。"); -define('_US_EXTRAINFO', "その他"); -define('_US_FINISH', "送信"); -define('_US_GROUPS', "所属グループ"); -define('_US_HASJUSTREG', "新規登録ユーザがありました! ユーザ名:%s"); -define('_US_IAGREE', "私は上記事項に同意します。"); -define('_US_ICQ', "ICQ"); -define('_US_INBOX', "受信箱"); -define('_US_INCORRECTLOGIN', "ログイン情報が間違っています。"); -define('_US_INTEREST', "趣味"); -define('_US_INVALIDMAIL', "不正なメールアドレスです。"); -define('_US_INVALIDNICKNAME', "不正なユーザ名です。"); -define('_US_LASTLOGIN', "最終ログイン日時"); -define('_US_LOCATION', "居住地"); -define('_US_LOGGEDOUT', "ログアウトしました。"); -define('_US_LOGGINGU', "%sさん、ようこそ。ログイン処理中です。"); -define('_US_LOGOUT', "ログアウト"); -define('_US_LOSTPASSWORD', "パスワードを紛失されましたか?"); -define('_US_MAILOK', "当サイトの新着情報などを"); -define('_US_MAILPWDNG', "mail_password: ユーザ情報の更新に失敗しました。お手数ですが、サイト管理者までお問合せください。"); -define('_US_MAXIMGSZ', "最大ファイルサイズ"); -define('_US_MAXPIXEL', "最大ピクセル数"); -define('_US_MEMBERSINCE', "登録日"); -define('_US_MOREABOUT', "個人情報詳細"); -define('_US_MSNM', "MSNM"); -define('_US_MYAVATAR', "アップロード済みアバター"); -define('_US_MYINFO', "個人情報"); -define('_US_NAMERESERVED', "このユーザ名は使用できません。"); -define('_US_NEWPWDREQ', "新規パスワードのリクエスト@%s"); -define('_US_NEWUSERREGAT', "新規登録ユーザ@%s"); -define('_US_NICKNAME', "ユーザ名"); -define('_US_NICKNAMENOSPACES', "ユーザ名に空白を含めないでください。"); -define('_US_NICKNAMETAKEN', "このユーザ名は既に使用されています。"); -define('_US_NICKNAMETOOLONG', "ユーザ名が長すぎます。半角 %s 文字以内に収めてください。"); -define('_US_NICKNAMETOOSHORT', "ユーザ名が短すぎます。半角 %s 文字以上にしてください。"); -define('_US_NO', "いいえ"); -define('_US_NOACTTPADM', "選択されたユーザはまだ存在しないか、承認が完了していません。"); -define('_US_NOEDITRIGHT', "このユーザ情報を変更する権限がありません。"); -define('_US_NOPERMISS', "このユーザ情報を変更することはできません。"); -define('_US_NOPROBLEM', "ご心配なく。まずはあなたが登録に使用したメールアドレスを入力し、ボタンをクリックしてください。 パスワード取得用のリンクが記載されたメールがあなたの登録メールアドレス宛に送られます。"); -define('_US_NOREGISTER', "申し訳ございませんが、現在このサイトでは新規ユーザの登録受付を行っておりません。"); -define('_US_NOTREGISTERED', "今すぐ登録?"); -define('_US_OCCUPATION', "職業"); -define('_US_OLDDELETED', "古いアバター画像は上書きされます。"); -define('_US_PASSNOTSAME', "パスワードが正しくありません。同じパスワードを二度入力してください。"); -define('_US_PASSWORD', "パスワード"); -define('_US_PM', "PM"); -define('_US_POSTS', "投稿数"); -define('_US_PRESSLOGIN', "下記ボタンをクリックしてログインしてください。"); -define('_US_PROFILE', "プロフィール"); -define('_US_PROFUPDATED', "プロフィールを更新しました。"); -define('_US_PWDMAILED', "%sさん宛にパスワードを送信しました。"); -define('_US_PWDTOOSHORT', "パスワードは半角"); -define('_US_RANK', "ランク"); -define('_US_REALNAME', "本名"); -define('_US_REGISTERNG', "登録できませんでした"); -define('_US_REMOVEINFO', "アカウントを削除した場合、全てのユーザ情報が失われます。"); -define('_US_SAVECHANGES', "変更を保存"); -define('_US_SELECTNG', "ユーザが選択されていません"); -define('_US_SELFILE', "ファイル選択"); -define('_US_SENDPASSWORD', "送信"); -define('_US_SHOWALL', "すべて表示"); -define('_US_SHOWSIG', "投稿に署名を必ず追加する"); -define('_US_SIGNATURE', "署名"); -define('_US_SORRYNOTFOUND', "ユーザ情報が見つかりませんでした。"); -define('_US_STATISTICS', "統計情報"); -define('_US_SUBMIT', "送信"); -define('_US_SURETODEL', "ユーザアカウントを本当に削除しても良いですか?"); -define('_US_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。"); -define('_US_TIMEZONE', "タイムゾーン"); -define('_US_TYPEPASSTWICE', "(パスワードを変更する場合のみ記入してください)"); -define('_US_UNEEDAGREE', "申し訳ございませんが、登録するためには免責事項にご同意いただく必要があります。"); -define('_US_UPLOADMYAVATAR', "アバターをアップロードする"); -define('_US_USECOOKIE', "ユーザ名を1年間クッキーに保存する"); -define('_US_USERKEYFOR', "%sさんの承認キーです"); -define('_US_USERNAME', "ユーザ名"); -define('_US_USERREG', "ユーザ登録"); -define('_US_VERIFYPASS', "パスワード確認"); -define('_US_WEBSITE', "ホームページ"); -define('_US_YIM', "YIM"); -define('_US_YOURACCOUNT', "%sでのユーザアカウント"); -define('_US_YOUREMAIL', "登録メールアドレス:"); -define('_US_YOURREGISTERED', "登録が完了しました。記載されたメールを登録メールアドレス宛に承認キーを送信しました。メールの指示に従い、承認を完了してください。"); -define('_US_YOURREGISTERED2', "登録が完了しました。サイト管理者がアカウントを承認するまでお待ちください。承認完了時にはメールにてお知らせします。"); -define('_US_YOURREGMAILNG', "登録が完了しました。しかし、サーバ内部エラーにより承認キーが記載されたメールを送信することができませんでした。大変申し訳ありませんが、サイト管理者までお問い合わせください。"); +define('_MD_USER_MESSAGE_YOURREGISTERED', "登録が完了しました。記載されたメールを登録メールアドレス宛に承認キーを送信しました。メールの指示に従い、承認を完了してください。"); +define('_MD_USER_MESSAGE_YOURREGISTERED2', "登録が完了しました。サイト管理者がアカウントを承認するまでお待ちください。承認完了時にはメールにてお知らせします。"); +define('_MD_USER_MESSAGE_YOURREGMAILNG', "登録が完了しました。しかし、サーバ内部エラーにより承認キーが記載されたメールを送信することができませんでした。大変申し訳ありませんが、サイト管理者までお問い合わせください。"); ?> From minahito @ users.sourceforge.jp Fri Aug 18 14:35:31 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 14:35:31 +0900 Subject: [xoops-cvslog 4189] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060818053531.40DE92AC1B9@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.4 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.5 --- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.4 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_view.html Fri Aug 18 14:35:31 2006 @@ -22,7 +22,7 @@
    <{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> <{$object->getShow('name')}>
    <{$smarty.const._AD_USER_LANG_USER_AVATAR}><{$smarty.const._MD_USER_LANG_USER_AVATAR}> <{if $object->get('user_avatar') != "blank.gif" }> Avatar @@ -50,55 +50,55 @@
    <{$smarty.const._AD_USER_LANG_USER_REGDATE}><{$smarty.const._MD_USER_LANG_USER_REGDATE}> <{$object->get('user_regdate')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_USER_LANG_USER_ICQ}><{$smarty.const._MD_USER_LANG_USER_ICQ}> <{$object->getShow('user_icq')}>
    <{$smarty.const._AD_USER_LANG_USER_FROM}><{$smarty.const._MD_USER_LANG_USER_FROM}> <{$object->getShow('user_from')}>
    <{$smarty.const._AD_USER_LANG_USER_SIG}><{$smarty.const._MD_USER_LANG_USER_SIG}> <{$object->getShow('user_sig')}>
    <{$smarty.const._AD_USER_LANG_USER_VIEWEMAIL}><{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}> <{$object->getShow('user_viewemail')}>
    <{$smarty.const._AD_USER_LANG_USER_AIM}><{$smarty.const._MD_USER_LANG_USER_AIM}> <{$object->getShow('user_aim')}>
    <{$smarty.const._AD_USER_LANG_USER_YIM}><{$smarty.const._MD_USER_LANG_USER_YIM}> <{$object->getShow('user_yim')}>
    <{$smarty.const._AD_USER_LANG_USER_MSNM}><{$smarty.const._MD_USER_LANG_USER_MSNM}> <{$object->getShow('user_msnm')}>
    <{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_POSTS}> <{$object->getShow('posts')}>
    @@ -109,13 +109,13 @@
    <{$smarty.const._AD_USER_LANG_ATTACHSIG}><{$smarty.const._MD_USER_LANG_ATTACHSIG}> <{$object->getShow('attachsig')}>
    <{$smarty.const._AD_USER_LANG_RANK}><{$smarty.const._MD_USER_LANG_RANK}> <{if $rank}> <{$rank->getShow('rank_title')}>
    @@ -124,13 +124,13 @@
    <{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_LEVEL}> <{$object->getShow('level')}>
    <{$smarty.const._AD_USER_LANG_THEME}><{$smarty.const._MD_USER_LANG_THEME}> <{$object->getShow('theme')}>
    <{$smarty.const._AD_USER_LANG_LAST_LOGIN}><{$smarty.const._MD_USER_LANG_LAST_LOGIN}> <{$object->get('last_login')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_USER_LANG_UMODE}><{$smarty.const._MD_USER_LANG_UMODE}> <{$umode|escape}>
    <{$smarty.const._AD_USER_LANG_UORDER}><{$smarty.const._MD_USER_LANG_UORDER}> <{$uorder|escape}>
    <{$smarty.const._AD_USER_LANG_USER_OCC}><{$smarty.const._MD_USER_LANG_USER_OCC}> <{$object->getShow('user_occ')}>
    <{$smarty.const._AD_USER_LANG_BIO}><{$smarty.const._MD_USER_LANG_BIO}> <{$object->getShow('bio')}>
    <{$smarty.const._AD_USER_LANG_USER_INTREST}><{$smarty.const._MD_USER_LANG_USER_INTREST}> <{$object->getShow('user_intrest')}>
    <{$smarty.const._AD_USER_LANG_USER_MAILOK}><{$smarty.const._MD_USER_LANG_USER_MAILOK}> <{$object->getShow('user_mailok')}> <{$smarty.const._MD_USER_LANG_RANK_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_TITLE}>
    +
    <{$smarty.const._MD_USER_LANG_RANK_TITLE}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_MIN}>
    +
    <{$smarty.const._MD_USER_LANG_RANK_MIN}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_MAX}>
    +
    <{$smarty.const._MD_USER_LANG_RANK_MAX}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_SPECIAL}>
    +
    <{$smarty.const._MD_USER_LANG_RANK_SPECIAL}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_RANK_IMAGE}><{$smarty.const._MD_USER_LANG_RANK_IMAGE}> <{$smarty.const._AD_USER_LANG_CONTROL}>
      <{$smarty.const._MD_USER_LANG_UID}> <{$smarty.const._MD_USER_LANG_UNAME}><{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}><{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_LEVEL}> <{$smarty.const._AD_USER_LANG_CONTROL}>
      <{$smarty.const._MD_USER_LANG_UID}> <{$smarty.const._MD_USER_LANG_UNAME}><{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}><{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_LEVEL}> <{$smarty.const._AD_USER_LANG_CONTROL}>
    <{$smarty.const._MD_USER_LANG_UNAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_NAME}>
    +
    <{$smarty.const._MD_USER_LANG_NAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_REGDATE}>
    @@ -27,10 +27,10 @@
    <{$smarty.const._AD_USER_LANG_LASTLOGIN}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_POSTS}>
    +
    <{$smarty.const._MD_USER_LANG_POSTS}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_LEVEL}>
    +
    <{$smarty.const._MD_USER_LANG_LEVEL}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_CONTROL}>  <{$smarty.const._MD_USER_LANG_UID}> <{$smarty.const._MD_USER_LANG_UNAME}><{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> <{$smarty.const._AD_USER_LANG_REGDATE}> <{$smarty.const._AD_USER_LANG_LASTLOGIN}><{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_LEVEL}> <{$smarty.const._AD_USER_LANG_CONTROL}>
    <{$smarty.const._MD_USER_LANG_UNAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_NAME}>
    +
    <{$smarty.const._MD_USER_LANG_NAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_REGDATE}>
    @@ -29,10 +29,10 @@
    <{$smarty.const._AD_USER_LANG_LASTLOGIN}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_POSTS}>
    +
    <{$smarty.const._MD_USER_LANG_POSTS}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_LEVEL}>
    +
    <{$smarty.const._MD_USER_LANG_LEVEL}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_USER_LANG_CONTROL}>
    <{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> "> <{xoops_input type=text name=name value=$actionForm->get('name') size=30 maxlength=60}>
    <{$smarty.const._AD_USER_LANG_USER_ICQ}><{$smarty.const._MD_USER_LANG_USER_ICQ}> "> <{xoops_input type=text name=user_icq value=$actionForm->get('user_icq') size=15 maxlength=15}>
    <{$smarty.const._AD_USER_LANG_USER_AIM}><{$smarty.const._MD_USER_LANG_USER_AIM}> "> <{xoops_input type=text name=user_aim value=$actionForm->get('user_aim') size=18 maxlength=18}>
    <{$smarty.const._AD_USER_LANG_USER_YIM}><{$smarty.const._MD_USER_LANG_USER_YIM}> "> <{xoops_input type=text name=user_yim value=$actionForm->get('user_yim') size=25 maxlength=25}>
    <{$smarty.const._AD_USER_LANG_USER_MSNM}><{$smarty.const._MD_USER_LANG_USER_MSNM}> "> <{xoops_input type=text name=user_msnm value=$actionForm->get('user_msnm') size=25 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_FROM}><{$smarty.const._MD_USER_LANG_USER_FROM}> "> <{xoops_input type=text name=user_from value=$actionForm->get('user_from') size=50 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_OCC}><{$smarty.const._MD_USER_LANG_USER_OCC}> "> <{xoops_input type=text name=user_occ value=$actionForm->get('user_occ') size=50 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_INTREST}><{$smarty.const._MD_USER_LANG_USER_INTREST}> "> <{xoops_input type=text name=user_intrest value=$actionForm->get('user_intrest') size=50 maxlength=150}>
    <{$smarty.const._AD_USER_LANG_USER_SIG}><{$smarty.const._MD_USER_LANG_USER_SIG}> "> <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}>
    <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}> - <{$smarty.const._AD_USER_LANG_ATTACHSIG}> + <{$smarty.const._MD_USER_LANG_ATTACHSIG}>
    <{$smarty.const._AD_USER_LANG_UMODE}><{$smarty.const._MD_USER_LANG_UMODE}> "> <{html_options name=umode options=$umodeOptions selected=$actionForm->get('umode')}>
    <{$smarty.const._AD_USER_LANG_UORDER}><{$smarty.const._MD_USER_LANG_UORDER}> "> <{html_options name=uorder options=$uorderOptions selected=$actionForm->get('uorder')}>
    <{$smarty.const._AD_USER_LANG_BIO}><{$smarty.const._MD_USER_LANG_BIO}> "> <{xoops_textarea type=text rows=5 cols=50 name=bio value=$actionForm->get('bio')}>
    <{$smarty.const._AD_USER_LANG_RANK}><{$smarty.const._MD_USER_LANG_RANK}> ">
    <{$smarty.const._AD_USER_LANG_USER_MAILOK}><{$smarty.const._MD_USER_LANG_USER_MAILOK}> "> <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}> <{$smarty.const._YES}> @@ -193,13 +193,13 @@
    <{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_POSTS}> "> <{xoops_input type=text name=posts value=$actionForm->get('posts')}>
    <{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_LEVEL}> "> <{xoops_input type=text name=level value=$actionForm->get('level')}>
    <{if $actionForm->get('rank_id') }> - <{$smarty.const._AD_USER_LANG_RANK_EDIT}> + <{$smarty.const._MD_USER_LANG_RANK_EDIT}> <{else}> - <{$smarty.const._AD_USER_LANG_RANK_NEW}> + <{$smarty.const._MD_USER_LANG_RANK_NEW}> <{/if}>
    <{$smarty.const._AD_USER_LANG_RANK_TITLE}><{$smarty.const._MD_USER_LANG_RANK_TITLE}> "> <{xoops_input type=text name=rank_title value=$actionForm->get('rank_title')}>
    <{$smarty.const._AD_USER_LANG_RANK_MIN}><{$smarty.const._MD_USER_LANG_RANK_MIN}> "> <{xoops_input type=text name=rank_min value=$actionForm->get('rank_min')}>
    <{$smarty.const._AD_USER_LANG_RANK_MAX}><{$smarty.const._MD_USER_LANG_RANK_MAX}> "> <{xoops_input type=text name=rank_max value=$actionForm->get('rank_max')}>
    <{$smarty.const._AD_USER_LANG_RANK_SPECIAL}><{$smarty.const._MD_USER_LANG_RANK_SPECIAL}> "> <{xoops_input type=radio name=rank_special value=1 default=$actionForm->get('rank_special')}><{$smarty.const._YES}> <{xoops_input type=radio name=rank_special value=0 default=$actionForm->get('rank_special')}><{$smarty.const._NO}>
    <{$smarty.const._AD_USER_LANG_RANK_IMAGE}><{$smarty.const._MD_USER_LANG_RANK_IMAGE}> "> "><{$object->getShow('rank_id')}>
    <{$smarty.const._AD_USER_LANG_RANK_TITLE}><{$smarty.const._MD_USER_LANG_RANK_TITLE}> "><{$object->getShow('rank_title')}>
    <{$smarty.const._AD_USER_LANG_RANK_MIN}><{$smarty.const._MD_USER_LANG_RANK_MIN}> "><{$object->getShow('rank_min')}>
    <{$smarty.const._AD_USER_LANG_RANK_MAX}><{$smarty.const._MD_USER_LANG_RANK_MAX}> "><{$object->getShow('rank_max')}>
    <{$smarty.const._AD_USER_LANG_RANK_SPECIAL}><{$smarty.const._MD_USER_LANG_RANK_SPECIAL}> "><{$object->getShow('rank_special')}>
    <{$smarty.const._AD_USER_LANG_RANK_IMAGE}><{$smarty.const._MD_USER_LANG_RANK_IMAGE}> <{$object->getShow('rank_title')}>
    <{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> "> <{xoops_input type=text name=name value=$actionForm->get('name') size=30 maxlength=60}>
    <{$smarty.const._AD_USER_LANG_USER_ICQ}><{$smarty.const._MD_USER_LANG_USER_ICQ}> "> <{xoops_input type=text name=user_icq value=$actionForm->get('user_icq') size=15 maxlength=15}>
    <{$smarty.const._AD_USER_LANG_USER_AIM}><{$smarty.const._MD_USER_LANG_USER_AIM}> "> <{xoops_input type=text name=user_aim value=$actionForm->get('user_aim') size=18 maxlength=18}>
    <{$smarty.const._AD_USER_LANG_USER_YIM}><{$smarty.const._MD_USER_LANG_USER_YIM}> "> <{xoops_input type=text name=user_yim value=$actionForm->get('user_yim') size=25 maxlength=25}>
    <{$smarty.const._AD_USER_LANG_USER_MSNM}><{$smarty.const._MD_USER_LANG_USER_MSNM}> "> <{xoops_input type=text name=user_msnm value=$actionForm->get('user_msnm') size=25 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_FROM}><{$smarty.const._MD_USER_LANG_USER_FROM}> "> <{xoops_input type=text name=user_from value=$actionForm->get('user_from') size=50 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_OCC}><{$smarty.const._MD_USER_LANG_USER_OCC}> "> <{xoops_input type=text name=user_occ value=$actionForm->get('user_occ') size=50 maxlength=100}>
    <{$smarty.const._AD_USER_LANG_USER_INTREST}><{$smarty.const._MD_USER_LANG_USER_INTREST}> "> <{xoops_input type=text name=user_intrest value=$actionForm->get('user_intrest') size=50 maxlength=150}> "><{$object->getShow('uname')}>
    <{$smarty.const._AD_USER_LANG_NAME}><{$smarty.const._MD_USER_LANG_NAME}> "><{$object->getShow('name')}>
    "><{$object->get('last_login')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_USER_LANG_POSTS}><{$smarty.const._MD_USER_LANG_POSTS}> "><{$object->getShow('posts')}>
    <{$smarty.const._AD_USER_LANG_LEVEL}><{$smarty.const._MD_USER_LANG_LEVEL}> "><{$object->getShow('level')}>
    <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
    " cospan="2"> + <{$smarty.const._MD_USER_MESSAGE_OLDDELETED}> + +
    <{$smarty.const._MD_USER_LANG_AVATAR_WIDTH_HIGHT}> "> <{$avatarWidth}> x <{$avatarHeight}> (px) From minahito @ users.sourceforge.jp Fri Aug 18 18:07:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:07:09 +0900 Subject: [xoops-cvslog 4198] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060818090709.6DA942AC1BF@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_edituser.html diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.10 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.11 --- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.10 Fri Aug 18 14:35:29 2006 +++ xoops2jp/html/modules/user/templates/user_edituser.html Fri Aug 18 18:07:09 2006 @@ -66,7 +66,7 @@
    <{$smarty.const._MD_USER_LANG_YIM}><{$smarty.const._MD_USER_LANG_USER_YIM}> "> <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->get('user_yim')}>
    <{$smarty.const._MD_USER_LANG_USER_INTEREST}><{$smarty.const._MD_USER_LANG_USER_INTREST}> "> <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->get('user_intrest')}> <{$smarty.const._MD_USER_LANG_USER_SIG}> "> <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}>
    - <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._MD_USER_LANG_ATTACHESIG}> + <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._MD_USER_LANG_ATTACHSIG}>
    <{$smarty.const._MD_USER_LANG_USECOOKIE}>"> + <{xoops_input type=radio name=user_mailok value=1}><{$smarty.const._YES}> + <{xoops_input type=radio name=user_mailok value=0}><{$smarty.const._NO}> +
    <{$smarty.const._MD_USER_LANG_USER_MAILOK}> "> <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}><{$smarty.const._YES}> From minahito @ users.sourceforge.jp Fri Aug 18 18:07:19 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 18:07:19 +0900 Subject: [xoops-cvslog 4199] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060818090719.91CE32AC1B5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_userinfo.html diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.13 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.14 --- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.13 Fri Aug 18 14:35:29 2006 +++ xoops2jp/html/modules/user/templates/user_userinfo.html Fri Aug 18 18:07:19 2006 @@ -72,7 +72,7 @@ <{$thisUser->getShow('user_aim')}>
    <{$smarty.const._MD_USER_LANG_YIM}><{$smarty.const._MD_USER_LANG_USER_YIM}> <{$thisUser->getShow('user_yim')}>
    <{$thisUser->getShow('user_occ')}>
    <{$smarty.const._MD_USER_LANG_USER_INTEREST}><{$smarty.const._MD_USER_LANG_USER_INTREST}> <{$thisUser->getShow('user_intrest')}>
    <{$smarty.const._AD_BASE_LANG_CONTROL}>
    <{$obj->getShow('bid')}> +
    <{$obj->getShow('bid')}> <{if $obj->mModule}> - <{$obj->mModule->getShow('name')}> + <{$obj->mModule->getShow('name')}> <{else}> + <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}> <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}> <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}> <{elseif $obj->get('c_type') == "T"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}> <{/if}> + <{/if}> <{$obj->getShow('title')}><{strip}> + <{$obj->getShow('title')}> + <{strip}> <{if $obj->get('side') == 0}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>- +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    <{else}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>- +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    <{/if}> +
    -
    <{if $obj->get('side') == 3}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    <{else}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    <{/if}> <{if $obj->get('side') == 5}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    <{else}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    <{/if}> <{if $obj->get('side') == 4}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>- +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    <{else}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>- +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    <{/if}> +
    -
    <{if $obj->get('side') == 1}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    <{else}> - <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}> +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    <{/if}> - <{/strip}>
    - <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}> + <{/strip}> + + <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight') class=base_list_number}> + <{$obj->getShow('last_modified')|xoops_formattimestamp:l}> + <{$obj->getShow('last_modified')|xoops_formattimestamp:l}> <{if $obj->get('block_type') == 'C'}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{else}> @@ -115,7 +121,7 @@ <{/foreach}>
    - +
    From minahito @ users.sourceforge.jp Fri Aug 18 20:28:34 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 20:28:34 +0900 Subject: [xoops-cvslog 4212] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060818112834.D17EC2AC085@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/modinfo.php diff -u xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.17 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.18 --- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.17 Wed Aug 2 18:42:33 2006 +++ xoops2jp/html/modules/base/language/japanese/modinfo.php Fri Aug 18 20:28:34 2006 @@ -19,21 +19,9 @@ define('_MI_BASE_KEYWORD_BLOCKINSTALL', "ブロック 新規"); define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList"); define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード"); -define('_MI_BASE_KEYWORD_IMAGE_CREATE', "Image create"); -define('_MI_BASE_KEYWORD_IMAGE_LIST', "Image list"); -define('_MI_BASE_KEYWORD_IMAGECATEGORY_CREATE', "Imagecategory create"); -define('_MI_BASE_KEYWORD_IMAGECATEGORY_LIST', "Imagecategory list"); define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規"); define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール"); -define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create"); -define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list"); define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト"); -define('_MI_BASE_LANG_IMAGE_CREATE', "Image create"); -define('_MI_BASE_LANG_IMAGE_LIST', "Image list"); -define('_MI_BASE_LANG_IMAGECATEGORY_CREATE', "Imagecategory create"); -define('_MI_BASE_LANG_IMAGECATEGORY_LIST', "Imagecategory list"); -define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create"); -define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list"); define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ"); define('_MI_BASE_MENU_BLOCKINSTALL', "ブロックのインストール"); define('_MI_BASE_MENU_BLOCKLIST', "ブロックの管理"); Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.44 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.45 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.44 Fri Aug 11 20:01:45 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Fri Aug 18 20:28:34 2006 @@ -14,7 +14,7 @@ define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "{0}ブロックにおいて、モジュールとのリンクを設定できませんでした"); define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "アクセス権限を設定できませんでした"); define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "システム管理権限を設定できませんでした"); -define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); +define('_MD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除できませんでした"); define('_AD_BASE_ERROR_DROP_TABLE', "テーブル {0} をドロップできませんでした"); define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません"); @@ -24,20 +24,32 @@ define('_AD_BASE_ERROR_IMG_SIZE', "画像の最大サイズは {0} x {1} です"); define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "{0} モジュールのインストールに失敗しました"); define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です"); -define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい"); +define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい"); +define('_AD_BASE_ERROR_MIN', "{0}は{1}以上の数値を指定して下さい"); define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "指定されたモジュールが見つかりませんでした"); +define('_AD_BASE_ERROR_NO_HELP_FILE', "ヘルプファイルが見つかりませんでした"); define('_AD_BASE_ERROR_OBJECTEXIST', "{0}の値が不正です"); -define('_AD_BASE_ERROR_OPTIONS', "オプションの値が不正です"); define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください"); define('_AD_BASE_ERROR_READGROUPS', "最低1グループ以上に使用権限を与えてください"); -define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); -define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい"); +define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); +define('_AD_BASE_ERROR_SEARCH_REQUIRED', "キーワードを入力して下さい"); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "sql file not found"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました"); define('_AD_BASE_ERROR_UPLOADGROUPS', "最低1グループ以上にアップロード権限を与えてください"); +define('_AD_BASE_LANG_ACTIONSEARCH', "アクションサーチ"); +define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。
    管理メニューの位置を忘れたときに使いましょう (例)利用許諾文"); +define('_AD_BASE_LANG_ACTIVE', "アクティブ"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加"); +define('_AD_BASE_LANG_ADMIN_MENU', "管理画面情報"); +define('_AD_BASE_LANG_ADMINMENU_HAS_MAIN', "管理画面"); +define('_AD_BASE_LANG_ADMINMENU_INDEX', "管理画面ページ"); +define('_AD_BASE_LANG_ADMINMENU_MENU', "管理メニュー設定ファイル"); +define('_AD_BASE_LANG_ADMINMENU_NAME', "管理画面名"); +define('_AD_BASE_LANG_ADMINMENU_URL', "管理画面URL"); +define('_AD_BASE_LANG_AGREE', "同意する"); +define('_AD_BASE_LANG_ALL_MODULE', "すべてのモジュール"); define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール"); define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス"); define('_AD_BASE_LANG_AUTHOR', "作者"); @@ -45,34 +57,41 @@ define('_AD_BASE_LANG_BID', "BID"); define('_AD_BASE_LANG_BLOCK_EDIT', "ブロック編集"); define('_AD_BASE_LANG_BLOCK_INSTALL', "ブロックのインストール"); +define('_AD_BASE_LANG_BLOCK_KEY', "キー"); define('_AD_BASE_LANG_BLOCK_TYPE', "ブロックタイプ"); define('_AD_BASE_LANG_BLOCK_UNINSTALL', "ブロックのアンインストール"); +define('_AD_BASE_LANG_BLOCK_VAL', "値"); +define('_AD_BASE_LANG_BLOCKS_INFO', "ブロック情報"); define('_AD_BASE_LANG_C_TYPE', "タイプ"); define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "中央ブロック - 中央"); define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "中央ブロック - 左"); define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "中央ブロック - 右"); -define('_AD_BASE_LANG_CODE', "コード"); +define('_MD_BASE_LANG_CODE', "コード"); define('_AD_BASE_LANG_COM_CREATED', "作成日時"); -define('_AD_BASE_LANG_COM_EXPARAMS', "拡張パラメータ"); -define('_AD_BASE_LANG_COM_ICON', "アイコン"); -define('_AD_BASE_LANG_COM_ID', "ID"); -define('_AD_BASE_LANG_COM_IP', "IP"); -define('_AD_BASE_LANG_COM_ITEMID', "アイテムID"); -define('_AD_BASE_LANG_COM_MODID', "モジュールID"); +define('_MD_BASE_LANG_COM_EXPARAMS', "拡張パラメータ"); +define('_MD_BASE_LANG_COM_ICON', "アイコン"); +define('_MD_BASE_LANG_COM_ID', "ID"); +define('_MD_BASE_LANG_COM_IP', "IP"); +define('_MD_BASE_LANG_COM_ITEMID', "アイテムID"); +define('_MD_BASE_LANG_COM_MODID', "モジュールID"); define('_AD_BASE_LANG_COM_MODIFIED', "編集日時"); -define('_AD_BASE_LANG_COM_PID', "PID"); -define('_AD_BASE_LANG_COM_ROOTID', "Root ID"); +define('_MD_BASE_LANG_COM_PID', "PID"); +define('_MD_BASE_LANG_COM_ROOTID', "Root ID"); define('_AD_BASE_LANG_COM_SIG', "署名"); define('_AD_BASE_LANG_COM_STATUS', "ステータス"); -define('_AD_BASE_LANG_COM_TEXT', "コメント"); -define('_AD_BASE_LANG_COM_TITLE', "表題"); +define('_MD_BASE_LANG_COM_TEXT', "コメント"); +define('_MD_BASE_LANG_COM_TITLE', "表題"); define('_AD_BASE_LANG_COM_UID', "UID"); define('_AD_BASE_LANG_COMMENT_DELETE', "コメント削除"); define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集"); define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加"); +define('_AD_BASE_LANG_COMMENT_SVC', "コメント機能"); define('_AD_BASE_LANG_COMMENT_VIEW', "コメント閲覧"); define('_AD_BASE_LANG_CONFCAT_ID', "コンフィグカテゴリ ID"); define('_AD_BASE_LANG_CONFCAT_NAME', "コンフィグカテゴリ名"); +define('_AD_BASE_LANG_CONFIG_INFO', "一般設定情報"); +define('_AD_BASE_LANG_CONFIG_KEY', "キー"); +define('_AD_BASE_LANG_CONFIG_VAL', "値"); define('_AD_BASE_LANG_CONTENT', "コンテンツ"); define('_AD_BASE_LANG_CONTROL', "操作"); define('_AD_BASE_LANG_CREATE_NEW', "新規作成"); @@ -86,15 +105,18 @@ define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "カスタム(顔アイコン無効)"); define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "カスタムブロック削除"); define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "カスタムブロック編集"); +define('_AD_BASE_LANG_DEACTIVATE', "非アクティブ"); define('_AD_BASE_LANG_DIRNAME', "dirname"); define('_AD_BASE_LANG_DISPLAY', "表示"); -define('_AD_BASE_LANG_DOBR', "改行を自動挿入する"); -define('_AD_BASE_LANG_DOHTML', "HTMLタグを有効にする"); +define('_MD_BASE_LANG_DOBR', "改行を自動挿入する"); +define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする"); define('_AD_BASE_LANG_DOIMAGE', "[img]タグを有効にする"); -define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする"); -define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする"); +define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする"); +define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする"); define('_AD_BASE_LANG_EDIT_FUNC', "編集用コールバック関数"); -define('_AD_BASE_LANG_EMOTION', "意味"); +define('_MD_BASE_LANG_EMOTION', "意味"); +define('_AD_BASE_LANG_FEATURE_SVC_INFO', "フューチャー機能情報"); +define('_AD_BASE_LANG_FORCE_MODE', "強制クリーンアップ:正常なアンインストールが不可能なケースでも、可能な限りアンインストールを続行し、データベースをクリーンにします"); define('_AD_BASE_LANG_FORMAT', "形式"); define('_AD_BASE_LANG_FUNC_FILE', "コールバック関数定義ファイル"); define('_AD_BASE_LANG_FUNC_NUM', "関数ナンバ"); @@ -107,10 +129,10 @@ define('_AD_BASE_LANG_IMAGE_EDIT', "イメージの編集"); define('_AD_BASE_LANG_IMAGE_ID', "ID"); define('_AD_BASE_LANG_IMAGE_LIST', "イメージの一覧"); -define('_AD_BASE_LANG_IMAGE_MIMETYPE', "Mimetype"); +define('_MD_BASE_LANG_IMAGE_MIMETYPE', "MIMEタイプ"); define('_AD_BASE_LANG_IMAGE_NAME', "名前"); define('_AD_BASE_LANG_IMAGE_NEW', "イメージの新規追加"); -define('_AD_BASE_LANG_IMAGE_NICENAME', "イメージ名"); +define('_MD_BASE_LANG_IMAGE_NICENAME', "イメージ名"); define('_AD_BASE_LANG_IMAGE_WEIGHT', "表示順"); define('_AD_BASE_LANG_IMAGECATEGORY_DELETE', "イメージカテゴリの削除"); define('_AD_BASE_LANG_IMAGECATEGORY_EDIT', "イメージカテゴリの編集"); @@ -127,37 +149,92 @@ define('_AD_BASE_LANG_IMGCAT_TYPE', "imgcat type"); define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "イメージのアップロードを許可するグループ"); define('_AD_BASE_LANG_IMGCAT_WEIGHT', "優先度"); +define('_AD_BASE_LANG_INFORMATION', "インフォメーション"); +define('_AD_BASE_LANG_INSTALL', "インストール"); define('_AD_BASE_LANG_ISACTIVE', "アクティブ"); define('_AD_BASE_LANG_LAST_MODIFIED', "最終更新日時"); +define('_AD_BASE_LANG_LASTUPDATE', "最終更新日"); define('_AD_BASE_LANG_LCR', "右-中央-左"); define('_AD_BASE_LANG_LIST', "一覧"); +define('_AD_BASE_LANG_MAINMENU_HAS_MAIN', "メインメニュー"); +define('_AD_BASE_LANG_MAINMENU_INFO', "メインメニュー情報"); define('_AD_BASE_LANG_MID', "モジュール"); +define('_AD_BASE_LANG_MOD_AUTHOR', "モジュール作者"); +define('_AD_BASE_LANG_MOD_BASIC_INFO', "モジュール概要"); +define('_AD_BASE_LANG_MOD_CREDITS', "署名&メモ"); +define('_AD_BASE_LANG_MOD_DESC', "モジュール説明"); +define('_AD_BASE_LANG_MOD_DIR_NAME', "ディレクトリ名"); +define('_AD_BASE_LANG_MOD_LICENSE_INFO', "ライセンス情報"); +define('_AD_BASE_LANG_MODINSTALL', "モジュールのインストール"); +define('_AD_BASE_LANG_MODINSTALL_ADVICE', "_%s_ をインストールします。よろしいですか?"); +define('_AD_BASE_LANG_MODINSTALL_CONF', "モジュールインストールの確認"); +define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "安全のために : 使用する予定がないモジュールは、サーバーから削除しましょう"); +define('_AD_BASE_LANG_MODINSTALL_LOG', "モジュールインストール ログ"); +define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "モジュールインストール終了"); +define('_AD_BASE_LANG_MODLIST', "モジュール管理"); +define('_AD_BASE_LANG_MODULE_LICENSE', "ライセンス"); +define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "_%s_ をアンインストールします。よろしいですか?"); +define('_AD_BASE_LANG_MODUNINSTALL_CONF', "モジュールアンインストールの確認"); +define('_AD_BASE_LANG_MODUNINSTALL_LOG', "モジュールアンインストール ログ"); +define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "モジュールアンインストール終了"); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか?"); +define('_AD_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認"); +define('_AD_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ"); +define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); define('_AD_BASE_LANG_NAME', "name"); -define('_AD_BASE_LANG_ONLINE_IP', "IP"); -define('_AD_BASE_LANG_ONLINE_MODULE', "モジュール"); -define('_AD_BASE_LANG_ONLINE_UID', "UID"); -define('_AD_BASE_LANG_ONLINE_UNAME', "uname"); -define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated"); +define('_AD_BASE_LANG_NO', "いいえ"); +define('_AD_BASE_LANG_NO_ADMINMENU', "管理画面情報は設定されていません"); +define('_AD_BASE_LANG_NO_AGREE', "同意しない"); +define('_AD_BASE_LANG_NO_BLOCK', "ブロック情報は設定されていません"); +define('_AD_BASE_LANG_NO_CHANGE', "変更なし"); +define('_AD_BASE_LANG_NO_CONFIG', "一般設定情報は設定されていません"); +define('_AD_BASE_LANG_NO_MAINMENU', "メインメニュー情報は設定されていません"); +define('_AD_BASE_LANG_NO_SQL', "SQL情報は設定されていません"); +define('_AD_BASE_LANG_NO_SUBMENU', "サブメニューは設定されていません"); +define('_AD_BASE_LANG_NO_TEMPLATE', "テンプレート情報は設定されていません"); +define('_AD_BASE_LANG_NONE', "なし"); +define('_AD_BASE_LANG_NOTIF_SVC', "イベント通知機能"); define('_AD_BASE_LANG_OPTIONS', "オプション"); define('_AD_BASE_LANG_PACKAGE', "パッケージ情報"); define('_AD_BASE_LANG_RENDER', "レンダーシステム"); define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス"); +define('_AD_BASE_LANG_RESULT', "検索結果"); +define('_AD_BASE_LANG_SEARCH', "検索"); +define('_AD_BASE_LANG_SEARCH_SVC', "検索機能"); define('_AD_BASE_LANG_SHOW_FUNC', "表示用コールバック関数"); define('_AD_BASE_LANG_SIDE', "表示サイド"); define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "サイドブロック - 左"); define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "サイドブロック - 右"); +define('_AD_BASE_LANG_SMARTY', "Smarty"); define('_AD_BASE_LANG_SMILE_URL', "画像"); define('_AD_BASE_LANG_SMILES_DELETE', "顔アイコン削除"); define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集"); define('_AD_BASE_LANG_SMILES_NEW', "顔アイコン新規追加"); -define('_AD_BASE_LANG_SUBMIT', "送信"); +define('_AD_BASE_LANG_SQL_ENGINE', "SQLエンジン"); +define('_AD_BASE_LANG_SQL_FILE_NAME', "SQLファイル名"); +define('_AD_BASE_LANG_SQL_HAS_MAIN', "SQLの使用"); +define('_AD_BASE_LANG_SQL_INFO', "SQL情報"); +define('_AD_BASE_LANG_SQL_MYSQL', "MySQL"); +define('_AD_BASE_LANG_SUBMENU_NAME', "サブメニュー名"); +define('_AD_BASE_LANG_SUBMENU_URL', "サブメニューURL"); +define('_AD_BASE_LANG_TABLE_NAME', "テーブル名"); +define('_AD_BASE_LANG_TABLE_NUM', "No"); +define('_AD_BASE_LANG_TABLE_PROPERTIES', "テーブル構造"); define('_AD_BASE_LANG_TARGET_GROUPS', "アクセス権のあるグループ"); define('_AD_BASE_LANG_TARGET_MODULES', "表示先のモジュール"); define('_AD_BASE_LANG_TEMPLATE', "テンプレート"); +define('_AD_BASE_LANG_TEMPLATE_DESC', "テンプレートの説明"); +define('_AD_BASE_LANG_TEMPLATE_ENGINE', "テンプレート エンジン"); +define('_AD_BASE_LANG_TEMPLATE_FILE', "テンプレート ファイル名"); +define('_AD_BASE_LANG_TEMPLATE_HAS_MAIN', "テンプレートの使用"); +define('_AD_BASE_LANG_TEMPLATE_INFO', "テンプレート情報"); +define('_AD_BASE_LANG_TEMPLATE_KEY', "キー"); define('_AD_BASE_LANG_THEME', "テーマ"); define('_AD_BASE_LANG_THEME_ADMIN', "テーマ管理"); define('_AD_BASE_LANG_TITLE', "タイトル"); define('_AD_BASE_LANG_TOPPAGE', "トップページ"); +define('_AD_BASE_LANG_UNINSTALL', "アンインストール"); +define('_AD_BASE_LANG_UPDATE', "アップデート"); define('_AD_BASE_LANG_VERSION', "バージョン"); define('_AD_BASE_LANG_VISIBLE', "可視"); define('_AD_BASE_LANG_WEIGHT', "並び順"); @@ -180,269 +257,5 @@ define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "イメージ・ファイルの保存先に、ファイルシステムもしくはデータベースを選択できます。この設定は後から変更できません。
    データベースへの保存はBLOBというバックアップやリストアに不向きなフォーマットが用いられることに注意しましょう。"); define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。
    ウェルカムメッセージなど、文章を表示したい場合は、カスタムブロックを追加しましょう。"); define('_AD_BASE_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。
    ユーザーにテーマを選択させたいですか? チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。"); -define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ"); -define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。
    管理メニューの位置を忘れたときに使いましょう (例)利用許諾文"); -define('_MB_A_BASE_LANG_MENU', "メニュー"); -define('_MB_A_BASE_LANG_RESULT', "検索結果"); -define('_MB_A_BASE_LANG_SEARCH', "検索"); -define('_MD_A_BASE_ERROR_ABOUT_ISACTIVE', "ISACTIVEに指定した値が不正です"); -define('_MD_A_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以内で入力して下さい"); -define('_MD_A_BASE_ERROR_MIN', "{0}は{1}以上の数値を指定して下さい"); -define('_MD_A_BASE_ERROR_NO_HELP_FILE', "ヘルプファイルが見つかりませんでした"); -define('_MD_A_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); -define('_MD_A_BASE_ERROR_SEARCH_REQUIRED', "キーワードを入力して下さい"); -define('_MD_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ"); -define('_MD_A_BASE_LANG_ACTIVE', "アクティブ"); -define('_MD_A_BASE_LANG_ADMIN_MENU', "管理画面情報"); -define('_MD_A_BASE_LANG_ADMINMENU_HAS_MAIN', "管理画面"); -define('_MD_A_BASE_LANG_ADMINMENU_INDEX', "管理画面ページ"); -define('_MD_A_BASE_LANG_ADMINMENU_MENU', "管理メニュー設定ファイル"); -define('_MD_A_BASE_LANG_ADMINMENU_NAME', "管理画面名"); -define('_MD_A_BASE_LANG_ADMINMENU_URL', "管理画面URL"); -define('_MD_A_BASE_LANG_AGREE', "同意する"); -define('_MD_A_BASE_LANG_ALL_MODULE', "すべてのモジュール"); -define('_MD_A_BASE_LANG_BLOCK_KEY', "キー"); -define('_MD_A_BASE_LANG_BLOCK_VAL', "値"); -define('_MD_A_BASE_LANG_BLOCKS_INFO', "ブロック情報"); -define('_MD_A_BASE_LANG_COMMENT_SVC', "コメント機能"); -define('_MD_A_BASE_LANG_CONFIG_INFO', "一般設定情報"); -define('_MD_A_BASE_LANG_CONFIG_KEY', "キー"); -define('_MD_A_BASE_LANG_CONFIG_VAL', "値"); -define('_MD_A_BASE_LANG_CONTROL', "操作"); -define('_MD_A_BASE_LANG_DEACTIVATE', "非アクティブ"); -define('_MD_A_BASE_LANG_FEATURE_SVC_INFO', "フューチャー機能情報"); -define('_MD_A_BASE_LANG_FORCE_MODE', "強制クリーンアップ:正常なアンインストールが不可能なケースでも、可能な限りアンインストールを続行し、データベースをクリーンにします"); -define('_MD_A_BASE_LANG_INFORMATION', "インフォメーション"); -define('_MD_A_BASE_LANG_INSTALL', "インストール"); -define('_MD_A_BASE_LANG_ISACTIVE', "有効"); -define('_MD_A_BASE_LANG_LASTUPDATE', "最終更新日"); -define('_MD_A_BASE_LANG_MAINMENU_HAS_MAIN', "メインメニュー"); -define('_MD_A_BASE_LANG_MAINMENU_INFO', "メインメニュー情報"); -define('_MD_A_BASE_LANG_MID', "MID"); -define('_MD_A_BASE_LANG_MOD_AUTHOR', "モジュール作者"); -define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "モジュール概要"); -define('_MD_A_BASE_LANG_MOD_CREDITS', "署名&メモ"); -define('_MD_A_BASE_LANG_MOD_DESC', "モジュール説明"); -define('_MD_A_BASE_LANG_MOD_DIR_NAME', "ディレクトリ名"); -define('_MD_A_BASE_LANG_MOD_LICENSE_INFO', "ライセンス情報"); -define('_MD_A_BASE_LANG_MODIFY', "変更"); -define('_MD_A_BASE_LANG_MODINSTALL', "モジュールのインストール"); -define('_MD_A_BASE_LANG_MODINSTALL_ADVICE', "_%s_ をインストールします。よろしいですか?"); -define('_MD_A_BASE_LANG_MODINSTALL_CONF', "モジュールインストールの確認"); -define('_MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE', "安全のために : 使用する予定がないモジュールは、サーバーから削除しましょう"); -define('_MD_A_BASE_LANG_MODINSTALL_LOG', "モジュールインストール ログ"); -define('_MD_A_BASE_LANG_MODINSTALL_SUCCESS', "モジュールインストール終了"); -define('_MD_A_BASE_LANG_MODLIST', "モジュール管理"); -define('_MD_A_BASE_LANG_MODULE_LICENSE', "ライセンス"); -define('_MD_A_BASE_LANG_MODUNINSTALL_ADVICE', "_%s_ をアンインストールします。よろしいですか?"); -define('_MD_A_BASE_LANG_MODUNINSTALL_CONF', "モジュールアンインストールの確認"); -define('_MD_A_BASE_LANG_MODUNINSTALL_LOG', "モジュールアンインストール ログ"); -define('_MD_A_BASE_LANG_MODUNINSTALL_SUCCESS', "モジュールアンインストール終了"); -define('_MD_A_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか?"); -define('_MD_A_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認"); -define('_MD_A_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ"); -define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); -define('_MD_A_BASE_LANG_NAME', "名前"); -define('_MD_A_BASE_LANG_NO_ADMINMENU', "管理画面情報は設定されていません"); -define('_MD_A_BASE_LANG_NO_AGREE', "同意しない"); -define('_MD_A_BASE_LANG_NO_BLOCK', "ブロック情報は設定されていません"); -define('_MD_A_BASE_LANG_NO_CHANGE', "変更なし"); -define('_MD_A_BASE_LANG_NO_CONFIG', "一般設定情報は設定されていません"); -define('_MD_A_BASE_LANG_NO_MAINMENU', "メインメニュー情報は設定されていません"); -define('_MD_A_BASE_LANG_NO_SQL', "SQL情報は設定されていません"); -define('_MD_A_BASE_LANG_NO_SUBMENU', "サブメニューは設定されていません"); -define('_MD_A_BASE_LANG_NO_TEMPLATE', "テンプレート情報は設定されていません"); -define('_MD_A_BASE_LANG_NOTIF_SVC', "イベント通知機能"); -define('_MD_A_BASE_LANG_SEARCH', "検索"); -define('_MD_A_BASE_LANG_SEARCH_SVC', "検索機能"); -define('_MD_A_BASE_LANG_SMARTY', "Smarty"); -define('_MD_A_BASE_LANG_SQL_ENGINE', "SQLエンジン"); -define('_MD_A_BASE_LANG_SQL_FILE_NAME', "SQLファイル名"); -define('_MD_A_BASE_LANG_SQL_HAS_MAIN', "SQLの使用"); -define('_MD_A_BASE_LANG_SQL_INFO', "SQL情報"); -define('_MD_A_BASE_LANG_SQL_MYSQL', "MySQL"); -define('_MD_A_BASE_LANG_SUBMENU_NAME', "サブメニュー名"); -define('_MD_A_BASE_LANG_SUBMENU_URL', "サブメニューURL"); -define('_MD_A_BASE_LANG_SUBMIT', "送信"); -define('_MD_A_BASE_LANG_TABLE_NAME', "テーブル名"); -define('_MD_A_BASE_LANG_TABLE_NUM', "No"); -define('_MD_A_BASE_LANG_TABLE_PROPERTIES', "テーブル構造"); -define('_MD_A_BASE_LANG_TEMPLATE_DESC', "テンプレートの説明"); -define('_MD_A_BASE_LANG_TEMPLATE_ENGINE', "テンプレート エンジン"); -define('_MD_A_BASE_LANG_TEMPLATE_FILE', "テンプレート ファイル名"); -define('_MD_A_BASE_LANG_TEMPLATE_HAS_MAIN', "テンプレートの使用"); -define('_MD_A_BASE_LANG_TEMPLATE_INFO', "テンプレート情報"); -define('_MD_A_BASE_LANG_TEMPLATE_KEY', "キー"); -define('_MD_A_BASE_LANG_UNINSTALL', "アンインストール"); -define('_MD_A_BASE_LANG_UPDATE', "アップデート"); -define('_MD_A_BASE_LANG_VERSION', "バージョン"); -define('_MD_A_BASE_LANG_WEIGHT', "表示順"); -define('_MD_AM_ACTVGROUP', "アカウント有効化依頼のメールの送信先グループ"); -define('_MD_AM_ACTVGROUPDSC', "「管理者が確認してアカウントを有効にする」設定になっている場合のみ有効です"); -define('_MD_AM_ACTVTYPE', "新規登録ユーザアカウントの有効化の方法"); -define('_MD_AM_ADMINACTV', "管理者が確認してアカウントを有効にする"); -define('_MD_AM_ADMINML', "管理者メールアドレス"); -define('_MD_AM_ADMNOTSET', "管理者のメールアドレスが設定されていません。"); -define('_MD_AM_ALLOWHTML', "コメント文においてHTMLタグの使用を許可する"); -define('_MD_AM_ALLOWIMAGE', "投稿への画像ファイルの表示を許可する"); -define('_MD_AM_ALLOWREG', "新規ユーザの登録を許可する"); -define('_MD_AM_ALLOWREGDSC', "「はい」を選択すると新規ユーザの登録を許可します。"); -define('_MD_AM_ALLOWTHEME', "サイトテーマの選択を許可する"); -define('_MD_AM_ALLWCHGMAIL', "ユーザ自身のEmailアドレス変更を許可する"); -define('_MD_AM_ALLWCHGMAILDSC', ""); -define('_MD_AM_ALWDHTML', "投稿文の中で使用可能なHTMLタグ"); -define('_MD_AM_ANONNAME', "未登録ユーザの表示名"); -define('_MD_AM_ANONPOST', "未登録ユーザの投稿を許可する"); -define('_MD_AM_AUTOACTV', "自動的にアカウントを有効にする"); -define('_MD_AM_AVATARALLOW', "アバター画像のアップロードを許可する"); -define('_MD_AM_AVATARCONF', "ユーザ独自のアバター画像に関する設定"); -define('_MD_AM_AVATARH', "アバター画像の最大高さ(ピクセル)"); -define('_MD_AM_AVATARMAX', "アバター画像の最大ファイルサイズ(バイト)"); -define('_MD_AM_AVATARMP', "アバターアップロード権を得るための発言数"); -define('_MD_AM_AVATARMPDSC', "ユーザが自分で作成したアバターをアップロードするために必要な最低投稿数を設定してください。"); -define('_MD_AM_AVATARW', "アバター画像の最大幅(ピクセル)"); -define('_MD_AM_BADEMAILS', "ユーザのemailアドレスとして使用できない文字列"); -define('_MD_AM_BADEMAILSDSC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); -define('_MD_AM_BADIPS', "このサイトへのアクセス拒否IPを入れてください。
    IPとIPの間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); -define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc は それで始まる IPアドレスからのアクセスを拒否します。
    aaa.bbb.ccc$ は それで終わる IPアドレスからのアクセスを拒否します。
    aaa.bbb.ccc はその IPアドレスを含むアドレスからのアクセスを拒否します。"); -define('_MD_AM_BADUNAMES', "ユーザ名として使用できない文字列"); -define('_MD_AM_BADUNAMESDSC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); -define('_MD_AM_BANNERS', "バナー広告を有効にする"); -define('_MD_AM_CENSOR', "禁止用語設定"); -define('_MD_AM_CENSORRPLC', "禁止用語を置き換える文字列:"); -define('_MD_AM_CENSORRPLCDSC', "禁止用語がこのテキストボックスで指定した文字列に置き換えられます。"); -define('_MD_AM_CENSORWRD', "禁止用語"); -define('_MD_AM_CENSORWRDDSC', "ユーザが投稿する際に使用を禁止sする文字列を入力してください。文字列と文字列の間は
    | で区切り、大文字小文字は区別しません。"); -define('_MD_AM_CHNGUTHEME', "全てのユーザのテーマを変更する"); -define('_MD_AM_CLOSESITE', "サイトを閉鎖する"); -define('_MD_AM_CLOSESITEDSC', "特定グループ以外はサイトにアクセスすることができないようにします。"); -define('_MD_AM_CLOSESITEOK', "サイト閉鎖時でもアクセスが認められているグループ"); -define('_MD_AM_CLOSESITEOKDSC', "デフォルトの管理者グループは常にアクセスできます"); -define('_MD_AM_CLOSESITETXT', "サイト閉鎖の理由"); -define('_MD_AM_CLOSESITETXTDSC', "サイト閉鎖時に表示します"); -define('_MD_AM_COMMODE', "デフォルトのコメント表示モード"); -define('_MD_AM_COMORDER', "デフォルトのコメント表示順"); -define('_MD_AM_DEBUGMODE', "デバッグモードを有効にする"); -define('_MD_AM_DEBUGMODE0', "オフ"); -define('_MD_AM_DEBUGMODE1', "PHPデバグ"); -define('_MD_AM_DEBUGMODE2', "MySQL/Blocksデバグ"); -define('_MD_AM_DEBUGMODE3', "Smartyテンプレート・デバグ"); -define('_MD_AM_DEBUGMODEDSC', "(デバッグ用に使用してください。実際のサイト運営時には解除してください。)"); -define('_MD_AM_DEFAULTTZ', "デフォルト・タイムゾーン"); -define('_MD_AM_DOBADIPS', "IPアクセス拒否を有効にしますか?"); -define('_MD_AM_DOBADIPSDSC', "アクセス拒否IPからのユーザはあなたのサイトには入れません。"); -define('_MD_AM_DOCENSOR', "禁止用語処理を有効にする"); -define('_MD_AM_DOCENSORDSC', "このオプションを有効にすると禁止用語のチェックを行うようになります。このオプションを無効にすることでサイトの処理速度が向上するかもしれません。"); -define('_MD_AM_DONTCHNG', "以下は絶対に変更しないで下さい"); -define('_MD_AM_DOSEARCH', "グローバルサーチを有効にする"); -define('_MD_AM_DOSEARCHDSC', "サイト内の投稿/記事の全検索を行います。"); -define('_MD_AM_DSPDSCLMR', "利用許諾文を表示する"); -define('_MD_AM_DSPDSCLMRDSC', "「はい」にするとユーザの新規登録ページに利用許諾の文章を表示します。"); -define('_MD_AM_DTHEME', "デフォルト・サイトテーマ"); -define('_MD_AM_DTPLSET', "デフォルトのテンプレート・セット"); -define('_MD_AM_FOOTER', "フッタ"); -define('_MD_AM_FOOTERDSC', "リンクを記入する場合は必ずフルパス(http://〜)で入力してください。フルパスで入力しなかった場合、モジュール内ページでうまく表示されないことがあります。"); -define('_MD_AM_GENERAL', "一般設定"); -define('_MD_AM_IFUCANT', "もしファイルのアクセス権限を変更できない場合は、このファイルを直接編集してください。"); -define('_MD_AM_INDEXFOLLOW', "Index, Follow"); -define('_MD_AM_INDEXNOFOLLOW', "Index, No Follow"); -define('_MD_AM_INVLDMINPASS', "パスワードの最低文字数が正しくありません。"); -define('_MD_AM_INVLDSCOOK', "セッションIDクッキーの名称が正しくありません。"); -define('_MD_AM_INVLDSEXP', "セッションのタイムアウト時間が正しくありません。"); -define('_MD_AM_INVLDUCOOK', "ユーザクッキーの名称が正しくありません。"); -define('_MD_AM_IPBAN', "IP Banning"); -define('_MD_AM_LANGUAGE', "使用言語"); -define('_MD_AM_LIGHT', "弱(漢字・平仮名も使用可)"); -define('_MD_AM_LOADINGIMG', "「loading..」画像を表示させる"); -define('_MD_AM_MAILER', "メール設定"); -define('_MD_AM_MAILER_', ""); -define('_MD_AM_MAILER_MAIL', ""); -define('_MD_AM_MAILER_SENDMAIL', ""); -define('_MD_AM_MAILERMETHOD', "メール送信方法"); -define('_MD_AM_MAILERMETHODDESC', "メールを送信する方法を選択してください。デフォルトではPHPのmail()関数を使用します。"); -define('_MD_AM_MAILFROM', "送信者メールアドレス"); -define('_MD_AM_MAILFROMDESC', ""); -define('_MD_AM_MAILFROMNAME', "送信者"); -define('_MD_AM_MAILFROMNAMEDESC', "メール送信の際に送信者として表示される名前を入力してください"); -define('_MD_AM_MAILFROMUID', "PM送信者"); -define('_MD_AM_MAILFROMUIDDESC', "プライベートメッセージ送信の際に送信者としてデフォルト表示されるユーザを選択してください"); -define('_MD_AM_MAXUNAME', "ユーザ名の最大文字数(byte)"); -define('_MD_AM_MEDIUM', "中"); -define('_MD_AM_METAAUTHOR', "METAタグ(作成者)"); -define('_MD_AM_METAAUTHORDSC', "作成者METAタグは、サイト文書の作成者情報を定義します。名前、WebmasterのEMailアドレス、会社名、URLなどを記述します。"); -define('_MD_AM_METACOPYR', "METAタグ(コピーライト)"); -define('_MD_AM_METACOPYRDSC', "METAコピーライトタグは、あなたのサイト上の情報に対するの著作権情報を定義します。"); -define('_MD_AM_METADESC', "METAタグ(Description)"); -define('_MD_AM_METADESCDSC', "METAタグ(Description) は、あなたのサイトの内容を説明する一般的なタグです。"); -define('_MD_AM_METAFOOTER', "METAタグ/フッタ設定"); -define('_MD_AM_METAKEY', "METAタグ(キーワード)"); -define('_MD_AM_METAKEYDSC', "METAキーワードはあなたのサイトの内容を表すものです。キーワードはカンマで区切って記述してください。(例: XOOPS, PHP, mySQL, ポータル)"); -define('_MD_AM_METAO14YRS', "14 years"); -define('_MD_AM_METAOGEN', "General"); -define('_MD_AM_METAOMAT', "Mature"); -define('_MD_AM_METAOREST', "Restricted"); -define('_MD_AM_METARATING', "METAタグ(RATING)"); -define('_MD_AM_METARATINGDSC', "閲覧対象年齢層の指定"); -define('_MD_AM_METAROBOTS', "METAタグ(ROBOTS)"); -define('_MD_AM_METAROBOTSDSC', "ロボット型検索エンジンへの対応"); -define('_MD_AM_MINPASS', "パスワードの最低文字数"); -define('_MD_AM_MINSEARCH', "キーワード最低文字数"); -define('_MD_AM_MINSEARCHDSC', "ユーザが検索を行う際に必要なキーワードの最低文字数を指定してください。"); -define('_MD_AM_MINUNAME', "ユーザ名の最低文字数(byte)"); -define('_MD_AM_MODCACHE', "モジュール・キャッシュ"); -define('_MD_AM_MODCACHEDSC', "各モジュールのコンテンツをキャッシュしておく時間の長さを指定してください。モジュールに既にキャッシュ機能がある場合は「キャッシュしない」を選択することをお勧めします。ブロック・キャッシュは含まれません。"); -define('_MD_AM_MODCONFIG', "モジュール設定オプション"); -define('_MD_AM_MYIP', "あなたのIPアドレスを入力してください。"); -define('_MD_AM_MYIPDSC', "このIPは、バナーのインプレッションおよびサイト統計においてカウントされません。"); -define('_MD_AM_NEWUNOTIFY', "新規ユーザ登録の際にメールにて知らせを受け取る"); -define('_MD_AM_NO', "いいえ"); -define('_MD_AM_NOINDEXFOLLOW', "No Index, Follow"); -define('_MD_AM_NOINDEXNOFOLLOW', "No Index, No Follow"); -define('_MD_AM_NOMODULE', "キャッシュ可能なモジュールはありません。"); -define('_MD_AM_NONE', "なし"); -define('_MD_AM_NOTIFYTO', "通知先グループ"); -define('_MD_AM_PREFMAIN', "システム設定メイン"); -define('_MD_AM_REGDSCLMR', "利用許諾文"); -define('_MD_AM_REGDSCLMRDSC', "ユーザの新規登録ページに表示する利用許諾文を入力してください。"); -define('_MD_AM_REMEMBER', "このファイルをウェブ上の管理者画面から編集できるようにするには、このファイルのアクセス権限を666(chmod 666)に設定する必要があります。"); -define('_MD_AM_SEARCH', "検索オプション"); -define('_MD_AM_SELFDELETE', "ユーザが自分自身のアカウントを削除できる"); -define('_MD_AM_SENDMAILPATH', "sendmailへのパス"); -define('_MD_AM_SENDMAILPATHDESC', "sendmailへのフルパスを記入してください"); -define('_MD_AM_SERVERTZ', "サーバのタイムゾーン"); -define('_MD_AM_SESSEXPIRE', "セッションがタイムアウトするまでの時間(単位:分)"); -define('_MD_AM_SESSEXPIREDSC', "セッションがタイムアウトするまでの時間を分単位で指定してください。(「セッションの設定をカスタマイズする」が有効の場合のみ)"); -define('_MD_AM_SESSNAME', "セッションIDの保存に使用するクッキーの名称"); -define('_MD_AM_SESSNAMEDSC', "このクッキーに保存されるセッションIDは、セッションがタイムアウトするか、ユーザがログアウトするまでの間有効です。(「セッションの設定をカスタマイズする」が有効の場合のみ)"); -define('_MD_AM_SITECACHE', "サイト・キャッシュ"); -define('_MD_AM_SITECACHEDSC', "サイト内のコンテンツをモジュール別にキャッシュします。サイト・キャッシュは、モジュール独自のキャッシュ機能(ある場合)よりも優先されます。"); -define('_MD_AM_SITENAME', "サイト名"); -define('_MD_AM_SITEPREF', "サイト一般設定"); -define('_MD_AM_SLOGAN', "サイト副題"); -define('_MD_AM_SMTPHOST', "SMTPサーバアドレス"); -define('_MD_AM_SMTPHOSTDESC', "SMTPサーバのアドレスの一覧を記入してください。"); -define('_MD_AM_SMTPPASS', "SMTPAuthパスワード"); -define('_MD_AM_SMTPPASSDESC', "SMTPAuthを使用してSMTPサーバにアクセスするためのパスワード"); -define('_MD_AM_SMTPUSER', "SMTPAuthユーザ名"); -define('_MD_AM_SMTPUSERDESC', "SMTPAuthを使用してSMTPサーバにアクセスするためのユーザ名"); -define('_MD_AM_SSLLINK', "SSLログインページへのURL"); -define('_MD_AM_SSLPOST', "SSLログイン時に使用するPOST変数の名称"); -define('_MD_AM_STARTPAGE', "開始モジュール"); -define('_MD_AM_STRICT', "強(アルファベットおよび数字のみ)←推奨"); -define('_MD_AM_THEMEFILE', "themes/ ディレクトリからの自動アップデートを有効にする"); -define('_MD_AM_THEMEFILEDSC', "現在使用中のテーマよりも更新日時が新しいファイルが themes/ディレクトリ下にある場合に、自動的にデータベース内のデータを更新します。サイト公開時には無効にする事をお勧めします。"); -define('_MD_AM_THEMEOK', "選択可能なテーマ"); -define('_MD_AM_THEMEOKDSC', "ユーザが選択することのできるテーマファイルを指定してください"); -define('_MD_AM_THEMESET', "テーマ・セット"); -define('_MD_AM_UNAMELVL', "ユーザ名として使用可能な文字の設定を行います。文字制限の程度を選択してください。"); -define('_MD_AM_USEGZIP', "gzip圧縮を使用する"); -define('_MD_AM_USEMYSESS', "セッションの設定をカスタマイズする"); -define('_MD_AM_USEMYSESSDSC', "セッションの設定のカスタマイズ(セッションがタイムアウトするまでの時間の設定や、セッション名の変更)を行えます"); -define('_MD_AM_USERACTV', "ユーザ自身の確認が必要(推奨)"); -define('_MD_AM_USERCOOKIE', "ユーザ名の保存に使用するクッキーの名称"); -define('_MD_AM_USERCOOKIEDSC', "このクッキーにはユーザ名のみが保存され、ユーザのPCのハードディスク中に1年間保管されます。このクッキーを使用するかしないかはユーザ自身が選択できます。"); -define('_MD_AM_USERSETTINGS', "ユーザ情報設定"); -define('_MD_AM_USESSL', "ログインにSSLを使用する"); -define('_MD_AM_YES', "はい"); ?> Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.21 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.22 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.21 Fri Aug 18 18:09:11 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Fri Aug 18 20:28:34 2006 @@ -1,6 +1,6 @@ From minahito @ users.sourceforge.jp Fri Aug 18 20:28:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 20:28:35 +0900 Subject: [xoops-cvslog 4213] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060818112835.0FEA52AC1BC@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/modinfo.php diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.16 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.17 --- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.16 Wed Aug 2 18:42:33 2006 +++ xoops2jp/html/modules/base/language/english/modinfo.php Fri Aug 18 20:28:34 2006 @@ -19,21 +19,9 @@ define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new"); define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList"); define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload"); -define('_MI_BASE_KEYWORD_IMAGE_CREATE', "Image create"); -define('_MI_BASE_KEYWORD_IMAGE_LIST', "Image list"); -define('_MI_BASE_KEYWORD_IMAGECATEGORY_CREATE', "Imagecategory create"); -define('_MI_BASE_KEYWORD_IMAGECATEGORY_LIST', "Imagecategory list"); define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new"); define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall"); -define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create"); -define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list"); define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list"); -define('_MI_BASE_LANG_IMAGE_CREATE', "Image create"); -define('_MI_BASE_LANG_IMAGE_LIST', "Image list"); -define('_MI_BASE_LANG_IMAGECATEGORY_CREATE', "Imagecategory create"); -define('_MI_BASE_LANG_IMAGECATEGORY_LIST', "Imagecategory list"); -define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create"); -define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list"); define('_MI_BASE_MENU_ACTIONSEARCH', "Action search"); define('_MI_BASE_MENU_BLOCKINSTALL', "Install block"); define('_MI_BASE_MENU_BLOCKLIST', "Block management"); @@ -47,7 +35,6 @@ define('_MI_BASE_MENU_THEME_MANAGE', "Theme manage"); define('_MI_BASE_NAME', "Legacy system"); define('_MI_BASE_NAME_DESC', "This module provides compatibility of XOOPS Cube with XOOPS 2.0.x."); -define('_MI_PROFILE_BASE_CONTROLLER', "This system attaches great importance to the compatibility with XOOPS 2.0.x.
    Pre-road mechanism of this module is very flexible, but it is low speed.
    "); -define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.
    This system can use themes of Xoops2.0.x rightly."); + ?> Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.20 xoops2jp/html/modules/base/language/english/main.php:1.1.2.21 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.20 Fri Aug 18 18:09:11 2006 +++ xoops2jp/html/modules/base/language/english/main.php Fri Aug 18 20:28:34 2006 @@ -1,6 +1,6 @@ Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.37 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.38 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.37 Fri Aug 11 20:01:50 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Fri Aug 18 20:28:34 2006 @@ -14,7 +14,7 @@ define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "Could not set link with all module at '{0}' block"); define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "Could not set read permission"); define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "Could not set system admin permission"); -define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed."); +define('_MD_BASE_ERROR_DBUPDATE_FAILED', "Failed updating database"); define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "Could not delete module information from XOOPS database."); define('_AD_BASE_ERROR_DROP_TABLE', "Could not drop table {0}"); define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list."); @@ -24,20 +24,32 @@ define('_AD_BASE_ERROR_IMG_SIZE', "Img size"); define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{1}' module has been failure"); define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong."); -define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); +define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); +define('_AD_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value."); define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "The specified module is not found"); +define('_AD_BASE_ERROR_NO_HELP_FILE', "Help file is not found."); define('_AD_BASE_ERROR_OBJECTEXIST', "{0} is wrong."); -define('_AD_BASE_ERROR_OPTIONS', "Options"); define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree the following licence."); define('_AD_BASE_ERROR_READGROUPS', "readgroups"); -define('_AD_BASE_ERROR_REQUIRED', "{0} is required."); -define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "Upload the image file of smilies."); +define('_MD_BASE_ERROR_REQUIRED', "{0} is required."); +define('_AD_BASE_ERROR_SEARCH_REQUIRED', "Input keyword"); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Uninstallation of '{1}' module has been failure"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Updating '{1}' module has been failure"); define('_AD_BASE_ERROR_UPLOADGROUPS', "uploadgroups"); +define('_AD_BASE_LANG_ACTIONSEARCH', "Action Search"); +define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search...."); +define('_AD_BASE_LANG_ACTIVE', "Active"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block"); +define('_AD_BASE_LANG_ADMIN_MENU', "Information of Administration Menu"); +define('_AD_BASE_LANG_ADMINMENU_HAS_MAIN', "Administration Menu"); +define('_AD_BASE_LANG_ADMINMENU_INDEX', "Administration Menu"); +define('_AD_BASE_LANG_ADMINMENU_MENU', "Detailed module package information "); +define('_AD_BASE_LANG_ADMINMENU_NAME', "Name of Administration Menu name"); +define('_AD_BASE_LANG_ADMINMENU_URL', "URL of Administration Menu"); +define('_AD_BASE_LANG_AGREE', "Agree"); +define('_AD_BASE_LANG_ALL_MODULE', "All modules"); define('_AD_BASE_LANG_ALL_MODULES', "All modules"); define('_AD_BASE_LANG_ALL_STATUS', "All status"); define('_AD_BASE_LANG_AUTHOR', "author"); @@ -45,34 +57,41 @@ define('_AD_BASE_LANG_BID', "BID"); define('_AD_BASE_LANG_BLOCK_EDIT', "Block edit"); define('_AD_BASE_LANG_BLOCK_INSTALL', "Block install"); +define('_AD_BASE_LANG_BLOCK_KEY', "Key"); define('_AD_BASE_LANG_BLOCK_TYPE', "Block type"); define('_AD_BASE_LANG_BLOCK_UNINSTALL', "Block uninstall"); +define('_AD_BASE_LANG_BLOCK_VAL', "Value"); +define('_AD_BASE_LANG_BLOCKS_INFO', "Block information"); define('_AD_BASE_LANG_C_TYPE', "Type"); define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block - center"); define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block - left"); define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block - right"); -define('_AD_BASE_LANG_CODE', "Code"); +define('_MD_BASE_LANG_CODE', "Code"); define('_AD_BASE_LANG_COM_CREATED', "Created"); -define('_AD_BASE_LANG_COM_EXPARAMS', "Comment extra parameters"); -define('_AD_BASE_LANG_COM_ICON', "Icon"); -define('_AD_BASE_LANG_COM_ID', "ID"); -define('_AD_BASE_LANG_COM_IP', "IP"); -define('_AD_BASE_LANG_COM_ITEMID', "Item ID"); -define('_AD_BASE_LANG_COM_MODID', "Module ID"); +define('_MD_BASE_LANG_COM_EXPARAMS', "Comment extra parameters"); +define('_MD_BASE_LANG_COM_ICON', "Icon"); +define('_MD_BASE_LANG_COM_ID', "ID"); +define('_MD_BASE_LANG_COM_IP', "IP"); +define('_MD_BASE_LANG_COM_ITEMID', "Item ID"); +define('_MD_BASE_LANG_COM_MODID', "Module ID"); define('_AD_BASE_LANG_COM_MODIFIED', "Modified"); -define('_AD_BASE_LANG_COM_PID', "PID"); -define('_AD_BASE_LANG_COM_ROOTID', "Root ID"); +define('_MD_BASE_LANG_COM_PID', "PID"); +define('_MD_BASE_LANG_COM_ROOTID', "Root ID"); define('_AD_BASE_LANG_COM_SIG', "Signature"); define('_AD_BASE_LANG_COM_STATUS', "Status"); -define('_AD_BASE_LANG_COM_TEXT', "Comment"); -define('_AD_BASE_LANG_COM_TITLE', "Title"); +define('_MD_BASE_LANG_COM_TEXT', "Comment"); +define('_MD_BASE_LANG_COM_TITLE', "Title"); define('_AD_BASE_LANG_COM_UID', "UID"); define('_AD_BASE_LANG_COMMENT_DELETE', "Delete a comment"); define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment"); define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment"); +define('_AD_BASE_LANG_COMMENT_SVC', "Comment"); define('_AD_BASE_LANG_COMMENT_VIEW', "Comment view"); define('_AD_BASE_LANG_CONFCAT_ID', "Config Category ID"); define('_AD_BASE_LANG_CONFCAT_NAME', "Confing Category Name"); +define('_AD_BASE_LANG_CONFIG_INFO', "Module Preferences"); +define('_AD_BASE_LANG_CONFIG_KEY', "Key"); +define('_AD_BASE_LANG_CONFIG_VAL', "Value"); define('_AD_BASE_LANG_CONTENT', "Content"); define('_AD_BASE_LANG_CONTROL', "Control"); define('_AD_BASE_LANG_CREATE_NEW', "Add a new"); @@ -86,15 +105,18 @@ define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "Custom without Smilies"); define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "Custom block delete"); define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "Custom block edit"); +define('_AD_BASE_LANG_DEACTIVATE', "Inactive"); define('_AD_BASE_LANG_DIRNAME', "Directory name"); define('_AD_BASE_LANG_DISPLAY', "Display"); -define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall"); -define('_AD_BASE_LANG_DOHTML', "Enable HTML tags"); +define('_MD_BASE_LANG_DOBR', "Insert line-break automatically"); +define('_MD_BASE_LANG_DOHTML', "Enable HTML tags"); define('_AD_BASE_LANG_DOIMAGE', "Enable [img] tag"); -define('_AD_BASE_LANG_DOSMILEY', "Use smilies"); -define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code"); +define('_MD_BASE_LANG_DOSMILEY', "Use smilies"); +define('_MD_BASE_LANG_DOXCODE', "Enable XOOPS code"); define('_AD_BASE_LANG_EDIT_FUNC', "Callback edit function name"); -define('_AD_BASE_LANG_EMOTION', "Emotion"); +define('_MD_BASE_LANG_EMOTION', "Emotion"); +define('_AD_BASE_LANG_FEATURE_SVC_INFO', "Information of feature function"); +define('_AD_BASE_LANG_FORCE_MODE', "Force mode: Force uninstall overcoming errors and clean up database as much as possible."); define('_AD_BASE_LANG_FORMAT', "format"); define('_AD_BASE_LANG_FUNC_FILE', "Callback file name"); define('_AD_BASE_LANG_FUNC_NUM', "Function number"); @@ -107,10 +129,10 @@ define('_AD_BASE_LANG_IMAGE_EDIT', "Image edit"); define('_AD_BASE_LANG_IMAGE_ID', "image id"); define('_AD_BASE_LANG_IMAGE_LIST', "Image list"); -define('_AD_BASE_LANG_IMAGE_MIMETYPE', "image mimetype"); +define('_MD_BASE_LANG_IMAGE_MIMETYPE', "Image mimetype"); define('_AD_BASE_LANG_IMAGE_NAME', "image name"); define('_AD_BASE_LANG_IMAGE_NEW', "Image new"); -define('_AD_BASE_LANG_IMAGE_NICENAME', "image nicename"); +define('_MD_BASE_LANG_IMAGE_NICENAME', "Image nicename"); define('_AD_BASE_LANG_IMAGE_WEIGHT', "image weight"); define('_AD_BASE_LANG_IMAGECATEGORY_DELETE', "Imagecategory delete"); define('_AD_BASE_LANG_IMAGECATEGORY_EDIT', "Imagecategory edit"); @@ -127,37 +149,92 @@ define('_AD_BASE_LANG_IMGCAT_TYPE', "imgcat type"); define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "Imgcat upload groups"); define('_AD_BASE_LANG_IMGCAT_WEIGHT', "imgcat weight"); +define('_AD_BASE_LANG_INFORMATION', "Information"); +define('_AD_BASE_LANG_INSTALL', "Install"); define('_AD_BASE_LANG_ISACTIVE', "Active"); define('_AD_BASE_LANG_LAST_MODIFIED', "Last modified"); +define('_AD_BASE_LANG_LASTUPDATE', "Last update"); define('_AD_BASE_LANG_LCR', "L-CTR-R"); define('_AD_BASE_LANG_LIST', "List"); +define('_AD_BASE_LANG_MAINMENU_HAS_MAIN', "Main Menu"); +define('_AD_BASE_LANG_MAINMENU_INFO', "Information of Main Menu"); define('_AD_BASE_LANG_MID', "MID"); +define('_AD_BASE_LANG_MOD_AUTHOR', "Module Author"); +define('_AD_BASE_LANG_MOD_BASIC_INFO', "Basic Information"); +define('_AD_BASE_LANG_MOD_CREDITS', "Signature / Memo"); +define('_AD_BASE_LANG_MOD_DESC', "Module discription"); +define('_AD_BASE_LANG_MOD_DIR_NAME', "Module directory"); +define('_AD_BASE_LANG_MOD_LICENSE_INFO', "Licence Information "); +define('_AD_BASE_LANG_MODINSTALL', "Module install"); +define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Module"); +define('_AD_BASE_LANG_MODINSTALL_CONF', "Are you sure to install the module?"); +define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from server to keep security of your site. "); +define('_AD_BASE_LANG_MODINSTALL_LOG', "module install log"); +define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "The module is successfully installed."); +define('_AD_BASE_LANG_MODLIST', "Modules administration"); +define('_AD_BASE_LANG_MODULE_LICENSE', "Module license"); +define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure to uninstall module"); +define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall"); +define('_AD_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log"); +define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled."); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Update module"); +define('_AD_BASE_LANG_MODUPDATE_CONF', "Confirm module update."); +define('_AD_BASE_LANG_MODUPDATE_LOG', "Module update log"); +define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "module update success"); define('_AD_BASE_LANG_NAME', "Name"); -define('_AD_BASE_LANG_ONLINE_IP', "Online ip"); -define('_AD_BASE_LANG_ONLINE_MODULE', "Online module"); -define('_AD_BASE_LANG_ONLINE_UID', "Online uid"); -define('_AD_BASE_LANG_ONLINE_UNAME', "Online uname"); -define('_AD_BASE_LANG_ONLINE_UPDATED', "Online updated"); +define('_AD_BASE_LANG_NO', "No"); +define('_AD_BASE_LANG_NO_ADMINMENU', "No Administration Menu"); +define('_AD_BASE_LANG_NO_AGREE', " I Do Not Agree."); +define('_AD_BASE_LANG_NO_BLOCK', "No block information"); +define('_AD_BASE_LANG_NO_CHANGE', "No change"); +define('_AD_BASE_LANG_NO_CONFIG', "Module preferences has not been configured."); +define('_AD_BASE_LANG_NO_MAINMENU', "Mainmenu settings has not been configured."); +define('_AD_BASE_LANG_NO_SQL', "SQL information has not been configured."); +define('_AD_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured."); +define('_AD_BASE_LANG_NO_TEMPLATE', "Template information has not been configured."); +define('_AD_BASE_LANG_NONE', "None"); +define('_AD_BASE_LANG_NOTIF_SVC', "Notification"); define('_AD_BASE_LANG_OPTIONS', "Options"); define('_AD_BASE_LANG_PACKAGE', "package"); define('_AD_BASE_LANG_RENDER', "render"); define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment"); +define('_AD_BASE_LANG_RESULT', "Results"); +define('_AD_BASE_LANG_SEARCH', "Search"); +define('_AD_BASE_LANG_SEARCH_SVC', "Search"); define('_AD_BASE_LANG_SHOW_FUNC', "Callback show function"); define('_AD_BASE_LANG_SIDE', "Side"); define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block - left"); define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block - right"); +define('_AD_BASE_LANG_SMARTY', "Smarty"); define('_AD_BASE_LANG_SMILE_URL', "Images"); define('_AD_BASE_LANG_SMILES_DELETE', "Delete smiley"); define('_AD_BASE_LANG_SMILES_EDIT', "Edit smiley"); define('_AD_BASE_LANG_SMILES_NEW', "Add a smiley"); -define('_AD_BASE_LANG_SUBMIT', "Submit"); +define('_AD_BASE_LANG_SQL_ENGINE', "SQL engine"); +define('_AD_BASE_LANG_SQL_FILE_NAME', "SQL file name"); +define('_AD_BASE_LANG_SQL_HAS_MAIN', "Use SQL"); +define('_AD_BASE_LANG_SQL_INFO', "SQL information"); +define('_AD_BASE_LANG_SQL_MYSQL', "MySQL"); +define('_AD_BASE_LANG_SUBMENU_NAME', "SubMenu name"); +define('_AD_BASE_LANG_SUBMENU_URL', "SubMenu URL"); +define('_AD_BASE_LANG_TABLE_NAME', "Table name"); +define('_AD_BASE_LANG_TABLE_NUM', "Table Number"); +define('_AD_BASE_LANG_TABLE_PROPERTIES', "Table Properties"); define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups"); define('_AD_BASE_LANG_TARGET_MODULES', "Target modules"); define('_AD_BASE_LANG_TEMPLATE', "Template"); +define('_AD_BASE_LANG_TEMPLATE_DESC', "Template description"); +define('_AD_BASE_LANG_TEMPLATE_ENGINE', "Template engine"); +define('_AD_BASE_LANG_TEMPLATE_FILE', "Template name"); +define('_AD_BASE_LANG_TEMPLATE_HAS_MAIN', "Use template"); +define('_AD_BASE_LANG_TEMPLATE_INFO', "Template information"); +define('_AD_BASE_LANG_TEMPLATE_KEY', "Template Key"); define('_AD_BASE_LANG_THEME', "theme"); define('_AD_BASE_LANG_THEME_ADMIN', "Theme admin"); define('_AD_BASE_LANG_TITLE', "Title"); define('_AD_BASE_LANG_TOPPAGE', "Toppage"); +define('_AD_BASE_LANG_UNINSTALL', "Uninstall"); +define('_AD_BASE_LANG_UPDATE', "Update"); define('_AD_BASE_LANG_VERSION', "version"); define('_AD_BASE_LANG_VISIBLE', "Visible"); define('_AD_BASE_LANG_WEIGHT', "Weight"); @@ -180,269 +257,5 @@ define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "imgcat storetype"); define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
    Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); -define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search"); -define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search...."); -define('_MB_A_BASE_LANG_MENU', "Menu"); -define('_MB_A_BASE_LANG_RESULT', "Results"); -define('_MB_A_BASE_LANG_SEARCH', "Search"); -define('_MD_A_BASE_ERROR_ABOUT_ISACTIVE', "Specified value for 'IS ACTIVE' is invalied."); -define('_MD_A_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or more characters."); -define('_MD_A_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value."); -define('_MD_A_BASE_ERROR_NO_HELP_FILE', "Help file is not found."); -define('_MD_A_BASE_ERROR_REQUIRED', "{0} is required"); -define('_MD_A_BASE_ERROR_SEARCH_REQUIRED', "Input keyword"); -define('_MD_A_BASE_LANG_ACTIONSEARCH', "Action Search"); -define('_MD_A_BASE_LANG_ACTIVE', "Active"); -define('_MD_A_BASE_LANG_ADMIN_MENU', "Information of Administration Menu"); -define('_MD_A_BASE_LANG_ADMINMENU_HAS_MAIN', "Administration Menu"); -define('_MD_A_BASE_LANG_ADMINMENU_INDEX', "Administration Menu"); -define('_MD_A_BASE_LANG_ADMINMENU_MENU', "Detailed module package information "); -define('_MD_A_BASE_LANG_ADMINMENU_NAME', "Name of Administration Menu name"); -define('_MD_A_BASE_LANG_ADMINMENU_URL', "URL of Administration Menu"); -define('_MD_A_BASE_LANG_AGREE', "Agree"); -define('_MD_A_BASE_LANG_ALL_MODULE', "All modules"); -define('_MD_A_BASE_LANG_BLOCK_KEY', "Key"); -define('_MD_A_BASE_LANG_BLOCK_VAL', "Value"); -define('_MD_A_BASE_LANG_BLOCKS_INFO', "Block information"); -define('_MD_A_BASE_LANG_COMMENT_SVC', "Comment"); -define('_MD_A_BASE_LANG_CONFIG_INFO', "Module Preferences"); -define('_MD_A_BASE_LANG_CONFIG_KEY', "Key"); -define('_MD_A_BASE_LANG_CONFIG_VAL', "Value"); -define('_MD_A_BASE_LANG_CONTROL', "Control"); -define('_MD_A_BASE_LANG_DEACTIVATE', "Inactive"); -define('_MD_A_BASE_LANG_FEATURE_SVC_INFO', "Information of feature function"); -define('_MD_A_BASE_LANG_FORCE_MODE', "Force mode: Force uninstall overcoming errors and clean up database as much as possible."); -define('_MD_A_BASE_LANG_INFORMATION', "Information"); -define('_MD_A_BASE_LANG_INSTALL', "Install"); -define('_MD_A_BASE_LANG_ISACTIVE', "Active"); -define('_MD_A_BASE_LANG_LASTUPDATE', "Last update"); -define('_MD_A_BASE_LANG_MAINMENU_HAS_MAIN', "Main Menu"); -define('_MD_A_BASE_LANG_MAINMENU_INFO', "Information of Main Menu"); -define('_MD_A_BASE_LANG_MID', "MID"); -define('_MD_A_BASE_LANG_MOD_AUTHOR', "Module Author"); -define('_MD_A_BASE_LANG_MOD_BASIC_INFO', "Basic Information"); -define('_MD_A_BASE_LANG_MOD_CREDITS', "Signature / Memo"); -define('_MD_A_BASE_LANG_MOD_DESC', "Module discription"); -define('_MD_A_BASE_LANG_MOD_DIR_NAME', "Module directory"); -define('_MD_A_BASE_LANG_MOD_LICENSE_INFO', "Licence Information "); -define('_MD_A_BASE_LANG_MODIFY', "Modify"); -define('_MD_A_BASE_LANG_MODINSTALL', "Module install"); -define('_MD_A_BASE_LANG_MODINSTALL_ADVICE', "Module"); -define('_MD_A_BASE_LANG_MODINSTALL_CONF', "Are you sure to install the module?"); -define('_MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from server to keep security of your site. "); -define('_MD_A_BASE_LANG_MODINSTALL_LOG', "module install log"); -define('_MD_A_BASE_LANG_MODINSTALL_SUCCESS', "The module is successfully installed."); -define('_MD_A_BASE_LANG_MODLIST', "Modules administration"); -define('_MD_A_BASE_LANG_MODULE_LICENSE', "Module license"); -define('_MD_A_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure to uninstall module"); -define('_MD_A_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall"); -define('_MD_A_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log"); -define('_MD_A_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled."); -define('_MD_A_BASE_LANG_MODUPDATE_ADVICE', "Update module"); -define('_MD_A_BASE_LANG_MODUPDATE_CONF', "Confirm module update."); -define('_MD_A_BASE_LANG_MODUPDATE_LOG', "Module update log"); -define('_MD_A_BASE_LANG_MODUPDATE_SUCCESS', "module update success"); -define('_MD_A_BASE_LANG_NAME', "Name"); -define('_MD_A_BASE_LANG_NO_ADMINMENU', "No Administration Menu"); -define('_MD_A_BASE_LANG_NO_AGREE', " I Do Not Agree."); -define('_MD_A_BASE_LANG_NO_BLOCK', "No block information"); -define('_MD_A_BASE_LANG_NO_CHANGE', "No change"); -define('_MD_A_BASE_LANG_NO_CONFIG', "Module preferences has not been configured."); -define('_MD_A_BASE_LANG_NO_MAINMENU', "Mainmenu settings has not been configured."); -define('_MD_A_BASE_LANG_NO_SQL', "SQL information has not been configured."); -define('_MD_A_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured."); -define('_MD_A_BASE_LANG_NO_TEMPLATE', "Template information has not been configured."); -define('_MD_A_BASE_LANG_NOTIF_SVC', "Notification"); -define('_MD_A_BASE_LANG_SEARCH', "Search"); -define('_MD_A_BASE_LANG_SEARCH_SVC', "Search"); -define('_MD_A_BASE_LANG_SMARTY', "Smarty"); -define('_MD_A_BASE_LANG_SQL_ENGINE', "SQL engine"); -define('_MD_A_BASE_LANG_SQL_FILE_NAME', "SQL file name"); -define('_MD_A_BASE_LANG_SQL_HAS_MAIN', "Use SQL"); -define('_MD_A_BASE_LANG_SQL_INFO', "SQL information"); -define('_MD_A_BASE_LANG_SQL_MYSQL', "MySQL"); -define('_MD_A_BASE_LANG_SUBMENU_NAME', "SubMenu name"); -define('_MD_A_BASE_LANG_SUBMENU_URL', "SubMenu URL"); -define('_MD_A_BASE_LANG_SUBMIT', "Submit"); -define('_MD_A_BASE_LANG_TABLE_NAME', "Table name"); -define('_MD_A_BASE_LANG_TABLE_NUM', "Table Number"); -define('_MD_A_BASE_LANG_TABLE_PROPERTIES', "Table Properties"); -define('_MD_A_BASE_LANG_TEMPLATE_DESC', "Template description"); -define('_MD_A_BASE_LANG_TEMPLATE_ENGINE', "Template engine"); -define('_MD_A_BASE_LANG_TEMPLATE_FILE', "Template name"); -define('_MD_A_BASE_LANG_TEMPLATE_HAS_MAIN', "Use template"); -define('_MD_A_BASE_LANG_TEMPLATE_INFO', "Template information"); -define('_MD_A_BASE_LANG_TEMPLATE_KEY', "Template Key"); -define('_MD_A_BASE_LANG_UNINSTALL', "Uninstall"); -define('_MD_A_BASE_LANG_UPDATE', "Update"); -define('_MD_A_BASE_LANG_VERSION', "Version"); -define('_MD_A_BASE_LANG_WEIGHT', "Weight"); -define('_MD_AM_ACTVGROUP', "Select group to which activation mail will be sent"); -define('_MD_AM_ACTVGROUPDSC', "Valid only when 'Activation by administrators' is selected"); -define('_MD_AM_ACTVTYPE', "Select activation type of newly registered users"); -define('_MD_AM_ADMINACTV', "Activation by administrators"); -define('_MD_AM_ADMINML', "Admin mail address"); -define('_MD_AM_ADMNOTSET', "Admin mail is not set."); -define('_MD_AM_ALLOWHTML', "Allow HTML tags in user comments?"); -define('_MD_AM_ALLOWIMAGE', "Allow users to display image files in posts?"); -define('_MD_AM_ALLOWREG', "Allow new user registration?"); -define('_MD_AM_ALLOWREGDSC', "Select yes to accept new user registration"); -define('_MD_AM_ALLOWTHEME', "Allow users to select theme?"); -define('_MD_AM_ALLWCHGMAIL', "Allow users to change email address?"); -define('_MD_AM_ALLWCHGMAILDSC', ""); -define('_MD_AM_ALWDHTML', "HTML tags allowed in all posts."); -define('_MD_AM_ANONNAME', "Username for anonymous users"); -define('_MD_AM_AUTOACTV', "Activate automatically"); -define('_MD_AM_AVATARALLOW', "Allow custom avatar upload?"); -define('_MD_AM_AVATARCONF', "Custom avatar settings"); -define('_MD_AM_AVATARH', "Avatar image max height (pixel)"); -define('_MD_AM_AVATARMAX', "Avatar image max filesize (byte)"); -define('_MD_AM_AVATARMP', "Minimum posts required"); -define('_MD_AM_AVATARMPDSC', "Enter the minimum number of posts required to upload a custom avatar"); -define('_MD_AM_AVATARW', "Avatar image max width (pixel)"); -define('_MD_AM_BADEMAILS', "Enter emails that should not be used in user profile"); -define('_MD_AM_BADEMAILSDSC', "Separate each with a |, case insensitive, regex enabled."); -define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
    Separate each with a |, case insensitive, regex enabled."); -define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc
    aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc
    aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc"); -define('_MD_AM_BADUNAMES', "Enter names that should not be selected as username"); -define('_MD_AM_BADUNAMESDSC', "Separate each with a |, case insensitive, regex enabled."); -define('_MD_AM_BANNERS', "Activate banner ads?"); -define('_MD_AM_CENSOR', "Word Censoring Options"); -define('_MD_AM_CENSORRPLC', "Bad words will be replaced with:"); -define('_MD_AM_CENSORRPLCDSC', "Censored words will be replaced with the characters entered in this textbox"); -define('_MD_AM_CENSORWRD', "Words to censor"); -define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.
    Separate each with a |, case insensitive."); -define('_MD_AM_CHNGUTHEME', "Change all users' theme"); -define('_MD_AM_CLOSESITE', "Turn your site off?"); -define('_MD_AM_CLOSESITEDSC', "Select yes to turn your site off so that only users in selected groups have access to the site. "); -define('_MD_AM_CLOSESITEOK', "Select groups that are allowed to access while the site is turned off."); -define('_MD_AM_CLOSESITEOKDSC', "Users in the default webmasters group are always granted access."); -define('_MD_AM_CLOSESITETXT', "Reason for turning off the site"); -define('_MD_AM_CLOSESITETXTDSC', "The text that is presented when the site is closed."); -define('_MD_AM_COMMODE', "Default Comment Display Mode"); -define('_MD_AM_COMORDER', "Default Comments Display Order"); -define('_MD_AM_DEBUGMODE', "Debug mode"); -define('_MD_AM_DEBUGMODE0', "Off"); -define('_MD_AM_DEBUGMODE1', "PHP Debug"); -define('_MD_AM_DEBUGMODE2', "MySQL/Blocks Debug"); -define('_MD_AM_DEBUGMODE3', "Smarty Templates Debug"); -define('_MD_AM_DEBUGMODEDSC', "Several debug options. A running website should have this turned off."); -define('_MD_AM_DEFAULTTZ', "Default timezone"); -define('_MD_AM_DOBADIPS', "Enable IP bans?"); -define('_MD_AM_DOBADIPSDSC', "Users from specified IP addresses will not be able to view your site"); -define('_MD_AM_DOCENSOR', "Enable censoring of unwanted words?"); -define('_MD_AM_DOCENSORDSC', "Words will be censored if this option is enabled. This option may be turned off for enhanced site speed."); -define('_MD_AM_DONTCHNG', "Don't change!"); -define('_MD_AM_DOSEARCH', "Enable global searches?"); -define('_MD_AM_DOSEARCHDSC', "Allow searching for posts/items within your site."); -define('_MD_AM_DSPDSCLMR', "Display disclaimer?"); -define('_MD_AM_DSPDSCLMRDSC', "Select yes to display disclaimer in registration page"); -define('_MD_AM_DTHEME', "Default theme"); -define('_MD_AM_DTPLSET', "Default template set"); -define('_MD_AM_FOOTER', "Footer"); -define('_MD_AM_FOOTERDSC', "Be sure to type links in full path starting from http://, otherwise the links will not work correctly in modules pages."); -define('_MD_AM_GENERAL', "General Settings"); -define('_MD_AM_IFUCANT', "If you can't change the permissions you can edit the rest of this file by hand."); -define('_MD_AM_INDEXFOLLOW', "Index, Follow"); -define('_MD_AM_INDEXNOFOLLOW', "Index, No Follow"); -define('_MD_AM_INVLDMINPASS', "Invalid value for minimum length of password."); -define('_MD_AM_INVLDSCOOK', "Invalid value for sessioncookie name."); -define('_MD_AM_INVLDSEXP', "Invalid value for session expiration time."); -define('_MD_AM_INVLDUCOOK', "Invalid value for usercookie name."); -define('_MD_AM_IPBAN', "IP Banning"); -define('_MD_AM_LANGUAGE', "Default language"); -define('_MD_AM_LIGHT', "Light (recommended for multi-byte chars)"); -define('_MD_AM_LOADINGIMG', "Display loading... image?"); -define('_MD_AM_MAILER', "Mail Setup"); -define('_MD_AM_MAILER_', ""); -define('_MD_AM_MAILER_MAIL', ""); -define('_MD_AM_MAILER_SENDMAIL', ""); -define('_MD_AM_MAILERMETHOD', "Mail delivery method"); -define('_MD_AM_MAILERMETHODDESC', "Method used to deliver mail. Default is \"mail\", use others only if that makes trouble."); -define('_MD_AM_MAILFROM', "FROM address"); -define('_MD_AM_MAILFROMDESC', ""); -define('_MD_AM_MAILFROMNAME', "FROM name"); -define('_MD_AM_MAILFROMNAMEDESC', ""); -define('_MD_AM_MAILFROMUID', "FROM user"); -define('_MD_AM_MAILFROMUIDDESC', "When the system sends a private message, which user should appear to have sent it?"); -define('_MD_AM_MAXUNAME', "Maximum length of username"); -define('_MD_AM_MEDIUM', "Medium"); -define('_MD_AM_METAAUTHOR', "Meta Author"); -define('_MD_AM_METAAUTHORDSC', "The author meta tag defines the name of the author of the document being read. Supported data formats include the name, email address of the webmaster, company name or URL."); -define('_MD_AM_METACOPYR', "Meta Copyright"); -define('_MD_AM_METACOPYRDSC', "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents."); -define('_MD_AM_METADESC', "Meta Description"); -define('_MD_AM_METADESCDSC', "The description meta tag is a general description of what is contained in your web page"); -define('_MD_AM_METAFOOTER', "Meta Tags and Footer"); -define('_MD_AM_METAKEY', "Meta Keywords"); -define('_MD_AM_METAKEYDSC', "The keywords meta tag is a series of keywords that represents the content of your site. Type in keywords with each separated by a comma or a space in between. (Ex. XOOPS, PHP, mySQL, portal system)"); -define('_MD_AM_METAO14YRS', "14 years"); -define('_MD_AM_METAOGEN', "General"); -define('_MD_AM_METAOMAT', "Mature"); -define('_MD_AM_METAOREST', "Restricted"); -define('_MD_AM_METARATING', "Meta Rating"); -define('_MD_AM_METARATINGDSC', "The rating meta tag defines your site age and content rating"); -define('_MD_AM_METAROBOTS', "Meta Robots"); -define('_MD_AM_METAROBOTSDSC', "The Robots Tag declares to search engines what content to index and spider"); -define('_MD_AM_MINPASS', "Minimum length of password required"); -define('_MD_AM_MINSEARCH', "Minimum keyword length"); -define('_MD_AM_MINSEARCHDSC', "Enter the minimum keyword length that users are required to enter to perform search"); -define('_MD_AM_MINUNAME', "Minimum length of username required"); -define('_MD_AM_MODCACHE', "Module-wide Cache"); -define('_MD_AM_MODCACHEDSC', "Caches module contents for a specified amount of time to enhance performance. Setting module-wide cache will override module item level cache if any."); -define('_MD_AM_MODCONFIG', "Module Config Options"); -define('_MD_AM_MYIP', "Your IP address"); -define('_MD_AM_MYIPDSC', "This IP will not counted as impression for banners"); -define('_MD_AM_NEWUNOTIFY', "Notify by mail when a new user is registered?"); -define('_MD_AM_NO', "No"); -define('_MD_AM_NOINDEXFOLLOW', "No Index, Follow"); -define('_MD_AM_NOINDEXNOFOLLOW', "No Index, No Follow"); -define('_MD_AM_NOMODULE', "There is no module that can be cached."); -define('_MD_AM_NONE', "None"); -define('_MD_AM_NOTIFYTO', "Select group to which new user notification mail will be sent"); -define('_MD_AM_PREFMAIN', "Preferences Main"); -define('_MD_AM_REGDSCLMR', "Registration disclaimer"); -define('_MD_AM_REGDSCLMRDSC', "Enter text to be displayed as registration disclaimer"); -define('_MD_AM_REMEMBER', "Remember to chmod 666 this file in order to let the system write to it properly."); -define('_MD_AM_SEARCH', "Search Options"); -define('_MD_AM_SELFDELETE', "Allow users to delete own account?"); -define('_MD_AM_SENDMAILPATH', "Path to sendmail"); -define('_MD_AM_SENDMAILPATHDESC', "Path to the sendmail program (or substitute) on the webserver."); -define('_MD_AM_SERVERTZ', "Server timezone"); -define('_MD_AM_SESSEXPIRE', "Session expiration"); -define('_MD_AM_SESSEXPIREDSC', "Maximum duration of session idle time in minutes (Valid only when 'use custom session' is enabled. Works only when you are using PHP4.2.0 or later.)"); -define('_MD_AM_SESSNAME', "Session name"); -define('_MD_AM_SESSNAMEDSC', "The name of session (Valid only when 'use custom session' is enabled)"); -define('_MD_AM_SITECACHE', "Site-wide Cache"); -define('_MD_AM_SITECACHEDSC', "Caches whole contents of the site for a specified amount of time to enhance performance. Setting site-wide cache will override module-level cache, block-level cache, and module item level cache if any."); -define('_MD_AM_SITENAME', "Site name"); -define('_MD_AM_SITEPREF', "Site Preferences"); -define('_MD_AM_SLOGAN', "Slogan for your site"); -define('_MD_AM_SMTPHOST', "SMTP host(s)"); -define('_MD_AM_SMTPHOSTDESC', "List of SMTP servers to try to connect to."); -define('_MD_AM_SMTPPASS', "SMTPAuth password"); -define('_MD_AM_SMTPPASSDESC', "Password to connect to an SMTP host with SMTPAuth."); -define('_MD_AM_SMTPUSER', "SMTPAuth username"); -define('_MD_AM_SMTPUSERDESC', "Username to connect to an SMTP host with SMTPAuth."); -define('_MD_AM_SSLLINK', "URL where SSL login page is located"); -define('_MD_AM_SSLPOST', "SSL Post variable name"); -define('_MD_AM_SSLPOSTDSC', "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess."); -define('_MD_AM_STARTPAGE', "Module for your start page"); -define('_MD_AM_STRICT', "Strict (only alphabets and numbers)"); -define('_MD_AM_THEMEFILE', "Update module template .html files from themes/your theme/templates directory?"); -define('_MD_AM_THEMEFILEDSC', "If this option is enabled, module template .html files will be updated automatically if there are newer files under the themes/your theme/templates directory for the current theme. This should be turned off once the site goes public."); -define('_MD_AM_THEMEOK', "Selectable themes"); -define('_MD_AM_THEMEOKDSC', "Choose themes that users can select as the default theme"); -define('_MD_AM_THEMESET', "Theme Set"); -define('_MD_AM_UNAMELVL', "Select the level of strictness for username filtering"); -define('_MD_AM_USEGZIP', "Use gzip compression?"); -define('_MD_AM_USEMYSESS', "Use custom session"); -define('_MD_AM_USEMYSESSDSC', "Select yes to customise session related values."); -define('_MD_AM_USERACTV', "Requires activation by user (recommended)"); -define('_MD_AM_USERCOOKIE', "Name for user cookies."); -define('_MD_AM_USERCOOKIEDSC', "This cookie contains only a user name and is saved in a user pc for a year (if the user wishes). If a user have this cookie, username will be automatically inserted in the login box."); -define('_MD_AM_USERSETTINGS', "User Info Settings"); -define('_MD_AM_USESSL', "Use SSL for login?"); -define('_MD_AM_YES', "Yes"); ?> From minahito @ users.sourceforge.jp Fri Aug 18 20:28:48 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 20:28:48 +0900 Subject: [xoops-cvslog 4214] CVS update: xoops2jp/html/modules/base/forms Message-ID: <20060818112848.264F12AC085@users.sourceforge.jp> Index: xoops2jp/html/modules/base/forms/ImageUploadForm.class.php diff -u xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:1.1.2.2 xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:1.1.2.3 --- xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:1.1.2.2 Mon May 29 16:07:06 2006 +++ xoops2jp/html/modules/base/forms/ImageUploadForm.class.php Fri Aug 18 20:28:48 2006 @@ -30,17 +30,17 @@ // $this->mFieldProperties['image_name'] =& new XCube_FieldProperty($this); $this->mFieldProperties['image_name']->setDependsByArray(array('extension')); - $this->mFieldProperties['image_name']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMAGE_NAME); + $this->mFieldProperties['image_name']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMAGE_NAME); $this->mFieldProperties['image_name']->addMessage('maxlength', _AD_BASE_ERROR_EXTENSION, _AD_BASE_LANG_IMAGE_NAME); $this->mFieldProperties['image_name']->addVar('extension', 'jpg,gif,png'); $this->mFieldProperties['image_nicename'] =& new XCube_FieldProperty($this); $this->mFieldProperties['image_nicename']->setDependsByArray(array('required')); - $this->mFieldProperties['image_nicename']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMAGE_NICENAME); + $this->mFieldProperties['image_nicename']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_IMAGE_NICENAME); $this->mFieldProperties['imgcat_id'] =& new XCube_FieldProperty($this); $this->mFieldProperties['imgcat_id']->setDependsByArray(array('required','objectExist')); - $this->mFieldProperties['imgcat_id']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMGCAT_ID); + $this->mFieldProperties['imgcat_id']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMGCAT_ID); $this->mFieldProperties['imgcat_id']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_IMGCAT_ID); $this->mFieldProperties['imgcat_id']->addVar('handler', 'imagecategory'); $this->mFieldProperties['imgcat_id']->addVar('module', 'base'); @@ -77,7 +77,7 @@ $formFile = $this->get('image_name'); if ($formFile == null && $this->_mIsNew ) { - $this->addErrorMessage(_AD_BASE_ERROR_REQUIRED); + $this->addErrorMessage(_MD_BASE_ERROR_REQUIRED); } } From minahito @ users.sourceforge.jp Fri Aug 18 20:29:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 18 Aug 2006 20:29:46 +0900 Subject: [xoops-cvslog 4215] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060818112946.8D4E72AC093@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/image_list.html diff -u xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/image_list.html Fri Aug 18 20:29:46 2006 @@ -16,10 +16,10 @@ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_BASE_LANG_IMAGE_NAME}><{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}>
    +
    <{$smarty.const._MD_BASE_LANG_IMAGE_NICENAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_BASE_LANG_IMAGE_MIMETYPE}>
    +
    <{$smarty.const._MD_BASE_LANG_IMAGE_MIMETYPE}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_BASE_LANG_IMAGE_CREATED}>
    Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.15 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.16 --- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.15 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html Fri Aug 18 20:29:46 2006 @@ -56,10 +56,10 @@
    <{$obj->getShow('template')}> <{if $obj->get('block_type') == 'C'}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_INSTALL}>" title="<{$smarty.const._AD_BASE_LANG_INSTALL}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> <{else}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_INSTALL}>"title="<{$smarty.const._AD_BASE_LANG_INSTALL}>" /> <{/if}>
    - - - - - - - + <{foreach item=module from=$moduleObjects}> @@ -59,17 +59,17 @@ <{/foreach}>
    <{$smarty.const._MD_A_BASE_LANG_MID}>
    +
    <{$smarty.const._AD_BASE_LANG_MID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_NAME}>
    +
    <{$smarty.const._AD_BASE_LANG_NAME}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_VERSION}>
    +
    <{$smarty.const._AD_BASE_LANG_VERSION}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}>
    +
    <{$smarty.const._AD_BASE_LANG_LASTUPDATE}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_WEIGHT}>
    +
    <{$smarty.const._AD_BASE_LANG_WEIGHT}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}>
    +
    <{$smarty.const._AD_BASE_LANG_ISACTIVE}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._MD_A_BASE_LANG_CONTROL}><{$smarty.const._AD_BASE_LANG_CONTROL}>
    get('isactive')}>checked="checked"<{/if}> /> - " alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_UPDATE}>" title="<{$smarty.const._AD_BASE_LANG_UPDATE}>" /> <{if $module->get('isactive') == 0 }> - " alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._AD_BASE_LANG_UNINSTALL}>" /> <{/if}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" title="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" />
    - +
    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.11 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html Fri Aug 18 20:29:46 2006 @@ -5,7 +5,7 @@

    <{$smarty.const._MI_BASE_MENU_ACTIONSEARCH}>

    -
    <{$smarty.const._MB_A_BASE_LANG_ACTIONSEARCH_INFO}>
    +
    <{$smarty.const._AD_BASE_LANG_ACTIONSEARCH_INFO}>
    <{xoops_input type=hidden name=action value=ActSearch}> <{xoops_token form=$actionForm}> 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.6 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.6 Mon Aug 14 21:16:18 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html Fri Aug 18 20:29:46 2006 @@ -1,6 +1,6 @@ <{include file="legacy_admin_actionsearch_form.html"}> -

    <{$smarty.const._MB_A_BASE_LANG_RESULT}>

    +

    <{$smarty.const._AD_BASE_LANG_RESULT}>

      <{foreach item=record from=$records}> Index: xoops2jp/html/modules/base/admin/templates/image_delete.html diff -u xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/image_delete.html Fri Aug 18 20:29:46 2006 @@ -27,11 +27,11 @@ "><{$object->getShow('image_name')}> - <{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}> + <{$smarty.const._MD_BASE_LANG_IMAGE_NICENAME}> "><{$object->getShow('image_nicename')}> - <{$smarty.const._AD_BASE_LANG_IMAGE_MIMETYPE}> + <{$smarty.const._MD_BASE_LANG_IMAGE_MIMETYPE}> "><{$object->getShow('image_mimetype')}> Index: xoops2jp/html/modules/base/admin/templates/module_uninstall.html diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_uninstall.html Fri Aug 18 20:29:46 2006 @@ -1,13 +1,13 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_CONF}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}>

      +

      <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_CONF}>

        -
      • <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}> +
      • <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}>
      <{if $actionForm->hasError()}> @@ -26,22 +26,22 @@ - + - + - + - + - + - + - + Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.14 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.15 --- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.14 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_delete.html Fri Aug 18 20:29:46 2006 @@ -16,19 +16,19 @@ - + - + - + - + - + - + @@ -56,15 +56,15 @@ - + - + - + @@ -79,22 +79,22 @@ - + @@ -110,13 +110,13 @@
      <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}><{$smarty.const._AD_BASE_LANG_MODUNINSTALL_CONF}>
      <{$module->modinfo.name|escape}>
      <{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}><{$smarty.const._AD_BASE_LANG_MOD_DIR_NAME}> <{$module->getShow('dirname')}>
      <{$smarty.const._MD_A_BASE_LANG_VERSION}><{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> @@ -50,7 +50,7 @@
      <{$smarty.const._MD_A_BASE_LANG_MID}><{$smarty.const._AD_BASE_LANG_MID}> <{if $module->get('mid')}> <{$module->getShow('mid')}> @@ -60,7 +60,7 @@
      <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}><{$smarty.const._AD_BASE_LANG_LASTUPDATE}> <{if $module->get('last_update')}> <{$module->get('last_update')|xoops_formattimestamp:l}> @@ -70,17 +70,17 @@
      <{$smarty.const._MD_A_BASE_LANG_MOD_DESC}><{$smarty.const._AD_BASE_LANG_MOD_DESC}> <{$module->modinfo.description|escape}>
      - <{$smarty.const._MD_A_BASE_LANG_FORCE_MODE}> + <{$smarty.const._AD_BASE_LANG_FORCE_MODE}>
      - +
      <{$smarty.const._AD_BASE_LANG_COMMENT_DELETE}>
      <{$smarty.const._AD_BASE_LANG_COM_ID}><{$smarty.const._MD_BASE_LANG_COM_ID}> "><{$object->getShow('com_id')}>
      <{$smarty.const._AD_BASE_LANG_COM_PID}><{$smarty.const._MD_BASE_LANG_COM_PID}> "><{$object->getShow('com_pid')}>
      <{$smarty.const._AD_BASE_LANG_COM_ROOTID}><{$smarty.const._MD_BASE_LANG_COM_ROOTID}> "><{$object->getShow('com_rootid')}>
      <{$smarty.const._AD_BASE_LANG_COM_MODID}><{$smarty.const._MD_BASE_LANG_COM_MODID}> "> <{if $obj->mModule}> <{$obj->mModule->getShow('name')}> @@ -36,11 +36,11 @@
      <{$smarty.const._AD_BASE_LANG_COM_ITEMID}><{$smarty.const._MD_BASE_LANG_COM_ITEMID}> "><{$object->getShow('com_itemid')}>
      <{$smarty.const._AD_BASE_LANG_COM_ICON}><{$smarty.const._MD_BASE_LANG_COM_ICON}> ">
      "><{$object->mUser->getShow('uname')}>
      <{$smarty.const._AD_BASE_LANG_COM_IP}><{$smarty.const._MD_BASE_LANG_COM_IP}> "><{$object->getShow('com_ip')}>
      <{$smarty.const._AD_BASE_LANG_COM_TITLE}><{$smarty.const._MD_BASE_LANG_COM_TITLE}> "><{$object->getShow('com_title')}>
      <{$smarty.const._AD_BASE_LANG_COM_TEXT}><{$smarty.const._MD_BASE_LANG_COM_TEXT}> "><{$object->getShow('com_text')}>
      "><{$object->mStatus->getShow('name')}>
      <{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}><{$smarty.const._MD_BASE_LANG_COM_EXPARAMS}> "><{$object->getShow('com_exparams')}>
      <{$smarty.const._AD_BASE_LANG_CONTROL}> "> <{xoops_input type=checkbox name=dohtml value=1 default=$object->get('dohtml') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOHTML}>
      + <{$smarty.const._MD_BASE_LANG_DOHTML}>
      <{xoops_input type=checkbox name=dosmiley value=1 default=$object->get('dosmiley') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOSMILEY}>
      + <{$smarty.const._MD_BASE_LANG_DOSMILEY}>
      <{xoops_input type=checkbox name=doxcode value=1 default=$object->get('doxcode') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOXCODE}>
      + <{$smarty.const._MD_BASE_LANG_DOXCODE}>
      <{xoops_input type=checkbox name=doimage value=1 default=$object->get('doimage') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOIMAGE}>
      <{xoops_input type=checkbox name=dobr value=1 default=$object->get('dobr') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOBR}> + <{$smarty.const._MD_BASE_LANG_DOBR}>
      - <{foreach item=obj from=$children}> Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html Fri Aug 18 20:29:46 2006 @@ -1,20 +1,20 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>

      +

      <{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}>

      <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=confirm value=1}>
      <{$smarty.const._AD_BASE_LANG_COM_ID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_MODID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_TITLE}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_ID}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_MODID}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_TITLE}>
      <{$smarty.const._AD_BASE_LANG_COM_CREATED}>
      <{$smarty.const._AD_BASE_LANG_COM_MODIFIED}>
      <{$smarty.const._AD_BASE_LANG_COM_UID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_IP}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_IP}>
      <{$smarty.const._AD_BASE_LANG_COM_STATUS}>
      - - - - + + + + <{foreach item=mid from=$mids}> @@ -36,19 +36,19 @@ @@ -63,7 +63,7 @@ <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/module_update.html diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_update.html Fri Aug 18 20:29:46 2006 @@ -1,12 +1,12 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}>

      +

      <{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}>

      -
      <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getShow('name')}>
      +
      <{$smarty.const._AD_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getShow('name')}>
      <{if $actionForm->hasError()}>
      @@ -23,22 +23,22 @@ <{xoops_input type=hidden name=dirname value=$module->get('dirname')}>
      <{$smarty.const._MD_A_BASE_LANG_MID}><{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._MD_A_BASE_LANG_WEIGHT}><{$smarty.const._MD_A_BASE_LANG_ISACTIVE}><{$smarty.const._AD_BASE_LANG_MID}><{$smarty.const._AD_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_WEIGHT}><{$smarty.const._AD_BASE_LANG_ISACTIVE}>
      <{if $actionForm->get('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}> - <{$smarty.const._MD_A_BASE_LANG_NO_CHANGE}> + <{$smarty.const._AD_BASE_LANG_NO_CHANGE}> <{else}> (<{if $moduleObjects[$mid]->getProperty('isactive') == 1 }> - <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}> + <{$smarty.const._AD_BASE_LANG_ISACTIVE}> <{else}> - <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}> + <{$smarty.const._AD_BASE_LANG_DEACTIVATE}> <{/if}>) » <{if $actionForm->get('isactive',$mid) == 1}> - <{$smarty.const._MD_A_BASE_LANG_ISACTIVE}> + <{$smarty.const._AD_BASE_LANG_ISACTIVE}> <{else}> - <{$smarty.const._MD_A_BASE_LANG_DEACTIVATE}> + <{$smarty.const._AD_BASE_LANG_DEACTIVATE}> <{/if}> <{/if}>
      - +
      - + - + - + - + - + - + - + Index: xoops2jp/html/modules/base/admin/templates/module_install.html diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_install.html Fri Aug 18 20:29:46 2006 @@ -1,13 +1,13 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>

      +

      <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>

      -
      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name','e')}>
      +
      <{$smarty.const._AD_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name','e')}>
      <{if $actionForm->hasError()}>
      @@ -24,22 +24,22 @@
      <{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}><{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}>
      <{$module->getShow('name')}>
      <{$module->modinfo.name|escape}>
      <{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}><{$smarty.const._AD_BASE_LANG_MOD_DIR_NAME}> <{$module->getShow('dirname')}>
      <{$smarty.const._MD_A_BASE_LANG_VERSION}><{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> » <{math equation=$module->modinfo.version format="%.2f"}> @@ -46,7 +46,7 @@
      <{$smarty.const._MD_A_BASE_LANG_MID}><{$smarty.const._AD_BASE_LANG_MID}> <{if $module->get('mid')}> <{$module->getShow('mid')}> @@ -56,7 +56,7 @@
      <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}><{$smarty.const._AD_BASE_LANG_LASTUPDATE}> <{if $module->get('last_update')}> <{$module->get('last_update')|xoops_formattimestamp:l}> @@ -66,12 +66,12 @@
      <{$smarty.const._MD_A_BASE_LANG_MOD_DESC}><{$smarty.const._AD_BASE_LANG_MOD_DESC}> <{$module->modinfo.description|escape}>
      - +
      - + - + - + - + - + - + - + Index: xoops2jp/html/modules/base/admin/templates/comment_view.html diff -u xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.6 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_view.html Fri Aug 18 20:29:46 2006 @@ -11,27 +11,27 @@ - + - + - + - + - + - + @@ -47,15 +47,15 @@ - + - + - + @@ -70,22 +70,22 @@ - +
      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}><{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      <{$module->modinfo.name|escape}>
      <{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}><{$smarty.const._AD_BASE_LANG_MOD_DIR_NAME}> <{$module->getShow('dirname')}>
      <{$smarty.const._MD_A_BASE_LANG_VERSION}><{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> » <{math equation=$module->modinfo.version format="%.2f"}> @@ -47,7 +47,7 @@
      <{$smarty.const._MD_A_BASE_LANG_MID}><{$smarty.const._AD_BASE_LANG_MID}> <{if $module->get('mid')}> <{$module->getShow('mid')}> @@ -57,7 +57,7 @@
      <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}><{$smarty.const._AD_BASE_LANG_LASTUPDATE}> <{if $module->get('last_update')}> <{$module->get('last_update')|xoops_formattimestamp:l}> @@ -67,12 +67,12 @@
      <{$smarty.const._MD_A_BASE_LANG_MOD_DESC}><{$smarty.const._AD_BASE_LANG_MOD_DESC}> <{$module->modinfo.description|escape}>
      - +
      <{$smarty.const._AD_BASE_LANG_COMMENT_VIEW}>
      <{$smarty.const._AD_BASE_LANG_COM_ID}><{$smarty.const._MD_BASE_LANG_COM_ID}> "><{$object->getShow('com_id')}>
      <{$smarty.const._AD_BASE_LANG_COM_PID}><{$smarty.const._MD_BASE_LANG_COM_PID}> "><{$object->getShow('com_pid')}>
      <{$smarty.const._AD_BASE_LANG_COM_ROOTID}><{$smarty.const._MD_BASE_LANG_COM_ROOTID}> "><{$object->getShow('com_rootid')}>
      <{$smarty.const._AD_BASE_LANG_COM_MODID}><{$smarty.const._MD_BASE_LANG_COM_MODID}> "><{$object->mModule->getShow('name')}>
      <{$smarty.const._AD_BASE_LANG_COM_ITEMID}><{$smarty.const._MD_BASE_LANG_COM_ITEMID}> "><{$object->getShow('com_itemid')}>
      <{$smarty.const._AD_BASE_LANG_COM_ICON}><{$smarty.const._MD_BASE_LANG_COM_ICON}> ">
      "><{$object->mUser->getShow('uname')}>
      <{$smarty.const._AD_BASE_LANG_COM_IP}><{$smarty.const._MD_BASE_LANG_COM_IP}> "><{$object->getShow('com_ip')}>
      <{$smarty.const._AD_BASE_LANG_COM_TITLE}><{$smarty.const._MD_BASE_LANG_COM_TITLE}> "><{$object->getShow('com_title')}>
      <{$smarty.const._AD_BASE_LANG_COM_TEXT}><{$smarty.const._MD_BASE_LANG_COM_TEXT}> "><{$object->getShow('com_text')}>
      "><{$object->mStatus->getShow('name')}>
      <{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}><{$smarty.const._MD_BASE_LANG_COM_EXPARAMS}> "><{$object->getShow('com_exparams')}>
      <{$smarty.const._AD_BASE_LANG_CONTROL}> "> <{xoops_input type=checkbox name=dohtml value=1 default=$object->get('dohtml') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOHTML}>
      + <{$smarty.const._MD_BASE_LANG_DOHTML}>
      <{xoops_input type=checkbox name=dosmiley value=1 default=$object->get('dosmiley') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOSMILEY}>
      + <{$smarty.const._MD_BASE_LANG_DOSMILEY}>
      <{xoops_input type=checkbox name=doxcode value=1 default=$object->get('doxcode') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOXCODE}>
      + <{$smarty.const._MD_BASE_LANG_DOXCODE}>
      <{xoops_input type=checkbox name=doimage value=1 default=$object->get('doimage') disabled=true}> <{$smarty.const._AD_BASE_LANG_DOIMAGE}>
      <{xoops_input type=checkbox name=dobr value=1 default=$object->get('dobr') disabled=true}> - <{$smarty.const._AD_BASE_LANG_DOBR}> + <{$smarty.const._MD_BASE_LANG_DOBR}>
      @@ -94,13 +94,13 @@ - <{foreach item=obj from=$children}> Index: xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html Fri Aug 18 20:29:46 2006 @@ -1,12 +1,12 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_SUCCESS}> + »» <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_SUCCESS}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_SUCCESS}>

      +

      <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_SUCCESS}>

      -

      <{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_LOG}>

      +

      <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_LOG}>

        <{foreach item=msg from=$log}> <{if $msg.type=="error"}> @@ -19,4 +19,4 @@ <{/foreach}>
      -

      » <{$smarty.const._MD_A_BASE_LANG_MODLIST}>

      +

      » <{$smarty.const._AD_BASE_LANG_MODLIST}>

      Index: xoops2jp/html/modules/base/admin/templates/smiles_edit.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_edit.html Fri Aug 18 20:29:46 2006 @@ -44,7 +44,7 @@ <{/if}> - + @@ -56,7 +56,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html Fri Aug 18 20:29:46 2006 @@ -1,8 +1,8 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>

      <{$licence|escape}>

      @@ -30,12 +30,12 @@
      <{$smarty.const._AD_BASE_LANG_COM_ID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_MODID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_TITLE}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_ID}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_MODID}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_TITLE}>
      <{$smarty.const._AD_BASE_LANG_COM_CREATED}>
      <{$smarty.const._AD_BASE_LANG_COM_MODIFIED}>
      <{$smarty.const._AD_BASE_LANG_COM_UID}>
      -
      <{$smarty.const._AD_BASE_LANG_COM_IP}>
      +
      <{$smarty.const._MD_BASE_LANG_COM_IP}>
      <{$smarty.const._AD_BASE_LANG_COM_STATUS}>
      <{$smarty.const._AD_BASE_LANG_CODE}><{$smarty.const._MD_BASE_LANG_CODE}> "> <{xoops_input type=text name=code value=$actionForm->get('code') size=15 maxlength=50}>
      <{$smarty.const._AD_BASE_LANG_EMOTION}><{$smarty.const._MD_BASE_LANG_EMOTION}> "> <{xoops_input type=text name=emotion value=$actionForm->get('emotion') size=30 maxlength=75}>
      - <{$smarty.const._MD_A_BASE_LANG_AGREE}> - <{$smarty.const._MD_A_BASE_LANG_NO_AGREE}> + <{$smarty.const._AD_BASE_LANG_AGREE}> + <{$smarty.const._AD_BASE_LANG_NO_AGREE}>
      - +
      Index: xoops2jp/html/modules/base/admin/templates/install_wizard.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.6 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard.html Fri Aug 18 20:29:46 2006 @@ -1,14 +1,14 @@
      <{$smarty.const._MI_BASE_NAME}> »» <{$smarty.const._MI_BASE_MENU_MODULELIST}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}> - »» <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL}> + »» <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      -

      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}>

      +

      <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>

        -
      • <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}> +
      • <{$smarty.const._AD_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}>
      @@ -16,7 +16,7 @@ - +
      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}><{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      @@ -33,7 +33,7 @@
      - +
      Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Fri Aug 18 20:29:46 2006 @@ -14,13 +14,13 @@ <{$smarty.const._AD_BASE_LANG_ID}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{$smarty.const._AD_BASE_LANG_CODE}>
      + <{$smarty.const._MD_BASE_LANG_CODE}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> <{$smarty.const._AD_BASE_LANG_SMILE_URL}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{$smarty.const._AD_BASE_LANG_EMOTION}>
      + <{$smarty.const._MD_BASE_LANG_EMOTION}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> <{$smarty.const._AD_BASE_LANG_DISPLAY}>
      Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Fri Aug 18 20:29:46 2006 @@ -1,18 +1,18 @@ -

      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL}>

      +

      <{$smarty.const._AD_BASE_LANG_MODINSTALL}>

      -
      <{$smarty.const._MD_A_BASE_LANG_MODINSTALL_LIST_ADVICE}>
      +
      <{$smarty.const._AD_BASE_LANG_MODINSTALL_LIST_ADVICE}>
      - - - + + + <{foreach item=module from=$moduleObjects}> @@ -22,8 +22,8 @@ <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/image_edit.html diff -u xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/image_edit.html Fri Aug 18 20:29:46 2006 @@ -45,7 +45,7 @@ - + Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.17 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.18 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.17 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Fri Aug 18 20:29:46 2006 @@ -119,7 +119,7 @@ <{elseif $config->get('conf_formtype') == 'startpage'}> Index: xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html diff -u xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html:1.1.2.3 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html:1.1.2.2 Mon Aug 14 21:16:18 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_error.html Fri Aug 18 20:29:46 2006 @@ -1,6 +1,6 @@ <{include file="legacy_admin_actionsearch_form.html"}> -

      <{$smarty.const._MB_A_BASE_LANG_RESULT}>

      +

      <{$smarty.const._AD_BASE_LANG_RESULT}>

      -

      <{$smarty.const._MD_A_BASE_LANG_INFORMATION}>

      +

      <{$smarty.const._AD_BASE_LANG_INFORMATION}>

      -
      <{$smarty.const._MD_A_BASE_LANG_MOD_BASIC_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}>
      <{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._MD_A_BASE_LANG_VERSION}><{$smarty.const._MD_A_BASE_LANG_CONTROL}><{$smarty.const._AD_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_VERSION}><{$smarty.const._AD_BASE_LANG_CONTROL}>
      <{$module->getRenderedVersion()}> - " alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /> - " alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_INSTALL}>" title="<{$smarty.const._AD_BASE_LANG_INSTALL}>" /> + " alt="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" title="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" />
      <{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}><{$smarty.const._MD_BASE_LANG_IMAGE_NICENAME}> "> <{xoops_input type=text name=image_nicename value=$actionForm->get('image_nicename') size=30 maxlength=255}>
      - + - + - + - + - + - + - +
      <{$smarty.const._MD_A_BASE_LANG_MOD_BASIC_INFO}><{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}>
      <{$module->getShow('name')}>
      <{$module->modinfo.name|escape}>
      <{$smarty.const._MD_A_BASE_LANG_NAME}><{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}><{$smarty.const._AD_BASE_LANG_MOD_DIR_NAME}> <{$module->getShow('dirname')}>
      <{$smarty.const._MD_A_BASE_LANG_VERSION}><{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> » <{math equation=$module->modinfo.version format="%.2f"}> @@ -35,7 +35,7 @@
      <{$smarty.const._MD_A_BASE_LANG_MID}><{$smarty.const._AD_BASE_LANG_MID}> <{if $module->get('mid')}> <{$module->getShow('mid')}> @@ -45,7 +45,7 @@
      <{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}><{$smarty.const._AD_BASE_LANG_LASTUPDATE}> <{if $module->get('last_update')}> <{$module->get('last_update')|xoops_formattimestamp:l}> @@ -55,51 +55,51 @@
      <{$smarty.const._MD_A_BASE_LANG_MOD_DESC}><{$smarty.const._AD_BASE_LANG_MOD_DESC}> <{$module->modinfo.description|escape}>

      -
      <{$smarty.const._MD_A_BASE_LANG_MOD_LICENSE_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>
      - + - + - +
      <{$smarty.const._MD_A_BASE_LANG_MODULE_LICENSE}><{$smarty.const._AD_BASE_LANG_MODULE_LICENSE}> <{$module->modinfo.license|escape}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_AUTHOR}><{$smarty.const._AD_BASE_LANG_MOD_AUTHOR}> <{$module->modinfo.author|escape}>
      <{$smarty.const._MD_A_BASE_LANG_MOD_CREDITS}><{$smarty.const._AD_BASE_LANG_MOD_CREDITS}> <{$module->modinfo.credits|escape}>

      -
      <{$smarty.const._MD_A_BASE_LANG_SQL_INFO}>
      +
      <{$smarty.const._AD_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._AD_BASE_LANG_SQL_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      <{$smarty.const._MD_A_BASE_LANG_SQL_ENGINE}><{$smarty.const._MD_A_BASE_LANG_SQL_MYSQL}><{$smarty.const._AD_BASE_LANG_SQL_ENGINE}><{$smarty.const._AD_BASE_LANG_SQL_MYSQL}>
      <{$smarty.const._MD_A_BASE_LANG_SQL_FILE_NAME}><{$smarty.const._AD_BASE_LANG_SQL_FILE_NAME}> <{$module->modinfo.sqlfile.mysql}>

      - - - + + + <{foreach from=$module->modinfo.tables item=table key=table_key}> @@ -110,25 +110,25 @@ <{/foreach}>
      <{$smarty.const._MD_A_BASE_LANG_TABLE_NUM}><{$smarty.const._MD_A_BASE_LANG_TABLE_NAME}><{$smarty.const._MD_A_BASE_LANG_TABLE_PROPERTIES}><{$smarty.const._AD_BASE_LANG_TABLE_NUM}><{$smarty.const._AD_BASE_LANG_TABLE_NAME}><{$smarty.const._AD_BASE_LANG_TABLE_PROPERTIES}>
      <{else}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_SQL}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_SQL}>
      <{/if}>
      -
      <{$smarty.const._MD_A_BASE_LANG_MAINMENU_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_MAINMENU_INFO}>
      <{if $module->get('hasmain')}> - - + +
      <{$smarty.const._MD_A_BASE_LANG_MAINMENU_HAS_MAIN}><{$smarty.const._MD_A_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_MAINMENU_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}>

      - - + + <{foreach from=$module->modinfo.sub item=sub }> "> @@ -137,29 +137,29 @@ <{foreachelse}> - + <{/foreach}>
      <{$smarty.const._MD_A_BASE_LANG_SUBMENU_NAME}><{$smarty.const._MD_A_BASE_LANG_SUBMENU_URL}><{$smarty.const._AD_BASE_LANG_SUBMENU_NAME}><{$smarty.const._AD_BASE_LANG_SUBMENU_URL}>
      <{$smarty.const._MD_A_BASE_LANG_NO_SUBMENU}><{$smarty.const._AD_BASE_LANG_NO_SUBMENU}>
      <{else}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_MAINMENU}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_MAINMENU}>
      <{/if}>
      -
      <{$smarty.const._MD_A_BASE_LANG_ADMIN_MENU}>
      +
      <{$smarty.const._AD_BASE_LANG_ADMIN_MENU}>
      <{if $module->get('hasadmin')}> - - + + - + - + @@ -171,9 +171,9 @@
      <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_HAS_MAIN}><{$smarty.const._MD_A_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ADMINMENU_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_INDEX}><{$smarty.const._AD_BASE_LANG_ADMINMENU_INDEX}> <{$module->modinfo.adminindex|escape}>
      <{$smarty.const._MD_A_BASE_LANG_ADMINMENU_MENU}><{$smarty.const._AD_BASE_LANG_ADMINMENU_MENU}> <{$module->modinfo.adminmenu|escape}>
      - - - + + + <{foreach from=$module->adminmenu item=admin key=admin_key}> @@ -185,29 +185,29 @@
      <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_KEY}><{$smarty.const._MD_A_BASE_LANG_ADMINMENU_NAME}><{$smarty.const._MD_A_BASE_LANG_ADMINMENU_URL}><{$smarty.const._AD_BASE_LANG_TEMPLATE_KEY}><{$smarty.const._AD_BASE_LANG_ADMINMENU_NAME}><{$smarty.const._AD_BASE_LANG_ADMINMENU_URL}>
      <{/if}> <{else}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_ADMINMENU}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_ADMINMENU}>
      <{/if}>
      -
      <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_INFO}>
      +
      <{$smarty.const._AD_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._AD_BASE_LANG_TEMPLATE_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_ENGINE}><{$smarty.const._MD_A_BASE_LANG_SMARTY}><{$smarty.const._AD_BASE_LANG_TEMPLATE_ENGINE}><{$smarty.const._AD_BASE_LANG_SMARTY}>

      - - - + + + <{foreach from=$module->modinfo.templates item=template key=template_key}> @@ -218,17 +218,17 @@ <{/foreach}>
      <{$smarty.const._MD_A_BASE_LANG_TEMPLATE_KEY}><{$smarty.const._MD_A_BASE_LANG_TEMPLATE_FILE}><{$smarty.const._MD_A_BASE_LANG_TEMPLATE_DESC}><{$smarty.const._AD_BASE_LANG_TEMPLATE_KEY}><{$smarty.const._AD_BASE_LANG_TEMPLATE_FILE}><{$smarty.const._AD_BASE_LANG_TEMPLATE_DESC}>
      <{else}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_TEMPLATE}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_TEMPLATE}>
      <{/if}>
      -
      <{$smarty.const._MD_A_BASE_LANG_BLOCKS_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_BLOCKS_INFO}>
      <{foreach from=$module->modinfo.blocks item=block key=block_num }> - - + + <{foreach from=$block key=block_key item=block_val name=block }> @@ -243,17 +243,17 @@
      <{$smarty.const._MD_A_BASE_LANG_BLOCK_KEY}> (<{$block_num|escape}>)<{$smarty.const._MD_A_BASE_LANG_BLOCK_VAL}><{$smarty.const._AD_BASE_LANG_BLOCK_KEY}> (<{$block_num|escape}>)<{$smarty.const._AD_BASE_LANG_BLOCK_VAL}>

      <{foreachelse}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_BLOCK}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_BLOCK}>
      <{/foreach}>
      -
      <{$smarty.const._MD_A_BASE_LANG_CONFIG_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_CONFIG_INFO}>
      <{foreach from=$module->modinfo.config item=config key=conf_num}> - - + + <{foreach from=$config key=config_key item=config_val name=config}> @@ -274,29 +274,29 @@
      <{$smarty.const._MD_A_BASE_LANG_CONFIG_KEY}> (<{$conf_num}>)<{$smarty.const._MD_A_BASE_LANG_CONFIG_VAL}><{$smarty.const._AD_BASE_LANG_CONFIG_KEY}> (<{$conf_num}>)<{$smarty.const._AD_BASE_LANG_CONFIG_VAL}>

      <{foreachelse}> -
      <{$smarty.const._MD_A_BASE_LANG_NO_CONFIG}>
      +
      <{$smarty.const._AD_BASE_LANG_NO_CONFIG}>
      <{/foreach}>
      -
      <{$smarty.const._MD_A_BASE_LANG_FEATURE_SVC_INFO}>
      +
      <{$smarty.const._AD_BASE_LANG_FEATURE_SVC_INFO}>
      <{if $module->get('hassearch')}> - - + + <{/if}> <{if $module->get('hascomments')}> - - + + <{/if}> <{if $module->get('hasnotification')}> - - + + <{/if}>
      <{$smarty.const._MD_A_BASE_LANG_SEARCH_SVC}><{$smarty.const._MD_A_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_SEARCH_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      <{$smarty.const._MD_A_BASE_LANG_COMMENT_SVC}><{$smarty.const._MD_A_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_COMMENT_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      <{$smarty.const._MD_A_BASE_LANG_NOTIF_SVC}><{$smarty.const._MD_A_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_NOTIF_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
      Index: xoops2jp/html/modules/base/admin/templates/comment_list.html diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.17 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.18 --- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.17 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_list.html Fri Aug 18 20:29:46 2006 @@ -8,7 +8,7 @@ @@ -109,34 +120,34 @@ - <{$smarty.const._MD_USER_LANG_ATTACHSIG}> + <{$smarty.const._MD_USER_LANG_ATTACHSIG}> <{$object->getShow('attachsig')}> - <{$smarty.const._MD_USER_LANG_RANK}> + <{$smarty.const._MD_USER_LANG_RANK}> <{if $rank}> - <{$rank->getShow('rank_title')}>
      + <{$rank->getShow('rank_title')}> <{$rank->getShow('rank_title')}> <{/if}> - <{$smarty.const._MD_USER_LANG_LEVEL}> + <{$smarty.const._MD_USER_LANG_LEVEL}> <{$object->getShow('level')}> - <{$smarty.const._MD_USER_LANG_THEME}> + <{$smarty.const._MD_USER_LANG_THEME}> <{$object->getShow('theme')}> - <{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}> + <{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}> <{if $timezone}> <{$timezone->getShow('zone_name')}> @@ -146,57 +157,61 @@ - <{$smarty.const._MD_USER_LANG_LAST_LOGIN}> + <{$smarty.const._MD_USER_LANG_LAST_LOGIN}> <{$object->get('last_login')|xoops_formattimestamp:l}> - <{$smarty.const._MD_USER_LANG_UMODE}> + <{$smarty.const._MD_USER_LANG_UMODE}> <{$umode|escape}> - <{$smarty.const._MD_USER_LANG_UORDER}> + <{$smarty.const._MD_USER_LANG_UORDER}> <{$uorder|escape}> - <{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}> + <{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}> <{$notify_method|escape}> - <{$smarty.const._MD_USER_LANG_NOTIFY_MODE}> + <{$smarty.const._MD_USER_LANG_NOTIFY_MODE}> <{$notify_mode|escape}> - <{$smarty.const._MD_USER_LANG_USER_OCC}> + <{$smarty.const._MD_USER_LANG_USER_OCC}> <{$object->getShow('user_occ')}> - <{$smarty.const._MD_USER_LANG_BIO}> + <{$smarty.const._MD_USER_LANG_BIO}> <{$object->getShow('bio')}> - <{$smarty.const._MD_USER_LANG_USER_INTREST}> + <{$smarty.const._MD_USER_LANG_USER_INTREST}> <{$object->getShow('user_intrest')}> - <{$smarty.const._MD_USER_LANG_USER_MAILOK}> + <{$smarty.const._MD_USER_LANG_USER_MAILOK}> - <{$object->getShow('user_mailok')}> + <{if $object->getShow('user_mailok') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._NO}> + <{/if}> From minahito @ users.sourceforge.jp Sat Aug 19 14:20:13 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 14:20:13 +0900 Subject: [xoops-cvslog 4230] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060819052013.9ADB42AC017@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.40 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.41 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.40 Fri Aug 18 21:28:51 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Sat Aug 19 14:20:13 2006 @@ -3,7 +3,7 @@ define('_AD_BASE_ERROR_ACTION_SEARCH_NORESULT', "Coundn't find results by your keyword."); define('_AD_BASE_ERROR_ACTION_SEARCH_TRY_AGAIN', "Try again with other keyword."); define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "Could not install block template '{0}'"); -define('_AD_BASE_ERROR_BMODULE', "bmodule"); +define('_AD_BASE_ERROR_BMODULE', "Specify one or more modules as target modules that blocks show up to."); define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "Can't uninstall active module. For uninstall, turn off the active-status of the module."); define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates : {0}"); define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "Could not insert config '{0}'"); @@ -18,9 +18,9 @@ define('_AD_BASE_ERROR_DROP_TABLE', "Could not drop table {0}"); define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list."); define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "Failed to execute '{0}' callback"); -define('_AD_BASE_ERROR_GROUPID', "Group Id"); -define('_AD_BASE_ERROR_IMG_FILESIZE', "Img filesize"); -define('_AD_BASE_ERROR_IMG_SIZE', "Img size"); +define('_AD_BASE_ERROR_GROUPID', "Give access permission to one or more groups."); +define('_AD_BASE_ERROR_IMG_FILESIZE', "The maximum file size of the image is {0} byte."); +define('_AD_BASE_ERROR_IMG_SIZE', "The maximum width and height of the image is {0} x {1}."); define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{1}' module has been failure"); define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong."); define('_AD_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value."); @@ -28,15 +28,15 @@ define('_AD_BASE_ERROR_NO_HELP_FILE', "Help file is not found."); define('_AD_BASE_ERROR_OBJECTEXIST', "{0} is wrong."); define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree the following licence."); -define('_AD_BASE_ERROR_READGROUPS', "readgroups"); +define('_AD_BASE_ERROR_READGROUPS', "Give read permission to one or more groups."); define('_AD_BASE_ERROR_SEARCH_REQUIRED', "Input keyword"); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}"); -define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); +define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "Could not uninstall template '{0}'."); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Uninstallation of '{1}' module has been failure"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Updating '{1}' module has been failure"); -define('_AD_BASE_ERROR_UPLOADGROUPS', "uploadgroups"); +define('_AD_BASE_ERROR_UPLOADGROUPS', "Give upload permission to one or more groups."); define('_AD_BASE_LANG_ACTIONSEARCH', "Action Search"); -define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search...."); +define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "You may search with keyword from menu of the control panel and help of modules. If you forget positions of them, use this."); define('_AD_BASE_LANG_ACTIVE', "Active"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block"); define('_AD_BASE_LANG_ADMIN_MENU', "Information of Administration Menu"); @@ -127,7 +127,7 @@ define('_AD_BASE_LANG_IMGCAT_STORETYPE', "imgcat storetype"); define('_AD_BASE_LANG_IMGCAT_TYPE', "imgcat type"); define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "Imgcat upload groups"); -define('_AD_BASE_LANG_IMGCAT_WEIGHT', "imgcat weight"); +define('_AD_BASE_LANG_IMGCAT_WEIGHT', "Weight"); define('_AD_BASE_LANG_INFORMATION', "Information"); define('_AD_BASE_LANG_INSTALL', "Install"); define('_AD_BASE_LANG_ISACTIVE', "Active"); @@ -137,7 +137,7 @@ define('_AD_BASE_LANG_LIST', "List"); define('_AD_BASE_LANG_MAINMENU_HAS_MAIN', "Main Menu"); define('_AD_BASE_LANG_MAINMENU_INFO', "Information of Main Menu"); -define('_AD_BASE_LANG_MID', "MID"); +define('_AD_BASE_LANG_MID', "Module"); define('_AD_BASE_LANG_MOD_AUTHOR', "Module Author"); define('_AD_BASE_LANG_MOD_BASIC_INFO', "Basic Information"); define('_AD_BASE_LANG_MOD_CREDITS', "Signature / Memo"); @@ -145,7 +145,7 @@ define('_AD_BASE_LANG_MOD_DIR_NAME', "Module directory"); define('_AD_BASE_LANG_MOD_LICENSE_INFO', "Licence Information "); define('_AD_BASE_LANG_MODINSTALL', "Module install"); -define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Module"); +define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Are you sure to install _%s_?"); define('_AD_BASE_LANG_MODINSTALL_CONF', "Are you sure to install the module?"); define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from server to keep security of your site. "); define('_AD_BASE_LANG_MODINSTALL_LOG', "module install log"); @@ -156,10 +156,10 @@ define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall"); define('_AD_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log"); define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled."); -define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Update module"); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure to update _%s_?"); define('_AD_BASE_LANG_MODUPDATE_CONF', "Confirm module update."); define('_AD_BASE_LANG_MODUPDATE_LOG', "Module update log"); -define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "module update success"); +define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); define('_AD_BASE_LANG_NAME', "Name"); define('_AD_BASE_LANG_NO', "No"); define('_AD_BASE_LANG_NO_ADMINMENU', "No Administration Menu"); @@ -174,8 +174,8 @@ define('_AD_BASE_LANG_NONE', "None"); define('_AD_BASE_LANG_NOTIF_SVC', "Notification"); define('_AD_BASE_LANG_OPTIONS', "Options"); -define('_AD_BASE_LANG_PACKAGE', "package"); -define('_AD_BASE_LANG_RENDER', "render"); +define('_AD_BASE_LANG_PACKAGE', "Package Data"); +define('_AD_BASE_LANG_RENDER', "Render System"); define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment"); define('_AD_BASE_LANG_RESULT', "Results"); define('_AD_BASE_LANG_SEARCH', "Search"); @@ -208,7 +208,7 @@ define('_AD_BASE_LANG_TEMPLATE_HAS_MAIN', "Use template"); define('_AD_BASE_LANG_TEMPLATE_INFO', "Template information"); define('_AD_BASE_LANG_TEMPLATE_KEY', "Template Key"); -define('_AD_BASE_LANG_THEME', "theme"); +define('_AD_BASE_LANG_THEME', "Theme"); define('_AD_BASE_LANG_THEME_ADMIN', "Theme admin"); define('_AD_BASE_LANG_TITLE', "Title"); define('_AD_BASE_LANG_TOPPAGE', "Toppage"); @@ -220,10 +220,10 @@ define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled"); define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "Block {0} has been installed"); define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together"); -define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Do you really delete it?"); +define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Are you sure to delete?"); define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished."); define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database."); -define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}"); +define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}."); define('_AD_BASE_MESSAGE_INSERT_CONFIG', "Config {0} added."); define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful"); define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{1}' has been installed."); @@ -233,7 +233,7 @@ define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site!
      If you want to get a free block except modules' blocks, create cutom block and write your message to it."); define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall the block, the configuration of the block isn't deleted. The block is removed only from display of your site. Therefore you can re-install the block easily because the installer recovers last configure."); define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at 'install block' page."); -define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "imgcat storetype"); +define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose file system or database as the storehouse ofimage files. You can't change this setting later.
      Keep in mind that it's difficult to restore and backup if you choose database."); define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
      Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); define('_MD_AM_ADMINML', "Admin mail address"); @@ -245,6 +245,7 @@ define('_MD_AM_ALLOWTHEME', "Allow users to select theme?"); define('_MD_AM_ALWDHTML', "HTML tags allowed in all posts."); define('_MD_AM_ANONNAME', "Username for anonymous users"); +define('_MD_AM_ANONPOST', "Anonymous user can post"); define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
      Separate each with a |, case insensitive, regex enabled."); define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc
      aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc
      aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc"); define('_MD_AM_CENSOR', "Word Censoring Options"); From minahito @ users.sourceforge.jp Sat Aug 19 14:20:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 14:20:36 +0900 Subject: [xoops-cvslog 4231] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060819052036.1E2BA2AC017@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.21 xoops2jp/html/modules/base/language/english/main.php:1.1.2.22 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.21 Fri Aug 18 20:28:34 2006 +++ xoops2jp/html/modules/base/language/english/main.php Sat Aug 19 14:20:35 2006 @@ -5,11 +5,11 @@ define('_MD_BASE_ERROR_INCORRECTLOGIN', "Invalid Login!"); define('_MD_BASE_ERROR_MASK', "{0} is wrong."); define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); -define('_MD_BASE_ERROR_PERMISSION', "permission"); +define('_MD_BASE_ERROR_PERMISSION', "Permission denided"); define('_MD_BASE_ERROR_REQUIRED', "{0} is required."); define('_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED', "Input keywords that is enough length."); define('_MD_BASE_FORMAT_SEARCH_SEPARATOR', "/[\s,]+/"); -define('_MD_BASE_LANG_ANDOR', "andor"); +define('_MD_BASE_LANG_ANDOR', "AndOr"); define('_MD_BASE_LANG_CLICKASMILIE', "Click a smilie to insert it into your message."); define('_MD_BASE_LANG_CODE', "Code"); define('_MD_BASE_LANG_COM_EXPARAMS', "Comment extra parameters"); From minahito @ users.sourceforge.jp Sat Aug 19 14:21:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 14:21:11 +0900 Subject: [xoops-cvslog 4232] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060819052111.444F02AC017@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.47 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.48 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.47 Fri Aug 18 21:28:51 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Sat Aug 19 14:21:11 2006 @@ -30,8 +30,8 @@ define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください"); define('_AD_BASE_ERROR_READGROUPS', "最低1グループ以上に使用権限を与えてください"); define('_AD_BASE_ERROR_SEARCH_REQUIRED', "キーワードを入力して下さい"); -define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "sql file not found"); -define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled"); +define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "{1}でSQLファイルが見つかりませんでした"); +define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "テンプレート '{0}' をアンインストールできませんでした"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました"); define('_AD_BASE_ERROR_UPLOADGROUPS', "最低1グループ以上にアップロード権限を与えてください"); @@ -92,7 +92,7 @@ define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "カスタムブロック削除"); define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "カスタムブロック編集"); define('_AD_BASE_LANG_DEACTIVATE', "非アクティブ"); -define('_AD_BASE_LANG_DIRNAME', "dirname"); +define('_AD_BASE_LANG_DIRNAME', "ディレクトリ名"); define('_AD_BASE_LANG_DISPLAY', "表示"); define('_AD_BASE_LANG_DOIMAGE', "[img]タグを有効にする"); define('_AD_BASE_LANG_EDIT_FUNC', "編集用コールバック関数"); @@ -125,7 +125,7 @@ define('_AD_BASE_LANG_IMGCAT_NAME', "カテゴリ名"); define('_AD_BASE_LANG_IMGCAT_READ_GROUPS', "イメージ・マネジャーの使用を許可するグループ"); define('_AD_BASE_LANG_IMGCAT_STORETYPE', "保存先"); -define('_AD_BASE_LANG_IMGCAT_TYPE', "imgcat type"); +define('_AD_BASE_LANG_IMGCAT_TYPE', "カテゴリタイプ"); define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "イメージのアップロードを許可するグループ"); define('_AD_BASE_LANG_IMGCAT_WEIGHT', "優先度"); define('_AD_BASE_LANG_INFORMATION', "インフォメーション"); @@ -159,8 +159,8 @@ define('_AD_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか?"); define('_AD_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認"); define('_AD_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ"); -define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); -define('_AD_BASE_LANG_NAME', "name"); +define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "モジュールアップデート終了"); +define('_AD_BASE_LANG_NAME', "名前"); define('_AD_BASE_LANG_NO', "いいえ"); define('_AD_BASE_LANG_NO_ADMINMENU', "管理画面情報は設定されていません"); define('_AD_BASE_LANG_NO_AGREE', "同意しない"); From minahito @ users.sourceforge.jp Sat Aug 19 14:21:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 14:21:35 +0900 Subject: [xoops-cvslog 4233] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060819052135.6B7DA2AC017@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.22 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.23 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.22 Fri Aug 18 20:28:34 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Sat Aug 19 14:21:35 2006 @@ -9,7 +9,7 @@ define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); define('_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED', "有効な長さの検索キーワードを入力してください。"); define('_MD_BASE_FORMAT_SEARCH_SEPARATOR', "/[\s, ]+/"); -define('_MD_BASE_LANG_ANDOR', "andor"); +define('_MD_BASE_LANG_ANDOR', "AndOr"); define('_MD_BASE_LANG_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。"); define('_MD_BASE_LANG_CODE', "コード"); define('_MD_BASE_LANG_COM_EXPARAMS', "拡張パラメータ"); @@ -28,10 +28,10 @@ define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする"); define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする"); define('_MD_BASE_LANG_EMOTION', "意味"); -define('_MD_BASE_LANG_ERROR', "error"); +define('_MD_BASE_LANG_ERROR', "エラー"); define('_MD_BASE_LANG_FMAIL', "友達のEmail"); define('_MD_BASE_LANG_FNAME', "友達の名前"); -define('_MD_BASE_LANG_IMAGE', "image"); +define('_MD_BASE_LANG_IMAGE', "イメージ"); define('_MD_BASE_LANG_IMAGE_FILE', "イメージファイル"); define('_MD_BASE_LANG_IMAGE_MIMETYPE', "MIMEタイプ"); define('_MD_BASE_LANG_IMAGE_NICENAME', "イメージ名"); @@ -39,8 +39,8 @@ define('_MD_BASE_LANG_IMAGE_UPLOAD', "画像のアップロード"); define('_MD_BASE_LANG_OPTION', "オプション"); define('_MD_BASE_LANG_POST', "投稿する"); -define('_MD_BASE_LANG_PREV_PAGE', "Prev page"); -define('_MD_BASE_LANG_SHOW_ALL', "Show all"); +define('_MD_BASE_LANG_PREV_PAGE', "前のページ"); +define('_MD_BASE_LANG_SHOW_ALL', "すべて表示"); define('_MD_BASE_LANG_SMILIES', "顔アイコン"); define('_MD_BASE_LANG_YMAIL', "あなたのEmail"); define('_MD_BASE_LANG_YNAME', "あなたの名前"); From tom_g3x @ users.sourceforge.jp Sat Aug 19 14:55:45 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 14:55:45 +0900 Subject: [xoops-cvslog 4234] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060819055545.BC30F2AC01B@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.1 xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.2 --- xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.1 Thu Aug 17 21:47:57 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Sat Aug 19 14:55:45 2006 @@ -1,7 +1,39 @@ +/* for List Table */ .user_list_id { text-align:center; } - .user_list_control { text-align:center; } +.user_list_image { + text-align:center; +} +.user_list_type { + text-align:center; +} +.user_list_date { + text-align:center; +} +.user_list_number { + text-align:right; + padding-right:5px; +} +.user_list_order { + text-align:center; +} +.user_list_title { + text-align:left; + padding-left:5px; + font-weight:bold; +} +.user_list_name { + text-align:left; + padding-left:5px; +} +.user_list_description { + text-align:left; + padding-left:5px; +} +.user_list_select { + text-align:center; +} From tom_g3x @ users.sourceforge.jp Sat Aug 19 14:55:45 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 14:55:45 +0900 Subject: [xoops-cvslog 4235] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060819055545.EFC952AC05B@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.13 Fri Aug 18 20:59:05 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_list.html Sat Aug 19 14:55:45 2006 @@ -32,11 +32,11 @@ <{foreach item=obj from=$objects}> <{$obj->getShow('rank_id')}> - <{$obj->getShow('rank_title')}> - <{$obj->getShow('rank_min')}> - <{$obj->getShow('rank_max')}> - <{$obj->getShow('rank_special')}> - <{$obj->getShow('rank_title')}> + <{$obj->getShow('rank_title')}> + <{$obj->getShow('rank_min')}> + <{$obj->getShow('rank_max')}> + <{$obj->getShow('rank_special')}> + <{$obj->getShow('rank_title')}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.19 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.20 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.19 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Sat Aug 19 14:55:45 2006 @@ -16,13 +16,13 @@ <{$smarty.const._AD_USER_LANG_GROUP_AMMO}> <{$smarty.const._AD_USER_LANG_CONTROL}> - - " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> - <{$group->getShow('groupid')}> - <{$group->getShow('name')}> - <{$group->getShow('description')}> - <{$group->getShow('group_type')}> - <{$group->getUserCount()|escape}> + + " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> + <{$group->getShow('groupid')}> + <{$group->getShow('name')}> + <{$group->getShow('description')}> + <{$group->getShow('group_type')}> + <{$group->getUserCount()|escape}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> @@ -72,15 +72,15 @@ <{foreach from=$noUsers item=user }> "> - - " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> - <{$user->getShow('uid')}> - <{$user->getShow('uname')}> - <{$user->getShow('name')}> - <{$user->get('user_regdate')|xoops_formattimestamp}> - <{$user->get('last_login')|xoops_formattimestamp:l}> - <{$user->getShow('posts')}> - <{$user->getShow('level')}> + + " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> + <{$user->getShow('uid')}> + <{$user->getShow('uname')}> + <{$user->getShow('name')}> + <{$user->get('user_regdate')|xoops_formattimestamp}> + <{$user->get('last_login')|xoops_formattimestamp:l}> + <{$user->getShow('posts')}> + <{$user->getShow('level')}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> @@ -123,15 +123,15 @@ <{foreach from=$users item=user }> "> - - " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> + + " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> <{$user->getShow('uid')}> - <{$user->getShow('uname')}> - <{$user->getShow('name')}> - <{$user->get('user_regdate')|xoops_formattimestamp}> - <{$user->get('last_login')|xoops_formattimestamp:l}> - <{$user->getShow('posts')}> - <{$user->getShow('level')}> + <{$user->getShow('uname')}> + <{$user->getShow('name')}> + <{$user->get('user_regdate')|xoops_formattimestamp}> + <{$user->get('last_login')|xoops_formattimestamp:l}> + <{$user->getShow('posts')}> + <{$user->getShow('level')}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.19 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.20 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.19 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Sat Aug 19 14:55:45 2006 @@ -37,14 +37,14 @@ <{foreach item=user from=$objects}> - " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> + " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> <{$user->getShow('uid')}> - <{$user->getShow('uname')}> - <{$user->getShow('name')}> - <{$user->get('user_regdate')|xoops_formattimestamp}> - <{$user->get('last_login')|xoops_formattimestamp:l}> - <{$user->getShow('posts')}> - <{$user->getShow('level')}> + <{$user->getShow('uname')}> + <{$user->getShow('name')}> + <{$user->get('user_regdate')|xoops_formattimestamp}> + <{$user->get('last_login')|xoops_formattimestamp:l}> + <{$user->getShow('posts')}> + <{$user->getShow('level')}> " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> Index: xoops2jp/html/modules/user/admin/templates/group_list.html diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.13 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/group_list.html Sat Aug 19 14:55:45 2006 @@ -29,12 +29,12 @@ <{foreach item=group from=$objects}> - " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> + " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$group->getShow('groupid')}> - <{$group->getShow('name')}> - <{$group->getShow('description')}> - <{$group->getShow('group_type')}> - <{$group->getUserCount()|escape}> + <{$group->getShow('name')}> + <{$group->getShow('description')}> + <{$group->getShow('group_type')}> + <{$group->getUserCount()|escape}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.17 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.18 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.17 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Sat Aug 19 14:55:45 2006 @@ -16,13 +16,13 @@ <{$smarty.const._AD_USER_LANG_GROUP_AMMO}> <{$smarty.const._AD_USER_LANG_CONTROL}> - - " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> - <{$group->getShow('groupid')}> - <{$group->getShow('name')}> - <{$group->getShow('description')}> - <{$group->getShow('group_type')}> - <{$group->getUserCount()|escape}> + + " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> + <{$group->getShow('groupid')}> + <{$group->getShow('name')}> + <{$group->getShow('description')}> + <{$group->getShow('group_type')}> + <{$group->getUserCount()|escape}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> @@ -51,15 +51,15 @@ <{$smarty.const._AD_USER_LANG_CONTROL}> <{foreach from=$users item=user }> - " style="text-align:center;"> - " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> + "> + " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> <{$user->getShow('uid')}> - <{$user->getShow('uname')}> - <{$user->getShow('name')}> - <{$user->getShow('user_regdate')|xoops_formattimestamp}> - <{$user->getShow('last_login')|xoops_formattimestamp:l}> - <{$user->getShow('posts')}> - <{$user->getShow('level')}> + <{$user->getShow('uname')}> + <{$user->getShow('name')}> + <{$user->getShow('user_regdate')|xoops_formattimestamp}> + <{$user->getShow('last_login')|xoops_formattimestamp:l}> + <{$user->getShow('posts')}> + <{$user->getShow('level')}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> @@ -101,7 +101,7 @@
      <{/if}> - + @@ -133,7 +133,7 @@ <{foreach key=i item=permissions from=$blockPermissions}>
      <{$smarty.const._AD_USER_LANG_PERM_GROUP_PERM_MODULE}>
      - + - + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + Index: xoops2jp/html/modules/base/admin/templates/block_edit.html diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.12 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/block_edit.html Sat Aug 19 16:44:50 2006 @@ -40,7 +40,7 @@ @@ -69,7 +69,7 @@ <{if $optionForm != null}> - + Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html Sat Aug 19 16:44:50 2006 @@ -63,7 +63,13 @@ - + @@ -75,7 +81,13 @@ - + Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html Sat Aug 19 16:44:50 2006 @@ -40,7 +40,7 @@ Index: xoops2jp/html/modules/base/admin/templates/customblock_delete.html diff -u xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/customblock_delete.html Sat Aug 19 16:44:50 2006 @@ -9,101 +9,114 @@
      <{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}>
      - <{xoops_token form=$actionForm}> - <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}> -
      <{$smarty.const._AD_USER_LANG_PERM_GROUP_PERM_BLOCK}> <{if $i == 0}>( <{$smarty.const._LEFT}> ) <{elseif $i == 1}>( <{$smarty.const._RIGHT}> ) Index: xoops2jp/html/modules/user/admin/templates/group_perm.html diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.21 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.22 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.21 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Sat Aug 19 14:55:45 2006 @@ -17,12 +17,12 @@ <{$smarty.const._AD_USER_LANG_CONTROL}>
      " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" />" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$group->getShow('groupid')}><{$group->getShow('name')}><{$group->getShow('description')}><{$group->getShow('group_type')}><{$group->getUserCount()|escape}><{$group->getShow('name')}><{$group->getShow('description')}><{$group->getShow('group_type')}><{$group->getUserCount()|escape}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.15 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.14 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Sat Aug 19 14:55:45 2006 @@ -39,14 +39,20 @@ <{foreach item=obj from=$objects}>
      <{$obj->getShow('avatar_id')}><{$obj->getShow('avatar_name')}><{$obj->getShow('avatar_name')}><{$obj->getShow('avatar_mimetype')}><{$obj->get('avatar_created')|xoops_formattimestamp:l}><{$obj->getShow('avatar_display')}><{$obj->getShow('avatar_weight')}><{$obj->getShow('avatar_type')}><{$obj->getUsingCount()|escape}><{$obj->getShow('avatar_name')}><{$obj->getShow('avatar_name')}><{$obj->getShow('avatar_mimetype')}><{$obj->get('avatar_created')|xoops_formattimestamp:l}> + <{if $obj->getShow('avatar_display') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._NO}> + <{/if}> + <{$obj->getShow('avatar_weight')}><{$obj->getShow('avatar_type')}><{$obj->getUsingCount()|escape}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.9 Thu Aug 17 21:48:54 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Sat Aug 19 14:55:45 2006 @@ -32,11 +32,23 @@ <{foreach item=obj from=$objects}>
      <{$obj->getShow('mailjob_id')}><{$obj->getShow('title')}><{$obj->getShow('is_pm')}><{$obj->getShow('is_mail')}><{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}> + <{$obj->getShow('title')}> + <{if $obj->getShow('is_pm') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._NO}> + <{/if}> + + <{if $obj->getShow('is_mail') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._NO}> + <{/if}> + <{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}> <{if $obj->mUserCount > 0}> <{$obj->mUserCount|escape}> <{else}> From tom_g3x @ users.sourceforge.jp Sat Aug 19 16:44:50 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 16:44:50 +0900 Subject: [xoops-cvslog 4236] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819074450.DE8792AC079@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html Sat Aug 19 16:44:50 2006 @@ -68,7 +68,7 @@
      <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5 class=base_list_number}>
      <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5 class=base_list_number}>
      <{$smarty.const._AD_BASE_LANG_OPTIONS}><{$smarty.const._AD_BASE_LANG_OPTIONS}> "> <{$optionForm}>
      <{$smarty.const._AD_BASE_LANG_VISIBLE}>"><{$object->getShow('visible')}>"> + <{if $object->getShow('visible') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._YES}> + <{/if}> +
      <{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}>
      <{$smarty.const._AD_BASE_LANG_ISACTIVE}>"><{$object->getShow('isactive')}>"> + <{if $object->getShow('isactive') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._YES}> + <{/if}> +
      <{$smarty.const._AD_BASE_LANG_DIRNAME}>
      <{$smarty.const._AD_BASE_LANG_WEIGHT}> "> - <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}> + <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5 class=base_list_number}>
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_DELETE}>
      <{$smarty.const._AD_BASE_LANG_BID}>"><{$object->getShow('bid')}>
      <{$smarty.const._AD_BASE_LANG_MID}>"><{$object->getShow('mid')}>
      <{$smarty.const._AD_BASE_LANG_FUNC_NUM}>"><{$object->getShow('func_num')}>
      <{$smarty.const._AD_BASE_LANG_OPTIONS}>"><{$object->getShow('options')}>
      <{$smarty.const._AD_BASE_LANG_NAME}>"><{$object->getShow('name')}>
      <{$smarty.const._AD_BASE_LANG_TITLE}>"><{$object->getShow('title')}>
      <{$smarty.const._AD_BASE_LANG_CONTENT}>"><{$object->getShow('content')}>
      <{$smarty.const._AD_BASE_LANG_SIDE}>"> - <{if $object->mColumn}><{$object->mColumn->getShow('name')}><{/if}> -
      <{$smarty.const._AD_BASE_LANG_WEIGHT}>"><{$object->getShow('weight')}>
      <{$smarty.const._AD_BASE_LANG_VISIBLE}>"><{$object->getShow('visible')}>
      <{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}>"><{$object->getShow('block_type')}>
      <{$smarty.const._AD_BASE_LANG_C_TYPE}>"><{$object->getShow('c_type')}>
      <{$smarty.const._AD_BASE_LANG_ISACTIVE}>"><{$object->getShow('isactive')}>
      <{$smarty.const._AD_BASE_LANG_DIRNAME}>"><{$object->getShow('dirname')}>
      <{$smarty.const._AD_BASE_LANG_FUNC_FILE}>"><{$object->getShow('func_file')}>
      <{$smarty.const._AD_BASE_LANG_SHOW_FUNC}>"><{$object->getShow('show_func')}>
      <{$smarty.const._AD_BASE_LANG_EDIT_FUNC}>"><{$object->getShow('edit_func')}>
      <{$smarty.const._AD_BASE_LANG_TEMPLATE}>"><{$object->getShow('template')}>
      <{$smarty.const._AD_BASE_LANG_BCACHETIME}>"> - <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}> -
      <{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}> - "><{$object->get('last_modified')|xoops_formattimestamp:l}>
      - - -
      +<{xoops_token form=$actionForm}> +<{xoops_input type=hidden name=bid value=$actionForm->get('bid')}> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_DELETE}>
      <{$smarty.const._AD_BASE_LANG_BID}>"><{$object->getShow('bid')}>
      <{$smarty.const._AD_BASE_LANG_MID}>"><{$object->getShow('mid')}>
      <{$smarty.const._AD_BASE_LANG_FUNC_NUM}>"><{$object->getShow('func_num')}>
      <{$smarty.const._AD_BASE_LANG_OPTIONS}>"><{$object->getShow('options')}>
      <{$smarty.const._AD_BASE_LANG_NAME}>"><{$object->getShow('name')}>
      <{$smarty.const._AD_BASE_LANG_TITLE}>"><{$object->getShow('title')}>
      <{$smarty.const._AD_BASE_LANG_CONTENT}>"><{$object->getShow('content')}>
      <{$smarty.const._AD_BASE_LANG_SIDE}>"> + <{if $object->mColumn}><{$object->mColumn->getShow('name')}><{/if}> +
      <{$smarty.const._AD_BASE_LANG_WEIGHT}>"><{$object->getShow('weight')}>
      <{$smarty.const._AD_BASE_LANG_VISIBLE}>"> + <{if $object->getShow('visible') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._YES}> + <{/if}> +
      <{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}>"><{$object->getShow('block_type')}>
      <{$smarty.const._AD_BASE_LANG_C_TYPE}>"><{$object->getShow('c_type')}>
      <{$smarty.const._AD_BASE_LANG_ISACTIVE}>"> + "> + <{if $object->getShow('isactive') == 1}> + <{$smarty.const._YES}> + <{else}> + <{$smarty.const._YES}> + <{/if}> +
      <{$smarty.const._AD_BASE_LANG_DIRNAME}>"><{$object->getShow('dirname')}>
      <{$smarty.const._AD_BASE_LANG_FUNC_FILE}>"><{$object->getShow('func_file')}>
      <{$smarty.const._AD_BASE_LANG_SHOW_FUNC}>"><{$object->getShow('show_func')}>
      <{$smarty.const._AD_BASE_LANG_EDIT_FUNC}>"><{$object->getShow('edit_func')}>
      <{$smarty.const._AD_BASE_LANG_TEMPLATE}>"><{$object->getShow('template')}>
      <{$smarty.const._AD_BASE_LANG_BCACHETIME}>"> + <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}> +
      <{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}> + "><{$object->get('last_modified')|xoops_formattimestamp:l}>
      + + +
      From minahito @ users.sourceforge.jp Sat Aug 19 17:04:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 17:04:40 +0900 Subject: [xoops-cvslog 4237] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060819080440.1EA272AC21A@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.24 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.25 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.24 Fri Aug 18 20:59:20 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Sat Aug 19 17:04:39 2006 @@ -1,14 +1,14 @@ X days ago"); define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than X days ago"); define('_AD_USER_LANG_LASTLOGIN', "Last login"); @@ -61,7 +61,7 @@ define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Only users that accept mail"); define('_AD_USER_LANG_MAILJOB_DELETE', "Mailjob delete"); define('_AD_USER_LANG_MAILJOB_EDIT', "Mailjob edit"); -define('_AD_USER_LANG_MAILJOB_ID', "mailjob id"); +define('_AD_USER_LANG_MAILJOB_ID', "Job ID"); define('_AD_USER_LANG_MAILJOB_LIST', "Mailjob list"); define('_AD_USER_LANG_MAILJOB_NEW', "Mailjob new"); define('_AD_USER_LANG_MAILJOB_SEND', "Mailjob send"); @@ -92,7 +92,7 @@ define('_AD_USER_LANG_RESET', "Reset"); define('_AD_USER_LANG_SEARCH_AGAIN', "Search again"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition"); -define('_AD_USER_LANG_TITLE', "title"); +define('_AD_USER_LANG_TITLE', "Title"); define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); define('_AD_USER_LANG_USER', "User"); define('_AD_USER_LANG_USER_DELETE', "Delete a user"); @@ -104,7 +104,7 @@ define('_AD_USER_LANG_USER_VIEW', "user view"); define('_AD_USER_LANG_VPASS', "Verify password"); define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?"); -define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you delete the user rank?"); +define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Are you sure you want to delete this user rank?"); define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recount success"); define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif."); define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters."); From minahito @ users.sourceforge.jp Sat Aug 19 17:05:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 17:05:00 +0900 Subject: [xoops-cvslog 4238] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060819080500.9CD892AC20E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/modinfo.php diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.14 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.15 --- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.14 Fri Aug 18 18:06:32 2006 +++ xoops2jp/html/modules/user/language/english/modinfo.php Sat Aug 19 17:05:00 2006 @@ -26,12 +26,12 @@ define('_MI_USER_CONF_AVATAR_HEIGHT', "Avatar image max height (pixel)"); define('_MI_USER_CONF_AVATAR_MAXSIZE', "Avatar image max filesize (byte)"); define('_MI_USER_CONF_AVATAR_MINPOSTS', "Minimum posts required"); -define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "User conf avatar minposts desc"); +define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "Enter the minimum number of posts required to upload a custom avatar."); define('_MI_USER_CONF_AVATAR_WIDTH', "Avatar image max width (pixel)"); define('_MI_USER_CONF_AVTR_ALLOW_UP', "Allow custom avatar upload?"); define('_MI_USER_CONF_BAD_EMAILS', "Enter emails that should not be used in user profile"); define('_MI_USER_CONF_BAD_EMAILS_DESC', "Separate each with a |, case insensitive, regex enabled."); -define('_MI_USER_CONF_BAD_UNAMES', ""); +define('_MI_USER_CONF_BAD_UNAMES', "Enter names that should not be selected as username"); define('_MI_USER_CONF_BAD_UNAMES_DESC', "Separate each with a |, case insensitive, regex enabled."); define('_MI_USER_CONF_CHGMAIL', "Allow users to change email address?"); define('_MI_USER_CONF_DISCLAIMER', "Registration disclaimer"); @@ -55,8 +55,8 @@ define('_MI_USER_CONF_USERCOOKIE', "Name for user cookies."); define('_MI_USER_CONF_USERCOOKIE_DESC', "This cookie contains only a user name and is saved in a user pc for a year (if the user wishes). If a user have this cookie, username will be automatically inserted in the login box."); define('_MI_USER_KEYWORD_AVATAR_MANAGE', "avatar custom system list edit modify delete"); -define('_MI_USER_KEYWORD_CREATE_AVATAR', "create avatar"); -define('_MI_USER_KEYWORD_CREATE_GROUP', "create group"); +define('_MI_USER_KEYWORD_CREATE_AVATAR', "create avatar upload"); +define('_MI_USER_KEYWORD_CREATE_GROUP', "create isergroup"); define('_MI_USER_KEYWORD_CREATE_RANK', "create rank"); define('_MI_USER_KEYWORD_CREATE_USER', "Create user"); define('_MI_USER_KEYWORD_GROUP_LIST', "list edit modify delete user permission add remove member"); From minahito @ users.sourceforge.jp Sat Aug 19 17:05:15 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 17:05:15 +0900 Subject: [xoops-cvslog 4239] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060819080515.859CB2AC1F7@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.33 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.34 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.33 Fri Aug 18 20:59:20 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Sat Aug 19 17:05:15 2006 @@ -1,14 +1,14 @@ Index: xoops2jp/html/modules/user/language/japanese/modinfo.php diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.18 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.19 --- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.18 Fri Aug 18 18:06:31 2006 +++ xoops2jp/html/modules/user/language/japanese/modinfo.php Sat Aug 19 17:05:53 2006 @@ -26,7 +26,7 @@ define('_MI_USER_CONF_AVATAR_HEIGHT', "アバター画像の最大高さ(ピクセル)"); define('_MI_USER_CONF_AVATAR_MAXSIZE', "アバター画像の最大ファイルサイズ(バイト)"); define('_MI_USER_CONF_AVATAR_MINPOSTS', "アバターアップロード権を得るための発言数"); -define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "Enter the minimum number of posts required to upload a custom avatar."); +define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "ユーザが自分で作成したアバターをアップロードするために必要な最低投稿数を設定してください。"); define('_MI_USER_CONF_AVATAR_WIDTH', "アバター画像の最大幅(ピクセル)"); define('_MI_USER_CONF_AVTR_ALLOW_UP', "アバター画像のアップロードを許可する"); define('_MI_USER_CONF_BAD_EMAILS', "ユーザのemailアドレスとして使用できない文字列"); @@ -56,13 +56,13 @@ define('_MI_USER_CONF_USERCOOKIE_DESC', "このクッキーにはユーザ名のみが保存され、ユーザのPCのハードディスク中に1年間保管されます。このクッキーを使用するかしないかはユーザ自身が選択できます。"); define('_MI_USER_KEYWORD_AVATAR_MANAGE', "アバター カスタムアバター システムアバター 一覧 リスト 編集 変更 削除"); define('_MI_USER_KEYWORD_CREATE_AVATAR', "アバター カスタムアバター システムアバター 新規作成 アップロード"); -define('_MI_USER_KEYWORD_CREATE_GROUP', "ユーザーグループ ユーザグループ"); +define('_MI_USER_KEYWORD_CREATE_GROUP', "新規作成 ユーザーグループ"); define('_MI_USER_KEYWORD_CREATE_RANK', "ランク ユーザーランク"); define('_MI_USER_KEYWORD_CREATE_USER', "新規登録"); define('_MI_USER_KEYWORD_GROUP_LIST', "グループ 一覧 リスト 編集 変更 削除 ユーザー ユーザグループ 権限 パーミッション 追加 メンバー"); define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage"); define('_MI_USER_KEYWORD_USER_LIST', "一覧 リスト 編集 変更 削除"); -define('_MI_USER_KEYWORD_USER_SEARCH', "User search"); +define('_MI_USER_KEYWORD_USER_SEARCH', "ユーザー 検索"); define('_MI_USER_MENU_CREATE_AVATAR', "アバターの新規作成"); define('_MI_USER_MENU_CREATE_GROUP', "グループの新規作成"); define('_MI_USER_MENU_CREATE_RANK', "ランクの新規作成"); From tom_g3x @ users.sourceforge.jp Sat Aug 19 17:27:51 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 17:27:51 +0900 Subject: [xoops-cvslog 4241] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060819082751.51DDB2AC218@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.11 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.12 --- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html Sat Aug 19 17:27:51 2006 @@ -59,7 +59,7 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}> "> - <{xoops_input type=text name=imptotal value=$actionForm->get('imptotal')}> + <{xoops_input type=text name=imptotal value=$actionForm->get('imptotal') class=legacyRender_list_number}> Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.9 --- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html Sat Aug 19 17:27:51 2006 @@ -38,14 +38,14 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('bid')}> - <{$obj->mClient->getShow('name')}> - <{$obj->getShow('impressions')}> - <{$obj->getShow('clicks')}> - <{$obj->get('datestart')|xoops_formattimestamp}> - <{$obj->get('dateend')|xoops_formattimestamp}> - + + <{$obj->getShow('bid')}> + <{$obj->mClient->getShow('name')}> + <{$obj->getShow('impressions')}> + <{$obj->getShow('clicks')}> + <{$obj->get('datestart')|xoops_formattimestamp}> + <{$obj->get('dateend')|xoops_formattimestamp}> + " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.24 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.25 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.24 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html Sat Aug 19 17:27:51 2006 @@ -61,19 +61,22 @@ <{else}> <{/if}> - <{$obj->getShow('tplset_id')}> - <{$obj->getShow('tplset_name')}>

      - <{$obj->getShow('tplset_desc')}> - <{$obj->get('tplset_credits')|escape|nl2br}> - <{$obj->get('tplset_created')|xoops_formattimestamp:l}> - + <{$obj->getShow('tplset_id')}> + <{$obj->getShow('tplset_name')}> + <{if $obj->getShow('tplset_desc')}> +

      <{$obj->getShow('tplset_desc')}>

      + <{/if}> + + <{$obj->get('tplset_credits')|escape|nl2br}> + <{$obj->get('tplset_created')|xoops_formattimestamp:l}> + - + <{if $activeTemplateSet == $obj->get('tplset_name')}> " alt="*active*" title="*active*" />

      <{else}> @@ -116,21 +119,21 @@ <{foreach item=obj from=$recentObjects}> <{if $obj->get('tpl_type') == "block"}> - + <{else}> <{/if}> - <{$obj->getShow('tpl_id')}> - <{$obj->getShow('tpl_module')}> - <{$obj->getShow('tpl_tplset')}> - - <{$obj->getShow('tpl_file')}>
      - <{$obj->getShow('tpl_desc')}> + <{$obj->getShow('tpl_id')}> + <{$obj->getShow('tpl_module')}> + <{$obj->getShow('tpl_tplset')}> + + <{$obj->getShow('tpl_file')}> +
      <{$obj->getShow('tpl_desc')}>
      - <{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}> - <{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}> - <{$obj->getShow('tpl_type')}> - + <{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}> + <{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}> + <{$obj->getShow('tpl_type')}> + <{if $obj->get('tpl_tplset') == "default"}> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /> <{else}> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.20 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.21 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.20 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html Sat Aug 19 17:27:51 2006 @@ -94,45 +94,48 @@ <{foreach item=obj from=$objects}> <{if $obj->mOverride == null && $targetTplset != null && $targetTplset != 'default'}> - + <{elseif $obj->get('tpl_type') == "block"}> - + <{else}> <{/if}> - + <{if $obj->mOverride != null}> <{$obj->mOverride->getShow('tpl_id')}> <{else}> <{$obj->getShow('tpl_id')}> <{/if}> - <{$obj->getShow('tpl_module')}> - + <{$obj->getShow('tpl_module')}> + <{if $obj->mOverride != null}> <{$obj->mOverride->getShow('tpl_tplset')}> <{else}> <{$obj->getShow('tpl_tplset')}> <{/if}> - <{$obj->getShow('tpl_file')}>
      - <{$obj->getShow('tpl_desc')}> - + <{$obj->getShow('tpl_file')}> + <{if $obj->getShow('tpl_desc')}> +
      <{$obj->getShow('tpl_desc')}>
      + <{/if}> + + <{if $obj->mOverride != null}> <{$obj->mOverride->get('tpl_lastmodified')|xoops_formattimestamp:l}> <{else}> <{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}> <{/if}> - + <{if $obj->mOverride != null}> <{$obj->mOverride->get('tpl_lastimported')|xoops_formattimestamp:l}> <{else}> <{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}> <{/if}> - <{$obj->getShow('tpl_type')}> - + <{$obj->getShow('tpl_type')}> + <{if $targetTplset == 'default'}> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /> @@ -140,12 +143,12 @@ " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /> - + <{xoops_input type=file name=upload key=$obj->mOverride->get('tpl_id')}> <{elseif $obj->mOverride == null && $targetTplset != null && $targetTplset != 'default'}> " alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /> -   +   <{else}> <{if $obj->get('tpl_tplset') == 'default'}> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /> @@ -154,15 +157,14 @@ <{/if}> " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /> <{/if}> - <{/foreach}> <{if $targetTplset != null && $targetTplset != 'default'}> - + - + <{xoops_input type=hidden name=tpl_tplset value=$targetTplset}> <{xoops_input type=hidden name=tpl_module value=$targetModule}> Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.8 --- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html Sat Aug 19 17:27:51 2006 @@ -35,14 +35,14 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('cid')}> - <{$obj->getShow('name')}> - <{$obj->getShow('contact')}> - <{$obj->getShow('email')}> - <{$obj->getShow('login')}> - <{$obj->getShow('extrainfo')}> - + + <{$obj->getShow('cid')}> + <{$obj->getShow('name')}> + <{$obj->getShow('contact')}> + <{$obj->getShow('email')}> + <{$obj->getShow('login')}> + <{$obj->getShow('extrainfo')}> + <{assign var=count value=count($obj->mBanners)}> <{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>(<{$obj->mBannerCount|escape}>)
      <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|escape}>)
      Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.10 --- xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html Sat Aug 19 17:27:51 2006 @@ -41,21 +41,21 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('bid')}> - <{$obj->mClient->getShow('name')}> - + + <{$obj->getShow('bid')}> + <{$obj->mClient->getShow('name')}> + <{if $obj->get('imptotal') > 0}> <{$obj->getShow('imptotal')}> <{else}> <{$smarty.const._AD_LEGACYRENDER_LANG_UN_LIMITED}> <{/if}> - <{$obj->getShow('impmade')}> - <{$obj->getShow('clicks')}> - <{$obj->get('date')|xoops_formattimestamp}> - <{if $obj->getShow('htmlbanner') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}> - + <{$obj->getShow('impmade')}> + <{$obj->getShow('clicks')}> + <{$obj->get('date')|xoops_formattimestamp}> + <{if $obj->getShow('htmlbanner') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> From tom_g3x @ users.sourceforge.jp Sat Aug 19 17:27:51 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 17:27:51 +0900 Subject: [xoops-cvslog 4242] CVS update: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets Message-ID: <20060819082751.7B9952AC21F@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.3 --- xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.2 Mon Aug 14 18:04:17 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css Sat Aug 19 17:27:51 2006 @@ -1,4 +1,4 @@ - +/* Template */ .legacyRender_TemplateSearch { text-align:right; } @@ -9,13 +9,53 @@ background-color:pink; } .legacyRender_TemplateFile_block { - background-color:pink; + color:#0000ff; } .legacyRender_TemplateFile_nofile { color:#ff0000; } - .legacyRender_TemplateManager_textarea { width:600px; height:400px; } + +/* List Table */ +.legacyRender_list_id { + text-align:center; +} +.legacyRender_list_control { + text-align:center; +} +.legacyRender_list_title { + text-align:left; + padding-left:5px; + font-weight:bold; +} +.legacyRender_list_name { + text-align:left; + padding-left:5px; +} +.legacyRender_list_text { + text-align:left; + padding-left:5px; +} +.legacyRender_list_email { + text-align:center; +} +.legacyRender_list_description { + text-align:left; + font-weight:normal; +} +.legacyRender_list_date { + text-align:center; +} +.legacyRender_list_select { + text-align:center; +} +.legacyRender_list_type { + text-align:center; +} +.legacyRender_list_number { + text-align:right; + padding-right:5px; +} \ No newline at end of file From tom_g3x @ users.sourceforge.jp Sat Aug 19 17:37:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 17:37:35 +0900 Subject: [xoops-cvslog 4243] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819083735.D26AF2AC12C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.6 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Sat Aug 19 17:37:35 2006 @@ -62,12 +62,12 @@ <{/foreach}> - - - + + + - + Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.11 Sat Aug 19 16:44:50 2006 +++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html Sat Aug 19 17:37:35 2006 @@ -109,8 +109,8 @@ - - + + Index: xoops2jp/html/modules/base/admin/templates/image_edit.html diff -u xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.12 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/image_edit.html Sat Aug 19 17:37:35 2006 @@ -74,8 +74,8 @@ <{else}> <{xoops_input type=hidden name=imgcat_id value=$actionForm->get('imgcat_id')}> <{/if}> - - + + Index: xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html Sat Aug 19 17:37:35 2006 @@ -98,8 +98,8 @@ <{/if}> - - + + Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.9 Sat Aug 19 16:44:50 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html Sat Aug 19 17:37:35 2006 @@ -75,8 +75,8 @@ <{/if}> - - + + From tom_g3x @ users.sourceforge.jp Sat Aug 19 17:37:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 17:37:35 +0900 Subject: [xoops-cvslog 4244] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060819083736.00C582AC186@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.8 --- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html Sat Aug 19 17:37:35 2006 @@ -74,8 +74,8 @@ <{xoops_dhtmltarea type=text name=extrainfo value=$actionForm->get('extrainfo') rows=5 cols=50}> - - + + From tom_g3x @ users.sourceforge.jp Sat Aug 19 17:37:36 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 17:37:36 +0900 Subject: [xoops-cvslog 4245] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060819083736.23A732AC12C@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html Sat Aug 19 17:37:36 2006 @@ -75,8 +75,8 @@ <{xoops_input type=checkbox name=is_mail value=1 default=$actionForm->get('is_mail')}> - - + + From tom_g3x @ users.sourceforge.jp Sat Aug 19 18:39:44 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 18:39:44 +0900 Subject: [xoops-cvslog 4246] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819093944.E3ACF2AC222@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/imagecategory_list.html diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/imagecategory_list.html Sat Aug 19 18:39:44 2006 @@ -43,18 +43,18 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('imgcat_id')}> - <{$obj->getShow('imgcat_name')}> - <{$obj->get('imgcat_maxsize')|number_format}> - <{$obj->get('imgcat_maxwidth')|number_format}> - <{$obj->get('imgcat_maxheight')|number_format}> - <{$obj->getShow('imgcat_display')}> - <{$obj->getShow('imgcat_weight')}> - <{$obj->getShow('imgcat_type')}> - <{$obj->getShow('imgcat_storetype')}> - <{$obj->getImageCount()|escape}> - + + <{$obj->getShow('imgcat_id')}> + <{$obj->getShow('imgcat_name')}> + <{$obj->get('imgcat_maxsize')|number_format}> + <{$obj->get('imgcat_maxwidth')|number_format}> + <{$obj->get('imgcat_maxheight')|number_format}> + <{$obj->getShow('imgcat_display')}> + <{$obj->getShow('imgcat_weight')}> + <{$obj->getShow('imgcat_type')}> + <{$obj->getShow('imgcat_storetype')}> + <{$obj->getImageCount()|escape}> + " alt="<{$smarty.const._AD_BASE_LANG_LIST}>" title="<{$smarty.const._AD_BASE_LANG_LIST}>" /> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/base/admin/templates/image_list.html diff -u xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.12 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/image_list.html Sat Aug 19 18:39:44 2006 @@ -31,15 +31,12 @@ <{$smarty.const._AD_BASE_LANG_IMAGE_WEIGHT}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> - <{$smarty.const._AD_BASE_LANG_IMGCAT_ID}>
      - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('image_id')}> - + + <{$obj->getShow('image_id')}> + <{if $obj->mImageCategory != null}> <{if $obj->mImageCategory->get('imgcat_storetype') == 'file'}> @@ -48,13 +45,12 @@ <{/if}> <{/if}> - <{$obj->getShow('image_nicename')}> - <{$obj->getShow('image_mimetype')}> - <{$obj->getShow('image_created')|xoops_formattimestamp:l}> - <{if $obj->get('image_display') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._YES}><{/if}> - <{$obj->getShow('image_weight')}> - <{$obj->getShow('imgcat_id')}> - + <{$obj->getShow('image_nicename')}> + <{$obj->getShow('image_mimetype')}> + <{$obj->getShow('image_created')|xoops_formattimestamp:l}> + <{if $obj->get('image_display') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._YES}><{/if}> + <{$obj->getShow('image_weight')}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.16 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.17 --- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.16 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html Sat Aug 19 18:39:44 2006 @@ -22,11 +22,6 @@ <{$smarty.const._AD_BASE_LANG_MID}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> -<{* - <{$smarty.const._AD_BASE_LANG_NAME}>
      - " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> - " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> -*}> <{$smarty.const._AD_BASE_LANG_TITLE}>
      " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> @@ -36,25 +31,24 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('bid')}> - + + <{$obj->getShow('bid')}> + <{if $obj->mModule}> - <{$obj->mModule->getShow('name')}> + <{$obj->mModule->getShow('name')}> <{else}> + <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}> <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}> <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}> <{elseif $obj->get('c_type') == "T"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}> <{/if}> + <{/if}> -<{* - <{$obj->getShow('name')}> -*}> - <{$obj->getShow('title')}> - <{$obj->getShow('template')}> - + <{$obj->getShow('title')}> + <{$obj->getShow('template')}> + <{if $obj->get('block_type') == 'C'}> " alt="<{$smarty.const._AD_BASE_LANG_INSTALL}>" title="<{$smarty.const._AD_BASE_LANG_INSTALL}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/base/admin/templates/module_list.html diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.17 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.18 --- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.17 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list.html Sat Aug 19 18:39:44 2006 @@ -44,21 +44,21 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=module from=$moduleObjects}> - - <{$module->getShow('mid')}> - <{$module->getShow('name')}>
      - - <{$module->getRenderedVersion()}> - <{$module->get('last_update')|xoops_formattimestamp:l}> - + + <{$module->getShow('mid')}> + <{$module->getShow('name')}>
      + + <{$module->getRenderedVersion()}> + <{$module->get('last_update')|xoops_formattimestamp:l}> + <{if $module->get('hasmain')}> <{else}> <{/if}> - get('isactive')}>checked="checked"<{/if}> /> - + get('isactive')}>checked="checked"<{/if}> /> + " alt="<{$smarty.const._AD_BASE_LANG_UPDATE}>" title="<{$smarty.const._AD_BASE_LANG_UPDATE}>" /> <{if $module->get('isactive') == 0 }> " alt="<{$smarty.const._AD_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._AD_BASE_LANG_UNINSTALL}>" /> Index: xoops2jp/html/modules/base/admin/templates/preference_list.html diff -u xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/preference_list.html:1.1.2.9 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_list.html Sat Aug 19 18:39:44 2006 @@ -12,10 +12,10 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getVar('confcat_id')}> - <{$obj->getName()|escape}> - + + <{$obj->getVar('confcat_id')}> + <{$obj->getName()|escape}> + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> Index: xoops2jp/html/modules/base/admin/templates/block_list.html diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.21 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.22 --- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.21 Fri Aug 18 20:25:05 2006 +++ xoops2jp/html/modules/base/admin/templates/block_list.html Sat Aug 19 18:39:44 2006 @@ -55,7 +55,7 @@ <{foreach item=obj from=$objects}> <{$obj->getShow('bid')}> - + <{if $obj->mModule}> <{$obj->mModule->getShow('name')}> <{else}> Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.9 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Sat Aug 19 18:39:44 2006 @@ -15,13 +15,13 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=module from=$moduleObjects}> - - - <{$module->getShow('name','e')}>
      - <{$module->getShow('name')}> + + + <{$module->getShow('name','e')}> +
      <{$module->getShow('name')}>
      - <{$module->getRenderedVersion()}> - + <{$module->getRenderedVersion()}> + " alt="<{$smarty.const._AD_BASE_LANG_INSTALL}>" title="<{$smarty.const._AD_BASE_LANG_INSTALL}>" /> " alt="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" title="<{$smarty.const._AD_BASE_LANG_INFORMATION}>" /> Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.11 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Sat Aug 19 18:39:44 2006 @@ -30,22 +30,22 @@ <{foreach item=obj from=$objects}> <{if $obj->get('display') == 1 }> - + <{else}> - + <{/if}> - <{$obj->getShow('id')}> - <{$obj->getShow('code')}> - <{$obj->getShow('emotion')}> - <{$obj->getShow('emotion')}> - + <{$obj->getShow('id')}> + <{$obj->getShow('code')}> + <{$obj->getShow('emotion')}> + <{$obj->getShow('emotion')}> + <{if $obj->get('display') == 1 }> <{$smarty.const._YES}> <{else}> <{$smarty.const._NO}> <{/if}> - + " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.9 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html Sat Aug 19 18:39:44 2006 @@ -18,23 +18,23 @@ <{foreach item=mid from=$mids}> - - <{$mid}> - + + <{$mid}> + <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}> <{$actionForm->get('name',$mid)|escape}> <{else}> (<{$moduleObjects[$mid]->getShow('name')}>) » <{$actionForm->get('name',$mid)|escape}> <{/if}> - + <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}> <{$actionForm->get('weight',$mid)|escape}> <{else}> (<{$moduleObjects[$mid]->getShow('weight')}>) » <{$actionForm->get('weight',$mid)|escape}> <{/if}> - + <{if $actionForm->get('isactive',$mid) == $moduleObjects[$mid]->getProperty('isactive')}> <{$smarty.const._AD_BASE_LANG_NO_CHANGE}> <{else}> @@ -51,15 +51,15 @@ <{$smarty.const._AD_BASE_LANG_DEACTIVATE}> <{/if}> <{/if}> + + + <{if $actionForm->get('isactive',$mid)}> + + <{else}> + + <{/if}> - - - <{if $actionForm->get('isactive',$mid)}> - - <{else}> - - <{/if}> <{/foreach}> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.7 Sat Aug 19 17:37:35 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Sat Aug 19 18:39:44 2006 @@ -27,19 +27,18 @@ <{foreach item=theme from=$themes}> <{if $currentThemeName == $theme->get('dirname')}> - base_theme_active" style="text-align:center;"> + base_theme_active"> <{else}> - base_theme_inactive" style="text-align:center;"> + base_theme_inactive"> <{/if}> - + <{if $theme->get('screenshot')}> - <{$theme->getShow('name')}>
      + <{$theme->getShow('name')}> <{/if}> - - <{$theme->getShow('name')}> +
      <{$theme->getShow('name')}>
      - -

      <{$theme->getShow('description') != null}>

      + +

      <{$theme->getShow('description') != null}>

      • <{$smarty.const._AD_BASE_LANG_VERSION}> : <{$theme->getShow('version')}>
      • <{$smarty.const._AD_BASE_LANG_RENDER}> : <{$theme->getShow('render_system')}> @@ -50,14 +49,14 @@ <{/if}>
      - + get('select', $theme->get('dirname'))}>checked="checked"<{/if}> /> - + <{if $currentThemeName != $theme->get('dirname')}> <{else}> - " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" /> + " alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" /> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/comment_list.html diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.18 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.19 --- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.18 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_list.html Sat Aug 19 18:39:44 2006 @@ -62,20 +62,20 @@ <{$smarty.const._AD_BASE_LANG_CONTROL}> <{foreach item=obj from=$objects}> - - <{$obj->getShow('com_id')}> - + + <{$obj->getShow('com_id')}> + <{if $obj->mModule}> <{$obj->mModule->getShow('name')}> <{/if}> - <{$obj->getShow('com_title')}> - <{$obj->getShow('com_created')|xoops_formattimestamp:l}> - <{$obj->getShow('com_modified')|xoops_formattimestamp:l}> + <{$obj->getShow('com_title')}> + <{$obj->getShow('com_created')|xoops_formattimestamp:l}> + <{$obj->getShow('com_modified')|xoops_formattimestamp:l}> <{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}> <{$obj->getShow('com_ip')}> <{$obj->mStatus->getShow('name')}> - + " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> " alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /> Index: xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.8 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html Sat Aug 19 18:39:44 2006 @@ -25,7 +25,7 @@ <{$licence|escape}> - + From tom_g3x @ users.sourceforge.jp Sat Aug 19 18:39:45 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 18:39:45 +0900 Subject: [xoops-cvslog 4247] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060819093945.190212AC229@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.2 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.3 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.2 Fri Aug 18 20:25:04 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Sat Aug 19 18:39:44 2006 @@ -16,10 +16,10 @@ /* block list */ .base_blocktype_module { - font-weight:bold; +/* font-weight:bold; */ } .base_blocktype_custom { - font-weight:bold; +/* font-weight:bold; */ color:#0000cc; } .base_blockside { @@ -39,22 +39,51 @@ float:left; } +/* module list */ +.base_module_title { + font-weight:bold; +} + /* for list table */ .base_list_id { text-align:center; } .base_list_title { text-align:left; + padding-left:5px; + font-weight:bold; +} +.base_list_name { + text-align:left; + padding-left:5px; +} +.base_list_text { + text-align:left; + padding-left:5px; +} +.base_list_description { + text-align:left; + padding-left:5px; } .base_list_number { text-align:right; + padding-right:5px; +} +.base_list_order { + text-align:center; +} +.base_list_image { + text-align:center; } .base_list_select { text-align:center; } +.base_list_type { + text-align:center; +} .base_list_date { - text-align:right; + text-align:center; } -.base_list_controll { +.base_list_control { text-align:center; } From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:06:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:06:35 +0900 Subject: [xoops-cvslog 4248] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060819110635.8040E2AC07C@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.21 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.22 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.21 Sat Aug 19 17:27:51 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html Sat Aug 19 20:06:35 2006 @@ -98,7 +98,7 @@ <{elseif $obj->get('tpl_type') == "block"}> <{else}> - + <{/if}> <{if $obj->mOverride != null}> Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.10 xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.11 --- xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html Sat Aug 19 20:06:35 2006 @@ -16,7 +16,7 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_DELETE}> - + <{if $object->get('htmlbanner')}> <{$object->get('htmlcode')}> <{else}> Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.12 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13 --- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.12 Sat Aug 19 17:27:51 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html Sat Aug 19 20:06:35 2006 @@ -39,7 +39,7 @@ <{if $actionForm->get('bid')}> - + <{if $actionForm->get('htmlbanner')}> <{$actionForm->get('htmlcode')}> <{else}> From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:06:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:06:35 +0900 Subject: [xoops-cvslog 4249] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819110635.CEC992AC07C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.10 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Sat Aug 19 20:06:35 2006 @@ -18,7 +18,7 @@ <{$module->getShow('name','e')}> -
      <{$module->getShow('name')}>
      +
      <{$module->getShow('name')}>
      <{$module->getRenderedVersion()}> Index: xoops2jp/html/modules/base/admin/templates/module_uninstall.html diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.8 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_uninstall.html Sat Aug 19 20:06:35 2006 @@ -29,7 +29,7 @@ <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_CONF}> - +
      <{$module->modinfo.name|escape}>
      @@ -45,7 +45,7 @@ <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> - » <{math equation=$module->modinfo.version format="%.2f"}> + » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.18 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.19 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.18 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Sat Aug 19 20:06:35 2006 @@ -46,7 +46,7 @@ <{foreach item=config from=$objectArr}> - + <{$config->getTitle()|escape}> <{if $config->get('conf_desc') != null}> Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.15 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.16 --- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.15 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_delete.html Sat Aug 19 20:06:35 2006 @@ -41,7 +41,13 @@ <{$smarty.const._MD_BASE_LANG_COM_ICON}> - "> + "> + <{if $object->getShow('com_icon')}> + + <{else}> + + <{/if}> + <{$smarty.const._AD_BASE_LANG_COM_CREATED}> @@ -120,19 +126,19 @@ <{$smarty.const._AD_BASE_LANG_COM_STATUS}>
      <{foreach item=obj from=$children}> - - <{$obj->getShow('com_id')}> - + + <{$obj->getShow('com_id')}> + <{if $obj->mModule}> <{$obj->mModule->getShow('name')}> <{/if}> - <{$obj->getShow('com_title')}> - <{$obj->getShow('com_created')|xoops_formattimestamp:l}> - <{$obj->getShow('com_modified')|xoops_formattimestamp:l}> - <{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}> - <{$obj->getShow('com_ip')}> - + <{$obj->getShow('com_title')}> + <{$obj->getShow('com_created')|xoops_formattimestamp:l}> + <{$obj->getShow('com_modified')|xoops_formattimestamp:l}> + <{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}> + <{$obj->getShow('com_ip')}> + <{if $obj->get('com_status') == 2}> " /> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.10 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html Sat Aug 19 20:06:35 2006 @@ -24,14 +24,14 @@ <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}> <{$actionForm->get('name',$mid)|escape}> <{else}> - (<{$moduleObjects[$mid]->getShow('name')}>) » <{$actionForm->get('name',$mid)|escape}> + (<{$moduleObjects[$mid]->getShow('name')}>) » <{$actionForm->get('name',$mid)|escape}> <{/if}> <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}> <{$actionForm->get('weight',$mid)|escape}> <{else}> - (<{$moduleObjects[$mid]->getShow('weight')}>) » <{$actionForm->get('weight',$mid)|escape}> + (<{$moduleObjects[$mid]->getShow('weight')}>) » <{$actionForm->get('weight',$mid)|escape}> <{/if}> @@ -44,7 +44,7 @@ <{$smarty.const._AD_BASE_LANG_DEACTIVATE}> <{/if}>) » - + <{if $actionForm->get('isactive',$mid) == 1}> <{$smarty.const._AD_BASE_LANG_ISACTIVE}> <{else}> Index: xoops2jp/html/modules/base/admin/templates/module_update.html diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.10 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_update.html Sat Aug 19 20:06:35 2006 @@ -26,9 +26,9 @@ <{$smarty.const._AD_BASE_LANG_MODUPDATE_CONF}> - + <{$module->getShow('name')}> -
      <{$module->modinfo.name|escape}>
      +
      <{$module->modinfo.name|escape}>
      <{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}> Index: xoops2jp/html/modules/base/admin/templates/module_information.html diff -u xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.14 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.13 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Sat Aug 19 20:06:35 2006 @@ -15,9 +15,9 @@ <{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}> - + <{$module->getShow('name')}> -
      <{$module->modinfo.name|escape}>
      +
      <{$module->modinfo.name|escape}>
      <{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}> @@ -30,7 +30,7 @@ <{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> - » <{math equation=$module->modinfo.version format="%.2f"}> + » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}> Index: xoops2jp/html/modules/base/admin/templates/comment_list.html diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.19 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.20 --- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.19 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_list.html Sat Aug 19 20:06:35 2006 @@ -5,6 +5,7 @@

      <{$smarty.const._MI_BASE_MENU_COMMENT_MANAGE}>

      + @@ -69,12 +69,26 @@ <{$obj->mModule->getShow('name')}> <{/if}> - + - - - + + + - @@ -42,7 +42,7 @@ Index: xoops2jp/html/modules/base/admin/templates/comment_view.html diff -u xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/comment_view.html:1.1.2.7 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/comment_view.html Sat Aug 19 20:06:35 2006 @@ -32,7 +32,12 @@ - + @@ -104,15 +109,15 @@ <{foreach item=obj from=$children}> - - - - - - - - - + + + + + + + + <{foreach item=user from=$objects}> - + - - - - - - + + + + + + - -
      <{$obj->getShow('com_title')}> + <{if $obj->getShow('com_icon')}> + + <{else}> + + <{/if}> + <{$obj->getShow('com_title')}> <{$obj->getShow('com_created')|xoops_formattimestamp:l}> <{$obj->getShow('com_modified')|xoops_formattimestamp:l}><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}><{$obj->getShow('com_ip')}><{$obj->mStatus->getShow('name')}> + + <{if $obj->mUser}> + <{$obj->mUser->getShow('uname')}> + <{else}> + <{$smarty.const._GUESTS}> + <{/if}> + + <{$obj->getShow('com_ip')}><{$obj->mStatus->getShow('name')}> " alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> Index: xoops2jp/html/modules/base/admin/templates/module_install.html diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.11 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_install.html Sat Aug 19 20:06:35 2006 @@ -27,7 +27,7 @@ <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      +
      <{$module->modinfo.name|escape}>
      <{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> - » <{math equation=$module->modinfo.version format="%.2f"}> + » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}>
      <{$smarty.const._MD_BASE_LANG_COM_ICON}>">"> + <{if $object->getShow('com_icon')}> + + <{else}> + + <{/if}>
      <{$smarty.const._AD_BASE_LANG_COM_CREATED}><{$smarty.const._AD_BASE_LANG_COM_STATUS}>
      <{$obj->getShow('com_id')}><{$obj->mModule->getShow('name')}><{$obj->getShow('com_title')}><{$obj->get('com_created')|xoops_formattimestamp:l}><{$obj->get('com_modified')|xoops_formattimestamp:l}><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}><{$obj->getShow('com_ip')}> +
      <{$obj->getShow('com_id')}><{$obj->mModule->getShow('name')}><{$obj->getShow('com_title')}><{$obj->get('com_created')|xoops_formattimestamp:l}><{$obj->get('com_modified')|xoops_formattimestamp:l}><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}><{$obj->getShow('com_ip')}> <{if $obj->get('com_status') == 2 }> " /> <{/if}> 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.12 xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.12 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_install_success.html Sat Aug 19 20:06:35 2006 @@ -12,11 +12,11 @@
        <{foreach item=msg from=$log}> <{if $msg.type=="error"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{elseif $msg.type=="warning"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{else}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{/if}> <{/foreach}>
      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.10 xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.10 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_update_success.html Sat Aug 19 20:06:35 2006 @@ -10,13 +10,13 @@
        <{foreach item=msg from=$log}> <{if $msg.type=="error"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{elseif $msg.type=="warning"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{else}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{/if}> <{/foreach}>
      -

      » <{$smarty.const._AD_BASE_LANG_MODLIST}>

      +

      » <{$smarty.const._AD_BASE_LANG_MODLIST}>

      Index: xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.9 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html Sat Aug 19 20:06:35 2006 @@ -9,14 +9,14 @@

      <{$smarty.const._AD_BASE_LANG_MODUNINSTALL_LOG}>

        <{foreach item=msg from=$log}> - <{if $msg.type=="error"}> -
      • <{$msg.message|escape}>
      • - <{elseif $msg.type=="warning"}> -
      • <{$msg.message|escape}>
      • + <{if $msg.type == "error"}> +
      • <{$msg.message|escape}>
      • + <{elseif $msg.type == "warning"}> +
      • <{$msg.message|escape}>
      • <{else}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{/if}> <{/foreach}>
      -

      » <{$smarty.const._AD_BASE_LANG_MODLIST}>

      +

      » <{$smarty.const._AD_BASE_LANG_MODLIST}>

      Index: xoops2jp/html/modules/base/admin/templates/install_wizard_error.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.4 --- xoops2jp/html/modules/base/admin/templates/install_wizard_error.html:1.1.2.3 Mon Aug 14 21:16:18 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard_error.html Sat Aug 19 20:06:35 2006 @@ -3,11 +3,11 @@
        <{foreach item=msg from=$log}> <{if $msg.type=="error"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{elseif $msg.type=="warning"}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{else}> -
      • <{$msg.message|escape}>
      • +
      • <{$msg.message|escape}>
      • <{/if}> <{/foreach}>
      From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:06:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:06:35 +0900 Subject: [xoops-cvslog 4250] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060819110636.016C22AC106@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.12 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.12 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Sat Aug 19 20:06:35 2006 @@ -39,14 +39,14 @@
      " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" />" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> <{$user->getShow('uid')}><{$user->getShow('uname')}><{$user->getShow('name')}><{$user->get('user_regdate')|xoops_formattimestamp}><{$user->get('last_login')|xoops_formattimestamp:l}><{$user->getShow('posts')}><{$user->getShow('level')}><{$user->getShow('uname')}><{$user->getShow('name')}><{$user->get('user_regdate')|xoops_formattimestamp}><{$user->get('last_login')|xoops_formattimestamp:l}><{$user->getShow('posts')}><{$user->getShow('level')}> " alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /> <{if $user->get('uid') != 1 }> From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:06:36 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:06:36 +0900 Subject: [xoops-cvslog 4251] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060819110636.2533A2AC07C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.3 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.4 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.3 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Sat Aug 19 20:06:36 2006 @@ -43,6 +43,20 @@ .base_module_title { font-weight:bold; } +.base_module_error { + color:#ff0000; +} +.base_module_warning { + color:#0000ff; +} +.base_module_message { + +} + +/* comment list */ +.base_comment_search { + text-align:center; +} /* for list table */ .base_list_id { From minahito @ users.sourceforge.jp Sat Aug 19 20:55:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:55:11 +0900 Subject: [xoops-cvslog 4252] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060819115511.7F93B2AC0BD@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.18 xoops2jp/html/modules/user/language/english/main.php:1.1.2.19 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.18 Fri Aug 18 18:06:32 2006 +++ xoops2jp/html/modules/user/language/english/main.php Sat Aug 19 20:55:11 2006 @@ -74,7 +74,7 @@ define('_MD_USER_LANG_UNAME', "User name"); define('_MD_USER_LANG_UORDER', "Comments Sort Order"); define('_MD_USER_LANG_URL', "Website"); -define('_MD_USER_LANG_USECOOKIE', "Store my user name in a cookie for 1 year"); +define('_MD_USER_LANG_USERCOOKIE', "Store my user name in a cookie for 1 year"); define('_MD_USER_LANG_USER_AIM', "AIM"); define('_MD_USER_LANG_USER_AVATAR', "Avatar"); define('_MD_USER_LANG_USER_FROM', "Location"); From minahito @ users.sourceforge.jp Sat Aug 19 20:55:11 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:55:11 +0900 Subject: [xoops-cvslog 4253] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060819115511.B4CF82AC210@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.20 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.21 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.20 Fri Aug 18 18:06:32 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Sat Aug 19 20:55:11 2006 @@ -74,7 +74,7 @@ define('_MD_USER_LANG_UNAME', "ユーザー名"); define('_MD_USER_LANG_UORDER', "コメントの並び順"); define('_MD_USER_LANG_URL', "ホームページ"); -define('_MD_USER_LANG_USECOOKIE', "ユーザ名を1年間クッキーに保存する"); +define('_MD_USER_LANG_USERCOOKIE', "ユーザ名を1年間クッキーに保存する"); define('_MD_USER_LANG_USER_AIM', "AIM"); define('_MD_USER_LANG_USER_AVATAR', "アバター"); define('_MD_USER_LANG_USER_FROM', "居住地"); From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:55:28 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:55:28 +0900 Subject: [xoops-cvslog 4254] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819115528.B5E8C2AC0BD@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.8 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Sat Aug 19 20:55:28 2006 @@ -35,7 +35,7 @@ <{if $theme->get('screenshot')}> <{$theme->getShow('name')}> <{/if}> -
      <{$theme->getShow('name')}>
      +
      <{$theme->getShow('name')}>

      <{$theme->getShow('description') != null}>

      Index: xoops2jp/html/modules/base/admin/templates/install_wizard.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/install_wizard.html:1.1.2.7 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard.html Sat Aug 19 20:55:28 2006 @@ -19,10 +19,10 @@
      <{$smarty.const._AD_BASE_LANG_MODINSTALL_CONF}>
      + <{$module->getShow('name')}> +

      <{$module->getShow('name')}>

        <{foreach item=item from=$module->modinfo.installer.description}> @@ -33,7 +33,7 @@
      - +
      Index: xoops2jp/html/modules/base/admin/templates/install_list.html diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.11 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/install_list.html Sat Aug 19 20:55:28 2006 @@ -18,7 +18,7 @@ <{$module->getShow('name','e')}> -
      <{$module->getShow('name')}>
      +
      <{$module->getShow('name')}>
      <{$module->getRenderedVersion()}> Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.19 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.20 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.19 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Sat Aug 19 20:55:28 2006 @@ -48,11 +48,11 @@ <{foreach item=config from=$objectArr}> - <{$config->getTitle()|escape}> +
      <{$config->getTitle()|escape}> <{if $config->get('conf_desc') != null}> -

      - <{$config->getDesc()|escape}> +

      <{$config->getDesc()|escape}>

      <{/if}> +
      "> <{if $config->get('conf_formtype') == 'textarea'}> Index: xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html diff -u xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html:1.1.2.9 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/install_wizard_licence.html Sat Aug 19 20:55:28 2006 @@ -35,7 +35,7 @@ - + From tom_g3x @ users.sourceforge.jp Sat Aug 19 20:55:28 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 20:55:28 +0900 Subject: [xoops-cvslog 4255] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060819115528.DAFF52AC210@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.4 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.5 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.4 Sat Aug 19 20:06:36 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Sat Aug 19 20:55:28 2006 @@ -67,6 +67,10 @@ padding-left:5px; font-weight:bold; } +.base_list_imagetitle { + text-align:center; + font-weight:bold; +} .base_list_name { text-align:left; padding-left:5px; @@ -78,6 +82,7 @@ .base_list_description { text-align:left; padding-left:5px; + font-weight:normal; } .base_list_number { text-align:right; From minahito @ users.sourceforge.jp Sat Aug 19 20:55:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:55:32 +0900 Subject: [xoops-cvslog 4256] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060819115532.B50F52AC0BD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_edituser.html diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.11 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12 --- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.11 Fri Aug 18 18:07:09 2006 +++ xoops2jp/html/modules/user/templates/user_edituser.html Sat Aug 19 20:55:32 2006 @@ -141,10 +141,10 @@ - <{$smarty.const._MD_USER_LANG_USECOOKIE}> + <{$smarty.const._MD_USER_LANG_USERCOOKIE}> "> - <{xoops_input type=radio name=user_mailok value=1}><{$smarty.const._YES}> - <{xoops_input type=radio name=user_mailok value=0}><{$smarty.const._NO}> + <{xoops_input type=radio name=usercookie value=1 default=$actionForm->get('usercookie')}><{$smarty.const._YES}> + <{xoops_input type=radio name=usercookie value=0 default=$actionForm->get('usercookie')}><{$smarty.const._NO}> From minahito @ users.sourceforge.jp Sat Aug 19 20:55:50 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:55:50 +0900 Subject: [xoops-cvslog 4256] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060819115550.645EC2AC0BD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.8 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.9 --- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.8 Fri Aug 18 18:06:19 2006 +++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Sat Aug 19 20:55:50 2006 @@ -14,8 +14,9 @@ /** * TODO The argument of this member property may be moved to constructor. */ - function prepare($userConfig) + function User_AbstractUserEditForm($userConfig) { + parent::XCube_ActionForm(); $this->mConfig = $userConfig; } From minahito @ users.sourceforge.jp Sat Aug 19 20:55:57 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:55:57 +0900 Subject: [xoops-cvslog 4257] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060819115557.98A592AC0BD@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.13 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.14 --- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.13 Fri Aug 18 18:06:19 2006 +++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Sat Aug 19 20:55:57 2006 @@ -51,6 +51,7 @@ $this->mFormProperties['bio'] =& new XCube_TextProperty('bio'); $this->mFormProperties['pass'] =& new XCube_StringProperty('pass'); $this->mFormProperties['vpass'] =& new XCube_StringProperty('vpass'); + $this->mFormProperties['usercookie'] =& new XCube_BoolProperty('usercookie'); $this->mFormProperties['user_mailok'] =& new XCube_BoolProperty('user_mailok'); // @@ -178,6 +179,9 @@ $this->set('pass', null); $this->set('vpass', null); + + $root =& XCube_Root::getSingleton(); + $this->set('usercookie', empty($_COOKIE[$this->mConfig['usercookie']]) ? 0 : 1); } function update(&$obj) From minahito @ users.sourceforge.jp Sat Aug 19 20:56:06 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 20:56:06 +0900 Subject: [xoops-cvslog 4258] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060819115606.992C62AC210@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.10 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.11 --- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.10 Thu Jul 20 17:14:28 2006 +++ xoops2jp/html/modules/user/actions/EditUserAction.class.php Sat Aug 19 20:56:06 2006 @@ -1,7 +1,7 @@ mUserCookie = $moduleConfig['usercookie']; + } + function _getId() { return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0; @@ -62,6 +75,23 @@ return false; } + function _doExecute() + { + if ($this->mObjectHandler->insert($this->mObject)) { + if ($this->mActionForm->get('usercookie')) { + setcookie($this->mUserCookie, $this->mObject->getShow('uname'), time() + USER_COOKIE_KEEP_TIME); + } + else { + setcookie($this->mUserCookie); + } + + return true; + } + else { + return false; + } + } + function executeViewInput(&$controller, &$xoopsUser, &$render) { $render->setTemplateName("user_edituser.html"); From minahito @ users.sourceforge.jp Sat Aug 19 21:01:40 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 21:01:40 +0900 Subject: [xoops-cvslog 4259] CVS update: xoops2jp/html/modules/user/actions Message-ID: <20060819120140.506C42AC02C@users.sourceforge.jp> Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.9 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.10 --- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.9 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php Sat Aug 19 21:01:40 2006 @@ -1,7 +1,7 @@ mConfig['reg_dispdsclmr'] != 0 && $this->mConfig['reg_disclaimer'] != null) { $this->mEnableAgreeFlag = true; - $this->mActionForm =& new User_RegisterAgreeEditForm(); + $this->mActionForm =& new User_RegisterAgreeEditForm($this->mConfig); } else { - $this->mActionForm =& new User_RegisterEditForm(); + $this->mActionForm =& new User_RegisterEditForm($this->mConfig); } - $this->mActionForm->prepare($this->mConfig); + $this->mActionForm->prepare(); } function executeViewInput(&$controller,&$xoopsUser,&$renderSystem) From minahito @ users.sourceforge.jp Sat Aug 19 21:01:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 21:01:54 +0900 Subject: [xoops-cvslog 4260] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060819120154.6C73E2AC02C@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.8 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.9 --- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.8 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php Sat Aug 19 21:01:54 2006 @@ -14,9 +14,9 @@ return "module.user.UserRegisterEditForm.TOKEN"; } - function prepare($userConfig) + function prepare() { - parent::prepare($userConfig); + parent::prepare(); // // Set form properties // @@ -98,9 +98,9 @@ class User_RegisterAgreeEditForm extends User_RegisterEditForm { - function prepare($userConfig) + function prepare() { - parent::prepare($userConfig); + parent::prepare(); // set properties $this->mFormProperties['agree']=new XCube_IntProperty('agree'); From tom_g3x @ users.sourceforge.jp Sat Aug 19 21:10:06 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 21:10:06 +0900 Subject: [xoops-cvslog 4261] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060819121006.C52232AC233@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/module_install.html diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.12 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/module_install.html Sat Aug 19 21:10:06 2006 @@ -29,7 +29,7 @@ -
      <{$module->modinfo.name|escape}>
      +
      <{$module->modinfo.name|escape}>
      <{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}> Index: xoops2jp/html/modules/base/admin/templates/module_uninstall.html diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.9 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/module_uninstall.html Sat Aug 19 21:10:06 2006 @@ -31,7 +31,7 @@ -
      <{$module->modinfo.name|escape}>
      +
      <{$module->modinfo.name|escape}>
      <{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}> From tom_g3x @ users.sourceforge.jp Sat Aug 19 21:35:34 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 21:35:34 +0900 Subject: [xoops-cvslog 4262] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060819123534.B3C772AC261@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.2 xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.3 --- xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.2 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Sat Aug 19 21:35:34 2006 @@ -21,7 +21,7 @@ .user_list_order { text-align:center; } -.user_list_title { +.user_list_title , .user_list_title a , .user_list_title a:visited { text-align:left; padding-left:5px; font-weight:bold; From tom_g3x @ users.sourceforge.jp Sat Aug 19 21:35:34 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 21:35:34 +0900 Subject: [xoops-cvslog 4263] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060819123534.D61D32AC263@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.5 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.6 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.5 Sat Aug 19 20:55:28 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Sat Aug 19 21:35:34 2006 @@ -16,10 +16,8 @@ /* block list */ .base_blocktype_module { -/* font-weight:bold; */ } .base_blocktype_custom { -/* font-weight:bold; */ color:#0000cc; } .base_blockside { From tom_g3x @ users.sourceforge.jp Sat Aug 19 21:35:35 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sat, 19 Aug 2006 21:35:35 +0900 Subject: [xoops-cvslog 4264] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060819123535.0F3F92AC261@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.20 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.21 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.20 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Sat Aug 19 21:35:34 2006 @@ -40,7 +40,7 @@ " alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /> <{$user->getShow('uid')}> <{$user->getShow('uname')}> - <{$user->getShow('name')}> + <{$user->getShow('name')}> <{$user->get('user_regdate')|xoops_formattimestamp}> <{$user->get('last_login')|xoops_formattimestamp:l}> <{$user->getShow('posts')}> From minahito @ users.sourceforge.jp Sat Aug 19 21:54:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 21:54:21 +0900 Subject: [xoops-cvslog 4265] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060819125421.B51962AC045@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.9 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.10 --- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.9 Sat Aug 19 20:55:50 2006 +++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Sat Aug 19 21:54:21 2006 @@ -11,9 +11,6 @@ { var $mConfig = null; - /** - * TODO The argument of this member property may be moved to constructor. - */ function User_AbstractUserEditForm($userConfig) { parent::XCube_ActionForm(); From minahito @ users.sourceforge.jp Sat Aug 19 23:09:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 23:09:37 +0900 Subject: [xoops-cvslog 4266] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060819140937.98BBA2AC017@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.6 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.7 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.6 Fri Aug 18 18:09:11 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Sat Aug 19 23:09:37 2006 @@ -55,5 +55,4 @@
    • XOOPS Cube における新しい SSL ログインが実装されていない。旧 SSL ログインは再考の余地があります。
    • モジュールコンフィグにポートされた設定項目が一部、全体の設定項目に残っている。
    • [New!] ユーザー自身によるアカウント削除機能を実装しなくてはならない。
    • -
    • [New!] implement USECOOKIE
    From minahito @ users.sourceforge.jp Sat Aug 19 23:09:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 19 Aug 2006 23:09:37 +0900 Subject: [xoops-cvslog 4267] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060819140937.BE8962AC026@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.6 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.7 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.6 Fri Aug 18 18:09:11 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Sat Aug 19 23:09:37 2006 @@ -57,5 +57,4 @@
  • SSL Login feature of XOOPS Cube Legacy 2.1 hasn't been implemented. Old SSL Login is bad.
  • Some config items have been ported from general settings. But, we still haven't removed these items in general setting.
  • [New!] We have to implement user delete function for user.
  • -
  • [New!] implement USECOOKIE
  • From minahito @ users.sourceforge.jp Sun Aug 20 10:42:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 20 Aug 2006 10:42:39 +0900 Subject: [xoops-cvslog 4268] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060820014239.114BA2AC0E3@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.25 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.26 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.25 Sat Aug 19 17:04:39 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Sun Aug 20 10:42:38 2006 @@ -6,7 +6,7 @@ define('_AD_USER_ERROR_IMAGE_REQUIRED', "You must select a image file."); define('_AD_USER_ERROR_INTRANGE', "Incorrect input on {0}."); define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "Failed sending mail or private message."); -define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "Choose one or more delivery means."); +define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "You must choose one or more mail delivery methods."); define('_AD_USER_ERROR_MIN', "Input {0} with {1} or more numeric value."); define('_AD_USER_ERROR_OBJECTEXIST', "Incorrect input on {0}."); define('_AD_USER_ERROR_REQUEST_IS_WRONG', "Request is wrong"); @@ -91,7 +91,7 @@ define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than X days ago"); define('_AD_USER_LANG_RESET', "Reset"); define('_AD_USER_LANG_SEARCH_AGAIN', "Search again"); -define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition"); +define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail to these users"); define('_AD_USER_LANG_TITLE', "Title"); define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); define('_AD_USER_LANG_USER', "User"); @@ -105,9 +105,9 @@ define('_AD_USER_LANG_VPASS', "Verify password"); define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?"); define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Are you sure you want to delete this user rank?"); -define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recount success"); -define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif."); -define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters."); -define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button."); +define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recalculate success"); +define('_AD_USER_TIP_DELETE_AVATAR', "Users who are using this avatar will have blank.gif as the avatar image file."); +define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many users to send mail, the server may not respond as expected (blank page etc.). In that case, reload the browser several times to complete sending mail to all users."); +define('_AD_USER_TIPS_RECOUNT_POSTS', "You may recalculate the number of posts for the user by clicking on the 'Recalculate' button below."); ?> From minahito @ users.sourceforge.jp Sun Aug 20 10:42:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 20 Aug 2006 10:42:51 +0900 Subject: [xoops-cvslog 4269] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060820014251.70BB32AC0E3@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.41 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.42 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.41 Sat Aug 19 14:20:13 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Sun Aug 20 10:42:51 2006 @@ -3,7 +3,7 @@ define('_AD_BASE_ERROR_ACTION_SEARCH_NORESULT', "Coundn't find results by your keyword."); define('_AD_BASE_ERROR_ACTION_SEARCH_TRY_AGAIN', "Try again with other keyword."); define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "Could not install block template '{0}'"); -define('_AD_BASE_ERROR_BMODULE', "Specify one or more modules as target modules that blocks show up to."); +define('_AD_BASE_ERROR_BMODULE', "You must specify one or more modules as the targe for displaying the block."); define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "Can't uninstall active module. For uninstall, turn off the active-status of the module."); define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates : {0}"); define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "Could not insert config '{0}'"); @@ -18,9 +18,9 @@ define('_AD_BASE_ERROR_DROP_TABLE', "Could not drop table {0}"); define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list."); define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "Failed to execute '{0}' callback"); -define('_AD_BASE_ERROR_GROUPID', "Give access permission to one or more groups."); -define('_AD_BASE_ERROR_IMG_FILESIZE', "The maximum file size of the image is {0} byte."); -define('_AD_BASE_ERROR_IMG_SIZE', "The maximum width and height of the image is {0} x {1}."); +define('_AD_BASE_ERROR_GROUPID', "You must grant access permission to one or more groups."); +define('_AD_BASE_ERROR_IMG_FILESIZE', "The maximum size of an image file is {0} bytes."); +define('_AD_BASE_ERROR_IMG_SIZE', "The maximum width and height of an image file is {0} x {1}."); define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{1}' module has been failure"); define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong."); define('_AD_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value."); @@ -28,15 +28,15 @@ define('_AD_BASE_ERROR_NO_HELP_FILE', "Help file is not found."); define('_AD_BASE_ERROR_OBJECTEXIST', "{0} is wrong."); define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree the following licence."); -define('_AD_BASE_ERROR_READGROUPS', "Give read permission to one or more groups."); +define('_AD_BASE_ERROR_READGROUPS', "You must grant read permission to one or more groups."); define('_AD_BASE_ERROR_SEARCH_REQUIRED', "Input keyword"); define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "Could not uninstall template '{0}'."); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Uninstallation of '{1}' module has been failure"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Updating '{1}' module has been failure"); -define('_AD_BASE_ERROR_UPLOADGROUPS', "Give upload permission to one or more groups."); +define('_AD_BASE_ERROR_UPLOADGROUPS', "You must grant upload permission to one or more groups."); define('_AD_BASE_LANG_ACTIONSEARCH', "Action Search"); -define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "You may search with keyword from menu of the control panel and help of modules. If you forget positions of them, use this."); +define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "You can use ActionSearch to search for a menu item or a help file by typing in a keyword."); define('_AD_BASE_LANG_ACTIVE', "Active"); define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block"); define('_AD_BASE_LANG_ADMIN_MENU', "Information of Administration Menu"); @@ -233,7 +233,7 @@ define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site!
    If you want to get a free block except modules' blocks, create cutom block and write your message to it."); define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall the block, the configuration of the block isn't deleted. The block is removed only from display of your site. Therefore you can re-install the block easily because the installer recovers last configure."); define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at 'install block' page."); -define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose file system or database as the storehouse ofimage files. You can't change this setting later.
    Keep in mind that it's difficult to restore and backup if you choose database."); +define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database for the storage scheme of image files. This setting cannot be changed later.
    Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes."); define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
    Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); define('_MD_AM_ADMINML', "Admin mail address"); From minahito @ users.sourceforge.jp Sun Aug 20 11:03:20 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 20 Aug 2006 11:03:20 +0900 Subject: [xoops-cvslog 4270] CVS update: xoops2jp/html Message-ID: <20060820020320.D002B2AC0C7@users.sourceforge.jp> Index: xoops2jp/html/admin.php diff -u xoops2jp/html/admin.php:1.2.8.5 xoops2jp/html/admin.php:1.2.8.6 --- xoops2jp/html/admin.php:1.2.8.5 Sat Jul 8 11:22:22 2006 +++ xoops2jp/html/admin.php Sun Aug 20 11:03:20 2006 @@ -1,18 +1,18 @@ Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.14 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.15 --- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.14 Fri Aug 18 18:05:54 2006 +++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php Sun Aug 20 11:50:06 2006 @@ -1,7 +1,7 @@ mFieldProperties['rank'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank']->setDependsByArray(array('required')); - $this->mFieldProperties['rank']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK); + $this->mFieldProperties['rank']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK); $this->mFieldProperties['level'] =& new XCube_FieldProperty($this); $this->mFieldProperties['level']->setDependsByArray(array('required')); @@ -231,10 +231,10 @@ $rank =& $handler->get($t_rank); if (!is_object($rank)) { - $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); } elseif ($rank->get('rank_special') != 1) { - $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_RANK)); + $this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK)); } } } Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.7 --- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.6 Fri Aug 18 18:05:54 2006 +++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php Sun Aug 20 11:50:06 2006 @@ -1,7 +1,7 @@ mFieldProperties['rank_title'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_title']->setDependsByArray(array('required','maxlength')); - $this->mFieldProperties['rank_title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_TITLE, '50'); - $this->mFieldProperties['rank_title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_TITLE, '50'); + $this->mFieldProperties['rank_title']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_RANK_TITLE, '50'); $this->mFieldProperties['rank_title']->addVar('maxlength', 50); $this->mFieldProperties['rank_min'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_min']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_min']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_MIN); - $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _MD_USER_LANG_RANK_MIN, 0); + $this->mFieldProperties['rank_min']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN); + $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MIN, 0); $this->mFieldProperties['rank_min']->addVar('min', 0); $this->mFieldProperties['rank_max'] =& new XCube_FieldProperty($this); $this->mFieldProperties['rank_max']->setDependsByArray(array('required', 'min')); - $this->mFieldProperties['rank_max']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_RANK_MAX); - $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _MD_USER_LANG_RANK_MAX, 0); + $this->mFieldProperties['rank_max']->addMessage('required', _MD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX); + $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MAX, 0); $this->mFieldProperties['rank_max']->addVar('min', 0); } From tom_g3x @ users.sourceforge.jp Sun Aug 20 11:56:52 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 11:56:52 +0900 Subject: [xoops-cvslog 4272] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060820025652.5D2D82AC064@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.10 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html Sun Aug 20 11:56:52 2006 @@ -1,18 +1,18 @@
    <{$smarty.const._MI_USER_NAME}> - »» <{$smarty.const._MD_USER_LANG_RANK_LIST}> + »» <{$smarty.const._AD_USER_LANG_RANK_LIST}> »» <{if $actionForm->get('rank_id') }> - <{$smarty.const._MD_USER_LANG_RANK_EDIT}> + <{$smarty.const._AD_USER_LANG_RANK_EDIT}> <{else}> - <{$smarty.const._MD_USER_LANG_RANK_NEW}> + <{$smarty.const._AD_USER_LANG_RANK_NEW}> <{/if}>
    <{if $actionForm->get('rank_id') }> -

    <{$smarty.const._MD_USER_LANG_RANK_EDIT}>

    +

    <{$smarty.const._AD_USER_LANG_RANK_EDIT}>

    <{else}> -

    <{$smarty.const._MD_USER_LANG_RANK_NEW}>

    +

    <{$smarty.const._AD_USER_LANG_RANK_NEW}>

    <{/if}> <{if $actionForm->hasError()}> @@ -32,39 +32,39 @@ <{if $actionForm->get('rank_id') }> - <{$smarty.const._MD_USER_LANG_RANK_EDIT}> + <{$smarty.const._AD_USER_LANG_RANK_EDIT}> <{else}> - <{$smarty.const._MD_USER_LANG_RANK_NEW}> + <{$smarty.const._AD_USER_LANG_RANK_NEW}> <{/if}> - <{$smarty.const._MD_USER_LANG_RANK_TITLE}> + <{$smarty.const._AD_USER_LANG_RANK_TITLE}> "> <{xoops_input type=text name=rank_title value=$actionForm->get('rank_title')}> - <{$smarty.const._MD_USER_LANG_RANK_MIN}> + <{$smarty.const._AD_USER_LANG_RANK_MIN}> "> <{xoops_input type=text name=rank_min value=$actionForm->get('rank_min')}> - <{$smarty.const._MD_USER_LANG_RANK_MAX}> + <{$smarty.const._AD_USER_LANG_RANK_MAX}> "> <{xoops_input type=text name=rank_max value=$actionForm->get('rank_max')}> - <{$smarty.const._MD_USER_LANG_RANK_SPECIAL}> + <{$smarty.const._AD_USER_LANG_RANK_SPECIAL}> "> <{xoops_input type=radio name=rank_special value=1 default=$actionForm->get('rank_special')}><{$smarty.const._YES}> <{xoops_input type=radio name=rank_special value=0 default=$actionForm->get('rank_special')}><{$smarty.const._NO}> - <{$smarty.const._MD_USER_LANG_RANK_IMAGE}> + <{$smarty.const._AD_USER_LANG_RANK_IMAGE}> "> Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.13 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html Sun Aug 20 11:56:52 2006 @@ -1,10 +1,10 @@ -

    <{$smarty.const._AD_USER_LANG_DELETE_RANK}>

    +

    <{$smarty.const._AD_USER_LANG_DELETE_RANK}> (<{$object->getShow('rank_title')}>)

    <{$smarty.const._AD_USER_MESSAGE_CONFIRM_DELETE_RANK}>
    @@ -13,30 +13,30 @@ <{xoops_input type=hidden name=rank_id value=$actionForm->get('rank_id')}> - + - - + + - + - + - + - + From tom_g3x @ users.sourceforge.jp Sun Aug 20 11:57:49 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 11:57:49 +0900 Subject: [xoops-cvslog 4273] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060820025749.B8BDE2AC064@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/avatar_delete.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.11 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_delete.html Sun Aug 20 11:57:49 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_AVATAR_DELETE}> -

    <{$smarty.const._AD_USER_LANG_AVATAR_DELETE}>

    +

    <{$smarty.const._AD_USER_LANG_AVATAR_DELETE}> (<{$object->getShow('avatar_name')}>)

    <{$smarty.const._AD_USER_TIP_DELETE_AVATAR}>
    @@ -15,11 +15,11 @@ <{xoops_input type=hidden name=avatar_id value=$actionForm->get('avatar_id')}>
    <{$smarty.const._AD_USER_LANG_DELETE_RANK}><{$smarty.const._AD_USER_LANG_DELETE_RANK}> (<{$object->getShow('rank_title')}>)
    <{$smarty.const._MD_USER_LANG_RANK_ID}> "><{$object->getShow('rank_id')}>
    <{$smarty.const._MD_USER_LANG_RANK_TITLE}>"><{$object->getShow('rank_title')}><{$smarty.const._AD_USER_LANG_RANK_TITLE}>"><{$object->getShow('rank_title')}>
    <{$smarty.const._MD_USER_LANG_RANK_MIN}><{$smarty.const._AD_USER_LANG_RANK_MIN}> "><{$object->getShow('rank_min')}>
    <{$smarty.const._MD_USER_LANG_RANK_MAX}><{$smarty.const._AD_USER_LANG_RANK_MAX}> "><{$object->getShow('rank_max')}>
    <{$smarty.const._MD_USER_LANG_RANK_SPECIAL}><{$smarty.const._AD_USER_LANG_RANK_SPECIAL}> "><{$object->getShow('rank_special')}>
    <{$smarty.const._MD_USER_LANG_RANK_IMAGE}><{$smarty.const._AD_USER_LANG_RANK_IMAGE}> <{$object->getShow('rank_title')}>
    - + - + Index: xoops2jp/html/modules/user/admin/templates/group_delete.html diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.15 --- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.14 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_delete.html Sun Aug 20 11:57:49 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_GROUP_DELETE}> -

    <{$smarty.const._AD_USER_LANG_GROUP_DELETE}>

    +

    <{$smarty.const._AD_USER_LANG_GROUP_DELETE}> (<{$object->getShow('name')}>)

    <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getShow('name')}>
    @@ -26,7 +26,7 @@ <{xoops_input type=hidden name=groupid value=$object->get('groupid')}>
    <{$smarty.const._AD_USER_LANG_AVATAR_DELETE}><{$smarty.const._AD_USER_LANG_AVATAR_DELETE}> (<{$object->getShow('avatar_name')}>)
    <{$smarty.const._MD_USER_LANG_AVATAR_ID}>"><{$object->getShow('avatar_id')}>"><{$object->getShow('avatar_id')}>
    <{$smarty.const._AD_USER_LANG_AVATAR_FILE}>
    - + @@ -34,7 +34,7 @@ - + Index: xoops2jp/html/modules/user/admin/templates/user_edit.html diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.19 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.20 --- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.19 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_edit.html Sun Aug 20 11:57:49 2006 @@ -10,7 +10,7 @@ <{if $actionForm->get('uid')}> -

    <{$smarty.const._AD_USER_LANG_USER_EDIT}>

    +

    <{$smarty.const._AD_USER_LANG_USER_EDIT}> (<{$actionForm->get('uname')}>)

    <{else}>

    <{$smarty.const._AD_USER_LANG_USER_NEW}>

    <{/if}> Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.9 Thu Aug 17 19:21:04 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html Sun Aug 20 11:57:49 2006 @@ -10,7 +10,7 @@ <{if $actionForm->get('avatar_id')}> -

    <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>

    +

    <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> (<{$actionForm->get('avatar_name')}>)

    <{else}>

    <{$smarty.const._AD_USER_LANG_AVATAR_NEW}>

    <{/if}> @@ -32,7 +32,7 @@ - + <{/if}> Index: xoops2jp/html/modules/user/admin/templates/user_delete.html diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14 --- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.13 Fri Aug 18 18:06:04 2006 +++ xoops2jp/html/modules/user/admin/templates/user_delete.html Sun Aug 20 11:57:49 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_USER_DELETE}> -

    <{$smarty.const._AD_USER_LANG_USER_DELETE}>

    +

    <{$smarty.const._AD_USER_LANG_USER_DELETE}> (<{$object->getShow('uname')}>)

    <{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getShow('uname')}>
    @@ -23,7 +23,7 @@ <{xoops_input type=hidden name=uid value=$object->get('uid')}>
    " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}> (<{$object->getShow('name')}>)
    <{$smarty.const._AD_USER_LANG_GROUP_GID}>
    <{$smarty.const._AD_USER_LANG_GROUP_NAME}>"><{$object->getShow('name')}>"><{$object->getShow('name')}>
    <{$smarty.const._AD_USER_LANG_GROUP_DESC}>
    <{if $actionForm->get('avatar_id')}> - <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> + <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> (<{$actionForm->get('avatar_name')}>) <{else}> <{$smarty.const._AD_USER_LANG_AVATAR_NEW}> <{/if}> @@ -41,7 +41,7 @@ <{if $actionForm->get('avatar_id')}>
    <{$smarty.const._MD_USER_LANG_AVATAR_ID}>"><{$actionForm->get('avatar_id')}>"><{$actionForm->get('avatar_id')}>
    - + @@ -31,7 +31,7 @@ - + Index: xoops2jp/html/modules/user/admin/templates/group_edit.html diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.11 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/user/admin/templates/group_edit.html Sun Aug 20 11:57:49 2006 @@ -10,7 +10,7 @@ <{if $actionForm->get('groupid') }> -

    <{$smarty.const._AD_USER_LANG_GROUP_EDIT}>

    +

    <{$smarty.const._AD_USER_LANG_GROUP_EDIT}> (<{$actionForm->get('name')}>)

    <{else}>

    <{$smarty.const._AD_USER_LANG_GROUP_NEW}>

    <{/if}> @@ -32,7 +32,7 @@ Index: xoops2jp/html/modules/user/admin/templates/user_edit.html diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.20 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21 --- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.20 Sun Aug 20 11:57:49 2006 +++ xoops2jp/html/modules/user/admin/templates/user_edit.html Sun Aug 20 17:33:33 2006 @@ -195,13 +195,13 @@ From tom_g3x @ users.sourceforge.jp Sun Aug 20 17:33:33 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 17:33:33 +0900 Subject: [xoops-cvslog 4279] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060820083333.A59112AC05E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.3 xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.4 --- xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.3 Sat Aug 19 21:35:34 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Sun Aug 20 17:33:33 2006 @@ -1,3 +1,8 @@ +/* mailjob */ +.user_mailjob_count { + color:#ff0000; +} + /* for List Table */ .user_list_id { text-align:center; From tom_g3x @ users.sourceforge.jp Sun Aug 20 22:25:07 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 22:25:07 +0900 Subject: [xoops-cvslog 4280] CVS update: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets Message-ID: <20060820132507.5E64F2AC110@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.4 --- xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.3 Sat Aug 19 17:27:51 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css Sun Aug 20 22:25:07 2006 @@ -14,6 +14,9 @@ .legacyRender_TemplateFile_nofile { color:#ff0000; } +.legacyRender_TemplateManager_sizenavi { + margin:5px; +} .legacyRender_TemplateManager_textarea { width:600px; height:400px; From tom_g3x @ users.sourceforge.jp Sun Aug 20 22:25:07 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 22:25:07 +0900 Subject: [xoops-cvslog 4281] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060820132507.8FFAB2AC115@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.10 xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.11 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.10 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html Sun Aug 20 22:25:07 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}> -

    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}>

    +

    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}> (<{$object->getShow('tplset_name')}>)

    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF|replace:"%s":$object->getShow('tplset_name')}>
    @@ -13,7 +13,7 @@ <{xoops_input type=hidden name=tplset_id value=$actionForm->get('tplset_id')}>
    <{$smarty.const._AD_USER_LANG_USER_DELETE}><{$smarty.const._AD_USER_LANG_USER_DELETE}> (<{$object->getShow('uname')}>)
    <{$smarty.const._MD_USER_LANG_UID}>
    <{$smarty.const._MD_USER_LANG_UNAME}>"><{$object->getShow('uname')}>"><{$object->getShow('uname')}>
    <{$smarty.const._MD_USER_LANG_NAME}>
    <{if $actionForm->get('groupid') }> - <{$smarty.const._AD_USER_LANG_GROUP_EDIT}> + <{$smarty.const._AD_USER_LANG_GROUP_EDIT}> (<{$actionForm->get('name')}>) <{else}> <{$smarty.const._AD_USER_LANG_GROUP_NEW}> <{/if}> From nobunobu @ users.sourceforge.jp Sun Aug 20 12:08:28 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sun, 20 Aug 2006 12:08:28 +0900 Subject: [xoops-cvslog 4274] CVS update: xoops2jp/html/kernel Message-ID: <20060820030828.7CE6B2AC06D@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_LanguageManager.class.php diff -u xoops2jp/html/kernel/XCube_LanguageManager.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_LanguageManager.class.php:1.1.2.2 --- xoops2jp/html/kernel/XCube_LanguageManager.class.php:1.1.2.1 Thu Jul 20 17:18:55 2006 +++ xoops2jp/html/kernel/XCube_LanguageManager.class.php Sun Aug 20 12:08:28 2006 @@ -1,7 +1,7 @@ mLanguageName; + } + + /** * Set language name. * * @param string $language language name @@ -69,6 +79,16 @@ } /** + * Get language name. + * + * @return string language name + */ + function getLanguage() + { + return $this->mLanguageName; + } + + /** * Load the global message catalog which is defined in the base module. */ function loadGlobalMessageCatalog() From nobunobu @ users.sourceforge.jp Sun Aug 20 12:08:28 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Sun, 20 Aug 2006 12:08:28 +0900 Subject: [xoops-cvslog 4275] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060820030828.A4E662AC206@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.69 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.70 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.69 Sat Aug 19 12:33:25 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sun Aug 20 12:08:28 2006 @@ -1,7 +1,7 @@ mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF); $this->setMainTheme($this->mConfig['theme_set']); - if ($this->mLanguage) { - $this->mConfig['language'] = $this->mLanguage; - } + $this->mConfig['language'] = $this->mRoot->mLanguageManager->getLanguage(); + $GLOBALS['xoopsConfig']=&$this->mConfig; } From minahito @ users.sourceforge.jp Sun Aug 20 12:34:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 20 Aug 2006 12:34:32 +0900 Subject: [xoops-cvslog 4276] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060820033432.E6A382AC01F@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.48 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.49 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.48 Sat Aug 19 14:21:11 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Sun Aug 20 12:34:32 2006 @@ -102,6 +102,7 @@ define('_AD_BASE_LANG_FUNC_FILE', "コールバック関数定義ファイル"); define('_AD_BASE_LANG_FUNC_NUM', "関数ナンバ"); define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "最新版を入手する"); +define('_AD_BASE_LANG_GROUPID', "グループ"); define('_AD_BASE_LANG_ID', "ID"); define('_AD_BASE_LANG_IMAGE_COUNT', "画像数"); define('_AD_BASE_LANG_IMAGE_CREATED', "作成日"); From minahito @ users.sourceforge.jp Sun Aug 20 12:34:33 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 20 Aug 2006 12:34:33 +0900 Subject: [xoops-cvslog 4277] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060820033433.1848B2AC02B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.42 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.43 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.42 Sun Aug 20 10:42:51 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Sun Aug 20 12:34:32 2006 @@ -102,6 +102,7 @@ define('_AD_BASE_LANG_FUNC_FILE', "Callback file name"); define('_AD_BASE_LANG_FUNC_NUM', "Function number"); define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "Get the latest version"); +define('_AD_BASE_LANG_GROUPID', "Group"); define('_AD_BASE_LANG_ID', "ID"); define('_AD_BASE_LANG_IMAGE_COUNT', "Image count"); define('_AD_BASE_LANG_IMAGE_CREATED', "image created"); From tom_g3x @ users.sourceforge.jp Sun Aug 20 17:33:33 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 17:33:33 +0900 Subject: [xoops-cvslog 4278] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060820083333.8164C2AC013@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.10 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.10 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Sun Aug 20 17:33:33 2006 @@ -50,7 +50,7 @@ <{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}> <{if $obj->mUserCount > 0}> - <{$obj->mUserCount|escape}> + <{$obj->mUserCount|escape}> <{else}> <{$smarty.const._AD_USER_LANG_COMPLETED}> <{/if}> Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.12 --- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.11 Sun Aug 20 11:56:52 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html Sun Aug 20 17:33:33 2006 @@ -47,13 +47,13 @@
    <{$smarty.const._AD_USER_LANG_RANK_MIN}> "> - <{xoops_input type=text name=rank_min value=$actionForm->get('rank_min')}> + <{xoops_input type=text name=rank_min value=$actionForm->get('rank_min') class=user_list_number}>
    <{$smarty.const._AD_USER_LANG_RANK_MAX}> "> - <{xoops_input type=text name=rank_max value=$actionForm->get('rank_max')}> + <{xoops_input type=text name=rank_max value=$actionForm->get('rank_max') class=user_list_number}>
    <{$smarty.const._MD_USER_LANG_POSTS}> "> - <{xoops_input type=text name=posts value=$actionForm->get('posts')}> + <{xoops_input type=text name=posts value=$actionForm->get('posts') class=user_list_number}>
    <{$smarty.const._MD_USER_LANG_LEVEL}> "> - <{xoops_input type=text name=level value=$actionForm->get('level')}> + <{xoops_input type=text name=level value=$actionForm->get('level') class=user_list_number}>
    - + @@ -21,7 +21,7 @@ - + Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.8 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.7 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html Sun Aug 20 22:25:07 2006 @@ -57,7 +57,7 @@ - @@ -126,9 +126,10 @@ - Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.9 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.8 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html Sun Aug 20 22:25:07 2006 @@ -42,7 +42,7 @@ <{foreach from=$module->modinfo.tables item=table key=table_key}> - - - - + + + + <{/foreach}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}> (<{$object->getShow('tplset_name')}>)
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_ID}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}>"><{$object->getShow('tplset_name')}>"><{$object->getShow('tplset_name')}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}> "> -
    +
    <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_SMALL}> »» [480x360] Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.25 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.26 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.25 Sat Aug 19 17:27:51 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html Sun Aug 20 22:25:07 2006 @@ -42,7 +42,7 @@
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_ID}>
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}>
    +
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}> (<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}>)
    " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /> " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
    <{$obj->getShow('tpl_id')}> <{$obj->getShow('tpl_module')}> <{$obj->getShow('tpl_tplset')}> - <{$obj->getShow('tpl_file')}> -
    <{$obj->getShow('tpl_desc')}>
    +
    <{$obj->getShow('tpl_file')}> + <{if $obj->getShow('tpl_desc')}> +
    <{$obj->getShow('tpl_desc')}>
    + <{/if}>
    <{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}> <{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}> "> -
    +
    <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_SMALL}> »» [480x360] Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.13 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.14 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.13 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html Sun Aug 20 22:25:07 2006 @@ -56,7 +56,7 @@
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}> "> -
    +
    <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_SMALL}> »» [480x360] Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.12 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.13 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.12 Mon Aug 14 21:46:44 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html Sun Aug 20 22:25:07 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}>
    -

    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}>

    +

    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}> (<{$object->getShow('tplset_name')}>)

    <{if $actionForm->hasError()}>
    @@ -21,11 +21,11 @@ <{xoops_input type=hidden name=tplset_id value=$actionForm->get('tplset_id')}> - + - + From tom_g3x @ users.sourceforge.jp Sun Aug 20 22:38:31 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 22:38:31 +0900 Subject: [xoops-cvslog 4282] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060820133831.581022AC0A4@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.4 xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.5 --- xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.4 Sun Aug 20 17:33:33 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Sun Aug 20 22:38:31 2006 @@ -3,6 +3,11 @@ color:#ff0000; } +/* group */ +.user_groupBlock_inactive { + color:#999999; +} + /* for List Table */ .user_list_id { text-align:center; From tom_g3x @ users.sourceforge.jp Sun Aug 20 22:38:31 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Sun, 20 Aug 2006 22:38:31 +0900 Subject: [xoops-cvslog 4283] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060820133831.7FEBE2AC0C3@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.22 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.23 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.22 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Sun Aug 20 22:38:31 2006 @@ -113,7 +113,7 @@ <{if $perm->mItem->isActive()}> <{$perm->mItem->getName()|escape}> <{else}> - <{$perm->mItem->getName()|escape}> + <{$perm->mItem->getName()|escape}> <{/if}> - + Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.18 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.19 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.18 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Sun Aug 20 22:38:31 2006 @@ -148,7 +148,7 @@ <{if $perm->mItem->isActive()}> <{$perm->mItem->getName()|escape}> <{else}> - <{$perm->mItem->getName()|escape}> + <{$perm->mItem->getName()|escape}> <{/if}> @@ -60,20 +60,22 @@
    <{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_EDIT}> (<{$object->getShow('tplset_name')}>)
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}>"><{$object->getShow('tplset_name')}>"><{$object->getShow('tplset_name')}>
    <{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}> <{assign var="getId" value=$perm->getId() }> Index: xoops2jp/html/modules/user/admin/templates/group_delete.html diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.15 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16 --- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.15 Sun Aug 20 11:57:49 2006 +++ xoops2jp/html/modules/user/admin/templates/group_delete.html Sun Aug 20 22:38:31 2006 @@ -29,7 +29,7 @@ " alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}> (<{$object->getShow('name')}>)
    <{$smarty.const._AD_USER_LANG_GROUP_GID}><{$smarty.const._AD_USER_LANG_GROUP_GID}> "><{$object->getShow('groupid')}>
    <{assign var="getId" value=$perm->getId() }> From tom_g3x @ users.sourceforge.jp Mon Aug 21 12:46:17 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 12:46:17 +0900 Subject: [xoops-cvslog 4284] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060821034617.50CC42AC0C8@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.49 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.50 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.49 Sun Aug 20 12:34:32 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Mon Aug 21 12:46:17 2006 @@ -67,7 +67,7 @@ define('_AD_BASE_LANG_COM_MODIFIED', "編集日時"); define('_AD_BASE_LANG_COM_SIG', "署名"); define('_AD_BASE_LANG_COM_STATUS', "ステータス"); -define('_AD_BASE_LANG_COM_UID', "UID"); +define('_AD_BASE_LANG_COM_UID', "ユーザー"); define('_AD_BASE_LANG_COMMENT_DELETE', "コメント削除"); define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集"); define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加"); Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.23 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.24 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.23 Sat Aug 19 14:21:35 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Mon Aug 21 12:46:17 2006 @@ -17,7 +17,7 @@ define('_MD_BASE_LANG_COM_ID', "ID"); define('_MD_BASE_LANG_COM_IP', "IP"); define('_MD_BASE_LANG_COM_ITEMID', "アイテムID"); -define('_MD_BASE_LANG_COM_MODID', "モジュールID"); +define('_MD_BASE_LANG_COM_MODID', "モジュール"); define('_MD_BASE_LANG_COM_PID', "PID"); define('_MD_BASE_LANG_COM_ROOTID', "Root ID"); define('_MD_BASE_LANG_COM_TEXT', "コメント"); From tom_g3x @ users.sourceforge.jp Mon Aug 21 12:46:17 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 12:46:17 +0900 Subject: [xoops-cvslog 4285] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060821034617.7BB432AC0EC@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.22 xoops2jp/html/modules/base/language/english/main.php:1.1.2.23 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.22 Sat Aug 19 14:20:35 2006 +++ xoops2jp/html/modules/base/language/english/main.php Mon Aug 21 12:46:17 2006 @@ -17,7 +17,7 @@ define('_MD_BASE_LANG_COM_ID', "ID"); define('_MD_BASE_LANG_COM_IP', "IP"); define('_MD_BASE_LANG_COM_ITEMID', "Item ID"); -define('_MD_BASE_LANG_COM_MODID', "Module ID"); +define('_MD_BASE_LANG_COM_MODID', "Module"); define('_MD_BASE_LANG_COM_PID', "PID"); define('_MD_BASE_LANG_COM_ROOTID', "Root ID"); define('_MD_BASE_LANG_COM_TEXT', "Comment"); Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.43 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.44 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.43 Sun Aug 20 12:34:32 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Mon Aug 21 12:46:17 2006 @@ -67,7 +67,7 @@ define('_AD_BASE_LANG_COM_MODIFIED', "Modified"); define('_AD_BASE_LANG_COM_SIG', "Signature"); define('_AD_BASE_LANG_COM_STATUS', "Status"); -define('_AD_BASE_LANG_COM_UID', "UID"); +define('_AD_BASE_LANG_COM_UID', "User"); define('_AD_BASE_LANG_COMMENT_DELETE', "Delete a comment"); define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment"); define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment"); From tom_g3x @ users.sourceforge.jp Mon Aug 21 13:44:34 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 13:44:34 +0900 Subject: [xoops-cvslog 4286] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060821044434.422A92AC059@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.14 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.15 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.14 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Mon Aug 21 13:44:34 2006 @@ -29,7 +29,7 @@
    <{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> - <{if $module->get('version') != $module->modinfo.version * 100 }> + <{if $module->get('version')/100 != $module->modinfo.version }> » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}>
    -
    <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>
    - - + - + + + + + - + - + - +
    <{$smarty.const._AD_BASE_LANG_MODULE_LICENSE}><{$module->modinfo.license|escape}><{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>
    <{$smarty.const._AD_BASE_LANG_MODULE_LICENSE}><{$module->modinfo.license|escape}>
    <{$smarty.const._AD_BASE_LANG_MOD_AUTHOR}><{$module->modinfo.author|escape}><{$module->modinfo.author|escape}>
    <{$smarty.const._AD_BASE_LANG_MOD_CREDITS}><{$module->modinfo.credits|escape}><{$module->modinfo.credits|escape}>
    @@ -81,17 +83,17 @@
    <{$smarty.const._AD_BASE_LANG_SQL_INFO}>
    <{if $module->modinfo.tables}> - + - + - + - + - + - +
    <{$smarty.const._AD_BASE_LANG_SQL_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    <{$smarty.const._AD_BASE_LANG_SQL_ENGINE}><{$smarty.const._AD_BASE_LANG_SQL_MYSQL}><{$smarty.const._AD_BASE_LANG_SQL_MYSQL}>
    <{$smarty.const._AD_BASE_LANG_SQL_FILE_NAME}><{$module->modinfo.sqlfile.mysql}><{$module->modinfo.sqlfile.mysql}>

    @@ -102,15 +104,15 @@
    <{$smarty.const._AD_BASE_LANG_TABLE_PROPERTIES}>
    <{$table_key}><{$table|escape}>xxxxxxxxxxxxx
    <{$table_key}><{$table|escape}>
    <{else}> -
    <{$smarty.const._AD_BASE_LANG_NO_SQL}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_SQL}>
    <{/if}>
    @@ -118,9 +120,9 @@ <{if $module->get('hasmain')}> - + - +
    <{$smarty.const._AD_BASE_LANG_MAINMENU_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    @@ -143,28 +145,28 @@ <{else}> -
    <{$smarty.const._AD_BASE_LANG_NO_MAINMENU}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_MAINMENU}>
    <{/if}>
    <{$smarty.const._AD_BASE_LANG_ADMIN_MENU}>
    <{if $module->get('hasadmin')}> - + - + - + - + - + - + - + - +
    <{$smarty.const._AD_BASE_LANG_ADMINMENU_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    <{$smarty.const._AD_BASE_LANG_ADMINMENU_INDEX}><{$module->modinfo.adminindex|escape}><{$module->modinfo.adminindex|escape}>
    <{$smarty.const._AD_BASE_LANG_ADMINMENU_MENU}><{$module->modinfo.adminmenu|escape}><{$module->modinfo.adminmenu|escape}>
    <{$smarty.const._HELP}><{$module->modinfo.help|escape}><{$module->modinfo.help|escape}>
    <{if $module->adminmenu}> @@ -176,16 +178,16 @@ <{$smarty.const._AD_BASE_LANG_ADMINMENU_URL}> <{foreach from=$module->adminmenu item=admin key=admin_key}> - - <{$admin_key|escape}> - "><{$admin.title|escape}> - "><{$admin.link|escape}> + + <{$admin_key|escape}> + <{$admin.title|escape}> + <{$admin.link|escape}> <{/foreach}> <{/if}> <{else}> -
    <{$smarty.const._AD_BASE_LANG_NO_ADMINMENU}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_ADMINMENU}>
    <{/if}> @@ -193,13 +195,13 @@
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_INFO}>
    <{if $module->modinfo.templates}> - + - + - + - +
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_HAS_MAIN}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_ENGINE}><{$smarty.const._AD_BASE_LANG_SMARTY}><{$smarty.const._AD_BASE_LANG_SMARTY}>

    @@ -210,15 +212,15 @@ <{$smarty.const._AD_BASE_LANG_TEMPLATE_DESC}> <{foreach from=$module->modinfo.templates item=template key=template_key}> - - <{$template_key}> - <{$template.file|escape}> - <{$template.description|escape}> + + <{$template_key}> + <{$template.file|escape}> + <{$template.description|escape}> <{/foreach}> <{else}> -
    <{$smarty.const._AD_BASE_LANG_NO_TEMPLATE}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_TEMPLATE}>
    <{/if}>
    @@ -231,19 +233,19 @@ <{$smarty.const._AD_BASE_LANG_BLOCK_VAL}> <{foreach from=$block key=block_key item=block_val name=block }> - - <{$block_key|escape}> + + <{$block_key|escape}> <{if $block_key == "name" }> - <{$block_val|escape}> + <{$block_val|escape}> <{else}> - <{$block_val|escape}> + <{$block_val|escape}> <{/if}> <{/foreach}>
    <{foreachelse}> -
    <{$smarty.const._AD_BASE_LANG_NO_BLOCK}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_BLOCK}>
    <{/foreach}>
    @@ -256,9 +258,9 @@ <{$smarty.const._AD_BASE_LANG_CONFIG_VAL}> <{foreach from=$config key=config_key item=config_val name=config}> - - <{$config_key|escape}> - "> + "> + <{$config_key|escape}> + <{if $config_key == "name" }> <{$config_val|escape}> <{elseif $config_key == options }> @@ -274,29 +276,29 @@
    <{foreachelse}> -
    <{$smarty.const._AD_BASE_LANG_NO_CONFIG}>
    +
    <{$smarty.const._AD_BASE_LANG_NO_CONFIG}>
    <{/foreach}>
    <{$smarty.const._AD_BASE_LANG_FEATURE_SVC_INFO}>
    <{if $module->get('hassearch')}> - + - + <{/if}> <{if $module->get('hascomments')}> - + - + <{/if}> <{if $module->get('hasnotification')}> - + - + <{/if}>
    <{$smarty.const._AD_BASE_LANG_SEARCH_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    <{$smarty.const._AD_BASE_LANG_COMMENT_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    <{$smarty.const._AD_BASE_LANG_NOTIF_SVC}><{$smarty.const._AD_BASE_LANG_ACTIVE}><{$smarty.const._AD_BASE_LANG_ACTIVE}>
    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.13 xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.14 --- xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.13 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/module_install_success.html Mon Aug 21 13:44:34 2006 @@ -21,4 +21,4 @@ <{/foreach}> - + Index: xoops2jp/html/modules/base/admin/templates/module_update.html diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.12 --- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.11 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/base/admin/templates/module_update.html Mon Aug 21 13:44:34 2006 @@ -41,7 +41,7 @@ <{$smarty.const._AD_BASE_LANG_VERSION}> <{math equation="v/100" v=$module->get('version') format="%.2f"}> <{if $module->get('version') != $module->modinfo.version * 100 }> - » <{math equation=$module->modinfo.version format="%.2f"}> + » <{math equation=$module->modinfo.version format="%.2f"}> <{/if}> From tom_g3x @ users.sourceforge.jp Mon Aug 21 13:44:34 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 13:44:34 +0900 Subject: [xoops-cvslog 4287] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060821044434.67F992AC0BC@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.6 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.7 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.6 Sat Aug 19 21:35:34 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Mon Aug 21 13:44:34 2006 @@ -50,7 +50,18 @@ .base_module_message { } +.base_module_return , .base_module_return a , .base_module_return a:visited { + font-weight:bold; +} +.base_module_versionMsg { + color:#0000ff; + font-weight:bold; +} + +.base_modinfo_notmounted { +} + /* comment list */ .base_comment_search { text-align:center; From minahito @ users.sourceforge.jp Mon Aug 21 18:51:54 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 21 Aug 2006 18:51:54 +0900 Subject: [xoops-cvslog 4288] CVS update: xoops2jp/html/kernel Message-ID: <20060821095154.E1BEB2AC053@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_ActionFilter.class.php diff -u xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.2 xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.3 --- xoops2jp/html/kernel/XCube_ActionFilter.class.php:1.1.2.2 Tue Jun 6 12:08:41 2006 +++ xoops2jp/html/kernel/XCube_ActionFilter.class.php Mon Aug 21 18:51:54 2006 @@ -1,7 +1,7 @@ From minahito @ users.sourceforge.jp Mon Aug 21 18:52:12 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 21 Aug 2006 18:52:12 +0900 Subject: [xoops-cvslog 4289] CVS update: xoops2jp/html/kernel Message-ID: <20060821095212.ECA812AC053@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Controller.class.php diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.14 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.15 --- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.14 Mon Jul 31 19:02:17 2006 +++ xoops2jp/html/kernel/XCube_Controller.class.php Mon Aug 21 18:52:12 2006 @@ -1,7 +1,7 @@ mFilterChain); $i++) { - $this->mFilterChain[$i]->preFilter($this); + $this->mFilterChain[$i]->preFilter(); } } @@ -320,7 +320,14 @@ function _processPreBlockFilter() { for ($i = 0; $i < count($this->mFilterChain); $i++) { - $this->mFilterChain[$i]->preBlockFilter($this); + $this->mFilterChain[$i]->preBlockFilter(); + } + } + + function _processPostFilter() + { + foreach (reverse(array_keys($this->mFilterChain)) as $key) { + $this->mFilterChain[$key]->postFilter(); } } @@ -402,7 +409,7 @@ function executeForward($url, $time = 0, $message = null) { // check header output - header("location: ".$url); + header("location: " . $url); exit(); } From minahito @ users.sourceforge.jp Mon Aug 21 18:59:02 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 21 Aug 2006 18:59:02 +0900 Subject: [xoops-cvslog 4290] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060821095902.791992AC053@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.21 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.22 --- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.21 Mon Aug 14 10:59:26 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php Mon Aug 21 18:59:02 2006 @@ -160,8 +160,9 @@ $filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/" . $fileName; } - if (!file_exists($filePath) && is_file($filePath)) + if (!file_exists($filePath)) { return false; + } $lines = file($filePath); if ($lines == false) { Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.11 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.12 --- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.11 Thu Aug 10 12:56:11 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php Mon Aug 21 18:59:02 2006 @@ -6,17 +6,18 @@ class Legacy_ModuleUninstaller extends Legacy_AbstractModuleInstaller { - /** - * @var XCube_Delegate - */ - var $mProcessScript = null; - function Legacy_ModuleUninstaller($dirname) { parent::Legacy_AbstractModuleInstaller($dirname); - $this->mProcessScript =& new XCube_Delegate(); $this->mProcessScript->register('Legacy_ModuleUninstaller.ProcessScript'); + $this->mProcessScript->add('Legacy_ModuleUninstaller::_processScript'); + + $this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable'); + $this->mInstallTable->add('Legacy_ModuleUninstaller::_uninstallTable'); + + $this->mInstallTemplate->register('Legacy_ModuleUninstaller.InstallTemplate'); + $this->mInstallTemplate->add('Legacy_ModuleUninstaller::_uninstallTemplate'); } /** @@ -63,23 +64,23 @@ /** * Drop table because this class is uninstaller. */ - function _installTable() + function _uninstallTable(&$module, &$log) { $root =& XCube_Root::getSingleton(); $db =& $root->mController->getDB(); - $tables = $this->mModule->getInfo('tables'); + $tables = $module->getInfo('tables'); if ($tables != false && is_array($tables)) { foreach($tables as $table) { - + // // TODO Do we need to check reserved core tables? - + // $sql = "DROP TABLE " . $db->prefix($table); if ($db->query($sql)) { - $this->mLog->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_DROP_TABLE, $db->prefix($table))); + $log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_DROP_TABLE, $db->prefix($table))); } else { - $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_DROP_TABLE, $db->prefix($table))); + $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_DROP_TABLE, $db->prefix($table))); } } } @@ -88,15 +89,15 @@ /** * Delete template because this class is uninstaller. */ - function _installTemplate() + function _uninstallTemplate(&$module, &$log) { $tplHandler =& xoops_gethandler('tplfile'); - $deleteTemplates =& $tplHandler->find(null, 'module', $this->mModule->getVar('mid')); + $deleteTemplates =& $tplHandler->find(null, 'module', $module->getVar('mid')); foreach($deleteTemplates as $tpl) { if (!$tplHandler->delete($tpl)) { - $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file'))); + $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file'))); } } } @@ -138,20 +139,18 @@ Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog); } - function _processScript() + function _processScript(&$module, &$log) { - $installScript = trim($this->mModule->getInfo('onUninstall')); + $installScript = trim($module->getInfo('onUninstall')); if ($installScript != false) { - require_once XOOPS_MODULE_PATH . "/" . $this->mModule->getVar('dirname') . "/" . $installScript; - $funcName = 'xoops_module_uninstall_' . $this->mModule->getVar('dirname'); + require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript; + $funcName = 'xoops_module_uninstall_' . $module->getVar('dirname'); if (function_exists($funcName)) { - if (!call_user_func($funcName, $this->mModule)) { - $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName)); + if (!call_user_func($funcName, $module)) { + $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName)); } } } - - $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.11 --- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.10 Thu Aug 10 12:56:11 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php Mon Aug 21 18:59:02 2006 @@ -8,17 +8,17 @@ { var $mPreVersion = 0; - /** - * @var XCube_Delegate - */ - var $mProcessScript = null; - function Legacy_ModuleUpdater($dirname) { parent::Legacy_AbstractModuleInstaller($dirname); - $this->mProcessScript =& new XCube_Delegate(); $this->mProcessScript->register('Legacy_ModuleUpdater.ProcessScript'); + $this->mProcessScript->add(array(&$this, '_processScript')); + + $this->mInstallTable->register('Legacy_ModuleUpdater.InstallTable'); + + $this->mInstallTemplate->register('Legacy_ModuleUpdater.InstallTemplate'); + $this->mInstallTemplate->add('Legacy_ModuleUpdater::_uninstallTemplate'); } /** @@ -56,9 +56,9 @@ } /** - * Remove all of installed templates and re-install all of defined templates. + * @static */ - function _installTemplate() + function _uninstallTemplate(&$module, &$log) { $tplHandler =& xoops_gethandler('tplfile'); @@ -66,17 +66,17 @@ // The following processing depends on the structure of Legacy_RenderSystem. // $tplHandler =& xoops_gethandler('tplfile'); - $delTemplates =& $tplHandler->find('default', 'module', $this->mModule->getVar('mid')); + $delTemplates =& $tplHandler->find('default', 'module', $module->getVar('mid')); if(is_array($delTemplates) && count($delTemplates) > 0) { // // clear cache // $xoopsTpl=new XoopsTpl(); - $xoopsTpl->clear_cache(null, "mod_" . $this->mModule->getVar('dirname')); + $xoopsTpl->clear_cache(null, "mod_" . $module->getVar('dirname')); foreach ($delTemplates as $tpl) { if (!$tplHandler->delete($tpl)) { - $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file'))); + $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file'))); } } } @@ -84,10 +84,10 @@ // // install Template All // - $templates = $this->mModule->getInfo('templates'); + $templates = $module->getInfo('templates'); if ($templates != false) { foreach ($templates as $template) { - Legacy_ModuleUtils::installTemplate($this->mModule, $template, $this->mLog); + Legacy_ModuleUtils::installTemplate($module, $template, $log); } } } @@ -181,20 +181,18 @@ Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog); } - function _processScript() + function _processScript(&$module, &$log) { - $installScript = trim($this->mModule->getInfo('onUpdate')); + $installScript = trim($module->getInfo('onUpdate')); if ($installScript != false) { - require_once XOOPS_MODULE_PATH . "/" . $this->mModule->getVar('dirname') . "/" . $installScript; - $funcName = 'xoops_module_update_' . $this->mModule->getVar('dirname'); + require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript; + $funcName = 'xoops_module_update_' . $module->getVar('dirname'); if (function_exists($funcName)) { - if (!call_user_func($funcName, $this->mModule, $this->mPreVersion)) { - $this->mLog->addError("Failed to execute " . $funcName); + if (!call_user_func($funcName, $module, $this->mPreVersion)) { + $log->addError("Failed to execute " . $funcName); } } } - - $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.17 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.18 --- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.17 Thu Aug 17 16:42:35 2006 +++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php Mon Aug 21 18:59:02 2006 @@ -12,17 +12,18 @@ { var $mAgree = false; - /** - * @var XCube_Delegate - */ - var $mProcessScript = null; - function Legacy_ModuleInstaller($dirname) { parent::Legacy_AbstractModuleInstaller($dirname); - $this->mProcessScript =& new XCube_Delegate(); $this->mProcessScript->register('Legacy_ModuleInstaller.ProcessScript'); + $this->mProcessScript->add('Legacy_ModuleInstaller::_processScript'); + + $this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable'); + $this->mInstallTable->add('Legacy_ModuleUtils::installTable'); + + $this->mInstallTemplate->register('Legacy_ModuleInstaller.InstallTemplate'); + $this->mInstallTemplate->add('Legacy_ModuleInstaller::_installTemplate'); } /** @@ -156,20 +157,18 @@ return $perm; } - function _installTable() - { - Legacy_ModuleUtils::installTable($this->mModule, $this->mLog); - } - - function _installTemplate() - { - $templates = $this->mModule->getInfo('templates'); + /** + * @static + */ + function _installTemplate(&$module, &$log) + { + $templates = $module->getInfo('templates'); if ($templates != false) { foreach ($templates as $template) { - Legacy_ModuleUtils::installTemplate($this->mModule, $template, $this->mLog); + Legacy_ModuleUtils::installTemplate($module, $template, $log); } } - } + } function _installBlock() { @@ -198,20 +197,18 @@ Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog); } - function _processScript() + function _processScript(&$module, &$log) { - $installScript = trim($this->mModule->getInfo('onInstall')); + $installScript = trim($module->getInfo('onInstall')); if ($installScript != false) { - require_once XOOPS_MODULE_PATH . "/" . $this->mModule->getVar('dirname') . "/" . $installScript; - $funcName = 'xoops_module_install_' . $this->mModule->getVar('dirname'); + require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript; + $funcName = 'xoops_module_install_' . $module->getVar('dirname'); if (function_exists($funcName)) { - if (!call_user_func($funcName, $this->mModule)) { - $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName)); + if (!call_user_func($funcName, $module)) { + $log->addError(XCUbe_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName)); } } } - - $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); } function _processReport() From minahito @ users.sourceforge.jp Mon Aug 21 18:59:13 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 21 Aug 2006 18:59:13 +0900 Subject: [xoops-cvslog 4291] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060821095913.1DC242AC053@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.8 xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.9 --- xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.8 Tue Jul 25 19:08:42 2006 +++ xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php Mon Aug 21 18:59:12 2006 @@ -12,6 +12,26 @@ */ class Legacy_AbstractModuleInstaller { + /** + * @var XCube_Delegate + */ + var $mProcessScript = null; + + /** + * Install or uninstall templates of this target module, this function is + * called by own execute(). + * + * @var XCube_Delegate + */ + var $mInstallTemplate = null; + + /** + * Create or drop tables, this function is called by own execute(). + * + * @var XCube_Delegate + */ + var $mInstallTable = null; + var $mDirname = null; /** @@ -42,6 +62,10 @@ if (is_object($root->mLanguageManager)) { $root->mLanguageManager->loadModuleAdminMessageCatalog('base'); } + + $this->mProcessScript =& new XCube_Delegate(); + $this->mInstallTable =& new XCube_Delegate(); + $this->mInstallTemplate =& new XCube_Delegate(); } /** @@ -59,7 +83,7 @@ return false; } - $this->_installTable(); + $this->mInstallTable->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); if (!$this->mForceMode && $this->mLog->hasError()) { $this->_processReport(); return false; @@ -71,7 +95,7 @@ return false; } - $this->_installTemplate(); + $this->mInstallTemplate->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); if (!$this->mForceMode && $this->mLog->hasError()) { $this->_processReport(); return false; @@ -95,7 +119,7 @@ return false; } - $this->_processScript(); + $this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog)); $this->_processReport(); @@ -125,20 +149,6 @@ } /** - * Create or drop tables, this function is called by own execute(). - */ - function _installTable() - { - } - - /** - * Install or uninstall templates of this target module, this function is called by own execute(). - */ - function _installTemplate() - { - } - - /** * Install or uninstall blocks and their templates, this function is called by own execute(). */ function _installBlock() @@ -162,10 +172,6 @@ { } - function _processScript() - { - } - /** * If set true, this class may never stop for error. */ From minahito @ users.sourceforge.jp Mon Aug 21 19:01:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Mon, 21 Aug 2006 19:01:35 +0900 Subject: [xoops-cvslog 4292] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060821100135.E59602AC053@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.70 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.71 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.70 Sun Aug 20 12:08:28 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Mon Aug 21 19:01:35 2006 @@ -1,7 +1,7 @@ mRoot->getSiteConfig('Legacy.PrimaryPreloads'); - foreach ($primaryPreloads as $className => $classPath) { - if (file_exists(XOOPS_ROOT_PATH . $classPath)) { - require_once XOOPS_ROOT_PATH . $classPath; - if (class_exists($className)) { - $filter =& new $className($this); - $this->addActionFilter($filter); - unset($filter); - } - } - } - - // - // Auto pre-loading. - // - if($this->mRoot->getSiteConfig('Legacy', 'AutoPreload')==1) { - $this->_executePreload(XOOPS_ROOT_PATH . "/preload"); - } + $this->_mStrategy->_setupFilterChain(); } function _setupBlock() @@ -546,6 +529,12 @@ function _processPreBlockFilter() { + $this->_mStrategy->_processPreBlockFilter(); + parent::_processPreBlockFilter(); + } + + function _executeModulePreload($dirname) + { // // Auto pre-loading for Module. // @@ -554,7 +543,7 @@ $moduleObjects =& $moduleHandler->getObjects(); foreach ($moduleObjects as $moduleObject) { $mod_dir = $moduleObject->getVar('dirname'); - $dir = XOOPS_ROOT_PATH . '/modules/' . $mod_dir . '/preload/'; + $dir = XOOPS_ROOT_PATH . '/modules/' . $mod_dir . $dirname . '/'; if(is_dir($dir)) { $files = glob($dir.'*.class.php'); if (is_array($files)) { @@ -573,8 +562,7 @@ } } } - parent::_processPreBlockFilter(); - } + } function _setupSession() { @@ -1071,6 +1059,27 @@ { $this->mController =& $controller; } + + function _setupFilterChain() + { $primaryPreloads = $this->mController->mRoot->getSiteConfig('Legacy.PrimaryPreloads'); + foreach ($primaryPreloads as $className => $classPath) { + if (file_exists(XOOPS_ROOT_PATH . $classPath)) { + require_once XOOPS_ROOT_PATH . $classPath; + if (class_exists($className)) { + $filter =& new $className($this->mController); + $this->mController->addActionFilter($filter); + unset($filter); + } + } + } + + // + // Auto pre-loading. + // + if($this->mController->mRoot->getSiteConfig('Legacy', 'AutoPreload') == 1) { + $this->mController->_executePreload(XOOPS_ROOT_PATH . "/preload"); + } + } /** * Create a instance of ModuleController, and set it to mModuleController @@ -1085,6 +1094,11 @@ function setupBlock() { } + + function _processPreBlockFilter() + { + $this->mController->_executeModulePreload('/preload'); + } /** * @return XoopsModule @@ -1167,6 +1181,12 @@ var $mStatusFlag = LEGACY_CONTROLLER_STATE_ADMIN; /** + * @var XCube_Delegate + * @param XCube_Controller &$controller + */ + var $mSetupBlock = null; + + /** * If this array includes current action, getVirtualCurrentModule() returns * the module object that specified by dirname. * @@ -1184,8 +1204,23 @@ if (!defined("LEGACY_DEPENDENCE_RENDERER")) { define("LEGACY_DEPENDENCE_RENDERER", "Legacy_AdminRenderSystem"); } + + $this->mSetupBlock =& new XCube_Delegate(); + $this->mSetupBlock->register('Legacy_AdminControllerStrategy.SetupBlock'); } + function _setupFilterChain() + { + parent::_setupFilterChain(); + + // + // Auto pre-loading. + // + if($this->mController->mRoot->getSiteConfig('Legacy', 'AutoPreload') == 1) { + $this->mController->_executePreload(XOOPS_ROOT_PATH . "/preload/admin"); + } + } + function setupModuleController() { require_once XOOPS_BASE_PATH . "/kernel/Legacy_AdminModuleController.class.php"; @@ -1198,6 +1233,14 @@ require_once XOOPS_BASE_PATH . "/admin/blocks/AdminSideMenu.class.php"; $this->mController->mBlockChain[] =& new Legacy_AdminActionSearch(); $this->mController->mBlockChain[] =& new Legacy_AdminSideMenu(); + + $this->mSetupBlock->call(new XCube_Ref($this->mController)); + } + + function _processPreBlockFilter() + { + parent::_processPreBlockFilter(); + $this->mController->_executeModulePreload('/admin/preload/'); } function &getVirtualCurrentModule() From tom_g3x @ users.sourceforge.jp Mon Aug 21 19:20:14 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 19:20:14 +0900 Subject: [xoops-cvslog 4293] CVS update: xoops2jp/html/modules/base/admin/theme Message-ID: <20060821102014.185F92AC053@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.7 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.7 Thu Aug 17 12:12:59 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Mon Aug 21 19:20:13 2006 @@ -1,8 +1,10 @@ - + + + <{$xoops_sitename}> : <{$smarty.const._CPHOME}> <{stylesheet file=style.css}> From tom_g3x @ users.sourceforge.jp Mon Aug 21 20:21:59 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 20:21:59 +0900 Subject: [xoops-cvslog 4294] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060821112159.529872AC151@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.15 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.16 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.15 Mon Aug 21 13:44:34 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Mon Aug 21 20:21:59 2006 @@ -60,6 +60,7 @@ +
    <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_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.7 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.7 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_success.html Mon Aug 21 20:21:59 2006 @@ -2,7 +2,7 @@

    <{$smarty.const._AD_BASE_LANG_RESULT}>

    -
      +
        <{foreach item=record from=$records}>
      • [ <{$record->mModuleName|escape}> ] - <{$record->mTitle|escape}> <{if $record->mDescription}>
        ( <{$record->mDescription|escape}> )<{/if}> 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.12 xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.12 Fri Aug 18 20:29:46 2006 +++ xoops2jp/html/modules/base/admin/templates/legacy_admin_actionsearch_form.html Mon Aug 21 20:21:59 2006 @@ -6,9 +6,11 @@

        <{$smarty.const._MI_BASE_MENU_ACTIONSEARCH}>

        <{$smarty.const._AD_BASE_LANG_ACTIONSEARCH_INFO}>
        +
        <{xoops_input type=hidden name=action value=ActSearch}> <{xoops_token form=$actionForm}> - value="<{$actionForm->get('keywords')|escape}>"<{/if}> /> + value="<{$actionForm->get('keywords')|escape}>"<{/if}> /> +
        \ No newline at end of file From tom_g3x @ users.sourceforge.jp Mon Aug 21 20:21:59 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 20:21:59 +0900 Subject: [xoops-cvslog 4295] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060821112159.772FB2AC239@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.7 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.8 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.7 Mon Aug 21 13:44:34 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Mon Aug 21 20:21:59 2006 @@ -14,8 +14,17 @@ color:#666666; } +/* Action Search */ +.base_actionsearch_form { + text-align:center; +} +.base_actionsearch_records { + +} + /* block list */ .base_blocktype_module { + } .base_blocktype_custom { color:#0000cc; From tom_g3x @ users.sourceforge.jp Mon Aug 21 20:26:06 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 20:26:06 +0900 Subject: [xoops-cvslog 4296] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060821112606.C184E2AC02E@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.16 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.17 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.16 Mon Aug 21 20:21:59 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Mon Aug 21 20:26:06 2006 @@ -17,7 +17,7 @@
    From tom_g3x @ users.sourceforge.jp Mon Aug 21 22:11:17 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 22:11:17 +0900 Subject: [xoops-cvslog 4297] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060821131117.B41EA2AC135@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.22 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.23 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.22 Sat Aug 19 20:06:35 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html Mon Aug 21 22:11:17 2006 @@ -163,7 +163,7 @@ <{if $targetTplset != null && $targetTplset != 'default'}> - + +
    <{$xoops_contents}>
    + +
    <{$module->getShow('name')}> -
    <{$module->modinfo.name|escape}>
    +
    <{$module->modinfo.name|escape}>
    <{$smarty.const._AD_BASE_LANG_NAME}> <{$module->getShow('name')}>
    <{xoops_input type=hidden name=tpl_tplset value=$targetTplset}> <{xoops_input type=hidden name=tpl_module value=$targetModule}> From tom_g3x @ users.sourceforge.jp Mon Aug 21 22:11:29 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 22:11:29 +0900 Subject: [xoops-cvslog 4298] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060821131129.77F282AC107@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.8 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.9 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.8 Mon Aug 21 20:21:59 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Mon Aug 21 22:11:29 2006 @@ -1,6 +1,6 @@ /* theme list */ tr.base_theme_active td { - background-color:#ff9999; + background-color:#ffcccc; } tr.base_theme_inactive td { @@ -8,7 +8,7 @@ /* smiles list */ tr.base_smiles_active td { - background-color:#ffaaaa; + background-color:#ffcccc; } tr.base_smiles_inactive td { color:#666666; From tom_g3x @ users.sourceforge.jp Mon Aug 21 22:28:48 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 21 Aug 2006 22:28:48 +0900 Subject: [xoops-cvslog 4299] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060821132848.AD1492AC0E2@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.10 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.11 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.10 Thu Aug 10 18:45:51 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Mon Aug 21 22:28:48 2006 @@ -262,6 +262,8 @@ return; } + $media = (isset($params['media'])) ? $params['media'] : "all"; + $infoArr = Legacy_get_ovveride_file($file, "stylesheets/"); // TEMP @@ -274,7 +276,7 @@ } } $url = XOOPS_MODULE_URL . "/base/admin/css.php?" . implode("&", $request); - print ''; + print ''; } } From minahito @ users.sourceforge.jp Tue Aug 22 00:12:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:49 +0900 Subject: [xoops-cvslog 4300] CVS update: xoops2jp/html/modules/loglog Message-ID: <20060821151249.36FD22AC0F3@users.sourceforge.jp> From minahito @ users.sourceforge.jp Tue Aug 22 00:12:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:49 +0900 Subject: [xoops-cvslog 4301] CVS update: xoops2jp/html/modules/loglog/language Message-ID: <20060821151249.627122AC160@users.sourceforge.jp> From minahito @ users.sourceforge.jp Tue Aug 22 00:12:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:49 +0900 Subject: [xoops-cvslog 4302] CVS update: xoops2jp/html/modules/loglog/language/english Message-ID: <20060821151249.97B662AC0F3@users.sourceforge.jp> From minahito @ users.sourceforge.jp Tue Aug 22 00:12:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:49 +0900 Subject: [xoops-cvslog 4303] CVS update: xoops2jp/html/modules/loglog/language/japanese Message-ID: <20060821151249.BFCDB2AC160@users.sourceforge.jp> From minahito @ users.sourceforge.jp Tue Aug 22 00:12:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:51 +0900 Subject: [xoops-cvslog 4304] CVS update: xoops2jp/html/modules/loglog/language/japanese Message-ID: <20060821151251.CC7D42AC0F3@users.sourceforge.jp> Index: xoops2jp/html/modules/loglog/language/japanese/modinfo.php diff -u /dev/null xoops2jp/html/modules/loglog/language/japanese/modinfo.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/modinfo.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,10 @@ + Index: xoops2jp/html/modules/loglog/language/japanese/main.php diff -u /dev/null xoops2jp/html/modules/loglog/language/japanese/main.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/main.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,6 @@ + Index: xoops2jp/html/modules/loglog/language/japanese/admin.php diff -u /dev/null xoops2jp/html/modules/loglog/language/japanese/admin.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/admin.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,21 @@ + From minahito @ users.sourceforge.jp Tue Aug 22 00:12:51 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:12:51 +0900 Subject: [xoops-cvslog 4305] CVS update: xoops2jp/html/modules/loglog/language/english Message-ID: <20060821151251.F20A72AC160@users.sourceforge.jp> Index: xoops2jp/html/modules/loglog/language/english/modinfo.php diff -u /dev/null xoops2jp/html/modules/loglog/language/english/modinfo.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/modinfo.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,10 @@ + Index: xoops2jp/html/modules/loglog/language/english/admin.php diff -u /dev/null xoops2jp/html/modules/loglog/language/english/admin.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/admin.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,21 @@ + Index: xoops2jp/html/modules/loglog/language/english/main.php diff -u /dev/null xoops2jp/html/modules/loglog/language/english/main.php:1.1.2.1 --- /dev/null Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/main.php Tue Aug 22 00:12:51 2006 @@ -0,0 +1,6 @@ + From minahito @ users.sourceforge.jp Tue Aug 22 00:13:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:13:07 +0900 Subject: [xoops-cvslog 4306] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060821151307.1A9B02AC0A0@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/global.php diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.7 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.8 --- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.7 Sat Jun 3 21:52:43 2006 +++ xoops2jp/html/modules/base/language/japanese/global.php Tue Aug 22 00:13:06 2006 @@ -31,7 +31,7 @@ define('_OLDESTFIRST','古いものから'); define('_NEWESTFIRST','新しいものから'); define('_MORE','もっと...'); -define("_MULTIPAGE","[pagebreak]タグを本文内に記入することでページ区切りを挿入することができます。"); +define("_MULTIPAGE","[pagebreak]タグを本文内に記入することでページ区切りを挿入することができます。"); define('_IFNOTRELOAD','ページが自動的に更新されない場合はここをクリックしてください'); define('_WARNINSTALL2','注意:ファイル%sがサーバ上に存在します。インストール完了後は必ず削除してください。'); define('_WARNINWRITEABLE','注意:ファイル%sへの書き込みが可能となっています。このファイルのパーミッション設定を変更してください。'); @@ -59,8 +59,8 @@ define('_WHOSONLINE','オンライン状況'); define('_GUESTS', 'ゲスト'); define('_MEMBERS', '登録ユーザ'); -define('_ONLINEPHRASE','%s 人のユーザが現在オンラインです。'); -define('_ONLINEPHRASEX','%s 人のユーザが %s を参照しています。'); +define('_ONLINEPHRASE','%s 人のユーザが現在オンラインです。'); +define('_ONLINEPHRASEX','%s 人のユーザが %s を参照しています。'); define('_CLOSE','閉じる'); // Close window //%%%%%% File Name module.textsanitizer.php %%%%% Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.50 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.51 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.50 Mon Aug 21 12:46:17 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Tue Aug 22 00:13:06 2006 @@ -146,18 +146,18 @@ define('_AD_BASE_LANG_MOD_DIR_NAME', "ディレクトリ名"); define('_AD_BASE_LANG_MOD_LICENSE_INFO', "ライセンス情報"); define('_AD_BASE_LANG_MODINSTALL', "モジュールのインストール"); -define('_AD_BASE_LANG_MODINSTALL_ADVICE', "_%s_ をインストールします。よろしいですか?"); +define('_AD_BASE_LANG_MODINSTALL_ADVICE', "_%s_ をインストールします。よろしいですか?"); define('_AD_BASE_LANG_MODINSTALL_CONF', "モジュールインストールの確認"); define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "安全のために : 使用する予定がないモジュールは、サーバーから削除しましょう"); define('_AD_BASE_LANG_MODINSTALL_LOG', "モジュールインストール ログ"); define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "モジュールインストール終了"); define('_AD_BASE_LANG_MODLIST', "モジュール管理"); define('_AD_BASE_LANG_MODULE_LICENSE', "ライセンス"); -define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "_%s_ をアンインストールします。よろしいですか?"); +define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "_%s_ をアンインストールします。よろしいですか?"); define('_AD_BASE_LANG_MODUNINSTALL_CONF', "モジュールアンインストールの確認"); define('_AD_BASE_LANG_MODUNINSTALL_LOG', "モジュールアンインストール ログ"); define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "モジュールアンインストール終了"); -define('_AD_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか?"); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか?"); define('_AD_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認"); define('_AD_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ"); define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "モジュールアップデート終了"); @@ -232,9 +232,9 @@ define('_AD_BASE_MESSAGE_UPDATE_STARTED', "アップデートを開始します"); define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "{0} モジュールのアップデートに成功しました"); define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "新しいブロックをインストールして、サイトをカスタマイズしましょう。
    モジュール付属のブロック以外にも、カスタムブロックを追加して、自由なメッセージをブロックカラムに追加できます。"); -define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Q:ブロックをアンインストールすると?
    A:すべての設定を記録したまま、表示やリストから消えます。設定を記録してますので、簡単に再インストールすることができます。"); -define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Q:カスタムブロックをアンインストールすると?
    A:削除されずに、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。"); -define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "イメージ・ファイルの保存先に、ファイルシステムもしくはデータベースを選択できます。この設定は後から変更できません。
    データベースへの保存はBLOBというバックアップやリストアに不向きなフォーマットが用いられることに注意しましょう。"); +define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Q:ブロックをアンインストールすると?
    A:すべての設定を記録したまま、表示やリストから消えます。設定を記録してますので、簡単に再インストールすることができます。"); +define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Q:カスタムブロックをアンインストールすると?
    A:削除されずに、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。"); +define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "イメージ・ファイルの保存先に、ファイルシステムもしくはデータベースを選択できます。この設定は後から変更できません。
    データベースへの保存はBLOBというバックアップやリストアに不向きなフォーマットが用いられることに注意しましょう。"); define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。
    ウェルカムメッセージなど、文章を表示したい場合は、カスタムブロックを追加しましょう。"); define('_AD_BASE_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。
    ユーザーにテーマを選択させたいですか? チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。"); define('_MD_AM_ADMINML', "管理者メールアドレス"); @@ -253,7 +253,7 @@ define('_MD_AM_CENSORRPLC', "禁止用語を置き換える文字列:"); define('_MD_AM_CENSORRPLCDSC', "禁止用語がこのテキストボックスで指定した文字列に置き換えられます。"); define('_MD_AM_CENSORWRD', "禁止用語"); -define('_MD_AM_CENSORWRDDSC', "ユーザが投稿する際に使用を禁止sする文字列を入力してください。文字列と文字列の間は
    | で区切り、大文字小文字は区別しません。"); +define('_MD_AM_CENSORWRDDSC', "ユーザが投稿する際に使用を禁止sする文字列を入力してください。文字列と文字列の間は
    | で区切り、大文字小文字は区別しません。"); define('_MD_AM_CHNGUTHEME', "全てのユーザのテーマを変更する"); define('_MD_AM_CLOSESITE', "サイトを閉鎖する"); define('_MD_AM_CLOSESITEDSC', "特定グループ以外はサイトにアクセスすることができないようにします。"); From minahito @ users.sourceforge.jp Tue Aug 22 00:13:14 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:13:14 +0900 Subject: [xoops-cvslog 4307] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060821151314.C540A2AC0A0@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.8 xoops2jp/html/modules/base/language/english/global.php:1.1.2.9 --- xoops2jp/html/modules/base/language/english/global.php:1.1.2.8 Fri Aug 11 10:55:07 2006 +++ xoops2jp/html/modules/base/language/english/global.php Tue Aug 22 00:13:14 2006 @@ -1,5 +1,5 @@ %s user(s) are online"); -define("_ONLINEPHRASEX","%s user(s) are browsing %s"); +define("_ONLINEPHRASE","%s user(s) are online"); +define("_ONLINEPHRASEX","%s user(s) are browsing %s"); define("_CLOSE","Close"); // Close window //%%%%%% File Name module.textsanitizer.php %%%%% Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.44 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.45 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.44 Mon Aug 21 12:46:17 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Tue Aug 22 00:13:14 2006 @@ -146,7 +146,7 @@ define('_AD_BASE_LANG_MOD_DIR_NAME', "Module directory"); define('_AD_BASE_LANG_MOD_LICENSE_INFO', "Licence Information "); define('_AD_BASE_LANG_MODINSTALL', "Module install"); -define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Are you sure to install _%s_?"); +define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Are you sure to install _%s_?"); define('_AD_BASE_LANG_MODINSTALL_CONF', "Are you sure to install the module?"); define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from server to keep security of your site. "); define('_AD_BASE_LANG_MODINSTALL_LOG', "module install log"); @@ -157,7 +157,7 @@ define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall"); define('_AD_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log"); define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled."); -define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure to update _%s_?"); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure to update _%s_?"); define('_AD_BASE_LANG_MODUPDATE_CONF', "Confirm module update."); define('_AD_BASE_LANG_MODUPDATE_LOG', "Module update log"); define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); @@ -234,7 +234,7 @@ define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site!
    If you want to get a free block except modules' blocks, create cutom block and write your message to it."); define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall the block, the configuration of the block isn't deleted. The block is removed only from display of your site. Therefore you can re-install the block easily because the installer recovers last configure."); define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at 'install block' page."); -define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database for the storage scheme of image files. This setting cannot be changed later.
    Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes."); +define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database for the storage scheme of image files. This setting cannot be changed later.
    Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes."); define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
    Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); define('_MD_AM_ADMINML', "Admin mail address"); @@ -247,13 +247,13 @@ define('_MD_AM_ALWDHTML', "HTML tags allowed in all posts."); define('_MD_AM_ANONNAME', "Username for anonymous users"); define('_MD_AM_ANONPOST', "Anonymous user can post"); -define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
    Separate each with a |, case insensitive, regex enabled."); +define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
    Separate each with a |, case insensitive, regex enabled."); define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc
    aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc
    aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc"); define('_MD_AM_CENSOR', "Word Censoring Options"); define('_MD_AM_CENSORRPLC', "Bad words will be replaced with:"); define('_MD_AM_CENSORRPLCDSC', "Censored words will be replaced with the characters entered in this textbox"); define('_MD_AM_CENSORWRD', "Words to censor"); -define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.
    Separate each with a |, case insensitive."); +define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.
    Separate each with a |, case insensitive."); define('_MD_AM_CHNGUTHEME', "Change all users' theme"); define('_MD_AM_CLOSESITE', "Turn your site off?"); define('_MD_AM_CLOSESITEDSC', "Select yes to turn your site off so that only users in selected groups have access to the site. "); From minahito @ users.sourceforge.jp Tue Aug 22 00:13:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:13:28 +0900 Subject: [xoops-cvslog 4308] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060821151328.B008E2AC0A0@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/modinfo.php diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.19 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.20 --- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.19 Sat Aug 19 17:05:53 2006 +++ xoops2jp/html/modules/user/language/japanese/modinfo.php Tue Aug 22 00:13:28 2006 @@ -30,9 +30,9 @@ define('_MI_USER_CONF_AVATAR_WIDTH', "アバター画像の最大幅(ピクセル)"); define('_MI_USER_CONF_AVTR_ALLOW_UP', "アバター画像のアップロードを許可する"); define('_MI_USER_CONF_BAD_EMAILS', "ユーザのemailアドレスとして使用できない文字列"); -define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); +define('_MI_USER_CONF_BAD_EMAILS_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); define('_MI_USER_CONF_BAD_UNAMES', "ユーザ名として使用できない文字列"); -define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); +define('_MI_USER_CONF_BAD_UNAMES_DESC', "それぞれの文字列の間は|で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。"); define('_MI_USER_CONF_CHGMAIL', "ユーザ自身のEmailアドレス変更を許可する"); define('_MI_USER_CONF_DISCLAIMER', "利用許諾文"); define('_MI_USER_CONF_DISCLAIMER_DESC', "ユーザの新規登録ページに表示する利用許諾文を入力してください。"); Index: xoops2jp/html/modules/user/language/japanese/blocks.php diff -u xoops2jp/html/modules/user/language/japanese/blocks.php:1.1.2.1 xoops2jp/html/modules/user/language/japanese/blocks.php:1.1.2.2 --- xoops2jp/html/modules/user/language/japanese/blocks.php:1.1.2.1 Fri Mar 24 22:04:24 2006 +++ xoops2jp/html/modules/user/language/japanese/blocks.php Tue Aug 22 00:13:28 2006 @@ -7,7 +7,7 @@ define('_MB_USER_SECURE', "SSL"); define('_MB_USER_REMEMBERME',"IDとパスワードを記憶"); -define('_MB_USER_ONLINEPHRASEX',"%s 人のユーザが現在オンラインです。"); +define('_MB_USER_ONLINEPHRASEX',"%s 人のユーザが現在オンラインです。"); define('_MB_USER_MEMBERS',"登録ユーザ"); define('_MB_USER_GUESTS',"ゲスト"); define('_MB_USER_MORE',"もっと..."); Index: xoops2jp/html/modules/user/language/japanese/admin.php diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.34 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.35 --- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.34 Sat Aug 19 17:05:15 2006 +++ xoops2jp/html/modules/user/language/japanese/admin.php Tue Aug 22 00:13:28 2006 @@ -39,7 +39,7 @@ define('_AD_USER_LANG_GROUP_ASSIGN', "メンバーの登録"); define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "このグループに登録されているユーザー一覧"); define('_AD_USER_LANG_GROUP_DELETE', "ユーザーグループの削除"); -define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "_%s_ のユーザーグループを削除します。よろしいですか?"); +define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "_%s_ のユーザーグループを削除します。よろしいですか?"); define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "グループを削除してもユーザーは削除されません"); define('_AD_USER_LANG_GROUP_DESC', "説明"); define('_AD_USER_LANG_GROUP_EDIT', "ユーザーグループ編集"); @@ -53,8 +53,8 @@ define('_AD_USER_LANG_GROUP_TYPE', "タイプ"); define('_AD_USER_LANG_IS_MAIL', "メール送信"); define('_AD_USER_LANG_IS_PM', "PM送信"); -define('_AD_USER_LANG_LASTLOG_LESS', "X日以内にログインしている"); -define('_AD_USER_LANG_LASTLOG_MORE', "X日以上ログインしていない"); +define('_AD_USER_LANG_LASTLOG_LESS', "X日以内にログインしている"); +define('_AD_USER_LANG_LASTLOG_MORE', "X日以上ログインしていない"); define('_AD_USER_LANG_LASTLOGIN', "最終ログイン"); define('_AD_USER_LANG_LEFT_TARGET_USER', "残送信数"); define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ"); @@ -66,7 +66,7 @@ define('_AD_USER_LANG_MAILJOB_NEW', "メールジョブ新規登録"); define('_AD_USER_LANG_MAILJOB_SEND', "一斉メールの送信"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); -define('_AD_USER_LANG_OVER_POSTS', "投稿数がX件以上"); +define('_AD_USER_LANG_OVER_POSTS', "投稿数がX件以上"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "承認が済んでいないユーザのみ"); define('_AD_USER_LANG_PERM_ACCESS', "アクセス"); define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限"); @@ -87,16 +87,16 @@ define('_AD_USER_LANG_RANK_TITLE', "ランク名"); define('_AD_USER_LANG_RECOUNT', "再集計"); define('_AD_USER_LANG_REGDATE', "登録日"); -define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時がX日以内"); -define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時がX日以上前"); +define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時がX日以内"); +define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時がX日以上前"); define('_AD_USER_LANG_RESET', "リセット"); define('_AD_USER_LANG_SEARCH_AGAIN', "条件を修正して再検索"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信"); define('_AD_USER_LANG_TITLE', "タイトル"); -define('_AD_USER_LANG_UNDER_POSTS', "投稿数がX件以下"); +define('_AD_USER_LANG_UNDER_POSTS', "投稿数がX件以下"); define('_AD_USER_LANG_USER', "ユーザー"); define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除"); -define('_AD_USER_LANG_USER_DELETE_ADVICE', "_%s_ のユーザーを削除します。よろしいですか?"); +define('_AD_USER_LANG_USER_DELETE_ADVICE', "_%s_ のユーザーを削除します。よろしいですか?"); define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集"); define('_AD_USER_LANG_USER_LIST', "ユーザー管理"); define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録"); From minahito @ users.sourceforge.jp Tue Aug 22 00:13:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:13:28 +0900 Subject: [xoops-cvslog 4309] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060821151328.D4DD62AC0F3@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/blocks.php diff -u xoops2jp/html/modules/user/language/english/blocks.php:1.1.2.1 xoops2jp/html/modules/user/language/english/blocks.php:1.1.2.2 --- xoops2jp/html/modules/user/language/english/blocks.php:1.1.2.1 Fri Mar 24 22:04:24 2006 +++ xoops2jp/html/modules/user/language/english/blocks.php Tue Aug 22 00:13:28 2006 @@ -7,7 +7,7 @@ define('_MB_USER_SECURE', "SSL"); define('_MB_USER_REMEMBERME',"Remember Me"); -define('_MB_USER_ONLINEPHRASEX',"%s user(s) are browsing %s"); +define('_MB_USER_ONLINEPHRASEX',"%s user(s) are browsing %s"); define('_MB_USER_MEMBERS',"Members"); define('_MB_USER_GUESTS',"Guests"); define('_MB_USER_MORE',"more..."); Index: xoops2jp/html/modules/user/language/english/admin.php diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.26 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.27 --- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.26 Sun Aug 20 10:42:38 2006 +++ xoops2jp/html/modules/user/language/english/admin.php Tue Aug 22 00:13:28 2006 @@ -53,8 +53,8 @@ define('_AD_USER_LANG_GROUP_TYPE', "Type"); define('_AD_USER_LANG_IS_MAIL', "Mail"); define('_AD_USER_LANG_IS_PM', "Private Message"); -define('_AD_USER_LANG_LASTLOG_LESS', "Last login is less than X days ago"); -define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than X days ago"); +define('_AD_USER_LANG_LASTLOG_LESS', "Last login is less than X days ago"); +define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than X days ago"); define('_AD_USER_LANG_LASTLOGIN', "Last login"); define('_AD_USER_LANG_LEFT_TARGET_USER', "Left target user"); define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Only users that don't accept mail "); @@ -66,7 +66,7 @@ define('_AD_USER_LANG_MAILJOB_NEW', "Mailjob new"); define('_AD_USER_LANG_MAILJOB_SEND', "Mailjob send"); define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------"); -define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than X"); +define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than X"); define('_AD_USER_LANG_PENDING_USERS_ONLY', "Only inactive users"); define('_AD_USER_LANG_PERM_ACCESS', "Access"); define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Privilege of access control"); @@ -87,13 +87,13 @@ define('_AD_USER_LANG_RANK_TITLE', "Title"); define('_AD_USER_LANG_RECOUNT', "Recount"); define('_AD_USER_LANG_REGDATE', "Registered date"); -define('_AD_USER_LANG_REGDATE_LESS', "Joined date is less than X days ago"); -define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than X days ago"); +define('_AD_USER_LANG_REGDATE_LESS', "Joined date is less than X days ago"); +define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than X days ago"); define('_AD_USER_LANG_RESET', "Reset"); define('_AD_USER_LANG_SEARCH_AGAIN', "Search again"); define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail to these users"); define('_AD_USER_LANG_TITLE', "Title"); -define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); +define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X"); define('_AD_USER_LANG_USER', "User"); define('_AD_USER_LANG_USER_DELETE', "Delete a user"); define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete "); From minahito @ users.sourceforge.jp Tue Aug 22 00:15:49 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:15:49 +0900 Subject: [xoops-cvslog 4310] CVS update: xoops2jp/html/modules/loglog/language/japanese Message-ID: <20060821151549.7093B2AC0F3@users.sourceforge.jp> Index: xoops2jp/html/modules/loglog/language/japanese/modinfo.php diff -u xoops2jp/html/modules/loglog/language/japanese/modinfo.php:1.1.2.1 xoops2jp/html/modules/loglog/language/japanese/modinfo.php:removed --- xoops2jp/html/modules/loglog/language/japanese/modinfo.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/modinfo.php Tue Aug 22 00:15:49 2006 @@ -1,10 +0,0 @@ - Index: xoops2jp/html/modules/loglog/language/japanese/main.php diff -u xoops2jp/html/modules/loglog/language/japanese/main.php:1.1.2.1 xoops2jp/html/modules/loglog/language/japanese/main.php:removed --- xoops2jp/html/modules/loglog/language/japanese/main.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/main.php Tue Aug 22 00:15:49 2006 @@ -1,6 +0,0 @@ - Index: xoops2jp/html/modules/loglog/language/japanese/admin.php diff -u xoops2jp/html/modules/loglog/language/japanese/admin.php:1.1.2.1 xoops2jp/html/modules/loglog/language/japanese/admin.php:removed --- xoops2jp/html/modules/loglog/language/japanese/admin.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/japanese/admin.php Tue Aug 22 00:15:49 2006 @@ -1,21 +0,0 @@ - From minahito @ users.sourceforge.jp Tue Aug 22 00:15:52 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Tue, 22 Aug 2006 00:15:52 +0900 Subject: [xoops-cvslog 4311] CVS update: xoops2jp/html/modules/loglog/language/english Message-ID: <20060821151552.147382AC160@users.sourceforge.jp> Index: xoops2jp/html/modules/loglog/language/english/modinfo.php diff -u xoops2jp/html/modules/loglog/language/english/modinfo.php:1.1.2.1 xoops2jp/html/modules/loglog/language/english/modinfo.php:removed --- xoops2jp/html/modules/loglog/language/english/modinfo.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/modinfo.php Tue Aug 22 00:15:51 2006 @@ -1,10 +0,0 @@ - Index: xoops2jp/html/modules/loglog/language/english/admin.php diff -u xoops2jp/html/modules/loglog/language/english/admin.php:1.1.2.1 xoops2jp/html/modules/loglog/language/english/admin.php:removed --- xoops2jp/html/modules/loglog/language/english/admin.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/admin.php Tue Aug 22 00:15:51 2006 @@ -1,21 +0,0 @@ - Index: xoops2jp/html/modules/loglog/language/english/main.php diff -u xoops2jp/html/modules/loglog/language/english/main.php:1.1.2.1 xoops2jp/html/modules/loglog/language/english/main.php:removed --- xoops2jp/html/modules/loglog/language/english/main.php:1.1.2.1 Tue Aug 22 00:12:51 2006 +++ xoops2jp/html/modules/loglog/language/english/main.php Tue Aug 22 00:15:51 2006 @@ -1,6 +0,0 @@ - From nobunobu @ users.sourceforge.jp Tue Aug 22 11:30:27 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Tue, 22 Aug 2006 11:30:27 +0900 Subject: [xoops-cvslog 4312] CVS update: xoops2jp/html/kernel Message-ID: <20060822023027.170452AC046@users.sourceforge.jp> Index: xoops2jp/html/kernel/block.php diff -u xoops2jp/html/kernel/block.php:1.2.8.9 xoops2jp/html/kernel/block.php:1.2.8.10 --- xoops2jp/html/kernel/block.php:1.2.8.9 Thu Jul 20 17:18:31 2006 +++ xoops2jp/html/kernel/block.php Tue Aug 22 11:30:26 2006 @@ -1,5 +1,5 @@ getVar('dirname').'/blocks/'.$this->getVar('func_file')) ) { $root=&XCube_Root::getSingleton(); - $root->mLanguageManager->loadBlockLanguage($this->getVar('dirname')); + $root->mLanguageManager->loadBlockMessageCatalog($this->getVar('dirname')); require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'); $options = explode('|', $this->getVar('options')); From nobunobu @ users.sourceforge.jp Tue Aug 22 11:30:27 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Tue, 22 Aug 2006 11:30:27 +0900 Subject: [xoops-cvslog 4313] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060822023027.3A6E72AC074@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.6 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.7 --- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.6 Thu Jul 20 17:15:40 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php Tue Aug 22 11:30:27 2006 @@ -1,7 +1,7 @@ _loadLanguage($dirname, "blocks"); } From nobunobu @ users.sourceforge.jp Wed Aug 23 10:31:24 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Wed, 23 Aug 2006 10:31:24 +0900 Subject: [xoops-cvslog 4314] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060823013124.54F812AC065@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10 --- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.9 Fri Aug 18 20:30:00 2006 +++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php Wed Aug 23 10:31:24 2006 @@ -1,7 +1,7 @@ getLanguageManager(); - $langManager->loadBlockLanguage($this->mObject->get('dirname')); + $langManager->loadBlockMessageCatalog($this->mObject->get('dirname')); $this->_mOptionForm = call_user_func($edit_func, $options); } From nobunobu @ users.sourceforge.jp Wed Aug 23 12:24:56 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Wed, 23 Aug 2006 12:24:56 +0900 Subject: [xoops-cvslog 4315] CVS update: xoops2jp/html/kernel Message-ID: <20060823032456.8D3072AC073@users.sourceforge.jp> Index: xoops2jp/html/kernel/XCube_Delegate.class.php diff -u xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.12 xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.13 --- xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.12 Mon Aug 7 20:24:25 2006 +++ xoops2jp/html/kernel/XCube_Delegate.class.php Wed Aug 23 12:24:56 2006 @@ -1,6 +1,6 @@ 0) { $this->_setSignatures(func_get_args()); } + $this->_mUniqueID = md5(uniqid(rand(), true)); } /** @@ -287,6 +289,11 @@ } } } + + function getID() + { + return $this->_mUniqueID; + } } /** @@ -328,15 +335,13 @@ */ function register($name, &$delegate) { - if (!isset($this->_mDelegates[$name])) { - $this->_mDelegates[$name] =& $delegate; + if (!isset($this->_mDelegates[$name][$delegate->getID()])) { + $this->_mDelegates[$name][$delegate->getID()] =& $delegate; if (isset($this->_mCallbacks[$name]) && count($this->_mCallbacks[$name]) > 0) { foreach (array_keys($this->_mCallbacks[$name]) as $key) { $delegate->add($this->_mCallbacks[$name][$key], $this->_mCallbackParameters[$name][$key][0], $this->_mCallbackParameters[$name][$key][1]); } - unset($this->_mCallbacks[$name]); - unset($this->_mCallbackParameters[$name]); } return true; @@ -361,12 +366,12 @@ function add($name, $callback, $param3 = null, $param4 = null) { if (isset($this->_mDelegates[$name])) { - $this->_mDelegates[$name]->add($callback, $param3, $param4); - } - else { - $this->_mCallbacks[$name][] = $callback; - $this->_mCallbackParameters[$name][] = array('0' => $param3, '1' => $param4); + foreach(array_keys($this->_mDelegates[$name]) as $key) { + $this->_mDelegates[$name][$key]->add($callback, $param3, $param4); + } } + $this->_mCallbacks[$name][] = $callback; + $this->_mCallbackParameters[$name][] = array('0' => $param3, '1' => $param4); } /** @@ -380,18 +385,19 @@ function delete($name, $delcallback) { if (isset($this->_mDelegates[$name])) { - $this->_mDelegates[$name]->delete($delcallback); - } else { - if (isset($this->_mCallbacks[$name])) { - foreach(array_keys($this->_mCallbacks[$name]) as $key) { - $callback = $this->_mCallbacks[$name][$key]; - if (XCube_DelegateUtils::_compareCallback($callback, $delcallback)) { - unset($this->_mCallbacks[$name][$key]); - unset($this->_mCallbackParameters[$name][$key]); - } - } - } - } + foreach(array_keys($this->_mDelegates[$name]) as $key) { + $this->_mDelegates[$name][$key]->delete($delcallback); + } + } + if (isset($this->_mCallbacks[$name])) { + foreach(array_keys($this->_mCallbacks[$name]) as $key) { + $callback = $this->_mCallbacks[$name][$key]; + if (XCube_DelegateUtils::_compareCallback($callback, $delcallback)) { + unset($this->_mCallbacks[$name][$key]); + unset($this->_mCallbackParameters[$name][$key]); + } + } + } } /** @@ -404,13 +410,14 @@ function reset($name) { if (isset($this->_mDelegates[$name])) { - $this->_mDelegates[$name]->reset(); - } else { - if (isset($this->_mCallbacks[$name])) { - unset($this->_mCallbacks[$name]); - unset($this->_mCallbackParameters[$name]); - } - } + foreach(array_keys($this->_mDelegates[$name]) as $key) { + $this->_mDelegates[$name][$key]->reset(); + } + } + if (isset($this->_mCallbacks[$name])) { + unset($this->_mCallbacks[$name]); + unset($this->_mCallbackParameters[$name]); + } } @@ -458,7 +465,8 @@ if ($root->mDelegateManager != null) { $delegates = $root->mDelegateManager->getDelegates(); if (isset($delegates[$delegateName])) { - $delegate =& $delegates[$delegateName]; + $keys = array_keys($delegates[$delegateName]); + $delegate =& $delegates[$delegateName][$keys[0]]; } else { $delegate =& new XCube_Delegate; $root->mDelegateManager->register($delegateName, $delegate); From tom_g3x @ users.sourceforge.jp Wed Aug 23 19:03:14 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 23 Aug 2006 19:03:14 +0900 Subject: [xoops-cvslog 4316] CVS update: xoops2jp/html/modules/base/admin/actions Message-ID: <20060823100314.65FFA2AC08C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.13 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.14 --- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.13 Fri Aug 18 20:30:00 2006 +++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Wed Aug 23 19:03:14 2006 @@ -1,7 +1,7 @@ mController->getModuleController(); - $moduleObject =& $modController->getXoopsModule(); - $language = $root->mController->getConfig('language'); - $dirname = $moduleObject->get('dirname'); + + if ( $dirname == null ) { + $modController =& $root->mController->getModuleController(); + $moduleObject =& $modController->getXoopsModule(); + $dirname = $moduleObject->get('dirname'); + } // // TODO We should check file_exists. From tom_g3x @ users.sourceforge.jp Wed Aug 23 23:31:41 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 23 Aug 2006 23:31:41 +0900 Subject: [xoops-cvslog 4317] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060823143141.635022AC096@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.17 xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.18 --- xoops2jp/html/modules/base/admin/templates/module_information.html:1.1.2.17 Mon Aug 21 20:26:06 2006 +++ xoops2jp/html/modules/base/admin/templates/module_information.html Wed Aug 23 23:31:41 2006 @@ -9,7 +9,7 @@

    <{$smarty.const._AD_BASE_LANG_INFORMATION}>

    -
    <{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}>

    @@ -61,7 +61,7 @@
    <{$smarty.const._AD_BASE_LANG_MOD_BASIC_INFO}>

    -
    <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>

    @@ -81,9 +81,12 @@
    <{$smarty.const._AD_BASE_LANG_MOD_LICENSE_INFO}>

    -
    <{$smarty.const._AD_BASE_LANG_SQL_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_SQL_INFO}>

    <{if $module->modinfo.tables}> + + + @@ -117,10 +120,13 @@ <{/if}>
    -
    <{$smarty.const._AD_BASE_LANG_MAINMENU_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_MAINMENU_INFO}>

    <{if $module->get('hasmain')}>
    <{$smarty.const._AD_BASE_LANG_SQL_INFO}>
    <{$smarty.const._AD_BASE_LANG_SQL_HAS_MAIN}> <{$smarty.const._AD_BASE_LANG_ACTIVE}>
    + + + @@ -150,9 +156,12 @@ <{/if}>
    -
    <{$smarty.const._AD_BASE_LANG_ADMIN_MENU}>
    +

    <{$smarty.const._AD_BASE_LANG_ADMIN_MENU}>

    <{if $module->get('hasadmin')}>
    <{$smarty.const._AD_BASE_LANG_MAINMENU_INFO}>
    <{$smarty.const._AD_BASE_LANG_MAINMENU_HAS_MAIN}> <{$smarty.const._AD_BASE_LANG_ACTIVE}>
    + + + @@ -193,9 +202,12 @@
    -
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_TEMPLATE_INFO}>

    <{if $module->modinfo.templates}>
    <{$smarty.const._AD_BASE_LANG_ADMIN_MENU}>
    <{$smarty.const._AD_BASE_LANG_ADMINMENU_HAS_MAIN}> <{$smarty.const._AD_BASE_LANG_ACTIVE}>
    + + + @@ -225,7 +237,7 @@ <{/if}>
    -
    <{$smarty.const._AD_BASE_LANG_BLOCKS_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_BLOCKS_INFO}>

    <{foreach from=$module->modinfo.blocks item=block key=block_num }>
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_INFO}>
    <{$smarty.const._AD_BASE_LANG_TEMPLATE_HAS_MAIN}> <{$smarty.const._AD_BASE_LANG_ACTIVE}>
    @@ -250,7 +262,7 @@ <{/foreach}>
    -
    <{$smarty.const._AD_BASE_LANG_CONFIG_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_CONFIG_INFO}>

    <{foreach from=$module->modinfo.config item=config key=conf_num}>
    @@ -280,8 +292,9 @@
    <{$smarty.const._AD_BASE_LANG_NO_CONFIG}>
    <{/foreach}> +<{*
    -
    <{$smarty.const._AD_BASE_LANG_FEATURE_SVC_INFO}>
    +

    <{$smarty.const._AD_BASE_LANG_FEATURE_SVC_INFO}>

    <{if $module->get('hassearch')}> @@ -303,3 +316,4 @@ <{/if}>
    +*}> From tom_g3x @ users.sourceforge.jp Wed Aug 23 23:32:05 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Wed, 23 Aug 2006 23:32:05 +0900 Subject: [xoops-cvslog 4318] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060823143205.BA0E32AC1A9@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.9 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.9 Mon Aug 21 22:11:29 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Wed Aug 23 23:32:05 2006 @@ -68,7 +68,7 @@ } .base_modinfo_notmounted { - + margin:10px 10px 10px 40px; } /* comment list */ From minahito @ users.sourceforge.jp Wed Aug 23 23:36:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Wed, 23 Aug 2006 23:36:47 +0900 Subject: [xoops-cvslog 4319] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060823143647.266DE2AC096@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/columnside.php diff -u xoops2jp/html/modules/base/class/columnside.php:1.1.2.1 xoops2jp/html/modules/base/class/columnside.php:1.1.2.2 --- xoops2jp/html/modules/base/class/columnside.php:1.1.2.1 Wed Apr 5 19:58:39 2006 +++ xoops2jp/html/modules/base/class/columnside.php Wed Aug 23 23:36:47 2006 @@ -41,7 +41,7 @@ return $ret; } - function get($id) + function &get($id) { if (isset($this->_mResults[$id])) { return $this->_mResults[$id]; From nobunobu @ users.sourceforge.jp Thu Aug 24 01:08:18 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 24 Aug 2006 01:08:18 +0900 Subject: [xoops-cvslog 4320] CVS update: xoops2jp/html/modules/base/actions Message-ID: <20060823160818.C12582AC078@users.sourceforge.jp> Index: xoops2jp/html/modules/base/actions/SearchResultsAction.class.php diff -u xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.6 xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.7 --- xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.6 Mon Jul 31 19:05:07 2006 +++ xoops2jp/html/modules/base/actions/SearchResultsAction.class.php Thu Aug 24 01:08:17 2006 @@ -17,6 +17,7 @@ function prepare(&$controller, &$xoopsUser) { $root =& $controller->mRoot; + $root->mLanguageManager->loadPageTypeMessageCatalog('search'); $root->mLanguageManager->loadModuleMessageCatalog('base'); $handler =& xoops_gethandler('config'); From nobunobu @ users.sourceforge.jp Thu Aug 24 10:53:55 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 24 Aug 2006 10:53:55 +0900 Subject: [xoops-cvslog 4321] CVS update: xoops2jp/html/modules/legacyRender/admin/actions Message-ID: <20060824015355.11F742AC1C1@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.4 --- xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.3 Tue Jul 11 12:05:26 2006 +++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php Thu Aug 24 10:53:54 2006 @@ -1,7 +1,7 @@ _getId(); From nobunobu @ users.sourceforge.jp Thu Aug 24 10:54:33 2006 From: nobunobu @ users.sourceforge.jp (NobuNobu) Date: Thu, 24 Aug 2006 10:54:33 +0900 Subject: [xoops-cvslog 4322] CVS update: xoops2jp/html/modules/base/preload Message-ID: <20060824015433.EBB372AC1C1@users.sourceforge.jp> Index: xoops2jp/html/modules/base/preload/Wating.class.php diff -u xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.1 xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2 --- xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.1 Sat Jul 8 11:20:43 2006 +++ xoops2jp/html/modules/base/preload/Wating.class.php Thu Aug 24 10:54:33 2006 @@ -19,7 +19,7 @@ $blockVal['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle"; list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result); $blockVal['lang_linkname'] = _MB_BASE_SUBMS; - $modules = $blockVal; + $modules[] = $blockVal; } } // for MyLinks Module From minahito @ users.sourceforge.jp Thu Aug 24 13:57:16 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 13:57:16 +0900 Subject: [xoops-cvslog 4323] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060824045716.D22CC2AC1C6@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php diff -u xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.2 --- xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.1 Mon Aug 14 10:58:52 2006 +++ xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php Thu Aug 24 13:57:16 2006 @@ -1,388 +1,401 @@ -mBuffer = array(); - for ($i = 0; $i < strlen($buffer); $i++) { - $this->mBuffer[$i] = $buffer{$i}; - } - - $this->mIndex = 0; - } - - function parse() - { - while ($this->mIndex <= count($this->mBuffer)) { - if ($this->mIndex == count($this->mBuffer)) { - $ch = ''; - $type = EASYLEX_SQL_UNKNOWN; - } - else { - $ch = $this->mBuffer[$this->mIndex]; - $type = $this->_getChrType($ch); - } - - switch ($this->mStatus) { - case EASYLEX_SQL_UNKNOWN: - $this->_parseUnknown($ch, $type); - break; - - case EASYLEX_SQL_DIGIT: - $this->_parseDigit($ch, $type); - break; - - case EASYLEX_SQL_LETTER: - $this->_parseLetter($ch, $type); - break; - - case EASYLEX_SQL_STRING_LITERAL: - $this->_parseStringLiteral($ch, $type); - break; - - case EASYLEX_SQL_OPEN_PARENTHESIS: - $this->_parseOpenParenthesis($ch, $type); - break; - - case EASYLEX_SQL_CLOSE_PARENTHESIS: - $this->_parseCloseParenthesis($ch, $type); - break; - - case EASYLEX_SQL_SEPARATER: - $this->_parseSeparater($ch, $type); - break; - - case EASYLEX_SQL_MARK: - $this->_parseMark($ch, $type); - break; - - case EASYLEX_SQL_SEMICOLON: - $this->_parseSemicolon($ch, $type); - break; - - case EASYLEX_SQL_COMMA: - $this->_parseComma($ch, $type); - break; - } - } - } - - /** - * Load file and set buffer. If $preprocess is true, scan commetns and - * remove these. - * - * @param string $path file path - * @param bool $preprocess - * @return bool - */ - function loadFile($path, $preprocess = true) - { - if (!file_exists($path)) { - return false; - } - - $fp = fopen($path, "rb"); - if (!$fp) { - return false; - } - - $t_buff = ""; - while ($str = fgets($fp)) { - if ($preprocess) { - $str = preg_replace("/\#.*/", "", $str); - } - $t_buff .= $str; - } - - $this->setBuffer($t_buff); - - fclose($fp); - return true; - } - - function _getChrType($ch) - { - if (preg_match("/\s/", $ch)) { - return EASYLEX_SQL_SEPARATER; - } - - if ($ch == '(') { - return EASYLEX_SQL_OPEN_PARENTHESIS; - } - - if ($ch == ')') { - return EASYLEX_SQL_CLOSE_PARENTHESIS; - } - - if ($ch == ';') { - return EASYLEX_SQL_SEMICOLON; - } - - if ($ch == ',') { - return EASYLEX_SQL_COMMA; - } - - if (preg_match("/[0-9]/", $ch)) { - return EASYLEX_SQL_DIGIT; - } - - if (preg_match("/[!=<>%\*]/", $ch)) { - return EASYLEX_SQL_MARK; - } - - return EASYLEX_SQL_LETTER; - } - - function _parseUnknown($ch, $type) - { - $this->mStatus = $type; - $this->mActiveToken .= $ch; - $this->mIndex++; - - if ($ch == "'" || $ch == '"' || $ch == '`') { - $this->mStatus = EASYLEX_SQL_STRING_LITERAL; - $this->mActiveQuoteMark = $ch; - } - - } - - function _parseDigit($ch, $type) - { - if ($type == EASYLEX_SQL_DIGIT) { - $this->mActiveToken .= $ch; - $this->mIndex++; - } - elseif ($type == EASYLEX_SQL_LETTER) { - $this->mStatus = EASYLEX_SQL_LETTER; - $this->mActiveToken .= $ch; - $this->mIndex++; - } - else { - $this->_createToken(); - } - } - - function _parseLetter($ch, $type) - { - if ($type == EASYLEX_SQL_LETTER || $type == EASYLEX_SQL_DIGIT) { - $this->mActiveToken .= $ch; - $this->mIndex++; - } - else { - $this->_createToken(); - } - } - - function _parseStringLiteral($ch, $type) - { - $this->mActiveToken .= $ch; - $this->mIndex++; - if ($ch == $this->mActiveQuoteMark && substr($this->mActiveToken, -2, 1) != "\\" && substr($this->mActiveToken, -3, 1) != "\\") { - $this->_createToken(); - } - } - - function _parseOpenParenthesis($ch, $type) - { - $this->_createToken(); - } - - function _parseCloseParenthesis($ch, $type) - { - $this->_createToken(); - } - - function _parseSeparater($ch, $type) - { - if ($type == EASYLEX_SQL_SEPARATER) { - $this->mActiveToken .= $ch; - $this->mIndex++; - } - else { - // $this->_createToken(); - $this->mStatus = EASYLEX_SQL_UNKNOWN; - $this->mActiveToken = ""; - } - } - - function _parseSemicolon($ch, $type) - { - $this->_createToken(); - } - - function _parseMark($ch, $type) - { - if ($type == EASYLEX_SQL_MARK) { - $this->mActiveToken .= $ch; - $this->mIndex++; - } - else { - $this->_createToken(); - } - } - - function _parseComma($ch, $type) - { - $this->_createToken(); - } - - function _createToken($type = null, $value = null) - { - if ($type === null) { - $type = $this->mStatus; - } - - if ($value === null) { - $value = $this->mActiveToken; - } - - $token =& new EasyLex_SQLToken($type, $value); - $this->mTokens[] =& $token; - - $this->mStatus = EASYLEX_SQL_UNKNOWN; - $this->mActiveToken = ""; - - return $token; - } - - /** - * Return Array of operations. - * - * @return Array $ret[Index] = Array of tokens. - */ - function &getOperations() - { - $ret = array(); - $t_tokens = array(); - $depth = 0; - - foreach (array_keys($this->mTokens) as $key) { - if ($this->mTokens[$key]->mType == EASYLEX_SQL_OPEN_PARENTHESIS) { - $depth++; - } - elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_CLOSE_PARENTHESIS) { - $depth--; - } - - $t_tokens[] =& $this->mTokens[$key]; - - if ($this->mTokens[$key]->mType == EASYLEX_SQL_SEMICOLON && $depth == 0) { - $ret[] =& $t_tokens; - unset($t_tokens); - $t_tokens = array(); - } - } - - if (count($t_tokens) > 0) { - $ret[] =& $t_tokens; - unset($t_tokens); - } - - return $ret; - } - - function getSQL() - { - $sqls = array(); - $lines =& $this->getOperations(); - - foreach ($lines as $line) { - $t_arr = array(); - foreach ($line as $token) { - $t_arr[] = $token->getOutputValue(); - } - $sqls[] = join(" ", $t_arr); - } - - return $sqls; - } -} - -class EasyLex_SQLToken -{ - var $mType = EASYLEX_SQL_UNKNOWN; - var $mValue = ""; - - function EasyLex_SQLToken($type, $value) - { - $this->mType = $type; - $this->mValue = $value; - } - - function getOutputValue() - { - if ($this->mType == EASYLEX_SQL_SEPARATER) { - return ""; - } - else { - return $this->mValue; - } - } -} - +mBuffer = array(); + for ($i = 0; $i < strlen($buffer); $i++) { + $this->mBuffer[$i] = $buffer{$i}; + } + + $this->mIndex = 0; + } + + function parse() + { + while ($this->mIndex <= count($this->mBuffer)) { + if ($this->mIndex == count($this->mBuffer)) { + $ch = ''; + $type = EASYLEX_SQL_UNKNOWN; + } + else { + $ch = $this->mBuffer[$this->mIndex]; + $type = $this->_getChrType($ch); + } + + switch ($this->mStatus) { + case EASYLEX_SQL_UNKNOWN: + $this->_parseUnknown($ch, $type); + break; + + case EASYLEX_SQL_DIGIT: + $this->_parseDigit($ch, $type); + break; + + case EASYLEX_SQL_LETTER: + $this->_parseLetter($ch, $type); + break; + + case EASYLEX_SQL_STRING_LITERAL: + $this->_parseStringLiteral($ch, $type); + break; + + case EASYLEX_SQL_OPEN_PARENTHESIS: + $this->_parseOpenParenthesis($ch, $type); + break; + + case EASYLEX_SQL_CLOSE_PARENTHESIS: + $this->_parseCloseParenthesis($ch, $type); + break; + + case EASYLEX_SQL_SEPARATER: + $this->_parseSeparater($ch, $type); + break; + + case EASYLEX_SQL_MARK: + $this->_parseMark($ch, $type); + break; + + case EASYLEX_SQL_SEMICOLON: + $this->_parseSemicolon($ch, $type); + break; + + case EASYLEX_SQL_COMMA: + $this->_parseComma($ch, $type); + break; + } + } + } + + /** + * Load file and set buffer. If $preprocess is true, scan commetns and + * remove these. + * + * @param string $path file path + * @param bool $preprocess + * @return bool + */ + function loadFile($path, $preprocess = true) + { + if (!file_exists($path)) { + return false; + } + + $fp = fopen($path, "rb"); + if (!$fp) { + return false; + } + + $t_buff = ""; + while ($str = fgets($fp)) { + if ($preprocess) { + $str = preg_replace("/\#.*/", "", $str); + } + $t_buff .= $str; + } + + $this->setBuffer($t_buff); + + fclose($fp); + return true; + } + + function _getChrType($ch) + { + if (preg_match("/\s/", $ch)) { + return EASYLEX_SQL_SEPARATER; + } + + if ($ch == '(') { + return EASYLEX_SQL_OPEN_PARENTHESIS; + } + + if ($ch == ')') { + return EASYLEX_SQL_CLOSE_PARENTHESIS; + } + + if ($ch == ';') { + return EASYLEX_SQL_SEMICOLON; + } + + if ($ch == ',') { + return EASYLEX_SQL_COMMA; + } + + if (preg_match("/[0-9]/", $ch)) { + return EASYLEX_SQL_DIGIT; + } + + if (preg_match("/[!=<>%\*]/", $ch)) { + return EASYLEX_SQL_MARK; + } + + return EASYLEX_SQL_LETTER; + } + + function _parseUnknown($ch, $type) + { + $this->mStatus = $type; + $this->mActiveToken .= $ch; + $this->mIndex++; + + if ($ch == "'" || $ch == '"' || $ch == '`') { + $this->mStatus = EASYLEX_SQL_STRING_LITERAL; + $this->mActiveQuoteMark = $ch; + } + + } + + function _parseDigit($ch, $type) + { + if ($type == EASYLEX_SQL_DIGIT) { + $this->mActiveToken .= $ch; + $this->mIndex++; + } + elseif ($type == EASYLEX_SQL_LETTER) { + $this->mStatus = EASYLEX_SQL_LETTER; + $this->mActiveToken .= $ch; + $this->mIndex++; + } + else { + $this->_createToken(); + } + } + + function _parseLetter($ch, $type) + { + if ($type == EASYLEX_SQL_LETTER || $type == EASYLEX_SQL_DIGIT) { + $this->mActiveToken .= $ch; + $this->mIndex++; + } + else { + $this->_createToken(); + } + } + + function _parseStringLiteral($ch, $type) + { + $this->mActiveToken .= $ch; + $this->mIndex++; + if ($ch == $this->mActiveQuoteMark && substr($this->mActiveToken, -2, 1) != "\\" && substr($this->mActiveToken, -3, 1) != "\\") { + $this->_createToken(); + } + } + + function _parseOpenParenthesis($ch, $type) + { + $this->_createToken(); + } + + function _parseCloseParenthesis($ch, $type) + { + $this->_createToken(); + } + + function _parseSeparater($ch, $type) + { + if ($type == EASYLEX_SQL_SEPARATER) { + $this->mActiveToken .= $ch; + $this->mIndex++; + } + else { + // $this->_createToken(); + $this->mStatus = EASYLEX_SQL_UNKNOWN; + $this->mActiveToken = ""; + } + } + + function _parseSemicolon($ch, $type) + { + $this->_createToken(); + } + + function _parseMark($ch, $type) + { + if ($type == EASYLEX_SQL_MARK) { + $this->mActiveToken .= $ch; + $this->mIndex++; + } + else { + $this->_createToken(); + } + } + + function _parseComma($ch, $type) + { + $this->_createToken(); + } + + function _createToken($type = null, $value = null) + { + if ($type === null) { + $type = $this->mStatus; + } + + if ($value === null) { + $value = $this->mActiveToken; + } + + $token =& new EasyLex_SQLToken($type, $value); + $this->mTokens[] =& $token; + + $this->mStatus = EASYLEX_SQL_UNKNOWN; + $this->mActiveToken = ""; + + return $token; + } + + /** + * Return Array of operations. + * + * @return Array $ret[Index] = Array of tokens. + */ + function &getOperations() + { + $ret = array(); + $t_tokens = array(); + $depth = 0; + + foreach (array_keys($this->mTokens) as $key) { + if ($this->mTokens[$key]->mType == EASYLEX_SQL_OPEN_PARENTHESIS) { + $depth++; + } + elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_CLOSE_PARENTHESIS) { + $depth--; + } + + $t_tokens[] =& $this->mTokens[$key]; + + if ($this->mTokens[$key]->mType == EASYLEX_SQL_SEMICOLON && $depth == 0) { + $ret[] =& $t_tokens; + unset($t_tokens); + $t_tokens = array(); + } + } + + if (count($t_tokens) > 0) { + $ret[] =& $t_tokens; + unset($t_tokens); + } + + return $ret; + } + + function getSQL() + { + $sqls = array(); + $lines =& $this->getOperations(); + + foreach ($lines as $line) { + $t_arr = array(); + foreach ($line as $token) { + $t_arr[] = $token->getOutputValue(); + } + $sqls[] = join(" ", $t_arr); + } + + return $sqls; + } +} + +class EasyLex_SQLToken +{ + var $mType = EASYLEX_SQL_UNKNOWN; + var $mValue = ""; + + function EasyLex_SQLToken($type, $value) + { + $this->mType = $type; + $this->mValue = $value; + } + + function getOutputValue() + { + if ($this->mType == EASYLEX_SQL_SEPARATER) { + return ""; + } + else { + return $this->mValue; + } + } + + function getValue() + { + if ($this->mType == EASYLEX_SQL_SEPARATER) { + return ""; + } + + if ($this->mType == EASYLEX_SQL_STRING_LITERAL) { + return substr($this->mValue, 1, strlen($this->mValue) - 2); + } + + return $this->mValue; + } +} + ?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 24 13:57:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 13:57:56 +0900 Subject: [xoops-cvslog 4324] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060824045756.2E6602AC1C6@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php diff -u xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:1.1.2.3 Thu Aug 17 12:49:41 2006 +++ xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php Thu Aug 24 13:57:56 2006 @@ -55,18 +55,18 @@ if (count($op) >= 3) { if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'CREATE' && $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' && - $op[2]->mType == EASYLEX_SQL_LETTER) { - $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->mValue; + ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) { + $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue(); } if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'ALTER' && $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' && - $op[2]->mType == EASYLEX_SQL_LETTER) { - $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->mValue; + ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) { + $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue(); } if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'INSERT' && $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'INTO' && - $op[2]->mType == EASYLEX_SQL_LETTER) { - $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->mValue; + ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) { + $op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue(); } } } From minahito @ users.sourceforge.jp Thu Aug 24 15:55:38 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 15:55:38 +0900 Subject: [xoops-cvslog 4325] CVS update: xoops2jp/html/modules/base/admin/class Message-ID: <20060824065538.815E52AC1D9@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php diff -u xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.3 --- xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.2 Thu Aug 24 13:57:16 2006 +++ xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php Thu Aug 24 15:55:38 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.45 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.46 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.45 Tue Aug 22 00:13:14 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Thu Aug 24 16:34:49 2006 @@ -1,49 +1,49 @@ _%s_?"); +define('_AD_BASE_LANG_MODINSTALL_CONF', "Are you sure you want to install this module?"); +define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from the server to maintain security of your site. "); define('_AD_BASE_LANG_MODINSTALL_LOG', "module install log"); -define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "The module is successfully installed."); -define('_AD_BASE_LANG_MODLIST', "Modules administration"); +define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "The module has been successfully installed."); +define('_AD_BASE_LANG_MODLIST', "Module administration"); define('_AD_BASE_LANG_MODULE_LICENSE', "Module license"); -define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure to uninstall module"); -define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall"); +define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure you want to uninstall this module?"); +define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall."); define('_AD_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log"); -define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module is successfully uninstalled."); -define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure to update _%s_?"); +define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module has been successfully uninstalled."); +define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure you want to update _%s_?"); define('_AD_BASE_LANG_MODUPDATE_CONF', "Confirm module update."); define('_AD_BASE_LANG_MODUPDATE_LOG', "Module update log"); -define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module is successfully updated."); +define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module has been successfully updated."); define('_AD_BASE_LANG_NAME', "Name"); define('_AD_BASE_LANG_NO', "No"); define('_AD_BASE_LANG_NO_ADMINMENU', "No Administration Menu"); define('_AD_BASE_LANG_NO_AGREE', " I Do Not Agree."); define('_AD_BASE_LANG_NO_BLOCK', "No block information"); define('_AD_BASE_LANG_NO_CHANGE', "No change"); -define('_AD_BASE_LANG_NO_CONFIG', "Module preferences has not been configured."); -define('_AD_BASE_LANG_NO_MAINMENU', "Mainmenu settings has not been configured."); +define('_AD_BASE_LANG_NO_CONFIG', "Module preferences have not been configured."); +define('_AD_BASE_LANG_NO_MAINMENU', "Mainmenu settings have not been configured."); define('_AD_BASE_LANG_NO_SQL', "SQL information has not been configured."); define('_AD_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured."); define('_AD_BASE_LANG_NO_TEMPLATE', "Template information has not been configured."); @@ -215,30 +215,30 @@ define('_AD_BASE_LANG_TOPPAGE', "Toppage"); define('_AD_BASE_LANG_UNINSTALL', "Uninstall"); define('_AD_BASE_LANG_UPDATE', "Update"); -define('_AD_BASE_LANG_VERSION', "version"); +define('_AD_BASE_LANG_VERSION', "Version"); define('_AD_BASE_LANG_VISIBLE', "Visible"); define('_AD_BASE_LANG_WEIGHT', "Weight"); define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled"); define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "Block {0} has been installed"); define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together"); -define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Are you sure to delete?"); +define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?"); define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished."); define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database."); define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}."); define('_AD_BASE_MESSAGE_INSERT_CONFIG', "Config {0} added."); -define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful"); +define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful."); define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{1}' has been installed."); -define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{1}' module has been successful"); -define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started"); -define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{1}' module has been successful"); -define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site!
    If you want to get a free block except modules' blocks, create cutom block and write your message to it."); -define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall the block, the configuration of the block isn't deleted. The block is removed only from display of your site. Therefore you can re-install the block easily because the installer recovers last configure."); -define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at 'install block' page."); -define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database for the storage scheme of image files. This setting cannot be changed later.
    Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes."); -define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block."); -define('_AD_BASE_TIPS_THEME_ADMIN', "Do you change your site's looks to your favorite? Click 'select' button to change theme.
    Do you think your site theme should be selectable by users? Add themes to theme selection block with checking checkboxes. To learn more details, read the help."); +define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{1}' module has been successful."); +define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started."); +define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{1}' module has been successful."); +define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site just the way you want it!
    If you want to have a block with free content that is not part of a module, simply create a custom block and write your message in it."); +define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall a block, the configuration of the block isn't deleted. The block is simply removed from view. Therefore you can re-install the block easily because the installer remembers the last configuration."); +define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is simply removed from view. You can re-install or delete it from the database from the 'install block' page."); +define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database storage scheme for your image files. This setting cannot be changed later.
    Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes."); +define('_AD_BASE_TIPS_INSTALL_BLOCK', "You can customize your site by installing your favorite blocks. You can edit each block's options when you install the block."); +define('_AD_BASE_TIPS_THEME_ADMIN', "Choose the look of your site by clicking the 'select' button next to your favourite theme.
    Let your users choose their own favourite look and feel for your site. Check the boxes to add a theme to the theme selection block. For more details, read the help."); define('_MD_AM_ADMINML', "Admin mail address"); -define('_MD_AM_ADMNOTSET', "Admin mail is not set."); +define('_MD_AM_ADMNOTSET', "Admin mail has not been set."); define('_MD_AM_ALLOWHTML', "Allow HTML tags in user comments?"); define('_MD_AM_ALLOWIMAGE', "Allow users to display image files in posts?"); define('_MD_AM_ALLOWREG', "Allow new user registration?"); @@ -247,13 +247,13 @@ define('_MD_AM_ALWDHTML', "HTML tags allowed in all posts."); define('_MD_AM_ANONNAME', "Username for anonymous users"); define('_MD_AM_ANONPOST', "Anonymous user can post"); -define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
    Separate each with a |, case insensitive, regex enabled."); +define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.
    Separate each with a |, case insensitive, regex enabled."); define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc
    aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc
    aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc"); define('_MD_AM_CENSOR', "Word Censoring Options"); -define('_MD_AM_CENSORRPLC', "Bad words will be replaced with:"); +define('_MD_AM_CENSORRPLC', "Censored words will be replaced with:"); define('_MD_AM_CENSORRPLCDSC', "Censored words will be replaced with the characters entered in this textbox"); define('_MD_AM_CENSORWRD', "Words to censor"); -define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.
    Separate each with a |, case insensitive."); +define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.
    Separate each with a |, case insensitive."); define('_MD_AM_CHNGUTHEME', "Change all users' theme"); define('_MD_AM_CLOSESITE', "Turn your site off?"); define('_MD_AM_CLOSESITEDSC', "Select yes to turn your site off so that only users in selected groups have access to the site. "); @@ -300,6 +300,7 @@ define('_MD_AM_MAILFROMNAMEDESC', ""); define('_MD_AM_MAILFROMUID', "FROM user"); define('_MD_AM_MAILFROMUIDDESC', "When the system sends a private message, which user should appear to have sent it?"); +define('_MD_AM_METAFOOTER', "Metadata"); define('_MD_AM_MINSEARCH', "Minimum keyword length"); define('_MD_AM_MINSEARCHDSC', "Enter the minimum keyword length that users are required to enter to perform search"); define('_MD_AM_MODCACHE', "Module-wide Cache"); @@ -339,11 +340,12 @@ define('_MD_AM_THEMEFILE', "Update module template .html files from themes/your theme/templates directory?"); define('_MD_AM_THEMEFILEDSC', "If this option is enabled, module template .html files will be updated automatically if there are newer files under the themes/your theme/templates directory for the current theme. This should be turned off once the site goes public."); define('_MD_AM_THEMEOK', "Selectable themes"); -define('_MD_AM_THEMEOKDSC', "Choose themes that users can select as the default theme"); +define('_MD_AM_THEMEOKDSC', "Choose themes that users can select as their default theme"); define('_MD_AM_THEMESET', "Theme Set"); define('_MD_AM_USEGZIP', "Use gzip compression?"); define('_MD_AM_USEMYSESS', "Use custom session"); define('_MD_AM_USEMYSESSDSC', "Select yes to customise session related values."); +define('_MD_AM_USERSETTINGS', "User Settings"); define('_MD_AM_USESSL', "Use SSL for login?"); define('_MD_AM_YES', "Yes"); From minahito @ users.sourceforge.jp Thu Aug 24 18:05:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 18:05:25 +0900 Subject: [xoops-cvslog 4327] CVS update: xoops2jp/html/settings Message-ID: <20060824090525.D55A42AC0E6@users.sourceforge.jp> Index: xoops2jp/html/settings/site_default.ini.php diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.15 xoops2jp/html/settings/site_default.ini.php:1.1.2.16 --- xoops2jp/html/settings/site_default.ini.php:1.1.2.15 Fri Jul 28 14:20:32 2006 +++ xoops2jp/html/settings/site_default.ini.php Thu Aug 24 18:05:25 2006 @@ -19,6 +19,7 @@ [Legacy] AutoPreload=1 Theme=admin +AllowDBProxy=true # # # Primary Preloads # From minahito @ users.sourceforge.jp Thu Aug 24 18:05:31 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 18:05:31 +0900 Subject: [xoops-cvslog 4328] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060824090531.348E72AC1BD@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.71 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.72 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.71 Mon Aug 21 19:01:35 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Aug 24 18:05:31 2006 @@ -1,7 +1,7 @@ mRoot->getSiteConfig('Legacy', 'AllowDBProxy') == true) { + if ($_SERVER['REQUEST_METHOD'] != 'POST' || !xoops_refcheck(XOOPS_DB_CHKREF)) { + define('XOOPS_DB_PROXY', 1); + } } $this->mDB =& XoopsDatabaseFactory::getDatabaseConnection(); From minahito @ users.sourceforge.jp Thu Aug 24 18:49:18 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 18:49:18 +0900 Subject: [xoops-cvslog 4329] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060824094918.5AE842AC0E6@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.72 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.73 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.72 Thu Aug 24 18:05:31 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Aug 24 18:49:18 2006 @@ -1,7 +1,7 @@ mRoot->mLanguageManager->setLanguage($language); $this->mRoot->mLanguageManager->prepare(); - $this->mRoot->mLanguageManager->loadGlobalMessageCatalog(); - // If you use special page, load message catalog for it. if (isset($xoopsOption['pagetype'])) { $this->mRoot->mLanguageManager->loadPageTypeMessageCatalog($xoopsOption['pagetype']); From minahito @ users.sourceforge.jp Thu Aug 24 18:49:29 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 18:49:29 +0900 Subject: [xoops-cvslog 4330] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060824094929.290692AC0E6@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.7 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.8 --- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.7 Tue Aug 22 11:30:27 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php Thu Aug 24 18:49:29 2006 @@ -1,7 +1,7 @@ _setupDatabase(); + $this->loadGlobalMessageCatalog(); + + $this->_setupMbstring(); + } + + /** + * Load the additional file to control DB. + */ + function _setupDatabase() + { $filename = XOOPS_MODULE_PATH . '/base/language/' . $this->mLanguageName . '/charset_' . XOOPS_DB_TYPE . '.php'; if (file_exists($filename)) { require_once($filename); } } + + function _setupMbstring() + { + if (function_exists("mb_language")) { + if (@mb_language($this->mLanguageName) != false && @mb_internal_encoding(_CHARSET) != false) { + define('MBSTRING', true); + } + else { + mb_language("neutral"); + mb_internal_encoding("ISO-8859-1"); + if (!defined('MBSTRING')) { + define('MBSTRING', false); + } + } + + @mb_internal_encoding(_CHARSET); + + ini_set( 'mbstring.http_input', 'pass'); + ini_set( 'mbstring.http_output', 'pass'); + ini_set( 'mbstring.func_overload', 0); + ini_set( 'mbstring.substitute_character', 'none'); + } + if (!defined( "MBSTRING")) { + define( "MBSTRING", FALSE); + } + } function loadGlobalMessageCatalog() { From minahito @ users.sourceforge.jp Thu Aug 24 18:52:43 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 18:52:43 +0900 Subject: [xoops-cvslog 4331] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060824095243.477A32AC0E6@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.8 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.9 --- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.8 Thu Aug 24 18:49:29 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php Thu Aug 24 18:52:43 2006 @@ -1,7 +1,7 @@ Index: xoops2jp/html/modules/base/language/japanese/global.php diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.8 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.9 --- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.8 Tue Aug 22 00:13:06 2006 +++ xoops2jp/html/modules/base/language/japanese/global.php Thu Aug 24 19:34:37 2006 @@ -110,6 +110,7 @@ define('_DESCENDING','降順'); define('_BACK', '戻る'); define('_NOTITLE', '無題'); +define('_RETURN_TOP', 'Topへ戻る'); /* Image manager */ define('_IMGMANAGER','イメージ・マネジャー'); From tom_g3x @ users.sourceforge.jp Thu Aug 24 19:34:38 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 24 Aug 2006 19:34:38 +0900 Subject: [xoops-cvslog 4333] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060824103438.2CD5D2AC1FA@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.9 xoops2jp/html/modules/base/language/english/global.php:1.1.2.10 --- xoops2jp/html/modules/base/language/english/global.php:1.1.2.9 Tue Aug 22 00:13:14 2006 +++ xoops2jp/html/modules/base/language/english/global.php Thu Aug 24 19:34:38 2006 @@ -1,5 +1,5 @@ Index: xoops2jp/html/modules/base/admin/theme/stylesheets/style.css diff -u xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.9 xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.10 --- xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.9 Mon Aug 14 21:46:45 2006 +++ xoops2jp/html/modules/base/admin/theme/stylesheets/style.css Thu Aug 24 19:34:38 2006 @@ -201,6 +201,11 @@ padding: 6px 4px; text-align: center; } +.return_top { + text-align:right; + margin:10px 30px; +} + .odd { background: #e6e6e6; padding: 5px 2px; From tom_g3x @ users.sourceforge.jp Thu Aug 24 19:34:38 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Thu, 24 Aug 2006 19:34:38 +0900 Subject: [xoops-cvslog 4335] CVS update: xoops2jp/html/modules/base/admin/theme Message-ID: <20060824103438.7A34B2AC1FD@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.8 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.9 --- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.8 Mon Aug 21 19:20:13 2006 +++ xoops2jp/html/modules/base/admin/theme/admin_theme.html Thu Aug 24 19:34:38 2006 @@ -73,7 +73,9 @@ <{/foreach}> <{/if}>--> -
    <{$xoops_contents}>
    From minahito @ users.sourceforge.jp Thu Aug 24 19:59:00 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 19:59:00 +0900 Subject: [xoops-cvslog 4336] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060824105900.510362AC01B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/modinfo.php diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.17 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.18 --- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.17 Fri Aug 18 20:28:34 2006 +++ xoops2jp/html/modules/base/language/english/modinfo.php Thu Aug 24 19:59:00 2006 @@ -6,9 +6,9 @@ define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu"); define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options"); define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options"); -define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search form block"); +define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search block"); define('_MI_BASE_BLOCK_SEARCH_NAME', "Search"); -define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic info about the site and a link to Recommend Us pop up window"); +define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic site information and a link to a 'Recommend Us' pop up window"); define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info"); define('_MI_BASE_BLOCK_THEMES_DESC', "Shows theme selection box"); define('_MI_BASE_BLOCK_THEMES_NAME', "Themes"); @@ -16,25 +16,26 @@ define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu"); define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval"); define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents"); +define('_MI_BASE_BLOCK_WAITING_NAME', "Pending Contents"); define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new"); define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList"); define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload"); define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new"); define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall"); define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list"); -define('_MI_BASE_MENU_ACTIONSEARCH', "Action search"); -define('_MI_BASE_MENU_BLOCKINSTALL', "Install block"); -define('_MI_BASE_MENU_BLOCKLIST', "Block management"); -define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment manage"); -define('_MI_BASE_MENU_CREATE_SMILES', "Create smiles"); -define('_MI_BASE_MENU_IMAGE_MANAGE', "Image Manage"); -define('_MI_BASE_MENU_MODULEINSTALL', "Install module"); -define('_MI_BASE_MENU_MODULELIST', "Module management"); -define('_MI_BASE_MENU_PREFERENCE', "Preference"); -define('_MI_BASE_MENU_SMILES_MANAGE', "Smiles management"); -define('_MI_BASE_MENU_THEME_MANAGE', "Theme manage"); -define('_MI_BASE_NAME', "Legacy system"); -define('_MI_BASE_NAME_DESC', "This module provides compatibility of XOOPS Cube with XOOPS 2.0.x."); +define('_MI_BASE_MENU_ACTIONSEARCH', "Action Search"); +define('_MI_BASE_MENU_BLOCKINSTALL', "Block Installation"); +define('_MI_BASE_MENU_BLOCKLIST', "Block Management"); +define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment Management"); +define('_MI_BASE_MENU_CREATE_SMILES', "Create Smilies"); +define('_MI_BASE_MENU_IMAGE_MANAGE', "Image Management"); +define('_MI_BASE_MENU_MODULEINSTALL', "Module Installation"); +define('_MI_BASE_MENU_MODULELIST', "Module Management"); +define('_MI_BASE_MENU_PREFERENCE', "Preferences"); +define('_MI_BASE_MENU_SMILES_MANAGE', "Smilies Management"); +define('_MI_BASE_MENU_THEME_MANAGE', "Theme Management"); +define('_MI_BASE_NAME', "Legacy System"); +define('_MI_BASE_NAME_DESC', "This module provides compatibility between XOOPS Cube and XOOPS 2.0.x."); -?> +?> \ No newline at end of file Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.23 xoops2jp/html/modules/base/language/english/main.php:1.1.2.24 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.23 Mon Aug 21 12:46:17 2006 +++ xoops2jp/html/modules/base/language/english/main.php Thu Aug 24 19:59:00 2006 @@ -1,23 +1,23 @@ + +?> \ No newline at end of file From minahito @ users.sourceforge.jp Thu Aug 24 20:16:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 20:16:09 +0900 Subject: [xoops-cvslog 4337] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060824111609.260872AC01B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/modinfo.php diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.18 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.19 --- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.18 Thu Aug 24 19:59:00 2006 +++ xoops2jp/html/modules/base/language/english/modinfo.php Thu Aug 24 20:16:09 2006 @@ -15,7 +15,6 @@ define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block"); define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu"); define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval"); -define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents"); define('_MI_BASE_BLOCK_WAITING_NAME', "Pending Contents"); define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new"); define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList"); From minahito @ users.sourceforge.jp Thu Aug 24 20:22:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 20:22:35 +0900 Subject: [xoops-cvslog 4338] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060824112235.BE6F62AC01B@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.19 xoops2jp/html/modules/user/language/english/main.php:1.1.2.20 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.19 Sat Aug 19 20:55:11 2006 +++ xoops2jp/html/modules/user/language/english/main.php Thu Aug 24 20:22:35 2006 @@ -16,6 +16,7 @@ define('_MD_USER_ERROR_UNEEDAGREE', "Sorry, you have to agree to our disclaimer to get registered."); define('_MD_USER_ERROR_YOURREGMAILNG', "You are now registered. However, we were unable to send the activation mail to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation."); define('_MD_USER_LANG_ALLABOUT', "All about %s"); +define('_MD_USER_LANG_ASSIGN', "Assign"); define('_MD_USER_LANG_ATTACHSIG', "Always attach my signature"); define('_MD_USER_LANG_AVATAR', "Avatar"); define('_MD_USER_LANG_AVATAR_EDIT', "Edit avatar"); @@ -26,6 +27,7 @@ define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "avatar width hight"); define('_MD_USER_LANG_BIO', "Extra Info"); define('_MD_USER_LANG_DELACCOUNT', "Delete Account"); +define('_MD_USER_LANG_DELETE', "Delete"); define('_MD_USER_LANG_DISCLAIMER', "Disclaimer"); define('_MD_USER_LANG_EDITPROFILE', "Edit Profile"); define('_MD_USER_LANG_EMAIL', "Email address"); @@ -57,6 +59,7 @@ define('_MD_USER_LANG_PROFILE', "Profile"); define('_MD_USER_LANG_RANK', "Rank"); define('_MD_USER_LANG_RANK_ID', "ID"); +define('_MD_USER_LANG_REGISTER', "Register"); define('_MD_USER_LANG_REGISTERNG', "Could not register new user."); define('_MD_USER_LANG_REMOVEINFO', "This will remove all your information from our database."); define('_MD_USER_LANG_SAVECHANGES', "Save Changes"); @@ -72,9 +75,9 @@ define('_MD_USER_LANG_UID', "UID"); define('_MD_USER_LANG_UMODE', "Comments Display Mode"); define('_MD_USER_LANG_UNAME', "User name"); +define('_MD_USER_LANG_UNASSIGN', "Unassign"); define('_MD_USER_LANG_UORDER', "Comments Sort Order"); define('_MD_USER_LANG_URL', "Website"); -define('_MD_USER_LANG_USERCOOKIE', "Store my user name in a cookie for 1 year"); define('_MD_USER_LANG_USER_AIM', "AIM"); define('_MD_USER_LANG_USER_AVATAR', "Avatar"); define('_MD_USER_LANG_USER_FROM', "Location"); @@ -87,6 +90,7 @@ define('_MD_USER_LANG_USER_SIG', "Signature"); define('_MD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address"); define('_MD_USER_LANG_USER_YIM', "YIM"); +define('_MD_USER_LANG_USERCOOKIE', "Store my user name in a cookie for 1 year"); define('_MD_USER_LANG_USERKEYFOR', "User activation key for %s"); define('_MD_USER_LANG_USERREG', "User Registration"); define('_MD_USER_LANG_VERIFYPASS', "Verify Password"); From minahito @ users.sourceforge.jp Thu Aug 24 20:22:35 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 20:22:35 +0900 Subject: [xoops-cvslog 4339] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060824112235.E2A272AC097@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.20 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.21 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.20 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Thu Aug 24 20:22:35 2006 @@ -59,7 +59,7 @@ - + @@ -91,7 +91,7 @@ <{/foreach}>
    <{$smarty.const._REGISTER}><{$smarty.const._MD_USER_LANG_ASSIGN}>   <{$smarty.const._MD_USER_LANG_UID}> <{$smarty.const._MD_USER_LANG_UNAME}>
    - +
    @@ -110,7 +110,7 @@ - + @@ -142,7 +142,7 @@ <{/foreach}>
    <{$smarty.const._DELETE}><{$smarty.const._MD_USER_LANG_UNASSIGN}>   <{$smarty.const._MD_USER_LANG_UID}> <{$smarty.const._MD_USER_LANG_UNAME}>
    - +
    From minahito @ users.sourceforge.jp Thu Aug 24 20:22:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Thu, 24 Aug 2006 20:22:36 +0900 Subject: [xoops-cvslog 4340] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060824112236.1088A2AC0A6@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.21 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.22 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.21 Sat Aug 19 20:55:11 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Thu Aug 24 20:22:35 2006 @@ -16,6 +16,7 @@ define('_MD_USER_ERROR_UNEEDAGREE', "申し訳ございませんが、登録するためには免責事項にご同意いただく必要があります。"); define('_MD_USER_ERROR_YOURREGMAILNG', "登録が完了しました。しかし、サーバ内部エラーにより承認キーが記載されたメールを送信することができませんでした。大変申し訳ありませんが、サイト管理者までお問い合わせください。"); define('_MD_USER_LANG_ALLABOUT', "%sさんの基本情報"); +define('_MD_USER_LANG_ASSIGN', "割り当て"); define('_MD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する"); define('_MD_USER_LANG_AVATAR', "アバター"); define('_MD_USER_LANG_AVATAR_EDIT', "アバター編集"); @@ -26,6 +27,7 @@ define('_MD_USER_LANG_AVATAR_WIDTH_HIGHT', "幅 x 高さ"); define('_MD_USER_LANG_BIO', "その他"); define('_MD_USER_LANG_DELACCOUNT', "アカウントを削除する"); +define('_MD_USER_LANG_DELETE', "削除"); define('_MD_USER_LANG_DISCLAIMER', "免責"); define('_MD_USER_LANG_EDITPROFILE', "プロフィールの編集"); define('_MD_USER_LANG_EMAIL', "メールアドレス"); @@ -57,6 +59,7 @@ define('_MD_USER_LANG_PROFILE', "プロフィール"); define('_MD_USER_LANG_RANK', "ランク"); define('_MD_USER_LANG_RANK_ID', "ID"); +define('_MD_USER_LANG_REGISTER', "登録"); define('_MD_USER_LANG_REGISTERNG', "登録できませんでした"); define('_MD_USER_LANG_REMOVEINFO', "アカウントを削除した場合、全てのユーザ情報が失われます。"); define('_MD_USER_LANG_SAVECHANGES', "変更を保存"); @@ -72,9 +75,9 @@ define('_MD_USER_LANG_UID', "UID"); define('_MD_USER_LANG_UMODE', "コメント表示モード"); define('_MD_USER_LANG_UNAME', "ユーザー名"); +define('_MD_USER_LANG_UNASSIGN', "割り当て解除"); define('_MD_USER_LANG_UORDER', "コメントの並び順"); define('_MD_USER_LANG_URL', "ホームページ"); -define('_MD_USER_LANG_USERCOOKIE', "ユーザ名を1年間クッキーに保存する"); define('_MD_USER_LANG_USER_AIM', "AIM"); define('_MD_USER_LANG_USER_AVATAR', "アバター"); define('_MD_USER_LANG_USER_FROM', "居住地"); @@ -87,6 +90,7 @@ define('_MD_USER_LANG_USER_SIG', "署名"); define('_MD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する"); define('_MD_USER_LANG_USER_YIM', "YIM"); +define('_MD_USER_LANG_USERCOOKIE', "ユーザ名を1年間クッキーに保存する"); define('_MD_USER_LANG_USERKEYFOR', "%sさんの承認キーです"); define('_MD_USER_LANG_USERREG', "ユーザ登録"); define('_MD_USER_LANG_VERIFYPASS', "パスワード確認"); From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4341] CVS update: xoops2jp/html/modules/user/admin/templates/stylesheets Message-ID: <20060825082610.06D452AC052@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.5 xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.6 --- xoops2jp/html/modules/user/admin/templates/stylesheets/module.css:1.1.2.5 Sun Aug 20 22:38:31 2006 +++ xoops2jp/html/modules/user/admin/templates/stylesheets/module.css Fri Aug 25 17:26:09 2006 @@ -3,11 +3,6 @@ color:#ff0000; } -/* group */ -.user_groupBlock_inactive { - color:#999999; -} - /* for List Table */ .user_list_id { text-align:center; From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4342] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060825082610.2EFE02AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.10 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.9 Sat Aug 19 20:55:28 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Fri Aug 25 17:26:10 2006 @@ -27,9 +27,9 @@ <{foreach item=theme from=$themes}> <{if $currentThemeName == $theme->get('dirname')}> - base_theme_active"> + active"> <{else}> - base_theme_inactive"> + inactive"> <{/if}> <{if $theme->get('screenshot')}> Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.12 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.13 --- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.12 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Fri Aug 25 17:26:10 2006 @@ -30,9 +30,9 @@ <{foreach item=obj from=$objects}> <{if $obj->get('display') == 1 }> - + <{else}> - + <{/if}> <{$obj->getShow('id')}> <{$obj->getShow('code')}> Index: xoops2jp/html/modules/base/admin/templates/block_list.html diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.22 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.23 --- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.22 Sat Aug 19 18:39:44 2006 +++ xoops2jp/html/modules/base/admin/templates/block_list.html Fri Aug 25 17:26:10 2006 @@ -72,31 +72,31 @@ <{strip}> <{if $obj->get('side') == 0}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    <{else}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>
    <{/if}>
    -
    <{if $obj->get('side') == 3}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    <{else}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
    <{/if}> <{if $obj->get('side') == 5}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    <{else}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
    <{/if}> <{if $obj->get('side') == 4}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    <{else}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>
    <{/if}>
    -
    <{if $obj->get('side') == 1}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    <{else}> -
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    +
    <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
    <{/if}> <{/strip}> From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4343] CVS update: xoops2jp/html/modules/base/admin/templates/stylesheets Message-ID: <20060825082610.5B1542AC052@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.10 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.10 Wed Aug 23 23:32:05 2006 +++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css Fri Aug 25 17:26:10 2006 @@ -1,19 +1,3 @@ -/* theme list */ -tr.base_theme_active td { - background-color:#ffcccc; -} -tr.base_theme_inactive td { - -} - -/* smiles list */ -tr.base_smiles_active td { - background-color:#ffcccc; -} -tr.base_smiles_inactive td { - color:#666666; -} - /* Action Search */ .base_actionsearch_form { text-align:center; @@ -32,14 +16,8 @@ .base_blockside { width:125px; } -.base_blockside_active { - float:left; - background-color:#66ff66; - border:1px solid #333333; -} -.base_blockside_inactive { +.base_blocksideInput { float:left; - background-color:#ffffff; border:1px solid #333333; } .base_blockside_separator { From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4344] CVS update: xoops2jp/html/modules/base/admin/theme/stylesheets Message-ID: <20060825082610.7F7CA2AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/theme/stylesheets/style.css diff -u xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.10 xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.11 --- xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.10 Thu Aug 24 19:34:38 2006 +++ xoops2jp/html/modules/base/admin/theme/stylesheets/style.css Fri Aug 25 17:26:10 2006 @@ -280,3 +280,10 @@ } .help { } +.active { + background:#ccffcc; +} +.inactive { + color:#333333; +} + From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4345] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060825082610.A35C82AC052@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.26 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.27 --- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.26 Sun Aug 20 22:25:07 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html Fri Aug 25 17:26:10 2006 @@ -57,9 +57,9 @@ <{foreach item=obj from=$objects}> <{if $activeTemplateSet == $obj->get('tplset_name')}> - + <{else}> - + <{/if}> <{$obj->getShow('tplset_id')}> <{$obj->getShow('tplset_name')}> @@ -118,10 +118,18 @@ <{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}> <{foreach item=obj from=$recentObjects}> - <{if $obj->get('tpl_type') == "block"}> - + <{if $activeTemplateSet == $obj->getShow('tpl_tplset') }> + <{if $obj->get('tpl_type') == "block"}> + + <{else}> + + <{/if}> <{else}> - + <{if $obj->get('tpl_type') == "block"}> + + <{else}> + + <{/if}> <{/if}> <{$obj->getShow('tpl_id')}> <{$obj->getShow('tpl_module')}> From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4346] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060825082610.CBBEC2AC1C5@users.sourceforge.jp> Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.19 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.20 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.19 Sun Aug 20 22:38:31 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Fri Aug 25 17:26:10 2006 @@ -148,7 +148,7 @@ <{if $perm->mItem->isActive()}> <{$perm->mItem->getName()|escape}> <{else}> - <{$perm->mItem->getName()|escape}> + <{$perm->mItem->getName()|escape}> <{/if}> <{assign var="getId" value=$perm->getId() }> Index: xoops2jp/html/modules/user/admin/templates/group_perm.html diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.23 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.24 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.23 Sun Aug 20 22:38:31 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Fri Aug 25 17:26:10 2006 @@ -113,7 +113,7 @@ <{if $perm->mItem->isActive()}> <{$perm->mItem->getName()|escape}> <{else}> - <{$perm->mItem->getName()|escape}> + <{$perm->mItem->getName()|escape}> <{/if}> <{assign var="getId" value=$perm->getId() }> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.15 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.16 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.15 Sat Aug 19 14:55:45 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Fri Aug 25 17:26:10 2006 @@ -37,7 +37,11 @@ <{$smarty.const._AD_USER_LANG_CONTROL}> <{foreach item=obj from=$objects}> - + <{if $obj->getShow('avatar_display') == 1}> + + <{else}> + + <{/if}> <{$obj->getShow('avatar_id')}> <{$obj->getShow('avatar_name')}> <{$obj->getShow('avatar_name')}> From tom_g3x @ users.sourceforge.jp Fri Aug 25 17:26:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 17:26:10 +0900 Subject: [xoops-cvslog 4347] CVS update: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets Message-ID: <20060825082610.F17FE2AC052@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css diff -u xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.5 --- xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.4 Sun Aug 20 22:25:07 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css Fri Aug 25 17:26:10 2006 @@ -5,9 +5,6 @@ .legacyRender_TemplateSelect { text-align:center; } -.legacyRender_TemplateSet_active { - background-color:pink; -} .legacyRender_TemplateFile_block { color:#0000ff; } From minahito @ users.sourceforge.jp Fri Aug 25 19:13:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:13:25 +0900 Subject: [xoops-cvslog 4346] CVS update: xoops2jp/html/include Message-ID: <20060825101325.AB4362AC00E@users.sourceforge.jp> Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.4.8.7 xoops2jp/html/include/version.php:1.4.8.8 --- xoops2jp/html/include/version.php:1.4.8.7 Fri Aug 18 18:11:54 2006 +++ xoops2jp/html/include/version.php Fri Aug 25 19:13:25 2006 @@ -1,5 +1,5 @@ \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 25 19:13:39 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:13:39 +0900 Subject: [xoops-cvslog 4347] CVS update: xoops2jp/html/install/include Message-ID: <20060825101339.50AD32AC00E@users.sourceforge.jp> Index: xoops2jp/html/install/include/makedata.php diff -u xoops2jp/html/install/include/makedata.php:1.1.2.3 xoops2jp/html/install/include/makedata.php:1.1.2.4 --- xoops2jp/html/install/include/makedata.php:1.1.2.3 Tue May 16 21:59:36 2006 +++ xoops2jp/html/install/include/makedata.php Fri Aug 25 19:13:39 2006 @@ -1,5 +1,5 @@ insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', 'cube_default', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)"); $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes(_INSTALL_ANON)."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)"); $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '0', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)"); - $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', 'xoops_user', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)"); $dbm->insert('config', " VALUES (11, 0, 1, 'session_expire', '_MD_AM_SESSEXPIRE', '15', '_MD_AM_SESSEXPIREDSC', 'textbox', 'int', 22)"); - $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '0', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)"); $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '1', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)"); $dbm->insert('config', " VALUES (14, 0, 1, 'my_ip', '_MD_AM_MYIP', '127.0.0.1', '_MD_AM_MYIPDSC', 'textbox', 'text', 29)"); $dbm->insert('config', " VALUES (15, 0, 1, 'use_ssl', '_MD_AM_USESSL', '0', '_MD_AM_USESSLDSC', 'yesno', 'int', 30)"); $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)"); - $dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '5', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)"); - $dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '3', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)"); - $dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '1', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)"); - $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)"); - $dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)"); - $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)"); - $dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '0', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)"); - $dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '0', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)"); - $dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '80', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)"); - $dbm->insert('config', " VALUES (28, 0, 2, 'avatar_height', '_MD_AM_AVATARH', '80', '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)"); - $dbm->insert('config', " VALUES (29, 0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', '35000', '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)"); - $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '".addslashes($adminmail)."', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)"); - $dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '0', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)"); $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', 'nest', '_MD_AM_COMMODEDSC', 'select', 'text', 34)"); $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '0', '_MD_AM_COMORDERDSC', 'select', 'int', 36)"); - $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)"); - $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoopscube.org$', 'xoopscube.jp$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)"); $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)"); $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)"); - $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', '', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)"); - $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS Cube 2.1 Alpha 1 © 2001-2006 The XOOPS Cube Project', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)"); $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)"); - $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'select', 'text', 2)"); $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (45, 0, 5, 'keyword_min', '_MD_AM_MINSEARCH', '5', '_MD_AM_MINSEARCHDSC', 'textbox', 'int', 1)"); $dbm->insert('config', " VALUES (46, 0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', '0', '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15)"); $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)"); - $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)"); - $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', '', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)"); - $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', '', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)"); - $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', '', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)"); - $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)"); $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '0', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)"); - $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)"); - $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '".addslashes(_INSTALL_DISCLMR)."', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)"); - $dbm->insert('config', " VALUES (56, 0, 2, 'allow_register', '_MD_AM_ALLOWREG', 1, '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (57, 0, 1, 'theme_fromfile', '_MD_AM_THEMEFILE', '0', '_MD_AM_THEMEFILEDSC', 'yesno', 'int', 13)"); $dbm->insert('config', " VALUES (58, 0, 1, 'closesite', '_MD_AM_CLOSESITE', '0', '_MD_AM_CLOSESITEDSC', 'yesno', 'int', 26)"); $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '".addslashes(serialize(array('1')))."', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)"); From minahito @ users.sourceforge.jp Fri Aug 25 19:13:56 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:13:56 +0900 Subject: [xoops-cvslog 4348] CVS update: xoops2jp/html/install/sql Message-ID: <20060825101356.19CAF2AC00E@users.sourceforge.jp> Index: xoops2jp/html/install/sql/mysql.data.sql diff -u xoops2jp/html/install/sql/mysql.data.sql:1.1 xoops2jp/html/install/sql/mysql.data.sql:1.1.8.1 --- xoops2jp/html/install/sql/mysql.data.sql:1.1 Thu Sep 9 14:15:04 2004 +++ xoops2jp/html/install/sql/mysql.data.sql Fri Aug 25 19:13:55 2006 @@ -30,8 +30,6 @@ # INSERT INTO configcategory VALUES (1, '_MD_AM_GENERAL', 0); -INSERT INTO configcategory VALUES (2, '_MD_AM_USERSETTINGS', 0); -INSERT INTO configcategory VALUES (3, '_MD_AM_METAFOOTER', 0); INSERT INTO configcategory VALUES (4, '_MD_AM_CENSOR', 0); INSERT INTO configcategory VALUES (5, '_MD_AM_SEARCH', 0); INSERT INTO configcategory VALUES (6, '_MD_AM_MAILER', 0); @@ -47,21 +45,11 @@ INSERT INTO configoption VALUES (5, '_THREADED', 'thread', 32); INSERT INTO configoption VALUES (6, '_OLDESTFIRST', '0', 33); INSERT INTO configoption VALUES (7, '_NEWESTFIRST', '1', 33); -INSERT INTO configoption VALUES (8, '_MD_AM_USERACTV', '0', 21); -INSERT INTO configoption VALUES (9, '_MD_AM_AUTOACTV', '1', 21); -INSERT INTO configoption VALUES (10, '_MD_AM_ADMINACTV', '2', 21); -INSERT INTO configoption VALUES (11, '_MD_AM_STRICT', '0', 23); -INSERT INTO configoption VALUES (12, '_MD_AM_MEDIUM', '1', 23); -INSERT INTO configoption VALUES (13, '_MD_AM_LIGHT', '2', 23); INSERT INTO configoption VALUES (14, '_MD_AM_DEBUGMODE3', '3', 13); INSERT INTO configoption VALUES (15, '_MD_AM_INDEXFOLLOW', 'index,follow', 43); INSERT INTO configoption VALUES (16, '_MD_AM_NOINDEXFOLLOW', 'noindex,follow', 43); INSERT INTO configoption VALUES (17, '_MD_AM_INDEXNOFOLLOW', 'index,nofollow', 43); INSERT INTO configoption VALUES (18, '_MD_AM_NOINDEXNOFOLLOW', 'noindex,nofollow', 43); -INSERT INTO configoption VALUES (19, '_MD_AM_METAOGEN', 'general', 48); -INSERT INTO configoption VALUES (20, '_MD_AM_METAO14YRS', '14 years', 48); -INSERT INTO configoption VALUES (21, '_MD_AM_METAOREST', 'restricted', 48); -INSERT INTO configoption VALUES (22, '_MD_AM_METAOMAT', 'mature', 48); INSERT INTO configoption VALUES (23, '_MD_AM_DEBUGMODE0', '0', 13); INSERT INTO configoption VALUES (24,'PHP mail()','mail',64); From minahito @ users.sourceforge.jp Fri Aug 25 19:14:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:14:08 +0900 Subject: [xoops-cvslog 4349] CVS update: xoops2jp/html/install/wizards Message-ID: <20060825101408.902ED2AC00E@users.sourceforge.jp> Index: xoops2jp/html/install/wizards/install_updateConfig_go.inc.php diff -u xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.2 --- xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.1 Sat Apr 1 10:33:00 2006 +++ xoops2jp/html/install/wizards/install_updateConfig_go.inc.php Fri Aug 25 19:14:08 2006 @@ -55,51 +55,21 @@ $dbm->insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', 'default', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)"); $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes($xoopsConfig['anonymous'])."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)"); $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '".intval($xoopsConfig['gzip_compression'])."', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)"); - $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', '".addslashes($xoopsConfig['usercookie'])."', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)"); $dbm->insert('config', " VALUES (11, 0, 1, 'session_expire', '_MD_AM_SESSEXPIRE', '15', '_MD_AM_SESSEXPIREDSC', 'textbox', 'int', 22)"); - $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '".intval($xoopsConfig['banners'])."', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)"); $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '1', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)"); $dbm->insert('config', " VALUES (14, 0, 1, 'my_ip', '_MD_AM_MYIP', '".addslashes($xoopsConfig['my_ip'])."', '_MD_AM_MYIPDSC', 'textbox', 'text', 29)"); $dbm->insert('config', " VALUES (15, 0, 1, 'use_ssl', '_MD_AM_USESSL', '0', '_MD_AM_USESSLDSC', 'yesno', 'int', 30)"); $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)"); - $dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '".intval($xoopsConfig['minpass'])."', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)"); - $dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '5', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)"); - $dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '".intval($xoopsConfig['new_user_notify'])."', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)"); - $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".intval($xoopsConfig['new_user_notify_group']).", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)"); - $dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)"); - $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".XOOPS_GROUP_ADMIN.", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)"); - $dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '".intval($xoopsConfig['uname_test_level'])."', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)"); - $dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '".intval($xoopsConfig['avatar_allow_upload'])."', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)"); - $dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '".intval($xoopsConfig['avatar_width'])."', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)"); - $dbm->insert('config', " VALUES (28, 0, 2, 'avatar_height', '_MD_AM_AVATARH', '".intval($xoopsConfig['avatar_height'])."', '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)"); - $dbm->insert('config', " VALUES (29, 0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', '".intval($xoopsConfig['avatar_maxsize'])."', '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)"); - $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '".addslashes($xoopsConfig['adminmail'])."', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)"); - $dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '".intval($xoopsConfig['self_delete'])."', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)"); $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', '".addslashes($xoopsConfig['com_mode'])."', '_MD_AM_COMMODEDSC', 'select', 'text', 34)"); $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '".intval($xoopsConfig['com_order'])."', '_MD_AM_COMORDERDSC', 'select', 'int', 36)"); - $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)"); - $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)"); - $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)"); $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)"); - $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)"); - $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 © 2001-2003 The XOOPS Project', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)"); $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)"); - $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'select', 'text', 2)"); $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (45, 0, 5, 'keyword_min', '_MD_AM_MINSEARCH', '5', '_MD_AM_MINSEARCHDSC', 'textbox', 'int', 1)"); - $dbm->insert('config', " VALUES (46, 0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', '0', '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15)"); $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)"); - $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)"); - $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)"); - $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright © 2001-2003', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)"); - $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)"); - $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)"); $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '0', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)"); - $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)"); - $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '".addslashes(_INSTALL_DISCLMR)."', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)"); - $dbm->insert('config', " VALUES (56, 0, 2, 'allow_register', '_MD_AM_ALLOWREG', 1, '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (57, 0, 1, 'theme_fromfile', '_MD_AM_THEMEFILE', '0', '_MD_AM_THEMEFILEDSC', 'yesno', 'int', 13)"); $dbm->insert('config', " VALUES (58, 0, 1, 'closesite', '_MD_AM_CLOSESITE', '0', '_MD_AM_CLOSESITEDSC', 'yesno', 'int', 26)"); $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '".addslashes(serialize(array('1')))."', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)"); From minahito @ users.sourceforge.jp Fri Aug 25 19:14:21 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:14:21 +0900 Subject: [xoops-cvslog 4350] CVS update: xoops2jp/html/modules/base/admin/.xml Message-ID: <20060825101421.0A9B72AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml diff -u xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:1.1.2.3 --- xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:1.1.2.2 Fri Aug 18 20:30:00 2006 +++ xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml Fri Aug 25 19:14:20 2006 @@ -47,7 +47,7 @@ - + From minahito @ users.sourceforge.jp Fri Aug 25 19:14:28 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:14:28 +0900 Subject: [xoops-cvslog 4351] CVS update: xoops2jp/html/modules/base/admin/forms Message-ID: <20060825101428.BCE8C2AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminEditForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminEditForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminEditForm.class.php:1.1.2.4 --- xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminEditForm.class.php:1.1.2.3 Fri Aug 18 20:30:01 2006 +++ xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminEditForm.class.php Fri Aug 25 19:14:28 2006 @@ -1,7 +1,7 @@ mFieldProperties['readgroups'] =& new XCube_FieldProperty($this); $this->mFieldProperties['readgroups']->setDependsByArray(array('objectExist')); - $this->mFieldProperties['readgroups']->addMessage('objectExist', _AD_BASE_ERROR_IMGCAT_READ_GROUPS, _AD_BASE_LANG_IMGCAT_READ_GROUPS); + $this->mFieldProperties['readgroups']->addMessage('objectExist', _AD_BASE_ERROR_IMGCAT_READ_GROUPS); $this->mFieldProperties['readgroups']->addVar('handler', 'group'); $this->mFieldProperties['uploadgroups'] =& new XCube_FieldProperty($this); $this->mFieldProperties['uploadgroups']->setDependsByArray(array('objectExist')); - $this->mFieldProperties['uploadgroups']->addMessage('objectExist', _AD_BASE_ERROR_IMGCAT_READ_GROUPS, _AD_BASE_LANG_IMGCAT_READ_GROUPS); + $this->mFieldProperties['uploadgroups']->addMessage('objectExist', _AD_BASE_ERROR_IMGCAT_UPLOAD_GROUPS); $this->mFieldProperties['uploadgroups']->addVar('handler', 'group'); } Index: xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminNewForm.class.php diff -u xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminNewForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminNewForm.class.php:1.1.2.5 --- xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminNewForm.class.php:1.1.2.4 Fri Aug 18 20:30:01 2006 +++ xoops2jp/html/modules/base/admin/forms/ImagecategoryAdminNewForm.class.php Fri Aug 25 19:14:28 2006 @@ -1,7 +1,7 @@ mFieldProperties['imgcat_storetype'] =& new XCube_FieldProperty($this); $this->mFieldProperties['imgcat_storetype']->setDependsByArray(array('required','mask')); $this->mFieldProperties['imgcat_storetype']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMGCAT_STORETYPE); - $this->mFieldProperties['imgcat_storetype']->addMessage('mask', _AD_BASE_ERROR_MASK, _AD_BASE_LANG_IMGCAT_STORETYPE); + $this->mFieldProperties['imgcat_storetype']->addMessage('mask', _MD_BASE_ERROR_MASK, _AD_BASE_LANG_IMGCAT_STORETYPE); $this->mFieldProperties['imgcat_storetype']->addVar('mask', '(file|db)'); } From minahito @ users.sourceforge.jp Fri Aug 25 19:14:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:14:46 +0900 Subject: [xoops-cvslog 4352] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060825101446.C10CD2AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.11 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.12 --- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.11 Mon Aug 21 22:28:48 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Fri Aug 25 19:14:46 2006 @@ -166,6 +166,12 @@ $this->mSmarty->assign("currentModule", $moduleObject); // + // Other attributes + // + $this->mSmarty->assign('xoops_sitename', htmlspecialchars($this->mController->getConfig('sitename'), ENT_QUOTES)); + $this->mSmarty->assign('xoops_slogan', htmlspecialchars($this->mController->getConfig('slogan'), ENT_QUOTES)); + + // // Theme rendering // $blocks = array(); From minahito @ users.sourceforge.jp Fri Aug 25 19:15:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:15:09 +0900 Subject: [xoops-cvslog 4353] CVS update: xoops2jp/html/modules/base/kernel Message-ID: <20060825101509.8FB852AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.9 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.10 --- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.9 Thu Aug 24 18:52:43 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php Fri Aug 25 19:15:09 2006 @@ -1,7 +1,7 @@ \ No newline at end of file From minahito @ users.sourceforge.jp Fri Aug 25 19:15:32 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:15:32 +0900 Subject: [xoops-cvslog 4354] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060825101532.9C4242AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/admin.php diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.46 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.47 --- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.46 Thu Aug 24 16:34:49 2006 +++ xoops2jp/html/modules/base/language/english/admin.php Fri Aug 25 19:15:32 2006 @@ -21,7 +21,8 @@ define('_AD_BASE_ERROR_GROUPID', "You must grant access permission to one or more groups."); define('_AD_BASE_ERROR_IMG_FILESIZE', "The maximum size of an image file is {0} bytes."); define('_AD_BASE_ERROR_IMG_SIZE', "The maximum width and height of an image file is {0} x {1}."); -define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{1}' module has failed."); +define('_AD_BASE_ERROR_IMGCAT_READ_GROUPS', "You must grant read permission to one or more groups."); +define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{0}' module has failed."); define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong."); define('_AD_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value."); define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "The specified module cannot be found."); @@ -30,10 +31,10 @@ define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree to the following licence."); define('_AD_BASE_ERROR_READGROUPS', "You must grant read permission to one or more groups."); define('_AD_BASE_ERROR_SEARCH_REQUIRED', "Input keyword"); -define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}"); +define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {0}"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "Could not uninstall template '{0}'."); -define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Sorry, uninstallation of '{1}' module has failed."); -define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Sorry, updating '{1}' module has failed."); +define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Sorry, uninstallation of '{0}' module has failed."); +define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Sorry, updating '{0}' module has failed."); define('_AD_BASE_ERROR_UPLOADGROUPS', "You must grant upload permission to one or more groups."); define('_AD_BASE_LANG_ACTIONSEARCH', "Action Search"); define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "You can use ActionSearch to search for a menu item or a help file by typing in a keyword."); @@ -226,11 +227,11 @@ define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database."); define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}."); define('_AD_BASE_MESSAGE_INSERT_CONFIG', "Config {0} added."); -define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful."); -define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{1}' has been installed."); -define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{1}' module has been successful."); +define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{0}' module has been successful."); +define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{0}' has been installed."); +define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{0}' module has been successful."); define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started."); -define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{1}' module has been successful."); +define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{0}' module has been successful."); define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site just the way you want it!
    If you want to have a block with free content that is not part of a module, simply create a custom block and write your message in it."); define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall a block, the configuration of the block isn't deleted. The block is simply removed from view. Therefore you can re-install the block easily because the installer remembers the last configuration."); define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is simply removed from view. You can re-install or delete it from the database from the 'install block' page."); From minahito @ users.sourceforge.jp Fri Aug 25 19:15:50 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:15:50 +0900 Subject: [xoops-cvslog 4355] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060825101550.8C9992AC235@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.7 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.8 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.7 Sat Aug 19 23:09:37 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Fri Aug 25 19:15:50 2006 @@ -44,7 +44,6 @@
  • Name of this module would be changed to 'Legacy module' form 'Base module'.
  • Some modules which depend on minor global variables of XOOPS2, can not be installed in XOOPS Cube Legacy 2.1.
  • 'SSL Login' and 'Avatar list' isn't available in misc.php. Avatar list has been ported to the user module.
  • -
  • Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)
  • IIS may not install modules which have SQL file. If you meet such troubles, please report to us. From minahito @ users.sourceforge.jp Fri Aug 25 19:16:02 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:16:02 +0900 Subject: [xoops-cvslog 4356] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060825101602.CA1BB2AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.51 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.52 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.51 Tue Aug 22 00:13:06 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Fri Aug 25 19:16:02 2006 @@ -21,6 +21,7 @@ define('_AD_BASE_ERROR_GROUPID', "最低1グループ以上にアクセス権限を与えてください"); define('_AD_BASE_ERROR_IMG_FILESIZE', "画像の最大ファイルサイズは{0}バイトです"); define('_AD_BASE_ERROR_IMG_SIZE', "画像の最大サイズは {0} x {1} です"); +define('_AD_BASE_ERROR_IMGCAT_READ_GROUPS', "最低1グループ以上にアクセス権限を与えてください"); define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "{0} モジュールのインストールに失敗しました"); define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です"); define('_AD_BASE_ERROR_MIN', "{0}は{1}以上の数値を指定して下さい"); From minahito @ users.sourceforge.jp Fri Aug 25 19:16:09 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:16:09 +0900 Subject: [xoops-cvslog 4357] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060825101609.951DA2AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.7 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.8 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.7 Sat Aug 19 23:09:37 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Fri Aug 25 19:16:09 2006 @@ -42,7 +42,6 @@
  • 「base module」の名称(ディレクトリ名を含む)は、正式版までに「Legacy module」に変更の予定です。
  • 幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。
  • misc.phpに依存した機能の「SSLログイン」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。
  • -
  • 旧バージョンからのアップグレードスクリプトは、本バージョンには含まれません。アップグレードスクリプトは、β版から提供される予定です。
  • IISを利用した環境の場合、.sqlファイルを持つモジュールのインストールが上手く行かないケースがあります。IISを利用されている方からの動作状況の報告をお待ちしております。
  • From minahito @ users.sourceforge.jp Fri Aug 25 19:16:25 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:16:25 +0900 Subject: [xoops-cvslog 4358] CVS update: xoops2jp/html/modules/base/lib/nusoap Message-ID: <20060825101625.60C2A2AC234@users.sourceforge.jp> Index: xoops2jp/html/modules/base/lib/nusoap/nusoap.php diff -u xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.2 xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.3 --- xoops2jp/html/modules/base/lib/nusoap/nusoap.php:1.1.2.2 Tue Aug 1 17:37:01 2006 +++ xoops2jp/html/modules/base/lib/nusoap/nusoap.php Fri Aug 25 19:16:25 2006 @@ -1,7 +1,7 @@ -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class nusoap_base { @@ -83,7 +83,7 @@ * @var string * @access private */ - var $revision = '$Revision: 1.1.2.2 $'; + var $revision = '$Revision: 1.1.2.3 $'; /** * Current error string (manipulated by getError/setError) * @@ -910,7 +910,7 @@ * Mainly used for returning faults from deployed functions * in a server instance. * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soap_fault extends nusoap_base { @@ -996,7 +996,7 @@ * tutorials I refer to :) * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class XMLSchema extends nusoap_base { @@ -1899,7 +1899,7 @@ * xsd:anyType and user-defined types. * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soapval extends nusoap_base { @@ -2000,7 +2000,7 @@ * NOTE: PHP must be compiled with the CURL extension for HTTPS support * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soap_transport_http extends nusoap_base { @@ -3038,7 +3038,7 @@ * NOTE: WSDL functionality is experimental * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soap_server extends nusoap_base { @@ -4003,7 +4003,7 @@ $SERVER_NAME = $_SERVER['SERVER_NAME']; $SERVER_PORT = $_SERVER['SERVER_PORT']; $SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']; - $HTTPS = $_SERVER['HTTPS']; + $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : false; } elseif (isset($HTTP_SERVER_VARS)) { $SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME']; $SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT']; @@ -4069,7 +4069,7 @@ * parses a WSDL file, allows access to it's data, other utility methods * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class wsdl extends nusoap_base { @@ -5794,7 +5794,7 @@ * soap_parser class parses SOAP XML messages into native PHP values * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soap_parser extends nusoap_base { @@ -6401,7 +6401,7 @@ * unset($soapclient); * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.1.2.2 2006/08/01 08:37:01 nobunobu Exp $ +* @version $Id: nusoap.php,v 1.1.2.3 2006/08/25 10:16:25 minahito Exp $ * @access public */ class soap_client extends nusoap_base { From minahito @ users.sourceforge.jp Fri Aug 25 19:16:37 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:16:37 +0900 Subject: [xoops-cvslog 4359] CVS update: xoops2jp/html/modules/base/preload/Primary Message-ID: <20060825101637.68D602AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php diff -u xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.5 xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.6 --- xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.5 Thu Jul 27 18:34:51 2006 +++ xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php Fri Aug 25 19:16:37 2006 @@ -40,7 +40,9 @@ function call() { $args = func_get_args(); - return call_user_func_array(array($this->mClient, 'call'), $args); + $op = array_shift($args); + + return $this->mClient->call($op, $args); } } From minahito @ users.sourceforge.jp Fri Aug 25 19:17:03 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:17:03 +0900 Subject: [xoops-cvslog 4360] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060825101703.76AA12AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/groups_users_link.php diff -u xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.2 xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.3 --- xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.2 Tue Mar 28 22:32:03 2006 +++ xoops2jp/html/modules/user/class/groups_users_link.php Fri Aug 25 19:17:03 2006 @@ -17,6 +17,16 @@ var $mTable = "groups_users_link"; var $mPrimary = "linkid"; var $mClass = "UserGroups_users_linkObject"; + + function isUserOfGroup($uid, $groupid) + { + $criteria =& new CriteriaCompo(); + $criteria->add(new Criteria('groupid', $groupid)); + $criteria->add(new Criteria('uid', $uid)); + + $objs =& $this->getObjects($criteria); + return (count($objs) > 0 && is_object($objs[0])); + } } ?> From minahito @ users.sourceforge.jp Fri Aug 25 19:17:15 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 25 Aug 2006 19:17:15 +0900 Subject: [xoops-cvslog 4361] CVS update: xoops2jp/html/modules/user/class Message-ID: <20060825101715.769CD2AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/class/users.php diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.6 xoops2jp/html/modules/user/class/users.php:1.1.2.7 --- xoops2jp/html/modules/user/class/users.php:1.1.2.6 Sat Aug 5 22:23:35 2006 +++ xoops2jp/html/modules/user/class/users.php Fri Aug 25 19:17:15 2006 @@ -8,6 +8,7 @@ // TODO naming rule // var $Groups = array(); + var $_mGroupsLoadedFlag = false; function UserUsersObject() { @@ -54,11 +55,15 @@ // function _loadGroups() { - $handler =& xoops_getmodulehandler('groups_users_link', 'user'); - $links =& $handler->getObjects(new Criteria('uid', $this->get('uid'))); - foreach ($links as $link) { - $this->Groups[] = $link->get('groupid'); + if (!$this->_mGroupsLoadedFlag) { + $handler =& xoops_getmodulehandler('groups_users_link', 'user'); + $links =& $handler->getObjects(new Criteria('uid', $this->get('uid'))); + foreach ($links as $link) { + $this->Groups[] = $link->get('groupid'); + } } + + $this->_mGroupsLoadedFlag = true; } } @@ -147,19 +152,34 @@ { if (parent::insert($user, $force)) { $flag = true; + + $user->_loadGroups(); $handler =& xoops_getmodulehandler('groups_users_link', 'user'); - $handler->deleteAll(new Criteria('uid', $user->get('uid')), $force); + $oldLinkArr =& $handler->getObjects(new Criteria('uid', $user->get('uid')), $force); + + // + // Delete + // + $oldGroupidArr = array(); + foreach (array_keys($oldLinkArr) as $key) { + $oldGroupidArr[] = $oldLinkArr[$key]->get('groupid'); + if (!in_array($oldLinkArr[$key]->get('groupid'), $user->Groups)) { + $handler->delete($oldLinkArr[$key], $force); + } + } foreach ($user->Groups as $gid) { - $link =& $handler->create(); + if (!in_array($gid, $oldGroupidArr)) { + $link =& $handler->create(); - $link->set('groupid', $gid); - $link->set('uid', $user->get('uid')); + $link->set('groupid', $gid); + $link->set('uid', $user->get('uid')); - $flag &= $handler->insert($link, $force); + $flag &= $handler->insert($link, $force); - unset($link); + unset($link); + } } return $flag; From tom_g3x @ users.sourceforge.jp Fri Aug 25 20:02:27 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Fri, 25 Aug 2006 20:02:27 +0900 Subject: [xoops-cvslog 4362] CVS update: xoops2jp/html/modules/base/admin/templates Message-ID: <20060825110227.BAA222AC051@users.sourceforge.jp> Index: xoops2jp/html/modules/base/admin/templates/theme_list.html diff -u xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.11 --- xoops2jp/html/modules/base/admin/templates/theme_list.html:1.1.2.10 Fri Aug 25 17:26:10 2006 +++ xoops2jp/html/modules/base/admin/templates/theme_list.html Fri Aug 25 20:02:27 2006 @@ -33,19 +33,19 @@ <{/if}> <{if $theme->get('screenshot')}> - <{$theme->getShow('name')}> + <{$theme->getShow('name')}> <{/if}>
    <{$theme->getShow('name')}>

    <{$theme->getShow('description') != null}>

      -
    • <{$smarty.const._AD_BASE_LANG_VERSION}> : <{$theme->getShow('version')}> -
    • <{$smarty.const._AD_BASE_LANG_RENDER}> : <{$theme->getShow('render_system')}> -
    • <{$smarty.const._AD_BASE_LANG_FORMAT}> : <{$theme->getShow('format')}> -
    • <{$smarty.const._AD_BASE_LANG_AUTHOR}> : <{$theme->getShow('author')}> +
    • <{$smarty.const._AD_BASE_LANG_VERSION}> : <{$theme->getShow('version')}>
    • +
    • <{$smarty.const._AD_BASE_LANG_RENDER}> : <{$theme->getShow('render_system')}>
    • +
    • <{$smarty.const._AD_BASE_LANG_FORMAT}> : <{$theme->getShow('format')}>
    • +
    • <{$smarty.const._AD_BASE_LANG_AUTHOR}> : <{$theme->getShow('author')}>
    • <{if $theme->get('url') != null}> -
    • <{$smarty.const._AD_BASE_LANG_GET_THE_LATEST_VERSION}> +
    • <{$smarty.const._AD_BASE_LANG_GET_THE_LATEST_VERSION}>
    • <{/if}>
    Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.20 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.21 --- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.20 Sat Aug 19 20:55:28 2006 +++ xoops2jp/html/modules/base/admin/templates/preference_edit.html Fri Aug 25 20:02:27 2006 @@ -68,7 +68,7 @@ <{elseif $config->get('conf_formtype') == 'select_multi'}> - []' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='5' multiple="multiple"> <{foreach item=option from=$config->getOptionItems()}> <{assign var=flag value=0}> <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> @@ -92,7 +92,7 @@ <{elseif $config->get('conf_formtype') == 'theme_multi'}> - []' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='5' multiple="multiple"> <{xoops_optionsArray value=dirname label=dirname from=$themeArr default=$actionForm->get($config->get('conf_name'))}> @@ -112,7 +112,7 @@ <{elseif $config->get('conf_formtype') == 'language'}> @@ -131,13 +131,13 @@ <{elseif $config->get('conf_formtype') == 'group_multi'}> - []' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='3' multiple="multiple"> <{foreach item=group from=$groupArr}> <{assign var=flag value=0}> <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> <{if $group->get('groupid') == $selected}><{assign var=flag value=1}><{/if}> <{/foreach}> - + <{/foreach}> @@ -151,13 +151,13 @@ <{elseif $config->get('conf_formtype') == 'user_multi'}> - []' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='3' multiple="multiple"> <{foreach key=value item=label from=$userArr}> <{assign var=flag value=0}> <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> <{if $value == $selected}><{assign var=flag value=1}><{/if}> <{/foreach}> - + <{/foreach}> @@ -168,7 +168,7 @@ + From minahito @ users.sourceforge.jp Sat Aug 26 14:32:46 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 26 Aug 2006 14:32:46 +0900 Subject: [xoops-cvslog 4373] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060826053246.EC9FA2AC241@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/english/modinfo.php diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.16 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.17 --- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.16 Sat Aug 26 13:58:42 2006 +++ xoops2jp/html/modules/user/language/english/modinfo.php Sat Aug 26 14:32:46 2006 @@ -44,8 +44,8 @@ define('_MI_USER_CONF_MINUNAME', "Minimum length of username required"); define('_MI_USER_CONF_NEW_NTF_GROUP', "Select a group to which new user notification mail will be sent"); define('_MI_USER_CONF_NEW_USER_NOTIFY', "Notify by mail when a new user is registered?"); -define('_MI_USER_CONF_SELF_DELETE', "Execution confirmation message"); -define('_MI_USER_CONF_SELF_DELETE_CONF', "Are you sure you want to delete your account?\nThis will remove all your info from our database."); +define('_MI_USER_CONF_SELF_DELETE', "Allow users to delete own account?"); +define('_MI_USER_CONF_SELF_DELETE_CONF', "Execution confirmation message"); define('_MI_USER_CONF_SELF_DELETE_CONFIRM_DEFAULT', "Are you sure you want to delete your account?\nThis will remove all your info from our database."); define('_MI_USER_CONF_SSLLOGINLINK', "URL where SSL login page is located"); define('_MI_USER_CONF_SSLPOST_NAME', "SSL Post variable name"); From minahito @ users.sourceforge.jp Sat Aug 26 14:34:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 26 Aug 2006 14:34:08 +0900 Subject: [xoops-cvslog 4374] CVS update: xoops2jp/html/modules/base/language/japanese/help Message-ID: <20060826053408.6AA8D2AC241@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/help/help.html diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.8 xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.9 --- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.8 Fri Aug 25 19:16:09 2006 +++ xoops2jp/html/modules/base/language/japanese/help/help.html Sat Aug 26 14:34:08 2006 @@ -52,6 +52,4 @@
  • カスタムブロックにプレビュー機能がなく、実装されなくてはならない。
  • ユーザー検索において、前方一致や後方一致の指定ができなくなっている。
  • XOOPS Cube における新しい SSL ログインが実装されていない。旧 SSL ログインは再考の余地があります。
  • -
  • モジュールコンフィグにポートされた設定項目が一部、全体の設定項目に残っている。
  • -
  • [New!] ユーザー自身によるアカウント削除機能を実装しなくてはならない。
  • From minahito @ users.sourceforge.jp Sat Aug 26 14:34:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 26 Aug 2006 14:34:08 +0900 Subject: [xoops-cvslog 4375] CVS update: xoops2jp/html/modules/base/language/english/help Message-ID: <20060826053408.910BB2AC29B@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/help/help.html diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.8 xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.9 --- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.8 Fri Aug 25 19:15:50 2006 +++ xoops2jp/html/modules/base/language/english/help/help.html Sat Aug 26 14:34:08 2006 @@ -54,6 +54,4 @@
  • The preview feature in custom blocks has to be implemented.
  • Users can't use forward-match and backward-match in the user search. These search options are available in XOOPS2.
  • SSL Login feature of XOOPS Cube Legacy 2.1 hasn't been implemented. Old SSL Login is bad.
  • -
  • Some config items have been ported from general settings. But, we still haven't removed these items in general setting.
  • -
  • [New!] We have to implement user delete function for user.
  • From minahito @ users.sourceforge.jp Sat Aug 26 16:15:08 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 26 Aug 2006 16:15:08 +0900 Subject: [xoops-cvslog 4376] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060826071508.A9F952AC10C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/columnside.php diff -u xoops2jp/html/modules/base/class/columnside.php:1.1.2.2 xoops2jp/html/modules/base/class/columnside.php:1.1.2.3 --- xoops2jp/html/modules/base/class/columnside.php:1.1.2.2 Wed Aug 23 23:36:47 2006 +++ xoops2jp/html/modules/base/class/columnside.php Sat Aug 26 16:15:08 2006 @@ -3,7 +3,6 @@ if (!defined('XOOPS_ROOT_PATH')) exit(); require_once XOOPS_ROOT_PATH . '/include/comment_constants.php'; -require_once XOOPS_ROOT_PATH . '/modules/system/constants.php'; class BaseColumnsideObject extends XoopsSimpleObject { From minahito @ users.sourceforge.jp Sat Aug 26 16:15:15 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sat, 26 Aug 2006 16:15:15 +0900 Subject: [xoops-cvslog 4377] CVS update: xoops2jp/html/modules/base/class Message-ID: <20060826071515.0E3962AC10C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/class/commentstatus.php diff -u xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.2 xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.3 --- xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.2 Thu Jul 20 17:16:36 2006 +++ xoops2jp/html/modules/base/class/commentstatus.php Sat Aug 26 16:15:14 2006 @@ -3,7 +3,6 @@ if (!defined('XOOPS_ROOT_PATH')) exit(); require_once XOOPS_ROOT_PATH . '/include/comment_constants.php'; -require_once XOOPS_ROOT_PATH . '/modules/system/constants.php'; class BaseCommentstatusObject extends XoopsSimpleObject { From minahito @ users.sourceforge.jp Sun Aug 27 00:08:19 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 00:08:19 +0900 Subject: [xoops-cvslog 4378] CVS update: xoops2jp/html/modules/user Message-ID: <20060826150819.A24412AC107@users.sourceforge.jp> Index: xoops2jp/html/modules/user/xoops_version.php diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.23 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24 --- xoops2jp/html/modules/user/xoops_version.php:1.1.2.23 Sat Aug 26 13:57:24 2006 +++ xoops2jp/html/modules/user/xoops_version.php Sun Aug 27 00:08:19 2006 @@ -1,5 +1,5 @@ "_MI_USER_CONF_BAD_UNAMES", "description"=>"_MI_USER_CONF_BAD_UNAMES_DESC", "formtype"=>"textarea", - "valuetype"=>"string", - "default"=>"webmaster|^xoops|^admin" + "valuetype"=>"array", + "default"=>array('webmaster', '^xoops', '^admin') ); $modversion['config'][]=array ( @@ -242,8 +242,8 @@ "title"=>"_MI_USER_CONF_BAD_EMAILS", "description"=>"_MI_USER_CONF_BAD_EMAILS_DESC", "formtype"=>"textarea", - "valuetype"=>"string", - "default"=>"xoopscube.org$|xoopscube.jp$" + "valuetype"=>"array", + "default"=>array('xoopscube.jp$', 'xoopscube.org$') ); $modversion['config'][]=array ( From minahito @ users.sourceforge.jp Sun Aug 27 01:43:36 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 01:43:36 +0900 Subject: [xoops-cvslog 4379] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060826164336.099AA2AC06E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/admin.php diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.52 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.53 --- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.52 Fri Aug 25 19:16:02 2006 +++ xoops2jp/html/modules/base/language/japanese/admin.php Sun Aug 27 01:43:35 2006 @@ -31,7 +31,7 @@ define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください"); define('_AD_BASE_ERROR_READGROUPS', "最低1グループ以上に使用権限を与えてください"); define('_AD_BASE_ERROR_SEARCH_REQUIRED', "キーワードを入力して下さい"); -define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "{1}でSQLファイルが見つかりませんでした"); +define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "{0}でSQLファイルが見つかりませんでした"); define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "テンプレート '{0}' をアンインストールできませんでした"); define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました"); define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました"); From minahito @ users.sourceforge.jp Sun Aug 27 01:44:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 01:44:07 +0900 Subject: [xoops-cvslog 4381] CVS update: xoops2jp/html/modules/user/language/english Message-ID: <20060826164407.238502AC06E@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.21 xoops2jp/html/modules/user/language/english/main.php:1.1.2.22 --- xoops2jp/html/modules/user/language/english/main.php:1.1.2.21 Sat Aug 26 13:58:42 2006 +++ xoops2jp/html/modules/user/language/english/main.php Sun Aug 27 01:44:07 2006 @@ -7,8 +7,10 @@ define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0} is an incorrect email address"); 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_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."); define('_MD_USER_ERROR_SEND_MAIL', "Email transmission failed. Please contact site administrator."); From minahito @ users.sourceforge.jp Sun Aug 27 01:44:07 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 01:44:07 +0900 Subject: [xoops-cvslog 4380] CVS update: xoops2jp/html/modules/user/language/japanese Message-ID: <20060826164407.456D22AC157@users.sourceforge.jp> Index: xoops2jp/html/modules/user/language/japanese/main.php diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.23 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.24 --- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.23 Sat Aug 26 13:58:43 2006 +++ xoops2jp/html/modules/user/language/japanese/main.php Sun Aug 27 01:44:07 2006 @@ -2,13 +2,15 @@ define('_MD_USER_ERROR_AVATAR_EXTENSION', "アップロードされたファイルは許可された拡張子と一致しません"); define('_MD_USER_ERROR_AVATAR_MAXFILESIZE', "アバターのファイルサイズが許容サイズをオーバーしています"); -define('_MD_USER_ERROR_AVATAR_SELECT', "ERROR - 指定したアバターは不正です"); +define('_MD_USER_ERROR_AVATAR_SELECT', "指定したアバターは不正です"); define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています"); define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_MD_USER_ERROR_EMAIL_FORMAT', "{0}は不正なメールアドレスです"); define('_MD_USER_ERROR_INJURY', "{0}の入力値が不正です"); +define('_MD_USER_ERROR_INVALID_EMAIL', "不正なメールアドレスです"); define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以内で入力して下さい"); define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい"); +define('_MD_USER_ERROR_NAME_RESERVED', "このユーザ名は使用できません。"); define('_MD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません"); define('_MD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい"); define('_MD_USER_ERROR_SEND_MAIL', "メールの送信に失敗しました。管理者に御連絡下さい。"); From minahito @ users.sourceforge.jp Sun Aug 27 01:44:50 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 01:44:50 +0900 Subject: [xoops-cvslog 4382] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060826164450.4F2DF2AC06E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.14 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.15 --- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.14 Sat Aug 19 20:55:57 2006 +++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Sun Aug 27 01:44:50 2006 @@ -148,6 +148,17 @@ $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } + function validateEmail() + { + if (strlen($this->get('email')) > 0) { + foreach ($this->mConfig['bad_emails'] as $t_email) { + if (preg_match("/${t_email}/i", $this->get('email'))) { + $this->addErrorMessage(_MD_USER_ERROR_INVALID_EMAIL); + } + } + } + } + function load(&$obj) { $this->set('uid', $obj->get('uid')); Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.9 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.10 --- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.9 Sat Aug 19 21:01:54 2006 +++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php Sun Aug 27 01:44:50 2006 @@ -74,6 +74,28 @@ $this->mFieldProperties['timezone_offset']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_TIMEZONE_OFFSET); } + function validateUname() + { + if (strlen($this->get('uname')) > 0) { + foreach ($this->mConfig['bad_unames'] as $t_uname) { + if (preg_match("/${t_uname}/i", $this->get('uname'))) { + $this->addErrorMessage(_MD_USER_ERROR_NAME_RESERVED); + } + } + } + } + + function validateEmail() + { + if (strlen($this->get('email')) > 0) { + foreach ($this->mConfig['bad_emails'] as $t_email) { + if (preg_match("/${t_email}/i", $this->get('email'))) { + $this->addErrorMessage(_MD_USER_ERROR_INVALID_EMAIL); + } + } + } + } + function load(&$obj) { } From minahito @ users.sourceforge.jp Sun Aug 27 01:50:27 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 01:50:27 +0900 Subject: [xoops-cvslog 4383] CVS update: xoops2jp/html/modules/user/forms Message-ID: <20060826165027.D50482AC06E@users.sourceforge.jp> Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.15 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.16 --- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.15 Sun Aug 27 01:44:50 2006 +++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Sun Aug 27 01:50:27 2006 @@ -148,17 +148,6 @@ $this->mFieldProperties['user_intrest']->addVar('maxlength', 150); } - function validateEmail() - { - if (strlen($this->get('email')) > 0) { - foreach ($this->mConfig['bad_emails'] as $t_email) { - if (preg_match("/${t_email}/i", $this->get('email'))) { - $this->addErrorMessage(_MD_USER_ERROR_INVALID_EMAIL); - } - } - } - } - function load(&$obj) { $this->set('uid', $obj->get('uid')); Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.10 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.11 --- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.10 Sun Aug 27 01:44:50 2006 +++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php Sun Aug 27 01:50:27 2006 @@ -74,28 +74,6 @@ $this->mFieldProperties['timezone_offset']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_TIMEZONE_OFFSET); } - function validateUname() - { - if (strlen($this->get('uname')) > 0) { - foreach ($this->mConfig['bad_unames'] as $t_uname) { - if (preg_match("/${t_uname}/i", $this->get('uname'))) { - $this->addErrorMessage(_MD_USER_ERROR_NAME_RESERVED); - } - } - } - } - - function validateEmail() - { - if (strlen($this->get('email')) > 0) { - foreach ($this->mConfig['bad_emails'] as $t_email) { - if (preg_match("/${t_email}/i", $this->get('email'))) { - $this->addErrorMessage(_MD_USER_ERROR_INVALID_EMAIL); - } - } - } - } - function load(&$obj) { } Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.10 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.11 --- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.10 Sat Aug 19 21:54:21 2006 +++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Sun Aug 27 01:50:27 2006 @@ -56,14 +56,26 @@ // // Check bad uname patterns. // - foreach(explode("|",$this->mConfig['bad_unames']) as $pattern) { - if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->get('uname'))) { + foreach($this->mConfig['bad_unames'] as $t_uname) { + if(!empty($t_uname) && preg_match("/${t_uname}/i", $this->get('uname'))) { $this->addErrorMessage(_MD_USER_LANG_NAMERESERVED); break; } } } } + + function validateEmail() + { + if (strlen($this->get('email')) > 0) { + foreach ($this->mConfig['bad_emails'] as $t_email) { + if (!empty($t_email) && preg_match("/${t_email}/i", $this->get('email'))) { + $this->addErrorMessage(_MD_USER_ERROR_INVALID_EMAIL); + break; + } + } + } + } function validateTimezone_offset() { From minahito @ users.sourceforge.jp Sun Aug 27 12:13:42 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 12:13:42 +0900 Subject: [xoops-cvslog 4384] CVS update: xoops2jp/html/modules/user/kernel Message-ID: <20060827031342.92BBB2AC141@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.8 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.9 --- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.8 Fri Aug 18 14:35:30 2006 +++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Sun Aug 27 12:13:42 2006 @@ -1,7 +1,7 @@ mController->executeForward($url); break; + case "delete": + $root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserDelete"); + break; + case "login": $root->mController->checkLogin(); break; From minahito @ users.sourceforge.jp Sun Aug 27 12:13:55 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 12:13:55 +0900 Subject: [xoops-cvslog 4385] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060827031355.6E6242AC12F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_delete.html diff -u xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.2 --- xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.1 Sat Aug 26 13:58:52 2006 +++ xoops2jp/html/modules/user/templates/user_delete.html Sun Aug 27 12:13:55 2006 @@ -7,8 +7,10 @@
    <{/if}> -

    <{$self_delete_message}>

    -
    -<{xoops_token form=$actionForm}> - -
    +
    +

    <{$self_delete_message|nl2br}>

    +
    + <{xoops_token form=$actionForm}> + +
    +
    \ No newline at end of file From minahito @ users.sourceforge.jp Sun Aug 27 12:14:02 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 12:14:02 +0900 Subject: [xoops-cvslog 4386] CVS update: xoops2jp/html/modules/user/templates Message-ID: <20060827031402.1135A2AC12F@users.sourceforge.jp> Index: xoops2jp/html/modules/user/templates/user_userinfo.html diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.14 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.15 --- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.14 Fri Aug 18 18:07:19 2006 +++ xoops2jp/html/modules/user/templates/user_userinfo.html Sun Aug 27 12:14:01 2006 @@ -1,6 +1,6 @@ -<{if $user_ownpage == true && $user_candelete == true}> +<{if $user_ownpage == true && $enableSelfDelete == true}> <{elseif $xoops_isadmin == true}>
    From minahito @ users.sourceforge.jp Sun Aug 27 12:20:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 12:20:47 +0900 Subject: [xoops-cvslog 4387] CVS update: xoops2jp/html/modules/base/language/english Message-ID: <20060827032047.7F21E2AC23C@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/english/main.php diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.24 xoops2jp/html/modules/base/language/english/main.php:1.1.2.25 --- xoops2jp/html/modules/base/language/english/main.php:1.1.2.24 Thu Aug 24 19:59:00 2006 +++ xoops2jp/html/modules/base/language/english/main.php Sun Aug 27 12:20:47 2006 @@ -3,7 +3,7 @@ define('_MD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed"); define('_MD_BASE_ERROR_EMAIL', "{0} is an invalid email address"); define('_MD_BASE_ERROR_INCORRECTLOGIN', "Invalid Login!"); -define('_MD_BASE_ERROR_MASK', "{0} is wrong."); +define('_MD_BASE_ERROR_MASK', "{0} format is invalid."); define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters."); define('_MD_BASE_ERROR_PERMISSION', "Permission denied"); define('_MD_BASE_ERROR_REQUIRED', "{0} is required."); From minahito @ users.sourceforge.jp Sun Aug 27 12:20:47 2006 From: minahito @ users.sourceforge.jp (Minahito) Date: Sun, 27 Aug 2006 12:20:47 +0900 Subject: [xoops-cvslog 4388] CVS update: xoops2jp/html/modules/base/language/japanese Message-ID: <20060827032047.A24142AC23E@users.sourceforge.jp> Index: xoops2jp/html/modules/base/language/japanese/main.php diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.24 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.25 --- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.24 Mon Aug 21 12:46:17 2006 +++ xoops2jp/html/modules/base/language/japanese/main.php Sun Aug 27 12:20:47 2006 @@ -3,7 +3,7 @@ define('_MD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました"); define('_MD_BASE_ERROR_EMAIL', "{0}は不正なメールアドレスです"); define('_MD_BASE_ERROR_INCORRECTLOGIN', "ログイン情報が間違っています。"); -define('_MD_BASE_ERROR_MASK', "{0}の値が不正です"); +define('_MD_BASE_ERROR_MASK', "{0}は入力フォーマットに反しています"); define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい"); define('_MD_BASE_ERROR_PERMISSION', "パーミッションエラー"); define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい"); From tom_g3x @ users.sourceforge.jp Mon Aug 28 01:00:10 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 28 Aug 2006 01:00:10 +0900 Subject: [xoops-cvslog 4389] CVS update: xoops2jp/html/modules/user/admin/templates Message-ID: <20060827160010.DE5E52AC16E@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.24 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.25 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.24 Fri Aug 25 17:26:10 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Mon Aug 28 01:00:10 2006 @@ -69,7 +69,6 @@ <{cycle values="," name="SysPer"}> <{/if}> <{/foreach}> -
    <{/if}> @@ -90,7 +89,6 @@ <{cycle values="," name="ModPer"}> <{/if}> <{/foreach}> -
    @@ -125,7 +123,6 @@ <{cycle values="," name="BlockPer"}> <{/if}> <{/foreach}> -
    <{/foreach}> From tom_g3x @ users.sourceforge.jp Mon Aug 28 01:00:11 2006 From: tom_g3x @ users.sourceforge.jp (Tom Hayakawa) Date: Mon, 28 Aug 2006 01:00:11 +0900 Subject: [xoops-cvslog 4390] CVS update: xoops2jp/html/modules/legacyRender/admin/templates Message-ID: <20060827160011.27C752AC173@users.sourceforge.jp> Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.23 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24 --- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.23 Mon Aug 21 22:11:17 2006 +++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html Mon Aug 28 01:00:10 2006 @@ -23,7 +23,7 @@
    -
    + <{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}> : <{foreach from=$modules item=module}> <{if is_object($filterForm->mModule)}> - <{else}>