From e2e56acca918ceb3cfd1a64a8ec91a788ae4a5f9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 17 Nov 2007 20:04:49 +0000 Subject: some further fixes - re-introduce grabbing random number from /dev/urandom git-svn-id: file:///svn/phpbb/trunk@8241 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_messenger.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'phpBB/includes/functions_messenger.php') diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 8d690bea64..be78ad2999 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -165,12 +165,7 @@ class messenger if (!file_exists($tpl_file)) { - $tpl_file = "{$phpbb_root_path}language/$template_lang/email/$template_file.txt"; - - if (!file_exists($tpl_file)) - { - trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR); - } + trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR); } if (($data = @file_get_contents($tpl_file)) === false) @@ -607,7 +602,7 @@ class queue continue 2; } - include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']); if (!$this->jabber->connect()) -- cgit v1.2.1