From minahito @ users.sourceforge.jp Fri May 27 17:33:55 2005 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 27 May 2005 17:33:55 +0900 Subject: [Xoops-cvslog 1] CVS update: xoops2jp/html/modules/news/admin Message-ID: <20050527083355.3307D2AC00E@users.sourceforge.jp> Date: Friday May 27, 2005 @ 17:33 Author: minahito Update of /cvsroot/xoops/xoops2jp/html/modules/news/admin In directory sf-cvs:/tmp/cvs-serv10130/html/modules/news/admin Modified Files: Tag: xoops2_0_9_4_jp-branch index.php Log Message: bug fix #4135. =================================================================== File: no file index.php Status: Needs Checkout Working revision: 1.2.6.5 Fri May 27 08:33:54 2005 Repository revision: 1.2.6.5 /cvsroot/xoops/xoops2jp/html/modules/news/admin/index.php,v Sticky Tag: xoops2_0_9_4_jp-branch (branch: 1.2.6) Existing Tags: xoops2_0_10_jp_beta (revision: 1.2.6.4) xoops2_1_0_jp-branch (branch: 1.2.8) xoops2_0_9_4_jp-branch (branch: 1.2.6) xoops2_0_9_3-branch (branch: 1.2.4) xoops2_0_10-branch (branch: 1.2.2) xoops2_0_9_2 (revision: 1.2) From onokazu @ users.sourceforge.jp Fri May 27 20:05:05 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 20:05:05 +0900 Subject: [Xoops-cvslog 2] CVS update: xoops2jp/html/include Message-ID: <20050527110505.4CE812AC00E@users.sourceforge.jp> Date: Friday May 27, 2005 @ 20:05 Author: onokazu Update of /cvsroot/xoops/xoops2jp/html/include In directory sf-cvs:/tmp/cvs-serv18837/html/include Modified Files: Tag: xoops2_0_9_4_jp-branch functions.php Log Message: Fixed invalid rss time format =================================================================== File: no file functions.php Status: Needs Checkout Working revision: 1.2.6.9 Fri May 27 11:05:05 2005 Repository revision: 1.2.6.9 /cvsroot/xoops/xoops2jp/html/include/functions.php,v Sticky Tag: xoops2_0_9_4_jp-branch (branch: 1.2.6) Existing Tags: xoops2_0_10_jp_beta (revision: 1.2.6.8) xoops2_1_0_jp-branch (branch: 1.2.8) xoops2_0_9_4_jp-branch (branch: 1.2.6) xoops2_0_9_3-branch (branch: 1.2.4) xoops2_0_10-branch (branch: 1.2.2) xoops2_0_9_2 (revision: 1.2) xoopsjp2_0_7_1 (revision: 1.1) From minahito @ users.sourceforge.jp Fri May 27 21:24:50 2005 From: minahito @ users.sourceforge.jp (Minahito) Date: Fri, 27 May 2005 21:24:50 +0900 Subject: [Xoops-cvslog 3] CVS update: xoops2jp/html/class Message-ID: <20050527122450.E49F82AC00E@users.sourceforge.jp> Date: Friday May 27, 2005 @ 21:24 Author: minahito Update of /cvsroot/xoops/xoops2jp/html/class In directory sf-cvs:/tmp/cvs-serv7199/html/class Modified Files: Tag: xoops2_0_9_4_jp-branch token.php Log Message: add comment. =================================================================== File: no file token.php Status: Needs Checkout Working revision: 1.1.2.7 Fri May 27 12:24:50 2005 Repository revision: 1.1.2.7 /cvsroot/xoops/xoops2jp/html/class/Attic/token.php,v Sticky Tag: xoops2_0_9_4_jp-branch (branch: 1.1.2) Existing Tags: xoops2_0_10_jp_beta (revision: 1.1.2.6) xoops2_0_9_4_jp-branch (branch: 1.1.2) From onokazu @ users.sourceforge.jp Fri May 27 21:30:55 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:30:55 +0900 Subject: [Xoops-cvslog 4] CVS update: CVSROOT Message-ID: <20050527123055.D45682AC00E@users.sourceforge.jp> Date: Friday May 27, 2005 @ 21:30 Author: onokazu Update of /cvsroot/xoops/CVSROOT In directory sf-cvs:/tmp/cvs-serv8323 Modified Files: loginfo Log Message: update =================================================================== File: loginfo Status: Up-to-date Working revision: 1.10 Fri May 27 12:30:35 2005 Repository revision: 1.10 /cvsroot/xoops/CVSROOT/loginfo,v Existing Tags: No Tags Exist From onokazu @ users.sourceforge.jp Fri May 27 21:32:07 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:32:07 +0900 Subject: [Xoops-cvslog 5] CVS update: CVSROOT Message-ID: <20050527123207.20B552AC00E@users.sourceforge.jp> From onokazu @ users.sourceforge.jp Fri May 27 21:38:55 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:38:55 +0900 Subject: [Xoops-cvslog 6] CVS update: xoops2jp/html/modules/system/admin/smilies Message-ID: <20050527123855.BC1432AC00E@users.sourceforge.jp> From onokazu @ users.sourceforge.jp Fri May 27 21:40:42 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:40:42 +0900 Subject: [Xoops-cvslog 7] CVS update: CVSROOT Message-ID: <20050527124042.809942AC018@users.sourceforge.jp> From onokazu @ users.sourceforge.jp Fri May 27 21:41:19 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:41:19 +0900 Subject: [Xoops-cvslog 8] CVS update: CVSROOT Message-ID: <20050527124119.A8C012AC00E@users.sourceforge.jp> Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.11 CVSROOT/loginfo:1.12 --- CVSROOT/loginfo:1.11 Fri May 27 21:32:06 2005 +++ CVSROOT/loginfo Fri May 27 21:41:19 2005 @@ -19,5 +19,6 @@ # s = file name # V = old version number (pre-checkin) # v = new version number (post-checkin) +# #DEFAULT /usr/local/bin/cvs-commitmail %s -f $CVSROOT/CVSROOT/commitlog -m xoops-cvslog @ lists.sourceforge.jp ALL /usr/local/bin/cvs-commitmail -d -m xoops-cvslog @ lists.sourceforge.jp "%p %{sVv}" \ No newline at end of file From onokazu @ users.sourceforge.jp Fri May 27 21:46:41 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 21:46:41 +0900 Subject: [Xoops-cvslog 9] CVS update: CVSROOT Message-ID: <20050527124641.43FE32AC00E@users.sourceforge.jp> Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.12 CVSROOT/loginfo:1.13 --- CVSROOT/loginfo:1.12 Fri May 27 21:41:19 2005 +++ CVSROOT/loginfo Fri May 27 21:46:41 2005 @@ -20,5 +20,6 @@ # V = old version number (pre-checkin) # v = new version number (post-checkin) # +# #DEFAULT /usr/local/bin/cvs-commitmail %s -f $CVSROOT/CVSROOT/commitlog -m xoops-cvslog @ lists.sourceforge.jp ALL /usr/local/bin/cvs-commitmail -d -m xoops-cvslog @ lists.sourceforge.jp "%p %{sVv}" \ No newline at end of file From nobunobu @ users.sourceforge.jp Fri May 27 22:26:36 2005 From: nobunobu @ users.sourceforge.jp (Nobuki Kowa) Date: Fri, 27 May 2005 22:26:36 +0900 Subject: [xoops-cvslog 10] CVS update: xoops2jp/html/modules/system/admin/groups Message-ID: <20050527132636.D4BE12AC00E@users.sourceforge.jp> Index: xoops2jp/html/modules/system/admin/groups/main.php diff -u xoops2jp/html/modules/system/admin/groups/main.php:1.2.6.3 xoops2jp/html/modules/system/admin/groups/main.php:1.2.6.4 --- xoops2jp/html/modules/system/admin/groups/main.php:1.2.6.3 Fri May 13 20:02:07 2005 +++ xoops2jp/html/modules/system/admin/groups/main.php Fri May 27 22:26:36 2005 @@ -1,5 +1,5 @@ 'groups', 'op' => 'delConf', 'g_id' => $g_id), 'admin.php', _AM_AREUSUREDEL); + $member_handler =& xoops_gethandler('member'); + $group =& $member_handler->getGroup($g_id); + xoops_token_confirm(array('fct' => 'groups', 'op' => 'delConf', 'g_id' => $g_id), 'admin.php', sprintf(_AM_AREUSUREDEL,$group->getVar('name'))); xoops_cp_footer(); break; case "delConf": From onokazu @ users.sourceforge.jp Fri May 27 23:06:29 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 23:06:29 +0900 Subject: [xoops-cvslog 11] CVS update: xoops2jp/html/class Message-ID: <20050527140629.E5D762AC01C@users.sourceforge.jp> Index: xoops2jp/html/class/uploader.php diff -u xoops2jp/html/class/uploader.php:1.2.6.3 xoops2jp/html/class/uploader.php:1.2.6.4 --- xoops2jp/html/class/uploader.php:1.2.6.3 Fri Apr 22 13:35:29 2005 +++ xoops2jp/html/class/uploader.php Fri May 27 23:06:29 2005 @@ -1,5 +1,5 @@ checkMaxHeight()) { $this->setErrors(sprintf('File height must be smaller than %u', $this->maxHeight)); } - if (!$this->checkFileType()) { + if (!$this->checkMimeType()) { $this->setErrors("Invalid file type"); } if (count($this->errors) > 0) { @@ -377,7 +377,7 @@ * * @return bool **/ - function checkFileType() + function checkMimeType() { if (!empty($this->allowedExtensions)) { if (!in_array($this->ext, $this->allowedExtensions)) { From onokazu @ users.sourceforge.jp Fri May 27 23:16:48 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 23:16:48 +0900 Subject: [xoops-cvslog 12] CVS update: xoops2jp/html Message-ID: <20050527141648.505E92AC00E@users.sourceforge.jp> Index: xoops2jp/html/admin.php diff -u xoops2jp/html/admin.php:1.2.6.4 xoops2jp/html/admin.php:1.2.6.5 --- xoops2jp/html/admin.php:1.2.6.4 Thu May 26 19:56:47 2005 +++ xoops2jp/html/admin.php Fri May 27 23:16:48 2005 @@ -1,5 +1,5 @@ '; } - if (function_exists('mb_convert_encoding') && !empty($_GET['xoopsorgnews'])) { +/* if (function_exists('mb_convert_encoding') && !empty($_GET['xoopsorgnews'])) { $rssurl = 'http://jp.xoops.org/backend.php'; $rssfile = XOOPS_CACHE_PATH.'/adminnews.xml'; $rssdata = ''; @@ -117,7 +117,7 @@ echo $rss2parser->getErrors(); } } - } + }*/ xoops_cp_footer(); break; case 'generate': From onokazu @ users.sourceforge.jp Fri May 27 23:16:48 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Fri, 27 May 2005 23:16:48 +0900 Subject: [xoops-cvslog 13] CVS update: xoops2jp/html/include Message-ID: <20050527141648.944B22AC01C@users.sourceforge.jp> Index: xoops2jp/html/include/cp_functions.php diff -u xoops2jp/html/include/cp_functions.php:1.2.6.1 xoops2jp/html/include/cp_functions.php:1.2.6.2 --- xoops2jp/html/include/cp_functions.php:1.2.6.1 Thu Mar 31 00:49:04 2005 +++ xoops2jp/html/include/cp_functions.php Fri May 27 23:16:48 2005 @@ -1,5 +1,5 @@
+ | "._CPHOME." | "._LOGOUT." | "._YOURHOME." | -+ |
- | + |
<{$lang_faq}>-<{$lang_main}> »» <{$category_name}>+<{$lang_main}> »» <{$category_name}>
'; - $output .= 'If you are the administrator of this site, please visit the Xoops Troubleshooting Page for assistance. '; - } - if (!$this->_showErrors || empty($this->_errors)) { - return $output; - } - - foreach( $this->_errors as $error ) - { - switch ( $error['errno'] ) - { - case E_USER_NOTICE: - $output .= "Notice [Xoops]: "; - break; - case E_USER_WARNING: - $output .= "Warning [Xoops]: "; - break; - case E_USER_ERROR: - $output .= "Error [Xoops]: "; - break; - case E_NOTICE: - $output .= "Notice [PHP]: "; - break; - case E_WARNING: - $output .= "Warning [PHP]: "; - break; - default: - $output .= "Unknown Condition [" . $error['errno'] . "]: "; - } - $output .= sprintf( "%s in file %s line %s \n", $error['errstr'], $error['errfile'], $error['errline'] ); - } - return $output; - } + /** + * List of errors + * + * @var array + * @access private + */ + var $_errors = array(); + + /** + * Show error messages? + * + * @var boolean + * @access private + */ + var $_showErrors = false; + + /** + * Was there a fatal error (E_USER_ERROR) + * + * @var boolean + * @access private + */ + var $_isFatal = false; + + /** + * Constructor + * + * Registers the error handler and shutdown functions. NOTE: when + * registering an error handler, the setting or 'error_reporting' is + * ignored and *everything* is trapped. + */ + function XoopsErrorHandler() + { + set_error_handler('XoopsErrorHandler_HandleError'); + register_shutdown_function('XoopsErrorHandler_Shutdown'); + } + + /** + * Get the (singleton) instance of the error handler + * + * @access public + */ + function &getInstance() + { + static $instance = null; + if (empty($instance)) { + $instance = new XoopsErrorHandler; + } + return $instance; + } + + /** + * Activate the error handler + * + * @access public + * @param boolean $showErrors True if debug mode is on + * @return void + */ + function activate($showErrors=false) + { + $this->_showErrors = $showErrors; + } + + /** + * Handle an error + * + * @param array $error Associative array containing error info + * @access public + * @return void + */ + function handleError($error) + { + if (($error['errno'] & error_reporting()) != $error['errno']) { + return; + } + $this->_errors[] = $error; + if ($error['errno'] == E_USER_ERROR) { + $this->_isFatal = true; + exit(); + } + } + + /** + * Render the list of errors + * + * NOTE: Unfortunately PHP 'fatal' and 'parse' errors are not trappable. + * If the server has 'display_errors Off', then the result will be a + * blank page. It would be nice to print a message 'This page cannot + * be displayed', but there seems to be no way to print this only when + * exiting due to a fatal error rather than normal end of page. + * + * Thus, 'trigger_error' should be used to trap problems early and + * display a meaningful message before a PHP fatal or parse error can + * occur. + * + * @TODO Use CSS + * @TODO Use language? or allow customized message? + * + * @access public + * @return void + */ + function renderErrors() + { + $output = ''; + if ($this->_isFatal) { + $output .= 'This page cannot be displayed due to an internal error. '; + $output .= 'If you are the administrator of this site, please visit the Xoops Troubleshooting Page for assistance. '; + } + if (!$this->_showErrors || empty($this->_errors)) { + return $output; + } + + foreach( $this->_errors as $error ) + { + switch ( $error['errno'] ) + { + case E_USER_NOTICE: + $output .= "Notice [Xoops]: "; + break; + case E_USER_WARNING: + $output .= "Warning [Xoops]: "; + break; + case E_USER_ERROR: + $output .= "Error [Xoops]: "; + break; + case E_NOTICE: + $output .= "Notice [PHP]: "; + break; + case E_WARNING: + $output .= "Warning [PHP]: "; + break; + default: + $output .= "Unknown Condition [" . $error['errno'] . "]: "; + } + $output .= sprintf( "%s in file %s line %s \n", $error['errstr'], $error['errfile'], $error['errline'] ); + } + return $output; + } -} +} /** * User-defined error handler (called from 'trigger_error') - * + * * NOTE: Some recent versions of PHP have a 5th parameter, &$p_ErrContext * which is an associative array of all variables defined in scope in which * error occurred. We cannot support this, for compatibility with older PHP. - * - * @access public + * + * @access public * @param int $errNo Type of error * @param string $errStr Error message * @param string $errFile File in which error occurred * @param int $errLine Line number on which error occurred - * @return void + * @return void */ function XoopsErrorHandler_HandleError($errNo, $errStr, $errFile, $errLine) -{ - // NOTE: we only store relative pathnames - $new_error = array( - 'errno' => $errNo, - 'errstr' => $errStr, - 'errfile' => preg_replace("|^" . XOOPS_ROOT_PATH . "/|", '', $errFile), - 'errline' => $errLine - ); - $error_handler =& XoopsErrorHandler::getInstance(); - $error_handler->handleError($new_error); -} +{ + // NOTE: we only store relative pathnames + $new_error = array( + 'errno' => $errNo, + 'errstr' => $errStr, + 'errfile' => preg_replace("|^" . XOOPS_ROOT_PATH . "/|", '', $errFile), + 'errline' => $errLine + ); + $error_handler =& XoopsErrorHandler::getInstance(); + $error_handler->handleError($new_error); +} /** * User-defined shutdown function (called from 'exit') - * - * @access public - * @return void + * + * @access public + * @return void */ function XoopsErrorHandler_Shutdown() { - $error_handler =& XoopsErrorHandler::getInstance(); - echo $error_handler->renderErrors(); -} + $error_handler =& XoopsErrorHandler::getInstance(); + echo $error_handler->renderErrors(); +} ?> From onokazu @ users.sourceforge.jp Mon May 30 20:05:19 2005 From: onokazu @ users.sourceforge.jp (onokazu) Date: Mon, 30 May 2005 20:05:19 +0900 Subject: [xoops-cvslog 30] CVS update: xoops2jp/html/modules/newbb/admin Message-ID: <20050530110519.69EC12AC011@users.sourceforge.jp> Index: xoops2jp/html/modules/newbb/admin/admin_forums.php diff -u xoops2jp/html/modules/newbb/admin/admin_forums.php:1.2.6.1 xoops2jp/html/modules/newbb/admin/admin_forums.php:1.2.6.2 --- xoops2jp/html/modules/newbb/admin/admin_forums.php:1.2.6.1 Wed Apr 20 19:04:15 2005 +++ xoops2jp/html/modules/newbb/admin/admin_forums.php Mon May 30 20:05:19 2005 @@ -6,7 +6,7 @@ copyright : (C) 2001 The phpBB Group email : support @ phpbb.com - $Id: admin_forums.php,v 1.2.6.1 2005/04/20 10:04:15 onokazu Exp $ + $Id: admin_forums.php,v 1.2.6.2 2005/05/30 11:05:19 onokazu Exp $ ***************************************************************************/ /*************************************************************************** @@ -187,7 +187,7 @@ $current_mods = array(); if ( $row = $xoopsDB->fetchArray($r) ) { do { - echo $row['uname']." ( "._MD_A_REMOVE.") "; + echo $row['uname']." ( "._MD_A_REMOVE.") "; $current_mods[] = $row['uid']; } while ( $row = $xoopsDB->fetchArray($r) ); echo " "; @@ -339,8 +339,8 @@
-
-
+
+
|
-
-
+
+
|
- |
+ |
|
@@ -615,7 +615,7 @@
|
- |
+ |
|
@@ -776,15 +776,15 @@
echo "\n\n";
+ echo "\" />\n";
+ echo "\n";
+ echo " |
+
| | |||||||||||||||||||||||||||||||||||
+ |
";
+
|