Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --combined lib/action.php
index d4e14ab3447cc53d3cdd7d7d058e91c2efadc387,66a5c69a719dd009bd00c2b661079300020203d9..82dd34020440e42ddda3da6452f0060592ee15d6
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -1218,7 -1218,7 +1218,7 @@@ class Action extends HTMLOutputter // l
       *
       * @return boolean is read only action?
       */
 -    function isReadOnly($args)
 +    function isReadOnly(array $args=array())
      {
          return false;
      }
@@@ -1356,6 -1356,19 +1356,19 @@@
          }
      }
  
+     /**
+      * This is a cheap hack to avoid a bug in DB_DataObject
+      * where '' is non-type-aware compared to 0, which means it
+      * will always be true for values like false and 0 too...
+      *
+      * Upstream bug is::
+      * https://pear.php.net/bugs/bug.php?id=20291
+      */
+     function booleanintstring($key, $def)
+     {
+         return $this->boolean($key, $def) ? '1' : '0';
+     }
+ 
      /**
       * Integer value of an argument
       *

diff --combined lib/attachmentlistitem.php
index 5127ced2ebf9b84416283a0963f3cf9841d0c740,8ab6a82a12680aa367bb723812924f2a7b7a0167..99cb3c8da94356be0afa901d22644d2f71809838
--- 1/lib/attachmentlistitem.php
--- 2/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@@ -107,11 -107,10 +107,10 @@@ class AttachmentListItem extends Widge
      function showRepresentation() {
          if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
              if (!empty($this->attachment->mimetype)) {
-                 switch ($this->attachment->mimetype) {
-                 case 'image/gif':
-                 case 'image/png':
-                 case 'image/jpg':
-                 case 'image/jpeg':
+                 $mediatype = common_get_mime_media($this->attachment->mimetype);
+                 switch ($mediatype) {
+                 // Anything we understand as an image, if we need special treatment, do it in StartShowAttachmentRepresentation
+                 case 'image':
                      try {
                          // Tell getThumbnail that we can show an animated image if it has one (4th arg, "force_still")
                          $thumb = $this->attachment->getThumbnail(null, null, false, false);
@@@ -123,27 -122,9 +122,9 @@@
                      }
                      break;
  
-                 case 'application/ogg':
-                     $arr  = array('type' => $this->attachment->mimetype,
-                         'data' => $this->attachment->url,
-                         'width' => 320,
-                         'height' => 240
-                     );
-                     $this->out->elementStart('object', $arr);
-                     $this->out->element('param', array('name' => 'src', 'value' => $this->attachment->url));
-                     $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
-                     $this->out->elementEnd('object');
-                     break;
- 
-                 case 'audio/ogg':
-                 case 'audio/x-speex':
-                 case 'video/mpeg':
-                 case 'audio/mpeg':
-                 case 'video/mp4':
-                 case 'video/ogg':
-                 case 'video/quicktime':
-                 case 'video/webm':
-                     $mediatype = common_get_mime_media($this->attachment->mimetype);
+                 // HTML5 media elements
+                 case 'audio':
+                 case 'video':
                      try {
                          $thumb = $this->attachment->getThumbnail();
                          $poster = $thumb->getUrl();
@@@ -156,22 -137,36 +137,36 @@@
                                              'poster'=>$poster,
                                              'controls'=>'controls'));
                      $this->out->element('source',
-                                         array('src'=>$this->attachment->url,
+                                         array('src'=>$this->attachment->getUrl(),
                                              'type'=>$this->attachment->mimetype));
                      $this->out->elementEnd($mediatype);
                      break;
  
-                 case 'text/html':
-                     if (!empty($this->attachment->filename)
-                             && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
-                         // Locally-uploaded HTML. Scrub and display inline.
-                         $this->showHtmlFile($this->attachment);
+                 default:
+                     switch ($this->attachment->mimetype) {
+                     // Ogg media that we're not really sure what it is...
+                     case 'application/ogg':
+                         $arr  = array('type' => $this->attachment->mimetype,
+                             'data' => $this->attachment->getUrl(),
+                             'width' => 320,
+                             'height' => 240
+                         );
+                         $this->out->elementStart('object', $arr);
+                         $this->out->element('param', array('name' => 'src', 'value' => $this->attachment->getUrl()));
+                         $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
+                         $this->out->elementEnd('object');
                          break;
+                     case 'text/html':
+                         if (!empty($this->attachment->filename)
+                                 && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
+                             // Locally-uploaded HTML. Scrub and display inline.
+                             $this->showHtmlFile($this->attachment);
+                             break;
+                         }
+                         // Fall through to default if it wasn't a _local_ text/html File object
+                     default:
+                         Event::handle('ShowUnsupportedAttachmentRepresentation', array($this->out, $this->attachment));
                      }
-                     // Fall through to default.
- 
-                 default:
-                     Event::handle('ShowUnsupportedAttachmentRepresentation', array($this->out, $this->attachment));
                  }
              } else {
                  Event::handle('ShowUnsupportedAttachmentRepresentation', array($this->out, $this->attachment));
@@@ -215,7 -210,7 +210,7 @@@
              $scripts[] = $script;
          }
          foreach ($scripts as $script) {
 -            common_log(LOG_DEBUG, $script->textContent);
 +            common_debug($script->textContent);
              $script->parentNode->removeChild($script);
          }
  

diff --combined lib/imagefile.php
index 674ba316eb70a53b2335ba315efaa740367f161e,7a545ad09302ce6117bef7f73c5ac4063da2da4f..cc8f8257ff7195e6c392a9c169919098bf30bb97
--- 1/lib/imagefile.php
--- 2/lib/imagefile.php
+++ b/lib/imagefile.php
@@@ -61,22 -61,28 +61,27 @@@ class ImageFil
      {
          $this->id = $id;
          if (!empty($this->id)) {
-             $this->fileRecord = File::getKV('id', $this->id);
-             if (!$this->fileRecord instanceof File) {
-                 throw new ServerException('Expected File object did not exist.');
+             $this->fileRecord = new File();
+             $this->fileRecord->id = $this->id;
+             if (!$this->fileRecord->find(true)) {
+                 // If we have set an ID, we need that ID to exist!
+                 throw new NoResultException($this->fileRecord);
              }
          }
+ 
+         // These do not have to be the same as fileRecord->filename for example,
+         // since we may have generated an image source file from something else!
          $this->filepath = $filepath;
          $this->filename = basename($filepath);
  
          $info = @getimagesize($this->filepath);
  
 -        if (!(
 -            ($info[2] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) ||
 -            ($info[2] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) ||
 -            $info[2] == IMAGETYPE_BMP ||
 -            ($info[2] == IMAGETYPE_WBMP && function_exists('imagecreatefromwbmp')) ||
 -            ($info[2] == IMAGETYPE_XBM && function_exists('imagecreatefromxbm')) ||
 -            ($info[2] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')))) {
 +        if (
 +            ($info[2] == IMAGETYPE_GIF && !function_exists('imagecreatefromgif')) ||
 +            ($info[2] == IMAGETYPE_JPEG && !function_exists('imagecreatefromjpeg')) ||
 +            ($info[2] == IMAGETYPE_WBMP && !function_exists('imagecreatefromwbmp')) ||
 +            ($info[2] == IMAGETYPE_XBM && !function_exists('imagecreatefromxbm')) ||
 +            ($info[2] == IMAGETYPE_PNG && !function_exists('imagecreatefrompng'))) {
  
              // TRANS: Exception thrown when trying to upload an unsupported image file format.
              throw new UnsupportedMediaException(_('Unsupported image format.'), $this->filepath);
@@@ -122,6 -128,14 +127,14 @@@
              if (empty($file->filename)) {
                  throw new UnsupportedMediaException(_('File without filename could not get a thumbnail source.'));
              }
+ 
+             // First some mimetype specific exceptions
+             switch ($file->mimetype) {
+             case 'image/svg+xml':
+                 throw new UseFileAsThumbnailException($file->id);
+             }
+ 
+             // And we'll only consider it an image if it has such a media type
              switch ($media) {
              case 'image':
                  $imgPath = $file->getPath();
@@@ -263,9 -277,6 +276,9 @@@
              if ($this->rotate == 0) {
                  // No rotational difference, just copy it as-is
                  @copy($this->filepath, $outpath);
 +
 +                // And set chmod
 +                @chmod($outpath, common_config('attachments', 'chmod'));
                  return $outpath;
              } elseif (abs($this->rotate) == 90) {
                  // Box is rotated 90 degrees in either direction,
@@@ -364,9 -375,6 +377,9 @@@
              throw new Exception(_('Unknown file type'));
          }
  
 +        // Always chmod 0644 (default) to have other processes (e.g. queue daemon read it)
 +        @chmod($outpath, common_config('attachments', 'chmod'));
 +
          imagedestroy($image_src);
          imagedestroy($image_dest);
      }

diff --combined plugins/VideoThumbnails/VideoThumbnailsPlugin.php
index c8fef72eb6fb0af221c5a9ad8e05b6efd05b5d14,23af7e00ac433676ae53f1e91c91f1feebd6dfd2..32ce37c1cf2945d4286f6d0e9177ec0aa44f440a
--- 1/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
--- 2/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
+++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
@@@ -63,12 -63,13 +63,13 @@@ class VideoThumbnailsPlugin extends Plu
          if (!getimagesize($imgPath)) {
              common_debug('exec of "avconv" produced a bad/nonexisting image it seems');
              @unlink($imgPath);
+             $imgPath = null;    // pretend we didn't touch it
              return true;
          }
          return false;
      }
  
 -    public function onPluginVersion(&$versions)
 +    public function onPluginVersion(array &$versions)
      {
          $versions[] = array('name' => 'Video Thumbnails',
                              'version' => GNUSOCIAL_VERSION,