\n";
+ $scrout .= " | ".&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)." |
\n";
my $cafter =
&Apache::lonhtmlcommon::date_setter('advsearch', # formname
'creationdate1', # fieldname
@@ -1062,10 +1054,10 @@ ENDHEADER
'', # state
1, # no_hh_mm_ss
);
- $scrout .= &mt('Created between | '.
- '[_1] |
'.
- 'and | '.
- '[_2] |
',$cafter,$cbefore);
+ $scrout .= ''.&mt('Created between').' | '
+ .''.$cafter.' |
'
+ .''.&mt('and').' | '
+ .''.$cbefore.' |
';
my $lafter =
&Apache::lonhtmlcommon::date_setter('advsearch',
'revisiondate1',
@@ -1084,10 +1076,10 @@ ENDHEADER
'', # state
1, # no_hh_mm_ss
);
- $scrout .= &mt('Last modified between | '.
- '[_1] |
'.
- 'and | '.
- '[_2] |
',$lafter,$lbefore);
+ $scrout .= ''.&mt('Last modified between').' | '
+ .''.$lafter.' |
'
+ .''.&mt('and').' | '
+ .''.$lbefore.' |
';
$scrout.="\n";
$scrout.=< NOW())) AND (".join(') AND (',@queries).'))';
+ $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
} else {
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
}
@@ -1710,7 +1702,7 @@ sub parse_basic_search {
#
# Clean up fields for safety
for my $field ('basicexp') {
- $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;
+ $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
}
foreach ('mode','form','element') {
# is this required? Hmmm.
@@ -1749,7 +1741,7 @@ sub parse_basic_search {
#}
my $final_query;
if ($env{'form.area'} eq 'portfolio') {
- $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND '.join(" AND ",@Queries).')';
+ $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
} else {
$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
}
@@ -2125,6 +2117,10 @@ sub copyright_check {
($env{'user.domain'} ne $resdom)) {
return 0;
}
+ # Check for custom rights
+ if ($Metadata->{'copyright'} eq 'custom') {
+ return &Apache::lonnet::customaccess('bre',$Metadata->{'url'});
+ }
return 1;
}
@@ -2493,8 +2489,6 @@ sub run_search {
$r->print(<
-
END
# Remove leading and trailing
$pretty_string =~ s:^\s*
::i;
@@ -2505,7 +2499,7 @@ END
pop(@Lines);
}
if (@Lines > 2) {
- $pretty_string = join '
',(@Lines[0..2],'....
');
+ $pretty_string = join '
',(@Lines[0..2],'...
');
}
$r->print(&mt("Search: [_1]",$pretty_string));
$r->rflush();
@@ -2560,18 +2554,22 @@ END
my $server;
my $status;
my $revise = &revise_button();
- $r->print(<
-Status | Total Matches | Time Remaining | |
-
- |
- |
- |
-$revise |
-
-
-
-END
+ $r->print('');
$r->rflush();
&reset_timing();
&update_seconds($r);
@@ -2643,8 +2641,6 @@ END
my %Fields = &parse_raw_result($result,$server,$tabletype);
$Fields{'hostname'} = $server;
#
- # Skip if external and we did not want that
- next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
# Skip based on copyright
next if (! ©right_check(\%Fields));