From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 6 Jul 2016 13:41:14 +0000 (+0200)
Subject: Added support for [wsm] and partially [wsmg]
X-Git-Tag: 3.0.0_Beta_1~1256
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65f833f26a79c2558b461ca1d539fa56eae9bd06;p=GitHub%2FWoltLab%2FWCF.git

Added support for [wsm] and partially [wsmg]
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 57f1adfc65..c27854df96 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -757,6 +757,11 @@
 			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
 			<classname><![CDATA[wcf\system\message\embedded\object\PageMessageEmbeddedObjectHandler]]></classname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.media</name>
+			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+			<classname><![CDATA[wcf\system\message\embedded\object\MediaMessageEmbeddedObjectHandler]]></classname>
+		</type>
 		<!-- embedded object handlers -->
 		
 		<type>
diff --git a/com.woltlab.wcf/templates/mediaBBCodeTag.tpl b/com.woltlab.wcf/templates/mediaBBCodeTag.tpl
new file mode 100644
index 0000000000..448dcfedd1
--- /dev/null
+++ b/com.woltlab.wcf/templates/mediaBBCodeTag.tpl
@@ -0,0 +1 @@
+<img src="{if $thumbnailSize == 'original'}{$media->getLink()}{else}{$media->getThumbnailLink($thumbnailSize)}{/if}" alt="{$media->getTitle()}"{if $float != 'none'} class="messageFloatObject{$float|ucfirst}"{/if}> 
\ No newline at end of file
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Editor.js b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Editor.js
index d0b6fe44ec..c8255cd64a 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Editor.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Editor.js
@@ -208,7 +208,7 @@ define(['Core', 'Dictionary', 'Dom/Traverse', 'Language', 'Ui/Dialog', 'WoltLab/
 			});
 			
 			this._options.editor.buffer.set();
-			this._options.editor.insert.text('[wsm]' + mediaIds.join(',') + '[/wsm]');
+			this._options.editor.insert.text("[wsmg='" + mediaIds.join(',') + "'][/wsmg]");
 		},
 		
 		/**
@@ -241,7 +241,7 @@ define(['Core', 'Dictionary', 'Dom/Traverse', 'Language', 'Ui/Dialog', 'WoltLab/
 				this._options.editor.insert.html('<img src="' + item[thumbnailSize + 'ThumbnailLink'] + '" class="woltlabSuiteMedia" data-media-id="' + item.mediaID + '" data-media-size="' + thumbnailSize + '">');
 			}
 			else {
-				this._options.editor.insert.text('[wsm]' + item.mediaID + '[/wsm]');
+				this._options.editor.insert.text("[wsm='" + item.mediaID + "'][/wsm]");
 			}
 		},
 		
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Redactor/Metacode.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Redactor/Metacode.js
index a988193d8d..fba6bb17ba 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Redactor/Metacode.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Redactor/Metacode.js
@@ -66,6 +66,12 @@ define(['Dom/Util'], function(DomUtil) {
 			
 			var buffer = '[' + name;
 			if (attributes.length) {
+				for (var i = 0, length = attributes.length; i < length; i++) {
+					if (!/^'.*'$/.test(attributes[i])) {
+						attributes[i] = "'" + attributes[i] + "'";
+					}
+				}
+				
 				buffer += '=' + attributes.join(',');
 			}
 			
diff --git a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
index 8bb65fbb28..d3acbf260e 100644
--- a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
@@ -9,7 +9,7 @@ use wcf\util\StringUtil;
  * that can be safely passed through HTMLPurifier's validation mechanism.
  * 
  * All though not exactly required for all bbcodes, the actual output of an bbcode
- * cannot be forseen and potentially conflict with HTMLPurifier's whitelist. Examples
+ * cannot be foreseen and potentially conflict with HTMLPurifier's whitelist. Examples
  * are <iframe> or other embedded media that is allowed as a result of a bbcode, but
  * not allowed to be directly provided by a user. 
  * 
diff --git a/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaBBCode.class.php
new file mode 100644
index 0000000000..257d59439e
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaBBCode.class.php
@@ -0,0 +1,49 @@
+<?php
+namespace wcf\system\bbcode;
+use wcf\data\media\Media;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Parses the [wsm] bbcode tag.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Bbcode
+ * @since       3.0
+ */
+class WoltLabSuiteMediaBBCode extends AbstractBBCode {
+	/**
+	 * @inheritDoc
+	 */
+	public function getParsedTag(array $openingTag, $content, array $closingTag, BBCodeParser $parser) {
+		$mediaID = (!empty($openingTag['attributes'][0])) ? intval($openingTag['attributes'][0]) : 0;
+		if (!$mediaID) {
+			return '';
+		}
+		
+		/** @var Media $media */
+		$media = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.media', $mediaID);
+		
+		if ($media !== null) {
+			if ($media->isImage) {
+				$thumbnailSize = (!empty($openingTag['attributes'][1])) ? $openingTag['attributes'][1] : 'original';
+				$float = (!empty($openingTag['attributes'][2])) ? $openingTag['attributes'][2] : 'none';
+				
+				WCF::getTPL()->assign([
+					'float' => $float,
+					'media' => $media,
+					'thumbnailSize' => $thumbnailSize
+				]);
+				
+				return WCF::getTPL()->fetch('mediaBBCodeTag', 'wcf');
+			}
+			
+			return StringUtil::getAnchorTag($media->getLink(), $media->getTitle());
+		}
+		
+		return '';
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaGalleryBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaGalleryBBCode.class.php
new file mode 100644
index 0000000000..278a08beff
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaGalleryBBCode.class.php
@@ -0,0 +1,19 @@
+<?php
+namespace wcf\system\bbcode;
+
+/**
+ * Parses the [wsmg] bbcode tag.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Bbcode
+ */
+class WoltLabSuiteMediaGalleryBBCode extends AbstractBBCode {
+	/**
+	 * @inheritDoc
+	 */
+	public function getParsedTag(array $openingTag, $content, array $closingTag, BBCodeParser $parser) {
+		return '<p>TODO: WoltLabSuiteMediaGalleryBBCode</p>';
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/cache/runtime/MediaRuntimeCache.class.php b/wcfsetup/install/files/lib/system/cache/runtime/MediaRuntimeCache.class.php
new file mode 100644
index 0000000000..4264357808
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/cache/runtime/MediaRuntimeCache.class.php
@@ -0,0 +1,24 @@
+<?php
+namespace wcf\system\cache\runtime;
+use wcf\data\media\Media;
+use wcf\data\media\MediaList;
+
+/**
+ * Runtime cache implementation for shared media.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Cache\Runtime
+ * @since	3.0
+ * 
+ * @method	Media[]         getCachedObjects()
+ * @method	Media           getObject($objectID)
+ * @method	Media[]         getObjects(array $objectIDs)
+ */
+class MediaRuntimeCache extends AbstractRuntimeCache {
+	/**
+	 * @inheritDoc
+	 */
+	protected $listClassName = MediaList::class;
+}
diff --git a/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php b/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
index 35adbfe6fb..0ef1557801 100644
--- a/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
@@ -63,6 +63,10 @@ class MessageHtmlInputFilter implements IHtmlInputFilter {
 		// size
 		$definition->addElement('woltlab-size', 'Inline', 'Inline', '', ['class' => 'Text']);
 		
+		// media
+		$definition->addAttribute('img', 'data-media-id', 'Number');
+		$definition->addAttribute('img', 'data-media-size', new \HTMLPurifier_AttrDef_Enum(['small', 'medium', 'large', 'original']));
+		
 		// mention
 		$definition->addElement('woltlab-mention', 'Inline', 'Inline', '', [
 			'data-user-id' => 'Number',
diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/MediaMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/MediaMessageEmbeddedObjectHandler.class.php
new file mode 100644
index 0000000000..1514103408
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/message/embedded/object/MediaMessageEmbeddedObjectHandler.class.php
@@ -0,0 +1,42 @@
+<?php
+namespace wcf\system\message\embedded\object;
+use wcf\system\cache\runtime\MediaRuntimeCache;
+use wcf\system\html\input\HtmlInputProcessor;
+use wcf\util\ArrayUtil;
+
+/**
+ * IMessageEmbeddedObjectHandler implementation for shared media.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Message\Embedded\Object
+ */
+class MediaMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObjectHandler {
+	/**
+	 * @inheritDoc
+	 */
+	public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedData) {
+		$mediaIDs = [];
+		foreach (['wsm', 'wsmg'] as $name) {
+			if (empty($embeddedData[$name])) {
+				continue;
+			}
+			
+			for ($i = 0, $length = count($embeddedData[$name]); $i < $length; $i++) {
+				$parsedIDs = ArrayUtil::toIntegerArray(explode(',', $embeddedData[$name][$i][0]));
+				
+				$mediaIDs = array_merge($mediaIDs, $parsedIDs);
+			}
+		}
+		
+		return $mediaIDs;
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function loadObjects(array $objectIDs) {
+		return MediaRuntimeCache::getInstance()->getObjects($objectIDs);
+	}
+}