Enabled user selection of address format when adding from address book during message...

[squirrelmail.git] / include / load_prefs.php

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 12886b9fb5ba5feff87a94a08a7b303ae06b8fe5..5cc697495f3430a7a898d08ce05fc8eba2ac7690 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -17,8 +17,7 @@
  * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' and
  * code does not handle magic_quotes_gpc=on.
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../src/login.php");
     die();
 }
@@ -158,9 +157,6 @@ $reply_focus = getPref($data_dir, $username, 'reply_focus', '');
 $left_refresh = getPref($data_dir, $username, 'left_refresh', 600 );
 $left_refresh = strtolower($left_refresh);
 
-/* Load up the Signature file */
-$signature_abs = $signature = getSig($data_dir, $username, 'g');
-
 /* Message Highlighting Rules */
 $message_highlight_list = array();
 
@@ -260,6 +256,9 @@ $collapse_folders =
 $show_html_default =
    getPref($data_dir, $username, 'show_html_default', SMPREF_ON);
 
+$addrsrch_fullname =
+   getPref($data_dir, $username, 'addrsrch_fullname', SMPREF_ON);
+
 $enable_forward_as_attachment =
    getPref($data_dir, $username, 'enable_forward_as_attachment', SMPREF_ON);
 
@@ -318,11 +317,9 @@ $show_only_subscribed_folders =
     getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
 
 
-$forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF);
-
 /* How are mailbox select lists displayed: 0. full names, 1. indented (default),
  * 3. delimited) */
-$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_ON);
+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_MAILBOX_SELECT_INDENTED);
 
 /* Allow user to customize, and display the full date, instead of day, or time based
    on time distance from date of message */
@@ -437,3 +434,6 @@ $icon_theme_path = (!$use_icons || $icon_theme=='none') ? NULL : ($icon_theme ==
 $default_icon_theme_path = (!$use_icons || $default_icon_theme=='none') ? NULL : ($default_icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $default_icon_theme);
 $fallback_icon_theme_path = (!$use_icons || $fallback_icon_theme=='none') ? NULL : ($fallback_icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $fallback_icon_theme);
 
+/* Load up the Signature file */
+$signature_abs = $signature = getSig($data_dir, $username, 'g');
+