s/Deliver_SentMail/Deliver_SendMail/

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 652bc192fa7bc31c3b08bd927841632e7ba16f9c..0e8f7a9d197b58aebedb5bf67c95449374ebc8de 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -37,8 +37,8 @@ $chosen_theme = (!$found_theme ? '' : $chosen_theme);
 if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
     @include_once($chosen_theme);
 } else {
-    if (isset($theme) && isset($theme[0]) && file_exists($theme[0]['PATH'])) {
-        @include_once($theme[0]['PATH']);
+    if (isset($theme) && isset($theme[$theme_default]) && file_exists($theme[$theme_default]['PATH'])) {
+        @include_once($theme[$theme_default]['PATH']);
     } else {
         /**
          * This theme as a failsafe if no themes were found. It makes
@@ -185,9 +185,11 @@ $location_of_buttons =
 $collapse_folders =
     getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
-/* show_html_default is a int value. */
 $show_html_default =
-    intval(getPref($data_dir, $username, 'show_html_default', SMPREF_OFF));
+   getPref($data_dir, $username, 'show_html_default', SMPREF_OFF);
+
+$enable_forward_as_attachment =
+   getPref($data_dir, $username, 'enable_forward_as_attachment', SMPREF_ON);
 
 $show_xmailer_default =
     getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF );
@@ -210,6 +212,9 @@ $hour_format = getPref($data_dir, $username, 'hour_format', 2);
 
 /*  compose in new window setting */
 $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+$compose_height = getPref($data_dir, $username, 'compose_height', 550);
+$compose_width = getPref($data_dir, $username, 'compose_width', 640);
+
 
 /* signature placement settings */
 $sig_first = getPref($data_dir, $username, 'sig_first', 0);
@@ -217,6 +222,9 @@ $sig_first = getPref($data_dir, $username, 'sig_first', 0);
 /* use the internal date of the message for sorting instead of the supplied header date */
 $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
 
+/* if server sorting is enabled/disabled */
+$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
+
 /* Load the javascript settings. */
 $javascript_setting =
     getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
@@ -225,6 +233,8 @@ $javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON);
 
 $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
+$forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
+
 do_hook('loading_prefs');
 
 ?>