[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/src move_messages.php,1.100,1.101
From:       Marc Groot Koerkamp <stekkel () users ! sourceforge ! net>
Date:       2004-05-26 0:02:47
Message-ID: E1BSlsd-00073I-6m () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26592/src

Modified Files:
	move_messages.php 
Log Message:
Missed a sqimap_mailbox_expunge_dmn call. Thnx Seth Randall for spotting
this.

NOTE To squirrelmail developers. If you are bored, please integrate this in
right_main.php. It's kind of a useless form handler which redirect to the
original right_main.php.





Index: move_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/move_messages.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -w -r1.100 -r1.101
--- move_messages.php	28 Apr 2004 00:40:14 -0000	1.100
+++ move_messages.php	26 May 2004 00:02:37 -0000	1.101
@@ -16,6 +16,16 @@
  * Path for SquirrelMail required files.
  * @ignore
  */
+
+
+/**
+ * FIX ME REMOVE ME FIX ME REMOVE ME I DON'T DESERVE TO EXIST
+ *
+ * Integrate this is a clean manner in right_main.php and rename right_main to
+ * messageslist or whatever
+ **/
+
+
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -120,11 +130,32 @@
 sqgetGlobalVar('bypass_trash',    $bypass_trash,    SQ_POST);
 sqgetGlobalVar('dmn',             $is_dmn,          SQ_POST);
 
+
+
 /* end of get globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
 
+
+global $allow_thread_sort, $auto_expunge;
+
+if ($allow_thread_sort && getPref($data_dir, $username, "thread_$mailbox",0)) {
+    $aMailbox['SORT_METHOD'] = 'THREAD';
+} else if ($allow_server_sort) {
+    $aMailbox['SORT_METHOD'] = 'SERVER';
+} else {
+    $aMailbox['SORT_METHOD'] = 'SQUIRREL';
+}
+sqgetGlobalVar('aLastSelectedMailbox',$aMailbox,SQ_SESSION);
+sqgetGlobalVar('server_sort_array', $server_sort_array, SQ_SESSION);
+$aMailbox['UIDSET'] = $server_sort_array;
+$aMailbox['SORT'] = $sort;
+$aMailbox['NAME'] = $mailbox;
+$aMailbox['EXISTS'] = $mbx_response['EXISTS'];
+$aMailbox['AUTO_EXPUNGE'] = $auto_expunge;
+$aMailbox['MSG_HEADERS'] = $msgs;
+
 $location = set_url_var($location,'composenew',0,false);
 $location = set_url_var($location,'composesession',0,false);
 $location = set_url_var($location,'session',0,false);
@@ -204,7 +235,7 @@
     if ( $num_ids > 0 ) {
         if ( $is_dmn && $num_ids == 1 ) {
             sqimap_msgs_list_move($imapConnection,$id[0],$targetMailbox);
-            $num_ids = sqimap_mailbox_expunge_dmn($id[0]);
+            $num_ids = sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox, $id[0]);
         } else {
             sqimap_msgs_list_move($imapConnection,$id,$targetMailbox);
             if ($auto_expunge) {



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]