changed log in method back to using cookies. also session id is now stored

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 30f0084f74a25853f6ac3fba775315f7065e54e6..12e2352dd1b519bac5cc2e578ea3ead106eeebad 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -10,15 +10,13 @@
     $display_messages_php = true;
 
     function error_username_password_incorrect($color) {
-      global $PHPSESSID;
-
       echo "<BR>";
       echo "<TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
       echo "         <B><CENTER>ERROR</CENTER></B>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><BR>". _("Unknown user or password incorrect.") ."<BR><A HREF=\"login.php?PHPSESSID=$PHPSESSID\" TARGET=_top>". _("Click here to try again") ."</A>.</CENTER>";
+      echo "      <CENTER><BR>". _("Unknown user or password incorrect.") ."<BR><A HREF=\"login.php\" TARGET=_top>". _("Click here to try again") ."</A>.</CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
       echo "</BODY></HTML>";
@@ -52,7 +50,6 @@
    }
 
     function messages_deleted_message($mailbox, $sort, $startMessage, $color) {
-      global $PHPSESSID;
       $urlMailbox = urlencode($mailbox);
 
       echo "<BR>";
@@ -63,7 +60,7 @@
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><BR>". _("The selected messages were deleted successfully.") ."<BR>\n";
       echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
       echo "      </CENTER>";
       echo "   </TD></TR>";
@@ -71,7 +68,6 @@
     }
 
     function messages_moved_message($mailbox, $sort, $startMessage, $color) {
-      global $PHPSESSID;
       $urlMailbox = urlencode($mailbox);
 
       echo "<BR>";
@@ -82,7 +78,7 @@
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><BR>". _("The selected messages were moved successfully.") ."<BR>\n";
       echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
       echo "      </CENTER>";
       echo "   </TD></TR>";
@@ -90,7 +86,6 @@
     }
 
     function error_message($message, $mailbox, $sort, $startMessage, $color) {
-      global $PHPSESSID;
       $urlMailbox = urlencode($mailbox);
 
       echo "<BR>";
@@ -101,7 +96,7 @@
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><BR>$message<BR>\n";
       echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
       echo "      </CENTER>";
       echo "   </TD></TR>";