'; +echo $org_title; +echo '

X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=3f9c11199a59b2ae9166f5b170ebfecfa8f2a146;hp=773995d7e3d2ff95f631edded05de95918ef02f4;hb=15e6162eacc97158393bc75aed3afeb7b19c24a6;hpb=5a7af78b274c22bc9279eaf1ee97a40c5403d1a6 diff --git a/src/webmail.php b/src/webmail.php index 773995d7..3f9c1119 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,101 +1,114 @@ \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 "\n"; - echo ""; - echo "$org_title"; - echo ""; - $ishelp = substr(getenv(REQUEST_URI),-8); // If calling help, set left frame to 300 - if ($ishelp == "help.php") { - echo ""; - } else { - echo ""; - } +/* + * 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. + * + * 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 (!isset($right_frame)) { + $right_frame = ""; +} -/** - 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. +if ($right_frame == 'right_main.php') { + $urlMailbox = urlencode($mailbox); + $right_frame_url = + "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; +} +elseif ($right_frame == 'options.php') { + $right_frame_url = 'options.php'; +} +elseif ($right_frame == 'folders.php') { + $right_frame_url = 'folders.php'; +} +elseif ($right_frame == 'compose.php') { + $right_frame_url = "compose.php?send_to=$rcptaddress"; +} +else { + $right_frame_url = 'right_main.php'; +} - 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 == "options.php") { - echo ""; - echo ""; - } else if ($right_frame == "folders.php") { - $urlMailbox = urlencode($mailbox); - echo ""; - echo ""; - } else { - echo ""; - echo ""; - } +if ($location_of_bar == 'right') { + echo ""; + echo ''; +} +else { + echo ''; + echo ""; +} ?>