From 6710a636170c73162560c94629656ddde85c7fa8 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 5 Jan 2009 10:13:08 +0000
Subject: Add required parameters to raise_error() calls.

---
 program/include/rcube_ldap.php      | 4 ++--
 program/lib/utf8.class.php          | 3 ++-
 program/steps/mail/sendmail.inc     | 2 +-
 program/steps/mail/spell_pspell.inc | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index ab0ef481e..d56ea9b17 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -71,7 +71,7 @@ class rcube_ldap
     global $RCMAIL;
     
     if (!function_exists('ldap_connect'))
-      raise_error(array('type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true);
+      raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true);
 
     if (is_resource($this->conn))
       return true;
@@ -122,7 +122,7 @@ class rcube_ldap
         $this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
     }
     else
-      raise_error(array('type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true);
+      raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true);
 
     // See if the directory is writeable.
     if ($this->prop['writable']) {
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index e2d10599d..2bbe63663 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -108,6 +108,7 @@ Class utf8{
   function onError($err_code,$err_text){
     //print($err_code . " : " . $err_text . "<hr>\n");
     raise_error(array('code' => 500,
+                      'type' => 'php',
                       'file' => __FILE__,
                       'message' => $err_text), TRUE, FALSE);
   }
@@ -173,4 +174,4 @@ Class utf8{
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 8e8d13919..b065c2a25 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -30,7 +30,7 @@ $savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
 /****** checks ********/
 
 if (!isset($_SESSION['compose']['id'])) {
-  raise_error(array('code' => 500, 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
+  raise_error(array('code' => 500, 'type' => 'smtp', 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
   console("Sendmail error", $_SESSION['compose']);
   $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 bf696f2fe..4a829ac48 100644
--- a/program/steps/mail/spell_pspell.inc
+++ b/program/steps/mail/spell_pspell.inc
@@ -22,6 +22,7 @@
 if (!extension_loaded('pspell')) {
     raise_error(array(
       'code' => 500,
+      'type' => 'php',
       'file' => __FILE__,
       'message' => "Pspell extension not available"), true, false);
       
-- 
cgit v1.2.3