"REPOSITORY/MDL-18356, append extenstions to file names smartly"

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 0e1b2f9181df9e4f933fb8ff95cc78b4847eb4d5..5fc55ebfabaf93a62516a276f8499ceea1e0738c 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -162,7 +162,12 @@ class repository_flickr extends repository {
                 } else {
                     $format = 'jpg';
                 }
-                $ret['list'][] = array('title'=>$p['title'].'.'.$format,'source'=>$p['id'],
+                $format = '.'.$format;
+                // append extensions to the files
+                if (substr($p['title'], strlen($p['title'])-strlen($format)) != $format) {
+                    $p['title'] .= $format; 
+                }
+                $ret['list'][] = array('title'=>$p['title'],'source'=>$p['id'],
                     'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'),
                     'date'=>'', 'size'=>'unknown', 'url'=>$photos_url.$p['id']);
             }

diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index c960ab96bf93b6abc2df567d655c8a1c8ad1f43a..1262ff42f4a537245b4c97e63b3d3e4b6cdb8177 100644 (file)
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -224,7 +224,12 @@ class repository_flickr_public extends repository {
                 } else {
                     $format = 'jpg';
                 }
-                $ret['list'][] = array('title'=>$p['title'].'.'.$format,'source'=>$p['id'],
+                $format = '.'.$format;
+                // append extensions to the files
+                if (substr($p['title'], strlen($p['title'])-strlen($format)) != $format) {
+                    $p['title'] .= $format; 
+                }
+                $ret['list'][] = array('title'=>$p['title'], 'source'=>$p['id'],
                     'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'),
                     'date'=>'', 'size'=>'unknown', 'url'=>'http://www.flickr.com/photos/'.$p['owner'].'/'.$p['id']);
             }