X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=3544d162c557b6e22ee820fceb836527988adc89;hb=d2c47f00c6069f0e42dc1d99f2f23b53a0a7a118;hp=7da0d2b5d3f53b2041ef23781bdcad77224aee64;hpb=1b187352c73f6aa55f20e43f6d8352ba1228e721;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 7da0d2b5..3544d162 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,77 +1,105 @@ "; - echo "$org_title"; - echo ""; - $ishelp = substr(getenv(REQUEST_URI),-8); // If calling help, set left frame to 300 - if ($ishelp == "help.php") { - echo ""; + echo "\n"; + echo ''; + echo $org_title; + echo ''; + + $left_size = getPref($data_dir, $username, "left_size"); + $location_of_bar = getPref($data_dir, $username, "location_of_bar"); + if ($location_of_bar == '') + $location_of_bar = 'left'; + if ($left_size == "") { + if (isset($default_left_size)) + $left_size = $default_left_size; + else + $left_size = 200; + } + + if ($location_of_bar == 'right') + { + echo ""; } else { - echo ""; + echo ""; } /** - There are four ways to call webmail.php + There are three ways to call webmail.php 1. webmail.php - This just loads the default entry screen. 2. webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX - This loads the frames starting at the given values. 3. webmail.php?right_frame=folders.php - Loads the frames with the Folder options in the right frame. - 4. webmail.php?right_frame=help.php - - Lets the left frame set up different menu for help and calls the right frame. This was done to create a pure HTML way of refreshing the folder list since we would like to use as little Javascript as possible. **/ - if ($right_frame == "right_main.php") { - $urlMailbox = urlencode($mailbox); - echo ""; - echo ""; - } else if ($right_frame == "folders.php") { + if (!isset($right_frame)) $right_frame = ""; + + if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); - echo ""; - echo ""; - } else if ($right_frame == "help.php") { - echo ""; - echo ""; + $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; + } else if ($right_frame == 'options.php') { + $right_frame_url = 'options.php'; + } else if ($right_frame == 'folders.php') { + $right_frame_url = 'folders.php'; + } else if ($right_frame == 'compose.php') { + $right_frame_url = "compose.php?send_to=$rcptaddress"; } else { - echo ""; - echo ""; + $right_frame_url = "right_main.php"; + } + + if ($location_of_bar == 'right') + { + echo ""; + echo ''; + } + else + { + echo ''; + echo ""; } ?> - + \ No newline at end of file