version 1.23, 2007/07/25 20:12:26
|
version 1.26, 2007/09/01 21:20:14
|
Line 271 sub print_config_box {
|
Line 271 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row">'); |
<tr class="LC_info_row">'); |
if ($action eq 'login') { |
if (($action eq 'login') || ($action eq 'directorysrch')) { |
$r->print(' |
$r->print(' |
<td class="LC_left_item" colspan="2">'.$item->{'header'}->[0]->{'col1'}.'</td>'); |
<td class="LC_left_item" colspan="2">'.$item->{'header'}->[0]->{'col1'}.'</td>'); |
} else { |
} else { |
Line 745 sub print_quotas {
|
Line 745 sub print_quotas {
|
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
my $typecount = 0; |
my $typecount = 0; |
my $css_class; |
my $css_class; |
if (@{$types} > 0) { |
if (ref($types) eq 'ARRAY') { |
foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
if (defined($usertypes->{$type})) { |
if (defined($usertypes->{$type})) { |
$typecount ++; |
$typecount ++; |
Line 768 sub print_quotas {
|
Line 768 sub print_quotas {
|
$typecount ++; |
$typecount ++; |
$css_class = $typecount%2?' class="LC_odd_row"':''; |
$css_class = $typecount%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.&mt($othertitle).'</td>'. |
'<td>'.$othertitle.'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<input type="text" name="defaultquota" value="'. |
'<input type="text" name="defaultquota" value="'. |
$defaultquota.'" size="5" /> Mb</span></td></tr>'; |
$defaultquota.'" size="5" /> Mb</span></td></tr>'; |
Line 878 sub print_autoupdate {
|
Line 878 sub print_autoupdate {
|
gen => 'Generation', |
gen => 'Generation', |
); |
); |
my $numrows = 0; |
my $numrows = 0; |
if (@{$types} > 0) { |
if (ref($types) eq 'ARRAY') { |
$datatable = |
if (@{$types} > 0) { |
&usertype_update_row($settings,$usertypes,\%fieldtitles, |
$datatable = |
\@fields,$types,\$numrows); |
&usertype_update_row($settings,$usertypes,\%fieldtitles, |
|
\@fields,$types,\$numrows); |
|
} |
} |
} |
$datatable .= |
$datatable .= |
&usertype_update_row($settings,{'default' => $othertitle}, |
&usertype_update_row($settings,{'default' => $othertitle}, |
Line 895 sub print_directorysrch {
|
Line 897 sub print_directorysrch {
|
my ($dom,$settings) = @_; |
my ($dom,$settings) = @_; |
my $srchon = ' '; |
my $srchon = ' '; |
my $srchoff = ' checked="checked" '; |
my $srchoff = ' checked="checked" '; |
my $exacton = ''; |
my ($exacton,$containson,$beginson); |
my $containson = ' checked="checked" '; |
my $localon = ' '; |
my $specifyon = ''; |
my $localoff = ' checked="checked" '; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'available'} eq '1') { |
if ($settings->{'available'} eq '1') { |
$srchon = $srchoff; |
$srchon = $srchoff; |
$srchoff = ' '; |
$srchoff = ' '; |
} |
} |
if ($settings->{'searchtypes'} eq 'exact') { |
if ($settings->{'localonly'} eq '1') { |
$exacton = $containson; |
$localon = $localoff; |
$containson = ' '; |
$localoff = ' '; |
} |
} |
if ($settings->{'searchtypes'} eq 'specify') { |
if (ref($settings->{'searchtypes'}) eq 'ARRAY') { |
$specifyon = $containson; |
foreach my $type (@{$settings->{'searchtypes'}}) { |
$containson = ' '; |
if ($type eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($type eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($type eq 'begins') { |
|
$beginson = ' checked="checked" '; |
|
} |
|
} |
|
} else { |
|
if ($settings->{'searchtypes'} eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'specify') { |
|
$exacton = ' checked="checked" '; |
|
$containson = ' checked="checked" '; |
|
} |
} |
} |
} |
} |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
|
|
my $numinrow = 4; |
my $numinrow = 4; |
|
my $cansrchrow = 0; |
my $datatable='<tr class="LC_odd_row">'. |
my $datatable='<tr class="LC_odd_row">'. |
'<td>'.&mt('Directory search available?').'</td>'. |
'<td colspan="2">'.&mt('Directory search available?').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="dirsrch_available"'. |
'<input type="radio" name="dirsrch_available"'. |
$srchon.' value="1" />'.&mt('Yes').'</label> '. |
$srchon.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="dirsrch_available"'. |
'<label><input type="radio" name="dirsrch_available"'. |
$srchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
$srchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
'</tr><tr>'. |
'</tr><tr>'. |
'<td>'.&mt('Search latitude').'</td>'. |
'<td colspan="2">'.&mt('Other domains can search?').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="searchtypes"'. |
'<input type="radio" name="dirsrch_localonly"'. |
$exacton.' value="exact" />'.&mt('Exact match only').'</label> '. |
$localoff.' value="0" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="searchtypes"'. |
'<label><input type="radio" name="dirsrch_localonly"'. |
$containson.' value="contains" />'.&mt('Contains is a match').'</label>'. |
$localon.' value="1" />'.&mt('No').'</label></span></td>'. |
' <label><input type="radio" name="searchtypes"'. |
'</tr>'; |
$specifyon.' value="specify" />'.&mt('Specifiable type'). |
if (ref($usertypes) eq 'HASH') { |
'</label></span></td></tr>'. |
if (keys(%{$usertypes}) > 0) { |
'<tr class="LC_odd_row">'. |
$datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom, |
'<td>'.&mt('Users permitted to search'). |
$numinrow,$othertitle); |
'</td><td class="LC_left_item"><table>'; |
$cansrchrow = 1; |
for (my $i=0; $i<@{$types}; $i++) { |
|
if (defined($usertypes->{$types->[$i]})) { |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $check = ' '; |
|
if (ref($settings->{'cansearch'}) eq 'ARRAY') { |
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="cansearch" '. |
|
'value="'.$types->[$i].'"'.$check.'/>'. |
|
$usertypes->{$types->[$i]}.'</label></span></td>'; |
|
} |
} |
} |
} |
|
if ($cansrchrow) { |
my $rem = @{$types}%($numinrow); |
$datatable .= '<tr>'; |
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
} else { |
$datatable .= '<td class="LC_left_item">'; |
$datatable .= '<tr class="LC_odd_row">'; |
} |
} |
my $defcheck = ' '; |
$datatable .= '<td>'.&mt('Supported search methods'). |
if (ref($settings->{'cansearch'}) eq 'ARRAY') { |
'</td><td class="LC_left_item" colspan="2"><table><tr>'; |
if (grep(/^default$/,@{$settings->{'cansearch'}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="cansearch" '. |
|
'value="default"'.$defcheck.'/>'. |
|
$othertitle.'</label></span></td>'. |
|
'</tr></table></td></tr>'; |
|
|
|
$datatable .= '<tr>'. |
|
'<td>'.&mt('Supported search methods'). |
|
'</td><td class="LC_left_item"><table><tr>'; |
|
foreach my $title (@{$titleorder}) { |
foreach my $title (@{$titleorder}) { |
if (defined($searchtitles->{$title})) { |
if (defined($searchtitles->{$title})) { |
my $check = ' '; |
my $check = ' '; |
Line 997 sub print_directorysrch {
|
Line 980 sub print_directorysrch {
|
} |
} |
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
|
if ($cansrchrow) { |
|
$datatable .= '<tr class="LC_odd_row">'; |
|
} else { |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td>'.&mt('Search latitude').'</td>'. |
|
'<td class="LC_left_item" colspan="2">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchtypes" '. |
|
$exacton.' value="exact" />'.&mt('Exact match'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$beginson.' value="begins" />'.&mt('Begins with'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$containson.' value="contains" />'.&mt('Contains'). |
|
'</label></span></td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub users_cansearch_row { |
|
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_; |
|
my $output = '<tr class="LC_odd_row">'. |
|
'<td>'.&mt('Users allowed to search').' ('.$dom.')'. |
|
'</td><td class="LC_left_item" colspan="2"><table>'; |
|
my $rem; |
|
if (ref($types) eq 'ARRAY') { |
|
for (my $i=0; $i<@{$types}; $i++) { |
|
if (defined($usertypes->{$types->[$i]})) { |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$output .= '</tr>'; |
|
} |
|
$output .= '<tr>'; |
|
} |
|
my $check = ' '; |
|
if (ref($settings->{'cansearch'}) eq 'ARRAY') { |
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
|
$output .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="cansearch" '. |
|
'value="'.$types->[$i].'"'.$check.'/>'. |
|
$usertypes->{$types->[$i]}.'</label></span></td>'; |
|
} |
|
} |
|
|
|
$rem = @{$types}%($numinrow); |
|
} |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$output .= '<td class="LC_left_item">'; |
|
} |
|
my $defcheck = ' '; |
|
if (ref($settings->{'cansearch'}) eq 'ARRAY') { |
|
if (grep(/^default$/,@{$settings->{'cansearch'}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="cansearch" '. |
|
'value="default"'.$defcheck.'/>'. |
|
$othertitle.'</label></span></td>'. |
|
'</tr></table></td></tr>'; |
|
return $output; |
|
} |
|
|
sub sorted_inst_types { |
sub sorted_inst_types { |
my ($dom) = @_; |
my ($dom) = @_; |
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
my $othertitle = "All users"; |
my $othertitle = &mt('All users'); |
my @types; |
my @types; |
if (ref($order) eq 'ARRAY') { |
if (ref($order) eq 'ARRAY') { |
@types = @{$order}; |
@types = @{$order}; |
Line 1029 sub sorted_searchtitles {
|
Line 1081 sub sorted_searchtitles {
|
return (\%searchtitles,\@titleorder); |
return (\%searchtitles,\@titleorder); |
} |
} |
|
|
|
sub sorted_searchtypes { |
|
my %srchtypes_desc = ( |
|
exact => 'is exact match', |
|
contains => 'contains ..', |
|
begins => 'begins with ..', |
|
); |
|
my @srchtypeorder = ('exact','begins','contains'); |
|
return (\%srchtypes_desc,\@srchtypeorder); |
|
} |
|
|
sub usertype_update_row { |
sub usertype_update_row { |
my ($settings,$usertypes,$fieldtitles,$fields,$types,$rownums) = @_; |
my ($settings,$usertypes,$fieldtitles,$fields,$types,$rownums) = @_; |
my $datatable; |
my $datatable; |
Line 1681 sub check_switchserver {
|
Line 1743 sub check_switchserver {
|
sub modify_quotas { |
sub modify_quotas { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my ($usertypes,$order) = |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
&Apache::lonnet::retrieve_inst_usertypes($dom); |
|
my %formhash; |
my %formhash; |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ($key =~ /^form\.quota_(.+)$/) { |
if ($key =~ /^form\.quota_(.+)$/) { |
Line 1716 sub modify_quotas {
|
Line 1777 sub modify_quotas {
|
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (sort(keys(%changes))) { |
foreach my $type (@{$types},'default') { |
$resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$usertypes->{$item},$formhash{$item}).'</li>'; |
if (defined($changes{$type})) { |
|
my $typetitle = $usertypes->{$type}; |
|
if ($type eq 'default') { |
|
$typetitle = $othertitle; |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$formhash{$type}).'</li>'; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 1811 sub modify_autoupdate {
|
Line 1878 sub modify_autoupdate {
|
run => 'Auto-update:', |
run => 'Auto-update:', |
classlists => 'Updates to user information in classlists?' |
classlists => 'Updates to user information in classlists?' |
); |
); |
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
id => 'Student/Employee ID', |
id => 'Student/Employee ID', |
permanentemail => 'E-mail address', |
permanentemail => 'E-mail address', |
Line 1822 sub modify_autoupdate {
|
Line 1889 sub modify_autoupdate {
|
); |
); |
my $othertitle = &mt('All users'); |
my $othertitle = &mt('All users'); |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$othertitle = "Other users"; |
$othertitle = &mt('Other users'); |
} |
} |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) { |
if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) { |
Line 1844 sub modify_autoupdate {
|
Line 1911 sub modify_autoupdate {
|
} |
} |
} elsif ($key eq 'fields') { |
} elsif ($key eq 'fields') { |
if (ref($currautoupdate{$key}) eq 'HASH') { |
if (ref($currautoupdate{$key}) eq 'HASH') { |
foreach my $item (keys(%{$currautoupdate{$key}})) { |
foreach my $item (@{$types},'default') { |
if (ref($currautoupdate{$key}{$item}) eq 'ARRAY') { |
if (ref($currautoupdate{$key}{$item}) eq 'ARRAY') { |
my $change = 0; |
my $change = 0; |
foreach my $type (@{$currautoupdate{$key}{$item}}) { |
foreach my $type (@{$currautoupdate{$key}{$item}}) { |
if (!exists($fields{$item})) { |
if (!exists($fields{$item})) { |
$change = 1; |
$change = 1; |
} elsif (ref($fields{$item}) eq 'ARRAY') { |
} elsif (ref($fields{$item}) eq 'ARRAY') { |
if (!grep/^\Q$type\E$/,@{$fields{$item}}) { |
if (!grep(/^\Q$type\E$/,@{$fields{$item}})) { |
$change = 1; |
$change = 1; |
} |
} |
} |
} |
Line 1859 sub modify_autoupdate {
|
Line 1926 sub modify_autoupdate {
|
if ($change) { |
if ($change) { |
push(@{$changes{$key}},$item); |
push(@{$changes{$key}},$item); |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
foreach my $key (keys(%fields)) { |
foreach my $item (@{$types},'default') { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (defined($fields{$item})) { |
if (!exists($currautoupdate{'fields'}{$key})) { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
push(@{$changes{'fields'}},$key); |
if (!exists($currautoupdate{'fields'}{$item})) { |
|
push(@{$changes{'fields'}},$item); |
|
} |
|
} else { |
|
push(@{$changes{'fields'}},$item); |
} |
} |
} else { |
|
push(@{$changes{'fields'}},$key); |
|
} |
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%updatehash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%updatehash, |
Line 1892 sub modify_autoupdate {
|
Line 1961 sub modify_autoupdate {
|
$newvaluestr = &mt('none'); |
$newvaluestr = &mt('none'); |
} |
} |
if ($item eq 'default') { |
if ($item eq 'default') { |
$resulttext .= '<li>'.&mt("Updates for $othertitle set to: [_1]",$newvaluestr).'</li>'; |
$resulttext .= '<li>'.&mt("Updates for '[_1]' set to: '[_2]'",$othertitle,$newvaluestr).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt("Updates for [_1] set to: [_2]",$usertypes->{$item},$newvaluestr).'</li>'; |
$resulttext .= '<li>'.&mt("Updates for '[_1]' set to: '[_2]'",$usertypes->{$item},$newvaluestr).'</li>'; |
} |
} |
} |
} |
} else { |
} else { |
Line 1928 sub modify_directorysrch {
|
Line 1997 sub modify_directorysrch {
|
} |
} |
} |
} |
my %title = ( available => 'Directory search available', |
my %title = ( available => 'Directory search available', |
cansearch => 'Users permitted to search', |
localonly => 'Other domains can search', |
searchby => 'Search types', |
searchby => 'Search types', |
searchtypes => 'Search latitude'); |
searchtypes => 'Search latitude'); |
|
|
my @offon = ('off','on'); |
my @offon = ('off','on'); |
|
my @otherdoms = ('Yes','No'); |
|
|
|
my @searchtypes = &Apache::loncommon::get_env_multiple('form.searchtypes'); |
my @cansearch = &Apache::loncommon::get_env_multiple('form.cansearch'); |
my @cansearch = &Apache::loncommon::get_env_multiple('form.cansearch'); |
my @searchby = &Apache::loncommon::get_env_multiple('form.searchby'); |
my @searchby = &Apache::loncommon::get_env_multiple('form.searchby'); |
|
|
if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') { |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
foreach my $type (@{$currdirsrch{'cansearch'}}) { |
if (keys(%{$usertypes}) == 0) { |
if (!grep(/^\Q$type\E$/,@cansearch)) { |
@cansearch = ('default'); |
push(@{$changes{'cansearch'}},$type); |
} else { |
|
if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') { |
|
foreach my $type (@{$currdirsrch{'cansearch'}}) { |
|
if (!grep(/^\Q$type\E$/,@cansearch)) { |
|
push(@{$changes{'cansearch'}},$type); |
|
} |
} |
} |
} |
foreach my $type (@cansearch) { |
foreach my $type (@cansearch) { |
if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) { |
if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) { |
push(@{$changes{'cansearch'}},$type); |
push(@{$changes{'cansearch'}},$type); |
} |
} |
} |
|
} else { |
|
push(@{$changes{'cansearch'}},@cansearch); |
} |
} |
} else { |
|
push(@{$changes{'cansearch'}},@cansearch); |
|
} |
} |
|
|
if (ref($currdirsrch{'searchby'}) eq 'ARRAY') { |
if (ref($currdirsrch{'searchby'}) eq 'ARRAY') { |
Line 1966 sub modify_directorysrch {
|
Line 2041 sub modify_directorysrch {
|
} else { |
} else { |
push(@{$changes{'searchby'}},@searchby); |
push(@{$changes{'searchby'}},@searchby); |
} |
} |
|
|
|
if (ref($currdirsrch{'searchtypes'}) eq 'ARRAY') { |
|
foreach my $type (@{$currdirsrch{'searchtypes'}}) { |
|
if (!grep(/^\Q$type\E$/,@searchtypes)) { |
|
push(@{$changes{'searchtypes'}},$type); |
|
} |
|
} |
|
foreach my $type (@searchtypes) { |
|
if (!grep(/^\Q$type\E$/,@{$currdirsrch{'searchtypes'}})) { |
|
push(@{$changes{'searchtypes'}},$type); |
|
} |
|
} |
|
} else { |
|
if (exists($currdirsrch{'searchtypes'})) { |
|
foreach my $type (@searchtypes) { |
|
if ($type ne $currdirsrch{'searchtypes'}) { |
|
push(@{$changes{'searchtypes'}},$type); |
|
} |
|
} |
|
if (!grep(/^\Q$currdirsrch{'searchtypes'}\E/,@searchtypes)) { |
|
push(@{$changes{'searchtypes'}},$currdirsrch{'searchtypes'}); |
|
} |
|
} else { |
|
push(@{$changes{'searchtypes'}},@searchtypes); |
|
} |
|
} |
|
|
my %dirsrch_hash = ( |
my %dirsrch_hash = ( |
directorysrch => { available => $env{'form.dirsrch_available'}, |
directorysrch => { available => $env{'form.dirsrch_available'}, |
cansearch => \@cansearch, |
cansearch => \@cansearch, |
|
localonly => $env{'form.dirsrch_localonly'}, |
searchby => \@searchby, |
searchby => \@searchby, |
searchtypes => $env{'form.searchtypes'}, |
searchtypes => \@searchtypes, |
} |
} |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash, |
Line 1986 sub modify_directorysrch {
|
Line 2088 sub modify_directorysrch {
|
$changes{'available'} = 1; |
$changes{'available'} = 1; |
} |
} |
} |
} |
if (exists($currdirsrch{'searchtypes'})) { |
if (exists($currdirsrch{'localonly'})) { |
if ($currdirsrch{'searchtypes'} ne $env{'form.searchtypes'}) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) { |
$changes{'searchtypes'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.searchtypes'}) { |
if ($env{'form.dirsrch_localonly'} eq '1') { |
$changes{'searchtypes'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
Line 2000 sub modify_directorysrch {
|
Line 2102 sub modify_directorysrch {
|
if ($changes{'available'}) { |
if ($changes{'available'}) { |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
} |
} |
|
if ($changes{'localonly'}) { |
|
$resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>'; |
|
} |
|
|
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); |
|
my $chgtext; |
my $chgtext; |
foreach my $type (@cansearch) { |
if (ref($usertypes) eq 'HASH') { |
if (defined($usertypes->{$type})) { |
if (keys(%{$usertypes}) > 0) { |
$chgtext .= $usertypes->{$type}.'; '; |
foreach my $type (@{$types}) { |
|
if (grep(/^\Q$type\E$/,@cansearch)) { |
|
$chgtext .= $usertypes->{$type}.'; '; |
|
} |
|
} |
|
if (grep(/^default$/,@cansearch)) { |
|
$chgtext .= $othertitle; |
|
} else { |
|
$chgtext =~ s/\; $//; |
|
} |
|
$resulttext .= '<li>'.&mt("Users from domain '<span class=\"LC_cusr_emph\">[_1]</span>' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).'</li>'; |
} |
} |
} |
} |
if (grep(/^default$/,@cansearch)) { |
|
$chgtext .= $othertitle; |
|
} else { |
|
$chgtext =~ s/\; $//; |
|
} |
|
$resulttext .= '<li>'.&mt("$title{'cansearch'} set to: [_1]",$chgtext).'</li>'; |
|
} |
} |
if (ref($changes{'searchby'}) eq 'ARRAY') { |
if (ref($changes{'searchby'}) eq 'ARRAY') { |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
Line 2028 sub modify_directorysrch {
|
Line 2137 sub modify_directorysrch {
|
$chgtext =~ s/\; $//; |
$chgtext =~ s/\; $//; |
$resulttext .= '<li>'.&mt("$title{'searchby'} set to: [_1]",$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt("$title{'searchby'} set to: [_1]",$chgtext).'</li>'; |
} |
} |
if ($changes{'searchtypes'}) { |
if (ref($changes{'searchtypes'}) eq 'ARRAY') { |
my %srchtypes_desc = ( |
my ($srchtypes_desc,$srchtypeorder) = &sorted_searchtypes(); |
exact => 'Exact match only', |
my $chgtext; |
contains => 'Contains is a match', |
foreach my $type (@{$srchtypeorder}) { |
specify => 'Match type specifiable', |
if (grep(/^\Q$type\E$/,@searchtypes)) { |
); |
if (defined($srchtypes_desc->{$type})) { |
$resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"$srchtypes_desc{$env{'form.searchtypes'}}\"").'</li>'; |
$chgtext .= $srchtypes_desc->{$type}.'; '; |
|
} |
|
} |
|
} |
|
$chgtext =~ s/\; $//; |
|
$resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 2048 sub modify_directorysrch {
|
Line 2162 sub modify_directorysrch {
|
} |
} |
|
|
1; |
1; |
|
|