diff --git a/contrib/scripts/vmail.cgi b/contrib/scripts/vmail.cgi index 7a3113e828..146de60e0b 100755 --- a/contrib/scripts/vmail.cgi +++ b/contrib/scripts/vmail.cgi @@ -100,7 +100,7 @@ sub check_login() } } elsif (/\[(.*)\]/) { $category = $1; - } elsif ($category ne "general") { + } elsif (($category ne "general") && ($category ne "zonemessages")) { if (/([^\s]+)\s*\=\>?\s*(.*)/) { @fields = split(/\,\s*/, $2); # print "

Mailbox is $1\n"; @@ -142,7 +142,7 @@ sub validmailbox() } } elsif (/\[(.*)\]/) { $category = $1; - } elsif (($category ne "general") && ($category eq $context)) { + } elsif (($category ne "general") && ($category ne "zonemessages") && ($category eq $context)) { if (/([^\s]+)\s*\=\>?\s*(.*)/) { @fields = split(/\,\s*/, $2); if (($mbox eq $1) && ($context eq $category)) { @@ -178,11 +178,11 @@ sub mailbox_options() $tmp .= $tmp2; } elsif (/\[(.*)\]/) { $category = $1; - } elsif ($category ne "general") { + } elsif (($category ne "general") && ($category ne "zonemessages")) { if (/([^\s]+)\s*\=\>?\s*(.*)/) { @fields = split(/\,\s*/, $2); $text = "$1"; - if ($fields[2]) { + if ($fields[1]) { $text .= " ($fields[1])"; } if ($1 eq $current) { @@ -285,6 +285,7 @@ sub message_prefs() my ($nextaction, $msgid) = @_; my $folder = param('folder'); my $mbox = param('mailbox'); + my $context = param('context'); my $passwd = param('password'); my $format = param('format'); if (!$format) { @@ -373,7 +374,7 @@ _EOH \n - \n + \n \n \n \n @@ -391,7 +392,7 @@ _EOH
$folder $msgid
Message:$msgid
Mailbox:$mbox
Mailbox:$mbox\@$context
Folder:$folder
From:$fields->{callerid}
Duration:$duration
- +
@@ -412,11 +413,12 @@ sub message_audio() my $folder = param('folder'); my $msgid = param('msgid'); my $mailbox = param('mailbox'); + my $context = param('context'); my $format = param('format'); if (!$format) { $format = &getcookie('format'); } - my $path = "/var/spool/asterisk/vm/$mailbox/$folder/msg${msgid}.$format"; + my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msgid}.$format"; $msgid =~ /^\d\d\d\d$/ || die("Msgid Liar ($msgid)!"); grep(/^${format}$/, keys %formats) || die("Format Liar ($format)!"); @@ -507,7 +509,7 @@ sub message_index() print header(-cookie => &makecookie($format)); print <<_EOH; -Asterisk Web-Voicemail: $mbox $folder +Asterisk Web-Voicemail: $mbox\@$context $folder $stdcontainerstart

@@ -638,7 +640,7 @@ sub message_rename() } my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$newfolder"; - mkdir $path, 0755; + mkdir $path, 0770; my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder"; opendir(DIR, $path) || die("Unable to open directory\n"); my @files = grep /^msg${old}\.\w+$/, readdir(DIR); @@ -672,7 +674,7 @@ sub file_copy() sub message_copy() { - my ($mbox, $newmbox, $oldfolder, $old, $new) = @_; + my ($context, $mbox, $newmbox, $oldfolder, $old, $new) = @_; my $oldfile, $newfile; return if ($mbox eq $newmbox); @@ -706,11 +708,11 @@ sub message_copy() die("Invalid old Message
\n"); } - my $path = "/var/spool/asterisk/vm/$newmbox"; - mkdir $path, 0755; - my $path = "/var/spool/asterisk/vm/$newmbox/INBOX"; - mkdir $path, 0755; - my $path = "/var/spool/asterisk/vm/$mbox/$oldfolder"; + my $path = "/var/spool/asterisk/voicemail/$context/$newmbox"; + mkdir $path, 0770; + my $path = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX"; + mkdir $path, 0770; + my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder"; opendir(DIR, $path) || die("Unable to open directory\n"); my @files = grep /^msg${old}\.\w+$/, readdir(DIR); closedir(DIR); @@ -720,7 +722,7 @@ sub message_copy() $tmp = $1; $oldfile = $path . "/$tmp"; $tmp =~ s/msg${old}/msg${new}/; - $newfile = "/var/spool/asterisk/vm/$newmbox/INBOX/$tmp"; + $newfile = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX/$tmp"; # print "Copying $oldfile to $newfile
\n"; &file_copy($oldfile, $newfile); } @@ -788,7 +790,7 @@ sub message_forward() # print header; foreach $msg (@msgs) { # print "Forwarding $msg from $mbox to $newmbox
\n"; - &message_copy($mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount); + &message_copy($context, $mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount); $msgcount++; } $txt = "Forwarded messages " . join(', ', @msgs) . "to $newmbox";