version 1.267, 2008/12/08 22:46:28
|
version 1.271, 2008/12/18 17:27:49
|
Line 2125 sub update_user_data {
|
Line 2125 sub update_user_data {
|
&Apache::lonnet::put('environment',\%changeHash, |
&Apache::lonnet::put('environment',\%changeHash, |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
if ($chgresult eq 'ok') { |
if ($chgresult eq 'ok') { |
my %newenvhash; |
|
my $hashid="$env{'form.ccuname'}:$env{'form.ccdomain'}"; |
|
foreach my $key (keys(%changed)) { |
|
if ($key ne 'quota') { |
|
&Apache::lonnet::devalidate_cache_new('usertools.'.$key,$hashid); |
|
$newenvhash{'environment.tools.'.$key} = |
|
$changeHash{'tools.'.$key}; |
|
} |
|
} |
|
if (($env{'user.name'} eq $env{'form.ccuname'}) && |
if (($env{'user.name'} eq $env{'form.ccuname'}) && |
($env{'user.domain'} eq $env{'form.ccdomain'})) { |
($env{'user.domain'} eq $env{'form.ccdomain'})) { |
&Apache::lonnet::appenv(\%newenvhash); |
my %newenvhash; |
|
foreach my $key (keys(%changed)) { |
|
if ($key ne 'quota') { |
|
$newenvhash{'environment.tools.'.$key} = |
|
$changeHash{'tools.'.$key}; |
|
$newenvhash{'environment.availabletools.'.$key} = |
|
$changeHash{'tools.'.$key}; |
|
} |
|
} |
|
if (keys(%newenvhash)) { |
|
&Apache::lonnet::appenv(\%newenvhash); |
|
} |
} |
} |
} |
} |
} |
} |
Line 2480 sub update_roles {
|
Line 2482 sub update_roles {
|
my $result = &Apache::lonnet::assigncustomrole( |
my $result = &Apache::lonnet::assigncustomrole( |
$env{'form.ccdomain'}, $env{'form.ccuname'}, |
$env{'form.ccdomain'}, $env{'form.ccuname'}, |
$url,$rdom,$rnam,$rolename,0,$now,undef,$context); |
$url,$rdom,$rnam,$rolename,0,$now,undef,$context); |
$r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]', |
$r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]', |
$rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />'); |
$rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />'); |
if (!grep(/^cr$/,@rolechanges)) { |
if (!grep(/^cr$/,@rolechanges)) { |
push(@rolechanges,'cr'); |
push(@rolechanges,'cr'); |
Line 2928 sub make_script_template {
|
Line 2930 sub make_script_template {
|
my ($priv_item, $dummy) = split(/\&/,$priv); |
my ($priv_item, $dummy) = split(/\&/,$priv); |
$role_c{$priv_item} = 1; |
$role_c{$priv_item} = 1; |
} |
} |
|
my %role_d; |
|
@temp = split(/:/,$Apache::lonnet::pr{$role.':d'}); |
|
foreach my $priv(@temp) { |
|
my ($priv_item, $dummy) = split(/\&/,$priv); |
|
$role_d{$priv_item} = 1; |
|
} |
|
my %role_s; |
|
@temp = split(/:/,$Apache::lonnet::pr{$role.':s'}); |
|
foreach my $priv(@temp) { |
|
my ($priv_item, $dummy) = split(/\&/,$priv); |
|
$role_s{$priv_item} = 1; |
|
} |
foreach my $priv_item (keys(%full_c)) { |
foreach my $priv_item (keys(%full_c)) { |
my ($priv, $dummy) = split(/\&/,$priv_item); |
my ($priv, $dummy) = split(/\&/,$priv_item); |
if (exists($role_c{$priv})) { |
if ((exists($role_c{$priv})) || (exists($role_d{$priv})) || |
|
(exists($role_s{$priv}))) { |
$return_script .= "document.form1.$priv"."_c.checked = true;\n"; |
$return_script .= "document.form1.$priv"."_c.checked = true;\n"; |
} else { |
} else { |
$return_script .= "document.form1.$priv"."_c.checked = false;\n"; |
$return_script .= "document.form1.$priv"."_c.checked = false;\n"; |
} |
} |
} |
} |
my %role_d; |
|
@temp = split(/:/,$Apache::lonnet::pr{$role.':d'}); |
|
foreach my $priv(@temp) { |
|
my ($priv_item, $dummy) = split(/\&/,$priv); |
|
$role_d{$priv_item} = 1; |
|
} |
|
foreach my $priv_item (keys(%full_d)) { |
foreach my $priv_item (keys(%full_d)) { |
my ($priv, $dummy) = split(/\&/,$priv_item); |
my ($priv, $dummy) = split(/\&/,$priv_item); |
if (exists($role_d{$priv})) { |
if ((exists($role_d{$priv})) || (exists($role_s{$priv}))) { |
$return_script .= "document.form1.$priv"."_d.checked = true;\n"; |
$return_script .= "document.form1.$priv"."_d.checked = true;\n"; |
} else { |
} else { |
$return_script .= "document.form1.$priv"."_d.checked = false;\n"; |
$return_script .= "document.form1.$priv"."_d.checked = false;\n"; |
} |
} |
} |
} |
my %role_s; |
|
@temp = split(/:/,$Apache::lonnet::pr{$role.':s'}); |
|
foreach my $priv(@temp) { |
|
my ($priv_item, $dummy) = split(/\&/,$priv); |
|
$role_s{$priv_item} = 1; |
|
} |
|
foreach my $priv_item (keys(%full_s)) { |
foreach my $priv_item (keys(%full_s)) { |
my ($priv, $dummy) = split(/\&/,$priv_item); |
my ($priv, $dummy) = split(/\&/,$priv_item); |
if (exists($role_s{$priv})) { |
if (exists($role_s{$priv})) { |