Menu
▾
▴
CVS: squirrelmail/src login.php,1.59,1.60 redirect.php,1.31,1.32
|
From: Philippe M. <phi...@us...> - 2001-11-27 19:10:33
|
Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv588/src
Modified Files:
login.php redirect.php
Log Message:
Fixed login crash
Index: login.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/login.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -w -r1.59 -r1.60
--- login.php 2001/11/26 13:02:47 1.59
+++ login.php 2001/11/27 19:10:28 1.60
@@ -53,21 +53,7 @@
$rcptaddress = urlencode($rcptaddress);
}
- /* Check if system has been configured */
- if ( !file_exists( '../config/config.php' ) ) {
- echo "<html>\n".
- "<head>\n".
- '<title>' . _("Configuration Error") . "</title>\n".
- "</head>\n".
- "<body>\n" .
- '<center><h1>' .
- _("This system has not been configured yet.") .
- '<br>' .
- _("Please contact system administrator.") .
- '</h1></center>'.
- "</body></html>\n";
- exit;
- }
+
require_once('../functions/strings.php');
require_once('../config/config.php');
Index: redirect.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/redirect.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- redirect.php 2001/11/23 15:02:41 1.31
+++ redirect.php 2001/11/27 19:10:28 1.32
@@ -15,7 +15,30 @@
require_once('../functions/i18n.php');
require_once('../functions/strings.php');
require_once('../config/config.php');
+ require_once('../functions/prefs.php');
+ require_once('../functions/imap.php');
+ require_once('../functions/plugin.php');
+ require_once('../functions/constants.php');
+
+ function attachment_common_parse($str, $debug) {
+ global $attachment_common_types, $attachment_common_types_parsed;
+
+ $attachment_common_types_parsed[$str] = true;
+ $types = explode(', ', $str);
+
+ foreach ($types as $val)
+ {
+ // Ignore the ";q=1.0" stuff
+ if (strpos($val, ';') !== false)
+ $val = substr($val, 0, strpos($val, ';'));
+ if (! isset($attachment_common_types[$val])) {
+ $attachment_common_types[$val] = true;
+ }
+ }
+ }
+
+
/* Before starting the session, the base URI must be known. Assuming */
/* that this file is in the src/ subdirectory (or something). */
ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
@@ -30,32 +53,25 @@
session_unregister ('user_is_logged_in');
session_register ('base_uri');
- if (! isset($squirrelmail_language)) {
- $squirrelmail_language = '';
+ if (! isset($squirrelmail_language) ||
+ $squirrelmail_language == '' ) {
+ $squirrelmail_language = $squirrelmail_default_language;
}
set_up_language($squirrelmail_language, true);
+ /* Refresh the language cookie. */
+ setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri);
if (!isset($login_username)) {
- echo "<HTML><BODY BGCOLOR=\"#ffffff\">\n";
- echo "<BR><BR>\n";
- echo "<CENTER>\n";
- echo ' <B>' . _("You must be logged in to access this page.") . "</B><BR>";
- echo ' <A HREF="../src/login.php">' . _("Go to the login page") . "</A>\n";
- echo "</CENTER>\n";
- echo "</BODY></HTML>\n";
+ echo "<HTML><BODY BGCOLOR=\"#ffffff\">\n" .
+ "<BR> <BR>\n" .
+ "<CENTER>\n" .
+ '<B>' . _("You must be logged in to access this page.") . "</B><BR>" .
+ '<A HREF="../src/login.php">' . _("Go to the login page") . "</A>\n" .
+ "</CENTER>\n" .
+ "</BODY></HTML>\n";
exit;
}
- /* Refresh the language cookie. */
- if (isset($squirrelmail_language)) {
- setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri);
- }
-
- require_once('../functions/prefs.php');
- require_once('../functions/imap.php');
- require_once('../functions/plugin.php');
- require_once('../functions/constants.php');
-
if (!session_is_registered('user_is_logged_in')) {
do_hook ('login_before');
@@ -70,13 +86,13 @@
$imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
if (!$imapConnection) {
- echo "<html><body bgcolor=\"#ffffff\">\n";
- echo "<br><br>";
- echo "<center>";
- echo "<b>"._("There was an error contacting the mail server.")."</b><br>";
- echo _("Contact your administrator for help.")."\n";
- echo "</center>";
- echo "</body></html>\n";
+ echo "<html><body bgcolor=\"#ffffff\">\n".
+ "<br> <br>\n".
+ "<center>\n".
+ '<b>' . _("There was an error contacting the mail server.") . "</b><br>\n".
+ _("Contact your administrator for help.") . "\n".
+ "</center>\n".
+ "</body></html>\n";
exit;
} else {
$delimiter = sqimap_get_delimiter ($imapConnection);
@@ -137,25 +153,5 @@
/* Send them off to the appropriate page. */
header("Location: $redirect_url");
-
-
-function attachment_common_parse($str, $debug)
-{
- global $attachment_common_types, $attachment_common_types_parsed;
-
- $attachment_common_types_parsed[$str] = true;
- $types = explode(', ', $str);
-
- foreach ($types as $val)
- {
- // Ignore the ";q=1.0" stuff
- if (strpos($val, ';') !== false)
- $val = substr($val, 0, strpos($val, ';'));
-
- if (! isset($attachment_common_types[$val])) {
- $attachment_common_types[$val] = true;
- }
- }
-}
?>
|