--- loncom/interface/lonsearchcat.pm	2008/05/28 21:07:29	1.293
+++ loncom/interface/lonsearchcat.pm	2008/12/12 17:46:25	1.302
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.293 2008/05/28 21:07:29 www Exp $
+# $Id: lonsearchcat.pm,v 1.302 2008/12/12 17:46:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,8 +281,9 @@ sub handler {
             $closebutton .="onClick='self.close()'";
         }
         $closebutton .= ">";
+        my $txt_import = &mt('IMPORT');
         $importbutton=<<END;
-<input type='button' name='import' value='IMPORT'
+<input type='button' name='import' value='$txt_import'
 onClick='javascript:select_group()'>
 END
     } else {
@@ -793,10 +794,10 @@ sub setup_basic_search {
              '<br />'.
             '<font size="-1">'.&searchhelp().'</font>'.'</td>'.
             '<td><font size="-1">'.
-            '<nobr>'.('&nbsp;'x3).$adv_search_link.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$userelatedwords.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$onlysearchdomain.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$inclext.'</nobr>'.'<br />'.
+            '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
+            '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
+            '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
+            '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
              '</font></td>'.
             '</tr>'.$/;
     #
@@ -1153,7 +1154,7 @@ Outputs: text for box with view options
 ######################################################################
 ######################################################################
 sub viewoptions {
-    my $scrout;
+    my $scrout = '<span class="LC_nobreak">';
     if (! defined($env{'form.viewselect'})) { 
         $env{'form.viewselect'}='detailed'; 
     }
@@ -1166,8 +1167,9 @@ sub viewoptions {
                                                   $env{'form.show'},
                                                   undef,
                                                   (10,20,50,100,1000,10000));
-    $scrout .= ('&nbsp;'x2).&mt('[_1] Records per Page',$countselect).
-        '</nobr>'.$/;
+    $scrout .= ('&nbsp;'x2)
+              .&mt('[_1] Records per Page',$countselect)
+              .'</span>'.$/;
     return $scrout;
 }
 
@@ -1393,7 +1395,7 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
-	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
+	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.\*]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1638,7 +1640,7 @@ sub parse_advanced_search {
     #
     if (@queries) {
         if ($env{'form.area'} eq 'portfolio') {
-            $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 < NOW() AND (pa.end IS NULL OR pa.end > 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).')';
         }
@@ -1701,7 +1703,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.
@@ -1740,7 +1742,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);
     }
@@ -2116,6 +2118,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;
 }
 
@@ -2484,8 +2490,6 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post">
-<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2496,7 +2500,7 @@ END
         pop(@Lines);
     }
     if (@Lines > 2) {
-        $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
+        $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
     }
     $r->print(&mt("Search: [_1]",$pretty_string));
     $r->rflush();
@@ -2551,18 +2555,22 @@ END
     my $server; 
     my $status;
     my $revise = &revise_button();
-    $r->print(<<END);
-<table>
-<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
-<tr>
-<td><input type="text" name="status"  value="" size="50" /></td>
-<td><input type="text" name="count"   value="" size="10" /></td>
-<td><input type="text" name="seconds" value="" size="8" /></td>
-<td>$revise</td>
-</tr>
-</table>
-</form>
-END
+    $r->print('<form name="statusform" action="" method="post">'."\n".
+              '<input type="hidden" name="acts" value="" />'."\n".
+              '<table border="0"><tr><td>'."\n".
+              &Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Status').'</th>'
+             .'<th>'.&mt('Total Matches').'</th>'
+             .'<th>'.&mt('Time Remaining').'</th>'
+             .&Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::start_data_table_row()
+             .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'
+             .'<td><input type="text" name="count"   value="" size="10" readonly="readonly" /></td>'
+             .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+             .&Apache::loncommon::end_data_table_row()
+             .&Apache::loncommon::end_data_table()
+             .'</td><td>&nbsp;</td><td>'.$revise.'</td></tr></table></form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);
@@ -2887,7 +2895,7 @@ sub display_results {
     ## Output links (if necessary) for 'prev' and 'next' pages.
     $r->print
         ('<table width="100%"><tr><td width="25%" align="right">'.
-         '<nobr>'.$sortform.'</nobr>'.
+         '<span class="LC_nobreak">'.$sortform.'</span>'.
          '</td><td width="25%" align="right">'.
          &prev_next_buttons($min,$env{'form.show'},$total_results).
          '</td><td align="right">'.