* Very minor bugfixes
authorfidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 6 Feb 2001 18:30:47 +0000 (18:30 +0000)
committerfidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 6 Feb 2001 18:30:47 +0000 (18:30 +0000)
* Removed warnings

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1061 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/i18n.php
src/load_prefs.php
src/signout.php

index e7a9a8e..d7b4680 100644 (file)
 
       if (isset($sm_language) && $use_gettext &&
          $squirrelmail_language != '' &&
-         $languages[$sm_language]['CHARSET']) {
+        isset($languages[$sm_language]['CHARSET'])) {
          if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
            putenv('LC_ALL=' . $sm_language);
          }
index 0380b4d..31389df 100644 (file)
@@ -19,6 +19,8 @@
       include("../functions/plugin.php");
       
    $load_prefs_php = true;
+   if (!isset($username))
+       $username = '';
    checkForPrefs($data_dir, $username);
 
    $chosen_theme = getPref($data_dir, $username, "chosen_theme");
index c3f1f8b..d77db43 100644 (file)
@@ -13,6 +13,9 @@
 
    session_start();
 
+   if (!isset($strings_php))
+      include("../functions/strings.php");
+
    include ("../src/load_prefs.php");
 
    if (!isset($config_php))
 
    set_up_language(getPref($data_dir, $username, "language"));
 
+   // If a user hits reload on the last page, $base_uri isn't set
+   // because it was deleted with the session.
+   if (! isset($base_uri))
+   {
+       ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+       $base_uri = $regs[1];
+   }
+
    do_hook("logout");
    setcookie("username", "", 0, $base_uri);
    setcookie("key", "", 0, $base_uri);
@@ -40,7 +51,8 @@
                $theme_css);
       echo "\n";
    }
-   echo "<TITLE>$title - Signout</TITLE>\n";
+   
+   echo "<TITLE>$org_title - Signout</TITLE>\n";
    echo "</HEAD><BODY TEXT=$color[8] BGCOLOR=$color[4] LINK=$color[7] VLINK=$color[7] ALINK=$color[7]>\n";
    echo "<BR><BR><TABLE BGCOLOR=FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
    echo "   <TR BGCOLOR=$color[0] WIDTH=100%>";