From de1d5834ac73f87a6a7e1efcb3027acaf223e7d5 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 21 Feb 2003 04:20:25 +0000 Subject: [PATCH] Changed ip groups to support more ip addresses and be more forgiving about formatting. --- docs/upgrades/upgrade_5.1.2-5.2.0.sql | 1 + lib/WebGUI/Operation/Group.pm | 2 +- lib/WebGUI/Privilege.pm | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/upgrades/upgrade_5.1.2-5.2.0.sql b/docs/upgrades/upgrade_5.1.2-5.2.0.sql index 385ce04f3..7fd3c3766 100644 --- a/docs/upgrades/upgrade_5.1.2-5.2.0.sql +++ b/docs/upgrades/upgrade_5.1.2-5.2.0.sql @@ -9,4 +9,5 @@ insert into international (internationalId,languageId,namespace,message,lastUpda insert into international (internationalId,languageId,namespace,message,lastUpdated) values (31,1,'MailForm','is not filled in correctly.', 1045210016); insert into international (internationalId,languageId,namespace,message,lastUpdated) values (32,1,'MailForm','is not a valid email address.', 1045210016); update international set message="Possible Values" where namespace = "MailForm" and internationalId = 24 and languageId=1; +alter table groups change ipFilter ipFilter text; diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index 150f28927..bd26c03cd 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -132,7 +132,7 @@ sub www_editGroup { if ($session{setting}{useKarma}) { $f->integer("karmaThreshold",WebGUI::International::get(538),$g->karmaThreshold); } - $f->text( + $f->textarea( -name=>"ipFilter", -value=>$g->ipFilter, -label=>WebGUI::International::get(857) diff --git a/lib/WebGUI/Privilege.pm b/lib/WebGUI/Privilege.pm index 9fe37ca10..279cd4f90 100644 --- a/lib/WebGUI/Privilege.pm +++ b/lib/WebGUI/Privilege.pm @@ -236,6 +236,10 @@ sub isInGroup { %group = WebGUI::SQL->quickHash("select karmaThreshold,ipFilter from groups where groupId='$gid'"); ### Check IP Address if ($group{ipFilter} ne "") { + $group{ipFilter} =~ s/\t//g; + $group{ipFilter} =~ s/\r//g; + $group{ipFilter} =~ s/\n//g; + $group{ipFilter} =~ s/\s//g; my @ips = split(";",$group{ipFilter}); foreach my $ip (@ips) { if ($session{env}{REMOTE_ADDR} =~ /^$ip/) {