From: Jason M. <jm...@us...> - 2002-08-12 17:16:35
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv31197/src Modified Files: Tag: SM-1_2-STABLE redirect.php read_body.php Log Message: rg=0 fixes Index: redirect.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/redirect.php,v retrieving revision 1.50.2.2 retrieving revision 1.50.2.3 diff -u -w -r1.50.2.2 -r1.50.2.3 --- redirect.php 3 Aug 2002 07:06:40 -0000 1.50.2.2 +++ redirect.php 12 Aug 2002 17:16:29 -0000 1.50.2.3 @@ -127,13 +127,14 @@ sqsession_register($attachment_common_types_parsed, 'attachment_common_types_parsed'); $debug = false; -if (isset($HTTP_SERVER_VARS['HTTP_ACCEPT']) && - !isset($attachment_common_types_parsed[$HTTP_SERVER_VARS['HTTP_ACCEPT']])) { - attachment_common_parse($HTTP_SERVER_VARS['HTTP_ACCEPT'], $debug); + +if (isset($_SERVER['HTTP_ACCEPT']) && + !isset($attachment_common_types_parsed[$_SERVER['HTTP_ACCEPT']])) { + attachment_common_parse($_SERVER['HTTP_ACCEPT'], $debug); } -if (isset($HTTP_ACCEPT) && - !isset($attachment_common_types_parsed[$HTTP_ACCEPT])) { - attachment_common_parse($HTTP_ACCEPT, $debug); +if (isset($_SERVER['HTTP_ACCEPT']) && + !isset($attachment_common_types_parsed[$_SERVER['HTTP_ACCEPT']])) { + attachment_common_parse($_SERVER['HTTP_ACCEPT'], $debug); } /* Complete autodetection of Javascript. */ Index: read_body.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v retrieving revision 1.179.2.8 retrieving revision 1.179.2.9 diff -u -w -r1.179.2.8 -r1.179.2.9 --- read_body.php 8 Aug 2002 17:13:40 -0000 1.179.2.8 +++ read_body.php 12 Aug 2002 17:16:29 -0000 1.179.2.9 @@ -388,21 +388,40 @@ $username = $_SESSION['username']; $key = $_COOKIE['key']; $onetimepad = $_SESSION['onetimepad']; -$passed_id = $_GET['passed_id']; $msgs = $_SESSION['msgs']; $base_uri = $_SESSION['base_uri']; +$delimiter = $_SESSION['delimiter']; + +if (isset($_GET['passed_id'])) { + $passed_id = $_GET['passed_id']; +} +elseif (isset($_POST['passed_id'])) { + $passed_id = $_POST['passed_id']; +} if (isset($_GET['sort'])) { $sort = $_GET['sort']; } +elseif (isset($_POST['sort'])) { + $sort = $_POST['sort']; +} if (isset($_GET['startMessage'])) { $startMessage = $_GET['startMessage']; } +elseif (isset($_POST['startMessage'])) { + $startMessage = $_POST['startMessage']; +} if (isset($_GET['show_more'])) { $show_more = $_GET['show_more']; } +elseif (isset($_POST['show_more'])) { + $show_more = $_POST['show_more']; +} if (isset($_GET['mailbox'])) { $mailbox = $_GET['mailbox']; } +elseif (isset($_POST['mailbox'])) { + $mailbox = $_POST['mailbox']; +} if (isset($_GET['where'])) { $where = $_GET['where']; } @@ -420,6 +439,9 @@ } if (isset($_SESSION['msort'])) { $msort = $_SESSION['msort']; +} +if (isset($_POST['move_id'])) { + $move_id = $_POST['move_id']; } $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox", 0); |