mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

small changes - mostly style related to fix cross-browser issues.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7696 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-05-29 16:07:42 +00:00
parent 8385b34222
commit 88e9dee7e8
16 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_jabber.php
View File

@@ -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'] . '<br /><br />' . $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'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
}
$jabber->disconnect();

2
phpBB/includes/acp/acp_update.php
View File

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

8
phpBB/includes/functions_jabber.php
View File

@@ -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 '<br /><br />' . implode("<br /><br />", $this->log_array);
return implode("<br /><br />", $this->log_array);
}
return '';