X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=a88fe31850d36995546c1f0d0ec305b40456d8e1;hb=5b8d68ca2263cc828546f629c7cd63a78783a3d0;hp=5f1b68934b13fe0451245583646296b3c8945ad1;hpb=8675ae429a23ce6d6a6c89bbd3add051923beded;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 5f1b6893..a88fe318 100644 --- a/src/login.php +++ b/src/login.php @@ -39,13 +39,13 @@ if (isset($emailaddress)) { $key = strtolower($k); $value = urlencode($v); if ($key == 'cc') { - $rcptaddress .= '&send_to_cc=' . $value; + $rcptaddress .= '&send_to_cc=' . $value; } else if ($key == 'bcc') { - $rcptaddress .= '&send_to_bcc=' . $value; + $rcptaddress .= '&send_to_bcc=' . $value; } else if ($key == 'subject') { - $rcptaddress .= '&subject=' . $value; + $rcptaddress .= '&subject=' . $value; } else if ($key == 'body') { - $rcptaddress .= '&body=' . $value; + $rcptaddress .= '&body=' . $value; } } @@ -59,6 +59,7 @@ require_once('../functions/i18n.php'); require_once('../functions/plugin.php'); require_once('../functions/constants.php'); require_once('../functions/page_header.php'); +require_once('../functions/html.php'); /* * $squirrelmail_language is set by a cookie when the user selects @@ -66,9 +67,13 @@ require_once('../functions/page_header.php'); */ set_up_language($squirrelmail_language, TRUE); -/* Need the base URI to set the cookies. (Same code as in webmail.php). */ -ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); -$base_uri = $regs[1]; +/** + * Find out the base URI to set cookies. + */ +if (!function_exists('sqm_baseuri')){ + require_once('../functions/display_messages.php'); +} +$base_uri = sqm_baseuri(); @session_destroy(); /* @@ -76,7 +81,8 @@ $base_uri = $regs[1]; * we get a new one. */ $cookie_params = session_get_cookie_params(); -setcookie(session_name(),'',0,$cookie_params['path'].$cookie_params['domain']); +setcookie(session_name(), '', 0, $cookie_params['path'], + $cookie_params['domain']); setcookie('username', '', 0, $base_uri); setcookie('key', '', 0, $base_uri); header('Pragma: no-cache'); @@ -85,7 +91,7 @@ do_hook('login_cookie'); /* Output the javascript onload function. */ -$header = "