mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-03 14:17:56 +02:00
Code Issues Releases Wiki Activity

some fixes. :)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7836 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-07-06 10:55:31 +00:00
parent d3468832bb
commit 281ed483de
15 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/admin.css
View File

@ -1232,7 +1232,7 @@ input.disabled {
.clearfix, #tabs, .row, #content, fieldset dl, #page-body {
height: 1%;
overflow: auto;
overflow: hidden;
}
/* Syntax Highlighting

2
phpBB/adm/style/editor.js
View File

@ -47,7 +47,7 @@ function initInsertions()
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
document.body.focus();
// document.body.focus();
}
}

4
phpBB/adm/style/viewsource.html
View File

@ -1,10 +1,10 @@
<!-- INCLUDE simple_header.html -->
<div id="acp">
<div id="acp" style="padding: 0;">
<div class="panel" style="padding: 10px;">
<div style="overflow: auto;">
<h1>{FILENAME}</h1>
<table>
<table class="type2">
<tbody>
<!-- BEGIN source -->
<tr valign="top">

1
phpBB/docs/CHANGELOG.html
View File

@ -221,6 +221,7 @@ p a {
<li>[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</li>
<li>[Fix] Topic deletion via the user post deletion mechanism did not take into account statistics for forums that hold shadow topics (Bug #12981)</li>
<li>[Fix] Allow for negative and decimal numbers to be in transposed queries in the Oracle and Firebird DBAL (Bug #13033)</li>
<li>[Fix] Some jabber related bugs (Bug #12989, #11805, #11809)</li>
</ul>

9
phpBB/includes/acp/acp_php_info.php
View File

@ -50,8 +50,15 @@ class acp_php_info
$output = preg_replace('#<img border="0"#i', '<img', $output);
$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr />', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
if (empty($output))
{
trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
}
$orig_output = $output;
preg_match_all('#<div class="center">(.*)</div>#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);
}

27
phpBB/includes/functions_jabber.php
View File

@ -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('</stream:stream>');
@ -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("<iq type='set' id='bind_1'>
<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
<resource>functions_jabber.phpbb.php</resource>
<resource>" . utf8_htmlspecialchars($this->resource) . '</resource>
</bind>
</iq>");
</iq>');
return $this->response($this->listen());
}

1
phpBB/language/en/memberlist.php
View File

@ -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',

7
phpBB/memberlist.php
View File

@ -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);

2
phpBB/styles/prosilver/template/editor.js
View File

@ -48,7 +48,7 @@ function initInsertions()
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
document.body.focus();
// document.body.focus();
}
}

2
phpBB/styles/prosilver/template/memberlist_im.html
View File

@ -13,7 +13,7 @@
<fieldset>
<dl class="fields2">
<dt><label>{L_IM_RECIPIENT}:</label></dt>
<dd><strong>{USERNAME}</strong> [ {IM_CONTACT} ]<!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
</dl>
<!-- IF S_SEND_ICQ -->

4
phpBB/styles/prosilver/template/simple_header.html
View File

@ -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]);
}

3
phpBB/styles/prosilver/template/viewtopic_body.html
View File

@ -205,8 +205,7 @@
<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
</ul>
<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup('{postrow.U_JABBER}', 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
</dd>
<!-- ENDIF -->
<!-- ENDIF -->

2
phpBB/styles/prosilver/theme/tweaks.css
View File

@ -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

2
phpBB/styles/subsilver2/template/editor.js
View File

@ -48,7 +48,7 @@ function initInsertions()
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
document.body.focus();
// document.body.focus();
}
}

2
phpBB/styles/subsilver2/template/memberlist_im.html
View File

@ -14,7 +14,7 @@
</tr>
<tr>
<td class="row1"><b class="genmed">{L_IM_RECIPIENT}: </b></td>
<td class="row2"><span class="gen"><b>{USERNAME}</b> [ {IM_CONTACT} ]</span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
</tr>
<!-- IF S_SEND_AIM -->