version 1.388, 2007/10/13 17:07:56
|
version 1.392, 2008/01/03 20:42:28
|
Line 1666 sub add_user_handler {
|
Line 1666 sub add_user_handler {
|
} |
} |
unless ($fperror) { |
unless ($fperror) { |
my $result=&make_passwd_file($uname, $umode,$npass, $passfilename); |
my $result=&make_passwd_file($uname, $umode,$npass, $passfilename); |
&Reply($client, $result, $userinput); #BUGBUG - could be fail |
&Reply($client,\$result, $userinput); #BUGBUG - could be fail |
} else { |
} else { |
&Failure($client, \$fperror, $userinput); |
&Failure($client, \$fperror, $userinput); |
} |
} |
Line 1735 sub change_authentication_handler {
|
Line 1735 sub change_authentication_handler {
|
my $result = &change_unix_password($uname, $npass); |
my $result = &change_unix_password($uname, $npass); |
&logthis("Result of password change for $uname: ".$result); |
&logthis("Result of password change for $uname: ".$result); |
if ($result eq "ok") { |
if ($result eq "ok") { |
&Reply($client, \$result) |
&Reply($client, \$result); |
} else { |
} else { |
&Failure($client, \$result); |
&Failure($client, \$result); |
} |
} |
Line 2582 sub get_profile_entry {
|
Line 2582 sub get_profile_entry {
|
my ($udom,$uname,$namespace,$what) = split(/:/,$tail); |
my ($udom,$uname,$namespace,$what) = split(/:/,$tail); |
chomp($what); |
chomp($what); |
|
|
|
|
my $replystring = read_profile($udom, $uname, $namespace, $what); |
my $replystring = read_profile($udom, $uname, $namespace, $what); |
my ($first) = split(/:/,$replystring); |
my ($first) = split(/:/,$replystring); |
if($first ne "error") { |
if($first ne "error") { |
Line 3311 sub put_course_id_handler {
|
Line 3312 sub put_course_id_handler {
|
my @new_items = split(/:/,$courseinfo,-1); |
my @new_items = split(/:/,$courseinfo,-1); |
my %storehash; |
my %storehash; |
for (my $i=0; $i<@new_items; $i++) { |
for (my $i=0; $i<@new_items; $i++) { |
$storehash{$items[$i]} = $new_items[$i]; |
$storehash{$items[$i]} = &unescape($new_items[$i]); |
} |
} |
$hashref->{$key} = |
$hashref->{$key} = |
&Apache::lonnet::freeze_escape(\%storehash); |
&Apache::lonnet::freeze_escape(\%storehash); |
Line 4057 sub dump_domainroles_handler {
|
Line 4058 sub dump_domainroles_handler {
|
} |
} |
} |
} |
unless (@roles < 1) { |
unless (@roles < 1) { |
unless (grep/^$trole$/,@roles) { |
unless (grep/^\Q$trole\E$/,@roles) { |
$match = 0; |
$match = 0; |
} |
} |
} |
} |
Line 4454 sub validate_class_access_handler {
|
Line 4455 sub validate_class_access_handler {
|
my ($cmd, $tail, $client) = @_; |
my ($cmd, $tail, $client) = @_; |
my $userinput = "$cmd:$tail"; |
my $userinput = "$cmd:$tail"; |
my ($inst_class,$ownerlist,$cdom) = split(/:/, $tail); |
my ($inst_class,$ownerlist,$cdom) = split(/:/, $tail); |
my @owners = split(/,/,&unescape($ownerlist)); |
my $owners = &unescape($ownerlist); |
my $outcome; |
my $outcome; |
eval { |
eval { |
local($SIG{__DIE__})='DEFAULT'; |
local($SIG{__DIE__})='DEFAULT'; |
$outcome=&localenroll::check_section($inst_class,\@owners,$cdom); |
$outcome=&localenroll::check_section($inst_class,$owners,$cdom); |
}; |
}; |
&Reply($client,\$outcome, $userinput); |
&Reply($client,\$outcome, $userinput); |
|
|
Line 4666 sub get_institutional_user_rules {
|
Line 4667 sub get_institutional_user_rules {
|
} |
} |
®ister_handler("instuserrules",\&get_institutional_user_rules,0,1,0); |
®ister_handler("instuserrules",\&get_institutional_user_rules,0,1,0); |
|
|
|
sub get_institutional_id_rules { |
|
my ($cmd, $tail, $client) = @_; |
|
my $userinput = "$cmd:$tail"; |
|
my $dom = &unescape($tail); |
|
my (%rules_hash,@rules_order); |
|
my $outcome; |
|
eval { |
|
local($SIG{__DIE__})='DEFAULT'; |
|
$outcome = &localenroll::id_rules($dom,\%rules_hash,\@rules_order); |
|
}; |
|
if (!$@) { |
|
if ($outcome eq 'ok') { |
|
my $result; |
|
foreach my $key (keys(%rules_hash)) { |
|
$result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&'; |
|
} |
|
$result =~ s/\&$//; |
|
$result .= ':'; |
|
if (@rules_order > 0) { |
|
foreach my $item (@rules_order) { |
|
$result .= &escape($item).'&'; |
|
} |
|
} |
|
$result =~ s/\&$//; |
|
&Reply($client,\$result,$userinput); |
|
} else { |
|
&Reply($client,"error\n", $userinput); |
|
} |
|
} else { |
|
&Failure($client,"unknown_cmd\n",$userinput); |
|
} |
|
} |
|
®ister_handler("instidrules",\&get_institutional_id_rules,0,1,0); |
|
|
|
|
sub institutional_username_check { |
sub institutional_username_check { |
my ($cmd, $tail, $client) = @_; |
my ($cmd, $tail, $client) = @_; |
Line 4696 sub institutional_username_check {
|
Line 4731 sub institutional_username_check {
|
} |
} |
®ister_handler("instrulecheck",\&institutional_username_check,0,1,0); |
®ister_handler("instrulecheck",\&institutional_username_check,0,1,0); |
|
|
|
sub institutional_id_check { |
|
my ($cmd, $tail, $client) = @_; |
|
my $userinput = "$cmd:$tail"; |
|
my %rulecheck; |
|
my $outcome; |
|
my ($udom,$id,@rules) = split(/:/,$tail); |
|
$udom = &unescape($udom); |
|
$id = &unescape($id); |
|
@rules = map {&unescape($_);} (@rules); |
|
eval { |
|
local($SIG{__DIE__})='DEFAULT'; |
|
$outcome = &localenroll::id_check($udom,$id,\@rules,\%rulecheck); |
|
}; |
|
if (!$@) { |
|
if ($outcome eq 'ok') { |
|
my $result=''; |
|
foreach my $key (keys(%rulecheck)) { |
|
$result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&'; |
|
} |
|
&Reply($client,\$result,$userinput); |
|
} else { |
|
&Reply($client,"error\n", $userinput); |
|
} |
|
} else { |
|
&Failure($client,"unknown_cmd\n",$userinput); |
|
} |
|
} |
|
®ister_handler("instidrulecheck",\&institutional_id_check,0,1,0); |
|
|
# Get domain specific conditions for import of student photographs to a course |
# Get domain specific conditions for import of student photographs to a course |
# |
# |
Line 6280 sub change_unix_password {
|
Line 6343 sub change_unix_password {
|
|
|
sub make_passwd_file { |
sub make_passwd_file { |
my ($uname, $umode,$npass,$passfilename)=@_; |
my ($uname, $umode,$npass,$passfilename)=@_; |
my $result="ok\n"; |
my $result="ok"; |
if ($umode eq 'krb4' or $umode eq 'krb5') { |
if ($umode eq 'krb4' or $umode eq 'krb5') { |
{ |
{ |
my $pf = IO::File->new(">$passfilename"); |
my $pf = IO::File->new(">$passfilename"); |
Line 6348 sub make_passwd_file {
|
Line 6411 sub make_passwd_file {
|
if($useraddok > 0) { |
if($useraddok > 0) { |
my $error_text = &lcuseraddstrerror($useraddok); |
my $error_text = &lcuseraddstrerror($useraddok); |
&logthis("Failed lcuseradd: $error_text"); |
&logthis("Failed lcuseradd: $error_text"); |
$result = "lcuseradd_failed:$error_text\n"; |
$result = "lcuseradd_failed:$error_text"; |
} else { |
} else { |
my $pf = IO::File->new(">$passfilename"); |
my $pf = IO::File->new(">$passfilename"); |
if($pf) { |
if($pf) { |
Line 6372 sub make_passwd_file {
|
Line 6435 sub make_passwd_file {
|
} |
} |
} |
} |
} else { |
} else { |
$result="auth_mode_error\n"; |
$result="auth_mode_error"; |
} |
} |
return $result; |
return $result; |
} |
} |