| Line 49 | Line 49 |
|---|
else
{
$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
|
else
{
$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
|
| | }
// Handle marking everything read
if ($mark_read == 'all')
{
$redirect = build_url(array('mark', 'hash'));
meta_refresh(3, $redirect);
if (check_link_hash(request_var('hash', ''), 'global'))
{
markread('all');
trigger_error(
$user->lang['FORUMS_MARKED'] . '<br /><br />' .
sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
);
}
else
{
trigger_error(sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
}
|
}
// Display list of active topics for this category?
| }
// Display list of active topics for this category?
|
| Line 102 | Line 123 |
|---|
$forum_tracking_info = array();
$branch_root_id = $root_data['forum_id'];
|
$forum_tracking_info = array();
$branch_root_id = $root_data['forum_id'];
|
| |
// Check for unread global announcements (index page only)
$ga_unread = false;
if ($root_data['forum_id'] == 0)
{
$unread_ga_list = get_unread_topics($user->data['user_id'], 'AND t.forum_id = 0', '', 1);
if (!empty($unread_ga_list))
{
$ga_unread = true;
}
}
|
while ($row = $db->sql_fetchrow($result))
{
$forum_id = $row['forum_id'];
// Mark forums read?
|
while ($row = $db->sql_fetchrow($result))
{
$forum_id = $row['forum_id'];
// Mark forums read?
|
if ($mark_read == 'forums' || $mark_read == 'all')
| if ($mark_read == 'forums')
|
{
if ($auth->acl_get('f_list', $forum_id))
{
$forum_ids[] = $forum_id;
|
{
if ($auth->acl_get('f_list', $forum_id))
{
$forum_ids[] = $forum_id;
|
continue;
| |
}
|
}
|
| |
continue;
|
}
// Category with no members
| }
// Category with no members
|
| Line 138 | Line 173 |
|---|
$right_id = $row['right_id'];
continue;
}
|
$right_id = $row['right_id'];
continue;
}
|
$forum_ids[] = $forum_id;
| |
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
|
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
|
| Line 154 | Line 187 |
|---|
$forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark'];
}
|
$forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark'];
}
|
| | // Count the difference of real to public topics, so we can display an information to moderators
$row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && ($row['forum_topics_real'] != $row['forum_topics'])) ? $forum_id : 0;
|
$row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
// Display active topics from this forum?
| $row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
// Display active topics from this forum?
|
| Line 210 | Line 245 |
|---|
if (isset($subforums[$parent_id][$row['parent_id']]) && !$row['display_on_index'])
{
$subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id;
|
if (isset($subforums[$parent_id][$row['parent_id']]) && !$row['display_on_index'])
{
$subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id;
|
| | }
if (!$forum_rows[$parent_id]['forum_id_unapproved_topics'] && $row['forum_id_unapproved_topics'])
{
$forum_rows[$parent_id]['forum_id_unapproved_topics'] = $forum_id;
|
}
$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
| }
$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
|
| Line 235 | Line 275 |
|---|
$db->sql_freeresult($result);
// Handle marking posts
|
$db->sql_freeresult($result);
// Handle marking posts
|
if ($mark_read == 'forums' || $mark_read == 'all')
| if ($mark_read == 'forums')
|
{
|
{
|
$redirect = build_url('mark', 'hash');
| $redirect = build_url(array('mark', 'hash'));
|
$token = request_var('hash', '');
if (check_link_hash($token, 'global'))
{
|
$token = request_var('hash', '');
if (check_link_hash($token, 'global'))
{
|
if ($mark_read == 'all')
{
markread('all');
$message = sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>');
}
else
{
| // Add 0 to forums array to mark global announcements correctly
$forum_ids[] = 0;
|
markread('topics', $forum_ids);
$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
|
markread('topics', $forum_ids);
$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
|
}
| |
meta_refresh(3, $redirect);
trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
}
| meta_refresh(3, $redirect);
trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
}
|
| Line 299 | Line 333 |
|---|
$forum_id = $row['forum_id'];
$forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false;
|
$forum_id = $row['forum_id'];
$forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false;
|
| |
// Mark the first visible forum on index as unread if there's any unread global announcement
if ($ga_unread && !empty($forum_ids_moderator) && $forum_id == $forum_ids_moderator[0])
{
$forum_unread = true;
}
|
$folder_image = $folder_alt = $l_subforums = '';
$subforums_list = array();
|
$folder_image = $folder_alt = $l_subforums = '';
$subforums_list = array();
|
| Line 368 | Line 408 |
|---|
}
else
{
|
}
else
{
|
$folder_alt = ($forum_unread) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
| $folder_alt = ($forum_unread) ? 'UNREAD_POSTS' : 'NO_UNREAD_POSTS';
|
}
// Create last post link information, if appropriate
| }
// Create last post link information, if appropriate
|
| Line 397 | Line 437 |
|---|
$s_subforums_list = array();
foreach ($subforums_list as $subforum)
{
|
$s_subforums_list = array();
foreach ($subforums_list as $subforum)
{
|
$s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['NEW_POSTS'] : $user->lang['NO_NEW_POSTS']) . '">' . $subforum['name'] . '</a>';
| $s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['UNREAD_POSTS'] : $user->lang['NO_UNREAD_POSTS']) . '">' . $subforum['name'] . '</a>';
|
}
$s_subforums_list = (string) implode(', ', $s_subforums_list);
$catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false;
| }
$s_subforums_list = (string) implode(', ', $s_subforums_list);
$catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false;
|
| Line 425 | Line 465 |
|---|
'S_NO_CAT' => $catless && !$last_catless,
'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false,
'S_UNREAD_FORUM' => $forum_unread,
|
'S_NO_CAT' => $catless && !$last_catless,
'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false,
'S_UNREAD_FORUM' => $forum_unread,
|
| | 'S_AUTH_READ' => $auth->acl_get('f_read', $row['forum_id']),
|
'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false,
'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false,
'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false,
|
'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false,
'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false,
'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false,
|
| | 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false,
|
'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'],
|
'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'],
|
| Line 448 | Line 490 |
|---|
'SUBFORUMS' => $s_subforums_list,
'L_SUBFORUM_STR' => $l_subforums,
|
'SUBFORUMS' => $s_subforums_list,
'L_SUBFORUM_STR' => $l_subforums,
|
'L_FORUM_FOLDER_ALT' => $folder_alt,
| |
'L_MODERATOR_STR' => $l_moderator,
|
'L_MODERATOR_STR' => $l_moderator,
|
| | 'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '',
|
'U_VIEWFORUM' => $u_viewforum,
'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url)
| 'U_VIEWFORUM' => $u_viewforum,
'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url)
|
| Line 473 | Line 515 |
|---|
'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . '&f=' . $root_data['forum_id'] . '&mark=forums') : '',
'S_HAS_SUBFORUM' => ($visible_forums) ? true : false,
'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],
|
'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . '&f=' . $root_data['forum_id'] . '&mark=forums') : '',
'S_HAS_SUBFORUM' => ($visible_forums) ? true : false,
'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],
|
'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'))
);
| 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPICS_UNAPPROVED'),
));
|
if ($return_moderators)
{
|
if ($return_moderators)
{
|
| Line 514 | Line 557 |
|---|
*/
function generate_forum_nav(&$forum_data)
{
|
*/
function generate_forum_nav(&$forum_data)
{
|
global $db, $user, $template, $auth;
| global $db, $user, $template, $auth, $config;
|
global $phpEx, $phpbb_root_path;
if (!$auth->acl_get('f_list', $forum_data['forum_id']))
| global $phpEx, $phpbb_root_path;
if (!$auth->acl_get('f_list', $forum_data['forum_id']))
|
| Line 561 | Line 604 |
|---|
$template->assign_vars(array(
'FORUM_ID' => $forum_data['forum_id'],
'FORUM_NAME' => $forum_data['forum_name'],
|
$template->assign_vars(array(
'FORUM_ID' => $forum_data['forum_id'],
'FORUM_NAME' => $forum_data['forum_name'],
|
'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']))
);
| 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']),
'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && $forum_data['forum_type'] == FORUM_POST && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
));
|
return;
}
|
return;
}
|
| Line 627 | Line 672 |
|---|
$times = 1;
for ($j = 0; $j < $replies + 1; $j += $per_page)
{
|
$times = 1;
for ($j = 0; $j < $replies + 1; $j += $per_page)
{
|
$pagination .= '<a href="' . $url . '&start=' . $j . '">' . $times . '</a>';
| $pagination .= '<a href="' . $url . ($j == 0 ? '' : '&start=' . $j) . '">' . $times . '</a>';
|
if ($times == 1 && $total_pages > 5)
{
|
if ($times == 1 && $total_pages > 5)
{
|
$pagination .= ' ... ';
| $pagination .= '<span class="page-dots"> ... </span>';
|
// Display the last three pages
$times = $total_pages - 3;
|
// Display the last three pages
$times = $total_pages - 3;
|
| Line 658 | Line 703 |
|---|
{
global $config, $template, $db, $phpbb_root_path, $phpEx, $user, $auth;
|
{
global $config, $template, $db, $phpbb_root_path, $phpEx, $user, $auth;
|
// Have we disabled the display of moderators? If so, then return
// from whence we came ...
if (!$config['load_moderators'])
{
return;
}
$forum_sql = '';
| $forum_id_ary = array();
|
if ($forum_id !== false)
{
|
if ($forum_id !== false)
{
|
| Line 674 | Line 712 |
|---|
$forum_id = array($forum_id);
}
|
$forum_id = array($forum_id);
}
|
// If we don't have a forum then we can't have a moderator
if (!sizeof($forum_id))
{
return;
}
$forum_sql = 'AND m.' . $db->sql_in_set('forum_id', $forum_id);
| // Exchange key/value pair to be able to faster check for the forum id existence
$forum_id_ary = array_flip($forum_id);
|
}
$sql_array = array(
| }
$sql_array = array(
|
| Line 701 | Line 734 |
|---|
),
),
|
),
),
|
'WHERE' => "m.display_on_index = 1 $forum_sql",
| 'WHERE' => 'm.display_on_index = 1',
|
);
|
);
|
| | // We query every forum here because for caching we should not have any parameter.
|
$sql = $db->sql_build_query('SELECT', $sql_array);
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
{
|
$sql = $db->sql_build_query('SELECT', $sql_array);
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
{
|
| | $f_id = (int) $row['forum_id'];
if (!isset($forum_id_ary[$f_id]))
{
continue;
}
|
if (!empty($row['user_id']))
{
|
if (!empty($row['user_id']))
{
|
$forum_moderators[$row['forum_id']][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
| $forum_moderators[$f_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
|
}
else
{
| }
else
{
|
| Line 719 | Line 760 |
|---|
if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile'))
{
|
if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile'))
{
|
$forum_moderators[$row['forum_id']][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
| $forum_moderators[$f_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
|
}
else
{
|
}
else
{
|
$forum_moderators[$row['forum_id']][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>';
| $forum_moderators[$f_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>';
|
}
}
}
| }
}
}
|
| Line 825 | Line 866 |
|---|
$folder_img = ($unread_topic) ? $folder_new : $folder;
|
$folder_img = ($unread_topic) ? $folder_new : $folder;
|
$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
| $folder_alt = ($unread_topic) ? 'UNREAD_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_UNREAD_POSTS');
|
// Posted image?
if (!empty($topic_row['topic_posted']) && $topic_row['topic_posted'])
|
// Posted image?
if (!empty($topic_row['topic_posted']) && $topic_row['topic_posted'])
|
| Line 846 | Line 887 |
|---|
*/
function display_custom_bbcodes()
{
|
*/
function display_custom_bbcodes()
{
|
global $db, $template;
| global $db, $template, $user;
|
// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
$num_predefined_bbcodes = 22;
|
// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
$num_predefined_bbcodes = 22;
|
| Line 860 | Line 901 |
|---|
$i = 0;
while ($row = $db->sql_fetchrow($result))
{
|
$i = 0;
while ($row = $db->sql_fetchrow($result))
{
|
| | // If the helpline is defined within the language file, we will use the localised version, else just use the database entry...
if (isset($user->lang[strtoupper($row['bbcode_helpline'])]))
{
$row['bbcode_helpline'] = $user->lang[strtoupper($row['bbcode_helpline'])];
}
|
$template->assign_block_vars('custom_tags', array(
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
| $template->assign_block_vars('custom_tags', array(
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
|
| Line 933 | Line 980 |
|---|
$forum_ary = array_unique($forum_ary);
$forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : '';
|
$forum_ary = array_unique($forum_ary);
$forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : '';
|
| |
$fid_m_approve = $auth->acl_getf('m_approve', true);
$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', array_keys($fid_m_approve)) : '';
|
// Obtain active forum
$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1
|
// Obtain active forum
$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1
|
| | AND (post_approved = 1
$sql_m_approve)
|
$forum_sql
GROUP BY forum_id
ORDER BY num_posts DESC";
| $forum_sql
GROUP BY forum_id
ORDER BY num_posts DESC";
|
| Line 957 | Line 1009 |
|---|
}
// Obtain active topic
|
}
// Obtain active topic
|
| | // We need to exclude passworded forums here so we do not leak the topic title
$forum_ary_topic = array_unique(array_merge($forum_ary, $user->get_passworded_forums()));
$forum_sql_topic = (!empty($forum_ary_topic)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary_topic, true) : '';
|
$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1
|
$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1
|
$forum_sql
| AND (post_approved = 1
$sql_m_approve)
$forum_sql_topic
|
GROUP BY topic_id
ORDER BY num_posts DESC";
$result = $db->sql_query_limit($sql, 1);
| GROUP BY topic_id
ORDER BY num_posts DESC";
$result = $db->sql_query_limit($sql, 1);
|
| Line 1017 | Line 1075 |
|---|
/**
* Topic and forum watching common code
*/
|
/**
* Topic and forum watching common code
*/
|
function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0)
| function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')
|
{
global $template, $db, $user, $phpEx, $start, $phpbb_root_path;
| {
global $template, $db, $user, $phpEx, $start, $phpbb_root_path;
|
| Line 1026 | Line 1084 |
|---|
$match_id = ($mode == 'forum') ? $forum_id : $topic_id;
$u_url = "uid={$user->data['user_id']}";
$u_url .= ($mode == 'forum') ? '&f' : '&f=' . $forum_id . '&t';
|
$match_id = ($mode == 'forum') ? $forum_id : $topic_id;
$u_url = "uid={$user->data['user_id']}";
$u_url .= ($mode == 'forum') ? '&f' : '&f=' . $forum_id . '&t';
|
| | $is_watching = 0;
|
// Is user watching this thread?
if ($user_id != ANONYMOUS)
|
// Is user watching this thread?
if ($user_id != ANONYMOUS)
|
| Line 1050 | Line 1109 |
|---|
if (isset($_GET['unwatch']))
{
$uid = request_var('uid', 0);
|
if (isset($_GET['unwatch']))
{
$uid = request_var('uid', 0);
|
if ($uid != $user_id)
| $token = request_var('hash', '');
if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))
{
if ($uid != $user_id || $_GET['unwatch'] != $mode)
|
{
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
trigger_error($message);
}
|
{
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
trigger_error($message);
}
|
if ($_GET['unwatch'] == $mode)
{
$is_watching = 0;
| |
$sql = 'DELETE FROM ' . $table_sql . "
WHERE $where_sql = $match_id
AND user_id = $user_id";
$db->sql_query($sql);
|
$sql = 'DELETE FROM ' . $table_sql . "
WHERE $where_sql = $match_id
AND user_id = $user_id";
$db->sql_query($sql);
|
}
| |
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
|
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
|
| $message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />';
$message .= sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
|
meta_refresh(3, $redirect_url);
|
meta_refresh(3, $redirect_url);
|
$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
| |
trigger_error($message);
|
trigger_error($message);
|
| | }
else
{
$s_hidden_fields = array(
'uid' => $user->data['user_id'],
'unwatch' => $mode,
'start' => $start,
'f' => $forum_id,
);
if ($mode != 'forum')
{
$s_hidden_fields['t'] = $topic_id;
}
if ($item_title == '')
{
$confirm_box_message = 'UNWATCH_' . strtoupper($mode);
}
else
{
$confirm_box_message = $user->lang('UNWATCH_' . strtoupper($mode) . '_DETAILED', $item_title);
}
confirm_box(false, $confirm_box_message, build_hidden_fields($s_hidden_fields));
}
|
}
else
{
$is_watching = true;
|
}
else
{
$is_watching = true;
|
if ($notify_status)
| if ($notify_status != NOTIFY_YES)
|
{
$sql = 'UPDATE ' . $table_sql . "
|
{
$sql = 'UPDATE ' . $table_sql . "
|
SET notify_status = 0
| SET notify_status = " . NOTIFY_YES . "
|
WHERE $where_sql = $match_id
AND user_id = $user_id";
$db->sql_query($sql);
| WHERE $where_sql = $match_id
AND user_id = $user_id";
$db->sql_query($sql);
|
| Line 1091 | Line 1173 |
|---|
{
if (isset($_GET['watch']))
{
|
{
if (isset($_GET['watch']))
{
|
| | $uid = request_var('uid', 0);
|
$token = request_var('hash', '');
|
$token = request_var('hash', '');
|
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
| |
|
|
if ($_GET['watch'] == $mode && check_link_hash($token, "{$mode}_$match_id"))
| if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))
|
{
|
{
|
| | if ($uid != $user_id || $_GET['watch'] != $mode)
{
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
trigger_error($message);
}
|
$is_watching = true;
$sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status)
|
$is_watching = true;
$sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status)
|
VALUES ($user_id, $match_id, 0)";
| VALUES ($user_id, $match_id, " . NOTIFY_YES . ')';
|
$db->sql_query($sql);
|
$db->sql_query($sql);
|
| |
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
|
$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
|
$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
|
| | meta_refresh(3, $redirect_url);
trigger_error($message);
|
}
else
{
|
}
else
{
|
$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
| $s_hidden_fields = array(
'uid' => $user->data['user_id'],
'watch' => $mode,
'start' => $start,
'f' => $forum_id,
);
if ($mode != 'forum')
{
$s_hidden_fields['t'] = $topic_id;
|
}
|
}
|
meta_refresh(3, $redirect_url);
trigger_error($message);
| $confirm_box_message = (($item_title == '') ? 'WATCH_' . strtoupper($mode) : $user->lang('WATCH_' . strtoupper($mode) . '_DETAILED', $item_title));
confirm_box(false, $confirm_box_message, build_hidden_fields($s_hidden_fields));
}
|
}
else
{
| }
else
{
|
| Line 1120 | Line 1221 |
|---|
}
else
{
|
}
else
{
|
if (isset($_GET['unwatch']) && $_GET['unwatch'] == $mode)
| if ((isset($_GET['unwatch']) && $_GET['unwatch'] == $mode) || (isset($_GET['watch']) && $_GET['watch'] == $mode))
|
{
login_box();
}
| {
login_box();
}
|
| Line 1150 | Line 1251 |
|---|
* @param string &$rank_img the rank image as full img tag is stored here after execution
* @param string &$rank_img_src the rank image source is stored here after execution
*
|
* @param string &$rank_img the rank image as full img tag is stored here after execution
* @param string &$rank_img_src the rank image source is stored here after execution
*
|
| | * Note: since we do not want to break backwards-compatibility, this function will only properly assign ranks to guests if you call it for them with user_posts == false
|
*/
function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
{
| */
function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
{
|
| Line 1167 | Line 1269 |
|---|
$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
}
|
$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
}
|
else
| else if ($user_posts !== false)
|
{
if (!empty($ranks['normal']))
{
| {
if (!empty($ranks['normal']))
{
|
| Line 1193 | Line 1295 |
|---|
* @param string $avatar_width Width of users avatar
* @param string $avatar_height Height of users avatar
* @param string $alt Optional language string for alt tag within image, can be a language key or text
|
* @param string $avatar_width Width of users avatar
* @param string $avatar_height Height of users avatar
* @param string $alt Optional language string for alt tag within image, can be a language key or text
|
| | * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
|
*
* @return string Avatar image
*/
|
*
* @return string Avatar image
*/
|
function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR')
| function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
|
{
global $user, $config, $phpbb_root_path, $phpEx;
|
{
global $user, $config, $phpbb_root_path, $phpEx;
|
if (empty($avatar) || !$avatar_type)
| if (empty($avatar) || !$avatar_type || (!$config['allow_avatar'] && !$ignore_config))
|
{
return '';
}
| {
return '';
}
|
| Line 1210 | Line 1313 |
|---|
switch ($avatar_type)
{
case AVATAR_UPLOAD:
|
switch ($avatar_type)
{
case AVATAR_UPLOAD:
|
| | if (!$config['allow_avatar_upload'] && !$ignore_config)
{
return '';
}
|
$avatar_img = $phpbb_root_path . "download/file.$phpEx?avatar=";
break;
case AVATAR_GALLERY:
|
$avatar_img = $phpbb_root_path . "download/file.$phpEx?avatar=";
break;
case AVATAR_GALLERY:
|
| | if (!$config['allow_avatar_local'] && !$ignore_config)
{
return '';
}
|
$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
|
$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
|
| | break;
case AVATAR_REMOTE:
if (!$config['allow_avatar_remote'] && !$ignore_config)
{
return '';
}
|
break;
}
| break;
}
|
