diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-29 16:07:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-29 16:07:42 +0000 |
| commit | 88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a (patch) | |
| tree | 9a3d7fbc187b6f90429aabae40326b523440de23 /phpBB/includes | |
| parent | 8385b34222d421a258b934f459e9c6d869f80576 (diff) | |
| download | forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.gz forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.bz2 forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.xz forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.zip | |
small changes - mostly style related to fix cross-browser issues.
git-svn-id: file:///svn/phpbb/trunk@7696 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 8 |
3 files changed, 7 insertions, 7 deletions
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'] . '<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(); 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 '<br /><br />' . implode("<br /><br />", $this->log_array); + return implode("<br /><br />", $this->log_array); } return ''; |