oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed ip groups to support more ip addresses and be more forgiving about formatting.

Browse source
This commit is contained in:
JT Smith 2003-02-21 04:20:25 +00:00
parent 73ff7fb959
commit de1d5834ac
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/upgrades/upgrade_5.1.2-5.2.0.sql
View file

@ -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 (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); 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; update international set message="Possible Values" where namespace = "MailForm" and internationalId = 24 and languageId=1;
alter table groups change ipFilter ipFilter text;

2
lib/WebGUI/Operation/Group.pm
View file

@ -132,7 +132,7 @@ sub www_editGroup {
if ($session{setting}{useKarma}) { if ($session{setting}{useKarma}) {
$f->integer("karmaThreshold",WebGUI::International::get(538),$g->karmaThreshold); $f->integer("karmaThreshold",WebGUI::International::get(538),$g->karmaThreshold);
} }
$f->text( $f->textarea(
-name=>"ipFilter", -name=>"ipFilter",
-value=>$g->ipFilter, -value=>$g->ipFilter,
-label=>WebGUI::International::get(857) -label=>WebGUI::International::get(857)

4
lib/WebGUI/Privilege.pm
View file

@ -236,6 +236,10 @@ sub isInGroup {
%group = WebGUI::SQL->quickHash("select karmaThreshold,ipFilter from groups where groupId='$gid'"); %group = WebGUI::SQL->quickHash("select karmaThreshold,ipFilter from groups where groupId='$gid'");
### Check IP Address ### Check IP Address
if ($group{ipFilter} ne "") { 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}); my @ips = split(";",$group{ipFilter});
foreach my $ip (@ips) { foreach my $ip (@ips) {
if ($session{env}{REMOTE_ADDR} =~ /^$ip/) { if ($session{env}{REMOTE_ADDR} =~ /^$ip/) {