diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 44f89fea33..b127462814 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1232,7 +1232,7 @@ input.disabled { .clearfix, #tabs, .row, #content, fieldset dl, #page-body { height: 1%; - overflow: auto; + overflow: hidden; } /* Syntax Highlighting diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index e82b9d5d62..93d0059609 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -47,7 +47,7 @@ function initInsertions() { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - document.body.focus(); + // document.body.focus(); } } diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html index 7f0fde239c..f127c9626f 100644 --- a/phpBB/adm/style/viewsource.html +++ b/phpBB/adm/style/viewsource.html @@ -1,10 +1,10 @@ -
+

{FILENAME}

- +
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5d82eb17e2..11e900c7da 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -221,6 +221,7 @@ p a {
  • [Fix] The forum/topic sync code now recognizes other ways that the latest post in a topic can be expressed (Bug #12947) - patch provided by APTX
  • [Fix] Topic deletion via the user post deletion mechanism did not take into account statistics for forums that hold shadow topics (Bug #12981)
  • [Fix] Allow for negative and decimal numbers to be in transposed queries in the Oracle and Firebird DBAL (Bug #13033)
    • +
  • [Fix] Some jabber related bugs (Bug #12989, #11805, #11809)
    • diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php index d5adef1097..d18d64b076 100644 --- a/phpBB/includes/acp/acp_php_info.php +++ b/phpBB/includes/acp/acp_php_info.php @@ -49,9 +49,16 @@ class acp_php_info $output = preg_replace('#]+>#i', '
    ', $output); $output = preg_replace('#', ''), array('class="row1"', 'class="row2"', '', '', ''), $output); - + + if (empty($output)) + { + trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING); + } + + $orig_output = $output; + preg_match_all('#
    (.*)
    #siU', $output, $output); - $output = (!empty($output[1][0])) ? $output[1][0] : @$output[1]; + $output = (!empty($output[1][0])) ? $output[1][0] : $orig_output; $template->assign_var('PHPINFO', $output); } diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index eb2a7245a5..def15c67c7 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -12,7 +12,7 @@ * * Jabber class from Flyspray project * -* @version class.jabber2.php 1244 2007-05-28 +* @version class.jabber2.php 1306 2007-06-21 * @copyright 2006 Flyspray.org * @author: Florian Schmitz (floele) * @@ -31,6 +31,7 @@ class jabber var $username; var $password; var $use_ssl; + var $resource = 'functions_jabber.phpbb.php'; var $enable_logging; var $log_array; @@ -76,17 +77,31 @@ class jabber return false; } - // Make sure the encryption stream is supported + /** + * Make sure the encryption stream is supported + * Also seem to work without the crypto stream if correctly compiled + $streams = stream_get_wrappers(); if (!in_array('streams.crypto', $streams)) { return false; } + */ return true; } + /** + * Sets the resource which is used. No validation is done here, only escaping. + * @param string $name + * @access public + */ + function set_resource($name) + { + $this->resource = $name; + } + /** * Connect */ @@ -126,7 +141,7 @@ class jabber // disconnect gracefully if (isset($this->session['sent_presence'])) { - $this->presence('offline', '', true); + $this->send_presence('offline', '', true); } $this->send(''); @@ -379,7 +394,7 @@ class jabber } // go on with authentication? - if (isset($this->features['stream:features'][0]['#']['bind'])) + if (isset($this->features['stream:features'][0]['#']['bind']) || $this->session['tls']) { return $this->response($this->features); } @@ -394,9 +409,9 @@ class jabber $this->send(" - functions_jabber.phpbb.php + " . utf8_htmlspecialchars($this->resource) . ' - "); + '); return $this->response($this->listen()); } diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index f4219feb61..6feb16c02c 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -54,6 +54,7 @@ $lang = array_merge($lang, array( 'EMAIL_TOPIC_EXPLAIN' => 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.', 'EMPTY_ADDRESS_EMAIL' => 'You must provide a valid e-mail address for the recipient.', 'EMPTY_MESSAGE_EMAIL' => 'You must enter a message to be emailed.', + 'EMPTY_MESSAGE_IM' => 'You must enter a message to be send.', 'EMPTY_NAME_EMAIL' => 'You must enter the real name of the recipient.', 'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the e-mail.', 'EQUAL_TO' => 'Equal to', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 81e0012f35..dfeaf9801f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -328,7 +328,12 @@ switch ($mode) include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); $subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']); - $message = request_var('message', '', true); + $message = trim(request_var('message', '', true)); + + if (empty($message)) + { + trigger_error('EMPTY_MESSAGE_IM'); + } $messenger = new messenger(false); diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 500ea91c51..80dd20da99 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -48,7 +48,7 @@ function initInsertions() { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - document.body.focus(); + // document.body.focus(); } } diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index b12d5314c7..717273baa3 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -13,7 +13,7 @@
    -
    {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}
    +
    {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}
    diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index a9f57df354..eaf6e6dd03 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -25,7 +25,7 @@ */ window.onload = function() { - for (i = 0; i <= onload_functions.length; i++) + for (var i = 0; i < onload_functions.length; i++) { eval(onload_functions[i]); } @@ -33,7 +33,7 @@ window.onunload = function() { - for (i = 0; i <= onunload_functions.length; i++) + for (var i = 0; i < onunload_functions.length; i++) { eval(onunload_functions[i]); } diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index f687f242a8..58d1f1a780 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -205,8 +205,7 @@
  • {L_ICQ}
  • {L_YIM}
  • {L_AIM}
    • -
  • {L_JABBER}
    • - +
  • {L_JABBER}
    • diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 6eb8761b62..52bdb1baaa 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -44,7 +44,7 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra .clearfix, #tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls { height: 1%; - overflow: auto; + overflow: hidden; } /* Simple fix so forum and topic lists always have a min-height set, even in IE6 diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index 339609b56e..72de8ef8ff 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -48,7 +48,7 @@ function initInsertions() { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - document.body.focus(); + // document.body.focus(); } } diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index 285190c3d5..860bec608d 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -14,7 +14,7 @@
    - +
    {L_IM_RECIPIENT}: {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}{USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}