--- loncom/interface/loncommon.pm	2013/08/18 17:31:26	1.1146
+++ loncom/interface/loncommon.pm	2013/08/20 02:32:59	1.1149
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1146 2013/08/18 17:31:26 raeburn Exp $
+# $Id: loncommon.pm,v 1.1149 2013/08/20 02:32:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9861,16 +9861,16 @@ sub ask_for_embedded_content {
             $embed_file = $file;
         }
         my $absolutepath;
-        if ($embed_file =~ m{^\w+://}) {
-            $newfiles{$embed_file} = 1;
-            $mapping{$embed_file} = $embed_file;
+        my $cleaned_file = &clean_path($embed_file);
+        if ($cleaned_file =~ m{^\w+://}) {
+            $newfiles{$cleaned_file} = 1;
+            $mapping{$cleaned_file} = $embed_file;
         } else {
             if ($embed_file =~ m{^/}) {
                 $absolutepath = $embed_file;
-                $embed_file =~ s{^(/+)}{};
             }
-            if ($embed_file =~ m{/}) {
-                my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
+            if ($cleaned_file =~ m{/}) {
+                my ($path,$fname) = ($cleaned_file =~ m{^(.+)/([^/]*)$});
                 $path = &check_for_traversal($path,$url,$toplevel);
                 my $item = $fname;
                 if ($path ne '') {
@@ -9887,9 +9887,9 @@ sub ask_for_embedded_content {
             } else {
                 $dependencies{$embed_file} = 1;
                 if ($absolutepath) {
-                    $mapping{$embed_file} = $absolutepath;
+                    $mapping{$cleaned_file} = $absolutepath;
                 } else {
-                    $mapping{$embed_file} = $embed_file;
+                    $mapping{$cleaned_file} = $embed_file;
                 }
             }
         }
@@ -10263,6 +10263,46 @@ sub ask_for_embedded_content {
     return ($output,$counter,$numpathchg);
 }
 
+=pod
+
+=item * clean_path($name)
+
+Performs clean-up of directories, subdirectories and filename in an
+embedded object, referenced in an HTML file which is being uploaded
+to a course or portfolio, where 
+"Upload embedded images/multimedia files if HTML file" checkbox was
+checked.
+
+Clean-up is similar to replacements in lonnet::clean_filename()
+except each / between sub-directory and next level is preserved.
+
+=cut
+
+sub clean_path {
+    my ($embed_file) = @_;
+    $embed_file =~s{^/+}{};
+    my @contents;
+    if ($embed_file =~ m{/}) {
+        @contents = split(/\//,$embed_file);
+    } else {
+        @contents = ($embed_file);
+    }
+    my $lastidx = scalar(@contents)-1;
+    for (my $i=0; $i<=$lastidx; $i++) { 
+        $contents[$i]=~s{\\}{/}g;
+        $contents[$i]=~s/\s+/\_/g;
+        $contents[$i]=~s{[^/\w\.\-]}{}g;
+        if ($i == $lastidx) {
+            $contents[$i]=~s/\.(\d+)(?=\.)/_$1/g;
+        }
+    }
+    if ($lastidx > 0) {
+        return join('/',@contents);
+    } else {
+        return $contents[0];
+    }
+}
+
 sub embedded_file_element {
     my ($context,$num,$embed_file,$mapping,$allfiles,$codebase,$type) = @_;
     return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
@@ -10651,6 +10691,7 @@ sub modify_html_refs {
                         my $numchg = ($content =~ s{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
                         $count += $numchg;
                         $allfiles{$newname} = $allfiles{$ref};
+                        delete($allfiles{$ref});
                     }
                     if ($env{'form.embedded_codebase_'.$i} ne '') {
                         $codebase = &unescape($env{'form.embedded_codebase_'.$i});
@@ -12121,6 +12162,9 @@ sub get_turnedin_filepath {
                             my $title = $res->compTitle();
                             $title =~ s/\W+/_/g;
                             if ($title ne '') {
+                                if (($pc > 1) && (length($title) > 12)) {
+                                    $title = substr($title,0,12);
+                                }
                                 push(@pathitems,$title);
                             }
                         }
@@ -12129,6 +12173,9 @@ sub get_turnedin_filepath {
                 my $maptitle = $mapres->compTitle();
                 $maptitle =~ s/\W+/_/g;
                 if ($maptitle ne '') {
+                    if (length($maptitle) > 12) {
+                        $maptitle = substr($maptitle,0,12);
+                    }
                     push(@pathitems,$maptitle);
                 }
                 unless ($env{'request.state'} eq 'construct') {
@@ -12169,6 +12216,9 @@ sub get_turnedin_filepath {
                 $restitle = time;
             }
         }
+        if (length($restitle) > 12) {
+            $restitle = substr($restitle,0,12);
+        }
         push(@pathitems,$restitle);
         $path .= join('/',@pathitems);
     }