fixed indentation advanced tree

[squirrelmail.git] / include / load_prefs.php

diff --git a/include/load_prefs.php b/include/load_prefs.php
index a261e76bda7635af2eeba6e67eb3f144a1ac32c6..2407d830509aab6fe4796bca9637c7d58a51a22f 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -18,7 +18,9 @@ require_once(SM_PATH . 'functions/prefs.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/constants.php');
 
-$username = ( !isset($_SESSION['username']) ? '' : $_SESSION['username'] );
+if( ! sqgetGlobalVar('username', $username, SQ_SESSION) ) {
+    $username = '';
+}
 
 $custom_css = getPref($data_dir, $username, 'custom_css', 'none' );
 
@@ -44,6 +46,7 @@ if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
 } else {
     if (isset($theme) && isset($theme[$theme_default]) && file_exists($theme[$theme_default]['PATH'])) {
         @include_once($theme[$theme_default]['PATH']);
+        $chosen_theme = $theme[$theme_default]['PATH'];
     } else {
         /**
          * This theme as a failsafe if no themes were found. It makes
@@ -256,6 +259,10 @@ $forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
 
 $mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 0);
 
+/* Allow user to customize, and display the full date, instead of day, or time based
+   on time distance from date of message */
+$show_full_date = getPref($data_dir, $username, 'show_full_date', 0);
+
 do_hook('loading_prefs');
 
 ?>