Changeset 2213 in subversion

Timestamp:

Jan 5, 2009 5:13:08 AM (4 years ago)

Author:

robin

Message:

Add required parameters to raise_error() calls.

Location:

trunk/roundcubemail/program

Files:

• include/rcube_ldap.php (modified) (2 diffs)
• lib/utf8.class.php (modified) (1 diff)
• steps/mail/sendmail.inc (modified) (1 diff)
• steps/mail/spell_pspell.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -72 +72 @@
     
     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))
@@ -123 +123 @@
     }
     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.

trunk/roundcubemail/program/lib/utf8.class.php

@@ -109 +109 @@
     //print($err_code . " : " . $err_text . "<hr>\n");
     raise_error(array('code' => 500,
+                      'type' => 'php',
                       'file' => __FILE__,
                       'message' => $err_text), TRUE, FALSE);

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -31 +31 @@
 
 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');

trunk/roundcubemail/program/steps/mail/spell_pspell.inc

@@ -23 +23 @@
     raise_error(array(
       'code' => 500,
+      'type' => 'php',
       'file' => __FILE__,
       'message' => "Pspell extension not available"), true, false);