|
@@ -38,10 +38,9 @@ unset($theme);
|
|
$theme=array();
|
|
$theme=array();
|
|
|
|
|
|
/* SquirrelMail required files. */
|
|
/* SquirrelMail required files. */
|
|
-require_once(SM_PATH . 'class/mime.class.php');
|
|
|
|
-require_once(SM_PATH . 'functions/global.php');
|
|
|
|
-require_once(SM_PATH . 'functions/strings.php');
|
|
|
|
-require_once(SM_PATH . 'config/config.php');
|
|
|
|
|
|
+include_once(SM_PATH . 'class/mime.class.php');
|
|
|
|
+include_once(SM_PATH . 'functions/global.php');
|
|
|
|
+include_once(SM_PATH . 'functions/strings.php');
|
|
|
|
|
|
/* set the name of the session cookie */
|
|
/* set the name of the session cookie */
|
|
if(isset($session_name) && $session_name) {
|
|
if(isset($session_name) && $session_name) {
|
|
@@ -52,8 +51,8 @@ if(isset($session_name) && $session_name) {
|
|
|
|
|
|
sqsession_is_active();
|
|
sqsession_is_active();
|
|
|
|
|
|
-require_once(SM_PATH . 'functions/i18n.php');
|
|
|
|
-require_once(SM_PATH . 'functions/auth.php');
|
|
|
|
|
|
+include_once(SM_PATH . 'functions/i18n.php');
|
|
|
|
+include_once(SM_PATH . 'functions/auth.php');
|
|
|
|
|
|
is_logged_in();
|
|
is_logged_in();
|
|
|
|
|
|
@@ -79,9 +78,10 @@ if (isset($send)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-require_once(SM_PATH . 'include/load_prefs.php');
|
|
|
|
-require_once(SM_PATH . 'functions/page_header.php');
|
|
|
|
-require_once(SM_PATH . 'functions/prefs.php');
|
|
|
|
|
|
+include_once(SM_PATH . 'functions/page_header.php');
|
|
|
|
+include_once(SM_PATH . 'functions/prefs.php');
|
|
|
|
+include_once(SM_PATH . 'config/config.php');
|
|
|
|
+include_once(SM_PATH . 'include/load_prefs.php');
|
|
|
|
|
|
/* Set up the language (i18n.php was included by auth.php). */
|
|
/* Set up the language (i18n.php was included by auth.php). */
|
|
global $username, $data_dir;
|
|
global $username, $data_dir;
|
|
@@ -103,7 +103,7 @@ if ( $timeZone != SMPREF_NONE && ($timeZone != "")
|
|
&& $tzChangeAllowed ) {
|
|
&& $tzChangeAllowed ) {
|
|
|
|
|
|
// get time zone key, if strict or custom strict timezones are used
|
|
// get time zone key, if strict or custom strict timezones are used
|
|
- if (isset($time_zone_type) &&
|
|
|
|
|
|
+ if (isset($time_zone_type) &&
|
|
($time_zone_type == 1 || $time_zone_type == 3)) {
|
|
($time_zone_type == 1 || $time_zone_type == 3)) {
|
|
/* load time zone functions */
|
|
/* load time zone functions */
|
|
require_once(SM_PATH . 'include/timezones.php');
|
|
require_once(SM_PATH . 'include/timezones.php');
|
|
@@ -118,4 +118,27 @@ if ( $timeZone != SMPREF_NONE && ($timeZone != "")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/* temporary sm_init section */
|
|
|
|
+
|
|
|
|
+include_once(SM_PATH . 'class/template/template.class.php');
|
|
|
|
+include_once(SM_PATH . 'class/error.class.php');
|
|
|
|
+/*
|
|
|
|
+ * Initialize the template object
|
|
|
|
+ */
|
|
|
|
+$oTemplate = new Template($sTplDir);
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Initialize our custom error handler object
|
|
|
|
+ */
|
|
|
|
+$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Activate custom error handling
|
|
|
|
+ */
|
|
|
|
+if (version_compare(PHP_VERSION, "4.3.0", ">=")) {
|
|
|
|
+ $oldErrorHandler = set_error_handler(array($oErrorHandler, 'SquirrelMailErrorhandler'));
|
|
|
|
+} else {
|
|
|
|
+ $oldErrorHandler = set_error_handler('SquirrelMailErrorhandler');
|
|
|
|
+}
|
|
|
|
+
|
|
?>
|
|
?>
|