onokazu
onoka****@users*****
2005年 10月 25日 (火) 12:07:38 JST
Index: xoops2jp/html/modules/newbb/index.php
diff -u xoops2jp/html/modules/newbb/index.php:1.6 xoops2jp/html/modules/newbb/index.php:1.7
--- xoops2jp/html/modules/newbb/index.php:1.6 Mon Oct 24 20:44:17 2005
+++ xoops2jp/html/modules/newbb/index.php Tue Oct 25 12:07:38 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.6 2005/10/24 11:44:17 onokazu Exp $
+// $Id: index.php,v 1.7 2005/10/25 03:07:38 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -45,7 +45,7 @@
$xoopsTpl->assign(array("lang_welcomemsg" => sprintf(_MD_WELCOME,htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)), "lang_tostart" => _MD_TOSTART, "lang_totaltopics" => _MD_TOTALTOPICSC, "lang_totalposts" => _MD_TOTALPOSTSC, "total_topics" => get_total_topics(), "total_posts" => get_total_posts(0, 'all'), "lang_lastvisit" => sprintf(_MD_LASTVISIT,formatTimestamp($last_visit)), "lang_currenttime" => sprintf(_MD_TIMENOW,formatTimestamp(time(),"m")), "lang_forum" => _MD_FORUM, "lang_topics" => _MD_TOPICS, "lang_posts" => _MD_POSTS, "lang_lastpost" => _MD_LASTPOST, "lang_moderators" => _MD_MODERATOR));
-$viewcat = (!empty($HTTP_GET_VARS['cat'])) ? intval($HTTP_GET_VARS['cat']) : 0;
+$viewcat = (!empty($_GET['cat'])) ? intval($_GET['cat']) : 0;
$categories = array();
while ( $cat_row = $xoopsDB->fetchArray($result) ) {
$categories[] = $cat_row;
Index: xoops2jp/html/modules/newbb/viewforum.php
diff -u xoops2jp/html/modules/newbb/viewforum.php:1.5 xoops2jp/html/modules/newbb/viewforum.php:1.6
--- xoops2jp/html/modules/newbb/viewforum.php:1.5 Mon Oct 24 20:44:17 2005
+++ xoops2jp/html/modules/newbb/viewforum.php Tue Oct 25 12:07:38 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: viewforum.php,v 1.5 2005/10/24 11:44:17 onokazu Exp $
+// $Id: viewforum.php,v 1.6 2005/10/25 03:07:38 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -31,7 +31,7 @@
include "header.php";
-$forum = intval($HTTP_GET_VARS['forum']);
+$forum = intval($_GET['forum']);
if ( $forum < 1 ) {
redirect_header("index.php", 2, _MD_ERRORFORUM);
exit();
@@ -127,10 +127,10 @@
$sel_sort_array = array("t.topic_title"=>_MD_TOPICTITLE, "t.topic_replies"=>_MD_NUMBERREPLIES, "u.uname"=>_MD_TOPICPOSTER, "t.topic_views"=>_MD_VIEWS, "p.post_time"=>_MD_LASTPOSTTIME);
-if ( !isset($HTTP_GET_VARS['sortname']) || !in_array($HTTP_GET_VARS['sortname'], array_keys($sel_sort_array)) ) {
+if ( !isset($_GET['sortname']) || !in_array($_GET['sortname'], array_keys($sel_sort_array)) ) {
$sortname = "p.post_time";
} else {
- $sortname = $HTTP_GET_VARS['sortname'];
+ $sortname = $_GET['sortname'];
}
$xoopsTpl->assign('lang_sortby', _MD_SORTEDBY);
@@ -144,7 +144,7 @@
// assign to template
$xoopsTpl->assign('forum_selection_sort', $forum_selection_sort);
-$sortorder = (!isset($HTTP_GET_VARS['sortorder']) || $HTTP_GET_VARS['sortorder'] != "ASC") ? "DESC" : "ASC";
+$sortorder = (!isset($_GET['sortorder']) || $_GET['sortorder'] != "ASC") ? "DESC" : "ASC";
$forum_selection_order = '<select name="sortorder">';
$forum_selection_order .= '<option value="ASC"'.(($sortorder == "ASC") ? ' selected="selected"' : '').'>'._MD_ASCENDING.'</option>';
$forum_selection_order .= '<option value="DESC"'.(($sortorder == "DESC") ? ' selected="selected"' : '').'>'._MD_DESCENDING.'</option>';
@@ -153,7 +153,7 @@
// assign to template
$xoopsTpl->assign('forum_selection_order', $forum_selection_order);
-$sortsince = !empty($HTTP_GET_VARS['sortsince']) ? intval($HTTP_GET_VARS['sortsince']) : 100;
+$sortsince = !empty($_GET['sortsince']) ? intval($_GET['sortsince']) : 100;
$sel_since_array = array(1, 2, 5, 10, 20, 30, 40, 60, 75, 100);
$forum_selection_since = '<select name="sortsince">';
foreach ($sel_since_array as $sort_since_v) {
@@ -183,7 +183,7 @@
$xoopsTpl->assign('lang_date', _MD_DATE);
$startdate = time() - (86400* $sortsince);
-$start = !empty($HTTP_GET_VARS['start']) ? intval($HTTP_GET_VARS['start']) : 0;
+$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
$sql = 'SELECT t.*, u.uname, u2.uname as last_poster, p.post_time as last_post_time, p.icon FROM '.$xoopsDB->prefix("bb_topics").' t LEFT JOIN '.$xoopsDB->prefix('users').' u ON u.uid = t.topic_poster LEFT JOIN '.$xoopsDB->prefix('bb_posts').' p ON p.post_id = t.topic_last_post_id LEFT JOIN '.$xoopsDB->prefix('users').' u2 ON u2.uid = p.uid WHERE t.forum_id = '.$forum.' AND (p.post_time > '.$startdate.' OR t.topic_sticky=1) ORDER BY topic_sticky DESC, '.$sortname.' '.$sortorder;
if ( !$result = $xoopsDB->query($sql,$forumdata['topics_per_page'],$start) ) {
Index: xoops2jp/html/modules/newbb/viewtopic.php
diff -u xoops2jp/html/modules/newbb/viewtopic.php:1.4 xoops2jp/html/modules/newbb/viewtopic.php:1.5
--- xoops2jp/html/modules/newbb/viewtopic.php:1.4 Mon Oct 24 20:44:17 2005
+++ xoops2jp/html/modules/newbb/viewtopic.php Tue Oct 25 12:07:38 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: viewtopic.php,v 1.4 2005/10/24 11:44:17 onokazu Exp $
+// $Id: viewtopic.php,v 1.5 2005/10/25 03:07:38 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -30,8 +30,8 @@
// ------------------------------------------------------------------------- //
include 'header.php';
-$forum = isset($HTTP_GET_VARS['forum']) ? intval($HTTP_GET_VARS['forum']) : 0;
-$topic_id = isset($HTTP_GET_VARS['topic_id']) ? intval($HTTP_GET_VARS['topic_id']) : 0;
+$forum = isset($_GET['forum']) ? intval($_GET['forum']) : 0;
+$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
if ( empty($forum) ) {
redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/index.php",2,_MD_ERRORFORUM);
exit();
@@ -39,8 +39,8 @@
redirect_header('viewforum.php?forum='.$forum,2,_MD_ERRORTOPIC);
exit();
}
-$topic_time = (isset($HTTP_GET_VARS['topic_time'])) ? intval($HTTP_GET_VARS['topic_time']) : 0;
-$post_id = !empty($HTTP_GET_VARS['post_id']) ? intval($HTTP_GET_VARS['post_id']) : 0;
+$topic_time = (isset($_GET['topic_time'])) ? intval($_GET['topic_time']) : 0;
+$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
//use users preferences
if (is_object($xoopsUser)) {
@@ -57,11 +57,11 @@
}
// override mode/order if any requested
-if (isset($HTTP_GET_VARS['viewmode']) && ($HTTP_GET_VARS['viewmode'] == 'flat' || $HTTP_GET_VARS['viewmode'] == 'thread')) {
- $viewmode = $HTTP_GET_VARS['viewmode'];
+if (isset($_GET['viewmode']) && ($_GET['viewmode'] == 'flat' || $_GET['viewmode'] == 'thread')) {
+ $viewmode = $_GET['viewmode'];
}
-if (isset($HTTP_GET_VARS['order']) && ($HTTP_GET_VARS['order'] == 'ASC' || $HTTP_GET_VARS['order'] == 'DESC')) {
- $order = $HTTP_GET_VARS['order'];
+if (isset($_GET['order']) && ($_GET['order'] == 'ASC' || $_GET['order'] == 'DESC')) {
+ $order = $_GET['order'];
}
if ($viewmode != 'flat') {
@@ -73,9 +73,9 @@
include XOOPS_ROOT_PATH.'/header.php';
include_once 'class/class.forumposts.php';
-if ( isset($HTTP_GET_VARS['move']) && 'next' == $HTTP_GET_VARS['move'] ) {
+if ( isset($_GET['move']) && 'next' == $_GET['move'] ) {
$sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time > '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time ASC LIMIT 1';
-} elseif ( isset($HTTP_GET_VARS['move']) && 'prev' == $HTTP_GET_VARS['move']) {
+} elseif ( isset($_GET['move']) && 'prev' == $_GET['move']) {
$sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time < '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time DESC LIMIT 1';
} else {
$sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_id = '.$topic_id.' AND t.forum_id = '.$forum;
@@ -229,7 +229,7 @@
}
// initialize the start number of select query
-$start = !empty($HTTP_GET_VARS['start']) ? intval($HTTP_GET_VARS['start']) : 0;
+$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
$total_posts = get_total_posts($topic_id, 'topic');
if ($total_posts > 50) {