--- loncom/interface/londocs.pm	2006/11/27 21:20:29	1.257
+++ loncom/interface/londocs.pm	2006/12/05 02:55:52	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.257 2006/11/27 21:20:29 www Exp $
+# $Id: londocs.pm,v 1.264 2006/12/05 02:55:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath;
 
@@ -99,7 +99,7 @@ sub authorhosts {
 		$ca=$env{'user.name'};
 		$cd=$env{'user.domain'};
 	    } else {
-		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+		($cd,$ca)=($realm=~/^\/($match_domain)\/($match_username)$/);
 	    }
 	    my $allowed=0;
 	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
@@ -366,7 +366,7 @@ sub exportcourse {
             if (ref($curRes)) {
                 my $symb = $curRes->symb();
                 my $ressymb = $symb;
-                if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                     unless ($ressymb =~ m|adm/wrapper/adm|) {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }
@@ -613,7 +613,7 @@ sub build_package {
                         if (grep/^$count$/,@$discussions) {
                             my $ressymb = $symb;
                             my $mode;
-                            if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                            if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                                 unless ($ressymb =~ m|adm/wrapper/adm|) {
                                     $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                                 }
@@ -698,7 +698,7 @@ sub process_content {
         }
     } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
         $content_type = 'examupload';
-    } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
+    } elsif ($symb =~ m-adm/($match_domain)/($match_username)/(\d+)/bulletinboard$-) {
         $content_type = 'bulletinboard';
         my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
         if ($contents) {
@@ -936,7 +936,7 @@ sub group_import {
 	    my $idx = &LONCAPA::map::getresidx($url);
 	    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
 	    my $ext = 'false';
-	    if ($url=~/^http:\/\//) { $ext = 'true'; }
+	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
 	    $url =~ s/:/\:/g;
 	    $name =~ s/:/\:/g;
 	    $LONCAPA::map::resources[$idx] = 
@@ -1028,7 +1028,8 @@ sub log_docs {
 
     sub log_differences {
         my ($plain)=@_;
-        my %storehash=('folder' => $plain);
+        my %storehash=('folder' => $plain,
+                       'currentfolder' => $env{'form.folder'});
         if ($parmidx) {
            $storehash{'parameter_res'}=$oldresources[$parmidx];
            foreach my $parm (keys %parmaction) {
@@ -1063,9 +1064,9 @@ sub log_docs {
 #
 sub docs_change_log {
     my ($r)=@_;
+    my $folder=$env{'form.folder'};
     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
-
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
@@ -1086,12 +1087,8 @@ sub docs_change_log {
 	    'randompick'     => 'Randomly pick',
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
-
-    my $countselect =
-        &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
-                                    (&mt('all'),10,20,50,100,1000,10000));
-
-    $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
+    $r->print(&Apache::loncommon::display_filter().
+              '<input type="hidden" name="folder" value="'.$folder.'" />'.
               '<input type="submit" value="'.&mt('Display').'" /></form>');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
@@ -1099,7 +1096,18 @@ sub docs_change_log {
               &Apache::loncommon::end_data_table_header_row());
     my $shown=0;
     foreach my $id (sort { $docslog{$b}{'exe_time'}<=>$docslog{$a}{'exe_time'} } (keys(%docslog))) {
+	if ($env{'form.displayfilter'} eq 'currentfolder') {
+	    if ($docslog{$id}{'logentry'}{'currentfolder'} ne $folder) { next; }
+	}
         my @changes=keys(%{$docslog{$id}{'logentry'}});
+        if ($env{'form.displayfilter'} eq 'containing') {
+	    my $wholeentry=$docslog{$id}{'exe_uname'}.':'.$docslog{$id}{'exe_udom'}.':'.
+		&Apache::loncommon::plainname($docslog{$id}{'exe_uname'},$docslog{$id}{'exe_udom'});
+	    foreach my $key (@changes) {
+		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
+	    }
+	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }         
+	}
         my $count = 0;
         my $time =
             &Apache::lonlocal::locallocaltime($docslog{$id}{'exe_time'});
@@ -1215,27 +1223,33 @@ sub editor {
 	    if ($env{'form.changeparms'}) {
 		my $idx=$env{'form.setparms'};
 # set parameters
-		if ($env{'form.randpick_'.$idx}) {
-		    &LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
-                    &remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
-		} else {
-		    &LONCAPA::map::delparameter($idx,'parameter_randompick');
-                    &remember_parms($idx,'randompick','del');
+		if ($env{'form.changeparms'} eq 'randompick') {
+		    if ($env{'form.randpick_'.$idx}) {
+			&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
+			&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
+		    } else {
+			&LONCAPA::map::delparameter($idx,'parameter_randompick');
+			&remember_parms($idx,'randompick','del');
+		    }
+		}
+		if ($env{'form.changeparms'} eq 'hiddenresource') {
+		    if ($env{'form.hidprs_'.$idx}) {
+			&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
+			&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
+		    } else {
+			&LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
+			&remember_parms($idx,'hiddenresource','del');
+		    }
+		}
+		if ($env{'form.changeparms'} eq 'encrypturl') {
+		    if ($env{'form.encprs_'.$idx}) {
+			&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
+			&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
+		    } else {
+			&LONCAPA::map::delparameter($idx,'parameter_encrypturl');
+			&remember_parms($idx,'encrypturl','del');
+		    }
 		}
-		if ($env{'form.hidprs_'.$idx}) {
-		    &LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
-                    &remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
- 		} else {
-		    &LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
-                    &remember_parms($idx,'hiddenresource','del');
- 		}
-		if ($env{'form.encprs_'.$idx}) {
-		    &LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
-                    &remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
- 		} else {
-		    &LONCAPA::map::delparameter($idx,'parameter_encrypturl');
-                    &remember_parms($idx,'encrypturl','del');
- 		}
 # store the changed version
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 		if ($fatal) {
@@ -1295,7 +1309,7 @@ sub editor {
 		    $url=~/^(.+)\.(\w+)$/;
 		    my $newurl=$1.$newid.'.'.$2;
 		    my $storefn=$newurl;
-                    $storefn=~s/^\/\w+\/\w+\/\w+\///;
+                    $storefn=~s{^/\w+/$match_domain/$match_username/}{};
 		    &Apache::lonclonecourse::writefile
 			($env{'request.course.id'},$storefn,
 			 &Apache::lonnet::getfile($url));
@@ -1618,7 +1632,7 @@ sub entryline {
     my $foldertitle=$title;
     my $pagetitle=$title;
     my $orderidx=$LONCAPA::map::order[$index];
-    if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) { 
+    if ($title=~ /^(\d+)___&amp;&amp;&amp;___($match_username)___&amp;&amp;&amp;___($match_domain)___&amp;&amp;&amp;___(.*)$/	) { 
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	$renametitle=$4;
 	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
@@ -1769,13 +1783,13 @@ END
     if ($uploaded) {
 	if ($extension eq 'sequence') {
 	    $icon=$iconpath.'/folder_closed.gif';
-	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
 	    $url='/adm/coursedocs?';
 	    $folderarg=$1;
 	    $isfolder=1;
         } elsif ($extension eq 'page') {
             $icon=$iconpath.'/page.gif';
-            $url=~/$coursenum\/([\/\w]+)\.page$/;
+            $url=~/\Q$coursenum\E\/([\/\w]+)\.page$/;
             $pagearg=$1;
             $url='/adm/coursedocs?';
             $ispage=1;
@@ -1834,7 +1848,7 @@ END
                                               'parameter_encrypturl'))[0]=~/^yes$/i);
 	$url.='folderpath='.&escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" onChange="this.form.changeparms.value=1;this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0].
                                               '" />'.
@@ -1873,9 +1887,9 @@ END
 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value=1;this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value=1;this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 ENDPARMS
     }
@@ -2476,7 +2490,8 @@ sub handler {
   my %codebase = ();
   my ($upload_result,$upload_output);
   if ($allowed) {
-      if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+      if (($env{'form.uploaddoc.filename'}) &&
+	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 # Process file upload - phase one - upload and parse primary file.  
           $upload_result = &process_file_upload(\$upload_output,$coursenum,
 						$coursedom,\%allfiles,
@@ -2635,6 +2650,7 @@ $exportbut
 </td><td bgcolor="#DDDDCC">
     <input type="submit" name="listsymbs" value="$lt{'ls'}" />
 </td><td bgcolor="#DDDDCC">
+    <input type="hidden" name="folder" value="$env{'form.folder'}" />
     <input type="submit" name="docslog" value="$lt{'sl'}" />
 </td></tr></table>
 </form>