--- loncom/interface/londocs.pm	2006/11/29 15:38:22	1.259
+++ loncom/interface/londocs.pm	2006/11/30 23:34:38	1.262
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.259 2006/11/29 15:38:22 www Exp $
+# $Id: londocs.pm,v 1.262 2006/11/30 23:34:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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=~/^http:\/\// || $url=~/^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'});
@@ -1087,6 +1088,7 @@ sub docs_change_log {
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
     $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>'.
@@ -1094,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'});
@@ -2636,6 +2649,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>