X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=74320bf3874683c69a2ac4137c968ba94d2201b6;hb=65c3ec94c897fb098598f3843e371020deb2226b;hp=fb46544b8395658b359397785fa54c5a0fb43b5a;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git

diff --git a/src/move_messages.php b/src/move_messages.php
index fb46544b..74320bf3 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -11,155 +11,141 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
 require_once('../src/validate.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 
-   function putSelectedMessagesIntoString($msg) {
-      $j = 0;
-      $i = 0;
-      $firstLoop = true;
-      
-      // If they have selected nothing msg is size one still, but will
-      // be an infinite loop because we never increment j. so check to
-      // see if msg[0] is set or not to fix this.
-      while (($j < count($msg)) && ($msg[0])) {
-         if ($msg[$i]) {
+function putSelectedMessagesIntoString($msg) {
+    $j = 0;
+    $i = 0;
+    $firstLoop = true;
+
+    // If they have selected nothing msg is size one still, but will
+    // be an infinite loop because we never increment j. so check to
+    // see if msg[0] is set or not to fix this.
+    while (($j < count($msg)) && ($msg[0])) {
+        if ($msg[$i]) {
             if ($firstLoop != true)
-               $selectedMessages .= "&";
+            $selectedMessages .= "&";
             else
-               $firstLoop = false;
+            $firstLoop = false;
 
             $selectedMessages .= "selMsg[$j]=$msg[$i]";
-            
+
             $j++;
-         }
-         $i++;
-      }
-   }
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   sqimap_mailbox_select($imapConnection, $mailbox);
-
-   // expunge-on-demand if user isn't using move_to_trash or auto_expunge
-   if(isset($expungeButton)) {
-     sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-     $location = get_location();
-     if ($where && $what)
-       header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-     else   
-       header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-   }
-   // undelete messages if user isn't using move_to_trash or auto_expunge
-   elseif(isset($undeleteButton)) {
-      if (is_array($msg) == 1) {
-         // Removes \Deleted flag from selected messages
-         $j = 0;
-         $i = 0;
-      
-         // If they have selected nothing msg is size one still, but will be an infinite
-         //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
-         while ($j < count($msg)) {
+        }
+        $i++;
+    }
+}
+
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+sqimap_mailbox_select($imapConnection, $mailbox);
+
+// expunge-on-demand if user isn't using move_to_trash or auto_expunge
+if(isset($expungeButton)) {
+    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    $location = get_location();
+    if ($where && $what) {
+        header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+    } else {
+        header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+    }
+
+} elseif(isset($undeleteButton)) {
+    // undelete messages if user isn't using move_to_trash or auto_expunge
+
+    if (is_array($msg) == 1) {
+        // Removes \Deleted flag from selected messages
+        $j = 0;
+        $i = 0;
+
+        // If they have selected nothing msg is size one still, but will be an infinite
+        //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
+        while ($j < count($msg)) {
             if ($msg[$i]) {
-              sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted");
-               $j++;
+            sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted");
+            $j++;
             }
             $i++;
-         }
-         $location = get_location();
+        }
+        $location = get_location();
 
-         if ($where && $what)
+        if ($where && $what)
             header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-         else   
+        else
             header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } else {
-         displayPageHeader($color, $mailbox);
-         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
-      }
-   }
-   // If the delete button was pressed, the moveButton variable will not be set.
-   elseif (!isset($moveButton)) {
-      if (is_array($msg) == 1) {
-         // Marks the selected messages as 'Deleted'
-         $j = 0;
-         $i = 0;
-      
-         // If they have selected nothing msg is size one still, but will be an infinite
-         //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
-         while ($j < count($msg)) {
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+} elseif (!isset($moveButton)) {
+    // If the delete button was pressed, the moveButton variable will not be set.
+    if (is_array($msg) == 1) {
+        // Marks the selected messages as 'Deleted'
+        $j = 0;
+        $i = 0;
+
+        // If they have selected nothing msg is size one still, but will be an infinite
+        //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
+        while ($j < count($msg)) {
             if (isset($msg[$i])) {
-               if (isset($markRead)) {
-                  sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
-               } else if (isset($markUnread)) {
-                   sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
-               } else {
-                  sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
-               }
-               $j++;
+                if (isset($markRead)) {
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else if (isset($markUnread)) {
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else {
+                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+                }
+                $j++;
             }
             $i++;
-         }
-         if ($auto_expunge) {
+        }
+        if ($auto_expunge) {
             sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-         }
-         $location = get_location();
-         if (isset($where) && isset($what))
+        }
+        $location = get_location();
+        if (isset($where) && isset($what)) {
             header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-         else   
+        } else {
             header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } else {
-         displayPageHeader($color, $mailbox);
-         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
-      }
-   } else {    // Move messages
-      // lets check to see if they selected any messages
-      if (is_array($msg) == 1) {
-         $j = 0;
-         $i = 0;
- 
-         // If they have selected nothing msg is size one still, but will be an infinite
-         //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
-         while ($j < count($msg)) {
+        }
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+} else {    // Move messages
+    // lets check to see if they selected any messages
+    if (is_array($msg) == 1) {
+        $j = 0;
+        $i = 0;
+
+        // If they have selected nothing msg is size one still, but will be an infinite
+        //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
+        while ($j < count($msg)) {
             if (isset($msg[$i])) {
-               /** check if they would like to move it to the trash folder or not */
-               sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
-               sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
-               $j++;
+                /** check if they would like to move it to the trash folder or not */
+                sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
+                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
+                $j++;
             }
             $i++;
-         }
-         if ($auto_expunge == true)
+        }
+        if ($auto_expunge == true)
             sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 
-         $location = get_location();
-         if (isset($where) && isset($what))
+        $location = get_location();
+        if (isset($where) && isset($what))
             header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-         else   
+        else
             header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } else {
-         displayPageHeader($color, $mailbox);
-         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
-      }
-   }
-
-   // Log out this session
-   sqimap_logout($imapConnection);
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+}
+
+// Log out this session
+sqimap_logout($imapConnection);
 
 ?>
 </BODY></HTML>