We have to create and populate the Notice_location table before constraint checking...

[quix0rs-gnu-social.git] / classes / File.php

diff --git a/classes/File.php b/classes/File.php
index 0368153acda7a2acba235ef567774d69199061aa..b28f1373d687e92949cb3eb658e9b58e5c96e3aa 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -120,7 +120,7 @@ class File extends Managed_DataObject
                         // $args['attachment'] should always be set if action===attachment, given our routing rules
                         $file = File::getByID($args['attachment']);
                         return $file;
-                    } catch (EmptyIdException $e) {
+                    } catch (EmptyPkeyValueException $e) {
                         // ...but $args['attachment'] can also be 0...
                     } catch (NoResultException $e) {
                         // apparently this link goes to us, but is _not_ an existing attachment (File) ID?
@@ -260,11 +260,12 @@ class File extends Managed_DataObject
 
     public function getFilename()
     {
-        if (!self::validFilename($this->filename)) {
-            // TRANS: Client exception thrown if a file upload does not have a valid name.
-            throw new ClientException(_("Invalid filename."));
-        }
-        return $this->filename;
+        return self::tryFilename($this->filename);
+    }
+
+    public function getSize()
+    {
+        return intval($this->size);
     }
 
     // where should the file go?
@@ -349,15 +350,23 @@ class File extends Managed_DataObject
         return preg_match('/^[A-Za-z0-9._-]+$/', $filename);
     }
 
+    static function tryFilename($filename)
+    {
+        if (!self::validFilename($filename))
+        {
+            throw new InvalidFilenameException($filename);
+        }
+        // if successful, return the filename for easy if-statementing
+        return $filename;
+    }
+
     /**
      * @throws ClientException on invalid filename
      */
     static function path($filename)
     {
-        if (!self::validFilename($filename)) {
-            // TRANS: Client exception thrown if a file upload does not have a valid name.
-            throw new ClientException(_("Invalid filename."));
-        }
+        self::tryFilename($filename);
+
         $dir = common_config('attachments', 'dir');
 
         if (!in_array($dir[mb_strlen($dir)-1], ['/', '\\'])) {
@@ -369,10 +378,7 @@ class File extends Managed_DataObject
 
     static function url($filename)
     {
-        if (!self::validFilename($filename)) {
-            // TRANS: Client exception thrown if a file upload does not have a valid name.
-            throw new ClientException(_("Invalid filename."));
-        }
+        self::tryFilename($filename);
 
         if (common_config('site','private')) {
 
@@ -477,6 +483,8 @@ class File extends Managed_DataObject
      * @param $width  int   Max width of thumbnail in pixels. (if null, use common_config values)
      * @param $height int   Max height of thumbnail in pixels. (if null, square-crop to $width)
      * @param $crop   bool  Crop to the max-values' aspect ratio
+     * @param $force_still  bool    Don't allow fallback to showing original (such as animated GIF)
+     * @param $upscale      mixed   Whether or not to scale smaller images up to larger thumbnail sizes. (null = site default)
      *
      * @return File_thumbnail
      *
@@ -497,7 +505,7 @@ class File extends Managed_DataObject
                     return File_thumbnail::byFile($this);
                 } catch (NoResultException $e) {
                     // and if it's not a remote file, it'll be safe to use the locally stored File
-                    throw new UseFileAsThumbnailException($this->id);
+                    throw new UseFileAsThumbnailException($this);
                 }
             }
         }
@@ -515,6 +523,11 @@ class File extends Managed_DataObject
         return $filepath;
     }
 
+    public function getAttachmentUrl()
+    {
+        return common_local_url('attachment', array('attachment'=>$this->getID()));
+    }
+
     public function getUrl($prefer_local=true)
     {
         if ($prefer_local && !empty($this->filename)) {