fixed message deleting problem

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@442 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index b21f9f1fe8793d6101c85a88a22662a300b70bcd..675735d2913d850189835ef00fa3aa6e1aacd575 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -10,8 +10,9 @@
 
    $mailbox_info = true;
 
-   function printMessageInfo($imapConnection, $t, $msg, $mailbox, $sort, $startMessage) {
-      global $color;
+   function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) {
+      global $color, $msgs, $msort;
+               $msg = $msgs[$key];
 
       $senderName = $msg["FROM"];
       $urlMailbox = urlencode($mailbox);
@@ -22,7 +23,7 @@
       if ($msg["FLAG_SEEN"] == false) { $bold = "<b>"; $bold_end = "</b>"; }
       if ($msg["FLAG_ANSWERED"] == true) { $ans = "&nbsp;[A]"; }
       
-      echo "   <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=$i></TD>\n";
+      echo "   <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
       echo "   <td>$bold$flag$senderName$flag_end$bold_end</td>\n";
       echo "   <td nowrap width=1%><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
       echo "   <td>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&sort=$sort&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$ans$bold_end</td>\n";
@@ -236,7 +237,13 @@
          echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=4><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp</CENTER></TD></TR>";
       } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
          $i = $startMessage - 1;
-         printMessageInfo($imapConnection, $t, $msgs[$i], $mailbox, $sort, $startMessage);
+         reset($msort);
+         do {
+            $key = key($msort);
+            next($msort);
+            $k++;
+         } while (isset ($key) && ($k < $i));
+         printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
       } else {
          $i = $startMessage;
          reset($msort);
@@ -247,7 +254,7 @@
          } while (isset ($key) && ($k < $i));
 
                   do {
-            printMessageInfo($imapConnection, $t, $msgs[$key], $mailbox, $sort, $startMessage);
+            printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
             $key = key($msort);
             $t++;
             $i++;

diff --git a/functions/strings.php b/functions/strings.php
index c9162fa3a50af03be2e8eee1c96538514c91bb83..dc85a717e560914f0cda4e36a6d6401598eb125c 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -76,6 +76,10 @@
       $text = str_replace(" ", "", $text);
       $text = str_replace(",", ";", $text);
       $array = explode(";", $text);
+               for ($i = 0; $i < count ($array); $i++) {
+                       $array[$i] = eregi_replace ("^.*\<", "", $array[$i]);
+                       $array[$i] = eregi_replace ("\>.*$", "", $array[$i]);
+               }
       return $array;
    }
 

diff --git a/src/move_messages.php b/src/move_messages.php
index 005cf2ca5cb0f320d32a6261bdb76126d3711506..8bf6e87e08f094e17731fe6122b295ab88807d0e 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -44,7 +44,6 @@
 
    // If the delete button was pressed, the moveButton variable will not be set.
    if (!$moveButton) {
- //     displayPageHeader($color, $mailbox);
       if (is_array($msg) == 1) {
          // Marks the selected messages ad 'Deleted'
          $j = 0;
@@ -75,7 +74,6 @@
          error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
       }
    } else {    // Move messages
-//      displayPageHeader($color, $mailbox);
       // lets check to see if they selected any messages
       if (is_array($msg) == 1) {
          $j = 0;