X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Finclude%2Finiset.php;h=92a2d90c0b848655751868a98b9da553a8a7e5a5;hb=07e1de2dcd3f3ff8910a3680493f035b3c693cf0;hp=b718393ea01df37a154b0e495b36e16a01cc5de7;hpb=48e8459231a1efa3e97284d07a328776a5b7485b;p=roundcube.git

diff --git a/program/include/iniset.php b/program/include/iniset.php
index b718393..92a2d90 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/iniset.php                                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008, RoundCube Dev, - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -16,23 +16,42 @@
  |         Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: cache.inc 88 2005-12-03 16:54:12Z roundcube $
+ $Id: iniset.php 4674 2011-04-20 09:03:08Z thomasb $
 
 */
 
+// Some users are not using Installer, so we'll check some
+// critical PHP settings here. Only these, which doesn't provide
+// an error/warning in the logs later. See (#1486307).
+$crit_opts = array(
+    'mbstring.func_overload' => 0,
+    'suhosin.session.encrypt' => 0,
+    'session.auto_start' => 0,
+    'file_uploads' => 1,
+);
+foreach ($crit_opts as $optname => $optval) {
+    if ($optval != ini_get($optname)) {
+        die("ERROR: Wrong '$optname' option value. Read REQUIREMENTS section in INSTALL file or use Roundcube Installer, please!");
+    }
+}
 
 // application constants
-define('RCMAIL_VERSION', '0.2-alpha');
+define('RCMAIL_VERSION', '0.5.2');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
+define('RCMAIL_START', microtime(true));
 
 if (!defined('INSTALL_PATH')) {
-  define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
+    define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
+}
+
+if (!defined('RCMAIL_CONFIG_DIR')) {
+    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 }
 
 // make sure path_separator is defined
 if (!defined('PATH_SEPARATOR')) {
-  define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
+    define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');
 }
 
 // RC include folders MUST be included FIRST to avoid other
@@ -45,54 +64,73 @@ $include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
 $include_path.= ini_get('include_path');
 
 if (set_include_path($include_path) === false) {
-  die('Fatal error: ini_set/set_include_path does not work.');
+    die("Fatal error: ini_set/set_include_path does not work.");
 }
 
-ini_set('session.name', 'roundcube_sessid');
-ini_set('session.use_cookies', 1);
-ini_set('session.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
 ini_set('error_reporting', E_ALL&~E_NOTICE);
-set_magic_quotes_runtime(0);
 
 // increase maximum execution time for php scripts
 // (does not work in safe mode)
-if (!ini_get('safe_mode')) {
-  set_time_limit(120);
-}
+@set_time_limit(120);
+
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+    mb_internal_encoding(RCMAIL_CHARSET);
+
 
 /**
  * Use PHP5 autoload for dynamic class loading
  * 
  * @todo Make Zend, PEAR etc play with this
+ * @todo Make our classes conform to a more straight forward CS.
  */
-function __autoload($classname)
+function rcube_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
+    );
+
+    if ($fp = @fopen("$filename.php", 'r', true)) {
+        fclose($fp);
+        include_once("$filename.php");
+        return true;
+    }
+
+    return false;
 }
 
+spl_autoload_register('rcube_autoload');
+
 /**
  * Local callback function for PEAR errors
  */
 function rcube_pear_error($err)
 {
-  error_log(sprintf("%s (%s): %s",
-    $err->getMessage(),
-    $err->getCode(),
-    $err->getUserinfo()), 0);
+    error_log(sprintf("%s (%s): %s",
+        $err->getMessage(),
+        $err->getCode(),
+        $err->getUserinfo()), 0);
 }
 
-// include global functions
-require_once 'include/bugs.inc';
-require_once 'include/main.inc';
-require_once 'include/rcube_shared.inc';
-
-
 // set PEAR error handling (will also load the PEAR main class)
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
 
+// include global functions
+require_once 'include/main.inc';
+require_once 'include/rcube_shared.inc';