--- loncom/interface/domainprefs.pm 2014/04/23 11:08:55 1.160.6.40 +++ loncom/interface/domainprefs.pm 2014/04/16 13:32:43 1.235 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.160.6.40 2014/04/23 11:08:55 raeburn Exp $ +# $Id: domainprefs.pm,v 1.235 2014/04/16 13:32:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -213,15 +213,15 @@ sub handler { 'quotas','autoenroll','autoupdate','autocreate', 'directorysrch','usercreation','usermodification', 'contacts','defaults','scantron','coursecategories', - 'serverstatuses','requestcourses','coursedefaults', - 'usersessions','loadbalancing','requestauthor', - 'selfenrollment','inststatus'],$dom); + 'serverstatuses','requestcourses','helpsettings', + 'coursedefaults','usersessions','loadbalancing', + 'requestauthor','selfenrollment'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', 'autoupdate','autocreate','directorysrch','contacts', 'usercreation','selfcreation','usermodification','scantron', 'requestcourses','requestauthor','coursecategories', - 'serverstatuses',coursedefaults','selfenrollment', - 'usersessions'); + 'serverstatuses','helpsettings', + 'coursedefaults','selfenrollment','usersessions'); my %existing; if (ref($domconfig{'loadbalancing'}) eq 'HASH') { %existing = %{$domconfig{'loadbalancing'}}; @@ -255,12 +255,10 @@ sub handler { modify => \&modify_login, }, 'defaults' => - { text => 'Default authentication/language/timezone/portal/types', + { text => 'Default authentication/language/timezone/portal', help => 'Domain_Configuration_LangTZAuth', header => [{col1 => 'Setting', - col2 => 'Value'}, - {col1 => 'Institutional user types', - col2 => 'Assignable to e-mail usernames'}], + col2 => 'Value'}], print => \&print_defaults, modify => \&modify_defaults, }, @@ -405,6 +403,14 @@ sub handler { print => \&print_serverstatuses, modify => \&modify_serverstatuses, }, + 'helpsettings' => + {text => 'Help page settings', + help => 'Domain_Configuration_Help_Settings', + header => [{col1 => 'Help Settings (logged-in users)', + col2 => 'Value'}], + print => \&print_helpsettings, + modify => \&modify_helpsettings, + }, 'coursedefaults' => {text => 'Course/Community defaults', help => 'Domain_Configuration_Course_Defaults', @@ -427,6 +433,14 @@ sub handler { print => \&print_selfenrollment, modify => \&modify_selfenrollment, }, + 'privacy' => + {text => 'User Privacy', + help => 'Domain_Configuration_User_Privacy', + header => [{col1 => 'Setting', + col2 => 'Value',}], + print => \&print_privacy, + modify => \&modify_privacy, + }, 'usersessions' => {text => 'User session hosting/offloading', help => 'Domain_Configuration_User_Sessions', @@ -481,7 +495,7 @@ sub handler { } } elsif ($phase eq 'display') { my $js = &recaptcha_js(). - &toggle_display_js(); + &credits_js(); if ((keys(%servers) > 1) || (keys(%existing) > 0)) { my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); @@ -611,6 +625,8 @@ sub process_changes { $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); } elsif ($action eq 'requestauthor') { $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); + } elsif ($action eq 'helpsettings') { + $output = &modify_helpsettings($r,$dom,$confname,%domconfig); } elsif ($action eq 'coursedefaults') { $output = &modify_coursedefaults($dom,$lastactref,%domconfig); } elsif ($action eq 'selfenrollment') { @@ -629,10 +645,8 @@ sub print_config_box { my $output; if ($action eq 'coursecategories') { $output = &coursecategories_javascript($settings); - } elsif ($action eq 'defaults') { - $output = &defaults_javascript($settings); } - $output .= + $output .= ''; $rowtotal ++; if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || - ($action eq 'usermodification') || ($action eq 'defaults') || + ($action eq 'usermodification') || ($action eq 'coursedefaults') || ($action eq 'selfenrollment') || ($action eq 'usersessions')) { $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); } elsif ($action eq 'coursecategories') { @@ -709,8 +723,7 @@ sub print_config_box { '."\n". $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); $rowtotal ++; - } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || - ($action eq 'defaults')) { + } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) { $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); } elsif ($action eq 'coursecategories') { $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); @@ -836,7 +849,8 @@ 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 'serverstatuses') || ($action eq 'loadbalancing')) { + ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') || + ($action eq 'loadbalancing')) { $output .= $item->{'print'}->($dom,$settings,\$rowtotal); } elsif ($action eq 'scantron') { $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); @@ -2085,7 +2099,7 @@ sub print_textbookcourses { } my $confname = $dom.'-domainconfig'; my $switchserver = &check_switchserver($dom,$confname); - $maxnum = scalar(keys(%ordered)); + my $maxnum = scalar(keys(%ordered)); my $datatable = &textbookcourses_javascript(\%ordered); if (keys(%ordered)) { my @items = sort { $a <=> $b } keys(%ordered); @@ -2204,6 +2218,7 @@ $jstext var newpos = 'addbook_pos'; var current = new Array; var maxh = 1 + $num; + var current = new Array; var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; if (item == newpos) { changedVal = newitemVal; @@ -2797,7 +2812,7 @@ sub print_coursedefaults { } $datatable .= '
'. @@ -647,7 +661,7 @@ sub print_config_box { if ($numheaders > 1) { my $colspan = ''; my $rightcolspan = ''; - if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'defaults') || + if (($action eq 'rolecolors') || ($action eq 'coursecategories') || (($action eq 'login') && ($numheaders < 3))) { $colspan = ' colspan="2"'; } @@ -664,7 +678,7 @@ sub print_config_box {
'."\n"; $itemcount ++; - my $onclick = "toggleDisplay(this.form,'credits');"; + my $onclick = 'toggleCredits(this.form);'; my $display = 'none'; if ($currusecredits) { $display = 'block'; @@ -4005,22 +4020,17 @@ sub print_usercreation { sub print_selfcreation { my ($position,$dom,$settings,$rowtotal) = @_; - my (@selfcreate,$createsettings,$processing,$datatable); + my (@selfcreate,$createsettings,$datatable); if (ref($settings) eq 'HASH') { if (ref($settings->{'cancreate'}) eq 'HASH') { $createsettings = $settings->{'cancreate'}; - 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'}; + 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'}); } } } @@ -4063,60 +4073,53 @@ sub print_selfcreation { foreach my $status (@{$types}) { $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, $numinrow,$$rowtotal,$usertypes); - $$rowtotal ++; + $$rowtotal ++; } } } else { - 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 = '
'; - 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 .= ''; - foreach my $status (@{$order}) { - $additional .= ''; - } - $additional .= ''; - foreach my $status (@{$order}) { - $additional .= ''; + 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 .= ''. + '
'.$usertypes->{$status}.'
'.&email_as_username($rowtotal,$processing,$status).''.&mt('E-mail address as username'). + ''. + ''; + 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"'; } - $additional .= '
'; } else { - $usertypes->{'default'} = &mt('All users'); - $additional .= &email_as_username($rowtotal,$processing); + if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) { + $checked = 'checked="checked"'; + } } + $datatable .= ' '; } - $additional .= '
'."\n"; - - ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, - \%choices,$itemcount,$onclick,$additional); - $$rowtotal += $itemcount; - $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); + $$rowtotal ++; + $datatable .= ''. + &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); $$rowtotal ++; my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); $numinrow = 1; - if (ref($order) eq 'ARRAY') { - foreach my $status (@{$order}) { + 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}) { $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); $$rowtotal ++; @@ -4136,59 +4139,6 @@ 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 .= ''; - if ($type eq '') { - $output .= ' '; - } else { - $output .= '
'; - } - } - $$rowtotal ++; - return $output; -} - sub captcha_choice { my ($context,$settings,$itemcount) = @_; my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); @@ -4375,143 +4325,70 @@ sub print_usermodification { } sub print_defaults { - my ($position,$dom,$settings,$rowtotal) = @_; + 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 $rownum = 0; my ($datatable,$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}; + foreach my $item (@items) { + if ($rownum%2) { + $css_class = ''; } else { - my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); - foreach my $item (@items) { - $defaults{$item} = $domdefaults{$item}; - } + $css_class = ' class="LC_odd_row" '; } - my $titles = &defaults_titles($dom); - foreach my $item (@items) { - if ($rownum%2) { - $css_class = ''; - } else { - $css_class = ' class="LC_odd_row" '; - } - $datatable .= ''. - ''.$titles->{$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 .= '  '; - } - } 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 .= ''; + $datatable .= ''. + ''.$titles->{$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 .= '  '; } - $datatable .= ''; - $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 .= ''. - ''. - ' '.&mt('Internal ID:').' '.$item.' '. - ''. - &mt('delete').''. - ''.&mt('Name displayed:'). - ''. - ''. - ''. - ''.(' 'x2). - ''; - } - $css_class = $rownum%2?' class="LC_odd_row"':''; - my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"'; - $datatable .= ''. - ' '.&mt('Internal ID:'). - ''. - ' '.&mt('(new)'). - ''. - &mt('Name displayed:'). - ''. - ''. - ''.(' 'x2). - ''; - ''."\n"; - $rownum ++; + } 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 .= ''; } + $datatable .= ''; + $rownum ++; } $$rowtotal += $rownum; return $datatable; @@ -4995,69 +4872,6 @@ 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"; - - -ENDSCRIPT - } -} - sub coursecategories_javascript { my ($settings) = @_; my ($output,$jstext,$cathash); @@ -5090,6 +4904,7 @@ 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; @@ -8264,8 +8079,7 @@ 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 'selfcreateprocessing')) { + ($item eq 'emailusername') || ($item eq 'notify')) { $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; } else { $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; @@ -8296,37 +8110,22 @@ sub modify_selfcreation { @{$cancreate{'selfcreate'}} = (); %{$cancreate{'emailusername'}} = (); @{$cancreate{'statustocreate'}} = (); - %{$cancreate{'selfcreateprocessing'}} = (); 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', + 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)', ); # # 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'}) { + if ($env{'form.cancreate_email'} eq 'email') { push(@{$cancreate{'selfcreate'}},'email'); - 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}; - } - } + } elsif ($env{'form.cancreate_email'} eq 'emailapproval') { + push(@{$cancreate{'selfcreate'}},'emailapproval'); } } else { if ($env{'form.cancreate_'.$item}) { @@ -8340,8 +8139,7 @@ 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') { + if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) { push(@contexts,'emailusername'); if (ref($types) eq 'ARRAY') { foreach my $type (@{$types}) { @@ -8401,7 +8199,7 @@ sub modify_selfcreation { } } # -# Check if domain default is set appropriately, if self-creation of accounts is to be available for +# Check if domain default is set appropriately, if selef-creation of accounts is to be available for # institutional log-in. # if (grep(/^login$/,@{$cancreate{'selfcreate'}})) { @@ -8490,12 +8288,6 @@ 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'}})) { @@ -8519,12 +8311,6 @@ 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'}})) { @@ -8574,9 +8360,6 @@ 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'}; } @@ -8663,26 +8446,6 @@ 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:'). - '
    '; - foreach my $type (@statuses) { - if ($type eq 'default') { - $chgtext .= '
  • '.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
    • '; - } else { - $chgtext .= '
  • '.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
    • '; - } - } - $chgtext .= '
'; - } 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.'); @@ -9026,103 +8789,6 @@ 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') { @@ -9131,47 +8797,21 @@ 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))) { - if ($item eq 'inststatus') { - if (ref($changes{'inststatus'}) eq 'HASH') { - if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) { - $resulttext .= '
  • '.&mt('Institutional user status types set to:').' '; - foreach my $type (@orderedstatus) { - $resulttext .= $alltypes{$type}.', '; - } - $resulttext =~ s/, $//; - $resulttext .= '
    • '; - } - if ($changes{'inststatus'}{'inststatusguest'}) { - $resulttext .= '
  • '; - 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 .= '
    • '; - } - } - } 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 .= '
  • '.&mt('[_1] set to "[_2]"',$title->{$item},$value).'
    • '; - $mailmsgtext .= "$title->{$item} set to $value\n"; + 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 .= '
  • '.&mt('[_1] set to "[_2]"',$title->{$item},$value).'
    • '; + $mailmsgtext .= "$title->{$item} set to $value\n"; } $resulttext .= ''; $mailmsgtext .= "\n"; @@ -11257,30 +10897,27 @@ END } -sub toggle_display_js { +sub credits_js { return <<"END";