getUrl() fixed for File and File_thumbnail to correct http/https stuff and other

diff --git a/classes/File.php b/classes/File.php
index 1edc89d5d7be503d30f3a1e03bcacc5453fa58ea..3bbdcbe99069d2fcd2a4b013066ca1460ebd6b11 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -453,11 +453,42 @@ class File extends Managed_DataObject
     {
         return self::path($this->filename);
     }
+
     public function getUrl()
     {
+        if (!empty($this->filename)) {
+            // A locally stored file, so let's generate a URL for our instance.
+            $url = self::url($this->filename);
+            if ($url != $this->url) {
+                // For indexing purposes, in case we do a lookup on the 'url' field.
+                // also we're fixing possible changes from http to https, or paths
+                $this->updateUrl($url);
+            }
+            return $url;
+        }
+
+        // No local filename available, return the URL we have stored
         return $this->url;
     }
 
+    public function updateUrl($url)
+    {
+        $file = File::getKV('url', $url);
+        if ($file instanceof File) {
+            throw new ServerException('URL already exists in DB');
+        }
+        $sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
+        $result = $this->query(sprintf($sql, $this->__table,
+                                             $this->_quote((string)$url),
+                                             $this->_quote((string)$this->url)));
+        if ($result === false) {
+            common_log_db_error($this, 'UPDATE', __FILE__);
+            throw new ServerException("Could not UPDATE {$this->__table}.url");
+        }
+
+        return $result;
+    }
+
     /**
      * Blow the cache of notices that link to this URL
      *

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 10135f3d2f8fd9edd5198217f9b6e3ffeec0e4ee..4d76b7dc55fc2e61036f9756aecc71f07183842d 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -110,9 +110,39 @@ class File_thumbnail extends Managed_DataObject
 
     public function getUrl()
     {
+        if (!empty($this->filename)) {
+            // A locally stored file, so let's generate a URL for our instance.
+            $url = File::url($this->filename);
+            if ($url != $this->url) {
+                // For indexing purposes, in case we do a lookup on the 'url' field.
+                // also we're fixing possible changes from http to https, or paths
+                $this->updateUrl($url);
+            }
+            return $url;
+        }
+
+        // No local filename available, return the URL we have stored
         return $this->url;
     }
 
+    public function updateUrl($url)
+    {
+        $file = File_thumbnail::getKV('url', $url);
+        if ($file instanceof File_thumbnail) {
+            throw new ServerException('URL already exists in DB');
+        }
+        $sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
+        $result = $this->query(sprintf($sql, $this->__table,
+                                             $this->_quote((string)$url),
+                                             $this->_quote((string)$this->url)));
+        if ($result === false) {
+            common_log_db_error($this, 'UPDATE', __FILE__);
+            throw new ServerException("Could not UPDATE {$this->__table}.url");
+        }
+
+        return $result;
+    }
+
     public function delete($useWhere=false)
     {
         if (!empty($this->filename) && file_exists(File_thumbnail::path($this->filename))) {