$advanced_tree and $oldway can be set in conf.pl

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5932 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/left_main.php b/src/left_main.php
index eb1b0995a2d54d9c55cfd183fd4282283dd0126b..4e9eab76ea1283a5ddde5ca23a54cee8d37f0185 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -431,7 +431,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-    $move_to_trash, $trash_folder, $collapse_folders;
+    $move_to_trash, $trash_folder, $collapse_folders, $oldway, $advanced_tree;
 
     if (!$boxes)
        return;
@@ -627,8 +627,12 @@ if (isset($left_refresh) && ($left_refresh != '') &&
  * to marc@its-projects.nl
  **/
 
-$advanced_tree = false;  /* set this to true if you want to see a nicer mailboxtree */
-$oldway = false;        /* default SM behaviour */
+/* set this to true if you want to see a nicer mailboxtree */
+if (! isset($advanced_tree) || $advanced_tree=="" ) {
+         $advanced_tree=false; }
+/* default SM behaviour */
+if (! isset($oldway) || $oldway=="" ) {
+         $oldway=false; }
 
 if ($advanced_tree) {
 $xtra .= <<<ECHO