version 1.241, 2014/05/05 23:28:53
|
version 1.254, 2014/10/06 00:48:39
|
Line 369 sub handler {
|
Line 369 sub handler {
|
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Available textbooks', |
{col1 => 'Available textbooks', |
col2 => ''}, |
col2 => ''}, |
|
{col1 => 'Available templates', |
|
col2 => ''}, |
{col1 => 'Validation (not official courses)', |
{col1 => 'Validation (not official courses)', |
col2 => 'Value'},], |
col2 => 'Value'},], |
print => \&print_quotas, |
print => \&print_quotas, |
Line 760 sub print_config_box {
|
Line 762 sub print_config_box {
|
$output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
$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); |
&print_studentcode($settings,\$rowtotal).' |
$rowtotal ++; |
|
$output .= &print_studentcode($settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 771 sub print_config_box {
|
Line 774 sub print_config_box {
|
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
<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> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 779 sub print_config_box {
|
Line 793 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
</tr>'. |
</tr>'. |
&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal); |
&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
|
$rowtotal ++; |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
</table> |
</table> |
Line 2061 sub print_requestmail {
|
Line 2076 sub print_requestmail {
|
$datatable .= &mt('There are no active Domain Coordinators'); |
$datatable .= &mt('There are no active Domain Coordinators'); |
} |
} |
$datatable .='</td></tr>'; |
$datatable .='</td></tr>'; |
$$rowtotal += $rows; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2070 sub print_studentcode {
|
Line 2084 sub print_studentcode {
|
my $rownum = 0; |
my $rownum = 0; |
my ($output,%current); |
my ($output,%current); |
my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook'); |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $type (@crstypes) { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
$current{$type} = $settings->{'uniquecode'}{$type}; |
foreach my $type (@crstypes) { |
|
$current{$type} = $settings->{'uniquecode'}{$type}; |
|
} |
} |
} |
} |
} |
$output .= '<tr>'. |
$output .= '<tr>'. |
Line 2093 sub print_studentcode {
|
Line 2109 sub print_studentcode {
|
} |
} |
|
|
sub print_textbookcourses { |
sub print_textbookcourses { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$type,$settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my $css_class; |
my $css_class; |
my $itemcount = 1; |
my $itemcount = 1; |
my $maxnum = 0; |
my $maxnum = 0; |
my $bookshash; |
my $bookshash; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$bookshash = $settings->{'textbooks'}; |
$bookshash = $settings->{$type}; |
} |
} |
my %ordered; |
my %ordered; |
if (ref($bookshash) eq 'HASH') { |
if (ref($bookshash) eq 'HASH') { |
Line 2113 sub print_textbookcourses {
|
Line 2129 sub print_textbookcourses {
|
} |
} |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
$maxnum = scalar(keys(%ordered)); |
my $maxnum = scalar(keys(%ordered)); |
my $datatable = &textbookcourses_javascript(\%ordered); |
my $datatable; |
if (keys(%ordered)) { |
if (keys(%ordered)) { |
my @items = sort { $a <=> $b } keys(%ordered); |
my @items = sort { $a <=> $b } keys(%ordered); |
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
Line 2122 sub print_textbookcourses {
|
Line 2138 sub print_textbookcourses {
|
my $key = $ordered{$items[$i]}; |
my $key = $ordered{$items[$i]}; |
my %coursehash=&Apache::lonnet::coursedescription($key); |
my %coursehash=&Apache::lonnet::coursedescription($key); |
my $coursetitle = $coursehash{'description'}; |
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') { |
if (ref($bookshash->{$key}) eq 'HASH') { |
$subject = $bookshash->{$key}->{'subject'}; |
$subject = $bookshash->{$key}->{'subject'}; |
$title = $bookshash->{$key}->{'title'}; |
$title = $bookshash->{$key}->{'title'}; |
$author = $bookshash->{$key}->{'author'}; |
if ($type eq 'textbooks') { |
$image = $bookshash->{$key}->{'image'}; |
$publisher = $bookshash->{$key}->{'publisher'}; |
if ($image ne '') { |
$author = $bookshash->{$key}->{'author'}; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
$image = $bookshash->{$key}->{'image'}; |
my $imagethumb = "$path/tn-".$imagefile; |
if ($image ne '') { |
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
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">' |
$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++) { |
for (my $k=0; $k<=$maxnum; $k++) { |
my $vpos = $k+1; |
my $vpos = $k+1; |
my $selstr; |
my $selstr; |
Line 2146 sub print_textbookcourses {
|
Line 2165 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select>'.(' 'x2). |
$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>'. |
&mt('Delete?').'</label></span></td>'. |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></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('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> '. |
|
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> '; |
if ($image) { |
if ($type eq 'textbooks') { |
$datatable .= '<span class="LC_nobreak">'. |
$datatable .= (' 'x2). |
$imgsrc. |
'<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '. |
'<label><input type="checkbox" name="book_image_del"'. |
(' 'x2). |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '. |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
(' 'x2). |
} |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
if ($switchserver) { |
if ($image) { |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= '<span class="LC_nobreak">'. |
} else { |
$imgsrc. |
$datatable .= '<input type="file" name="book_image_'.$i.'" value="" />'; |
'<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:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
$coursetitle.'</span></td></tr>'."\n"; |
$coursetitle.'</span></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
} |
} |
} |
} |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$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". |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
'<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n". |
'<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n". |
'<select name="addbook_pos"'.$chgstr.'>'; |
'<select name="'.$type.'_addbook_pos"'.$chgstr.'>'; |
for (my $k=0; $k<$maxnum+1; $k++) { |
for (my $k=0; $k<$maxnum+1; $k++) { |
my $vpos = $k+1; |
my $vpos = $k+1; |
my $selstr; |
my $selstr; |
Line 2188 sub print_textbookcourses {
|
Line 2211 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$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">'. |
'<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). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2); |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
if ($type eq 'textbooks') { |
if ($switchserver) { |
$datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n". |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
(' 'x2). |
} else { |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n". |
$datatable .= '<input type="file" name="addbook_image" value="" />'; |
(' '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". |
$datatable .= '</span>'."\n". |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom'). |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
'<input type="text" size="25" name="addbook_cnum" value="" />'. |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
&Apache::loncommon::selectcourse_link |
&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". |
'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 2215 sub print_textbookcourses {
|
Line 2242 sub print_textbookcourses {
|
} |
} |
|
|
sub textbookcourses_javascript { |
sub textbookcourses_javascript { |
my ($textbooks) = @_; |
my ($settings) = @_; |
return unless(ref($textbooks) eq 'HASH'); |
return unless(ref($settings) eq 'HASH'); |
my $num = scalar(keys(%{$textbooks})); |
my (%ordered,%total,%jstext); |
my @jsarray; |
foreach my $type ('textbooks','templates') { |
foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) { |
$total{$type} = 0; |
push(@jsarray,$textbooks->{$item}); |
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"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function reorderBooks(form,item) { |
function reorderBooks(form,item,caller) { |
var changedVal; |
var changedVal; |
$jstext |
$jstext{'textbooks'}; |
var newpos = 'addbook_pos'; |
$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 current = new Array; |
var maxh = 1 + $num; |
|
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
if (item == newpos) { |
if (item == newpos) { |
changedVal = newitemVal; |
changedVal = newitemVal; |
Line 2239 $jstext
|
Line 2286 $jstext
|
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
current[newitemVal] = newpos; |
current[newitemVal] = newpos; |
} |
} |
for (var i=0; i<textbooks.length; i++) { |
if (caller == 'textbooks') { |
var elementName = textbooks[i]; |
for (var i=0; i<textbooks.length; i++) { |
if (elementName != item) { |
var elementName = 'textbooks_'+textbooks[i]; |
if (form.elements[elementName]) { |
if (elementName != item) { |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
if (form.elements[elementName]) { |
current[currVal] = 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; |
|
} |
} |
} |
} |
} |
} |
} |
Line 2462 sub print_autocreate {
|
Line 2522 sub print_autocreate {
|
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'autocreate_xmldc',%currhash); |
'autocreate_xmldc',%currhash); |
|
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'). |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
'</td><td class="LC_left_item">'; |
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as:'). |
|
'</td><td class="LC_right_item">'; |
} |
} |
|
$datatable .= $dctable.'</td></tr>'; |
$$rowtotal += $rows; |
$$rowtotal += $rows; |
return $datatable; |
return $datatable; |
} |
} |
Line 3060 sub print_validation_rows {
|
Line 3122 sub print_validation_rows {
|
} |
} |
if ($caller eq 'requestcourses') { |
if ($caller eq 'requestcourses') { |
my %currhash; |
my %currhash; |
if (ref($settings->{'validation'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'validation'}{'dc'} ne '') { |
if (ref($settings->{'validation'}) eq 'HASH') { |
$currhash{$settings->{'validation'}{'dc'}} = 1; |
if ($settings->{'validation'}{'dc'} ne '') { |
|
$currhash{$settings->{'validation'}{'dc'}} = 1; |
|
} |
} |
} |
} |
} |
my $numinrow = 2; |
my $numinrow = 2; |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'validationdc',%currhash); |
'validationdc',%currhash); |
|
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '</td></tr><tr'.$css_class.'><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
|
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as: '); |
} |
} |
|
$datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
if (ref($rowtotal)) { |
if (ref($rowtotal)) { |
Line 3596 sub print_loadbalancing {
|
Line 3661 sub print_loadbalancing {
|
$disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
} |
} |
$targettable .= |
$targettable .= |
'<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
'<td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
'</span></label></td>'; |
'</span></label></span></td>'; |
my $rem = $i%($numinrow); |
my $rem = $i%($numinrow); |
if ($rem == 0) { |
if ($rem == 0) { |
if (($i > 0) && ($i < $numspares-1)) { |
if (($i > 0) && ($i < $numspares-1)) { |
Line 3688 sub loadbalancing_rules {
|
Line 3754 sub loadbalancing_rules {
|
if (ref($currrules) eq 'HASH') { |
if (ref($currrules) eq 'HASH') { |
$current = $currrules->{$type}; |
$current = $currrules->{$type}; |
} |
} |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
$current = ''; |
$current = ''; |
} |
} |
Line 3740 sub loadbalance_rule_row {
|
Line 3806 sub loadbalance_rule_row {
|
my @rulenames; |
my @rulenames; |
my %ruletitles = &offloadtype_text(); |
my %ruletitles = &offloadtype_text(); |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
@rulenames = ('balancer','offloadedto'); |
@rulenames = ('balancer','offloadedto','specific'); |
} else { |
} else { |
@rulenames = ('default','homeserver'); |
@rulenames = ('default','homeserver'); |
if ($type eq '_LC_external') { |
if ($type eq '_LC_external') { |
Line 3751 sub loadbalance_rule_row {
|
Line 3817 sub loadbalance_rule_row {
|
push(@rulenames,'none'); |
push(@rulenames,'none'); |
} |
} |
my $style = $targets_div_style; |
my $style = $targets_div_style; |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
$style = $homedom_div_style; |
$style = $homedom_div_style; |
} |
} |
my $space; |
my $space; |
Line 3802 sub loadbalance_rule_row {
|
Line 3868 sub loadbalance_rule_row {
|
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
')"'.$checked.' /> '; |
'</label>'.$extra.'</span><br />'."\n"; |
if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) { |
|
$output .= $ruletitles{'particular'}; |
|
} else { |
|
$output .= $ruletitles{$rulenames[$i]}; |
|
} |
|
$output .= '</label>'.$extra.'</span><br />'."\n"; |
} |
} |
$output .= '</div></td></tr>'."\n"; |
$output .= '</div></td></tr>'."\n"; |
return $output; |
return $output; |
Line 3818 sub offloadtype_text {
|
Line 3889 sub offloadtype_text {
|
'none' => 'No offload', |
'none' => 'No offload', |
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
|
'particular' => 'Session hosted (after re-auth) on server:', |
); |
); |
return %ruletitles; |
return %ruletitles; |
} |
} |
Line 4100 sub print_selfcreation {
|
Line 4172 sub print_selfcreation {
|
$datatable .= '<tr>'; |
$datatable .= '<tr>'; |
} |
} |
my $currval; |
my $currval; |
if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
if (ref($createsettings) eq 'HASH') { |
$currval = $createsettings->{'shibenv'}{$fields[$i]}; |
if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
|
$currval = $createsettings->{'shibenv'}{$fields[$i]}; |
|
} |
} |
} |
$datatable .= '<td class="LC_left_item">'. |
$datatable .= '<td class="LC_left_item">'. |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
Line 5105 sub serverstatus_pages {
|
Line 5179 sub serverstatus_pages {
|
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
my ($output,$jstext); |
return unless (ref($settings) eq 'HASH'); |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
$maxnum = 0; |
$maxnum = 0; |
} |
} |
$maxnum ++; |
$maxnum ++; |
$jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
my $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 6005 sub modify_login {
|
Line 6079 sub modify_login {
|
if (!$privkey) { |
if (!$privkey) { |
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
} else { |
} else { |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>'; |
} |
} |
$chgtxt .= '</ul>'; |
$chgtxt .= '</ul>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
Line 6830 sub modify_quotas {
|
Line 6904 sub modify_quotas {
|
$confhash{'uniquecode'}{$type} = 1; |
$confhash{'uniquecode'}{$type} = 1; |
} |
} |
} |
} |
my ($newbook,@allpos); |
my (%newbook,%allpos); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if ($env{'form.addbook'}) { |
foreach my $type ('textbooks','templates') { |
if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) && |
@{$allpos{$type}} = (); |
($env{'form.addbook_cdom'} =~ /^$match_domain$/)) { |
my $invalid; |
if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'}, |
if ($type eq 'textbooks') { |
$env{'form.addbook_cdom'}) eq 'no_host') { |
$invalid = &mt('Invalid LON-CAPA course for textbook'); |
$errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
} else { |
'</span></li>'; |
$invalid = &mt('Invalid LON-CAPA course for template'); |
} else { |
} |
$newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'}; |
if ($env{'form.'.$type.'_addbook'}) { |
my $position = $env{'form.addbook_pos'}; |
if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) && |
$position =~ s/\D+//g; |
($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) { |
if ($position ne '') { |
if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'}, |
$allpos[$position] = $newbook; |
$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}) eq 'HASH') { |
if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
Line 6885 sub modify_quotas {
|
Line 6965 sub modify_quotas {
|
$changes{'uniquecode'} = 1; |
$changes{'uniquecode'} = 1; |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
my %deletions; |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
my @todelete = &Apache::loncommon::get_env_multiple('form.book_del'); |
my %deletions; |
if (@todelete) { |
my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del'); |
map { $deletions{$_} = 1; } @todelete; |
if (@todelete) { |
} |
map { $deletions{$_} = 1; } @todelete; |
my %imgdeletions; |
} |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del'); |
my %imgdeletions; |
if (@todeleteimages) { |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del'); |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
if (@todeleteimages) { |
} |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
my $maxnum = $env{'form.book_maxnum'}; |
} |
for (my $i=0; $i<=$maxnum; $i++) { |
my $maxnum = $env{'form.'.$type.'_maxnum'}; |
my $key = $env{'form.book_id_'.$i}; |
for (my $i=0; $i<=$maxnum; $i++) { |
if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') { |
my $itemid = $env{'form.'.$type.'_id_'.$i}; |
if ($deletions{$key}) { |
my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); |
if ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') { |
#FIXME need to obsolete item in RES space |
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; |
if ($imgdeletions{$key}) { |
} else { |
$changes{$type}{$key} = 1; |
my $newpos = $env{'form.'.$key}; |
#FIXME need to obsolete item in RES space |
$newpos =~ s/\D+//g; |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
foreach my $item ('subject','title','author') { |
my ($cdom,$cnum) = split(/_/,$key); |
$confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i}; |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) { |
$cdom,$cnum,$type,$configuserok, |
$changes{'textbooks'}{$key} = 1; |
$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'}; |
|
} |
} |
} |
} |
} |
} |
Line 6949 sub modify_quotas {
|
Line 7034 sub modify_quotas {
|
} |
} |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if ($newbook) { |
foreach my $type ('textbooks','templates') { |
$changes{'textbooks'}{$newbook} = 1; |
if ($newbook{$type}) { |
foreach my $item ('subject','title','author') { |
$changes{$type}{$newbook{$type}} = 1; |
$env{'form.addbook_'.$item} =~ s/(`)/'/g; |
foreach my $item ('subject','title','publisher','author') { |
if ($env{'form.addbook_'.$item}) { |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
$confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item}; |
($type eq 'template')); |
} |
$env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g; |
} |
if ($env{'form.'.$type.'_addbook_'.$item}) { |
if ($env{'form.addbook_image.filename'} ne '') { |
$confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item}; |
my ($cdom,$cnum) = split(/_/,$newbook); |
} |
my ($imageurl,$error) = |
} |
&process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok, |
if ($type eq 'textbooks') { |
$switchserver,$author_ok); |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
if ($imageurl) { |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
$confhash{'textbooks'}{$newbook}{'image'} = $imageurl; |
my ($imageurl,$error) = |
} |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
if ($error) { |
$configuserok,$switchserver,$author_ok); |
&Apache::lonnet::logthis($error); |
if ($imageurl) { |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
} |
} |
} |
} |
} |
if (@{$allpos{$type}} > 0) { |
if (@allpos > 0) { |
my $idx = 0; |
my $idx = 0; |
foreach my $item (@{$allpos{$type}}) { |
foreach my $item (@allpos) { |
if ($item ne '') { |
if ($item ne '') { |
$confhash{$type}{$item}{'order'} = $idx; |
$confhash{'textbooks'}{$item}{'order'} = $idx; |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') { |
if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') { |
if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) { |
if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) { |
$changes{$type}{$item} = 1; |
$changes{'textbooks'}{$item} = 1; |
} |
} |
} |
} |
} |
} |
} |
|
$idx ++; |
} |
} |
$idx ++; |
|
} |
} |
} |
} |
} |
} |
Line 7202 sub modify_quotas {
|
Line 7293 sub modify_quotas {
|
$domdefaults{'requestauthor'} = \%confhash; |
$domdefaults{'requestauthor'} = \%confhash; |
} else { |
} else { |
foreach my $key (keys(%confhash)) { |
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}; |
$domdefaults{$key} = $confhash{$key}; |
} |
} |
} |
} |
Line 7354 sub modify_quotas {
|
Line 7445 sub modify_quotas {
|
'</li>'; |
'</li>'; |
} |
} |
} |
} |
if (ref($changes{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
$resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>'; |
if (ref($changes{$type}) eq 'HASH') { |
foreach my $key (sort(keys(%{$changes{'textbooks'}}))) { |
$resulttext .= '<li>'.&mt("Available $type updated").'<ul>'; |
my %coursehash = &Apache::lonnet::coursedescription($key); |
foreach my $key (sort(keys(%{$changes{$type}}))) { |
my $coursetitle = $coursehash{'description'}; |
my %coursehash = &Apache::lonnet::coursedescription($key); |
my $position = $confhash{'textbooks'}{$key}{'order'} + 1; |
my $coursetitle = $coursehash{'description'}; |
$resulttext .= '<li>'; |
my $position = $confhash{$type}{$key}{'order'} + 1; |
foreach my $item ('subject','title','author') { |
$resulttext .= '<li>'; |
my $name = $item.':'; |
foreach my $item ('subject','title','publisher','author') { |
$name =~ s/^(\w)/\U$1/; |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
$resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />'; |
($type eq 'templates')); |
} |
my $name = $item.':'; |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
$name =~ s/^(\w)/\U$1/; |
if ($confhash{'textbooks'}{$key}{'image'}) { |
$resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />'; |
$resulttext .= ' '.&mt('Image: [_1]', |
} |
'<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'. |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
' alt="Textbook cover" />').'<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 .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
$resulttext .= '</ul></li>'; |
|
} |
} |
if (ref($changes{'validation'}) eq 'HASH') { |
if (ref($changes{'validation'}) eq 'HASH') { |
if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
Line 7422 sub modify_quotas {
|
Line 7519 sub modify_quotas {
|
} |
} |
|
|
sub process_textbook_image { |
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 $filename = $env{'form.'.$caller.'.filename'}; |
my ($error,$url); |
my ($error,$url); |
my ($width,$height) = (50,50); |
my ($width,$height) = (50,50); |
Line 7433 sub process_textbook_image {
|
Line 7530 sub process_textbook_image {
|
} elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
my ($result,$imageurl) = |
my ($result,$imageurl) = |
&publishlogo($r,'upload',$caller,$dom,$confname, |
&publishlogo($r,'upload',$caller,$dom,$confname, |
"textbooks/$dom/$cnum/cover",$width,$height); |
"$type/$dom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 8450 sub modify_selfcreation {
|
Line 8547 sub modify_selfcreation {
|
# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. |
# 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'}) { |
push(@contexts,'emailusername'); |
push(@contexts,'emailusername'); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
Line 8868 sub modify_selfcreation {
|
Line 8965 sub modify_selfcreation {
|
foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { |
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>'; |
'<ul>'; |
foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
if ($cancreate{'emailusername'}{$type}{$field}) { |
if ($cancreate{'emailusername'}{$type}{$field}) { |
$chgtext .= '<li>'.$infotitles->{$field}.'</li>'; |
$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 { |
} 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 />'; |
} |
} |
} |
} |
} |
} |
Line 8984 sub process_captcha {
|
Line 9083 sub process_captcha {
|
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; |
$newpub =~ s/[^\w\-]//g; |
$newpriv =~ s/\W//g; |
$newpriv =~ s/[^\w\-]//g; |
$newsettings->{'recaptchakeys'} = { |
$newsettings->{'recaptchakeys'} = { |
public => $newpub, |
public => $newpub, |
private => $newpriv, |
private => $newpriv, |
Line 9685 sub modify_coursecategories {
|
Line 9784 sub modify_coursecategories {
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
if ($changes{'unauth'} || $changes{'auth'}) { |
if ($changes{'unauth'} || $changes{'auth'}) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
if ($changes{'auth'}) { |
|
$domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'}; |
|
} |
|
if ($changes{'unauth'}) { |
|
$domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'}; |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domdefaults'} = 1; |
} |
} |
} |
} |
} else { |
} else { |
Line 10580 sub modify_loadbalancing {
|
Line 10687 sub modify_loadbalancing {
|
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %libraryservers = &Apache::lonnet::get_servers($dom,'library'); |
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
my $resulttext; |
my $resulttext; |
Line 10693 sub modify_loadbalancing {
|
Line 10801 sub modify_loadbalancing {
|
\%defaultshash,$dom); |
\%defaultshash,$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
|
my %toupdate; |
if (ref($changes{'delete'}) eq 'ARRAY') { |
if (ref($changes{'delete'}) eq 'ARRAY') { |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
$toupdate{$balancer} = 1; |
&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
|
} |
} |
} |
} |
if (ref($changes{'add'}) eq 'ARRAY') { |
if (ref($changes{'add'}) eq 'ARRAY') { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
|
$toupdate{$balancer} = 1; |
} |
} |
} |
} |
if (ref($changes{'curr'}) eq 'HASH') { |
if (ref($changes{'curr'}) eq 'HASH') { |
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
|
$toupdate{$balancer} = 1; |
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
if ($changes{'curr'}{$balancer}{'targets'}) { |
if ($changes{'curr'}{$balancer}{'targets'}) { |
my %offloadstr; |
my %offloadstr; |
Line 10743 sub modify_loadbalancing {
|
Line 10853 sub modify_loadbalancing {
|
if ($rule eq '') { |
if ($rule eq '') { |
$balancetext = $ruletitles{'default'}; |
$balancetext = $ruletitles{'default'}; |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
$balancetext = $ruletitles{$rule}; |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
|
foreach my $sparetype (@sparestypes) { |
|
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
|
map { $toupdate{$_} = 1; } (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}}); |
|
} |
|
} |
|
foreach my $item (@{$alltypes}) { |
|
next if ($item =~ /^_LC_ipchange/); |
|
my $hasrule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$item}; |
|
if ($hasrule eq 'homeserver') { |
|
map { $toupdate{$_} = 1; } (keys(%libraryservers)); |
|
} else { |
|
unless (($hasrule eq 'default') || ($hasrule eq 'none') || ($hasrule eq 'externalbalancer')) { |
|
if ($servers{$hasrule}) { |
|
$toupdate{$hasrule} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if (($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
|
$balancetext = $ruletitles{$rule}; |
|
} else { |
|
my $receiver = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}; |
|
$balancetext = $ruletitles{'particular'}.' '.$receiver; |
|
if ($receiver) { |
|
$toupdate{$receiver}; |
|
} |
|
} |
|
} else { |
|
$balancetext = $ruletitles{$rule}; |
|
} |
} else { |
} else { |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
} |
} |
Line 10753 sub modify_loadbalancing {
|
Line 10893 sub modify_loadbalancing {
|
} |
} |
} |
} |
} |
} |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
if (keys(%toupdate)) { |
&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
my %thismachine; |
|
my $updatedhere; |
|
my $cachetime = 60*60*24; |
|
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
|
foreach my $lonhost (keys(%toupdate)) { |
|
if ($thismachine{$lonhost}) { |
|
unless ($updatedhere) { |
|
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
|
$defaultshash{'loadbalancing'}, |
|
$cachetime); |
|
$updatedhere = 1; |
|
} |
|
} else { |
|
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
|
} |
|
} |
|
} |
} |
} |
} |
} |
if ($resulttext ne '') { |
if ($resulttext ne '') { |
Line 10895 sub active_dc_picker {
|
Line 11052 sub active_dc_picker {
|
my ($dcname,$dcdom) = split(':',$domcoord[0]); |
my ($dcname,$dcdom) = split(':',$domcoord[0]); |
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
if ($inputtype eq 'radio') { |
if ($inputtype eq 'radio') { |
$table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
$table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
} |
} |
Line 10904 sub active_dc_picker {
|
Line 11061 sub active_dc_picker {
|
if (exists($currhash{$domcoord[0]})) { |
if (exists($currhash{$domcoord[0]})) { |
$check = ' checked="checked"'; |
$check = ' checked="checked"'; |
} |
} |
$table .= '<span class="LC_nobreak"><label>'. |
$table = '<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$name.'" '. |
'<input type="checkbox" name="'.$name.'" '. |
'value="'.$domcoord[0].'"'.$check.' />'.$user; |
'value="'.$domcoord[0].'"'.$check.' />'.$user; |
if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
} |
} |