aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-08-09 17:05:20 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-08-09 17:05:20 +0000
commitbd3a6850aab60c5e76e1f96a88609115d740d734 (patch)
tree14c2dec5026ea07ca71b29ffab15cfda0a93af0d
parent53150c6803e05b87975f7eb43d1eefe56f12e8b6 (diff)
downloadforums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar
forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.gz
forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.bz2
forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.xz
forums-bd3a6850aab60c5e76e1f96a88609115d740d734.zip
Improved index folder mark code
git-svn-id: file:///svn/phpbb/trunk@821 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/index.php42
-rwxr-xr-xphpBB/language/lang_english.php16
-rw-r--r--phpBB/templates/PSO/index_body.tpl2
3 files changed, 32 insertions, 28 deletions
diff --git a/phpBB/index.php b/phpBB/index.php
index 8c62327d5e..95711d4500 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -176,14 +176,14 @@ if($total_categories = $db->sql_numrows($q_categories))
{
$forum_mods_single_user[$forum_mods_list[$i]['forum_id']][] = 1;
- $forum_mods_name[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['username'];
+ $forum_mods_name[$forum_mods_list[$i]['forum_id']][] = stripslashes($forum_mods_list[$i]['username']);
$forum_mods_id[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['user_id'];
}
else
{
$forum_mods_single_user[$forum_mods_list[$i]['forum_id']][] = 0;
- $forum_mods_name[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['group_name'];
+ $forum_mods_name[$forum_mods_list[$i]['forum_id']][] = stripslashes($forum_mods_list[$i]['group_name']);
$forum_mods_id[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['group_id'];
}
}
@@ -193,12 +193,6 @@ if($total_categories = $db->sql_numrows($q_categories))
//
$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_rows);
- //
- // Output page header and open the index body template
- //
- $page_title = $lang['Forum_Index'];
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
$template->set_filenames(array(
"body" => "index_body.tpl")
);
@@ -248,37 +242,29 @@ if($total_categories = $db->sql_numrows($q_categories))
if($forum_rows[$j]['forum_status'] == FORUM_LOCKED)
{
$folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"" . $lang['Forum_locked'] . "\" />";
-
}
else
{
+ $unread_topics = false;
if( count($new_topic_data[$forum_id]) )
{
for($k = 0; $k < count($new_topic_data[$forum_id]); $k++)
{
- if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $new_topic_data[$forum_id][$k]]) )
- {
- $folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
- }
- else
+ if( !isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $new_topic_data[$forum_id][$k]]) )
{
if($mark_read == "forums")
{
- setcookie('phpbb2_' . $forum_id . '_' . $new_topic_data[$forum_id][$k], time(), time()+6000, $cookiepath, $cookiedomain, $cookiesecure);
- $folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ setcookie('phpbb2_' . $forum_id . '_' . $new_topic_data[$forum_id][$k], time(), 0, $cookiepath, $cookiedomain, $cookiesecure);
}
else
{
- $folder_image = "<img src=\"" . $images['folder_new'] . "\" alt=\"" . $lang['New_posts'] . "\" />";
+ $unread_topics = true;
}
}
}
}
- else
- {
- $folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
- }
+ $folder_image = ( $unread_topics ) ? "<img src=\"" . $images['folder_new'] . "\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
}
$posts = $forum_rows[$j]['forum_posts'];
@@ -288,15 +274,15 @@ if($total_categories = $db->sql_numrows($q_categories))
{
if($forum_rows[$j]['user_id'] == ANONYMOUS && $forum_rows[$j]['post_username'] != '')
{
- $last_poster = $forum_rows[$j]['post_username'];
+ $last_poster = stripslashes($forum_rows[$j]['post_username']);
}
else
{
- $last_poster = $forum_rows[$j]['username'];
+ $last_poster = stripslashes($forum_rows[$j]['username']);
}
$last_post_time = create_date($board_config['default_dateformat'], $forum_rows[$j]['post_time'], $board_config['default_timezone']);
- $last_post = $last_post_time . "<br />by ";
+ $last_post = $last_post_time . "<br />" . $lang['by'] . " ";
$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $forum_rows[$j]['user_id']) . "\">" . $last_poster . "</a>&nbsp;";
$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $forum_rows[$j]['topic_last_post_id']) . "#" . $forum_rows[$j]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
@@ -381,6 +367,14 @@ else
}
//
+// Output page header and open the index body template
+// we do this here because of the mark topics read cookie
+// code
+//
+$page_title = $lang['Forum_Index'];
+include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+//
// Generate the page
//
$template->pparse("body");
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 9fcab40e73..d563892a24 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -6,7 +6,11 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
+<<<<<<< lang_english.php
* $Id$
+=======
+ * $Id$
+>>>>>>> 1.104
*
* ***************************************************************************/
@@ -141,6 +145,9 @@ $lang['Usergroups'] = "Usergroups";
$lang['Last_Post'] = "Last Post";
$lang['Moderator'] = "Moderator/s";
+$lang['Mark_all_topics'] = "Mark all topics read";
+$lang['Mark_all_forums'] = "Mark all forums read";
+
//
// Stats block text
//
@@ -188,8 +195,8 @@ $lang['Reached_on_error'] = "You have reached this page in error, please go back
$lang['Display_topics'] = "Display topics from previous";
$lang['All_Topics'] = "All Topics";
-$lang['Annoucement'] = "<b>Annoucement:</b>";
-$lang['Sticky'] = "<b>Sticky:</b>";
+$lang['Topic_Announcement'] = "<b>Announcement:</b>";
+$lang['Topic_Sticky'] = "<b>Sticky:</b>";
//
// Viewtopic
@@ -242,7 +249,7 @@ $lang['Post_a_reply'] = "Post a reply";
$lang['Post_topic_as'] = "Post topic as";
$lang['Edit_Post'] = "Edit post";
$lang['Post_Normal'] = "Normal";
-$lang['Post_Annoucement'] = "Announcement";
+$lang['Post_Announcement'] = "Announcement";
$lang['Post_Sticky'] = "Sticky";
$lang['Options'] = "Options";
@@ -547,6 +554,7 @@ $lang['this_forum'] = " this forum";
//
$lang['Who_is_online'] = "Who is online";
$lang['Online_explain'] = "This data is based on users active over the past five minutes";
+$lang['No_users_browsing'] = "There are no users currently browsing this forum";
$lang['Location'] = "Location";
$lang['Last_updated'] = "Last Updated";
@@ -911,4 +919,4 @@ $l_emailpass = "Email Lost Password";
$l_passexplain = "Please fill out the form, a new password will be sent to your Email address";
$l_sendpass = "Send Password";
-?>
+?> \ No newline at end of file
diff --git a/phpBB/templates/PSO/index_body.tpl b/phpBB/templates/PSO/index_body.tpl
index 475cd3445f..ab00dea929 100644
--- a/phpBB/templates/PSO/index_body.tpl
+++ b/phpBB/templates/PSO/index_body.tpl
@@ -64,6 +64,8 @@
<td width="20" align="center"><img src="images/folder_lock.gif" alt="{L_FORUM_LOCKED}" /></td>
<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
</tr>
+ <tr>
+ <td colspan="8"><br /><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_FORUMS_READ}</a></span></td>
</table></td>
<td align="right" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
</tr>
generated by cgit v1.2.1 (git 2.21.0) at 2025-06-24 11:22:11 +0000