onokazu
onoka****@users*****
2006年 5月 1日 (月) 11:37:27 JST
Index: xoops2jp/html/include/checklogin.php diff -u xoops2jp/html/include/checklogin.php:1.4 xoops2jp/html/include/checklogin.php:1.5 --- xoops2jp/html/include/checklogin.php:1.4 Wed Aug 3 21:39:11 2005 +++ xoops2jp/html/include/checklogin.php Mon May 1 11:37:26 2006 @@ -1,99 +1,99 @@ -<?php -// $Id: checklogin.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $ -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// 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 // -// ------------------------------------------------------------------------ // -// Author: Kazumi Ono (AKA onokazu) // -// URL: http://www.xoops.org/ http://jp.xoops.org/ http://www.myweb.ne.jp/ // -// Project: The XOOPS Project (http://www.xoops.org/) // -// ------------------------------------------------------------------------- // - -if (!defined('XOOPS_ROOT_PATH')) { - exit(); -} -include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php'; -$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']); -$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']); -if ($uname == '' || $pass == '') { - redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN); - exit(); -} -$member_handler =& xoops_gethandler('member'); -$myts =& MyTextsanitizer::getInstance(); -$user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($uname)), addslashes($myts->stripSlashesGPC($pass))); -if (false != $user) { - if (0 == $user->getVar('level')) { - redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM); - exit(); - } - if ($xoopsConfig['closesite'] == 1) { - $allowed = false; - foreach ($user->getGroups() as $group) { - if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) { - $allowed = true; - break; - } - } - if (!$allowed) { - redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM); - exit(); - } - } - $user->setVar('last_login', time()); - if (!$member_handler->insertUser($user)) { - } - $_SESSION = array(); - $_SESSION['xoopsUserId'] = $user->getVar('uid'); - $_SESSION['xoopsUserGroups'] = $user->getGroups(); - if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') { - setcookie($xoopsConfig['session_name'], session_id(), time()+(60 * $xoopsConfig['session_expire']), '/', '', 0); - } - $user_theme = $user->getVar('theme'); - if (in_array($user_theme, $xoopsConfig['theme_set_allowed'])) { - $_SESSION['xoopsUserTheme'] = $user_theme; - } - if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) { - $parsed = parse_url(XOOPS_URL); - $url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://'; - if (isset($parsed['host'])) { - $url .= isset($parsed['port']) ?$parsed['host'].':'.$parsed['port'].trim($_POST['xoops_redirect']): $parsed['host'].trim($_POST['xoops_redirect']); - } else { - $url .= xoops_getenv('HTTP_HOST').trim($_POST['xoops_redirect']); - } - } else { - $url = XOOPS_URL.'/index.php'; - } - - // RMV-NOTIFY - // Perform some maintenance of notification records - $notification_handler =& xoops_gethandler('notification'); - $notification_handler->doLoginMaintenance($user->getVar('uid')); - - redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname'))); -} else { - - redirect_header(XOOPS_URL.'/user.php',1,_US_INCORRECTLOGIN); -} -exit(); -?> +<?php +// $Id: checklogin.php,v 1.5 2006/05/01 02:37:26 onokazu Exp $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// 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 // +// ------------------------------------------------------------------------ // +// Author: Kazumi Ono (AKA onokazu) // +// URL: http://www.xoops.org/ http://jp.xoops.org/ http://www.myweb.ne.jp/ // +// Project: The XOOPS Project (http://www.xoops.org/) // +// ------------------------------------------------------------------------- // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} +include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php'; +$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']); +$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']); +if ($uname == '' || $pass == '') { + redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN); + exit(); +} +$member_handler =& xoops_gethandler('member'); +$myts =& MyTextsanitizer::getInstance(); +$user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($uname)), $myts->stripSlashesGPC($pass)); +if (false != $user) { + if (0 == $user->getVar('level')) { + redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM); + exit(); + } + if ($xoopsConfig['closesite'] == 1) { + $allowed = false; + foreach ($user->getGroups() as $group) { + if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) { + $allowed = true; + break; + } + } + if (!$allowed) { + redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM); + exit(); + } + } + $user->setVar('last_login', time()); + if (!$member_handler->insertUser($user)) { + } + $_SESSION = array(); + $_SESSION['xoopsUserId'] = $user->getVar('uid'); + $_SESSION['xoopsUserGroups'] = $user->getGroups(); + if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') { + setcookie($xoopsConfig['session_name'], session_id(), time()+(60 * $xoopsConfig['session_expire']), '/', '', 0); + } + $user_theme = $user->getVar('theme'); + if (in_array($user_theme, $xoopsConfig['theme_set_allowed'])) { + $_SESSION['xoopsUserTheme'] = $user_theme; + } + if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) { + $parsed = parse_url(XOOPS_URL); + $url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://'; + if (isset($parsed['host'])) { + $url .= isset($parsed['port']) ?$parsed['host'].':'.$parsed['port'].trim($_POST['xoops_redirect']): $parsed['host'].trim($_POST['xoops_redirect']); + } else { + $url .= xoops_getenv('HTTP_HOST').trim($_POST['xoops_redirect']); + } + } else { + $url = XOOPS_URL.'/index.php'; + } + + // RMV-NOTIFY + // Perform some maintenance of notification records + $notification_handler =& xoops_gethandler('notification'); + $notification_handler->doLoginMaintenance($user->getVar('uid')); + + redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname'))); +} else { + + redirect_header(XOOPS_URL.'/user.php',1,_US_INCORRECTLOGIN); +} +exit(); +?> Index: xoops2jp/html/include/comment_reply.php diff -u xoops2jp/html/include/comment_reply.php:1.2 xoops2jp/html/include/comment_reply.php:1.3 --- xoops2jp/html/include/comment_reply.php:1.2 Fri Mar 18 21:51:55 2005 +++ xoops2jp/html/include/comment_reply.php Mon May 1 11:37:26 2006 @@ -1,5 +1,5 @@ <?php -// $Id: comment_reply.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $ +// $Id: comment_reply.php,v 1.3 2006/05/01 02:37:26 onokazu Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -54,7 +54,8 @@ $comment_handler =& xoops_gethandler('comment'); $comment =& $comment_handler->get($com_id); $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid')); -$r_text = _CM_POSTER.': <b>'.$r_name.'</b> '._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E'); +$r_text = _CM_POSTER.': <b>'.$r_name.'</b> '._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text'); +$com_title = $comment->getVar('com_title', 'E'); if (!preg_match("/^re:/i", $com_title)) { $com_title = "Re: ".xoops_substr($com_title, 0, 56); } Index: xoops2jp/html/include/cp_functions.php diff -u xoops2jp/html/include/cp_functions.php:1.4 xoops2jp/html/include/cp_functions.php:1.5 --- xoops2jp/html/include/cp_functions.php:1.4 Wed Aug 3 21:39:11 2005 +++ xoops2jp/html/include/cp_functions.php Mon May 1 11:37:26 2006 @@ -1,5 +1,5 @@ <?php -// $Id: cp_functions.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $ +// $Id: cp_functions.php,v 1.5 2006/05/01 02:37:26 onokazu Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -54,7 +54,7 @@ echo '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/system/style.css" />'; include_once XOOPS_CACHE_PATH.'/adminmenu.php'; $moduleperm_handler =& xoops_gethandler('groupperm'); - $admin_mids =& $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups()); + $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups()); $module_handler =& xoops_gethandler('module'); $modules =& $module_handler->getObjects(new @@ -109,7 +109,7 @@ <body> <table border='0' width='100%' cellspacing='0' cellpadding='0'> <tr> - <td bgcolor='#2F5376'><a href='http://www.xoops.org/' target='_blank'><img src='".XOOPS_URL."/modules/system/images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' /></a></td> + <td bgcolor='#2F5376'><a href='http://xoopscube.org/' target='_blank'><img src='".XOOPS_URL."/modules/system/images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' /></a></td> <td align='right' bgcolor='#2F5376' colspan='2'><img src='".XOOPS_URL."/modules/system/images/xoops2.gif' alt='' /></td> </tr> <tr> @@ -156,7 +156,7 @@ <table border='0' width='100%' cellspacing='0' cellpadding='0'> <tr> <td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_left.gif' width='10' height='23' /></td> - <td width='98%' background='".XOOPS_URL."/modules/system/images/hbar_middle.gif' align='center'><div class='fontSmall'>Powered by ".XOOPS_VERSION." © 2001-2005 <a href='http://jp.xoops.org/' target='_blank'>The XOOPS Project</a></div></td><td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_right.gif' width='10' height='23' /></td> + <td width='98%' background='".XOOPS_URL."/modules/system/images/hbar_middle.gif' align='center'><div class='fontSmall'>Powered by ".XOOPS_VERSION." © 2001-2005 <a href='http://xoopscube.org/' target='_blank'>The XOOPS Cube Project</a></div></td><td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_right.gif' width='10' height='23' /></td> </tr> </table> </td> Index: xoops2jp/html/include/functions.php diff -u xoops2jp/html/include/functions.php:1.6 xoops2jp/html/include/functions.php:1.7 --- xoops2jp/html/include/functions.php:1.6 Mon Oct 24 20:44:16 2005 +++ xoops2jp/html/include/functions.php Mon May 1 11:37:26 2006 @@ -1,5 +1,5 @@ <?php -// $Id: functions.php,v 1.6 2005/10/24 11:44:16 onokazu Exp $ +// $Id: functions.php,v 1.7 2006/05/01 02:37:26 onokazu Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -522,10 +522,12 @@ if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php") ) { include_once XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php"; if ( class_exists("XoopsMailerLocal") ) { - return new XoopsMailerLocal(); + $ret =& new XoopsMailerLocal(); + return $ret; } } - return new XoopsMailer(); + $ret =& new XoopsMailer(); + return $ret; } function &xoops_gethandler($name, $optional = false ) @@ -544,7 +546,11 @@ if (!isset($handlers[$name]) && !$optional ) { trigger_error('Class <b>'.$class.'</b> does not exist<br />Handler Name: '.$name, E_USER_ERROR); } - return isset($handlers[$name]) ? $handlers[$name] : false; + $ret = false; + if (isset($handlers[$name])) { + $ret =& $handlers[$name]; + } + return $ret; } function &xoops_getmodulehandler($name = null, $module_dir = null, $optional = false) @@ -574,7 +580,11 @@ if (!isset($handlers[$module_dir][$name]) && !$optional) { trigger_error('Handler does not exist<br />Module: '.$module_dir.'<br />Name: '.$name, E_USER_ERROR); } - return isset($handlers[$module_dir][$name]) ? $handlers[$module_dir][$name] : false; + $ret = false; + if (isset($handlers[$module_dir][$name])) { + $ret =& $handlers[$module_dir][$name]; + } + return $ret; } function xoops_getrank($rank_id =0, $posts = 0) Index: xoops2jp/html/include/version.php diff -u xoops2jp/html/include/version.php:1.12 xoops2jp/html/include/version.php:1.13 --- xoops2jp/html/include/version.php:1.12 Tue Oct 25 11:57:28 2005 +++ xoops2jp/html/include/version.php Mon May 1 11:37:26 2006 @@ -1,4 +1,4 @@ <?php -// $Id: version.php,v 1.12 2005/10/25 02:57:28 onokazu Exp $ -define("XOOPS_VERSION","XOOPS 2.0.13a JP"); +// $Id: version.php,v 1.13 2006/05/01 02:37:26 onokazu Exp $ +define("XOOPS_VERSION","XOOPS 2.0.14 JP"); ?> \ No newline at end of file Index: xoops2jp/html/include/xoopscodes.php diff -u xoops2jp/html/include/xoopscodes.php:1.4 xoops2jp/html/include/xoopscodes.php:1.5 --- xoops2jp/html/include/xoopscodes.php:1.4 Wed Aug 3 21:39:11 2005 +++ xoops2jp/html/include/xoopscodes.php Mon May 1 11:37:26 2006 @@ -1,5 +1,5 @@ <?php -// $Id: xoopscodes.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $ +// $Id: xoopscodes.php,v 1.5 2006/05/01 02:37:26 onokazu Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -81,7 +81,7 @@ function xoopsSmilies($textarea_id) { $myts =& MyTextSanitizer::getInstance(); - $smiles =& $myts->getSmileys(); + $smiles = $myts->getSmileys(); if (empty($smileys)) { $db =& Database::getInstance(); if ($result = $db->query('SELECT * FROM '.$db->prefix('smiles').' WHERE display=1')) {
