X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=5e80c89cb8cfc8413fce3e81dd776c5fc42b9e30;hb=f1f3803aab9214d9d65a6e2ff9a5fbb4339be0ad;hp=0ed842d3f36d29ff406475ab8dfe7413bc0cf3f7;hpb=5917742752bea11a547aeba6e4102dd3655b4800;p=squirrelmail.git

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 0ed842d3..5e80c89c 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -5,50 +5,48 @@
     **  This implements all functions that do general imap functions.
     **/
 
+   $imap_general_debug = false;
+   //$imap_general_debug = false;
+
    /******************************************************************************
     **  Reads the output from the IMAP stream.  If handle_errors is set to true,
     **  this will also handle all errors that are received.  If it is not set,
     **  the errors will be sent back through $response and $message
     ******************************************************************************/
-   function sqimap_read_data ($imap_stream, $pre, $handle_errors, $response, $message) {
-      global $color;
+   function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+      global $color, $squirrelmail_language, $imap_general_debug;
 
-      $read = fgets ($imap_stream, 1024);
       $counter = 0;
-      while ((substr($read, 0, strlen("$pre OK")) != "$pre OK") &&
-             (substr($read, 0, strlen("$pre BAD")) != "$pre BAD") &&
-             (substr($read, 0, strlen("$pre NO")) != "$pre NO")) {
-         $data[$counter] = $read;
-         $read = fgets ($imap_stream, 1024);
-         $counter++;
-      }       
-      if (substr($read, 0, strlen("$pre OK")) == "$pre OK") {
-         $response = "OK";
-         $message = trim(substr($read, strlen("$pre OK"), strlen($read)));
-      }
-      else if (substr($read, 0, strlen("$pre BAD")) == "$pre BAD") {
-         $response = "BAD";
-         $message = trim(substr($read, strlen("$pre BAD"), strlen($read)));
-      }
-      else {   
-         $response = "NO";
-         $message = trim(substr($read, strlen("$pre NO"), strlen($read)));
-      }
+      do {
+          $data[$counter] = $read = fgets ($imap_stream, 9096);
+          if ($imap_general_debug) { echo "<small><tt><font color=cc0000>$read</font></tt></small><br>"; flush(); }
+          $counter++;
+      } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs));
+
+      $response = $regs[1];
+      $message = trim($regs[2]);
+      
+      if ($imap_general_debug) echo "--<br>";
 
       if ($handle_errors == true) {
          if ($response == "NO") {
-            echo "<br><b><font color=$color[2]>";
-            echo _("ERROR : Could not complete request.");
-            echo "</b><br>";
-            echo _("Reason Given: ");
-            echo "$message</font><br>";
-            exit;
+            // ignore this error from m$ exchange, it is not fatal (aka bug)
+            if (!ereg("command resulted in",$message)) { 
+               set_up_language($squirrelmail_language);
+               echo "<br><b><font color=$color[2]>\n";
+               echo _("ERROR : Could not complete request.");
+               echo "</b><br>\n";
+               echo _("Reason Given: ");
+               echo $message . "</font><br>\n";
+               exit;
+            }
          } else if ($response == "BAD") {
-            echo "<br><b><font color=$color[2]>";
+            set_up_language($squirrelmail_language);
+            echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Bad or malformed request.");
-            echo "</b><br>";
+            echo "</b><br>\n";
             echo _("Server responded: ");
-            echo "$message</font><br>";
+            echo $message . "</font><br>\n";
             exit;
          }
       }
@@ -56,38 +54,66 @@
       return $data;
    }
    
-
-
-   
    /******************************************************************************
     **  Logs the user into the imap server.  If $hide is set, no error messages
     **  will be displayed.  This function returns the imap connection handle.
     ******************************************************************************/
    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);
+      global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
+
+      $imap_stream = fsockopen ($imap_server_address, $imap_port,
+         &$error_number, &$error_string, 15);
       $server_info = fgets ($imap_stream, 1024);
       
+      // Decrypt the password
+      $password = OneTimePadDecrypt($password, $onetimepad);
+
       /** Do some error correction **/
       if (!$imap_stream) {
          if (!$hide) {
-            echo "Error connecting to IMAP server: $imap_server_address.<br>\r\n";
+            set_up_language($squirrelmail_language, true);
+            printf (_("Error connecting to IMAP server: %s.")."<br>\r\n", $imap_server_address);
             echo "$error_number : $error_string<br>\r\n";
          }
          exit;
       }
 
-      fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n");
-      $read = fgets ($imap_stream, 1024);
+      fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) . 
+         "\" \"" . quotemeta($password) . "\"\r\n");
+      $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message);
 
       /** If the connection was not successful, lets see why **/
-      if (substr($read, 0, 7) != "a001 OK") {
+      if ($response != "OK") {
          if (!$hide) {
-            if (substr($read, 0, 8) == "a001 BAD") {
-               echo "Bad request: $read<br>\r\n";
+            if ($response != "NO") {
+               // "BAD" and anything else gets reported here.
+               set_up_language($squirrelmail_language, true);
+               if ($response == "BAD")
+                   printf (_("Bad request: %s")."<br>\r\n", $message);
+               else
+                   printf (_("Unknown error: %s") . "<br>\n", $message);
+               echo "<br>";
+               echo _("Read data:") . "<br>\n";
+	       if (is_array($read))
+	       {
+                   foreach ($read as $line)
+                   {
+                       echo htmlspecialchars($line) . "<br>\n";
+		   }
+               }
                exit;
-            } else if (substr($read, 0, 7) == "a001 NO") {
+            } else {
+               // If the user does not log in with the correct
+               // username and password it is not possible to get the
+               // correct locale from the user's preferences.
+               // Therefore, apply the same hack as on the login
+               // screen.
+
+               // $squirrelmail_language is set by a cookie when
+               // the user selects language and logs out
+               
+               set_up_language($squirrelmail_language, true);
+               
                ?>
                   <html>
                      <body bgcolor=ffffff>
@@ -107,7 +133,7 @@
                               <td>
                                  <center>
                                  <?php echo _("Unknown user or password incorrect.") ?><br>
-                                 <a href="login.php"><?php echo _("Click here to try again") ?></a>
+                                 <a href="login.php" target="_top"><?php echo _("Click here to try again") ?></a>
                                  </center>
                               </td>
                            </tr>
@@ -118,9 +144,6 @@
                <?php
                session_destroy();
                exit;
-            } else {
-               echo "Unknown error: $read<br>";
-               exit;
             }
          } else {
             exit;
@@ -140,21 +163,86 @@
       fputs ($imap_stream, "a001 LOGOUT\r\n");
    }
 
+function sqimap_capability($imap_stream, $capability) {
+	global $sqimap_capabilities;
+	global $imap_general_debug;
 
+	if (!is_array($sqimap_capabilities)) {
+		fputs ($imap_stream, "a001 CAPABILITY\r\n");
+		$read = sqimap_read_data($imap_stream, "a001", true, $a, $b);
+
+		$c = explode(' ', $read[0]);
+		for ($i=2; $i < count($c); $i++) {
+			list($k, $v) = explode('=', $c[$i]);
+			$sqimap_capabilities[$k] = ($v)?$v:TRUE;
+		}
+	}
+	return $sqimap_capabilities[$capability];
+}
 
    /******************************************************************************
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
-   function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LSUB \"\" *\r\n");
-      $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
-      $quote_position = strpos ($read[0], "\"");
-      $delim = substr ($read[0], $quote_position+1, 1);
+function sqimap_get_delimiter ($imap_stream = false) {
+   global $imap_general_debug;
+   global $sqimap_delimiter;
+   global $optional_delimiter;
 
-      return $delim;
+   /* Use configured delimiter if set */
+   if((!empty($optional_delimiter)) && $optional_delimiter != "detect") {
+      return $optional_delimiter;
    }
 
-
+	/* Do some caching here */
+    if (!$sqimap_delimiter) {
+		if (sqimap_capability($imap_stream, "NAMESPACE")) {
+			/* According to something that I can't find, this is supposed to work on all systems
+			   OS: This won't work in Courier IMAP.
+			   OS:  According to rfc2342 response from NAMESPACE command is:
+			   OS:  * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES)
+			   OS:  We want to lookup all personal NAMESPACES...
+			*/
+			fputs ($imap_stream, "a001 NAMESPACE\r\n");
+			$read = sqimap_read_data($imap_stream, "a001", true, $a, $b);
+			if (eregi('\* NAMESPACE +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL)', $read[0], $data)) {
+				if (eregi('^\( *\((.*)\) *\)', $data[1], $data2))
+					$pn = $data2[1];
+				$pna = explode(')(', $pn);
+				while (list($k, $v) = each($pna))
+				{
+					list($_, $n, $_, $d) = explode('"', $v);
+					$pn[$n] = $d;
+				}
+/* OS: We don't need this code right now, it is for other_users and shared folders
+				if (eregi('^\( *\((.*)\) *\)', $data[2], $data2))
+					$on = $data2[1];
+				if (eregi('^\( *\((.*)\) *\)', $data[3], $data2))
+					$sn = $data2[1];
+				unset($data);
+				$ona = explode(')(', $on);
+				while (list($k, $v) = each($ona))
+				{
+					list($_, $n, $_, $d) = explode('"', $v);
+					$on[$n] = $d;
+				}
+				$sna = explode(')(', $sn);
+				while (list($k, $v) = each($sna))
+				{
+					list($_, $n, $_, $d) = explode('"', $v);
+					$sn[$n] = $d;
+				}
+*/
+			}
+			$sqimap_delimiter = $pn[0];
+		} else {
+			fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
+			$read = sqimap_read_data($imap_stream, ".", true, $a, $b);
+			$quote_position = strpos ($read[0], "\"");
+			$sqimap_delimiter = substr ($read[0], $quote_position+1, 1);
+		}
+	}
+	return $sqimap_delimiter;
+}
 
 
    /******************************************************************************
@@ -164,12 +252,11 @@
       fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
       for ($i = 0; $i < count($read_ary); $i++) {
-         if (substr(trim($read_ary[$i]), -6) == EXISTS) {
-            $array = explode (" ", $read_ary[$i]);
-            $num = $array[1];
+         if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) {
+	    return $regs[1];
          }
       }
-      return $num;
+      return "BUG!  Couldn't get number of messages in $mailbox!";
    }
 
    
@@ -180,11 +267,13 @@
       /** Luke Ehresman <lehresma@css.tayloru.edu>
        ** <lehresma@css.tayloru.edu>
        ** lehresma@css.tayloru.edu
+       **
+       ** What about
+       **    lehresma@css.tayloru.edu (Luke Ehresman)
        **/
 
-      if (strpos($string, "<") && strpos($string, ">")) {
-         $string = substr($string, strpos($string, "<")+1);
-         $string = substr($string, 0, strpos($string, ">"));
+      if (ereg("<([^>]+)>", $string, $regs)) {
+          $string = $regs[1];
       }
       return trim($string); 
    }
@@ -199,6 +288,7 @@
     ******************************************************************************/
    function sqimap_find_displayable_name ($string) {
       $string = " ".trim($string);
+      $orig_string = $string;
       if (strpos($string, "<") && strpos($string, ">")) {
          if (strpos($string, "<") == 1) {
             $string = sqimap_find_email($string);
@@ -207,30 +297,24 @@
             $string = substr($string, 0, strpos($string, "<"));
             $string = ereg_replace ("\"", "", $string);   
          }   
+
+         if (trim($string) == "") {
+            $string = sqimap_find_email($orig_string);
+         }
       }
       return $string; 
    }
 
 
-   
    /******************************************************************************
     **  Returns the number of unseen messages in this folder 
     ******************************************************************************/
-   function sqimap_unseen_messages ($imap_stream, &$num_unseen) {
-      fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
+   function sqimap_unseen_messages ($imap_stream, &$num_unseen, $mailbox) {
+      //fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
+      fputs ($imap_stream, "a001 STATUS \"$mailbox\" (UNSEEN)\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
-      $unseen = false;
-      
-      if (strlen($read_ary[0]) > 10) {
-         $unseen = true;
-         $ary = explode (" ", $read_ary[0]);
-         $num_unseen = count($ary) - 2;
-      } else {
-         $unseen = false;
-         $num_unseen = 0;
-      }
-
-      return $unseen;
+      ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs);
+      return $regs[1];
    }