From f01835508614938c2cf0382b82ea62c2c4dedd16 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 28 Jan 2010 11:27:16 +0000 Subject: - add file/line definitions to raise_error() calls git-svn-id: https://svn.roundcube.net/trunk@3231 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcmail.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'roundcubemail/program/include/rcmail.php') diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index 28ccb0cb0..1afb7d72a 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -506,17 +506,16 @@ class rcmail } else { raise_error(array( - 'code' => 600, - 'type' => 'php', + 'code' => 600, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, 'message' => "Failed to create a user record. Maybe aborted by a plugin?" - ), true, false); + ), true, false); } } else { raise_error(array( - 'code' => 600, - 'type' => 'php', - 'file' => RCMAIL_CONFIG_DIR."/main.inc.php", + 'code' => 600, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, 'message' => "Acces denied for new user $username. 'auto_create_user' is disabled" ), true, false); } @@ -947,9 +946,8 @@ class rcmail else { raise_error(array( - 'code' => 500, - 'type' => 'php', - 'file' => __FILE__, + 'code' => 500, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, 'message' => "Could not perform encryption; make sure Mcrypt is installed or lib/des.inc is available" ), true, true); } @@ -993,9 +991,8 @@ class rcmail else { raise_error(array( - 'code' => 500, - 'type' => 'php', - 'file' => __FILE__, + 'code' => 500, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, 'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available" ), true, true); } -- cgit v1.2.3