summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/mail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-28 11:27:16 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-28 11:27:16 +0000
commitf01835508614938c2cf0382b82ea62c2c4dedd16 (patch)
treec08f29e860b3c2cc281488a2579d7d84312151cd /roundcubemail/program/steps/mail
parent7a3551691e2eb17b7fe9f000d02f53c1742e05a5 (diff)
- add file/line definitions to raise_error() calls
git-svn-id: https://svn.roundcube.net/trunk@3231 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc6
-rw-r--r--roundcubemail/program/steps/mail/spell_pspell.inc2
-rw-r--r--roundcubemail/program/steps/mail/viewsource.inc4
3 files changed, 7 insertions, 5 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 230572f66..589c9af7f 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -30,8 +30,10 @@ $savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
/****** checks ********/
if (!isset($_SESSION['compose']['id'])) {
- raise_error(array('code' => 500, 'type' => 'smtp', 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
- console("Sendmail error", $_SESSION['compose']);
+ raise_error(array('code' => 500, 'type' => 'smtp',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Invalid compose ID"), true, false);
+
$OUTPUT->show_message("An internal error occured. Please try again.", 'error');
$OUTPUT->send('iframe');
}
diff --git a/roundcubemail/program/steps/mail/spell_pspell.inc b/roundcubemail/program/steps/mail/spell_pspell.inc
index 578bfe523..b443ed525 100644
--- a/roundcubemail/program/steps/mail/spell_pspell.inc
+++ b/roundcubemail/program/steps/mail/spell_pspell.inc
@@ -23,7 +23,7 @@ if (!extension_loaded('pspell')) {
raise_error(array(
'code' => 500,
'type' => 'php',
- 'file' => __FILE__,
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Pspell extension not available"), true, false);
header('HTTP/1.1 404 Not Found');
diff --git a/roundcubemail/program/steps/mail/viewsource.inc b/roundcubemail/program/steps/mail/viewsource.inc
index a61385df8..17e382456 100644
--- a/roundcubemail/program/steps/mail/viewsource.inc
+++ b/roundcubemail/program/steps/mail/viewsource.inc
@@ -50,9 +50,9 @@ else
raise_error(array(
'code' => 500,
'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => 'Message UID '.$uid.' not found'),
- true,
- true);
+ true, true);
}
exit;