[SM-CVS] CVS: squirrelmail/plugins/delete_move_next setup.php,1.9,1.9.2.1

[Jason M. <jm...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/plugins/delete_move_next
In directory usw-pr-cvs1:/tmp/cvs-serv31197/plugins/delete_move_next

Modified Files:
      Tag: SM-1_2-STABLE
	setup.php 
Log Message:
rg=0 fixes



Index: setup.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/plugins/delete_move_next/setup.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -w -r1.9 -r1.9.2.1
--- setup.php	14 May 2002 18:37:57 -0000	1.9
+++ setup.php	12 Aug 2002 17:16:29 -0000	1.9.2.1
@@ -103,13 +103,18 @@
 
 function delete_move_next_action() {
 
-    global $PHP_SELF,
-           $delete_id, $move_id;
+    global $PHP_SELF;
 
-    if ($delete_id) {
+    if (isset($_GET['delete_id'])) {
+        $delete_id = $_GET['delete_id'];
+    }
+    if (isset($_POST['move_id'])) {
+        $move_id = $_POST['move_id'];
+    }
+    if (isset($delete_id)) {
         delete_move_next_delete();
         fix_sort_array();
-    } elseif ($move_id) {
+    } elseif (isset($move_id)) {
         delete_move_next_move();
         fix_sort_array();
     }
@@ -208,7 +213,6 @@
 
 function get_move_target_list() {
     global $imapConnection;
-    
     $boxes = sqimap_mailbox_list($imapConnection);
     for ($i = 0; $i < count($boxes); $i++) {  
         if (!in_array('noselect', $boxes[$i]['flags'])) {
@@ -227,7 +231,6 @@
     global $color, $where, $what, $currentArrayIndex, $passed_id,
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
-
     echo '<tr>'.
          "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
            '<form action="read_body.php" method="post"><small>'.
@@ -275,8 +278,9 @@
 
 
 function delete_move_next_delete() {
-    global $imapConnection, $delete_id, $mailbox, $auto_expunge;
-    
+    global $imapConnection, $auto_expunge;
+    $delete_id = $_GET['delete_id'];
+    $mailbox = $_GET['mailbox'];
     sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
     if ($auto_expunge){
         delete_move_expunge_from_all($delete_id);
@@ -285,8 +289,10 @@
 }
 
 function delete_move_next_move() {
-    global $imapConnection, $move_id, $targetMailbox, $auto_expunge, $mailbox;
-    
+    global $imapConnection, $auto_expunge;
+    $move_id = $_POST['move_id'];
+    $mailbox = $_POST['mailbox'];
+    $targetMailbox = $_POST['targetMailbox'];
     // Move message
     sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
     sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted');
@@ -332,9 +338,11 @@
 
 function delete_move_next_display_save() {
 
-    global $username,$data_dir,
-           $delete_move_next_ti, $delete_move_next_formATtopi,
-           $delete_move_next_bi, $delete_move_next_formATbottomi;
+    global $username, $data_dir;
+    $delete_move_next_ti = $_POST['delete_move_next_ti'];
+    $delete_move_next_bi = $_POST['delete_move_next_bi'];
+    $delete_move_next_formATtopi = $_POST['delete_move_next_formATtopi'];
+    $delete_move_next_formATbottomi = $_POST['delete_move_next_formATbottomi'];
     
     if (isset($delete_move_next_ti)) {
         setPref($data_dir, $username, 'delete_move_next_t', 'on');