From 23a8095f0dfa9a767acfab1fc02dcad78cd16eae Mon Sep 17 00:00:00 2001 From: lkehresman Date: Wed, 6 Dec 2000 13:22:42 +0000 Subject: [PATCH] - fixed bug in conf.pl where no default was set for $force_username_lowercase - fixed bug in download.php that didn't display rtf correctly git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@868 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 2 ++ config/conf.pl | 3 +++ src/download.php | 15 +++++++++++---- src/login.php | 3 ++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d9dddbf..a51ab3af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Version 1.0pre1 -- DEVELOPMENT ------------------------------ +- Made session cookie parameter use PHP's settings rather than making assumptions +- Select/Deslect all implemented using only HTML (not Javascript) - Fixed default charset that is sent with outbound messages (now user's preferred charset) - Sort method saving now transparent to user, and saves between sessions - Now replacing all \n with \r\n before sending the message. diff --git a/config/conf.pl b/config/conf.pl index 4d47933d..68a5ee69 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -234,6 +234,9 @@ if (!$config_use_color) { if (!$invert_time) { $invert_time = "false"; } +if (!$force_username_lowercase) { + $force_username_lowercase = "false"; +} ##################################################################################### if ($config_use_color == 1) { diff --git a/src/download.php b/src/download.php index d9502e0e..faaafc62 100644 --- a/src/download.php +++ b/src/download.php @@ -130,10 +130,17 @@ } else { switch ($type0) { case "text": - $body = decodeBody($body, $header->encoding); - include("../functions/page_header.php"); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); - break; + if ($type1 == "text" || $type1 == "html") { + $body = decodeBody($body, $header->encoding); + include("../functions/page_header.php"); + viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); + } else { + $body = decodeBody($body, $header->encoding); + header("Content-type: $type0/$type1; name=\"$filename\""); + header("Content-Disposition: attachment; filename=\"$filename\""); + echo $body; + } + break; case "message": $body = decodeBody($body, $header->encoding); include("../functions/page_header.php"); diff --git a/src/login.php b/src/login.php index f2345509..d8d69c14 100644 --- a/src/login.php +++ b/src/login.php @@ -33,7 +33,8 @@ // In case the last session was not terminated properly, make sure // we get a new one. - setcookie("PHPSESSID", "", 0, $base_uri); + $cookie_params = session_get_cookie_params(); + setcookie(session_name(),"",0,$cookie_params["domain"].$cookie_params["path"]); echo ""; echo ""; -- 2.25.1