- | lang['UPLOAD_ICON']; ?>: |
+ lang['UPLOAD_ICON']; ?>: |
@@ -935,11 +935,11 @@ if ($mode == 'ext_groups')
- | lang['MAX_EXTGROUP_FILESIZE']; ?>: |
+ lang['MAX_EXTGROUP_FILESIZE']; ?>: |
|
- |
|
|
- lang['ALLOWED_FORUMS']; ?>:
lang['ALLOWED_FORUMS_EXPLAIN']; ?> |
+ lang['ALLOWED_FORUMS']; ?>:
lang['ALLOWED_FORUMS_EXPLAIN']; ?> |
/> lang['ALLOW_ALL_FORUMS']; ?> /> lang['ALLOW_SELECTED_FORUMS']; ?>
|
diff --git a/phpBB/styles/subSilver/template/posting_topic_review.html b/phpBB/styles/subSilver/template/posting_topic_review.html
index 0a29a3758e..19bdf0023f 100644
--- a/phpBB/styles/subSilver/template/posting_topic_review.html
+++ b/phpBB/styles/subSilver/template/posting_topic_review.html
@@ -24,9 +24,6 @@
|
| {topic_review_row.POSTER_NAME} |
-
- | {topic_review_row.KARMA_IMG} |
-
|
diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html
index 2916165c4e..17d6b49f7a 100644
--- a/phpBB/styles/subSilver/template/viewforum_body.html
+++ b/phpBB/styles/subSilver/template/viewforum_body.html
@@ -3,13 +3,14 @@
-
+
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index cea26f5a47..c0dea66295 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -3,13 +3,14 @@
-
+
@@ -134,9 +135,6 @@
-
- | {postrow.KARMA_IMG} |
-
| {postrow.ONLINE_IMG} |
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 80d383e837..2b1e6e0a51 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -301,7 +301,12 @@ switch ($mode)
// Only registered users can go beyond this point
if ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_INACTIVE || $user->data['user_type'] == USER_IGNORE)
{
- redirect("index.$phpEx");
+ if ($user->data['user_id'] != ANONYMOUS)
+ {
+ redirect("index.$phpEx");
+ }
+
+ login_box($user->cur_page, '', $user->lang['LOGIN_EXPLAIN_UCP']);
}
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 0cfcedc882..24a9829920 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -119,7 +119,7 @@ if ($forum_data['forum_password'])
// Redirect to login upon emailed notification links
if (isset($_GET['e']) && $user->data['user_id'] == ANONYMOUS)
{
- login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])), '', $user->lang['LOGIN_NOTIFY_FORUM']);
+ login_box($user->cur_page, '', $user->lang['LOGIN_NOTIFY_FORUM']);
}
// Permissions check
@@ -130,12 +130,15 @@ if (!$auth->acl_get('f_read', $forum_id))
trigger_error($user->lang['SORRY_AUTH_READ']);
}
- login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])), '', $user->lang['LOGIN_VIEWFORUM']);
+ login_box($user->cur_page, '', $user->lang['LOGIN_VIEWFORUM']);
}
// Build navigation links
generate_forum_nav($forum_data);
+// Forum Rules
+generate_forum_rules($forum_data);
+
// Do we have subforums?
$active_forum_ary = $moderators = array();
@@ -198,7 +201,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
}
$s_forum_rules = '';
- gen_forum_rules('forum', $forum_id);
+ gen_forum_auth_level('forum', $forum_id);
// Topic ordering options
$limit_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']);
@@ -280,7 +283,6 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
'S_FORUM_ACTION' => "viewforum.$phpEx$SID&f=$forum_id&start=$start",
'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('f_search', $forum_id)) ? true : false,
'S_SEARCHBOX_ACTION' => "search.$phpEx$SID&f[]=$forum_id",
- 'S_FORUM_RULES' => false,
'U_MCP' => ($auth->acl_gets('m_', $forum_id)) ? "mcp.$phpEx?sid=$user->session_id&f=$forum_id&mode=forum_view" : '',
'U_POST_NEW_TOPIC' => "posting.$phpEx$SID&mode=post&f=$forum_id",
@@ -407,10 +409,10 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
$topic_type = '';
if ($row['topic_status'] == ITEM_MOVED)
{
- $topic_type = $user->lang['VIEW_TOPIC_MOVED'] . ' ';
+ $topic_type = $user->lang['VIEW_TOPIC_MOVED'];
$topic_id = $row['topic_moved_id'];
- $folder_image = 'folder';
+ $folder_img = 'folder';
$folder_alt = 'Topic_Moved';
$newest_post_img = '';
}
@@ -576,7 +578,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
if ((isset($row['mark_time']) && $row['topic_last_post_time'] > $row['mark_time']) || (empty($row['mark_time']) && $row['topic_last_post_time'] > $forum_data['mark_time']))
{
// sync post/topic marking
- if (!$unread_topic && !empty($row['mark_time']) && $row['mark_time'])
+ if (isset($unread_topc) && !$unread_topic && !empty($row['mark_time']) && $row['mark_time'])
{
markread('topic', $forum_id, $topic_id);
}
@@ -609,7 +611,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
// on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find
// any it updates the forum last read cookie. This requires that the user visit the forum
// after reading a topic
- if ($forum_data['forum_type'] == FORUM_POST && $user->data['user_id'] != ANONYMOUS && $mark_forum_read)
+ if ($forum_data['forum_type'] == FORUM_POST && $user->data['user_id'] != ANONYMOUS && count($topic_list) && $mark_forum_read)
{
markread('mark', $forum_id);
}
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 0631a6d0a4..5224eda215 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -162,7 +162,7 @@ if ($user->data['user_id'] != ANONYMOUS)
// whereupon we join on the forum_id passed as a parameter ... this
// is done so navigation, forum name, etc. remain consistent with where
// 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_last_poster_id, t.topic_last_post_time, t.topic_poster, t.topic_time, t.topic_time_limit, t.topic_type, t.topic_bumped, t.topic_bumper, 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_type, 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_last_poster_id, t.topic_last_post_time, t.topic_poster, t.topic_time, t.topic_time_limit, t.topic_type, t.topic_bumped, t.topic_bumper, 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_type, f.forum_id, f.forum_style, f.forum_password, f.forum_rules, f.forum_rules_link, f.forum_rules_flags' . $extra_fields . '
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f' . $join_sql_table . "
WHERE $join_sql
AND (f.forum_id = t.forum_id
@@ -236,7 +236,7 @@ if (!$auth->acl_get('f_read', $forum_id))
trigger_error($user->lang['SORRY_AUTH_READ']);
}
- login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])), '', $user->lang['LOGIN_VIEWFORUM']);
+ login_box($user->cur_page, '', $user->lang['LOGIN_VIEWFORUM']);
}
// Forum is passworded ... check whether access has been granted to this
@@ -334,7 +334,7 @@ if ($hilit_words)
// Forum rules listing
$s_forum_rules = '';
-gen_forum_rules('topic', $forum_id);
+gen_forum_auth_level('topic', $forum_id);
// Quick mod tools
$topic_mod = '';
@@ -357,6 +357,9 @@ $pagination = generate_pagination($pagination_url, $total_posts, $config['posts_
// Navigation links
generate_forum_nav($topic_data);
+// Forum Rules
+generate_forum_rules($topic_data);
+
// Moderators
$forum_moderators = array();
get_moderators($forum_moderators, $forum_id);
@@ -663,7 +666,7 @@ while ($row = $db->sql_fetchrow($result))
if ($row['foe'])
{
$rowset[$row['post_id']] = array(
- 'foe' => TRUE,
+ 'foe' => true,
'post_id' => $row['post_id'],
'poster' => $poster,
);
@@ -728,8 +731,6 @@ while ($row = $db->sql_fetchrow($result))
'joined' => '',
'posts' => '',
'from' => '',
- 'karma' => 0,
- 'karma_img' => '',
'sig' => '',
'sig_bbcode_uid' => '',
@@ -971,7 +972,7 @@ for ($i = 0; $i < count($post_list); ++$i)
// i) The posters karma is below the minimum of the user ... not in 2.2.x
// ii) The poster is on the users ignore list
// iii) The post was made in a codepage different from the users
- if ($row['foe'])
+ if (isset($row['foe']) && $row['foe'])
{
$template->assign_block_vars('postrow', array(
'S_IGNORE_POST' => true,
|