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

merging 6.2.9 changes

Browse source
This commit is contained in:
JT Smith 2004-11-19 22:59:25 +00:00
parent 1bb82bd7b9
commit 48caad2d74
42 changed files with 224 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Macro/GroupAdd.pm
View file

@ -23,7 +23,7 @@ sub process {
my @param = WebGUI::Macro::getParams($_[0]);
return "" if ($param[0] eq "");
return "" if ($param[1] eq "");
return "" if ($session{user}{userId} == 1);
return "" if ($session{user}{userId} eq '1');
my $g = WebGUI::Group->find($param[0]);
return "" if ($g->groupId eq "");
return "" unless ($g->autoAdd);

2
lib/WebGUI/Macro/GroupDelete.pm
View file

@ -23,7 +23,7 @@ sub process {
my @param = WebGUI::Macro::getParams($_[0]);
return "" if ($param[0] eq "");
return "" if ($param[1] eq "");
return "" if ($session{user}{userId} == 1);
return "" if ($session{user}{userId} eq '1');
my $g = WebGUI::Group->find($param[0]);
return "" if ($g->groupId eq "");
return "" unless ($g->autoDelete);

10
lib/WebGUI/Macro/L_loginBox.pm
View file

@ -40,14 +40,16 @@ sub process {
if (index(lc($ENV{HTTP_USER_AGENT}),"msie") < 0) {
$boxSize = int($boxSize=$boxSize*2/3);
}
$var{'form.header'} = WebGUI::Form::formHeader()
my $action;
if ($session{setting}{encryptLogin}) {
$action = WebGUI::URL::page(undef,1);
$action =~ s/http:/https:/;
}
$var{'form.header'} = WebGUI::Form::formHeader({action=>$action})
.WebGUI::Form::hidden({
name=>"op",
value=>"login"
});
if ($session{setting}{encryptLogin}) {
$var{'form.header'} =~ s/http:/https:/;
}
$var{'username.label'} = WebGUI::International::get(50);
$var{'username.form'} = WebGUI::Form::text({
name=>"username",

2
lib/WebGUI/Macro/LoginToggle.pm
View file

@ -23,7 +23,7 @@ sub process {
my $login = $param[0] || WebGUI::International::get(716);
my $logout = $param[1] || WebGUI::International::get(717);
my %var;
if ($session{user}{userId} == 1) {
if ($session{user}{userId} eq '1') {
return WebGUI::URL::page("op=displayLogin") if ($param[0] eq "linkonly");
$var{'toggle.url'} = WebGUI::URL::page('op=displayLogin');
$var{'toggle.text'} = $login;