New upstream version.

[roundcube.git] / installer / utils.php

diff --git a/installer/utils.php b/installer/utils.php
index c1775f2bba6f6a856d54db16bd0e4829c4b4c308..a7521b980259eed822e468365cc884ddbf7f271c 100644 (file)
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -1,40 +1,80 @@
 <?php
+/*
+ +-------------------------------------------------------------------------+
+ | Roundcube Webmail IMAP Client                                           |
+ | Version 0.6                                                             |
+ |                                                                         |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team                         |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or modify    |
+ | it under the terms of the GNU General Public License version 2          |
+ | as published by the Free Software Foundation.                           |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ |                                                                         |
+ | You should have received a copy of the GNU General Public License along |
+ | with this program; if not, write to the Free Software Foundation, Inc., |
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.             |
+ |                                                                         |
+ +-------------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                          |
+ +-------------------------------------------------------------------------+
 
+ $Id: index.php 2696 2009-07-02 06:38:26Z thomasb $
+
+*/
 
 /**
  * Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
+ * (copy from program/include/iniset.php)
  */
 function __autoload($classname)
 {
-  $filename = preg_replace(
-      array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
-      array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
-      $classname
-  );
-  include_once $filename. '.php';
+    $filename = preg_replace(
+        array(
+            '/MDB2_(.+)/',
+            '/Mail_(.+)/',
+            '/Net_(.+)/',
+            '/Auth_(.+)/',
+            '/^html_.+/',
+            '/^utf8$/'
+        ),
+        array(
+            'MDB2/\\1',
+            'Mail/\\1',
+            'Net/\\1',
+            'Auth/\\1',
+            'html',
+            'utf8.class'
+        ),
+        $classname
+    );
+    include_once $filename. '.php';
 }
 
 
 /**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
+ * Fake internal error handler to catch errors
  */
-function Q($string)
+function raise_error($p)
 {
-  return htmlentities($string, ENT_COMPAT, 'UTF-8');
+    $rci = rcube_install::get_instance();
+    $rci->raise_error($p);
 }
 
-
 /**
- * Fake rinternal error handler to catch errors
+ * Local callback function for PEAR errors
  */
-function raise_error($p)
+function rcube_pear_error($err)
 {
-  $rci = rcube_install::get_instance();
-  $rci->raise_error($p);
+    raise_error(array(
+        'code' => $err->getCode(),
+        'message' => $err->getMessage(),
+    ));
 }
 
-
+// set PEAR error handling (will also load the PEAR main class)
+PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');