X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap.php;h=e4e857235082872b3d85a8db2d470ef87c73fb9d;hb=95dbbd91f7d7858cb05de5c3090b82ce14b4fd99;hp=4f11ed9072d7f43691a5f7232e6204fa280d4137;hpb=aceb0d5c925965586360e1a9560b09e6173d49d6;p=squirrelmail.git

diff --git a/functions/imap.php b/functions/imap.php
index 4f11ed90..e4e85723 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -1,109 +1,18 @@
-<?
-   /**
-    **  imap.php
-    **
-    **  Functions for the IMAP connection
-    **
-    **/
-
-   /** 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);
-      }
-      echo $tmp;
-      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");
-   }
-
-   /** Sends back two arrays, boxesFormatted and boxesUnformatted **/
-   function getFolderList($imapConnection, &$boxesFormatted, &$boxesUnformatted) {
-      fputs($imapConnection, "1 list \"\" *\n");
-      $str = imapReadData($imapConnection);
-
-      for ($i = 0;$i < count($str); $i++) {
-         $mailbox = chop($str[$i]);
-         $mailbox = findMailboxName($mailbox);
-         $periodCount = countCharInString($mailbox, ".");
-
-         // indent the correct number of spaces.
-         for ($j = 0;$j < $periodCount;$j++)
-            $boxesFormatted[$i] = "$boxesFormatted[$i]&nbsp;&nbsp;";
-
-         $boxesFormatted[$i] = $boxesFormatted[$i] . readShortMailboxName($mailbox, ".");
-         $boxesUnformatted[$i] = $mailbox;
-      }
-   }
-
-   function deleteMessages($imapConnection, $a, $b, $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox) {
-      /** check if they would like to move it to the trash folder or not */
-      if ($move_to_trash == true) {
-         $success = copyMessages($imapConnection, $a, $b, $trash_folder);
-         if ($success == true)
-            setMessageFlag($imapConnection, $a, $b, "Deleted");
-      } else {
-         setMessageFlag($imapConnection, $a, $b, "Deleted");
-      }
-   }
-   function stripComments($line) {
-      if (strpos($line, ";")) {
-         $line = substr($line, 0, strpos($line, ";"));
-      }
-
-      if (strpos($line, "(") && strpos($line, ")")) {
-         $full_line = $full_line . substr($line, 0, strpos($line, "("));
-         $full_line = $full_line . substr($line, strpos($line, ")")+1, strlen($line) - strpos($line, ")"));
-      } else {
-         $full_line = $line;
-      }
-      return $full_line;
-   }
-?>
+<?php
+
+/**
+ * imap.php
+ *
+ * This just includes the different sections of the imap functions.
+ * They have been organized into these sections for simplicity sake.
+ *
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage imap
+ */
+
+/** Includes */
+include_once(SM_PATH . 'functions/imap_messages.php');
+include_once(SM_PATH . 'functions/imap_general.php');