--- loncom/interface/loncreateuser.pm 2005/06/19 00:41:32 1.105
+++ loncom/interface/loncreateuser.pm 2006/03/21 18:51:28 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.105 2005/06/19 00:41:32 www Exp $
+# $Id: loncreateuser.pm,v 1.111 2006/03/21 18:51:28 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -116,13 +116,15 @@ sub authorpriv {
# =================================================================== Phase one
sub print_username_entry_form {
- my $r=shift;
+ my ($r) = @_;
my $defdom=$env{'request.role.domain'};
my @domains = &Apache::loncommon::get_domains();
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
- my $html=&Apache::lonxml::xmlbegin();
- my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
my $selscript=&Apache::loncommon::studentbrowser_javascript();
+ my $start_page =
+ &Apache::loncommon::start_page('Create Users, Change User Privileges',
+ $selscript);
+
my $sellink=&Apache::loncommon::selectstudent_link
('crtuser','ccuname','ccdomain');
my %existingroles=&my_custom_roles();
@@ -137,15 +139,11 @@ sub print_username_entry_form {
'nr' => "Name of Role",
'cre' => "Custom Role Editor"
);
+ my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
$r->print(<<"ENDDOCUMENT");
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-$selscript
-</head>
-$bodytag
+$start_page
<form action="/adm/createuser" method="post" name="crtuser">
<input type="hidden" name="phase" value="get_user_info">
<h2>$lt{siur}$helpsiur</h2>
@@ -156,14 +154,103 @@ $lt{'dom'}:</td><td>$domform</td></tr>
</table>
<input name="userrole" type="submit" value="$lt{usrr}" />
</form>
+ENDDOCUMENT
+ if (&Apache::lonnet::allowed('mcr','/')) {
+ $r->print(<<ENDCUSTOM);
<form action="/adm/createuser" method="post" name="docustom">
<input type="hidden" name="phase" value="selected_custom_edit">
<h2>$lt{'ecrp'}$helpecpr</h2>
$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
<input name="customeditor" type="submit" value="$lt{'cre'}" />
-</body>
-</html>
-ENDDOCUMENT
+</form>
+ENDCUSTOM
+ }
+ $r->print(&Apache::loncommon::end_page());
+}
+
+
+sub user_modification_js {
+ my ($pjump_def, $dc_setcourse_code)=@_;
+ return <<END;
+<script type="text/javascript" language="Javascript">
+
+ function pclose() {
+ parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
+ "height=350,width=350,scrollbars=no,menubar=no");
+ parmwin.close();
+ }
+
+ $pjump_def
+ $dc_setcourse_code
+
+ function dateset() {
+ eval("document.cu."+document.cu.pres_marker.value+
+ ".value=document.cu.pres_value.value");
+ pclose();
+ }
+
+ function setSections() {
+ var re1 = /^currsec_/;
+ for (var i=0;i<document.cu.elements.length;i++) {
+ var str = document.cu.elements[i].name;
+ var checkcurr = str.match(re1);
+ if (checkcurr != null) {
+ var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+ if (document.cu.elements[i-1].checked == true) {
+ var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+ match = re2.exec(str);
+ var role = match[1];
+ if (role == 'cc') {
+ alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+ }
+ else {
+ var sections = '';
+ var numsec = 0;
+ var sections;
+ for (var j=0; j<document.cu.elements[i].length; j++) {
+ if (document.cu.elements[i].options[j].selected == true ) {
+ if (document.cu.elements[i].options[j].value != "") {
+ if (numsec == 0) {
+ if (document.cu.elements[i].options[j].value != "") {
+ sections = document.cu.elements[i].options[j].value;
+ numsec ++;
+ }
+ }
+ else {
+ sections = sections + "," + document.cu.elements[i].options[j].value
+ numsec ++;
+ }
+ }
+ }
+ }
+ if (numsec > 0) {
+ if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
+ sections = sections + "," + document.cu.elements[i+1].value;
+ }
+ }
+ else {
+ sections = document.cu.elements[i+1].value;
+ }
+ var newsecs = document.cu.elements[i+1].value;
+ if (newsecs != null && newsecs != "") {
+ var numsplit = newsecs.split(/,/g);
+ numsec = numsec + numsplit.length;
+ }
+ if ((role == 'st') && (numsec > 1)) {
+ alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
+ return;
+ }
+ else {
+ document.cu.elements[i+2].value = sections;
+ }
+ }
+ }
+ }
+ }
+ document.cu.submit();
+ }
+</script>
+END
}
# =================================================================== Phase two
@@ -270,93 +357,12 @@ sub print_user_modification_page {
}
ENDSCRIPT
}
- my $html=&Apache::lonxml::xmlbegin();
- my $dochead =<<"ENDDOCHEAD";
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript" language="Javascript">
- function pclose() {
- parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- "height=350,width=350,scrollbars=no,menubar=no");
- parmwin.close();
- }
+ my $js = &user_modification_js($pjump_def, $dc_setcourse_code);
+ my $start_page =
+ &Apache::loncommon::start_page('Create Users, Change User Privileges',
+ $js,{'add_entries' => $loaditem,});
- $pjump_def
- $dc_setcourse_code
-
- function dateset() {
- eval("document.cu."+document.cu.pres_marker.value+
- ".value=document.cu.pres_value.value");
- pclose();
- }
-
- function setSections() {
- var re1 = /^currsec_/;
- for (var i=0;i<document.cu.elements.length;i++) {
- var str = document.cu.elements[i].name;
- var checkcurr = str.match(re1);
- if (checkcurr != null) {
- var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
- if (document.cu.elements[i-1].checked == true) {
- var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
- match = re2.exec(str);
- var role = match[1];
- if (role == 'cc') {
- alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
- }
- else {
- var sections = '';
- var numsec = 0;
- var sections;
- for (var j=0; j<document.cu.elements[i].length; j++) {
- if (document.cu.elements[i].options[j].selected == true ) {
- if (document.cu.elements[i].options[j].value != "") {
- if (numsec == 0) {
- if (document.cu.elements[i].options[j].value != "") {
- sections = document.cu.elements[i].options[j].value;
- numsec ++;
- }
- }
- else {
- sections = sections + "," + document.cu.elements[i].options[j].value
- numsec ++;
- }
- }
- }
- }
- if (numsec > 0) {
- if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
- sections = sections + "," + document.cu.elements[i+1].value;
- }
- }
- else {
- sections = document.cu.elements[i+1].value;
- }
- var newsecs = document.cu.elements[i+1].value;
- if (newsecs != null && newsecs != "") {
- var numsplit = newsecs.split(/,/g);
- numsec = numsec + numsplit.length;
- }
- if ((role == 'st') && (numsec > 1)) {
- alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
- return;
- }
- else {
- document.cu.elements[i+2].value = sections;
- }
- }
- }
- }
- }
- document.cu.submit();
- }
-</script>
-</head>
-ENDDOCHEAD
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges',undef,$loaditem));
my $forminfo =<<"ENDFORMINFO";
<form action="/adm/createuser" method="post" name="cu">
<input type="hidden" name="phase" value="update_user_data">
@@ -398,7 +404,7 @@ ENDFORMINFO
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
&initialize_authen_forms();
$r->print(<<ENDNEWUSER);
-$dochead
+$start_page
<h1>$lt{'cnu'}</h1>
$forminfo
<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2>
@@ -439,7 +445,7 @@ ENDNEWUSER
'gen' => "generation"
);
$r->print(<<ENDCHANGEUSER);
-$dochead
+$start_page
<h1>$lt{'cup'}</h1>
$forminfo
<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
@@ -661,7 +667,7 @@ END
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
if ($currentauth=~/^krb(4|5):/) {
$currentauth=~/^krb(4|5):(.*)/;
- my $krbdefdom=$1;
+ my $krbdefdom=$2;
my %param = ( formname => 'document.cu',
kerb_def_dom => $krbdefdom
);
@@ -859,7 +865,7 @@ ENDDROW
$r->print(&course_level_table(%inccourses));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()">'."\n");
}
- $r->print("</form></body></html>");
+ $r->print("</form>".&Apache::loncommon::end_page());
}
# ================================================================= Phase Three
@@ -869,22 +875,15 @@ sub update_user_data {
$env{'form.ccdomain'});
# Error messages
my $error = '<font color="#ff0000">'.&mt('Error').':</font>';
- my $end = '</body></html>';
- # Print header
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<ENDTHREEHEAD);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-ENDTHREEHEAD
+ my $end = &Apache::loncommon::end_page();
+
my $title;
if (exists($env{'form.makeuser'})) {
$title='Set Privileges for New User';
} else {
$title='Modify User Privileges';
}
- $r->print(&Apache::loncommon::bodytag($title));
+ $r->print(&Apache::loncommon::start_page($title));
# Check Inputs
if (! $env{'form.ccuname'} ) {
$r->print($error.&mt('No login name specified').'.'.$end);
@@ -1262,7 +1261,7 @@ END
# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();
$r->print('<p><a href="/adm/createuser">Create/Modify Another User</a></p>');
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
}
sub commit_customrole {
@@ -1398,14 +1397,14 @@ sub custom_role_editor {
return;
}
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges').'<h2>');
+ $r->print(&Apache::loncommon::start_page('Custom Role Editor'));
my $syspriv='';
my $dompriv='';
my $coursepriv='';
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
+ $r->print('<h2>');
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
$r->print(&mt('Existing Role').' "');
# ------------------------------------------------- Get current role privileges
@@ -1477,12 +1476,13 @@ ENDCCF
'</td></tr>');
}
$r->print(
- '<table><input type="submit" value="'.&mt('Define Role').'" /></form></body></html>');
+ '<table><input type="submit" value="'.&mt('Define Role').'" /></form>'.
+ &Apache::loncommon::end_page());
}
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
- my $r=shift;
+ my ($r) = @_;
my $rolename=$env{'form.rolename'};
@@ -1493,10 +1493,10 @@ sub set_custom_role {
return;
}
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges').'<h2>');
+ $r->print(&Apache::loncommon::start_page('Save Custom Role').'<h2>');
my ($rdummy,$roledef)=
- &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+ &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+
# ------------------------------------------------------- Does this role exist?
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
$r->print(&mt('Existing Role').' "');
@@ -1546,7 +1546,8 @@ sub set_custom_role {
$env{'user.name'},
$rolename));
}
- $r->print('</body></html>');
+ $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler