Add attachments 'thumb_width' and 'thumb_height' settings for inline thumbs, defaulting to 100x75.

This is used as the max thumb width/height for oEmbed requests (replacing the old default of 500x400 which was more suitable for the lightbox).

3 files changed, 7 insertions, 5 deletions

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 4813d5dda..a5540ecfe 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -58,11 +58,11 @@ class File_oembed extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    function _getOembed($url, $maxwidth = 500, $maxheight = 400) {
+    function _getOembed($url) {
         require_once INSTALLDIR.'/extlib/Services/oEmbed.php';
         $parameters = array(
-            'maxwidth'=>$maxwidth,
-            'maxheight'=>$maxheight,
+            'maxwidth' => common_config('attachments', 'thumb_width'),
+            'maxheight' => common_config('attachments', 'thumb_height'),
         );
         try{
             $oEmbed = new Services_oEmbed($url);
diff --git a/lib/default.php b/lib/default.php
index a19453fce..87f4e45c0 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -250,6 +250,8 @@ $default =
               'monthly_quota' => 15000000,
               'uploads' => true,
               'filecommand' => '/usr/bin/file',
+              'thumb_width' => 100,
+              'thumb_height' => 75,
               ),
         'application' =>
         array('desclimit' => null),
diff --git a/lib/mediafile.php b/lib/mediafile.php
index 2c04b4650..febf4603a 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -127,8 +127,8 @@ class MediaFile
         $outname = File::filename($this->user->getProfile(), 'thumb-' . $this->filename, $this->mimetype);
         $outpath = File::path($outname);
 
-        $width = 100;
-        $height = 75;
+        $width = common_config('attachments', 'thumb_width');
+        $height = common_config('attachments', 'thumb_height');
 
         $image->resizeTo($outpath, $width, $height);
         File_thumbnail::saveThumbnail($this->fileRecord->id,