--- loncom/interface/domainprefs.pm 2014/04/02 16:27:18 1.233 +++ loncom/interface/domainprefs.pm 2014/05/30 00:11:06 1.245 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.233 2014/04/02 16:27:18 raeburn Exp $ +# $Id: domainprefs.pm,v 1.245 2014/05/30 00:11:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -165,6 +165,7 @@ use Apache::lonlocal; use Apache::lonmsg(); use Apache::lonconfigsettings; use Apache::lonuserutils(); +use Apache::loncoursequeueadmin(); use LONCAPA qw(:DEFAULT :match); use LONCAPA::Enrollment; use LONCAPA::lonauthcgi(); @@ -214,7 +215,7 @@ sub handler { 'contacts','defaults','scantron','coursecategories', 'serverstatuses','requestcourses','helpsettings', 'coursedefaults','usersessions','loadbalancing', - 'requestauthor','selfenrollment'],$dom); + 'requestauthor','selfenrollment','inststatus'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', 'autoupdate','autocreate','directorysrch','contacts', 'usercreation','selfcreation','usermodification','scantron', @@ -254,10 +255,12 @@ sub handler { modify => \&modify_login, }, 'defaults' => - { text => 'Default authentication/language/timezone/portal', + { text => 'Default authentication/language/timezone/portal/types', help => 'Domain_Configuration_LangTZAuth', header => [{col1 => 'Setting', - col2 => 'Value'}], + col2 => 'Value'}, + {col1 => 'Institutional user types', + col2 => 'Assignable to e-mail usernames'}], print => \&print_defaults, modify => \&modify_defaults, }, @@ -365,7 +368,11 @@ sub handler { {col1 => 'Setting', col2 => 'Value'}, {col1 => 'Available textbooks', - col2 => ''}], + col2 => ''}, + {col1 => 'Available templates', + col2 => ''}, + {col1 => 'Validation (not official courses)', + col2 => 'Value'},], print => \&print_quotas, modify => \&modify_quotas, }, @@ -382,7 +389,9 @@ sub handler { 'coursecategories' => { text => 'Cataloging of courses/communities', help => 'Domain_Configuration_Cataloging_Courses', - header => [{col1 => 'Category settings', + header => [{col1 => 'Catalog type/availability', + col2 => '',}, + {col1 => 'Category settings for standard catalog', col2 => '',}, {col1 => 'Categories', col2 => '', @@ -492,7 +501,7 @@ sub handler { } } elsif ($phase eq 'display') { my $js = &recaptcha_js(). - &credits_js(); + &toggle_display_js(); if ((keys(%servers) > 1) || (keys(%existing) > 0)) { my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); @@ -615,7 +624,7 @@ sub process_changes { } elsif ($action eq 'scantron') { $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig); } elsif ($action eq 'coursecategories') { - $output = &modify_coursecategories($dom,%domconfig); + $output = &modify_coursecategories($dom,$lastactref,%domconfig); } elsif ($action eq 'serverstatuses') { $output = &modify_serverstatuses($dom,%domconfig); } elsif ($action eq 'requestcourses') { @@ -642,8 +651,10 @@ sub print_config_box { my $output; if ($action eq 'coursecategories') { $output = &coursecategories_javascript($settings); + } elsif ($action eq 'defaults') { + $output = &defaults_javascript($settings); } - $output .= + $output .= '<table class="LC_nested_outer"> <tr> <th align="left" valign="middle"><span class="LC_nobreak">'. @@ -658,7 +669,7 @@ sub print_config_box { if ($numheaders > 1) { my $colspan = ''; my $rightcolspan = ''; - if (($action eq 'rolecolors') || ($action eq 'coursecategories') || + if (($action eq 'rolecolors') || ($action eq 'defaults') || (($action eq 'login') && ($numheaders < 3))) { $colspan = ' colspan="2"'; } @@ -675,7 +686,7 @@ sub print_config_box { </tr>'; $rowtotal ++; if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || - ($action eq 'usermodification') || ($action eq 'coursedefaults') || + ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || ($action eq 'selfenrollment') || ($action eq 'usersessions')) { $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); } elsif ($action eq 'coursecategories') { @@ -706,8 +717,14 @@ sub print_config_box { $rowtotal ++; if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || ($action eq 'selfenrollment') || - ($action eq 'usersessions')) { - $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).' + ($action eq 'usersessions') || ($action eq 'coursecategories')) { + if ($action eq 'coursecategories') { + $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); + $colspan = ' colspan="2"'; + } else { + $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); + } + $output .= ' </table> </td> </tr> @@ -717,13 +734,16 @@ sub print_config_box { <tr class="LC_info_row"> <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> - </tr>'."\n". - $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); + </tr>'."\n"; + if ($action eq 'coursecategories') { + $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); + } else { + $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); + } $rowtotal ++; - } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) { + } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || + ($action eq 'defaults')) { $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); - } elsif ($action eq 'coursecategories') { - $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); } elsif ($action eq 'login') { if ($numheaders == 3) { $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' @@ -753,7 +773,29 @@ sub print_config_box { <tr class="LC_info_row"> <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. - &print_textbookcourses($dom,$settings,\$rowtotal); + &textbookcourses_javascript($settings). + &print_textbookcourses($dom,'textbooks',$settings,\$rowtotal).' + </table> + </td> + </tr> + <tr> + <td> + <table class="LC_nested"> + <tr class="LC_info_row"> + <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> + <td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'. + &print_textbookcourses($dom,'templates',$settings,\$rowtotal).' + </table> + </td> + </tr> + <tr> + <td> + <table class="LC_nested"> + <tr class="LC_info_row"> + <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td> + <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td> + </tr>'. + &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal); } elsif ($action eq 'requestauthor') { $output .= &print_requestmail($dom,$action,$settings,\$rowtotal); } elsif ($action eq 'rolecolors') { @@ -835,8 +877,7 @@ sub print_config_box { if ($action eq 'quotas') { $output .= &print_quotas($dom,$settings,\$rowtotal,$action); } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') || - ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') || - ($action eq 'loadbalancing')) { + ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) { $output .= $item->{'print'}->($dom,$settings,\$rowtotal); } elsif ($action eq 'scantron') { $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); @@ -1472,7 +1513,7 @@ sub display_color_options { $datatable .= '<td class="LC_right_item">'. '<table border="0"><tr>'; foreach my $item (@{$links}) { - my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item}; + my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item}; $datatable .= '<td align="center">'.$choices->{$item}."\n"; if ($designs->{'links'}{$item}) { $datatable.=' '; @@ -2065,14 +2106,14 @@ sub print_studentcode { } sub print_textbookcourses { - my ($dom,$settings,$rowtotal) = @_; + my ($dom,$type,$settings,$rowtotal) = @_; my $rownum = 0; my $css_class; my $itemcount = 1; my $maxnum = 0; my $bookshash; if (ref($settings) eq 'HASH') { - $bookshash = $settings->{'textbooks'}; + $bookshash = $settings->{$type}; } my %ordered; if (ref($bookshash) eq 'HASH') { @@ -2086,7 +2127,7 @@ sub print_textbookcourses { my $confname = $dom.'-domainconfig'; my $switchserver = &check_switchserver($dom,$confname); my $maxnum = scalar(keys(%ordered)); - my $datatable = &textbookcourses_javascript(\%ordered); + my $datatable; if (keys(%ordered)) { my @items = sort { $a <=> $b } keys(%ordered); for (my $i=0; $i<@items; $i++) { @@ -2094,21 +2135,24 @@ sub print_textbookcourses { my $key = $ordered{$items[$i]}; my %coursehash=&Apache::lonnet::coursedescription($key); my $coursetitle = $coursehash{'description'}; - my ($subject,$title,$author,$image,$imgsrc,$cdom,$cnum); + my ($subject,$title,$author,$publisher,$image,$imgsrc,$cdom,$cnum); if (ref($bookshash->{$key}) eq 'HASH') { $subject = $bookshash->{$key}->{'subject'}; $title = $bookshash->{$key}->{'title'}; - $author = $bookshash->{$key}->{'author'}; - $image = $bookshash->{$key}->{'image'}; - if ($image ne '') { - my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); - my $imagethumb = "$path/tn-".$imagefile; - $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; + if ($type eq 'textbooks') { + $publisher = $bookshash->{$key}->{'publisher'}; + $author = $bookshash->{$key}->{'author'}; + $image = $bookshash->{$key}->{'image'}; + if ($image ne '') { + my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); + my $imagethumb = "$path/tn-".$imagefile; + $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; + } } } - my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"'; + my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"'; $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' - .'<select name="'.$key.'"'.$chgstr.'>'; + .'<select name="'.$type.'_'.$key.'"'.$chgstr.'>'; for (my $k=0; $k<=$maxnum; $k++) { my $vpos = $k+1; my $selstr; @@ -2118,39 +2162,43 @@ sub print_textbookcourses { $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; } $datatable .= '</select>'.(' 'x2). - '<label><input type="checkbox" name="book_del" value="'.$key.'" />'. + '<label><input type="checkbox" name="'.$type.'_del" value="'.$key.'" />'. &mt('Delete?').'</label></span></td>'. '<td colspan="2">'. - '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></span> '. - (' 'x2). - '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></span> '. - (' 'x2). - '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="book_author_'.$i.'" value="'.$author.'" /></span> '. + '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '. (' 'x2). - '<span class="LC_nobreak">'.&mt('Thumbnail:'); - if ($image) { - $datatable .= '<span class="LC_nobreak">'. - $imgsrc. - '<label><input type="checkbox" name="book_image_del"'. - ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. - '<span class="LC_nobreak"> '.&mt('Replace:').' '; - } - if ($switchserver) { - $datatable .= &mt('Upload to library server: [_1]',$switchserver); - } else { - $datatable .= '<input type="file" name="book_image_'.$i.'" value="" />'; + '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> '; + if ($type eq 'textbooks') { + $datatable .= (' 'x2). + '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '. + (' 'x2). + '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '. + (' 'x2). + '<span class="LC_nobreak">'.&mt('Thumbnail:'); + if ($image) { + $datatable .= '<span class="LC_nobreak">'. + $imgsrc. + '<label><input type="checkbox" name="'.$type.'_image_del"'. + ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. + '<span class="LC_nobreak"> '.&mt('Replace:').' '; + } + if ($switchserver) { + $datatable .= &mt('Upload to library server: [_1]',$switchserver); + } else { + $datatable .= '<input type="file" name="'.$type.'_image_'.$i.'" value="" />'; + } } - $datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$key.'" /></span> '. + $datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '. '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. $coursetitle.'</span></td></tr>'."\n"; $itemcount ++; } } $css_class = $itemcount%2?' class="LC_odd_row"':''; - my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"'; + my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type"."_addbook_pos','$type'".');"'; $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". - '<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n". - '<select name="addbook_pos"'.$chgstr.'>'; + '<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n". + '<select name="'.$type.'_addbook_pos"'.$chgstr.'>'; for (my $k=0; $k<$maxnum+1; $k++) { my $vpos = $k+1; my $selstr; @@ -2160,26 +2208,30 @@ sub print_textbookcourses { $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; } $datatable .= '</select> '."\n". - '<input type="checkbox" name="addbook" value="1" />'.&mt('Add').'</td>'."\n". + '<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n". '<td colspan="2">'. - '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="addbook_subject" value="" /></span> '."\n". + '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". (' 'x2). - '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="addbook_title" value="" /></span> '."\n". - (' 'x2). - '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n". - (' 'x2). - '<span class="LC_nobreak">'.&mt('Image:').' '; - if ($switchserver) { - $datatable .= &mt('Upload to library server: [_1]',$switchserver); - } else { - $datatable .= '<input type="file" name="addbook_image" value="" />'; + '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n". + (' 'x2); + if ($type eq 'textbooks') { + $datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n". + (' 'x2). + '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n". + (' 'x2). + '<span class="LC_nobreak">'.&mt('Image:').' '; + if ($switchserver) { + $datatable .= &mt('Upload to library server: [_1]',$switchserver); + } else { + $datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; + } } $datatable .= '</span>'."\n". '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. - &Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom'). - '<input type="text" size="25" name="addbook_cnum" value="" />'. + &Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). + '<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. &Apache::loncommon::selectcourse_link - ('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course'); + ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'); '</span></td>'."\n". '</tr>'."\n"; $itemcount ++; @@ -2187,23 +2239,42 @@ sub print_textbookcourses { } sub textbookcourses_javascript { - my ($textbooks) = @_; - return unless(ref($textbooks) eq 'HASH'); - my $num = scalar(keys(%{$textbooks})); - my @jsarray; - foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) { - push(@jsarray,$textbooks->{$item}); + my ($settings) = @_; + return unless(ref($settings) eq 'HASH'); + my (%ordered,%total,%jstext); + foreach my $type ('textbooks','templates') { + $total{$type} = 0; + if (ref($settings->{$type}) eq 'HASH') { + foreach my $item (keys(%{$settings->{$type}})) { + if (ref($settings->{$type}->{$item}) eq 'HASH') { + my $num = $settings->{$type}->{$item}{'order'}; + $ordered{$type}{$num} = $item; + } + } + $total{$type} = scalar(keys(%{$settings->{$type}})); + } + my @jsarray = (); + foreach my $item (sort {$a <=> $b } (keys(%{$ordered{$type}}))) { + push(@jsarray,$ordered{$type}{$item}); + } + $jstext{$type} = ' var '.$type.' = Array('."'".join("','",@jsarray)."'".');'."\n"; } - my $jstext = ' var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n"; return <<"ENDSCRIPT"; <script type="text/javascript"> // <![CDATA[ -function reorderBooks(form,item) { +function reorderBooks(form,item,caller) { var changedVal; -$jstext - var newpos = 'addbook_pos'; - var current = new Array; - var maxh = 1 + $num; +$jstext{'textbooks'}; +$jstext{'templates'}; + var newpos; + var maxh; + if (caller == 'textbooks') { + newpos = 'textbooks_addbook_pos'; + maxh = 1 + $total{'textbooks'}; + } else { + newpos = 'templates_addbook_pos'; + maxh = 1 + $total{'templates'}; + } var current = new Array; var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; if (item == newpos) { @@ -2212,12 +2283,25 @@ $jstext changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; current[newitemVal] = newpos; } - for (var i=0; i<textbooks.length; i++) { - var elementName = textbooks[i]; - if (elementName != item) { - if (form.elements[elementName]) { - var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; - current[currVal] = elementName; + if (caller == 'textbooks') { + for (var i=0; i<textbooks.length; i++) { + var elementName = 'textbooks_'+textbooks[i]; + if (elementName != item) { + if (form.elements[elementName]) { + var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; + current[currVal] = elementName; + } + } + } + } + if (caller == 'templates') { + for (var i=0; i<templates.length; i++) { + var elementName = 'templates_'+templates[i]; + if (elementName != item) { + if (form.elements[elementName]) { + var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; + current[currVal] = elementName; + } } } } @@ -2798,7 +2882,7 @@ sub print_coursedefaults { } $datatable .= '</tr></table></td></tr>'."\n"; $itemcount ++; - my $onclick = 'toggleCredits(this.form);'; + my $onclick = "toggleDisplay(this.form,'credits');"; my $display = 'none'; if ($currusecredits) { $display = 'block'; @@ -2974,48 +3058,85 @@ sub print_selfenrollment { $datatable .= '</table></td></tr>'; } } elsif ($position eq 'bottom') { - my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types(); - my %currvalidation; - if (ref($settings) eq 'HASH') { - if (ref($settings->{'validation'}) eq 'HASH') { - %currvalidation = %{$settings->{'validation'}}; - } + $datatable .= &print_validation_rows('selfenroll',$dom,$settings,\$itemcount); + } + $$rowtotal += $itemcount; + return $datatable; +} + +sub print_validation_rows { + my ($caller,$dom,$settings,$rowtotal) = @_; + my ($itemsref,$namesref,$fieldsref); + if ($caller eq 'selfenroll') { + ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types(); + } elsif ($caller eq 'requestcourses') { + ($itemsref,$namesref,$fieldsref) = &Apache::loncoursequeueadmin::requestcourses_validation_types(); + } + my %currvalidation; + if (ref($settings) eq 'HASH') { + if (ref($settings->{'validation'}) eq 'HASH') { + %currvalidation = %{$settings->{'validation'}}; } - foreach my $item (@{$itemsref}) { - $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; - $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. - $namesref->{$item}. - '</span></td>'. - '<td class="LC_left_item">'; - if (($item eq 'url') || ($item eq 'button')) { - $datatable .= '<span class="LC_nobreak">'. - '<input type="text" name="selfenroll_validation_'.$item.'"'. - ' value="'.$currvalidation{$item}.'" size="50" /></span>'; - } elsif ($item eq 'fields') { - my @currfields; - if (ref($currvalidation{$item}) eq 'ARRAY') { - @currfields = @{$currvalidation{$item}}; - } - foreach my $field (@{$fieldsref}) { - my $check = ''; - if (grep(/^\Q$field\E$/,@currfields)) { - $check = ' checked="checked"'; - } - $datatable .= '<span class="LC_nobreak"><label>'. - '<input type="checkbox" name="selfenroll_validation_fields"'. - ' value="'.$field.'"'.$check.' />'.$field. - '</label></span> '; - } - } elsif ($item eq 'markup') { - $datatable .= '<textarea name="selfenroll_validation_markup" cols="50" rows="5" wrap="soft">'. - $currvalidation{$item}. + } + my $datatable; + my $itemcount = 0; + foreach my $item (@{$itemsref}) { + my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; + $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. + $namesref->{$item}. + '</span></td>'. + '<td class="LC_left_item">'; + if (($item eq 'url') || ($item eq 'button')) { + $datatable .= '<span class="LC_nobreak">'. + '<input type="text" name="'.$caller.'_validation_'.$item.'"'. + ' value="'.$currvalidation{$item}.'" size="50" /></span>'; + } elsif ($item eq 'fields') { + my @currfields; + if (ref($currvalidation{$item}) eq 'ARRAY') { + @currfields = @{$currvalidation{$item}}; + } + foreach my $field (@{$fieldsref}) { + my $check = ''; + if (grep(/^\Q$field\E$/,@currfields)) { + $check = ' checked="checked"'; + } + $datatable .= '<span class="LC_nobreak"><label>'. + '<input type="checkbox" name="'.$caller.'_validation_fields"'. + ' value="'.$field.'"'.$check.' />'.$field. + '</label></span> '; + } + } elsif ($item eq 'markup') { + $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'. + $currvalidation{$item}. '</textarea>'; - } - $datatable .= '</td></tr>'."\n"; + } + $datatable .= '</td></tr>'."\n"; + if (ref($rowtotal)) { $itemcount ++; } } - $$rowtotal += $itemcount; + if ($caller eq 'requestcourses') { + my %currhash; + if (ref($settings->{'validation'}) eq 'HASH') { + if ($settings->{'validation'}{'dc'} ne '') { + $currhash{$settings->{'validation'}{'dc'}} = 1; + } + } + my $numinrow = 2; + my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', + 'validationdc',%currhash); + if ($numdc > 1) { + $datatable .= '</td></tr><tr class="LC_odd_row"><td>'. + &mt('Course creation processed as: (choose Dom. Coord.)'). + '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; + } else { + $datatable .= $dctable.'</td></tr>'; + } + $itemcount ++; + } + if (ref($rowtotal)) { + $$rowtotal += $itemcount; + } return $datatable; } @@ -3969,17 +4090,22 @@ sub print_usercreation { sub print_selfcreation { my ($position,$dom,$settings,$rowtotal) = @_; - my (@selfcreate,$createsettings,$datatable); + my (@selfcreate,$createsettings,$processing,$datatable); if (ref($settings) eq 'HASH') { if (ref($settings->{'cancreate'}) eq 'HASH') { $createsettings = $settings->{'cancreate'}; - if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') { - @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}}; - } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') { - if ($settings->{'cancreate'}{'selfcreate'} eq 'any') { - @selfcreate = ('email','login','sso'); - } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') { - @selfcreate = ($settings->{'cancreate'}{'selfcreate'}); + if (ref($createsettings) eq 'HASH') { + if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') { + @selfcreate = @{$createsettings->{'selfcreate'}}; + } elsif ($createsettings->{'selfcreate'} ne '') { + if ($settings->{'cancreate'}{'selfcreate'} eq 'any') { + @selfcreate = ('email','login','sso'); + } elsif ($createsettings->{'selfcreate'} ne 'none') { + @selfcreate = ($createsettings->{'selfcreate'}); + } + } + if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') { + $processing = $createsettings->{'selfcreateprocessing'}; } } } @@ -4012,6 +4138,43 @@ sub print_selfcreation { $$rowtotal ++; } } + my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus'); + my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); + $fieldtitles{'inststatus'} = &mt('Institutional status'); + my $rem; + my $numperrow = 2; + my $css_class = $$rowtotal%2?' class="LC_odd_row"':''; + $datatable .= '<tr'.$css_class.'>'. + '<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. + '<td class="LC_left_item">'."\n". + '<table><tr><td>'."\n"; + for (my $i=0; $i<@fields; $i++) { + $rem = $i%($numperrow); + if ($rem == 0) { + if ($i > 0) { + $datatable .= '</tr>'; + } + $datatable .= '<tr>'; + } + my $currval; + if (ref($createsettings->{'shibenv'}) eq 'HASH') { + $currval = $createsettings->{'shibenv'}{$fields[$i]}; + } + $datatable .= '<td class="LC_left_item">'. + '<span class="LC_nobreak">'. + '<input type="text" name="shibenv_'.$fields[$i].'" '. + 'value="'.$currval.'" size="10" /> '. + $fieldtitles{$fields[$i]}.'</span></td>'; + } + my $colsleft = $numperrow - $rem; + if ($colsleft > 1 ) { + $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. + ' </td>'; + } elsif ($colsleft == 1) { + $datatable .= '<td class="LC_left_item"> </td>'; + } + $datatable .= '</tr></table></td></tr>'; + $$rowtotal ++; } elsif ($position eq 'middle') { my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); @@ -4026,49 +4189,56 @@ sub print_selfcreation { } } } else { - my $css_class = $$rowtotal%2?' class="LC_odd_row"':''; - my %choices = - &Apache::lonlocal::texthash( - email => 'Approved automatically', - emailapproval => 'Queued for approval by DC', - off => 'Not enabled', - ); - $datatable .= '<tr'.$css_class.'>'. - '<td>'.&mt('E-mail address as username'). - '</td><td class="LC_left_item">'. - '<span class="LC_nobreak">'; - foreach my $option ('email','emailapproval','off') { - my $checked; - if ($option eq 'email') { - if ($radiohash{'cancreate_email'}) { - $checked = 'checked="checked"'; - } - } elsif ($option eq 'emailapproval') { - if ($radiohash{'cancreate_emailapproval'}) { - $checked = 'checked="checked"'; + my %choices = &Apache::lonlocal::texthash ( + cancreate_email => 'E-mail address as username', + ); + my @toggles = sort(keys(%choices)); + my %defaultchecked = ( + 'cancreate_email' => 'off', + ); + my $itemcount = 0; + my $display = 'none'; + if (grep(/^\Qemail\E$/,@selfcreate)) { + $display = 'block'; + } + my $onclick = "toggleDisplay(this.form,'emailoptions');"; + my $additional = '<div id="emailoptions" style="display: '.$display.'">'; + my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); + my $usertypes = {}; + my $order = []; + if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) { + $usertypes = $domdefaults{'inststatustypes'}; + $order = $domdefaults{'inststatusguest'}; + } + if (ref($order) eq 'ARRAY') { + push(@{$order},'default'); + if (@{$order} > 1) { + $usertypes->{'default'} = &mt('Other users'); + $additional .= '<table><tr>'; + foreach my $status (@{$order}) { + $additional .= '<th>'.$usertypes->{$status}.'</th>'; + } + $additional .= '</tr><tr>'; + foreach my $status (@{$order}) { + $additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; } + $additional .= '</tr></table>'; } else { - if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) { - $checked = 'checked="checked"'; - } + $usertypes->{'default'} = &mt('All users'); + $additional .= &email_as_username($rowtotal,$processing); } - $datatable .= '<label>'. - '<input type="radio" name="cancreate_email" '. - $checked.' value="'.$option.'" />'. - $choices{$option}.'</label> '; } + $additional .= '</div>'."\n"; + + ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, + \%choices,$$rowtotal,$onclick,$additional); $$rowtotal ++; - $datatable .= '</span></td></tr>'. - &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); + $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); $$rowtotal ++; my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); $numinrow = 1; - my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - $usertypes->{'default'} = $othertitle; - if (ref($types) eq 'ARRAY') { - push(@{$types},'default'); - $usertypes->{'default'} = $othertitle; - foreach my $status (@{$types}) { + if (ref($order) eq 'ARRAY') { + foreach my $status (@{$order}) { $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); $$rowtotal ++; @@ -4088,6 +4258,59 @@ sub print_selfcreation { return $datatable; } +sub email_as_username { + my ($rowtotal,$processing,$type) = @_; + my %choices = + &Apache::lonlocal::texthash ( + automatic => 'Automatic approval', + approval => 'Queued for approval', + ); + my $output; + foreach my $option ('automatic','approval') { + my $checked; + if (ref($processing) eq 'HASH') { + if ($type eq '') { + if (!exists($processing->{'default'})) { + if ($option eq 'automatic') { + $checked = ' checked="checked"'; + } + } else { + if ($processing->{'default'} eq $option) { + $checked = ' checked="checked"'; + } + } + } else { + if (!exists($processing->{$type})) { + if ($option eq 'automatic') { + $checked = ' checked="checked"'; + } + } else { + if ($processing->{$type} eq $option) { + $checked = ' checked="checked"'; + } + } + } + } elsif ($option eq 'automatic') { + $checked = ' checked="checked"'; + } + my $name = 'cancreate_emailprocess'; + if (($type ne '') && ($type ne 'default')) { + $name .= '_'.$type; + } + $output .= '<span class="LC_nobreak"><label>'. + '<input type="radio" name="'.$name.'"'. + $checked.' value="'.$option.'" />'. + $choices{$option}.'</label></span>'; + if ($type eq '') { + $output .= ' '; + } else { + $output .= '<br />'; + } + } + $$rowtotal ++; + return $output; +} + sub captcha_choice { my ($context,$settings,$itemcount) = @_; my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); @@ -4274,70 +4497,143 @@ sub print_usermodification { } sub print_defaults { - my ($dom,$settings,$rowtotal) = @_; - my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', - 'datelocale_def','portal_def'); - my %defaults; - if (ref($settings) eq 'HASH') { - %defaults = %{$settings}; - } else { - my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); - foreach my $item (@items) { - $defaults{$item} = $domdefaults{$item}; - } - } - my $titles = &defaults_titles($dom); + my ($position,$dom,$settings,$rowtotal) = @_; my $rownum = 0; my ($datatable,$css_class); - foreach my $item (@items) { - if ($rownum%2) { - $css_class = ''; + if ($position eq 'top') { + my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', + 'datelocale_def','portal_def'); + my %defaults; + if (ref($settings) eq 'HASH') { + %defaults = %{$settings}; } else { - $css_class = ' class="LC_odd_row" '; + my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); + foreach my $item (@items) { + $defaults{$item} = $domdefaults{$item}; + } } - $datatable .= '<tr'.$css_class.'>'. - '<td><span class="LC_nobreak">'.$titles->{$item}. - '</span></td><td class="LC_right_item">'; - if ($item eq 'auth_def') { - my @authtypes = ('internal','krb4','krb5','localauth'); - my %shortauth = ( - internal => 'int', - krb4 => 'krb4', - krb5 => 'krb5', - localauth => 'loc' - ); - my %authnames = &authtype_names(); - foreach my $auth (@authtypes) { - my $checked = ' '; - if ($defaults{$item} eq $auth) { - $checked = ' checked="checked" '; - } - $datatable .= '<label><input type="radio" name="'.$item. - '" value="'.$auth.'"'.$checked.'/>'. - $authnames{$shortauth{$auth}}.'</label> '; + my $titles = &defaults_titles($dom); + foreach my $item (@items) { + if ($rownum%2) { + $css_class = ''; + } else { + $css_class = ' class="LC_odd_row" '; } - } elsif ($item eq 'timezone_def') { - my $includeempty = 1; - $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty); - } elsif ($item eq 'datelocale_def') { - my $includeempty = 1; - $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); - } elsif ($item eq 'lang_def') { - my %langchoices = &get_languages_hash(); - $langchoices{''} = 'No language preference'; - %langchoices = &Apache::lonlocal::texthash(%langchoices); - $datatable .= &Apache::loncommon::select_form($defaults{$item},$item, - \%langchoices); - } else { - my $size; - if ($item eq 'portal_def') { - $size = ' size="25"'; + $datatable .= '<tr'.$css_class.'>'. + '<td><span class="LC_nobreak">'.$titles->{$item}. + '</span></td><td class="LC_right_item" colspan="3">'; + if ($item eq 'auth_def') { + my @authtypes = ('internal','krb4','krb5','localauth'); + my %shortauth = ( + internal => 'int', + krb4 => 'krb4', + krb5 => 'krb5', + localauth => 'loc' + ); + my %authnames = &authtype_names(); + foreach my $auth (@authtypes) { + my $checked = ' '; + if ($defaults{$item} eq $auth) { + $checked = ' checked="checked" '; + } + $datatable .= '<label><input type="radio" name="'.$item. + '" value="'.$auth.'"'.$checked.'/>'. + $authnames{$shortauth{$auth}}.'</label> '; + } + } elsif ($item eq 'timezone_def') { + my $includeempty = 1; + $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty); + } elsif ($item eq 'datelocale_def') { + my $includeempty = 1; + $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); + } elsif ($item eq 'lang_def') { + my %langchoices = &get_languages_hash(); + $langchoices{''} = 'No language preference'; + %langchoices = &Apache::lonlocal::texthash(%langchoices); + $datatable .= &Apache::loncommon::select_form($defaults{$item},$item, + \%langchoices); + } else { + my $size; + if ($item eq 'portal_def') { + $size = ' size="25"'; + } + $datatable .= '<input type="text" name="'.$item.'" value="'. + $defaults{$item}.'"'.$size.' />'; + } + $datatable .= '</td></tr>'; + $rownum ++; + } + } else { + my (%defaults); + if (ref($settings) eq 'HASH') { + if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && + (ref($settings->{'inststatusguest'}) eq 'ARRAY')) { + my $maxnum = @{$settings->{'inststatusorder'}}; + for (my $i=0; $i<$maxnum; $i++) { + $css_class = $rownum%2?' class="LC_odd_row"':''; + my $item = $settings->{'inststatusorder'}->[$i]; + my $title = $settings->{'inststatustypes'}->{$item}; + my $guestok; + if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) { + $guestok = 1; + } + my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"'; + $datatable .= '<tr'.$css_class.'>'. + '<td><span class="LC_nobreak">'. + '<select name="inststatus_pos_'.$item.'"'.$chgstr.'>'; + for (my $k=0; $k<=$maxnum; $k++) { + my $vpos = $k+1; + my $selstr; + if ($k == $i) { + $selstr = ' selected="selected" '; + } + $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; + } + my ($checkedon,$checkedoff); + $checkedoff = ' checked="checked"'; + if ($guestok) { + $checkedon = $checkedoff; + $checkedoff = ''; + } + $datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '. + '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'. + &mt('delete').'</span></td>'. + '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:'). + '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'. + '</span></td>'. + '<td class="LC_right_item"><span class="LC_nobreak">'. + '<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'. + &mt('Yes').'</label>'.(' 'x2). + '<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'. + &mt('No').'</label></span></td></tr>'; + } + $css_class = $rownum%2?' class="LC_odd_row"':''; + my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"'; + $datatable .= '<tr '.$css_class.'>'. + '<td><span class="LC_nobreak"><select name="addinststatus_pos"'.$chgstr.'>'; + for (my $k=0; $k<=$maxnum; $k++) { + my $vpos = $k+1; + my $selstr; + if ($k == $maxnum) { + $selstr = ' selected="selected" '; + } + $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; + } + $datatable .= '</select> '.&mt('Internal ID:'). + '<input type="text" size="10" name="addinststatus" value="" /></span>'. + ' '.&mt('(new)'). + '</span></td><td class="LC_left_item"><span class="LC_nobreak">'. + &mt('Name displayed:'). + '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'. + '<td class="LC_right_item"><span class="LC_nobreak">'. + '<label><input type="radio" value="1" name="addinststatus_guest" />'. + &mt('Yes').'</label>'.(' 'x2). + '<label><input type="radio" value="0" name="addinststatus_guest" />'. + &mt('No').'</label></span></td></tr>'; + '</tr>'."\n"; + $rownum ++; } - $datatable .= '<input type="text" name="'.$item.'" value="'. - $defaults{$item}.'"'.$size.' />'; } - $datatable .= '</td></tr>'; - $rownum ++; } $$rowtotal += $rownum; return $datatable; @@ -4554,6 +4850,49 @@ sub print_coursecategories { my ($position,$dom,$hdritem,$settings,$rowtotal) = @_; my $datatable; if ($position eq 'top') { + my (%checked); + my @catitems = ('unauth','auth'); + my @cattypes = ('std','domonly','codesrch','none'); + $checked{'unauth'} = 'std'; + $checked{'auth'} = 'std'; + if (ref($settings) eq 'HASH') { + foreach my $type (@cattypes) { + if ($type eq $settings->{'unauth'}) { + $checked{'unauth'} = $type; + } + if ($type eq $settings->{'auth'}) { + $checked{'auth'} = $type; + } + } + } + my %lt = &Apache::lonlocal::texthash ( + unauth => 'Catalog type for unauthenticated users', + auth => 'Catalog type for authenticated users', + none => 'No catalog', + std => 'Standard catalog', + domonly => 'Domain-only catalog', + codesrch => "Code search form", + ); + my $itemcount = 0; + foreach my $item (@catitems) { + my $css_class = $itemcount%2? ' class="LC_odd_row"':''; + $datatable .= '<tr '.$css_class.'>'. + '<td>'.$lt{$item}.'</td>'. + '<td class="LC_right_item"><span class="LC_nobreak">'; + foreach my $type (@cattypes) { + my $ischecked; + if ($checked{$item} eq $type) { + $ischecked=' checked="checked"'; + } + $datatable .= '<label>'. + '<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. + ' />'.$lt{$type}.'</label> '; + } + $datatable .= '</td></tr>'; + $itemcount ++; + } + $$rowtotal += $itemcount; + } elsif ($position eq 'middle') { my $toggle_cats_crs = ' '; my $toggle_cats_dom = ' checked="checked" '; my $can_cat_crs = ' '; @@ -4760,7 +5099,7 @@ sub print_coursecategories { $datatable .= &initialize_categories($itemcount); } } else { - $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>' + $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>' .&initialize_categories($itemcount); } $$rowtotal += $itemcount; @@ -4821,6 +5160,69 @@ sub serverstatus_pages { 'uniquecodes','diskusage'); } +sub defaults_javascript { + my ($settings) = @_; + my ($output,$jstext); + if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { + my $maxnum = scalar(@{$settings->{'inststatusorder'}}); + if ($maxnum eq '') { + $maxnum = 0; + } + $maxnum ++; + $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; + return <<"ENDSCRIPT"; +<script type="text/javascript"> +// <![CDATA[ +function reorderTypes(form,caller) { + var changedVal; +$jstext + var newpos = 'addinststatus_pos'; + var current = new Array; + var maxh = $maxnum; + var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; + var oldVal; + if (caller == newpos) { + changedVal = newitemVal; + } else { + var curritem = 'inststatus_pos_'+caller; + changedVal = form.elements[curritem].options[form.elements[curritem].selectedIndex].value; + current[newitemVal] = newpos; + } + for (var i=0; i<inststatuses.length; i++) { + if (inststatuses[i] != caller) { + var elementName = 'inststatus_pos_'+inststatuses[i]; + if (form.elements[elementName]) { + var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; + current[currVal] = elementName; + } + } + } + for (var j=0; j<maxh; j++) { + if (current[j] == undefined) { + oldVal = j; + } + } + if (oldVal < changedVal) { + for (var k=oldVal+1; k<=changedVal ; k++) { + var elementName = current[k]; + form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; + } + } else { + for (var k=changedVal; k<oldVal; k++) { + var elementName = current[k]; + form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; + } + } + return; +} + +// ]]> +</script> + +ENDSCRIPT + } +} + sub coursecategories_javascript { my ($settings) = @_; my ($output,$jstext,$cathash); @@ -4843,9 +5245,9 @@ sub coursecategories_javascript { $jstext = ' var categories = Array(1);'."\n". ' categories[0] = Array("instcode_pos");'."\n"; } - my $instcode_reserved = &mt('The name: "instcode" is a reserved category'); - my $communities_reserved = &mt('The name: "communities" is a reserved category'); - my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); + my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); + my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"'); + my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); $output = <<"ENDSCRIPT"; <script type="text/javascript"> // <![CDATA[ @@ -4853,7 +5255,6 @@ function reorderCats(form,parent,item,id var changedVal; $jstext var newpos = 'addcategory_pos'; - var current = new Array; if (parent == '') { var has_instcode = 0; var maxtop = categories[idx].length; @@ -5769,22 +6170,38 @@ sub modify_colors { } if ($role eq 'login') { foreach my $item (@logintext) { - unless ($env{'form.'.$role.'_'.$item} eq $defaults{'logintext'}{$item}) { + $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item}); + if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) { + $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item}; + } + unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'logintext'}{$item})) { $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; } } } else { - unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) { + $env{'form.'.$role.'_fontmenu'} = lc($env{'form.'.$role.'_fontmenu'}); + if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) { + $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'}; + } + unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) { $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'}; } } foreach my $item (@bgs) { - unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) { + $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item}); + if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) { + $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item}; + } + unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'bgs'}{$item})) { $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; } } foreach my $item (@links) { - unless ($env{'form.'.$role.'_'.$item} eq $defaults{'links'}{$item}) { + $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item}); + if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) { + $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item}; + } + unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'links'}{$item})) { $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; } } @@ -6406,7 +6823,8 @@ sub modify_quotas { my ($r,$dom,$action,$lastactref,%domconfig) = @_; my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash, %limithash,$toolregexp,%conditions,$resulttext,%changes,$confname,$configuserok, - $author_ok,$switchserver,$errors); + $author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref, + $validationfieldsref); if ($action eq 'quotas') { $context = 'tools'; } else { @@ -6422,6 +6840,8 @@ sub modify_quotas { $confname = $dom.'-domainconfig'; my $servadm = $r->dir_config('lonAdmEMail'); ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); + ($validationitemsref,$validationnamesref,$validationfieldsref) = + &Apache::loncoursequeueadmin::requestcourses_validation_types(); } elsif ($context eq 'requestauthor') { @usertools = ('author'); %titles = &authorrequest_titles(); @@ -6467,28 +6887,35 @@ sub modify_quotas { $confhash{'uniquecode'}{$type} = 1; } } - my ($newbook,@allpos); + my (%newbook,%allpos); if ($context eq 'requestcourses') { - if ($env{'form.addbook'}) { - if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) && - ($env{'form.addbook_cdom'} =~ /^$match_domain$/)) { - if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'}, - $env{'form.addbook_cdom'}) eq 'no_host') { - $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). - '</span></li>'; - } else { - $newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'}; - my $position = $env{'form.addbook_pos'}; - $position =~ s/\D+//g; - if ($position ne '') { - $allpos[$position] = $newbook; + foreach my $type ('textbooks','templates') { + @{$allpos{$type}} = (); + my $invalid; + if ($type eq 'textbooks') { + $invalid = &mt('Invalid LON-CAPA course for textbook'); + } else { + $invalid = &mt('Invalid LON-CAPA course for template'); + } + if ($env{'form.'.$type.'_addbook'}) { + if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) && + ($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) { + if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'}, + $env{'form.'.$type.'_addbook_cdom'}) eq 'no_host') { + $errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; + } else { + $newbook{$type} = $env{'form.'.$type.'_addbook_cdom'}.'_'.$env{'form.'.$type.'_addbook_cnum'}; + my $position = $env{'form.'.$type.'_addbook_pos'}; + $position =~ s/\D+//g; + if ($position ne '') { + $allpos{$type}[$position] = $newbook{$type}; + } } + } else { + $errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; } - } else { - $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). - '</span></li>'; } - } + } } if (ref($domconfig{$action}) eq 'HASH') { if (ref($domconfig{$action}{'notify'}) eq 'HASH') { @@ -6521,56 +6948,61 @@ sub modify_quotas { $changes{'uniquecode'} = 1; } if ($context eq 'requestcourses') { - if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { - my %deletions; - my @todelete = &Apache::loncommon::get_env_multiple('form.book_del'); - if (@todelete) { - map { $deletions{$_} = 1; } @todelete; - } - my %imgdeletions; - my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del'); - if (@todeleteimages) { - map { $imgdeletions{$_} = 1; } @todeleteimages; - } - my $maxnum = $env{'form.book_maxnum'}; - for (my $i=0; $i<=$maxnum; $i++) { - my $key = $env{'form.book_id_'.$i}; - if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') { - if ($deletions{$key}) { - if ($domconfig{$action}{'textbooks'}{$key}{'image'}) { - #FIXME need to obsolete item in RES space + foreach my $type ('textbooks','templates') { + if (ref($domconfig{$action}{$type}) eq 'HASH') { + my %deletions; + my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del'); + if (@todelete) { + map { $deletions{$_} = 1; } @todelete; + } + my %imgdeletions; + my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del'); + if (@todeleteimages) { + map { $imgdeletions{$_} = 1; } @todeleteimages; + } + my $maxnum = $env{'form.'.$type.'_maxnum'}; + for (my $i=0; $i<=$maxnum; $i++) { + my $itemid = $env{'form.'.$type.'_id_'.$i}; + my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); + if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') { + if ($deletions{$key}) { + if ($domconfig{$action}{$type}{$key}{'image'}) { + #FIXME need to obsolete item in RES space + } + next; + } else { + my $newpos = $env{'form.'.$itemid}; + $newpos =~ s/\D+//g; + foreach my $item ('subject','title','publisher','author') { + next if ((($item eq 'author') || ($item eq 'publisher')) && + ($type eq 'templates')); + $confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i}; + if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) { + $changes{$type}{$key} = 1; + } + } + $allpos{$type}[$newpos] = $key; } - next; - } else { - my $newpos = $env{'form.'.$key}; - $newpos =~ s/\D+//g; - foreach my $item ('subject','title','author') { - $confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i}; - if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) { - $changes{'textbooks'}{$key} = 1; + if ($imgdeletions{$key}) { + $changes{$type}{$key} = 1; + #FIXME need to obsolete item in RES space + } elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { + my ($cdom,$cnum) = split(/_/,$key); + my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, + $cdom,$cnum,$type,$configuserok, + $switchserver,$author_ok); + if ($imgurl) { + $confhash{$type}{$key}{'image'} = $imgurl; + $changes{$type}{$key} = 1; } + if ($error) { + &Apache::lonnet::logthis($error); + $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; + } + } elsif ($domconfig{$action}{$type}{$key}{'image'}) { + $confhash{$type}{$key}{'image'} = + $domconfig{$action}{$type}{$key}{'image'}; } - $allpos[$newpos] = $key; - } - if ($imgdeletions{$key}) { - $changes{'textbooks'}{$key} = 1; - #FIXME need to obsolete item in RES space - } elsif ($env{'form.book_image_'.$i.'.filename'}) { - my ($cdom,$cnum) = split(/_/,$key); - my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,'book_image_'.$i, - $cdom,$cnum,$configuserok, - $switchserver,$author_ok); - if ($imgurl) { - $confhash{'textbooks'}{$key}{'image'} = $imgurl; - $changes{'textbooks'}{$key} = 1; - } - if ($error) { - &Apache::lonnet::logthis($error); - $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; - } - } elsif ($domconfig{$action}{'textbooks'}{$key}{'image'}) { - $confhash{'textbooks'}{$key}{'image'} = - $domconfig{$action}{'textbooks'}{$key}{'image'}; } } } @@ -6585,46 +7017,124 @@ sub modify_quotas { } } if ($context eq 'requestcourses') { - if ($newbook) { - $changes{'textbooks'}{$newbook} = 1; - foreach my $item ('subject','title','author') { - $env{'form.addbook_'.$item} =~ s/(`)/'/g; - if ($env{'form.addbook_'.$item}) { - $confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item}; - } - } - if ($env{'form.addbook_image.filename'} ne '') { - my ($cdom,$cnum) = split(/_/,$newbook); - my ($imageurl,$error) = - &process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok, - $switchserver,$author_ok); - if ($imageurl) { - $confhash{'textbooks'}{$newbook}{'image'} = $imageurl; - } - if ($error) { - &Apache::lonnet::logthis($error); - $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; + foreach my $type ('textbooks','templates') { + if ($newbook{$type}) { + $changes{$type}{$newbook{$type}} = 1; + foreach my $item ('subject','title','publisher','author') { + next if ((($item eq 'author') || ($item eq 'publisher')) && + ($type eq 'template')); + $env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g; + if ($env{'form.'.$type.'_addbook_'.$item}) { + $confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item}; + } + } + if ($type eq 'textbooks') { + if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { + my ($cdom,$cnum) = split(/_/,$newbook{$type}); + my ($imageurl,$error) = + &process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, + $configuserok,$switchserver,$author_ok); + if ($imageurl) { + $confhash{$type}{$newbook{$type}}{'image'} = $imageurl; + } + if ($error) { + &Apache::lonnet::logthis($error); + $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; + } + } } } - } - if (@allpos > 0) { - my $idx = 0; - foreach my $item (@allpos) { - if ($item ne '') { - $confhash{'textbooks'}{$item}{'order'} = $idx; - if (ref($domconfig{$action}) eq 'HASH') { - if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { - if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') { - if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) { - $changes{'textbooks'}{$item} = 1; + if (@{$allpos{$type}} > 0) { + my $idx = 0; + foreach my $item (@{$allpos{$type}}) { + if ($item ne '') { + $confhash{$type}{$item}{'order'} = $idx; + if (ref($domconfig{$action}) eq 'HASH') { + if (ref($domconfig{$action}{$type}) eq 'HASH') { + if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') { + if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) { + $changes{$type}{$item} = 1; + } } } } + $idx ++; + } + } + } + } + if (ref($validationitemsref) eq 'ARRAY') { + foreach my $item (@{$validationitemsref}) { + if ($item eq 'fields') { + my @changed; + @{$confhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.requestcourses_validation_'.$item); + if (@{$confhash{'validation'}{$item}} > 0) { + @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}}); + } + if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { + if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { + @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, + $domconfig{'requestcourses'}{'validation'}{$item}); + } else { + @changed = @{$confhash{'validation'}{$item}}; + } + } else { + @changed = @{$confhash{'validation'}{$item}}; + } + if (@changed) { + if ($confhash{'validation'}{$item}) { + $changes{'validation'}{$item} = join(', ',@{$confhash{'validation'}{$item}}); + } else { + $changes{'validation'}{$item} = &mt('None'); + } + } + } else { + $confhash{'validation'}{$item} = $env{'form.requestcourses_validation_'.$item}; + if ($item eq 'markup') { + if ($env{'form.requestcourses_validation_'.$item}) { + $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs; + } + } + if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { + if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { + $changes{'validation'}{$item} = $confhash{'validation'}{$item}; + } + } else { + if ($confhash{'validation'}{$item} ne '') { + $changes{'validation'}{$item} = $confhash{'validation'}{$item}; + } } - $idx ++; } } } + if ($env{'form.validationdc'}) { + my $newval = $env{'form.validationdc'}; + my %domcoords = &get_active_dcs($dom); + if (exists($domcoords{$newval})) { + $confhash{'validation'}{'dc'} = $newval; + } + } + if (ref($confhash{'validation'}) eq 'HASH') { + if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { + if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { + unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { + if ($confhash{'validation'}{'dc'} eq '') { + $changes{'validation'}{'dc'} = &mt('None'); + } else { + $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; + } + } + } elsif ($confhash{'validation'}{'dc'} ne '') { + $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; + } + } elsif ($confhash{'validation'}{'dc'} ne '') { + $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; + } + } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { + if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { + $changes{'validation'}{'dc'} = &mt('None'); + } + } } } else { $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'}; @@ -6766,7 +7276,7 @@ sub modify_quotas { $domdefaults{'requestauthor'} = \%confhash; } else { foreach my $key (keys(%confhash)) { - unless (($context eq 'requestcourses') && ($key eq 'textbooks')) { + unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) { $domdefaults{$key} = $confhash{$key}; } } @@ -6918,27 +7428,53 @@ sub modify_quotas { '</li>'; } } - if (ref($changes{'textbooks'}) eq 'HASH') { - $resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>'; - foreach my $key (sort(keys(%{$changes{'textbooks'}}))) { - my %coursehash = &Apache::lonnet::coursedescription($key); - my $coursetitle = $coursehash{'description'}; - my $position = $confhash{'textbooks'}{$key}{'order'} + 1; - $resulttext .= '<li>'; - foreach my $item ('subject','title','author') { - my $name = $item.':'; - $name =~ s/^(\w)/\U$1/; - $resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />'; - } - $resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; - if ($confhash{'textbooks'}{$key}{'image'}) { - $resulttext .= ' '.&mt('Image: [_1]', - '<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'. - ' alt="Textbook cover" />').'<br />'; + foreach my $type ('textbooks','templates') { + if (ref($changes{$type}) eq 'HASH') { + $resulttext .= '<li>'.&mt("Available $type updated").'<ul>'; + foreach my $key (sort(keys(%{$changes{$type}}))) { + my %coursehash = &Apache::lonnet::coursedescription($key); + my $coursetitle = $coursehash{'description'}; + my $position = $confhash{$type}{$key}{'order'} + 1; + $resulttext .= '<li>'; + foreach my $item ('subject','title','publisher','author') { + next if ((($item eq 'author') || ($item eq 'publisher')) && + ($type eq 'templates')); + my $name = $item.':'; + $name =~ s/^(\w)/\U$1/; + $resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />'; + } + $resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; + if ($type eq 'textbooks') { + if ($confhash{$type}{$key}{'image'}) { + $resulttext .= ' '.&mt('Image: [_1]', + '<img src="'.$confhash{$type}{$key}{'image'}.'"'. + ' alt="Textbook cover" />').'<br />'; + } + } + $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; + } + $resulttext .= '</ul></li>'; + } + } + if (ref($changes{'validation'}) eq 'HASH') { + if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { + $resulttext .= '<li>'.&mt('Validation of courses/communities updated').'<ul>'; + foreach my $item (@{$validationitemsref}) { + if (exists($changes{'validation'}{$item})) { + if ($item eq 'markup') { + $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item}, + '<br /><pre>'.$changes{'validation'}{$item}.'</pre>').'</li>'; + } else { + $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item}, + '<b>'.$changes{'validation'}{$item}.'</b>').'</li>'; + } + } + } + if (exists($changes{'validation'}{'dc'})) { + $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]', + '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>'; } - $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; } - $resulttext .= '</ul></li>'; } } $resulttext .= '</ul>'; @@ -6966,7 +7502,7 @@ sub modify_quotas { } sub process_textbook_image { - my ($r,$dom,$confname,$caller,$cdom,$cnum,$configuserok,$switchserver,$author_ok) = @_; + my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_; my $filename = $env{'form.'.$caller.'.filename'}; my ($error,$url); my ($width,$height) = (50,50); @@ -6977,7 +7513,7 @@ sub process_textbook_image { } elsif ($author_ok eq 'ok') { my ($result,$imageurl) = &publishlogo($r,'upload',$caller,$dom,$confname, - "textbooks/$dom/$cnum/cover",$width,$height); + "$type/$dom/$cnum/cover",$width,$height); if ($result eq 'ok') { $url = $imageurl; } else { @@ -7916,7 +8452,8 @@ sub modify_selfcreation { foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { if (($item eq 'selfcreate') || ($item eq 'statustocreate') || ($item eq 'captcha') || ($item eq 'recaptchakeys') || - ($item eq 'emailusername') || ($item eq 'notify')) { + ($item eq 'emailusername') || ($item eq 'notify') || + ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) { $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; } else { $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; @@ -7947,22 +8484,38 @@ sub modify_selfcreation { @{$cancreate{'selfcreate'}} = (); %{$cancreate{'emailusername'}} = (); @{$cancreate{'statustocreate'}} = (); + %{$cancreate{'selfcreateprocessing'}} = (); + %{$cancreate{'shibenv'}} = (); my %selfcreatetypes = ( sso => 'users authenticated by institutional single sign on', login => 'users authenticated by institutional log-in', - email => 'users who provide a valid e-mail address for use as username (automatic creation)', - emailapproval => 'users who provide a valid e-mail address for use as username (queued for Domain Coordinator review)', + email => 'users who provide a valid e-mail address for use as username', ); # # Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts # is permitted. # + + my @statuses; + if (ref($domconfig{'inststatus'}) eq 'HASH') { + if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') { + @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}}; + } + } + push(@statuses,'default'); + foreach my $item ('login','sso','email') { if ($item eq 'email') { - if ($env{'form.cancreate_email'} eq 'email') { + if ($env{'form.cancreate_email'}) { push(@{$cancreate{'selfcreate'}},'email'); - } elsif ($env{'form.cancreate_email'} eq 'emailapproval') { - push(@{$cancreate{'selfcreate'}},'emailapproval'); + push(@contexts,'selfcreateprocessing'); + foreach my $type (@statuses) { + if ($type eq 'default') { + $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'}; + } else { + $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type}; + } + } } } else { if ($env{'form.cancreate_'.$item}) { @@ -7976,7 +8529,8 @@ sub modify_selfcreation { # Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data # value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. # - if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) { + + if ($env{'form.cancreate_email'}) { push(@contexts,'emailusername'); if (ref($types) eq 'ARRAY') { foreach my $type (@{$types}) { @@ -8036,7 +8590,7 @@ sub modify_selfcreation { } } # -# Check if domain default is set appropriately, if selef-creation of accounts is to be available for +# Check if domain default is set appropriately, if self-creation of accounts is to be available for # institutional log-in. # if (grep(/^login$/,@{$cancreate{'selfcreate'}})) { @@ -8049,6 +8603,7 @@ sub modify_selfcreation { } my @fields = ('lastname','firstname','middlename','generation', 'permanentemail','id'); + my @shibfields = (@fields,'inststatus'); my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); # # Where usernames may created for institutional log-in and/or institutional single sign on: @@ -8093,6 +8648,27 @@ sub modify_selfcreation { } } } + foreach my $field (@shibfields) { + if ($env{'form.shibenv_'.$field} ne '') { + $cancreate{'shibenv'}{$field} = $env{'form.shibenv_'.$field}; + } + } + if (ref($curr_usercreation{'cancreate'}) eq 'HASH') { + if (ref($curr_usercreation{'cancreate'}{'shibenv'}) eq 'HASH') { + foreach my $field (@shibfields) { + if ($env{'form.shibenv_'.$field} ne $curr_usercreation{'cancreate'}{'shibenv'}{$field}) { + push(@{$changes{'cancreate'}},'shibenv'); + } + } + } else { + foreach my $field (@shibfields) { + if ($env{'form.shibenv_'.$field}) { + push(@{$changes{'cancreate'}},'shibenv'); + last; + } + } + } + } } foreach my $item (@contexts) { if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { @@ -8125,6 +8701,12 @@ sub modify_selfcreation { } } } + } elsif ($item eq 'selfcreateprocessing') { + if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) { + if (!grep(/^$item$/,@{$changes{'cancreate'}})) { + push(@{$changes{'cancreate'}},$item); + } + } } else { if (!$cancreate{$item}{$curr}) { if (!grep(/^$item$/,@{$changes{'cancreate'}})) { @@ -8148,6 +8730,12 @@ sub modify_selfcreation { } } } + } elsif ($item eq 'selfcreateprocessing') { + if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) { + if (!grep(/^$item$/,@{$changes{'cancreate'}})) { + push(@{$changes{'cancreate'}},$item); + } + } } else { if (!$curr_usercreation{'cancreate'}{$item}{$field}) { if (!grep(/^$item$/,@{$changes{'cancreate'}})) { @@ -8197,9 +8785,15 @@ sub modify_selfcreation { if (ref($cancreate{'notify'}) eq 'HASH') { $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'}; } + if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') { + $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'}; + } if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { $save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'}; } + if (ref($cancreate{'shibenv'}) eq 'HASH') { + $save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; + } $save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; $save_usercreate{'emailrule'} = \@email_rule; @@ -8242,6 +8836,22 @@ sub modify_selfcreation { } } } + } elsif ($type eq 'shibenv') { + if (keys(%{$cancreate{$type}}) == 0) { + $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information'); + } else { + $chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:'). + '<ul>'; + foreach my $field (@shibfields) { + next if ($cancreate{$type}{$field} eq ''); + if ($field eq 'inststatus') { + $chgtext .= '<li>'.&mt('Institutional status').' -- '.$cancreate{$type}{$field}.'</li>'; + } else { + $chgtext .= '<li>'.$fieldtitles{$field}.' -- '.$cancreate{$type}{$field}.'</li>'; + } + } + $chgtext .= '</ul>'; + } } elsif ($type eq 'statustocreate') { if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && (ref($cancreate{'statustocreate'}) eq 'ARRAY')) { @@ -8283,6 +8893,26 @@ sub modify_selfcreation { } } } + } elsif ($type eq 'selfcreateprocessing') { + my %choices = &Apache::lonlocal::texthash ( + automatic => 'Automatic approval', + approval => 'Queued for approval', + ); + if (@statuses > 1) { + $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:'). + '<ul>'; + foreach my $type (@statuses) { + if ($type eq 'default') { + $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>'; + } else { + $chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>'; + } + } + $chgtext .= '</ul>'; + } else { + $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"', + $choices{$cancreate{'selfcreateprocessing'}{'default'}}); + } } elsif ($type eq 'captcha') { if ($savecaptcha{$type} eq 'notused') { $chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.'); @@ -8318,17 +8948,19 @@ sub modify_selfcreation { foreach my $type (@{$types}) { if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { - $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',$usertypes->{$type}). + $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'"). '<ul>'; foreach my $field (@{$infofields}) { if ($cancreate{'emailusername'}{$type}{$field}) { $chgtext .= '<li>'.$infotitles->{$field}.'</li>'; } } + $chgtext .= '</ul>'; + } else { + $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; } - $chgtext .= '</ul>'; } else { - $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',$usertypes->{$type}).'<br />'; + $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; } } } @@ -8626,6 +9258,103 @@ sub modify_defaults { defaults => \%newvalues, ); my $title = &defaults_titles(); + + my $currinststatus; + if (ref($domconfig{'inststatus'}) eq 'HASH') { + $currinststatus = $domconfig{'inststatus'}; + } else { + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); + $currinststatus = { + inststatustypes => $usertypes, + inststatusorder => $types, + inststatusguest => [], + }; + } + my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete'); + my @allpos; + my %guests; + my %alltypes; + my ($currtitles,$currguests,$currorder); + if (ref($currinststatus) eq 'HASH') { + if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') { + foreach my $type (@{$currinststatus->{'inststatusorder'}}) { + if (ref($currinststatus->{inststatustypes}) eq 'HASH') { + if ($currinststatus->{inststatustypes}->{$type} ne '') { + $currtitles .= $currinststatus->{inststatustypes}->{$type}.','; + } + } + unless (grep(/^\Q$type\E$/,@todelete)) { + my $position = $env{'form.inststatus_pos_'.$type}; + $position =~ s/\D+//g; + $allpos[$position] = $type; + $alltypes{$type} = $env{'form.inststatus_title_'.$type}; + $alltypes{$type} =~ s/`//g; + if ($env{'form.inststatus_guest_'.$type}) { + $guests{$type} = 1; + } + } + } + if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') { + $currguests = join(',',@{$currinststatus->{'inststatusguest'}}); + } + $currorder = join(',',@{$currinststatus->{'inststatusorder'}}); + $currtitles =~ s/,$//; + } + } + if ($env{'form.addinststatus'}) { + my $newtype = $env{'form.addinststatus'}; + $newtype =~ s/\W//g; + unless (exists($alltypes{$newtype})) { + if ($env{'form.addinststatus_guest'}) { + $guests{$newtype} = 1; + } + $alltypes{$newtype} = $env{'form.addinststatus_title'}; + $alltypes{$newtype} =~ s/`//g; + my $position = $env{'form.addinststatus_pos'}; + $position =~ s/\D+//g; + if ($position ne '') { + $allpos[$position] = $newtype; + } + } + } + my (@orderedstatus,@orderedguests); + foreach my $type (@allpos) { + unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) { + push(@orderedstatus,$type); + if ($guests{$type}) { + push(@orderedguests,$type); + } + } + } + foreach my $type (keys(%alltypes)) { + unless (grep(/^\Q$type\E$/,@orderedstatus)) { + delete($alltypes{$type}); + } + } + $defaults_hash{'inststatus'} = { + inststatustypes => \%alltypes, + inststatusorder => \@orderedstatus, + inststatusguest => \@orderedguests, + }; + if (ref($defaults_hash{'inststatus'}) eq 'HASH') { + foreach my $item ('inststatustypes','inststatusorder','inststatusguest') { + $domdefaults{$item} = $defaults_hash{'inststatus'}{$item}; + } + } + if ($currorder ne join(',',@orderedstatus)) { + $changes{'inststatus'}{'inststatusorder'} = 1; + } + if ($currguests ne join(',',@orderedguests)) { + $changes{'inststatus'}{'inststatusguest'} = 1; + } + my $newtitles; + foreach my $item (@orderedstatus) { + $newtitles .= $alltypes{$item}.','; + } + $newtitles =~ s/,$//; + if ($currtitles ne $newtitles) { + $changes{'inststatus'}{'inststatustypes'} = 1; + } my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash, $dom); if ($putresult eq 'ok') { @@ -8634,21 +9363,47 @@ sub modify_defaults { my $version = &Apache::lonnet::get_server_loncaparev($dom); my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n"; foreach my $item (sort(keys(%changes))) { - my $value = $env{'form.'.$item}; - if ($value eq '') { - $value = &mt('none'); - } elsif ($item eq 'auth_def') { - my %authnames = &authtype_names(); - my %shortauth = ( - internal => 'int', - krb4 => 'krb4', - krb5 => 'krb5', - localauth => 'loc', - ); - $value = $authnames{$shortauth{$value}}; + if ($item eq 'inststatus') { + if (ref($changes{'inststatus'}) eq 'HASH') { + if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) { + $resulttext .= '<li>'.&mt('Institutional user status types set to:').' '; + foreach my $type (@orderedstatus) { + $resulttext .= $alltypes{$type}.', '; + } + $resulttext =~ s/, $//; + $resulttext .= '</li>'; + } + if ($changes{'inststatus'}{'inststatusguest'}) { + $resulttext .= '<li>'; + if (@orderedguests) { + $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' '; + foreach my $type (@orderedguests) { + $resulttext .= $alltypes{$type}.', '; + } + $resulttext =~ s/, $//; + } else { + $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.'); + } + $resulttext .= '</li>'; + } + } + } else { + my $value = $env{'form.'.$item}; + if ($value eq '') { + $value = &mt('none'); + } elsif ($item eq 'auth_def') { + my %authnames = &authtype_names(); + my %shortauth = ( + internal => 'int', + krb4 => 'krb4', + krb5 => 'krb5', + localauth => 'loc', + ); + $value = $authnames{$shortauth{$value}}; + } + $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; + $mailmsgtext .= "$title->{$item} set to $value\n"; } - $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; - $mailmsgtext .= "$title->{$item} set to $value\n"; } $resulttext .= '</ul>'; $mailmsgtext .= "\n"; @@ -8770,10 +9525,12 @@ sub modify_scantron { } sub modify_coursecategories { - my ($dom,%domconfig) = @_; + my ($dom,$lastactref,%domconfig) = @_; my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors, $cathash); my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory'); + my @catitems = ('unauth','auth'); + my @cattypes = ('std','domonly','codesrch','none'); if (ref($domconfig{'coursecategories'}) eq 'HASH') { $cathash = $domconfig{'coursecategories'}{'cats'}; if ($domconfig{'coursecategories'}{'togglecats'} ne $env{'form.togglecats'}) { @@ -8792,6 +9549,14 @@ sub modify_coursecategories { $changes{'categorizecomm'} = 1; $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; } + foreach my $item (@catitems) { + if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { + if ($domconfig{'coursecategories'}{$item} ne $env{'form.coursecat_'.$item}) { + $changes{$item} = 1; + $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item}; + } + } + } } else { $changes{'togglecats'} = 1; $changes{'categorize'} = 1; @@ -8803,6 +9568,14 @@ sub modify_coursecategories { togglecatscomm => $env{'form.togglecatscomm'}, categorizecomm => $env{'form.categorizecomm'}, }; + foreach my $item (@catitems) { + if ($env{'form.coursecat_'.$item} ne 'std') { + $changes{$item} = 1; + } + if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { + $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item}; + } + } } if (ref($cathash) eq 'HASH') { if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) { @@ -8925,6 +9698,10 @@ sub modify_coursecategories { dom => 'set in Domain ("Modify Course/Community")', crs => 'set in Course ("Course Configuration")', comm => 'set in Community ("Community Configuration")', + none => 'No catalog', + std => 'Standard catalog', + domonly => 'Domain-only catalog', + codesrch => 'Code search form', ); $resulttext = &mt('Changes made:').'<ul>'; if ($changes{'togglecats'}) { @@ -8939,6 +9716,12 @@ sub modify_coursecategories { if ($changes{'categorizecomm'}) { $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>'; } + if ($changes{'unauth'}) { + $resulttext .= '<li>'.&mt('Catalog type for unauthenticated users set to "'.$level{$env{'form.coursecat_unauth'}}.'"').'</li>'; + } + if ($changes{'auth'}) { + $resulttext .= '<li>'.&mt('Catalog type for authenticated users set to "'.$level{$env{'form.coursecat_auth'}}.'"').'</li>'; + } if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) { my $cathash; if (ref($domconfig{'coursecategories'}) eq 'HASH') { @@ -8983,6 +9766,12 @@ sub modify_coursecategories { } } $resulttext .= '</ul>'; + if ($changes{'unauth'} || $changes{'auth'}) { + &Apache::loncommon::devalidate_domconfig_cache($dom); + if (ref($lastactref) eq 'HASH') { + $lastactref->{'domainconfig'} = 1; + } + } } else { $resulttext = '<span class="LC_error">'. &mt('An error occurred: [_1]',$putresult).'</span>'; @@ -10125,7 +10914,7 @@ sub get_active_dcs { sub active_dc_picker { my ($dom,$numinrow,$inputtype,$name,%currhash) = @_; - my %domcoords = &get_active_dcs($dom); + my %domcoords = &get_active_dcs($dom); my @domcoord = keys(%domcoords); if (keys(%currhash)) { foreach my $dc (keys(%currhash)) { @@ -10734,27 +11523,30 @@ END } -sub credits_js { +sub toggle_display_js { return <<"END"; <script type="text/javascript"> // <![CDATA[ -function toggleCredits(domForm) { - if (document.getElementById('credits')) { - creditsitem = document.getElementById('credits'); - var creditsLength = domForm.coursecredits.length; - if (creditsLength) { +function toggleDisplay(domForm,caller) { + if (document.getElementById(caller)) { + var divitem = document.getElementById(caller); + var optionsElement = domForm.coursecredits; + if (caller == 'emailoptions') { + optionsElement = domForm.cancreate_email; + } + if (optionsElement.length) { var currval; - for (var i=0; i<creditsLength; i++) { - if (domForm.coursecredits[i].checked) { - currval = domForm.coursecredits[i].value; + for (var i=0; i<optionsElement.length; i++) { + if (optionsElement[i].checked) { + currval = optionsElement[i].value; } } if (currval == 1) { - creditsitem.style.display = 'block'; + divitem.style.display = 'block'; } else { - creditsitem.style.display = 'none'; + divitem.style.display = 'none'; } } }