projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Last batch of updates
[clearscm.git]
/
maps
/
bin
/
add2nulllist.cgi
diff --git
a/maps/bin/add2nulllist.cgi
b/maps/bin/add2nulllist.cgi
index
7fcf668
..
65f302a
100755
(executable)
--- a/
maps/bin/add2nulllist.cgi
+++ b/
maps/bin/add2nulllist.cgi
@@
-2,8
+2,8
@@
################################################################################
#
# File: $RCSfile: add2nulllist.cgi,v $
################################################################################
#
# File: $RCSfile: add2nulllist.cgi,v $
-# Revision:
$Revision: 1.1 $
-# Description:
Add an email address to the nulllist
+# Revision: $Revision: 1.1 $
+# Description: Add an email address to the nulllist
# Author: Andrew@DeFaria.com
# Created: Mon Jan 16 20:25:32 PST 2006
# Modified: $Date: 2013/06/12 14:05:47 $
# Author: Andrew@DeFaria.com
# Created: Mon Jan 16 20:25:32 PST 2006
# Modified: $Date: 2013/06/12 14:05:47 $
@@
-18,7
+18,7
@@
use warnings;
use FindBin;
$0 = $FindBin::Script;
use FindBin;
$0 = $FindBin::Script;
-use lib
$FindBin::Bin
;
+use lib
"$FindBin::Bin/../lib"
;
use MAPS;
use MAPSLog;
use MAPS;
use MAPSLog;
@@
-31,45
+31,48
@@
my $userid;
my $Userid;
my $type = 'null';
my $Userid;
my $type = 'null';
-sub Add2List {
+sub Add2List
()
{
my $sender = '';
my $sender = '';
- my $nextseq =
MAPSDB::GetNextSequenceNo $userid, $type
;
+ my $nextseq =
GetNextSequenceNo($userid, $type)
;
while () {
while () {
- my $pattern = param "pattern$nextseq";
- my $domain = param "domain$nextseq";
- my $comment = param "comment$nextseq";
+ my $pattern = param "pattern$nextseq";
+ my $domain = param "domain$nextseq";
+ my $comment = param "comment$nextseq";
+ my $hit_count = param "hit_count$nextseq";
last if ((!defined $pattern || $pattern eq '') &&
last if ((!defined $pattern || $pattern eq '') &&
- (!defined $domain
|| $domain eq ''));
+ (!defined $domain || $domain eq ''));
$sender = lc "$pattern\@$domain";
$sender = lc "$pattern\@$domain";
- my ($status, $rule) = OnNulllist
$sender
;
+ my ($status, $rule) = OnNulllist
($sender)
;
if ($status != 0) {
print br {-class => 'error'}, "The email address $sender is already on ${Userid}'s $type list";
} else {
if ($status != 0) {
print br {-class => 'error'}, "The email address $sender is already on ${Userid}'s $type list";
} else {
- Add2Nulllist $sender, $userid, $comment;
+ $hit_count ||= CountMsg($sender);
+
+ Add2Nulllist($sender, $userid, $comment, $hit_count);
print br "The email address, $sender, has been added to ${Userid}'s $type list";
print br "The email address, $sender, has been added to ${Userid}'s $type list";
-
+
# Now remove this entry from the other lists (if present)
# Now remove this entry from the other lists (if present)
- for
each
my $otherlist ('white', 'black') {
+ for my $otherlist ('white', 'black') {
my $sth = FindList $otherlist, $sender;
my ($sequence, $count);
my $sth = FindList $otherlist, $sender;
my ($sequence, $count);
- ($_, $_, $_, $_, $_, $sequence) = GetList
$sth
;
+ ($_, $_, $_, $_, $_, $sequence) = GetList
($sth)
;
if ($sequence) {
if ($sequence) {
- $count = DeleteList
$otherlist, $sequence
;
+ $count = DeleteList
($otherlist, $sequence)
;
print br "Removed $sender from ${Userid}'s " . ucfirst $otherlist . ' list'
if $count > 0;
print br "Removed $sender from ${Userid}'s " . ucfirst $otherlist . ' list'
if $count > 0;
- ResequenceList
$userid, $otherlist
;
+ ResequenceList
($userid, $otherlist)
;
} # if
} # if
- } # for
each
+ } # for
} # if
$nextseq++;
} # if
$nextseq++;
@@
-77,32
+80,32
@@
sub Add2List {
} # Add2List
# Main
} # Add2List
# Main
-$userid = Heading
(
+$userid = Heading(
'getcookie',
'',
'Add to Null List',
'Add to Null List',
);
'getcookie',
'',
'Add to Null List',
'Add to Null List',
);
-SetContext
$userid
;
+SetContext
($userid)
;
-NavigationBar
$userid
;
+NavigationBar
($userid)
;
$Userid = ucfirst $userid;
Add2List;
print start_form {
$Userid = ucfirst $userid;
Add2List;
print start_form {
- -method
=> 'post',
- -action
=> 'processaction.cgi',
- -name
=> 'list'
+ -method => 'post',
+ -action => 'processaction.cgi',
+ -name => 'list'
};
print '<p></p><center>',
};
print '<p></p><center>',
- hidden ({-name
=> 'type',
- -default
=> $type}),
- submit ({-name
=> 'action',
- -value
=> 'Add New Entry'}),
+ hidden ({-name => 'type',
+ -default => $type}),
+ submit ({-name => 'action',
+ -value => 'Add New Entry'}),
'</center>';
Footing;
'</center>';
Footing;