--- loncom/interface/loncreateuser.pm 2007/05/29 17:48:44 1.149
+++ loncom/interface/loncreateuser.pm 2007/06/11 22:24:51 1.155
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.149 2007/05/29 17:48:44 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.155 2007/06/11 22:24:51 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -751,7 +751,7 @@ END
$row.=' ';
}
my $plaintext='';
- unless ($croletitle) {
+ if (!$croletitle) {
$plaintext=&Apache::lonnet::plaintext($role_code,$class)
} else {
$plaintext=
@@ -1574,7 +1574,7 @@ sub build_roles {
} else {
foreach my $sec (@secnums) {
$sec =~ ~s/\W//g;
- unless ($sec eq "") {
+ if (!($sec eq "")) {
if (exists($$sections{$sec})) {
$$sections{$sec} ++;
} else {
@@ -1607,35 +1607,35 @@ sub custom_role_editor {
$rolename=~s/[^A-Za-z0-9]//gs;
- unless ($rolename) {
+ if (!$rolename) {
&print_username_entry_form($r);
return;
}
-
- $r->print(&Apache::loncommon::start_page('Custom Role Editor'));
+# ------------------------------------------------------- What can be assigned?
+ my %full=();
+ my %courselevel=();
+ my %courselevelcurrent=();
my $syspriv='';
my $dompriv='';
my $coursepriv='';
+ my $body_top;
+ my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
- $r->print('<h2>');
+ $body_top .= '<h2>';
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
- $r->print(&mt('Existing Role').' "');
+ $body_top .= &mt('Existing Role').' "';
# ------------------------------------------------- Get current role privileges
($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
} else {
- $r->print(&mt('New Role').' "');
+ $body_top .= &mt('New Role').' "';
$roledef='';
}
- $r->print($rolename.'"</h2>');
-# ------------------------------------------------------- What can be assigned?
- my %full=();
- my %courselevel=();
- my %courselevelcurrent=();
+ $body_top .= $rolename.'"</h2>';
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict='F'; }
+ if (!$restrict) { $restrict='F'; }
$courselevel{$priv}=$restrict;
if ($coursepriv=~/\:$priv/) {
$courselevelcurrent{$priv}=1;
@@ -1646,7 +1646,7 @@ sub custom_role_editor {
my %domainlevelcurrent=();
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict='F'; }
+ if (!$restrict) { $restrict='F'; }
$domainlevel{$priv}=$restrict;
if ($dompriv=~/\:$priv/) {
$domainlevelcurrent{$priv}=1;
@@ -1657,21 +1657,35 @@ sub custom_role_editor {
my %systemlevelcurrent=();
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict='F'; }
+ if (!$restrict) { $restrict='F'; }
$systemlevel{$priv}=$restrict;
if ($syspriv=~/\:$priv/) {
$systemlevelcurrent{$priv}=1;
}
$full{$priv}=1;
}
+ my $button_code = "\n";
+ my $head_script = "\n";
+ $head_script .= '<script type="text/javascript">'."\n";
+ my @template_roles = ("cc","in","ta","ep","st");
+ foreach my $role (@template_roles) {
+ $head_script .= &make_script_template($role);
+ $button_code .= &make_button_code($role);
+ }
+ $head_script .= '</script>'."\n";
+ $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
+ $r->print($body_top);
my %lt=&Apache::lonlocal::texthash(
'prv' => "Privilege",
'crl' => "Course Level",
'dml' => "Domain Level",
- 'ssl' => "System Level"
- );
+ 'ssl' => "System Level");
+ $r->print('Select a Template<br />');
+ $r->print('<form action="">');
+ $r->print($button_code);
+ $r->print('</form>');
$r->print(<<ENDCCF);
-<form method="post">
+<form name=form1 method="post">
<input type="hidden" name="phase" value="set_custom_roles" />
<input type="hidden" name="rolename" value="$rolename" />
ENDCCF
@@ -1684,22 +1698,93 @@ ENDCCF
my $privtext = &Apache::lonnet::plaintext($priv);
$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.$privtext.'</td><td>'.
- ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
+ ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '.
+ ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
($domainlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+ ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td>'.
&Apache::loncommon::end_data_table_row());
}
$r->print(&Apache::loncommon::end_data_table().
- '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+ '<input type="reset" value="Reset" /><input type="submit" value="'.&mt('Define Role').'" /></form>'.
&Apache::loncommon::end_page());
}
-
+# --------------------------------------------------------
+sub make_script_template {
+ my ($role) = @_;
+ my %full_c=();
+ my %full_d=();
+ my %full_s=();
+ my $return_script;
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
+ $full_c{$priv}=1;
+ }
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
+ $full_d{$priv}=1;
+ }
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
+ $full_s{$priv}=1;
+ }
+ $return_script .= 'function set_'.$role.'() {'."\n";
+ my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'});
+ my %role_c;
+ foreach my $priv (@temp) {
+ my ($priv_item, $dummy) = split(/\&/,$priv);
+ $role_c{$priv_item} = 1;
+ }
+ foreach my $priv_item (keys(%full_c)) {
+ my ($priv, $dummy) = split(/\&/,$priv_item);
+ if (exists($role_c{$priv})) {
+ $return_script .= "document.form1.$priv"."_c.checked = true;\n";
+ } else {
+ $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)) {
+ my ($priv, $dummy) = split(/\&/,$priv_item);
+ if (exists($role_d{$priv})) {
+ $return_script .= "document.form1.$priv"."_d.checked = true;\n";
+ } else {
+ $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)) {
+ my ($priv, $dummy) = split(/\&/,$priv_item);
+ if (exists($role_s{$priv})) {
+ $return_script .= "document.form1.$priv"."_s.checked = true;\n";
+ } else {
+ $return_script .= "document.form1.$priv"."_s.checked = false;\n";
+ }
+ }
+ $return_script .= '}'."\n";
+ return ($return_script);
+}
+# ----------------------------------------------------------
+sub make_button_code {
+ my ($role) = @_;
+ my $label = &Apache::lonnet::plaintext($role);
+ my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
+ return ($button_code);
+}
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
my ($r) = @_;
@@ -1708,7 +1793,7 @@ sub set_custom_role {
$rolename=~s/[^A-Za-z0-9]//gs;
- unless ($rolename) {
+ if (!$rolename) {
&print_username_entry_form($r);
return;
}
@@ -1732,24 +1817,24 @@ sub set_custom_role {
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict=''; }
- if ($env{'form.'.$priv.':c'}) {
+ if (!$restrict) { $restrict=''; }
+ if ($env{'form.'.$priv.'_c'}) {
$courole.=':'.$item;
}
}
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict=''; }
- if ($env{'form.'.$priv.':d'}) {
+ if (!$restrict) { $restrict=''; }
+ if ($env{'form.'.$priv.'_d'}) {
$domrole.=':'.$item;
}
}
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
my ($priv,$restrict)=split(/\&/,$item);
- unless ($restrict) { $restrict=''; }
- if ($env{'form.'.$priv.':s'}) {
+ if (!$restrict) { $restrict=''; }
+ if ($env{'form.'.$priv.'_s'}) {
$sysrole.=':'.$item;
}
}
@@ -1788,7 +1873,7 @@ sub handler {
(&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- unless ($env{'form.phase'}) {
+ if (!$env{'form.phase'}) {
&print_username_entry_form($r);
}
if ($env{'form.phase'} eq 'get_user_info') {