Merge branch '5.3'

diff --cc wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
index 879f6c5e8d15257b15439955854f90da0ff769a9,6cdc414b4c5bce4135ed0a547a0e83a97e0cdca4..d4d1a10fe6cb7262a72636e4b02def112b8b111e
--- 1/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
--- 2/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
@@@ -9,116 -8,134 +10,140 @@@ use wcf\util\JSON
  
  /**
   * Imports attachments.
 - * 
 - * @author    Tim Duesterhus, Marcel Werk
 - * @copyright 2001-2019 WoltLab GmbH
 - * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 - * @package   WoltLabSuite\Core\System\Importer
 + *
 + * @author  Tim Duesterhus, Marcel Werk
 + * @copyright   2001-2019 WoltLab GmbH
 + * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 + * @package WoltLabSuite\Core\System\Importer
   */
 -class AbstractAttachmentImporter extends AbstractImporter {
 -      /**
 -       * @inheritDoc
 -       */
 -      protected $className = Attachment::class;
 -      
 -      /**
 -       * object type id for attachments
 -       * @var integer
 -       */
 -      protected $objectTypeID = 0;
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      public function import($oldID, array $data, array $additionalData = []) {
 -              // check file location
 -              if (!is_readable($additionalData['fileLocation'])) return 0;
 -              
 -              // Extract metadata from the file ourselves, because the
 -              // information pulled from the source database might not
 -              // be reliable.
 -              $data['fileHash'] = sha1_file($additionalData['fileLocation']);
 -              $data['filesize'] = filesize($additionalData['fileLocation']);
 -              $data['fileType'] = FileUtil::getMimeType($additionalData['fileLocation']);
 -              
 -              $imageData = @getimagesize($additionalData['fileLocation']);
 -              if ($imageData !== false) {
 -                      $data['isImage'] = 1;
 -                      $data['width'] = $imageData[0];
 -                      $data['height'] = $imageData[1];
 -              }
 -              else {
 -                      $data['isImage'] = 0;
 -                      $data['width'] = 0;
 -                      $data['height'] = 0;
 -              }
 -              
 -              // get user id
 -              $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
 -              
 -              // check existing attachment id
 -              if (ctype_digit((string)$oldID)) {
 -                      $attachment = new Attachment($oldID);
 -                      if (!$attachment->attachmentID) $data['attachmentID'] = $oldID;
 -              }
 -              
 -              // set default last download time
 -              if (empty($data['lastDownloadTime']) && !empty($data['downloads'])) {
 -                      $data['lastDownloadTime'] = TIME_NOW;
 -              }
 -              
 -              // save attachment
 -              $attachment = AttachmentEditor::create(array_merge($data, ['objectTypeID' => $this->objectTypeID]));
 -              
 -              // check attachment directory
 -              // and create subdirectory if necessary
 -              $dir = dirname($attachment->getLocation());
 -              if (!@file_exists($dir)) {
 -                      @mkdir($dir, 0777);
 -              }
 -              
 -              // copy file
 -              try {
 -                      if (!copy($additionalData['fileLocation'], $attachment->getLocation())) {
 -                              throw new SystemException();
 -                      }
 -                      
 -                      return $attachment->attachmentID;
 -              }
 -              catch (SystemException $e) {
 -                      // copy failed; delete attachment
 -                      $editor = new AttachmentEditor($attachment);
 -                      $editor->delete();
 -              }
 -              
 -              return 0;
 -      }
 -      
 -      /**
 -       * Replaces old attachment BBCodes with BBCodes with the new attachment id.
 -       * 
 -       * @param       string          $message
 -       * @param       integer         $oldID
 -       * @param       integer         $newID
 -       * @return      string|boolean
 -       */
 -      protected function fixEmbeddedAttachments($message, $oldID, $newID) {
 -              if (mb_strripos($message, '[attach]'.$oldID.'[/attach]') !== false || mb_strripos($message, '[attach='.$oldID.']') !== false || mb_strripos($message, '[attach='.$oldID.',') !== false) {
 -                      $message = str_ireplace('[attach]'.$oldID.'[/attach]', '[attach]'.$newID.'[/attach]', $message);
 -                      $message = str_ireplace('[attach='.$oldID.']', '[attach='.$newID.']', $message);
 -                      $message = str_ireplace('[attach='.$oldID.',', '[attach='.$newID.',', $message);
 -                      
 -                      return $message;
 -              }
 -              else {
 -                      return \preg_replace_callback(
 -                              '~<woltlab-metacode data-name="attach" data-attributes="(?<attributes>[^"]+)">~',
 -                              static function (array $matches) use ($oldID, $newID): string {
 -                                      $encodedAttributes = $matches['attributes'];
 -                                      
 -                                      $base64Decoded = \base64_decode($matches['attributes']);
 -                                      if ($base64Decoded) {
 -                                              try {
 -                                                      $attributes = JSON::decode($base64Decoded);
 -                                                      if ($attributes[0] == $oldID) {
 -                                                              $attributes[0] = $newID;
 -                                                      }
 -                                                      
 -                                                      $encodedAttributes = \base64_encode(JSON::encode($attributes));
 -                                              }
 -                                              catch (\Exception $e) {
 -                                                      $encodedAttributes = $matches['attributes'];
 -                                              }
 -                                      }
 -                                      
 -                                      return '<woltlab-metacode data-name="attach" data-attributes="' . $encodedAttributes . '">';
 -                              },
 -                              $message
 -                      );
 -              }
 -              
 -              return false;
 -      }
 +class AbstractAttachmentImporter extends AbstractImporter
 +{
 +    /**
 +     * @inheritDoc
 +     */
 +    protected $className = Attachment::class;
 +
 +    /**
 +     * object type id for attachments
 +     * @var int
 +     */
 +    protected $objectTypeID = 0;
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function import($oldID, array $data, array $additionalData = [])
 +    {
 +        // check file location
 +        if (!\is_readable($additionalData['fileLocation'])) {
 +            return 0;
 +        }
 +
 +        // Extract metadata from the file ourselves, because the
 +        // information pulled from the source database might not
 +        // be reliable.
 +        $data['fileHash'] = \sha1_file($additionalData['fileLocation']);
 +        $data['filesize'] = \filesize($additionalData['fileLocation']);
 +        $data['fileType'] = FileUtil::getMimeType($additionalData['fileLocation']);
 +
 +        $imageData = @\getimagesize($additionalData['fileLocation']);
 +        if ($imageData !== false) {
 +            $data['isImage'] = 1;
 +            $data['width'] = $imageData[0];
 +            $data['height'] = $imageData[1];
 +        } else {
 +            $data['isImage'] = 0;
 +            $data['width'] = 0;
 +            $data['height'] = 0;
 +        }
 +
 +        // get user id
 +        $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
 +
 +        // check existing attachment id
 +        if (\ctype_digit((string)$oldID)) {
 +            $attachment = new Attachment($oldID);
 +            if (!$attachment->attachmentID) {
 +                $data['attachmentID'] = $oldID;
 +            }
 +        }
 +
 +        // set default last download time
 +        if (empty($data['lastDownloadTime']) && !empty($data['downloads'])) {
 +            $data['lastDownloadTime'] = TIME_NOW;
 +        }
 +
 +        // save attachment
 +        $attachment = AttachmentEditor::create(\array_merge($data, ['objectTypeID' => $this->objectTypeID]));
 +
 +        // check attachment directory
 +        // and create subdirectory if necessary
 +        $dir = \dirname($attachment->getLocation());
 +        if (!@\file_exists($dir)) {
 +            @\mkdir($dir, 0777);
 +        }
 +
 +        // copy file
 +        try {
 +            if (!\copy($additionalData['fileLocation'], $attachment->getLocation())) {
 +                throw new SystemException();
 +            }
 +
 +            return $attachment->attachmentID;
 +        } catch (SystemException $e) {
 +            // copy failed; delete attachment
 +            $editor = new AttachmentEditor($attachment);
 +            $editor->delete();
 +        }
 +
 +        return 0;
 +    }
 +
 +    /**
 +     * Replaces old attachment BBCodes with BBCodes with the new attachment id.
 +     *
 +     * @param string $message
 +     * @param int $oldID
 +     * @param int $newID
 +     * @return  string|bool
 +     */
 +    protected function fixEmbeddedAttachments($message, $oldID, $newID)
 +    {
 +        if (
 +            \mb_strripos($message, '[attach]' . $oldID . '[/attach]') !== false
 +            || \mb_strripos($message, '[attach=' . $oldID . ']') !== false
 +            || \mb_strripos($message, '[attach=' . $oldID . ',') !== false
 +        ) {
 +            $message = \str_ireplace('[attach]' . $oldID . '[/attach]', '[attach]' . $newID . '[/attach]', $message);
 +            $message = \str_ireplace('[attach=' . $oldID . ']', '[attach=' . $newID . ']', $message);
 +
 +            return \str_ireplace('[attach=' . $oldID . ',', '[attach=' . $newID . ',', $message);
++        } else {
++            return \preg_replace_callback(
++                '~<woltlab-metacode data-name="attach" data-attributes="(?<attributes>[^"]+)">~',
++                static function (array $matches) use ($oldID, $newID): string {
++                    $encodedAttributes = $matches['attributes'];
++
++                    $base64Decoded = \base64_decode($matches['attributes']);
++                    if ($base64Decoded) {
++                        try {
++                            $attributes = JSON::decode($base64Decoded);
++                            if ($attributes[0] == $oldID) {
++                                $attributes[0] = $newID;
++                            }
++
++                            $encodedAttributes = \base64_encode(JSON::encode($attributes));
++                        } catch (\Exception $e) {
++                            $encodedAttributes = $matches['attributes'];
++                        }
++                    }
++
++                    return '<woltlab-metacode data-name="attach" data-attributes="' . $encodedAttributes . '">';
++                },
++                $message
++            );
 +        }
 +
 +        return false;
 +    }
  }