Merge branch 'master' into WebGUI8
This commit is contained in:
Graham Knop
commit
2400f19099
797 changed files with 33894 additions and 27196 deletions
|
|
@ -276,7 +276,7 @@ sub getUserSearchForm {
|
|||
$session->scratch->set("userSearchModifier",$session->form->process("modifier")) if defined($session->form->process("modifier"));
|
||||
my $i18n = WebGUI::International->new($session);
|
||||
my $output = '<div align="center">'
|
||||
.WebGUI::Form::formHeader($session,)
|
||||
.WebGUI::Form::formHeader($session,{ method => 'GET'}, )
|
||||
.WebGUI::Form::hidden($session,
|
||||
name => "op",
|
||||
value => $op
|
||||
|
|
@ -625,27 +625,27 @@ sub www_editUser {
|
|||
my $i18n = WebGUI::International->new($session, "WebGUI");
|
||||
my %tabs;
|
||||
tie %tabs, 'Tie::IxHash';
|
||||
%tabs = (
|
||||
"account"=> { label=>$i18n->get("account")},
|
||||
"profile"=> { label=>$i18n->get("profile")},
|
||||
"groups"=> { label=>$i18n->get('89')},
|
||||
);
|
||||
%tabs = (
|
||||
"account"=> { label=>$i18n->get("account")},
|
||||
"profile"=> { label=>$i18n->get("profile")},
|
||||
"groups"=> { label=>$i18n->get('89')},
|
||||
);
|
||||
my $tabform = WebGUI::TabForm->new($session,\%tabs);
|
||||
$tabform->formHeader({extras=>'autocomplete="off"'});
|
||||
my $u = WebGUI::User->new($session,($uid eq 'new') ? '' : $uid); #Setting uid to '' when uid is 'new' so visitor defaults prefill field for new user
|
||||
my $username = ($u->isVisitor && $uid ne "1") ? '' : $u->username;
|
||||
$tabform->hidden({name=>"op",value=>"editUserSave"});
|
||||
$tabform->hidden({name=>"uid",value=>$uid});
|
||||
$tabform->getTab("account")->raw('<tr><td width="170"> </td><td> </td></tr>');
|
||||
$tabform->getTab("account")->readOnly(value=>$uid,label=>$i18n->get(378));
|
||||
$tabform->getTab("account")->readOnly(value=>$u->karma,label=>$i18n->get(537)) if ($session->setting->get("useKarma"));
|
||||
$tabform->getTab("account")->readOnly(value=>$session->datetime->epochToHuman($u->dateCreated,"%z"),label=>$i18n->get(453));
|
||||
$tabform->getTab("account")->readOnly(value=>$session->datetime->epochToHuman($u->lastUpdated,"%z"),label=>$i18n->get(454));
|
||||
$tabform->getTab("account")->text(
|
||||
-name=>"username",
|
||||
-label=>$i18n->get(50),
|
||||
-value=>$username
|
||||
);
|
||||
$tabform->hidden({name=>"op",value=>"editUserSave"});
|
||||
$tabform->hidden({name=>"uid",value=>$uid});
|
||||
$tabform->getTab("account")->raw('<tr><td width="170"> </td><td> </td></tr>');
|
||||
$tabform->getTab("account")->readOnly(value=>$uid,label=>$i18n->get(378));
|
||||
$tabform->getTab("account")->readOnly(value=>$u->karma,label=>$i18n->get(537)) if ($session->setting->get("useKarma"));
|
||||
$tabform->getTab("account")->readOnly(value=>$session->datetime->epochToHuman($u->dateCreated,"%z"),label=>$i18n->get(453));
|
||||
$tabform->getTab("account")->readOnly(value=>$session->datetime->epochToHuman($u->lastUpdated,"%z"),label=>$i18n->get(454));
|
||||
$tabform->getTab("account")->text(
|
||||
-name=>"username",
|
||||
-label=>$i18n->get(50),
|
||||
-value=>$username
|
||||
);
|
||||
my %status;
|
||||
tie %status, 'Tie::IxHash';
|
||||
%status = (
|
||||
|
|
@ -658,7 +658,8 @@ sub www_editUser {
|
|||
-name => "status",
|
||||
-value => $u->status
|
||||
);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$tabform->getTab("account")->selectBox(
|
||||
-name => "status",
|
||||
-options => \%status,
|
||||
|
|
@ -675,7 +676,7 @@ sub www_editUser {
|
|||
-options=>$options,
|
||||
-label=>$i18n->get(164),
|
||||
-value=>$u->authMethod,
|
||||
);
|
||||
);
|
||||
foreach (@{$session->config->get("authMethods")}) {
|
||||
my $authInstance = WebGUI::Operation::Auth::getInstance($session,$_,$u->userId);
|
||||
my $editUserForm = $authInstance->editUserForm;
|
||||
|
|
@ -689,9 +690,10 @@ sub www_editUser {
|
|||
foreach my $field (@{$category->getFields}) {
|
||||
next if $field->getId =~ /contentPositions/;
|
||||
my $label = $field->getLabel . ($field->isRequired ? "*" : '');
|
||||
if ($field->getId eq "alias" && $u->isVisitor) {
|
||||
$tabform->getTab("profile")->raw($field->formField({label=>$label},1,undef,1));
|
||||
} else {
|
||||
if ($u->isVisitor) {
|
||||
$tabform->getTab("profile")->raw($field->formField({label=>$label},1,undef,undef,undef,undef,'useFormDefault'));
|
||||
}
|
||||
else {
|
||||
$tabform->getTab("profile")->raw($field->formField({label=>$label},1,$u));
|
||||
}
|
||||
}
|
||||
|
|
@ -717,9 +719,9 @@ sub www_editUser {
|
|||
my @include;
|
||||
foreach my $group (@exclude) {
|
||||
unless (
|
||||
$group eq "1" || $group eq "2" || $group eq "7" # can't remove user from magic groups
|
||||
|| ($session->user->userId eq $u->userId && $group eq 3) # cannot remove self from admin
|
||||
|| ($u->isAdmin && $group eq "3") # admin user cannot be remove from admin
|
||||
$group eq "1" || $group eq "2" || $group eq "7" # can't remove user from magic groups
|
||||
|| ($session->user->userId eq $uid && $group eq 3) # cannot remove self from admin
|
||||
|| ($uid eq '3' && $group eq "3") # user Admin cannot be removed from admin group
|
||||
) {
|
||||
push(@include,$group);
|
||||
}
|
||||
|
|
@ -776,7 +778,7 @@ sub www_editUserSave {
|
|||
#
|
||||
# Also verify that the posted username is not blank (we need a username)
|
||||
#
|
||||
|
||||
|
||||
my $postedUsername = $session->form->process("username");
|
||||
$postedUsername = WebGUI::HTML::filter($postedUsername, "all");
|
||||
|
||||
|
|
@ -793,16 +795,15 @@ sub www_editUserSave {
|
|||
$u->authMethod($session->form->process("authMethod"));
|
||||
$u->status($session->form->process("status"));
|
||||
|
||||
# Loop through all of this users authentication methods
|
||||
foreach (@{$session->config->get("authMethods")}) {
|
||||
|
||||
# Instantiate each auth object and call it's save method. These methods are responsible for
|
||||
# updating authentication information with values supplied by the www_editUser form.
|
||||
my $authInstance = WebGUI::Operation::Auth::getInstance($session, $_, $actualUserId);
|
||||
$authInstance->editUserFormSave();
|
||||
}
|
||||
# Loop through all of this users authentication methods
|
||||
foreach (@{$session->config->get("authMethods")}) {
|
||||
# Instantiate each auth object and call it's save method. These methods are responsible for
|
||||
# updating authentication information with values supplied by the www_editUser form.
|
||||
my $authInstance = WebGUI::Operation::Auth::getInstance($session, $_, $actualUserId);
|
||||
$authInstance->editUserFormSave();
|
||||
}
|
||||
|
||||
# Loop through all profile fields, and update them with new values.
|
||||
# Loop through all profile fields, and update them with new values.
|
||||
foreach my $field (@{WebGUI::ProfileField->getFields($session)}) {
|
||||
next if $field->getId =~ /contentPositions/;
|
||||
$u->profileField($field->getId,$field->formProcess($u));
|
||||
|
|
@ -839,7 +840,7 @@ sub www_editUserSave {
|
|||
}
|
||||
# Display an error telling them the username they are trying to use is not available and suggest alternatives
|
||||
} else {
|
||||
$error = '<ul>' . sprintf($i18n->get(77), $postedUsername, $postedUsername, $postedUsername, $session->datetime->epochToHuman($session->datetime->time(),"%y")).'</ul>';
|
||||
$error = '<ul>' . sprintf($i18n->get(77), $postedUsername, $postedUsername, $postedUsername, $session->datetime->epochToHuman(time(),"%y")).'</ul>';
|
||||
}
|
||||
if ($isSecondary) {
|
||||
return _submenu($session,{workarea => $i18n->get(978)});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue