--- loncom/lonnet/perl/lonnet.pm	2013/10/06 20:33:51	1.1241
+++ loncom/lonnet/perl/lonnet.pm	2013/10/14 17:14:48	1.1243
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1241 2013/10/06 20:33:51 raeburn Exp $
+# $Id: lonnet.pm,v 1.1243 2013/10/14 17:14:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1988,6 +1988,7 @@ sub inst_userrules {
 
 sub get_domain_defaults {
     my ($domain,$ignore_cache) = @_;
+    return if (($domain eq '') || ($domain eq 'public'));
     my $cachetime = 60*60*24;
     unless ($ignore_cache) {
         my ($result,$cached)=&is_cached_new('domdefaults',$domain);
@@ -3501,8 +3502,26 @@ sub extract_embedded_items {
                     }
                 }
 	    }
+            if (lc($tagname) eq 'iframe') {
+                my $src = $attr->{'src'} ;
+                if (($src ne '') && ($src !~ m{^(/|https?://)})) {
+                    &add_filetype($allfiles,$src,'src');
+                } elsif ($src =~ m{^/}) {
+                    if ($env{'request.course.id'}) {
+                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                        my $url = &hreflocation('',$fullpath);
+                        if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) {
+                            my $relpath = $1;
+                            if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) {
+                                &add_filetype($allfiles,$1,'src');
+                            }
+                        }
+                    }
+                }
+            }
             if ($t->[4] =~ m{/>$}) {
-                pop(@state);  
+                pop(@state);
             }
 	} elsif ($t->[0] eq 'E') {
 	    my ($tagname) = ($t->[1]);
@@ -6204,7 +6223,7 @@ sub usertools_access {
     }
     return if (!defined($tools{$tool}));
 
-    if ((!defined($udom)) || (!defined($uname))) {
+    if (($udom eq '') || ($uname eq '')) {
         $udom = $env{'user.domain'};
         $uname = $env{'user.name'};
     }