X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap.php;h=1ef7ace33eb5a6a60ce8d510c23db715fa68a41b;hb=ce916cdff59ae68ef8147158ade6e2230d471899;hp=30ef23b0862ce05eece85b4d9477ed92bf3b53f4;hpb=597d8f1dd82b77e993a99ea9dca1c26b19218b8b;p=squirrelmail.git

diff --git a/functions/imap.php b/functions/imap.php
index 30ef23b0..1ef7ace3 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -1,65 +1,11 @@
 <?
-   /**
-    **  imap.php
-    **
-    **  Functions for the IMAP connection
-    **
+   /**  This just includes the different sections of the imap functions.
+    **  They have been organized into these sections for simplicity sake.
     **/
 
-   /** Read from the connection until we get either an OK or BAD message. **/
-   function imapReadData($connection) {
-      $read = fgets($connection, 1024);
-      $counter = 0;
-      while ((substr($read, strpos($read, " ") + 1, 2) != "OK") && (substr($read, strpos($read, " ") + 1, 3) != "BAD")) {
-         $data[$counter] = $read;
-         $read = fgets($connection, 1024);
-         $counter++;
-      }
-      return $data;
-   }
-
-   /** Parse the incoming mailbox name and return a string that is the FOLDER.MAILBOX **/
-   function findMailboxName($mailbox) {
-      // start at -2 so that we skip the initial quote at the end of the mailbox name
-      $i = -2;
-      $char = substr($mailbox, $i, 1);
-      while ($char != "\"") {
-         $i--;
-         $temp .= $char;
-         $char = substr($mailbox, $i, 1);
-      }
-      return strrev($temp);
-   }
-
-   // handles logging onto an imap server.
-   function loginToImapServer($username, $key, $imapServerAddress) {
-      $imapConnection = fsockopen($imapServerAddress, 143, &$errorNumber, &$errorString);
-      if (!$imapConnection) {
-         echo "Error connecting to IMAP Server.<br>";
-         echo "$errorNumber : $errorString<br>";
-         exit;
-      }
-      $serverInfo = fgets($imapConnection, 256);
- 
-      // login
-      fputs($imapConnection, "1 login $username $key\n");
-      $read = fgets($imapConnection, 1024);
- 
-      if (strpos($read, "NO")) {
-         error_username_password_incorrect();
-         exit;
-      }
-      
-      return $imapConnection;
-   }
-
-   /** must be sent in the form:  user.<USER>.<FOLDER> **/
-   function createFolder($imapConnection, $folder) {
-      fputs($imapConnection, "1 create \"$folder\"\n");
-   }
-
-   /** must be sent in the form:  user.<USER>.<FOLDER> **/
-   function removeFolder($imapConnection, $folder) {
-      fputs($imapConnection, "1 delete \"$folder\"\n");
-   }
+   $imap_php = true;
+   
+   include ("../functions/imap_mailbox.php");
+   include ("../functions/imap_messages.php");
+   include ("../functions/imap_general.php");
 ?>