--- websieve.pl.orig Mon Sep 17 01:23:49 2001 +++ websieve.pl Fri Apr 25 19:49:30 2003 @@ -98,7 +98,7 @@ $encode_params=&encode_base64($encode_params) if $userc4; $auth_cookie=cookie(-name => 'websieve', -value=>$encode_params, - -path=>"$program_url", + -path=>"/", -expires => 'now'); print header(-cookie=> $auth_cookie); param('op',''); @@ -193,7 +193,7 @@ $encode_params=&encode_base64($encode_params) if $userc4; $auth_cookie=cookie(-name => 'websieve', -value=>$encode_params, - -path=>"$program_url", + -path=>"/", -expires => $expires); if ($uid ne "" && $pass ne "") { @@ -301,7 +301,7 @@ } print ""; - print "NOTE: You will lose ALL changes made to a script in advanced mode if you switch back to basic mode." if ($mode eq 'advanced' && $op eq 'advanced'); + print "NOTE: You will lose ALL changes made to a script in advanced mode if you switch back to basic mode." if ($mode eq 'advanced' && $op eq 'advanced'); } @@ -405,7 +405,7 @@ else { $change=1 ; param('mbx',$mbx); - print hidden('mbx'); + #print hidden('mbx'); } } if (!$mbx || !(( $acl && $useracl) || $maxquota)) { @@ -547,7 +547,7 @@ } @tmpbox=@mailboxes; print "",popup_menu('selectedmbx',[@aclview],' ') if ($shortacl); - print "  ".submit('Select Folder')." ".submit('Up One Level')."" if ($shortacl && $ismanager); + print "  ".submit('Select Folder')." ".submit('Up One Level')."" if ($shortacl && $ismanager); print ""; print ""; @@ -567,10 +567,10 @@ if (!$ismanager) { print popup_menu('mbx',[@tmpbox],' ').""; } else { - print textfield("mbx","",48)."   ".submit("Select","Select $subtext")."  (Wildcards allowed [*])"; + print textfield("mbx","",48)."   ".submit("Select","Select $subtext")."  (Wildcards allowed [*])"; } print "Foreign User ID:"; - print "".textfield("acluser")." (User ID to assign access rights)  ".submit("Set Acl").""; + print "".textfield("acluser")." (User ID to assign access rights)  ".submit("Set Acl").""; print " General Rights:".radio_group('rights',[@rights],"-",'',\%rightshash).""; print "Specific Rights:".checkbox_group('acl',[@acls],'','',\%aclhash).""; @@ -580,7 +580,7 @@ param('aclmaxquota',$imapquota[2]); print "<$cb>Disk Quota Limit (KB):"; print textfield('aclmaxquota',$imapquota[2],20,40); - print "  Disk Quota Used (KB):  ".$imapquota[1]."  ".submit("Set Quota").""; + print "  Disk Quota Used (KB):  ".$imapquota[1]."  ".submit("Set Quota").""; } print ""; print "",br; @@ -592,10 +592,10 @@ param('delmailbox',''); param('newmbx',''); param('partition',''); - print "$subtext to Create:".textfield("newmbx")."  "; + print "$subtext to Create:".textfield("newmbx")."  "; print "Partition: ",textfield("partition") if $ismanager; - print"  ". submit('Create Mailbox',"Create $subtext")."  "; - print "$subtext to Delete:".textfield("delmailbox")."   ".submit("Delete This Mailbox","Delete $subtext")."" if $ismanager; + print"  ". submit('Create Mailbox',"Create $subtext")."  "; + print "$subtext to Delete:".textfield("delmailbox")."   ".submit("Delete This Mailbox","Delete $subtext")."" if $ismanager; print ""; print ""; @@ -1046,7 +1046,7 @@ if (!$rulecount) { print " [No Rules avalailable]
"; } - print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset("Reset Values"),"
"; + print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset("Reset Values"),"
"; } # if viewrules if (($op eq 'addrule' || $modrule) && ($op ne 'forward')) { @@ -1057,8 +1057,8 @@ print "
New Rule Entry for user: $uid
"; print ""; print ""; + print "  Priority: ",textfield("rules.priority.$rulecount",$spriority,2); + print "  Status: ",popup_menu("rules.ruletype.$rulecount",[@ruletype],'ENABLED'),""; my @checked; my @checkvalues=("copy","keep"); push @checkvalues,"regex" if $useregex; @@ -1096,23 +1096,23 @@ param("rules.searchflg.$rulecount","$ssearchflg"); print popup_menu("rules.searchflg.$rulecount",[@flgsts],$ssearchflg,\%searchflghash); } - print " field(s):"; ############# TO field print ""; - print ""; ########### SUBJECT field print ""; - print ""; @@ -1154,26 +1154,26 @@ ############## Action REDIRECT param("rules.forward.$rulecount","$sdest1"); - print ""; ############### Action REPLY WITH if ($usereply) { param("rules.reply.$rulecount","$sdest2") if (defined $sdest2); - print ""; } ############## Action Reject if ($usereject) { param("rules.reject.$rulecount","$sdest3"); - print ""; } ############## Action Discard if ($usediscard) { - print ""; + print ""; } ############### Action CustomCode @@ -1196,7 +1196,7 @@ print hr,"
Rule#: [$rulecount]"; - print "  Priority: ",textfield("rules.priority.$rulecount",$spriority,2); - print "  Status: ",popup_menu("rules.ruletype.$rulecount",[@ruletype],'ENABLED'),"
  'from' contains ", + print " field(s):  'from' contains ", ""; param("rules.from.$rulecount","$sfrom"); print textfield("rules.from.$rulecount","$sfrom",50),"
 "; - print "  'to' contains ", + print " "; + print "  'to' contains ", ""; param("rules.to.$rulecount","$sto"); print textfield("rules.to.$rulecount","$sto",50),"
 "; - print "  'subject' contains ", + print " "; + print "  'subject' contains ", ""; param("rules.subject.$rulecount","$ssubject"); print textfield("rules.subject.$rulecount","$ssubject",50),"
  Forward To "; + print "  Forward To "; print textfield("rules.forward.$rulecount",$sdest1,50)," (Email Address)
  Reply With "; + print "  Reply With "; print textarea("rules.reply.$rulecount",$sdest2,2,43)," (Text Message)
  Reject "; + print "  Reject "; print textarea("rules.reject.$rulecount",$sdest3,2,43)," (Text Message)
  Discard  
  Discard  
$wild
"; $rulecount--; - print hr,"
",submit("Save Rule "),"  ",reset('Clear'),"
"; + print hr,"
",submit("Save Rule "),"  ",reset('Clear'),"
"; } # if addrule @@ -1248,7 +1248,7 @@ print "Server: $imapserverUserid: $uid"; print "Used Quota: "; if ($percent ne "") { - print "[$quota[1] kbytes used / $quota[2] kbytes available.($percent\% usage)]"; + print "[$quota[1] kbytes used / $quota[2] kbytes available. ($percent\% usage)]"; } else { print "$quota[1] No limits"; }; @@ -1387,7 +1387,7 @@ print start_form(-action=>$program_url); $gomodifyit = 'yes'; print hidden('s',$sencode_params) if $useservercookie; - print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
" if $op; + print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
" if $op; param('op',$op); if (param('action') && param('action') eq 'deletembx') { &deleteimapmailbox; @@ -1407,7 +1407,7 @@ &initscripts(%scripts); if ($op eq 'setacl') { &viewacl if $useacl; - print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
"; + print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
"; } if ($mode =~ /basic/i && $op ne 'setacl') { @@ -1420,7 +1420,7 @@ # print "printing $op
"; &printscript($scripts{'script'}) ; - print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
"; + print "
",submit('Save Changes'),"  ",submit("Refresh"),"  ",reset('Reset Values'),"
"; }