Fix error when forwarding voicemail. Bug #682

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1927 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/scripts/vmail.cgi b/contrib/scripts/vmail.cgi
index fb22f116e6fd1618ce94fd8b9f26bb7efaa01112..7a3113e828c9aaf6881900a7d5f813075c0601dd 100755 (executable)
--- a/contrib/scripts/vmail.cgi
+++ b/contrib/scripts/vmail.cgi
@@ -672,7 +672,7 @@ sub file_copy()
 
 sub message_copy()
 {
-       my ($mbox, $oldfolder, $old, $newmbox, $new) = @_;
+       my ($mbox, $newmbox, $oldfolder, $old, $new) = @_;
        my $oldfile, $newfile;
        return if ($mbox eq $newmbox);
        
@@ -788,7 +788,7 @@ sub message_forward()
 #              print header;
                foreach $msg (@msgs) {
 #                      print "Forwarding $msg from $mbox to $newmbox<BR>\n";
-                       &message_copy($context, $mbox, $folder, $msg, $newmbox, sprintf "%04d", $msgcount);
+                       &message_copy($mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount);
                        $msgcount++;
                }
                $txt = "Forwarded messages " . join(', ', @msgs) . "to $newmbox";

diff --git a/vmail.cgi b/vmail.cgi
index fb22f116e6fd1618ce94fd8b9f26bb7efaa01112..7a3113e828c9aaf6881900a7d5f813075c0601dd 100755 (executable)
--- a/vmail.cgi
+++ b/vmail.cgi
@@ -672,7 +672,7 @@ sub file_copy()
 
 sub message_copy()
 {
-       my ($mbox, $oldfolder, $old, $newmbox, $new) = @_;
+       my ($mbox, $newmbox, $oldfolder, $old, $new) = @_;
        my $oldfile, $newfile;
        return if ($mbox eq $newmbox);
        
@@ -788,7 +788,7 @@ sub message_forward()
 #              print header;
                foreach $msg (@msgs) {
 #                      print "Forwarding $msg from $mbox to $newmbox<BR>\n";
-                       &message_copy($context, $mbox, $folder, $msg, $newmbox, sprintf "%04d", $msgcount);
+                       &message_copy($mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount);
                        $msgcount++;
                }
                $txt = "Forwarded messages " . join(', ', @msgs) . "to $newmbox";