From 10eedbe75a2022d65ec349de5f3bd12400191974 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Jan 2010 11:27:16 +0000
Subject: - add file/line definitions to raise_error() calls

---
 program/steps/mail/sendmail.inc     | 6 ++++--
 program/steps/mail/spell_pspell.inc | 2 +-
 program/steps/mail/viewsource.inc   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 230572f66..589c9af7f 100644
--- a/program/steps/mail/sendmail.inc
+++ b/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/program/steps/mail/spell_pspell.inc b/program/steps/mail/spell_pspell.inc
index 578bfe523..b443ed525 100644
--- a/program/steps/mail/spell_pspell.inc
+++ b/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/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index a61385df8..17e382456 100644
--- a/program/steps/mail/viewsource.inc
+++ b/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;
-- 
cgit v1.2.3