aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-05-16 20:07:23 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-05-16 20:07:23 +0000
commit36cb30de909891b538a3998628bf69089b70f9e7 (patch)
tree834788dc46261d2cf20d52498d2e82d95df4cc4f
parentcca94aa778f30e94abe348fb3c807ad0c9d62428 (diff)
downloadforums-36cb30de909891b538a3998628bf69089b70f9e7.tar
forums-36cb30de909891b538a3998628bf69089b70f9e7.tar.gz
forums-36cb30de909891b538a3998628bf69089b70f9e7.tar.bz2
forums-36cb30de909891b538a3998628bf69089b70f9e7.tar.xz
forums-36cb30de909891b538a3998628bf69089b70f9e7.zip
Added a view posts in previoux x day capability to viewforum
git-svn-id: file:///svn/phpbb/trunk@305 89ea8834-ac86-4346-8a33-228a782c2dd0
-rwxr-xr-xphpBB/language/lang_english.php3
-rw-r--r--phpBB/templates/PSO/viewforum_header.tpl7
-rw-r--r--phpBB/viewforum.php88
3 files changed, 79 insertions, 19 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 8be5e9ba4d..c3ebaa2df5 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -159,6 +159,9 @@ $l_hotthres = "More then $hot_threshold $l_posts";
$l_islocked = "$l_topic is Locked (No new $l_posts may be made in it)";
$l_moderatedby = "Moderated by";
+$l_Days = "Day/s";
+$l_All_posts = "All posts";
+
// Private forums
$l_privateforum = "This is a <b>Private Forum</b>.";
$l_private = "$l_privateforum<br>Note: you must have cookies enabled in order to use private forums.";
diff --git a/phpBB/templates/PSO/viewforum_header.tpl b/phpBB/templates/PSO/viewforum_header.tpl
index 2024cb7cdd..9ac7b3be93 100644
--- a/phpBB/templates/PSO/viewforum_header.tpl
+++ b/phpBB/templates/PSO/viewforum_header.tpl
@@ -1,5 +1,6 @@
<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
- <tr>
- <td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</font></td>
- </tr>
+ <tr><form method="post" action="{S_POST_DAYS_ACTION}">
+ <td align="left" valign="bottom" nowrap><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</font></td>
+ <td align="right" valign="bottom" nowrap><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">Display previous :&nbsp;{S_SELECT_POST_DAYS}&nbsp;<input type="submit" value="Go"></font></td>
+ </form></tr>
</table></div> \ No newline at end of file
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 984c81d9c1..aae3bcf64b 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -40,6 +40,15 @@ else
}
//
+// Start session management
+//
+$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+init_userprefs($userdata);
+//
+// End session management
+//
+
+//
// Check if the user has actually sent a forum ID with his/her request
// If not give them a nice error page.
//
@@ -47,7 +56,7 @@ if(isset($forum_id))
{
$sql = "SELECT f.forum_type, f.forum_name, f.forum_topics, u.username, u.user_id
FROM ".FORUMS_TABLE." f, ".FORUM_MODS_TABLE." fm, ".USERS_TABLE." u
- WHERE f.forum_id = $forum_id
+ WHERE f.forum_id = $forum_id
AND fm.forum_id = $forum_id
AND u.user_id = fm.user_id";
}
@@ -69,22 +78,13 @@ if(!$total_rows = $db->sql_numrows($result))
//
-// Start session management
-//
-$userdata = session_pagestart($user_ip, $forum_id, $session_length);
-init_userprefs($userdata);
-//
-// End session management
+// Start auth check
//
-
-
-
//
-// Add checking for private forums here!!
+// End of auth check
//
-
$forum_row = $db->sql_fetchrowset($result);
if(!$forum_row)
{
@@ -92,7 +92,10 @@ if(!$forum_row)
}
$forum_name = stripslashes($forum_row[0]['forum_name']);
-$topics_count = $forum_row[0]['forum_topics'];
+if(empty($HTTP_POST_VARS['postdays']))
+{
+ $topics_count = $forum_row[0]['forum_topics'];
+}
for($x = 0; $x < $db->sql_numrows($result); $x++)
{
@@ -102,10 +105,61 @@ for($x = 0; $x < $db->sql_numrows($result); $x++)
$forum_moderators .= "<a href=\"".append_sid("profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$forum_row[$x]['user_id'])."\">".$forum_row[$x]['username']."</a>";
}
-if(!isset($start))
+//
+// Check for start
+//
+if(!isset($HTTP_GET_VARS['start']))
+{
+ $start = 0;
+}
+else
+{
+ $start = $HTTP_GET_VARS['start'];
+}
+
+//
+// Generate a 'Show posts in previous x days'
+// select box. If the postdays var is POSTed
+// then get it's value, find the number of topics
+// with dates newer than it (to properly handle
+// pagination) and alter the main query
+//
+$previous_days = array(0, 1, 7, 14, 20, 30, 60, 90, 120);
+
+if(!empty($HTTP_POST_VARS['postdays']))
{
+
+ $min_post_time = time() - ($HTTP_POST_VARS['postdays'] * 86400);
+
+ $sql = "SELECT COUNT(*) AS forum_topics
+ FROM ".TOPICS_TABLE."
+ WHERE forum_id = $forum_id
+ AND topic_time > $min_post_time";
+
+ if(!$result = $db->sql_query($sql))
+ {
+ error_die(SQL_QUERY, "Couldn't obtain limited topics count information.", __LINE__, __FILE__);
+ }
+ $topics_count = $db->sql_numrows($result);
+
+ $limit_posts_time = "AND t.topic_time > $min_post_time ";
$start = 0;
}
+else
+{
+ $limit_posts_time = "";
+}
+
+$select_post_days .= "<select name=\"postdays\">";
+for($i = 0; $i < count($previous_days); $i++)
+{
+ if(isset($HTTP_POST_VARS['postdays']))
+ {
+ $selected = ($HTTP_POST_VARS['postdays'] == $previous_days[$i]) ? " selected" : "";
+ }
+ $select_post_days .= ($previous_days[$i] == 0) ? "<option value=\"0\"$selected>$l_All_posts</option>" : "<option value=\"".$previous_days[$i]."\"$selected>".$previous_days[$i]." $l_Days</option>";
+}
+$select_post_days .= "</select>";
//
// Grab all the basic data for
@@ -117,6 +171,7 @@ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as i
AND t.topic_poster = u.user_id
AND p.post_id = t.topic_last_post_id
AND p.poster_id = u2.user_id
+ $limit_posts_time
ORDER BY topic_time DESC
LIMIT $start, ".$board_config['topics_per_page'];
if(!$t_result = $db->sql_query($sql))
@@ -125,14 +180,15 @@ if(!$t_result = $db->sql_query($sql))
}
$total_topics = $db->sql_numrows($t_result);
-
//
// Post URL generation for
// templating vars
//
$post_new_topic_url = append_sid("posting.".$phpEx."?mode=newtopic&".POST_FORUM_URL."=$forum_id");
$template->assign_vars(array(
- "U_POST_NEW_TOPIC" => $post_new_topic_url));
+ "U_POST_NEW_TOPIC" => $post_new_topic_url,
+ "S_SELECT_POST_DAYS" => $select_post_days,
+ "S_POST_DAYS_ACTION" => append_sid("viewforum.$phpEx?".POST_FORUM_URL."=".$forum_id."&start=$start")));
//
// Dump out the page header