diff options
Diffstat (limited to 'program/include/iniset.php')
| -rwxr-xr-x | program/include/iniset.php | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php index 5f7c59d1f..29b2cce87 100755 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -42,14 +42,14 @@ 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']).'/'); } define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); // make sure path_separator is defined if (!defined('PATH_SEPARATOR')) { - define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':'); + define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':'); } // RC include folders MUST be included FIRST to avoid other @@ -62,7 +62,7 @@ $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('error_reporting', E_ALL&~E_NOTICE); @@ -73,7 +73,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE); // set internal encoding for mbstring extension if(extension_loaded('mbstring')) - mb_internal_encoding(RCMAIL_CHARSET); + mb_internal_encoding(RCMAIL_CHARSET); /** @@ -84,26 +84,26 @@ if(extension_loaded('mbstring')) */ function rcube_autoload($classname) { - $filename = preg_replace( - array( - '/MDB2_(.+)/', - '/Mail_(.+)/', - '/Net_(.+)/', - '/^html_.+/', - '/^utf8$/', - '/html2text/' - ), - array( - 'MDB2/\\1', - 'Mail/\\1', - 'Net/\\1', - 'html', - 'utf8.class', - 'lib/html2text' // see #1485505 - ), - $classname - ); - include $filename. '.php'; + $filename = preg_replace( + array( + '/MDB2_(.+)/', + '/Mail_(.+)/', + '/Net_(.+)/', + '/^html_.+/', + '/^utf8$/', + '/html2text/' + ), + array( + 'MDB2/\\1', + 'Mail/\\1', + 'Net/\\1', + 'html', + 'utf8.class', + 'lib/html2text' // see #1485505 + ), + $classname + ); + include $filename. '.php'; } spl_autoload_register('rcube_autoload'); @@ -113,17 +113,16 @@ spl_autoload_register('rcube_autoload'); */ 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); } +// 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/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'); |