version 1.160.6.6, 2012/09/25 20:38:47
|
version 1.167, 2012/08/25 22:55:00
|
Line 86 $dom,$settings,$rowtotal,$action.
|
Line 86 $dom,$settings,$rowtotal,$action.
|
|
|
$dom is the domain, $settings is a reference to a hash of current settings for |
$dom is the domain, $settings is a reference to a hash of current settings for |
the current context, $rowtotal is a reference to the scalar used to record the |
the current context, $rowtotal is a reference to the scalar used to record the |
number of rows displayed on the page, and $action is the context (quotas, |
number of rows displayed on the page, and $action is the context (quotas, |
requestcourses or requestauthor). |
requestcourses or requestauthor). |
|
|
The print_quotas routine was orginally created to display/store information |
The print_quotas routine was orginally created to display/store information |
Line 210 sub handler {
|
Line 210 sub handler {
|
'quotas','autoenroll','autoupdate','autocreate', |
'quotas','autoenroll','autoupdate','autocreate', |
'directorysrch','usercreation','usermodification', |
'directorysrch','usercreation','usermodification', |
'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
'serverstatuses','requestcourses','usersessions', |
'serverstatuses','requestcourses','helpsettings', |
'loadbalancing','requestauthor'],$dom); |
'coursedefaults','usersessions','loadbalancing', |
|
'requestauthor'],$dom); |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','usermodification','scantron', |
'usercreation','usermodification','scantron', |
'requestcourses','requestauthor','coursecategories', |
'requestcourses','requestauthor','coursecategories', |
'serverstatuses','usersessions'); |
'serverstatuses','helpsettings', |
|
'coursedefaults','usersessions'); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
push(@prefs_order,'loadbalancing'); |
push(@prefs_order,'loadbalancing'); |
} |
} |
Line 236 sub handler {
|
Line 238 sub handler {
|
'login' => |
'login' => |
{ text => 'Log-in page options', |
{ text => 'Log-in page options', |
help => 'Domain_Configuration_Login_Page', |
help => 'Domain_Configuration_Login_Page', |
header => [{col1 => 'Log-in Page Items', |
header => [{col1 => 'Item', |
col2 => '',}, |
col2 => '',}], |
{col1 => 'Log-in Help', |
|
col2 => 'Value'}], |
|
}, |
}, |
|
|
'defaults' => |
'defaults' => |
{ text => 'Default authentication/language/timezone/portal', |
{ text => 'Default authentication/language/timezone/portal', |
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
Line 349 sub handler {
|
Line 350 sub handler {
|
col3 => 'Specific IPs', |
col3 => 'Specific IPs', |
}], |
}], |
}, |
}, |
|
'helpsettings' => |
|
{text => 'Help page settings', |
|
help => 'Domain_Configuration_Help_Settings', |
|
header => [{col1 => 'Help Settings (logged-in users)', |
|
col2 => 'Value'}, |
|
{col1 => 'Help Settings (before log-in)', |
|
col2 => 'Value'}], |
|
}, |
|
'coursedefaults' => |
|
{text => 'Course/Community defaults', |
|
help => 'Domain_Configuration_Course_Defaults', |
|
header => [{col1 => 'Defaults which can be overridden in each course by a CC', |
|
col2 => 'Value',}, |
|
{col1 => 'Defaults which can be overridden for each course by a DC', |
|
col2 => 'Value',},], |
|
}, |
|
'privacy' => |
|
{text => 'User Privacy', |
|
help => 'Domain_Configuration_User_Privacy', |
|
header => [{col1 => 'Setting', |
|
col2 => 'Value',}], |
|
}, |
'usersessions' => |
'usersessions' => |
{text => 'User session hosting/offloading', |
{text => 'User session hosting/offloading', |
help => 'Domain_Configuration_User_Sessions', |
help => 'Domain_Configuration_User_Sessions', |
Line 375 sub handler {
|
Line 398 sub handler {
|
header => [{col1 => 'Log-in Service', |
header => [{col1 => 'Log-in Service', |
col2 => 'Server Setting',}, |
col2 => 'Server Setting',}, |
{col1 => 'Log-in Page Items', |
{col1 => 'Log-in Page Items', |
col2 => ''}, |
col2 => ''}], |
{col1 => 'Log-in Help', |
|
col2 => 'Value'}], |
|
}; |
}; |
} |
} |
my @roles = ('student','coordinator','author','admin'); |
my @roles = ('student','coordinator','author','admin'); |
Line 393 sub handler {
|
Line 414 sub handler {
|
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
$js .= &lonbalance_targets_js($dom,$types,\%servers). |
$js = &lonbalance_targets_js($dom,$types,\%servers). |
&new_spares_js(). |
&new_spares_js(). |
&common_domprefs_js(). |
&common_domprefs_js(). |
&Apache::loncommon::javascript_array_indexof(); |
&Apache::loncommon::javascript_array_indexof(); |
} |
} |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
} else { |
} else { |
Line 478 sub process_changes {
|
Line 499 sub process_changes {
|
$output = &modify_quotas($dom,$action,%domconfig); |
$output = &modify_quotas($dom,$action,%domconfig); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output = &modify_quotas($dom,$action,%domconfig); |
$output = &modify_quotas($dom,$action,%domconfig); |
|
} elsif ($action eq 'helpsettings') { |
|
$output = &modify_helpsettings($r,$dom,$confname,%domconfig); |
|
} elsif ($action eq 'coursedefaults') { |
|
$output = &modify_coursedefaults($dom,%domconfig); |
} elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
$output = &modify_usersessions($dom,%domconfig); |
$output = &modify_usersessions($dom,%domconfig); |
} elsif ($action eq 'loadbalancing') { |
} elsif ($action eq 'loadbalancing') { |
Line 508 sub print_config_box {
|
Line 533 sub print_config_box {
|
if ($numheaders > 1) { |
if ($numheaders > 1) { |
my $colspan = ''; |
my $colspan = ''; |
my $rightcolspan = ''; |
my $rightcolspan = ''; |
if (($action eq 'rolecolors') || ($action eq 'coursecategories') || |
if (($action eq 'rolecolors') || ($action eq 'coursecategories')) { |
(($action eq 'login') && ($numheaders < 3))) { |
|
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
Line 533 sub print_config_box {
|
Line 557 sub print_config_box {
|
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 3) { |
$output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
|
} else { |
|
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal); |
|
} |
|
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
|
} elsif ($action eq 'helpsettings') { |
|
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
$output .= &print_usersessions('top',$dom,$settings,\$rowtotal); |
$output .= &print_usersessions('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'coursedefaults') { |
|
$output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal); |
} |
} |
$output .= ' |
$output .= ' |
</table> |
</table> |
Line 603 sub print_config_box {
|
Line 627 sub print_config_box {
|
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 3) { |
$output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('page',$dom,$confname,$phase,$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'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
|
&print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
|
$rowtotal ++; |
|
} else { |
|
$output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
|
} |
|
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
|
} elsif ($action eq 'helpsettings') { |
|
$output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
$output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).' |
$output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).' |
</table> |
</table> |
Line 714 sub print_config_box {
|
Line 725 sub print_config_box {
|
} |
} |
$output .= '</tr>'; |
$output .= '</tr>'; |
$rowtotal ++; |
$rowtotal ++; |
if ($action eq 'quotas') { |
if ($action eq 'login') { |
|
$output .= &print_login('bottom',$dom,$confname,$phase,$settings, |
|
\$rowtotal); |
|
} elsif ($action eq 'quotas') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'autoenroll') { |
} elsif ($action eq 'autoenroll') { |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
Line 731 sub print_config_box {
|
Line 745 sub print_config_box {
|
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'helpsettings') { |
$output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal); |
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'loadbalancing') { |
} elsif ($action eq 'loadbalancing') { |
$output .= &print_loadbalancing($dom,$settings,\$rowtotal); |
$output .= &print_loadbalancing($dom,$settings,\$rowtotal); |
} |
} |
Line 745 sub print_config_box {
|
Line 759 sub print_config_box {
|
} |
} |
|
|
sub print_login { |
sub print_login { |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
|
|
if ($caller eq 'service') { |
if ($position eq 'top') { |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
$css_class = ' class="LC_odd_row"'; |
$css_class = ' class="LC_odd_row"'; |
Line 816 sub print_login {
|
Line 830 sub print_login {
|
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
return $datatable; |
return $datatable; |
} elsif ($caller eq 'page') { |
} |
my %defaultchecked = ( |
|
'coursecatalog' => 'on', |
my %defaultchecked = ( |
'adminmail' => 'off', |
'coursecatalog' => 'on', |
'newuser' => 'off', |
'adminmail' => 'off', |
); |
'newuser' => 'off', |
my @toggles = ('coursecatalog','adminmail','newuser'); |
); |
my (%checkedon,%checkedoff); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
|
my (%checkedon,%checkedoff); |
|
foreach my $item (@toggles) { |
|
if ($defaultchecked{$item} eq 'on') { |
|
$checkedon{$item} = ' checked="checked" '; |
|
$checkedoff{$item} = ' '; |
|
} elsif ($defaultchecked{$item} eq 'off') { |
|
$checkedoff{$item} = ' checked="checked" '; |
|
$checkedon{$item} = ' '; |
|
} |
|
} |
|
my @images = ('img','logo','domlogo','login'); |
|
my @logintext = ('textcol','bgcol'); |
|
my @bgs = ('pgbg','mainbg','sidebg'); |
|
my @links = ('link','alink','vlink'); |
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
|
my %defaultdesign = %Apache::loncommon::defaultdesign; |
|
my (%is_custom,%designs); |
|
my %defaults = ( |
|
font => $defaultdesign{'login.font'}, |
|
); |
|
foreach my $item (@images) { |
|
$defaults{$item} = $defaultdesign{'login.'.$item}; |
|
$defaults{'showlogo'}{$item} = 1; |
|
} |
|
foreach my $item (@bgs) { |
|
$defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
foreach my $item (@logintext) { |
|
$defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
foreach my $item (@links) { |
|
$defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
if (ref($settings) eq 'HASH') { |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($defaultchecked{$item} eq 'on') { |
if ($settings->{$item} eq '1') { |
$checkedon{$item} = ' checked="checked" '; |
$checkedon{$item} = ' checked="checked" '; |
$checkedoff{$item} = ' '; |
$checkedoff{$item} = ' '; |
} elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($settings->{$item} eq '0') { |
$checkedoff{$item} = ' checked="checked" '; |
$checkedoff{$item} = ' checked="checked" '; |
$checkedon{$item} = ' '; |
$checkedon{$item} = ' '; |
} |
} |
} |
} |
my @images = ('img','logo','domlogo','login'); |
|
my @logintext = ('textcol','bgcol'); |
|
my @bgs = ('pgbg','mainbg','sidebg'); |
|
my @links = ('link','alink','vlink'); |
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
|
my %defaultdesign = %Apache::loncommon::defaultdesign; |
|
my (%is_custom,%designs); |
|
my %defaults = ( |
|
font => $defaultdesign{'login.font'}, |
|
); |
|
foreach my $item (@images) { |
foreach my $item (@images) { |
$defaults{$item} = $defaultdesign{'login.'.$item}; |
if (defined($settings->{$item})) { |
$defaults{'showlogo'}{$item} = 1; |
$designs{$item} = $settings->{$item}; |
} |
$is_custom{$item} = 1; |
foreach my $item (@bgs) { |
} |
$defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; |
if (defined($settings->{'showlogo'}{$item})) { |
|
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
|
} |
} |
} |
foreach my $item (@logintext) { |
foreach my $item (@logintext) { |
$defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item}; |
if ($settings->{$item} ne '') { |
|
$designs{'logintext'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
} |
} |
foreach my $item (@links) { |
if ($settings->{'font'} ne '') { |
$defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; |
$designs{'font'} = $settings->{'font'}; |
|
$is_custom{'font'} = 1; |
} |
} |
if (ref($settings) eq 'HASH') { |
foreach my $item (@bgs) { |
foreach my $item (@toggles) { |
if ($settings->{$item} ne '') { |
if ($settings->{$item} eq '1') { |
$designs{'bgs'}{$item} = $settings->{$item}; |
$checkedon{$item} = ' checked="checked" '; |
$is_custom{$item} = 1; |
$checkedoff{$item} = ' '; |
|
} elsif ($settings->{$item} eq '0') { |
|
$checkedoff{$item} = ' checked="checked" '; |
|
$checkedon{$item} = ' '; |
|
} |
|
} |
|
foreach my $item (@images) { |
|
if (defined($settings->{$item})) { |
|
$designs{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
if (defined($settings->{'showlogo'}{$item})) { |
|
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
|
} |
|
} |
|
foreach my $item (@logintext) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'logintext'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
if ($settings->{'font'} ne '') { |
|
$designs{'font'} = $settings->{'font'}; |
|
$is_custom{'font'} = 1; |
|
} |
|
foreach my $item (@bgs) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'bgs'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
foreach my $item (@links) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'links'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
} else { |
|
if ($designhash{$dom.'.login.font'} ne '') { |
|
$designs{'font'} = $designhash{$dom.'.login.font'}; |
|
$is_custom{'font'} = 1; |
|
} |
|
foreach my $item (@images) { |
|
if ($designhash{$dom.'.login.'.$item} ne '') { |
|
$designs{$item} = $designhash{$dom.'.login.'.$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
foreach my $item (@bgs) { |
|
if ($designhash{$dom.'.login.'.$item} ne '') { |
|
$designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
} |
foreach my $item (@links) { |
} |
if ($designhash{$dom.'.login.'.$item} ne '') { |
foreach my $item (@links) { |
$designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; |
if ($settings->{$item} ne '') { |
$is_custom{$item} = 1; |
$designs{'links'}{$item} = $settings->{$item}; |
} |
$is_custom{$item} = 1; |
} |
} |
} |
} |
my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', |
} else { |
logo => 'Institution Logo', |
if ($designhash{$dom.'.login.font'} ne '') { |
domlogo => 'Domain Logo', |
$designs{'font'} = $designhash{$dom.'.login.font'}; |
login => 'Login box'); |
$is_custom{'font'} = 1; |
my $itemcount = 1; |
|
foreach my $item (@toggles) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td colspan="2">'.$choices{$item}. |
|
'</td><td>'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="'. |
|
$item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'"'. |
|
$checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$itemcount ++; |
|
} |
} |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
foreach my $item (@images) { |
$datatable .= '</tr></table></td></tr>'; |
if ($designhash{$dom.'.login.'.$item} ne '') { |
} elsif ($caller eq 'help') { |
$designs{$item} = $designhash{$dom.'.login.'.$item}; |
my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices); |
$is_custom{$item} = 1; |
my $switchserver = &check_switchserver($dom,$confname); |
|
my $itemcount = 1; |
|
$defaulturl = '/adm/loginproblems.html'; |
|
$defaulttype = 'default'; |
|
%lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
|
my @currlangs; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'helpurl'}) eq 'HASH') { |
|
foreach my $key (sort(keys(%{$settings->{'helpurl'}}))) { |
|
next if ($settings->{'helpurl'}{$key} eq ''); |
|
$url{$key} = $settings->{'helpurl'}{$key}.'?inhibitmenu=yes'; |
|
$type{$key} = 'custom'; |
|
unless ($key eq 'nolang') { |
|
push(@currlangs,$key); |
|
} |
|
} |
|
} elsif ($settings->{'helpurl'} ne '') { |
|
$type{'nolang'} = 'custom'; |
|
$url{'nolang'} = $settings->{'helpurl'}.'?inhibitmenu=yes'; |
|
} |
} |
} |
} |
foreach my $lang ('nolang',sort(@currlangs)) { |
foreach my $item (@bgs) { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
if ($designhash{$dom.'.login.'.$item} ne '') { |
$datatable .= '<tr'.$css_class.'>'; |
$designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; |
if ($url{$lang} eq '') { |
$is_custom{$item} = 1; |
$url{$lang} = $defaulturl; |
|
} |
|
if ($type{$lang} eq '') { |
|
$type{$lang} = $defaulttype; |
|
} |
|
$datatable .= '<td colspan="2"><span class="LC_nobreak">'; |
|
if ($lang eq 'nolang') { |
|
$datatable .= &mt('Log-in help page if no specific language file: [_1]', |
|
&Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500)); |
|
} else { |
|
$datatable .= &mt('Log-in help page for language: [_1] is [_2]', |
|
$langchoices{$lang}, |
|
&Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500)); |
|
} |
|
$datatable .= '</span></td>'."\n". |
|
'<td class="LC_left_item">'; |
|
if ($type{$lang} eq 'custom') { |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loginhelpurl_del" value="'.$lang.'" />'. |
|
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= $lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="loginhelpurl_'.$lang.'" />'; |
|
} |
} |
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
} |
} |
my @addlangs; |
foreach my $item (@links) { |
foreach my $lang (sort(keys(%langchoices))) { |
if ($designhash{$dom.'.login.'.$item} ne '') { |
next if ((grep(/^\Q$lang\E$/,@currlangs)) || ($lang eq 'x_chef')); |
$designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; |
push(@addlangs,$lang); |
$is_custom{$item} = 1; |
} |
|
if (@addlangs > 0) { |
|
my %toadd; |
|
map { $toadd{$_} = $langchoices{$_} ; } @addlangs; |
|
$toadd{''} = &mt('Select'); |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td class="LC_left_item" colspan="2">'. |
|
&mt('Add log-in help page for a specific language:').' '. |
|
&Apache::loncommon::select_form('','loginhelpurl_add_lang',\%toadd). |
|
'</td><td class="LC_left_item">'.$lt{'upl'}.'<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="loginhelpurl_add_file" />'; |
|
} |
} |
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
} |
} |
$datatable .= &captcha_choice('login',$settings,$itemcount); |
|
} |
} |
|
my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', |
|
logo => 'Institution Logo', |
|
domlogo => 'Domain Logo', |
|
login => 'Login box'); |
|
my $itemcount = 1; |
|
foreach my $item (@toggles) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td colspan="2">'.$choices{$item}. |
|
'</td><td>'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="'. |
|
$item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'"'. |
|
$checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$itemcount ++; |
|
} |
|
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
|
$datatable .= '</tr></table></td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 1470 sub print_quotas {
|
Line 1395 sub print_quotas {
|
} elsif ($context eq 'requestauthor') { |
} elsif ($context eq 'requestauthor') { |
@usertools = ('author'); |
@usertools = ('author'); |
@options = ('norequest','approval','automatic'); |
@options = ('norequest','approval','automatic'); |
%titles = &authorrequest_titles(); |
%titles = &authorrequest_titles(); |
} else { |
} else { |
@usertools = ('aboutme','blog','webdav','portfolio'); |
@usertools = ('aboutme','blog','webdav','portfolio'); |
%titles = &tool_titles(); |
%titles = &tool_titles(); |
Line 2338 sub print_contacts {
|
Line 2263 sub print_contacts {
|
} |
} |
|
|
sub print_helpsettings { |
sub print_helpsettings { |
my ($dom,$confname,$settings,$rowtotal) = @_; |
my ($position,$dom,$confname,$settings,$rowtotal) = @_; |
my ($datatable,$itemcount); |
my ($css_class,$datatable,$itemcount); |
|
my $switchserver = &check_switchserver($dom,$confname); |
$itemcount = 1; |
$itemcount = 1; |
my (%choices,%defaultchecked,@toggles); |
if ($position eq 'top') { |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles,$align); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
&mt('LON-CAPA bug tracker'),600,500)); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
%defaultchecked = ('submitbugs' => 'on'); |
&mt('LON-CAPA bug tracker'),600,500)); |
@toggles = ('submitbugs',); |
%defaultchecked = ('submitbugs' => 'on'); |
|
@toggles = ('submitbugs',); |
|
$align = 'LC_left_item'; |
|
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
} else { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'; |
|
my $url = '/adm/loginproblems.html'; |
|
my $type = 'default'; |
|
my %lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'loginhelpurl'}) eq 'HASH') { |
|
|
|
} elsif ($settings->{'loginhelpurl'} ne '') { |
|
$type = 'custom'; |
|
$url = $settings->{'loginhelpurl'}.'?inhibitmenu=yes'; |
|
} |
|
} |
|
$datatable .= '<td class="LC_left_item"><span class="LC_nobreak">'. |
|
&mt('Log-in help page currently in use: [_1]', |
|
&Apache::loncommon::modal_link($url,$lt{$type},600,500)). |
|
'</span></td>'."\n". |
|
'<td class="LC_left_item">'; |
|
if ($type eq 'custom') { |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loginhelpurl_del" value="1" />'.$lt{'del'}. |
|
'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= $lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="loginhelpurl" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2358 sub radiobutton_prefs {
|
Line 2326 sub radiobutton_prefs {
|
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
(ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
|
|
my (%checkedon,%checkedoff,$datatable,$css_class); |
my (%checkedon,%checkedoff,$datatable,$css_class,$cell_colspan); |
|
|
foreach my $item (@{$toggles}) { |
foreach my $item (@{$toggles}) { |
if ($defaultchecked->{$item} eq 'on') { |
if ($defaultchecked->{$item} eq 'on') { |
Line 3132 sub authorrequest_titles {
|
Line 3100 sub authorrequest_titles {
|
automatic => 'Automatic approval', |
automatic => 'Automatic approval', |
); |
); |
return %titles; |
return %titles; |
} |
} |
|
|
sub courserequest_conditions { |
sub courserequest_conditions { |
my %conditions = &Apache::lonlocal::texthash ( |
my %conditions = &Apache::lonlocal::texthash ( |
Line 3273 sub print_usercreation {
|
Line 3241 sub print_usercreation {
|
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'statustocreate'); |
'statustocreate'); |
$$rowtotal ++; |
$$rowtotal ++; |
$rownum ++; |
|
} |
} |
} |
} |
$datatable .= &captcha_choice('cancreate',$createsettings,$rownum); |
$datatable .= &captcha_choice('cancreate',$createsettings); |
} else { |
} else { |
my @contexts = ('author','course','domain'); |
my @contexts = ('author','course','domain'); |
my @authtypes = ('int','krb4','krb5','loc'); |
my @authtypes = ('int','krb4','krb5','loc'); |
Line 3329 sub print_usercreation {
|
Line 3296 sub print_usercreation {
|
} |
} |
|
|
sub captcha_choice { |
sub captcha_choice { |
my ($context,$settings,$itemcount) = @_; |
my ($context,$settings) = @_; |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
$rowname = &mt('CAPTCHA validation (e-mail as username)'); |
$rowname = &mt('CAPTCHA validation (e-mail as username)'); |
} elsif ($context eq 'login') { |
} elsif ($context eq 'help') { |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
$rowname = &mt('CAPTCHA validation'); |
} |
} |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'captcha'}) { |
if ($settings->{'captcha'}) { |
Line 3356 sub captcha_choice {
|
Line 3323 sub captcha_choice {
|
} else { |
} else { |
$checked{'original'} = ' checked="checked"'; |
$checked{'original'} = ' checked="checked"'; |
} |
} |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $output = '<tr class="LC_odd_row">'. |
my $output = '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_right_item" colspan="2">'."\n". |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n". |
|
'<table><tr><td>'."\n"; |
'<table><tr><td>'."\n"; |
foreach my $option ('original','recaptcha','notused') { |
foreach my $option ('original','recaptcha','notused') { |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
Line 3371 sub captcha_choice {
|
Line 3337 sub captcha_choice {
|
# |
# |
# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit: |
# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit: |
# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple |
# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple |
# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) |
# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) |
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain. |
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain. |
# |
# |
$output .= '</td></tr>'."\n". |
$output .= '</td></tr>'."\n". |
'<tr><td>'."\n". |
'<tr><td>'."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
Line 3561 sub print_defaults {
|
Line 3527 sub print_defaults {
|
my $includeempty = 1; |
my $includeempty = 1; |
$datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty); |
$datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty); |
} elsif ($item eq 'lang_def') { |
} elsif ($item eq 'lang_def') { |
my %langchoices = &get_languages_hash(); |
my %langchoices=('' => 'No language preference'); |
$langchoices{''} = 'No language preference'; |
foreach my $id (&Apache::loncommon::languageids()) { |
|
my $code = &Apache::loncommon::supportedlanguagecode($id); |
|
if ($code ne '') { |
|
$langchoices{$code} = &Apache::loncommon::plainlanguagedescription($id); |
|
} |
|
} |
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
$datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item, |
$datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item, |
\%langchoices); |
\%langchoices); |
Line 3581 sub print_defaults {
|
Line 3552 sub print_defaults {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
sub get_languages_hash { |
|
my %langchoices; |
|
foreach my $id (&Apache::loncommon::languageids()) { |
|
my $code = &Apache::loncommon::supportedlanguagecode($id); |
|
if ($code ne '') { |
|
$langchoices{$code} = &Apache::loncommon::plainlanguagedescription($id); |
|
} |
|
} |
|
return %langchoices; |
|
} |
|
|
|
sub defaults_titles { |
sub defaults_titles { |
my ($dom) = @_; |
my ($dom) = @_; |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
Line 4503 sub usertype_update_row {
|
Line 4463 sub usertype_update_row {
|
|
|
sub modify_login { |
sub modify_login { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges); |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
my %title = ( coursecatalog => 'Display course catalog', |
%title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header'); |
my @offon = ('off','on'); |
@offon = ('off','on'); |
my %curr_loginvia; |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) { |
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) { |
Line 4517 sub modify_login {
|
Line 4477 sub modify_login {
|
} |
} |
} |
} |
} |
} |
|
my %loginhash; |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
Line 4589 sub modify_login {
|
Line 4550 sub modify_login {
|
$new = ''; |
$new = ''; |
} |
} |
} |
} |
|
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
} |
} |
} |
} |
Line 4614 sub modify_login {
|
Line 4576 sub modify_login {
|
} |
} |
} |
} |
|
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my %langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
|
if (ref($domconfig{'login'}) eq 'HASH') { |
|
if (ref($domconfig{'login'}{'helpurl'}) eq 'HASH') { |
|
foreach my $lang (sort(keys(%{$domconfig{'login'}{'helpurl'}}))) { |
|
if ($lang eq 'nolang') { |
|
push(@currlangs,$lang); |
|
} elsif (defined($langchoices{$lang})) { |
|
push(@currlangs,$lang); |
|
} else { |
|
next; |
|
} |
|
} |
|
} |
|
} |
|
my @delurls = &Apache::loncommon::get_env_multiple('form.loginhelpurl_del'); |
|
if (@currlangs > 0) { |
|
foreach my $lang (@currlangs) { |
|
if (grep(/^\Q$lang\E$/,@delurls)) { |
|
$changes{'helpurl'}{$lang} = 1; |
|
} elsif ($env{'form.loginhelpurl_'.$lang.'.filename'}) { |
|
$changes{'helpurl'}{$lang} = 1; |
|
$newfile{$lang} = $env{'form.loginhelpurl_'.$lang.'.filename'}; |
|
push(@newlangs,$lang); |
|
} else { |
|
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
|
} |
|
} |
|
} |
|
unless (grep(/^nolang$/,@currlangs)) { |
|
if ($env{'form.loginhelpurl_nolang.filename'}) { |
|
$changes{'helpurl'}{'nolang'} = 1; |
|
$newfile{'nolang'} = $env{'form.loginhelpurl_nolang.filename'}; |
|
push(@newlangs,'nolang'); |
|
} |
|
} |
|
if ($env{'form.loginhelpurl_add_lang'}) { |
|
if ((defined($langchoices{$env{'form.loginhelpurl_add_lang'}})) && |
|
($env{'form.loginhelpurl_add_file.filename'})) { |
|
$newfile{$env{'form.loginhelpurl_add_lang'}} = $env{'form.loginhelpurl_add_file.filename'}; |
|
$addedfile = $env{'form.loginhelpurl_add_lang'}; |
|
} |
|
} |
|
if ((@newlangs > 0) || ($addedfile)) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
my @allnew = @newlangs; |
|
if ($addedfile ne '') { |
|
push(@allnew,$addedfile); |
|
} |
|
foreach my $lang (@allnew) { |
|
my $formelem = 'loginhelpurl_'.$lang; |
|
if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
|
$formelem = 'loginhelpurl_add_file'; |
|
} |
|
(my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"help/$lang",'','',$newfile{$lang}); |
|
if ($result eq 'ok') { |
|
$loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang}; |
|
$changes{'helpurl'}{$lang} = 1; |
|
} else { |
|
my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
if ((grep(/^\Q$lang\E$/,@currlangs)) && |
|
(!grep(/^\Q$lang\E$/,@delurls))) { |
|
|
|
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
|
} |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of custom log-in help file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
|
|
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
|
my $defaulttext = &mt('Default in use'); |
|
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
Line 4769 sub modify_login {
|
Line 4641 sub modify_login {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
} elsif ($item eq 'helpurl') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
foreach my $lang (sort(keys(%{$changes{$item}}))) { |
|
if (grep(/^\Q$lang\E$/,@delurls)) { |
|
my ($chg,$link); |
|
$link = &Apache::loncommon::modal_link($defaulthelpfile,$defaulttext,600,500); |
|
if ($lang eq 'nolang') { |
|
$chg = &mt('custom log-in help file removed for no preferred language; [_1]',$link); |
|
} else { |
|
$chg = &mt('custom log-in help file removed for specific language: [_1]; [_2]',$langchoices{$lang},$link); |
|
} |
|
$resulttext .= '<li>'.$chg.'</li>'; |
|
} else { |
|
my $chg; |
|
if ($lang eq 'nolang') { |
|
$chg = &mt('custom log-in help file for no preferred language'); |
|
} else { |
|
$chg = &mt('custom log-in help file for specific language: [_1]',$langchoices{$lang}); |
|
} |
|
$resulttext .= '<li>'.&Apache::loncommon::modal_link( |
|
$loginhash{'login'}{'helpurl'}{$lang}. |
|
'?inhibitmenu=yes',$chg,600,500). |
|
'</li>'; |
|
} |
|
} |
|
} |
|
} elsif ($item eq 'captcha') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
my $chgtxt; |
|
if ($loginhash{'login'}{$item} eq 'notused') { |
|
$chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.'); |
|
} else { |
|
my %captchas = &captcha_phrases(); |
|
if ($captchas{$loginhash{'login'}{$item}}) { |
|
$chgtxt .= &mt("Validation for helpdesk form set to $captchas{$loginhash{'login'}{$item}}."); |
|
} else { |
|
$chgtxt .= &mt('Validation for helpdesk form set to unknown type.'); |
|
} |
|
} |
|
$resulttext .= '<li>'.$chgtxt.'</li>'; |
|
} |
|
} elsif ($item eq 'recaptchakeys') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
my ($privkey,$pubkey); |
|
if (ref($loginhash{'login'}{$item}) eq 'HASH') { |
|
$pubkey = $loginhash{'login'}{$item}{'public'}; |
|
$privkey = $loginhash{'login'}{$item}{'private'}; |
|
} |
|
my $chgtxt .= &mt('ReCAPTCHA keys changes').'<ul>'; |
|
if (!$pubkey) { |
|
$chgtxt .= '<li>'.&mt('Public key deleted').'</li>'; |
|
} else { |
|
$chgtxt .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>'; |
|
} |
|
if (!$privkey) { |
|
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
|
} else { |
|
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
|
} |
|
$chgtxt .= '</ul>'; |
|
$resulttext .= '<li>'.$chgtxt.'</li>'; |
|
} |
|
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
} |
} |
Line 5275 sub publishlogo {
|
Line 5085 sub publishlogo {
|
# See if there is anything left |
# See if there is anything left |
unless ($fname) { return ('error: no uploaded file'); } |
unless ($fname) { return ('error: no uploaded file'); } |
$fname="$subdir/$fname"; |
$fname="$subdir/$fname"; |
my $docroot=$r->dir_config('lonDocRoot'); |
my $docroot=$r->dir_config('lonDocRoot'); |
my $filepath="$docroot/priv"; |
my $filepath="$docroot/priv"; |
my $relpath = "$dom/$confname"; |
my $relpath = "$dom/$confname"; |
my ($fnamepath,$file,$fetchthumb); |
my ($fnamepath,$file,$fetchthumb); |
Line 5283 sub publishlogo {
|
Line 5093 sub publishlogo {
|
if ($fname=~m|/|) { |
if ($fname=~m|/|) { |
($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
} |
} |
my @parts=split(/\//,"$filepath/$relpath/$fnamepath"); |
my @parts=split(/\//,"$filepath/$relpath/$fnamepath"); |
my $count; |
my $count; |
for ($count=5;$count<=$#parts;$count++) { |
for ($count=5;$count<=$#parts;$count++) { |
$filepath.="/$parts[$count]"; |
$filepath.="/$parts[$count]"; |
Line 5549 sub modify_quotas {
|
Line 5359 sub modify_quotas {
|
%limithash,$toolregexp,%conditions,$resulttext,%changes); |
%limithash,$toolregexp,%conditions,$resulttext,%changes); |
if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
$context = 'tools'; |
$context = 'tools'; |
} else { |
} else { |
$context = $action; |
$context = $action; |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
Line 5739 sub modify_quotas {
|
Line 5549 sub modify_quotas {
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
|
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
unless (($context eq 'requestcourses') || |
unless (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if (ref($changes{'defaultquota'}) eq 'HASH') { |
if (ref($changes{'defaultquota'}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>'; |
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>'; |
Line 5760 sub modify_quotas {
|
Line 5570 sub modify_quotas {
|
my (%haschgs,%inconf); |
my (%haschgs,%inconf); |
if ($context eq 'requestauthor') { |
if ($context eq 'requestauthor') { |
%haschgs = %changes; |
%haschgs = %changes; |
%inconf = %confhash; |
%inconf = %confhash; |
} else { |
} else { |
if (ref($changes{$item}) eq 'HASH') { |
if (ref($changes{$item}) eq 'HASH') { |
%haschgs = %{$changes{$item}}; |
%haschgs = %{$changes{$item}}; |
Line 5774 sub modify_quotas {
|
Line 5584 sub modify_quotas {
|
&Apache::lonnet::usertools_access($env{'user.name'}, |
&Apache::lonnet::usertools_access($env{'user.name'}, |
$env{'user.domain'}, |
$env{'user.domain'}, |
$item,'reload',$context); |
$item,'reload',$context); |
if (($context eq 'requestcourses') || |
if (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if ($env{'environment.canrequest.'.$item} ne $newacc) { |
if ($env{'environment.canrequest.'.$item} ne $newacc) { |
$newenv{'environment.canrequest.'.$item} = $newacc; |
$newenv{'environment.canrequest.'.$item} = $newacc; |
Line 6795 sub modify_usercreation {
|
Line 6605 sub modify_usercreation {
|
if ($captchas{$cancreate{$type}}) { |
if ($captchas{$cancreate{$type}}) { |
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}."); |
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}."); |
} else { |
} else { |
$chgtext .= &mt('Validation for self-creation screen set to unknown type.'); |
$chgtext .= &mt('Validation for self-creation screen set to unknown type.'); |
} |
} |
} |
} |
} elsif ($type eq 'recaptchakeys') { |
} elsif ($type eq 'recaptchakeys') { |
Line 6923 sub process_captcha {
|
Line 6733 sub process_captcha {
|
$newsettings->{'captcha'} = 'original'; |
$newsettings->{'captcha'} = 'original'; |
} |
} |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
push(@{$changes->{'cancreate'}},'captcha'); |
push(@{$changes->{'cancreate'}},'captcha'); |
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['captcha']; |
$changes->{'cancreate'} = ['captcha']; |
|
} |
|
} else { |
|
$changes->{'captcha'} = 1; |
|
} |
} |
} |
} |
my ($newpub,$newpriv,$currpub,$currpriv); |
my ($newpub,$newpriv,$currpub,$currpriv); |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
$newpub =~ s/\W//g; |
|
$newpriv =~ s/\W//g; |
|
$newsettings->{'recaptchakeys'} = { |
|
public => $newpub, |
|
private => $newpriv, |
|
}; |
|
} |
} |
|
$newsettings->{'recaptchakeys'} = { |
|
public => $newpub, |
|
private => $newpriv, |
|
}; |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$newsettings->{'recaptchakeys'} = { |
|
public => '', |
|
private => '', |
|
} |
|
} |
} |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
push(@{$changes->{'cancreate'}},'recaptchakeys'); |
push(@{$changes->{'cancreate'}},'recaptchakeys'); |
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['recaptchakeys']; |
$changes->{'cancreate'} = ['recaptchakeys']; |
|
} |
|
} else { |
|
$changes->{'recaptchakeys'} = 1; |
|
} |
} |
} |
} |
return; |
return; |
Line 7623 sub modify_serverstatuses {
|
Line 7419 sub modify_serverstatuses {
|
sub modify_helpsettings { |
sub modify_helpsettings { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%helphash); |
my ($resulttext,$errors,%changes,%helphash); |
|
my $customhelpfile = $env{'form.loginhelpurl.filename'}; |
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
|
my $defaulttext = &mt('Default in use'); |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
my %defaultchecked = ('submitbugs' => 'on'); |
my %defaultchecked = ('submitbugs' => 'on'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
|
my %title = ( |
|
submitbugs => 'Display link for users to submit a bug', |
|
loginhelpurl => 'Unauthenticated login help page set to custom file' |
|
); |
my @toggles = ('submitbugs'); |
my @toggles = ('submitbugs'); |
|
$helphash{'helpsettings'} = {}; |
|
if (ref($domconfig{'helpsettings'}) ne 'HASH') { |
|
if ($domconfig{'helpsettings'} eq '') { |
|
$domconfig{'helpsettings'} = {}; |
|
} |
|
} |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($defaultchecked{$item} eq 'on') { |
if ($defaultchecked{$item} eq 'on') { |
Line 7644 sub modify_helpsettings {
|
Line 7455 sub modify_helpsettings {
|
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} |
} |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
} |
} |
} |
} |
|
if ($customhelpfile ne '') { |
|
my $error; |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver); |
|
} else { |
|
if ($author_ok eq 'ok') { |
|
my ($result,$loginhelpurl) = &publishlogo($r,'upload','loginhelpurl',$dom, |
|
$confname,'help','','',$customhelpfile); |
|
if ($result eq 'ok') { |
|
$helphash{'helpsettings'}{'loginhelpurl'} = $loginhelpurl; |
|
$changes{'loginhelpurl'} = 1; |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customhelpfile,$result); |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$customhelpfile,$confname,$dom,$author_ok); |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$customhelpfile,$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
if ($domconfig{'helpsettings'}{'loginhelpurl'} ne '') { |
|
if ($env{'form.loginhelpurl_del'}) { |
|
$helphash{'helpsettings'}{'loginhelpurl'} = ''; |
|
$changes{'loginhelpurl'} = 1; |
|
} |
|
} |
} |
} |
my $putresult; |
my $putresult; |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
if ($putresult eq 'ok') { |
} else { |
|
$putresult = 'ok'; |
|
} |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'submitbugs') { |
if ($item eq 'submitbugs') { |
Line 7661 sub modify_helpsettings {
|
Line 7509 sub modify_helpsettings {
|
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
} |
} |
|
if ($item eq 'loginhelpurl') { |
|
if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') { |
|
$resulttext .= '<li>'.&mt('custom log-in help file removed.').' '. |
|
&Apache::loncommon::modal_link($defaulthelpfile, |
|
$defaulttext,600,500).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&Apache::loncommon::modal_link( |
|
$helphash{'helpsettings'}{'loginhelpurl'}. |
|
'?inhibitmenu=yes', |
|
&mt('custom log-in help file'),600,500). |
|
'</li>'; |
|
} |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to help settings'); |
$resulttext = &mt('No changes made to help settings'); |
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing the settings: [_1]', |
|
$putresult).'</span></li>'; |
|
} |
} |
|
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('An error occurred storing the settings: [_1]', |
|
$putresult).'</span></li>'; |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'. |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$errors.'</ul>'; |
$errors.'</ul>'; |
} |
} |
return $resulttext; |
return $resulttext; |