diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 5bc029f75c..abc115330c 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -89,15 +89,15 @@
-
+
-
+
-
+

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index eea150ae6b..458cae5d97 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -172,7 +172,7 @@ a:active { #content h1 { color: #115098; line-height: 1.2em; - margin-bottom: 0px; + margin-bottom: 0; } #main { @@ -191,6 +191,11 @@ a:active { height: 350px; } +.simple-page-body { + padding: 0; + padding-right: 10px; + min-width: 0; +} /* Tabbed menu Based on: http://www.alistapart.com/articles/slidingdoors2/ @@ -257,12 +262,12 @@ a:active { } #tabs #activetab a { - background-position: 0 0px; + background-position: 0 0; border-bottom: 1px solid #DCDEE2; } #tabs #activetab a span { - background-position: 100% 0px; + background-position: 100% 0; padding-bottom: 5px; color: #23649F; } @@ -510,7 +515,7 @@ table.type2 th { } table.type2 td { - padding: 0px; + padding: 0; font-size: 1em; } @@ -640,7 +645,7 @@ legend { position: relative; text-transform: none; line-height: 1.2em; - top: 0em; + top: 0; vertical-align: middle; } @@ -1229,7 +1234,7 @@ input.disabled { font-weight: bold; line-height: 1.20em; text-align: right; - padding: 0px; + padding: 0; } .rtl .sourcenum { @@ -1240,7 +1245,7 @@ input.disabled { font-family: Monaco, 'Courier New', monospace; font-size: 1.25em; line-height: 1.20em; - padding: 0px; + padding: 0; } .syntaxbg { @@ -1392,11 +1397,11 @@ fieldset.permissions .permissions-switch { .permissions-category .activetab a:hover span.tabbg { color: #333333; - background-position: 100% 0px; + background-position: 100% 0; } .permissions-category .activetab a:hover { - background-position: 0 0px; + background-position: 0 0; } .permissions-category a span.colour { diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index b7ce2d986f..882026a1c1 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -101,4 +101,4 @@ function swatch(field) -

+
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 8e4cbda0e7..8ecb7627e5 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -504,7 +504,7 @@ class dbal if (!$this->return_on_error) { - $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]

' . $error['message'] . ' [' . $error['code'] . ']'; + $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]

' . $error['message'] . ' [' . $error['code'] . ']'; // Show complete SQL error and path to administrators only // Additionally show complete error on installation or if extended debug mode is enabled @@ -514,8 +514,8 @@ class dbal // Print out a nice backtrace... $backtrace = get_backtrace(); - $message .= ($sql) ? '

SQL

' . htmlspecialchars($sql) : ''; - $message .= ($backtrace) ? '

BACKTRACE
' . $backtrace : ''; + $message .= ($sql) ? '

SQL

' . htmlspecialchars($sql) : ''; + $message .= ($backtrace) ? '

BACKTRACE
' . $backtrace : ''; $message .= '
'; } else diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index d75a548d1b..69318212ea 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -899,7 +899,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) */ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { - global $user, $auth, $db, $template, $bbcode; + global $user, $auth, $db, $template, $bbcode, $cache; global $config, $phpbb_root_path, $phpEx; // Go ahead and pull all data for this topic @@ -941,10 +941,16 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $bbcode_bitfield = ''; $rowset = array(); + $has_attachments = false; while ($row = $db->sql_fetchrow($result)) { $rowset[$row['post_id']] = $row; $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); + + if ($row['post_attachment']) + { + $has_attachments = true; + } } $db->sql_freeresult($result); @@ -955,6 +961,27 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $bbcode = new bbcode(base64_encode($bbcode_bitfield)); } + // Grab extensions + $extensions = $attachments = array(); + if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) + { + $extensions = $cache->obtain_attach_extensions($forum_id); + + // Get attachments... + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE ' . $db->sql_in_set('post_msg_id', $post_list) . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[$row['post_msg_id']][] = $row; + } + $db->sql_freeresult($result); + } + for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) { // A non-existing rowset only happens if there was no user present for the entered poster_id @@ -990,6 +1017,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $message = smiley_text($message, !$row['enable_smilies']); + if (!empty($attachments[$row['post_id']])) + { + $update_count = array(); + parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); + } + $post_subject = censor_text($post_subject); $template->assign_block_vars($mode . '_row', array( @@ -998,16 +1031,30 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), + 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, + 'POST_SUBJECT' => $post_subject, 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']), 'POST_DATE' => $user->format_date($row['post_time']), 'MESSAGE' => $message, 'DECODED_MESSAGE' => $decoded_message, - 'U_POST_ID' => $row['post_id'], + 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], 'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', 'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); + + // Display not already displayed Attachments for this post, we already parsed them. ;) + if (!empty($attachments[$row['post_id']])) + { + foreach ($attachments[$row['post_id']] as $attachment) + { + $template->assign_block_vars($mode . '_row.attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment) + ); + } + } + unset($rowset[$i]); } diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index ea2e2fafd7..8dbbdba92e 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -14,7 +14,7 @@ function mcp_post_details($id, $mode, $action) { global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; + global $template, $db, $user, $auth, $cache; $user->add_lang('posting'); @@ -92,6 +92,7 @@ function mcp_post_details($id, $mode, $action) // Set some vars $users_ary = $usernames_ary = array(); + $attachments = $extensions = array(); $post_id = $post_info['post_id']; $topic_tracking_info = array(); @@ -120,6 +121,43 @@ function mcp_post_details($id, $mode, $action) } $message = smiley_text($message); + if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) + { + $extensions = $cache->obtain_attach_extensions($post_info['forum_id']); + + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE post_msg_id = ' . $post_id . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[] = $row; + } + $db->sql_freeresult($result); + + if (sizeof($attachments)) + { + $update_count = array(); + parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); + } + + // Display not already displayed Attachments for this post, we already parsed them. ;) + if (!empty($attachments)) + { + $template->assign_var('S_HAS_ATTACHMENTS', true); + + foreach ($attachments as $attachment) + { + $template->assign_block_vars('attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment) + ); + } + } + } + $template->assign_vars(array( 'U_MCP_ACTION' => "$url&i=main&quickmod=1", // Use this for mode paramaters 'U_POST_ACTION' => "$url&i=$id&mode=post_details", // Use this for action parameters @@ -163,9 +201,10 @@ function mcp_post_details($id, $mode, $action) 'POST_SUBJECT' => $post_info['post_subject'], 'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']), + 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', 'POST_ID' => $post_info['post_id'], + 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? "$url&i=$id&mode=$mode&lookup={$post_info['poster_ip']}#ip" : '', 'U_WHOIS' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&action=whois&p=$post_id&ip={$post_info['poster_ip']}") : '', )); diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index d5b4f8d422..1492f64c43 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -25,7 +25,7 @@ class mcp_queue function main($id, $mode) { - global $auth, $db, $user, $template; + global $auth, $db, $user, $template, $cache; global $config, $phpbb_root_path, $phpEx, $action; include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); @@ -101,7 +101,8 @@ class mcp_queue ); } - $topic_tracking_info = array(); + $extensions = $attachments = $topic_tracking_info = array(); + // Get topic tracking info if ($config['load_db_lastread']) { @@ -127,6 +128,43 @@ class mcp_queue } $message = smiley_text($message); + if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) + { + $extensions = $cache->obtain_attach_extensions($post_info['forum_id']); + + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE post_msg_id = ' . $post_id . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[] = $row; + } + $db->sql_freeresult($result); + + if (sizeof($attachments)) + { + $update_count = array(); + parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); + } + + // Display not already displayed Attachments for this post, we already parsed them. ;) + if (!empty($attachments)) + { + $template->assign_var('S_HAS_ATTACHMENTS', true); + + foreach ($attachments as $attachment) + { + $template->assign_block_vars('attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment) + ); + } + } + } + $post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']); $topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']); @@ -165,9 +203,11 @@ class mcp_queue 'POST_SUBJECT' => $post_info['post_subject'], 'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']), - 'POST_ID' => $post_info['post_id']) - ); + 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', + 'POST_ID' => $post_info['post_id'], + + 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '', + )); break; diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 15ce7af689..c318472b7d 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -25,7 +25,7 @@ class mcp_reports function main($id, $mode) { - global $auth, $db, $user, $template; + global $auth, $db, $user, $template, $cache; global $config, $phpbb_root_path, $phpEx, $action; include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); @@ -111,7 +111,7 @@ class mcp_reports ); } - $topic_tracking_info = array(); + $topic_tracking_info = $extensions = $attachments = array(); // Get topic tracking info if ($config['load_db_lastread']) { @@ -137,9 +137,46 @@ class mcp_reports } $message = smiley_text($message); + if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) + { + $extensions = $cache->obtain_attach_extensions($post_info['forum_id']); + + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE post_msg_id = ' . $post_id . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[] = $row; + } + $db->sql_freeresult($result); + + if (sizeof($attachments)) + { + $update_count = array(); + parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); + } + + // Display not already displayed Attachments for this post, we already parsed them. ;) + if (!empty($attachments)) + { + $template->assign_var('S_HAS_ATTACHMENTS', true); + + foreach ($attachments as $attachment) + { + $template->assign_block_vars('attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment) + ); + } + } + } + $template->assign_vars(array( 'S_MCP_REPORT' => true, - 'S_CLOSE_ACTION' => $this->u_action . '&p=' . $post_id . 'f=' . $forum_id, + 'S_CLOSE_ACTION' => $this->u_action . '&p=' . $post_id . '&f=' . $forum_id, 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => !$post_info['post_approved'], @@ -182,9 +219,11 @@ class mcp_reports 'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'], 'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']), - 'POST_ID' => $post_info['post_id']) - ); + 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', + 'POST_ID' => $post_info['post_id'], + + 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? $this->u_action . '&r=' . $report_id . '&p=' . $post_id . '&f=' . $forum_id . '&lookup=' . $post_info['poster_ip'] . '#ip' : '', + )); $this->tpl_name = 'mcp_post'; diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 3c49477ca2..95f8d6c71b 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -14,7 +14,7 @@ function mcp_topic_view($id, $mode, $action) { global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; + global $template, $db, $user, $auth, $cache; $url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url()); @@ -104,11 +104,12 @@ function mcp_topic_view($id, $mode, $action) ORDER BY ' . $sort_order_sql; $result = $db->sql_query_limit($sql, $posts_per_page, $start); - $rowset = array(); + $rowset = $post_id_list = array(); $bbcode_bitfield = ''; while ($row = $db->sql_fetchrow($result)) { $rowset[] = $row; + $post_id_list[] = $row['post_id']; $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); } $db->sql_freeresult($result); @@ -135,6 +136,30 @@ function mcp_topic_view($id, $mode, $action) $has_unapproved_posts = false; + // Grab extensions + $extensions = $attachments = array(); + if ($topic_info['topic_attachment'] && sizeof($post_id_list)) + { + $extensions = $cache->obtain_attach_extensions($topic_info['forum_id']); + + // Get attachments... + if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id'])) + { + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE ' . $db->sql_in_set('post_msg_id', $post_id_list) . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[$row['post_msg_id']][] = $row; + } + $db->sql_freeresult($result); + } + } + foreach ($rowset as $i => $row) { $message = $row['post_text']; @@ -148,6 +173,12 @@ function mcp_topic_view($id, $mode, $action) $message = smiley_text($message); + if (!empty($attachments[$row['post_id']])) + { + $update_count = array(); + parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count); + } + if (!$row['post_approved']) { $has_unapproved_posts = true; @@ -172,12 +203,24 @@ function mcp_topic_view($id, $mode, $action) 'S_POST_REPORTED' => ($row['post_reported']) ? true : false, 'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true, 'S_CHECKED' => ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? true : false, + 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, 'U_POST_DETAILS' => "$url&i=$id&p={$row['post_id']}&mode=post_details", 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']) : '', 'U_MCP_REPORT' => ($auth->acl_get('m_report', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']) : '') ); + // Display not already displayed Attachments for this post, we already parsed them. ;) + if (!empty($attachments[$row['post_id']])) + { + foreach ($attachments[$row['post_id']] as $attachment) + { + $template->assign_block_vars('postrow.attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment) + ); + } + } + unset($rowset[$i]); } diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 06908eea91..aa88bfe65f 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -345,7 +345,7 @@ function message_history($msg_id, $user_id, $message_row, $folder) 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, - 'U_MSG_ID' => $row['msg_id'], + 'MSG_ID' => $row['msg_id'], 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], 'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', 'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 2c7d8de7f3..f72a8f423d 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -46,10 +46,8 @@ $lang = array_merge($lang, array( 'ACP_BAN_EMAILS' => 'Ban e-mails', 'ACP_BAN_IPS' => 'Ban IPs', 'ACP_BAN_USERNAMES' => 'Ban usernames', - 'ACP_BASIC_PERMISSIONS' => 'Basic permissions', 'ACP_BBCODES' => 'BBCodes', 'ACP_BOARD_CONFIGURATION' => 'Board configuration', - 'ACP_BOARD_DEFAULTS' => 'Board defaults', 'ACP_BOARD_FEATURES' => 'Board features', 'ACP_BOARD_MANAGEMENT' => 'Board management', 'ACP_BOARD_SETTINGS' => 'Board settings', @@ -128,7 +126,6 @@ $lang = array_merge($lang, array( 'ACP_PERMISSIONS' => 'Permissions', 'ACP_PERMISSION_MASKS' => 'Permission masks', 'ACP_PERMISSION_ROLES' => 'Permission roles', - 'ACP_PERMISSION_SETTINGS' => 'Permission settings', 'ACP_PERMISSION_TRACE' => 'Permission trace', 'ACP_PHP_INFO' => 'PHP information', 'ACP_POST_SETTINGS' => 'Post settings', @@ -153,7 +150,6 @@ $lang = array_merge($lang, array( 'ACP_SERVER_SETTINGS' => 'Server settings', 'ACP_SIGNATURE_SETTINGS' => 'Signature settings', 'ACP_SMILIES' => 'Smilies', - 'ACP_SPECIAL_PERMISSIONS' => 'Special permissions', 'ACP_STYLE_COMPONENTS' => 'Style components', 'ACP_STYLE_MANAGEMENT' => 'Style management', 'ACP_STYLES' => 'Styles', @@ -204,7 +200,6 @@ $lang = array_merge($lang, array( 'CONFIG_UPDATED' => 'Configuration updated successfully.', 'DEACTIVATE' => 'Deactivate', - 'DIMENSIONS' => 'Dimensions', 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.', 'DIRECTORY_NOT_DIR' => 'The entered path “%s” is not a directory.', 'DIRECTORY_NOT_WRITABLE' => 'The entered path “%s” is not writable.', @@ -256,7 +251,6 @@ $lang = array_merge($lang, array( 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', 'REMIND' => 'Remind', - 'REORDER' => 'Reorder', 'RESYNC' => 'Resynchronise', 'RETURN_TO' => 'Return to…', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 7380322da4..df14105eb2 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -108,11 +108,9 @@ $lang = array_merge($lang, array( 'HIDE_CSS' => 'Hide raw CSS', - 'IMAGE_CONFIGURATION' => 'Image configuration', 'IMAGE_WIDTH' => 'Image width', 'IMAGE_HEIGHT' => 'Image height', 'IMAGE' => 'Image', - 'IMAGE_LOCATION' => 'Image location', 'IMAGE_NAME' => 'Image name', 'IMAGE_PARAMETER' => 'Parameter', 'IMAGE_VALUE' => 'Value', @@ -280,8 +278,6 @@ $lang = array_merge($lang, array( 'LINE_SPACING' => 'Line spacing', 'LOCALISED_IMAGES' => 'Localised', - 'EDITED_IMAGESET' => 'Edited imageset', - 'NO_CLASS' => 'Cannot find class in stylesheet.', 'NO_IMAGESET' => 'Cannot find imageset on filesystem.', 'NO_IMAGE' => 'No image', diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index 8a46fbdbb3..36c314e0c0 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -21,8 +21,8 @@ - - + + diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index d05f9401ff..17e57578ba 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -37,13 +37,13 @@
style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG});"> [ {L_SELECT_MERGE} ]   - {topicrow.TOPIC_TITLE} {topicrow.ATTACH_ICON_IMG} + {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG} {REPORTED_IMG}  [ {L_DELETE_SHADOW_TOPIC} ]
{topicrow.PAGINATION} - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME}
+ {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME}
{topicrow.REPLIES} {L_REPLIES}
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}
{topicrow.LAST_POST_TIME}
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index a16396f094..dc0ea9f800 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -90,7 +90,11 @@
-
{L_THIS_POST_IP}: {POST_IP} [ {POST_IPADDR} ]
+
{L_THIS_POST_IP}: + {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) + + {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) +
@@ -219,7 +223,11 @@
-

{L_THIS_POST_IP}: {POST_IP} [ {POST_IPADDR} ]

+

{L_THIS_POST_IP}: + {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) + + {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) +

diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index f27ab7f5d0..704624b993 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -110,7 +110,7 @@ onload_functions.push('subPanels()');
{L_POST_DETAILS} | {L_SELECT}: checked="checked" />

{postrow.POST_SUBJECT}

-

{postrow.MINI_POST_IMG} {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} [ {L_POST_DETAILS} ]

+

{postrow.MINI_POST_IMG} {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} [ {L_POST_DETAILS} ]

@@ -120,6 +120,16 @@ onload_functions.push('subPanels()');

{postrow.MESSAGE}
+ + +
+
{L_ATTACHMENTS}
+ +
{postrow.attachment.DISPLAY_ATTACHMENT}
+ +
+ + diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 6f86e83a8f..5953ea11f9 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -9,9 +9,17 @@

{post_review_row.POST_SUBJECT}

{post_review_row.MINI_POST_IMG}{post_review_row.MINI_POST_IMG} {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {post_review_row.POST_DATE}

-
- {post_review_row.MESSAGE} -
+
{post_review_row.MESSAGE}
+ + +
+
{L_ATTACHMENTS}
+ +
{post_review_row.attachment.DISPLAY_ATTACHMENT}
+ +
+ +
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 929ebd1c45..f3aa5d94d0 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -9,20 +9,28 @@
-
+
{L_POST_DETAILS}
-

{topic_review_row.POST_SUBJECT}

+

{topic_review_row.POST_SUBJECT}

{topic_review_row.MINI_POST_IMG}{topic_review_row.MINI_POST_IMG} {L_POST_BY_AUTHOR} {topic_review_row.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {topic_review_row.POST_DATE}

-
- {topic_review_row.MESSAGE} -
+
{topic_review_row.MESSAGE}
+ + +
+
{L_ATTACHMENTS}
+ +
{topic_review_row.attachment.DISPLAY_ATTACHMENT}
+ +
+ + - +
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index cd4efc6ccc..7e402f4b16 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -76,7 +76,7 @@ a.sendemail { } a.sendemail:hover { - background-position: 0px -18px; + background-position: 0 -18px; } a.fontsize { @@ -86,7 +86,7 @@ a.fontsize { } a.fontsize:hover { - background-position: 0px -20px; + background-position: 0 -20px; text-decoration: none; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 4bbad79d84..f870a87d3c 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -74,12 +74,12 @@ p { } img { - border-width: 0px; + border-width: 0; } hr { /* Also see tweaks.css */ - border: 0px none #FFFFFF; + border: 0 none #FFFFFF; border-top: 1px solid #CCCCCC; height: 1px; margin: 5px 0; diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 60bc15d76d..c98a874254 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -74,7 +74,7 @@ li.row:hover dd { li.header dt, li.header dd { line-height: 1em; - border-left-width: 0px; + border-left-width: 0; margin: 2px 0 4px 0; color: #FFFFFF; padding-top: 2px; @@ -269,7 +269,7 @@ div[class].topic-actions { } #topicreview h2 { - border-bottom-width: 0px; + border-bottom-width: 0; } /* Content container styles @@ -648,7 +648,7 @@ fieldset.polls dd div { font-family: Arial, Helvetica, sans-serif; color: #FFFFFF; font-weight: bold; - padding: 0px 2px; + padding: 0 2px; overflow: visible; min-width: 2%; } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index ebc75c5022..fa8899bae8 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -92,7 +92,7 @@ ul.cplist { } #cp-main .buttons { - margin-left: 0px; + margin-left: 0; } #cp-main ul.linklist { @@ -402,7 +402,7 @@ ol.def-rules li { .pm-legend { border-left-width: 10px; border-left-style: solid; - border-right-width: 0px; + border-right-width: 0; margin-bottom: 3px; padding-left: 3px; } diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 2b517cdceb..0ef5743698 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -4,7 +4,7 @@ /* General form styles ----------------------------------------*/ fieldset { - border-width: 0px; + border-width: 0; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 1.1em; } @@ -76,12 +76,12 @@ fieldset dd { /* Specific layout 1 */ fieldset.fields1 dt { width: 10em; - border-right-width: 0px; + border-right-width: 0; } fieldset.fields1 dd { margin-left: 10em; - border-left-width: 0px; + border-left-width: 0; } fieldset.fields1 { @@ -95,12 +95,12 @@ fieldset.fields1 div { /* Specific layout 2 */ fieldset.fields2 dt { width: 15em; - border-right-width: 0px; + border-right-width: 0; } fieldset.fields2 dd { margin-left: 16em; - border-left-width: 0px; + border-left-width: 0; } /* Form elements */ diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 736e7aaeef..4c4ccd31a9 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -161,7 +161,7 @@ a.right { background: none no-repeat 95% 60%; } a.up, a.up:link, a.up:active, a.up:visited { padding-left: 10px; text-decoration: none; - border-bottom-width: 0px; + border-bottom-width: 0; } a.up:hover { diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html index 908dce6a38..036e7b2fd2 100644 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ b/phpBB/styles/subsilver2/template/bbcode.html @@ -40,8 +40,8 @@ - - + + diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html index a995163f39..7441e4e71c 100644 --- a/phpBB/styles/subsilver2/template/mcp_ban.html +++ b/phpBB/styles/subsilver2/template/mcp_ban.html @@ -84,15 +84,15 @@
- + - + - + diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html index 043be1d089..eea9dffe58 100644 --- a/phpBB/styles/subsilver2/template/mcp_header.html +++ b/phpBB/styles/subsilver2/template/mcp_header.html @@ -31,7 +31,7 @@ - + @@ -69,7 +75,27 @@ - + diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index 714cb75884..b73190cffa 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -96,7 +96,24 @@
{L_BAN_LENGTH}:
{L_BAN_REASON}:
{L_BAN_GIVE_REASON}:
    {l_block1.L_TITLE} -
    +
    • » {l_block1.l_block2.L_TITLE}{l_block1.l_block2.L_TITLE}
      • diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index c9e3a9d4e7..bd5a02fed0 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -58,7 +58,13 @@
{L_THIS_POST_IP}: {POST_IP}{POST_IP} [ {POST_IPADDR} ] + + {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) + + {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) + +
{L_PREVIEW}
{POST_PREVIEW}
{EDIT_IMG}
 +
{EDIT_IMG}
+ +
{POST_PREVIEW}
+ + +

+ + + + + + + + + + +
{L_ATTACHMENTS}:
{attachment.DISPLAY_ATTACHMENT}
+ + +
- + -
{postrow.MESSAGE}

 +
{postrow.MESSAGE}
+ +

+ + + + + + + + + + +
{L_ATTACHMENTS}:
{postrow.attachment.DISPLAY_ATTACHMENT}
+ + +
diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html index edabe3e12c..c3a7f7aead 100644 --- a/phpBB/styles/subsilver2/template/posting_review.html +++ b/phpBB/styles/subsilver2/template/posting_review.html @@ -20,7 +20,7 @@
+ @@ -47,7 +47,24 @@ diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html index 63aa8a12f0..9ac6f90d9e 100644 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ b/phpBB/styles/subsilver2/template/posting_topic_review.html @@ -15,7 +15,7 @@ - @@ -44,8 +44,24 @@ diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html index ffbf1199e0..6ade3a5745 100644 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ b/phpBB/styles/subsilver2/template/ucp_header.html @@ -63,7 +63,7 @@ -
    +
      @@ -80,7 +80,7 @@ -
        +
        • » {l_block1.l_block2.L_TITLE}{l_block1.l_block2.L_TITLE}
          • @@ -125,7 +125,7 @@ {L_FRIENDS_ONLINE} -
            +
            • {friends_online.USERNAME_FULL} @@ -141,7 +141,7 @@ {L_FRIENDS_OFFLINE} -
                +
                • {friends_offline.USERNAME_FULL} diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index e9e77863a0..1bcd042d03 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -13,7 +13,7 @@
-
{post_review_row.POST_AUTHOR_FULL} - +
{post_review_row.MESSAGE}
{post_review_row.MESSAGE}
+ + +

+ + + + + + + + + + +
{L_ATTACHMENTS}:
{post_review_row.attachment.DISPLAY_ATTACHMENT}
+ + +
+ @@ -28,7 +28,7 @@ - +
style="color: {topic_review_row.POST_AUTHOR_COLOUR}">{topic_review_row.POST_AUTHOR}  {L_POST_SUBJECT}:  {topic_review_row.POST_SUBJECT} {QUOTE_IMG} {QUOTE_IMG}
{topic_review_row.MESSAGE}
+ + +

+ + + + + + + + + + +
{L_ATTACHMENTS}:
{topic_review_row.attachment.DISPLAY_ATTACHMENT}
+ + - +
+ @@ -32,7 +32,7 @@ diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 43a7b227c8..a2d8829f9a 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -78,9 +78,9 @@ body { #findbar { width: 100%; - margin: 0px; - padding: 0px; - border: 0px; + margin: 0; + padding: 0; + border: 0; } .forumrules { @@ -129,7 +129,7 @@ h3 { } h4 { - margin: 0px; + margin: 0; font-size: 1.1em; font-weight: bold; } @@ -139,7 +139,7 @@ p { } p.moderators { - margin: 0px; + margin: 0; float: left; color: black; font-weight: bold; @@ -150,7 +150,7 @@ p.moderators { } p.linkmcp { - margin: 0px; + margin: 0; float: right; white-space: nowrap; } @@ -160,7 +160,7 @@ p.linkmcp { } p.breadcrumbs { - margin: 0px; + margin: 0; float: left; color: black; font-weight: bold; @@ -173,7 +173,7 @@ p.breadcrumbs { } p.datetime { - margin: 0px; + margin: 0; float: right; white-space: nowrap; font-size: 1em; @@ -189,7 +189,7 @@ p.searchbar { } p.searchbarreg { - margin: 0px; + margin: 0; float: right; white-space: nowrap; } @@ -203,15 +203,15 @@ p.forumdesc { } p.topicauthor { - margin: 1px 0px; + margin: 1px 0; } p.topicdetails { - margin: 1px 0px; + margin: 1px 0; } .postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active { - margin: 1px 0px; + margin: 1px 0; color: red; font-weight:bold; } @@ -252,7 +252,7 @@ p.topicdetails { } .nav { - margin: 0px; + margin: 0; color: black; font-weight: bold; } @@ -326,9 +326,9 @@ td.profile { .catdiv { height: 28px; - margin: 0px; - padding: 0px; - border: 0px; + margin: 0; + padding: 0; + border: 0; background: white url('./images/cellpic2.jpg') repeat-y scroll top left; } .rtl .catdiv { @@ -337,9 +337,9 @@ td.profile { .cat { height: 28px; - margin: 0px; - padding: 0px; - border: 0px; + margin: 0; + padding: 0; + border: 0; background-color: #C7D0D7; background-image: url('./images/cellpic1.gif'); text-indent: 4px; @@ -381,7 +381,7 @@ td.profile { hr { height: 1px; - border-width: 0px; + border-width: 0; background-color: #D1D7DC; color: #D1D7DC; } @@ -417,7 +417,7 @@ a.forumlink { } a.topictitle { - margin: 1px 0px; + margin: 1px 0; font-family: "Lucida Grande", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 1.2em; @@ -442,9 +442,9 @@ th a:hover { /* Form Elements ------------ */ form { - margin: 0px; - padding: 0px; - border: 0px; + margin: 0; + padding: 0; + border: 0; } input { @@ -541,9 +541,9 @@ input.radio { /* BBCode ------------ */ .quotetitle, .attachtitle { - margin: 10px 5px 0px 5px; + margin: 10px 5px 0 5px; padding: 4px; - border-width: 1px 1px 0px 1px; + border-width: 1px 1px 0 1px; border-style: solid; border-color: #A9B8C2; color: #333333; @@ -557,10 +557,10 @@ input.radio { } .quotecontent, .attachcontent { - margin: 0px 5px 10px 5px; + margin: 0 5px 10px 5px; padding: 5px; border-color: #A9B8C2; - border-width: 0px 1px 1px 1px; + border-width: 0 1px 1px 1px; border-style: solid; font-weight: normal; font-size: 1em; @@ -575,9 +575,9 @@ input.radio { } .codetitle { - margin: 10px 5px 0px 5px; + margin: 10px 5px 0 5px; padding: 2px 4px; - border-width: 1px 1px 0px 1px; + border-width: 1px 1px 0 1px; border-style: solid; border-color: #A9B8C2; color: #333333; @@ -588,10 +588,10 @@ input.radio { .codecontent { direction: ltr; - margin: 0px 5px 10px 5px; + margin: 0 5px 10px 5px; padding: 5px; border-color: #A9B8C2; - border-width: 0px 1px 1px 1px; + border-width: 0 1px 1px 1px; border-style: solid; font-weight: normal; color: #006600;
{history_row.MESSAGE_AUTHOR_FULL} - +
{history_row.MESSAGE}
{history_row.MESSAGE}