Remove another obsoleted function.

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 943538656cc62e5d0fddac3b2db9e2c88a763d9e..3095fde7b6df8c3d5f237645ae2b1bf3231049e2 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -16,41 +16,19 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/html.php');
 
 global $compose_new_win;
 
-if (isset($_SESSION['composesession'])) {
-    $composesession = $_SESSION['composesession'];
-} else {
-    $composesession = 0;
-} 
-/* obsolete ?? */
-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 .= "&amp;";
-            } else {
-                $firstLoop = false;
-            }
-            $selectedMessages .= "selMsg[$j]=$msg[$i]";
-            $j++;
-        }
-        $i++;
-    }
+if ( !sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
+  $composesession = 0;
 }
 
 function attachSelectedMessages($msg, $imapConnection) {
-    global $username, $attachment_dir,  
+    global $username, $attachment_dir, $startMessage,
            $data_dir, $composesession, $uid_support,
           $msgs, $thread_sort_messages, $allow_server_sort, $show_num,
           $compose_messages;
@@ -89,7 +67,7 @@ function attachSelectedMessages($msg, $imapConnection) {
         if (isset($msg[$i])) {
            $id = $msg[$i];
            $body_a = sqimap_run_command($imapConnection, "FETCH $id RFC822",true, $response, $readmessage, $uid_support);
-           if ($response = 'OK') {
+           if ($response == 'OK') {
                $k = $i + $start_index;
                $subject = $msgs[$k]['SUBJECT'];
     
@@ -119,64 +97,30 @@ function attachSelectedMessages($msg, $imapConnection) {
 
 
 /* get globals */
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
 
-$username = $_SESSION['username'];
-$key  = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
-if (isset($_GET['mailbox'])) {
-    $mailbox = $_GET['mailbox'];
-}
-if (isset($_GET['startMessage'])) {
-    $startMessage = $_GET['startMessage'];
-}
-if (isset($_POST['moveButton'])) {
-    $moveButton = $_POST['moveButton'];
-}
-if (isset($_POST['msg'])) {
-    $msg = $_POST['msg'];
-}
-elseif (isset($_GET['msg'])) {
-    $msg = $_GET['msg'];
-}
+sqgetGlobalVar('mailbox', $mailbox);
+sqgetGlobalVar('startMessage', $startMessage);
+sqgetGlobalVar('msg', $msg);
 
-if (isset($_SESSION['msgs'])) {
-    $msgs = $_SESSION['msgs'];
-}
+sqgetGlobalVar('msgs',              $msgs,              SQ_SESSION);
+sqgetGlobalVar('composesession',    $composesession,    SQ_SESSION);
+sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
 
-if (isset($_POST['expungeButton'])) {
-    $expungeButton = $_POST['expungeButton'];
-}
-if (isset($_POST['targetMailbox'])) {
-    $targetMailbox = $_POST['targetMailbox'];
-}
-if (isset($_SESSION['lastTargetMailbox'])) {
-    $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
-}
-if (isset($_POST['expungeButton'])) {
-    $expungeButton = $_POST['expungeButton'];
-}
-if (isset($_POST['undeleteButton'])) {
-    $undeleteButton = $_POST['undeleteButton'];
-}
-if (isset($_POST['markRead'])) {
-    $markRead = $_POST['markRead'];
-}
-if (isset($_POST['markUnread'])) {
-    $markUnread = $_POST['markUnread'];
-}
-if (isset($_POST['attache'])) {
-    $attache = $_POST['attache'];
-}
-
-if (isset($_POST['location'])) {
-    $location = $_POST['location'];
-}
+sqgetGlobalVar('moveButton',      $moveButton,      SQ_POST);
+sqgetGlobalVar('expungeButton',   $expungeButton,   SQ_POST);
+sqgetGlobalVar('targetMailbox',   $targetMailbox,   SQ_POST);
+sqgetGlobalVar('expungeButton',   $expungeButton,   SQ_POST);
+sqgetGlobalVar('undeleteButton',  $undeleteButton,  SQ_POST);
+sqgetGlobalVar('markRead',        $markRead,        SQ_POST);
+sqgetGlobalVar('markUnread',      $markUnread,      SQ_POST);
+sqgetGlobalVar('attache',         $attache,         SQ_POST);
+sqgetGlobalVar('location',        $location,        SQ_POST);
 
-if (isset($_SESSION['composesession'])) {
-    $composesession = $_SESSION['composesession'];
-}
 /* end of get globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -195,6 +139,9 @@ if ($targetMailbox != $lastTargetMailbox) {
     sqsession_register($lastTargetMailbox, 'lastTargetMailbox');
 }
 $exception = false;
+
+do_hook('move_before_move');
+
 // expunge-on-demand if user isn't using move_to_trash or auto_expunge
 if(isset($expungeButton)) {
     $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);