diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b385b724e2..5895920525 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -187,7 +187,7 @@ p a { diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index de4ea19438..76d91c5324 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -58,13 +58,13 @@ class acp_jabber if (!$jabber->connect()) { - trigger_error($user->lang['ERR_JAB_CONNECT'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['ERR_JAB_CONNECT'] . '

' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); } // We'll try to authorise using this account if (!$jabber->login()) { - trigger_error($user->lang['ERR_JAB_AUTH'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['ERR_JAB_AUTH'] . '

' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); } $jabber->disconnect(); diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index a1a5dbaf3a..24dc3ebabf 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -33,7 +33,7 @@ class acp_update if ($info === false) { - trigger_error($errstr . adm_back_link($this->u_action)); + trigger_error($errstr, E_USER_WARNING); } $info = explode("\n", $info); diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 4b9928089e..566eff65c5 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -192,15 +192,15 @@ class jabber { if (@function_exists('dns_get_record')) { - $record = dns_get_record("_xmpp-client._tcp.$server", DNS_SRV); - if (!empty($record)) + $record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV); + if (!empty($record) && !empty($record[0]['target'])) { $server = $record[0]['target']; } } else { - $this->add_to_log('Warning: dns_get_record function not found. GTalk will not work.'); + $this->add_to_log('Warning: dns_get_record() function not found. GTalk will not work.'); } $server = $use_ssl ? 'ssl://' . $server : $server; @@ -225,7 +225,7 @@ class jabber { if ($this->enable_logging && sizeof($this->log_array)) { - return '

' . implode("

", $this->log_array); + return implode("

", $this->log_array); } return ''; diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 8cdbc492c4..1b9fbf22ce 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -130,7 +130,7 @@ $lang = array_merge($lang, array( 'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'post'), 'acl_f_post' => array('lang' => 'Can start new topics', 'cat' => 'post'), 'acl_f_reply' => array('lang' => 'Can reply to topics', 'cat' => 'post'), - 'acl_f_icons' => array('lang' => 'Can use post icons', 'cat' => 'post'), + 'acl_f_icons' => array('lang' => 'Can use topic/post icons', 'cat' => 'post'), 'acl_f_announce' => array('lang' => 'Can post announcements', 'cat' => 'post'), 'acl_f_sticky' => array('lang' => 'Can post stickies', 'cat' => 'post'), @@ -191,7 +191,7 @@ $lang = array_merge($lang, array( 'acl_a_forumdel' => array('lang' => 'Can delete forums', 'cat' => 'forums'), 'acl_a_prune' => array('lang' => 'Can prune forums', 'cat' => 'forums'), - 'acl_a_icons' => array('lang' => 'Can alter topic icons and smilies', 'cat' => 'posting'), + 'acl_a_icons' => array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'), 'acl_a_words' => array('lang' => 'Can alter word censors', 'cat' => 'posting'), 'acl_a_bbcode' => array('lang' => 'Can define BBCode tags', 'cat' => 'posting'), 'acl_a_attach' => array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'), diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 96fa57857e..bda83dcc82 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -3,12 +3,14 @@

{LAST_VISIT_DATE}{CURRENT_TIME}

{CURRENT_TIME}
[ {L_MCP} ]

{CURRENT_TIME}

+ + @@ -18,7 +20,7 @@
    | - +
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 077362e306..3a0979585d 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -18,7 +18,7 @@
- diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index 8174a2ddc1..d4ccc8740e 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -32,8 +32,8 @@
-
-
+
+
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 97021d53d3..ab50f0017d 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -95,8 +95,8 @@
-
-
+
+
 
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index a29f59166b..0fd3011254 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -4,7 +4,7 @@

{TOTAL_GUEST_USERS_ONLINE} • {L_SWITCH_GUEST_DISPLAY}

@@ -49,7 +49,7 @@

{L_LEGEND}: {LEGEND}

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 017d9bcb51..e533b8f070 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -895,7 +895,7 @@ fieldset.fields2 dl:hover dt label { } /* Quick-login on index page */ -fieldset.quick-login input { +fieldset.quick-login input.inputbox { background-color: #F2F3F3; } diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 272fd920ba..8031f52b81 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -153,6 +153,10 @@ fieldset.quick-login { } fieldset.quick-login input { + width: auto; +} + +fieldset.quick-login input.inputbox { width: 15%; vertical-align: middle; margin-right: 5px; @@ -287,11 +291,6 @@ fieldset.submit-buttons input { color: #4b4b4b; } -input.checkbox { - width: auto !important; - background-color: transparent !important; -} - input.inputbox { width: 85%; } input.medium { width: 50%; } input.narrow { width: 25%; } diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index e3a2557fc5..cceb5682f5 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -34,7 +34,7 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra /* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above) From http://www.positioniseverything.net/easyclearing.html */ -#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { +#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dd:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { content: "."; display: block; height: 0; diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html index 2f54ebc488..d56823868b 100644 --- a/phpBB/styles/subsilver2/template/jumpbox.html +++ b/phpBB/styles/subsilver2/template/jumpbox.html @@ -4,7 +4,7 @@ -
{L_SELECT_TOPICS_FROM}{L_MODERATE_FORUM}{L_JUMP_TO}: {L_SELECT_TOPICS_FROM}{L_MODERATE_FORUM}{L_JUMP_TO}:  + {L_JUMP_TO}: