X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=5ee384040a778464b571ddb0ee95dcf67d10facd;hb=5cd6702ade2d6ca6732f69d5f73c62d571419388;hp=9d9638258f44e5468fcc22b645bff99a049f972e;hpb=2a32fc83f95eba42be0d1752ef685adf10e1edc9;p=squirrelmail.git

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 9d963825..5ee38404 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  imap.php
     **
@@ -65,7 +65,6 @@
     ******************************************************************************/
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
       global $color;
-      global $PHPSESSID;
       $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
       $server_info = fgets ($imap_stream, 1024);
       
@@ -98,7 +97,7 @@
                               <td bgcolor=dcdcdc>
                                  <font color=cc0000>
                                  <center>
-                                 <? echo _("ERROR") ?>
+                                 <?php echo _("ERROR") ?>
                                  </center>
                                  </font>
                               </td>
@@ -106,8 +105,8 @@
                            <tr>
                               <td>
                                  <center>
-                                 <? echo _("Unknown user or password incorrect.") ?><br>
-                                 <a href="login.php"><? echo _("Click here to try again") ?></a>
+                                 <?php echo _("Unknown user or password incorrect.") ?><br>
+                                 <a href="login.php"><?php echo _("Click here to try again") ?></a>
                                  </center>
                               </td>
                            </tr>
@@ -115,7 +114,7 @@
                         </center>
                      </body>
                   </html>
-               <?
+               <?php
                session_destroy();
                exit;
             } else {
@@ -146,7 +145,7 @@
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
    function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LSUB \"\" *\r\n");
+      fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
       $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
       $quote_position = strpos ($read[0], "\"");
       $delim = substr ($read[0], $quote_position+1, 1);