We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
squirrelmail
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixed a bug in deleting messages where it wouldn't delete the messages. Now
it does.

Luke Ehresman 25 years ago
parent
7d8c623ec3
commit
6fd6f33dcf
5 changed files with 11 additions and 15 deletions
Unified View Show Diff Stats
  1. 0 2
      functions/imap.php
  2. 2 1
      functions/mailbox.php
  3. 6 6
      src/compose_send.php
  4. 1 1
      src/left_main.php
  5. 2 5
      src/move_messages.php

+ 0 - 2
functions/imap.php
View File 

@@ -91,7 +91,5 @@
 
       } else {
 
       } else {
 
          setMessageFlag($imapConnection, $a, $b, "Deleted");
 
          setMessageFlag($imapConnection, $a, $b, "Deleted");
 
       }
 
       }
 
-      if ($auto_expunge == true)
 
-         expungeBox($imapConnection, $mailbox, $numMessages);
 
    }
 
    }
 
 ?>
 
 ?>

+ 2 - 1
functions/mailbox.php
View File 

@@ -183,12 +183,13 @@
 
    function copyMessages($imapConnection, $from_id, $to_id, $folder) {
 
    function copyMessages($imapConnection, $from_id, $to_id, $folder) {
 
       fputs($imapConnection, "mailboxStore COPY $from_id:$to_id \"$folder\"\n");
 
       fputs($imapConnection, "mailboxStore COPY $from_id:$to_id \"$folder\"\n");
 
       $read = fgets($imapConnection, 1024);
 
       $read = fgets($imapConnection, 1024);
 
+      echo ">>> $read<BR>";
 
       while ((substr($read, 0, 15) != "mailboxStore OK") && (substr($read, 0, 15) != "mailboxStore NO")) {
 
       while ((substr($read, 0, 15) != "mailboxStore OK") && (substr($read, 0, 15) != "mailboxStore NO")) {
 
          $read = fgets($imapConnection, 1024);
 
          $read = fgets($imapConnection, 1024);
 
+         echo ">>> $read<BR>";
 
       }
 
       }
 
 
 
       if (substr($read, 0, 15) == "mailboxStore NO") {
 
       if (substr($read, 0, 15) == "mailboxStore NO") {
 
-         echo "ERROR... $read<BR>";
 
          return false;
 
          return false;
 
       } else if (substr($read, 0, 15) == "mailboxStore OK") {
 
       } else if (substr($read, 0, 15) == "mailboxStore OK") {
 
          return true;
 
          return true;

+ 6 - 6
src/compose_send.php
View File 

@@ -7,7 +7,12 @@
 
    include("../functions/smtp.php");
 
    include("../functions/smtp.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/display_messages.php");
 
 
 
-   if ($passed_to == "") {
 
+   if ($passed_body == "") {
 
+      echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
+      displayPageHeader("None");
 
+      plain_error_message("You have not entered a message body.");
 
+      exit;
 
+   } else if ($passed_to == "") {
 
       echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
       echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
       displayPageHeader("None");
 
       displayPageHeader("None");
 
       plain_error_message("You have not filled in the \"To:\" field.");
 
       plain_error_message("You have not filled in the \"To:\" field.");
 
@@ -22,11 +27,6 @@
 
       echo "</CENTER></FORM>\n";
 
       echo "</CENTER></FORM>\n";
 
 
 
       exit;
 
       exit;
 
-
 
-      echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
-      displayPageHeader("None");
 
-      plain_error_message("Message NOT sent<BR><BR>You have not entered anything into the To: field.<BR>Press the BACK button on your browser");
 
-      exit;
 
    } else if ($passed_subject == "") {
 
    } else if ($passed_subject == "") {
 
       echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
       echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
 
       displayPageHeader("None");
 
       displayPageHeader("None");

+ 1 - 1
src/left_main.php
View File 

@@ -68,7 +68,7 @@
 
       if (($move_to_trash == true) && ($mailbox == $trash_folder)) {
 
       if (($move_to_trash == true) && ($mailbox == $trash_folder)) {
 
          $urlMailbox = urlencode($mailbox);
 
          $urlMailbox = urlencode($mailbox);
 
          selectMailbox($imapConnection, $mailbox, $numNessages);
 
          selectMailbox($imapConnection, $mailbox, $numNessages);
 
-         echo "</A>&nbsp;&nbsp;<B>(<A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right>empty</A>)</B>";
 
+         echo "</A>&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">empty</A></B>)";
 
       }
 
       }
 
       echo "</FONT></a><br>\n";
 
       echo "</FONT></a><br>\n";
 
    }
 
    }

+ 2 - 5
src/move_messages.php
View File 

@@ -7,9 +7,6 @@
 
    include("../functions/display_messages.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/imap.php");
 
    include("../functions/imap.php");
 
 
 
-   for ($i = 0; $i < count($msg); $i++) {
 
-      echo "MSG: $msg[$i]<BR>";
 
-   }
 
 
 
    function putSelectedMessagesIntoString($msg) {
 
    function putSelectedMessagesIntoString($msg) {
 
       $j = 0;
 
       $j = 0;
 
@@ -32,8 +29,7 @@
 
          $i++;
 
          $i++;
 
       }
 
       }
 
    }
 
    }
 
-   
-   
+
 
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
 
 
    // switch to the mailbox, and get the number of messages in it.
 
    // switch to the mailbox, and get the number of messages in it.
 
@@ -51,6 +47,7 @@
 
          //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
 
          //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
 
          while ($j < count($msg)) {
 
          while ($j < count($msg)) {
 
             if ($msg[$i]) {
 
             if ($msg[$i]) {
 
+               echo "MSG: $msg[$i]<BR>";
 
                deleteMessages($imapConnection, $msg[$i], $msg[$i], $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox);
 
                deleteMessages($imapConnection, $msg[$i], $msg[$i], $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox);
 
                $j++;
 
                $j++;
 
             }
 
             }

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5