makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

sticky/announcement time limit

Browse source 
login upon notification


git-svn-id: file:///svn/phpbb/trunk@4577 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-10-12 09:27:16 +00:00
parent 149fff3596
commit 3bd4218780
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/viewtopic.php
View file

@ -162,7 +162,7 @@ if ($user->data['user_id'] != ANONYMOUS)
// whereupon we join on the forum_id passed as a parameter ... this // whereupon we join on the forum_id passed as a parameter ... this
// is done so navigation, forum name, etc. remain consistent with where // is done so navigation, forum name, etc. remain consistent with where
// user clicked to view a global topic // user clicked to view a global topic
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_attachment, t.topic_status, t.topic_approved, ' . (($auth->acl_get('m_approve')) ? 't.topic_replies_real AS topic_replies' : 't.topic_replies') . ', t.topic_last_post_id, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style, f.forum_password' . $extra_fields . ' $sql = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_attachment, t.topic_status, t.topic_approved, ' . (($auth->acl_get('m_approve')) ? 't.topic_replies_real AS topic_replies' : 't.topic_replies') . ', t.topic_last_post_id, t.topic_poster, t.topic_time, t.topic_time_limit, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style, f.forum_password' . $extra_fields . '
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f' . $join_sql_table . " FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f' . $join_sql_table . "
WHERE $join_sql WHERE $join_sql
AND (f.forum_id = t.forum_id AND (f.forum_id = t.forum_id
@ -179,6 +179,17 @@ if (!($topic_data = $db->sql_fetchrow($result)))
// Extract the data // Extract the data
extract($topic_data); extract($topic_data);
// Check sticky/announcement time limit
if (($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) && $topic_time_limit && $topic_time+$topic_time_limit < time())
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_type = ' . POST_NORMAL . ', topic_time_limit = 0
WHERE topic_id = ' . $topic_id;
$db->sql_query($sql);
$topic_type = POST_NORMAL;
$topic_time_limit = 0;
}
// Setup look and feel // Setup look and feel
$user->setup(false, $forum_style); $user->setup(false, $forum_style);
@ -205,6 +216,12 @@ if ($forum_password)
login_forum_box($topic_data); login_forum_box($topic_data);
} }
// Redirect to login upon emailed notification links
if (isset($_GET['e']) && (int) $_GET['e'] && $user->data['user_id'] == ANONYMOUS)
{
login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])), '', $user->lang['LOGIN_NOTIFY_TOPIC']);
}
// Not final in the slightest! Far too simplistic // Not final in the slightest! Far too simplistic
if ($rate) if ($rate)
{ {
@ -393,7 +410,7 @@ gen_forum_rules('topic', $forum_id);
// Quick mod tools // Quick mod tools
$topic_mod = ''; $topic_mod = '';
$topic_mod .= ($auth->acl_get('m_lock', $forum_id)) ? (($topic_status == ITEM_UNLOCKED) ? '<option value="lock">' . $user->lang['LOCK_TOPIC'] . '</option>' : '<option value="unlock">' . $user->lang['UNLOCK_TOPIC'] . '</option>') : ''; $topic_mod .= ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_lock', $forum_id) && $user->data['user_id'] != ANONYMOUS && $user->data['user_id'] == $topic_poster)) ? (($topic_status == ITEM_UNLOCKED) ? '<option value="lock">' . $user->lang['LOCK_TOPIC'] . '</option>' : '<option value="unlock">' . $user->lang['UNLOCK_TOPIC'] . '</option>') : '';
$topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '<option value="delete_topic">' . $user->lang['DELETE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '<option value="delete_topic">' . $user->lang['DELETE_TOPIC'] . '</option>' : '';
$topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : '';
$topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : '';
@ -795,7 +812,7 @@ do
$bbcode_bitfield |= $row['bbcode_bitfield']; $bbcode_bitfield |= $row['bbcode_bitfield'];
// Is a signature attached? Are we going to display it? // Is a signature attached? Are we going to display it?
if ($row['enable_sig'] && $config['allow_sig'] && $user->data['user_viewsigs']) if ($row['enable_sig'] && $config['allow_sig'] && $user->optionget('viewsigs'))
{ {
$bbcode_bitfield |= $row['user_sig_bbcode_bitfield']; $bbcode_bitfield |= $row['user_sig_bbcode_bitfield'];
} }
@ -829,7 +846,7 @@ do
else else
{ {
$user_sig = ''; $user_sig = '';
if ($row['user_sig'] && $config['allow_sig'] && $user->data['user_viewsigs']) if ($row['user_sig'] && $config['allow_sig'] && $user->optionget('viewsigs'))
{ {
$user_sig = $row['user_sig']; $user_sig = $row['user_sig'];
} }
@ -861,7 +878,7 @@ do
); );
if ($row['user_avatar'] && $user->data['user_viewavatars']) if ($row['user_avatar'] && $user->optionget('viewavatars'))
{ {
$avatar_img = ''; $avatar_img = '';
switch ($row['user_avatar_type']) switch ($row['user_avatar_type'])
@ -1107,7 +1124,7 @@ foreach ($rowset as $i => $row)
// If we allow users to disable display of emoticons // If we allow users to disable display of emoticons
// we'll need an appropriate check and preg_replace here // we'll need an appropriate check and preg_replace here
$message = (empty($config['allow_smilies']) || !$user->data['user_viewsmilies']) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); $message = (empty($config['allow_smilies']) || !$user->optionget('viewsmilies')) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message);
// Highlight active words (primarily for search) // Highlight active words (primarily for search)
if ($highlight_match) if ($highlight_match)