From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 9 Oct 2016 20:18:07 +0000 (+0200)
Subject: Added support for embedded objects in box content
X-Git-Tag: 3.0.0_Beta_3~50^2~29
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4a77c8f7fe13d3473e4cae2b2e3bdadc045f121;p=GitHub%2FWoltLab%2FWCF.git

Added support for embedded objects in box content
---

diff --git a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
index c2e60887e5..f9b79b4245 100644
--- a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
@@ -1,3 +1,28 @@
+<script data-relocate="true">
+	require(['Language'], function (Language) {
+		Language.addObject({
+			'wcf.page.search': '{lang}wcf.page.search{/lang}',
+			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
+			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
+			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
+			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}'
+		});
+	})
+</script>
+
+{if $boxType == 'html' || $boxType == 'tpl'}
+	<ul class="codemirrorToolbar">
+		<li><a href="#" id="codemirror-content{@$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}"><span class="icon icon16 fa-file-o"></span></a></li>
+		<li><a href="#" id="codemirror-content{@$languageID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}"><span class="icon icon16 fa-file-text-o"></span></a></li>
+	</ul>
+	<script data-relocate="true">
+		require(['WoltLabSuite/Core/Acp/Ui/CodeMirror/Media', 'WoltLabSuite/Core/Acp/Ui/CodeMirror/Page'], function(AcpUiCodeMirrorMedia, AcpUiCodeMirrorPage) {
+			new AcpUiCodeMirrorMedia('content{@$languageID}');
+			new AcpUiCodeMirrorPage('content{@$languageID}');
+		});
+	</script>
+{/if}
+
 {if $boxType == 'text'}
 	<textarea name="content[{@$languageID}]" id="content{@$languageID}"
 		{if $boxType == 'text'}
diff --git a/wcfsetup/install/files/lib/data/box/Box.class.php b/wcfsetup/install/files/lib/data/box/Box.class.php
index 650957f40a..8e5b8b332e 100644
--- a/wcfsetup/install/files/lib/data/box/Box.class.php
+++ b/wcfsetup/install/files/lib/data/box/Box.class.php
@@ -239,13 +239,14 @@ class Box extends DatabaseObject {
 		
 		if ($boxContent !== null) {
 			if ($this->boxType == 'text') {
-				$processor = new HtmlOutputProcessor();
-				$processor->process($boxContent->content, 'com.woltlab.wcf.box.content', $boxContent->boxContentID);
-				
-				return $processor->getHtml();
+				return $boxContent->getFormattedContent();
+			}
+			else if ($this->boxType == 'html') {
+				return $boxContent->getParsedContent();
+			}
+			else if ($this->boxType == 'tpl') {
+				return $boxContent->getParsedTemplate($this->getTplName(WCF::getLanguage()->languageID));
 			}
-			
-			return $boxContent->content;
 		}
 		return '';
 	}
diff --git a/wcfsetup/install/files/lib/data/box/BoxAction.class.php b/wcfsetup/install/files/lib/data/box/BoxAction.class.php
index 7a3df6321d..42e0f1ce0f 100644
--- a/wcfsetup/install/files/lib/data/box/BoxAction.class.php
+++ b/wcfsetup/install/files/lib/data/box/BoxAction.class.php
@@ -8,6 +8,7 @@ use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\box\IConditionBoxController;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
+use wcf\system\html\simple\HtmlSimpleParser;
 use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 use wcf\system\WCF;
 
@@ -89,6 +90,9 @@ class BoxAction extends AbstractDatabaseObjectAction {
 						$boxContentEditor->update(['hasEmbeddedObjects' => 1]);
 					}
 				}
+				else if ($box->boxType == 'html' || $box->boxType == 'tpl') {
+					HtmlSimpleParser::getInstance()->parse('com.woltlab.wcf.box.content', $boxContent->boxContentID, $boxContent->content);
+				}
 			}
 		}
 		
@@ -145,6 +149,7 @@ class BoxAction extends AbstractDatabaseObjectAction {
 							'content' => $content['content'],
 							'imageID' => $content['imageID']
 						]);
+						$boxContent = BoxContent::getBoxContent($box->boxID, ($languageID ?: null));
 					}
 					else {
 						/** @var BoxContent $boxContent */
@@ -166,6 +171,9 @@ class BoxAction extends AbstractDatabaseObjectAction {
 							$boxContentEditor->update(['hasEmbeddedObjects' => $boxContent->hasEmbeddedObjects ? 0 : 1]);
 						}
 					}
+					else if ($box->boxType == 'html' || $box->boxType == 'tpl') {
+						HtmlSimpleParser::getInstance()->parse('com.woltlab.wcf.box.content', $boxContent->boxContentID, $boxContent->content);
+					}
 				}
 				
 				// save template
diff --git a/wcfsetup/install/files/lib/data/box/content/BoxContent.class.php b/wcfsetup/install/files/lib/data/box/content/BoxContent.class.php
index dc84b72f5c..6571f8b542 100644
--- a/wcfsetup/install/files/lib/data/box/content/BoxContent.class.php
+++ b/wcfsetup/install/files/lib/data/box/content/BoxContent.class.php
@@ -2,6 +2,9 @@
 namespace wcf\data\box\content;
 use wcf\data\media\ViewableMedia;
 use wcf\data\DatabaseObject;
+use wcf\system\html\output\HtmlOutputProcessor;
+use wcf\system\html\simple\HtmlSimpleParser;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 use wcf\system\WCF;
 
 /**
@@ -93,4 +96,48 @@ class BoxContent extends DatabaseObject {
 	public function setImage(ViewableMedia $image) {
 		$this->image = $image;
 	}
+	
+	/**
+	 * Returns the box's formatted content.
+	 *
+	 * @return      string
+	 */
+	public function getFormattedContent() {
+		MessageEmbeddedObjectManager::getInstance()->loadObjects('com.woltlab.wcf.box.content', [$this->boxContentID]);
+		
+		$processor = new HtmlOutputProcessor();
+		$processor->process($this->content, 'com.woltlab.wcf.box.content', $this->boxContentID);
+		
+		return $processor->getHtml();
+	}
+	
+	/**
+	 * Parses simple placeholders embedded in raw html.
+	 *
+	 * @return      string          parsed content
+	 */
+	public function getParsedContent() {
+		MessageEmbeddedObjectManager::getInstance()->loadObjects('com.woltlab.wcf.box.content', [$this->boxContentID]);
+		
+		return HtmlSimpleParser::getInstance()->replaceTags('com.woltlab.wcf.box.content', $this->boxContentID, $this->content);
+	}
+	
+	/**
+	 * Parses simple placeholders embedded in HTML with template scripting.
+	 *
+	 * @param       string          $templateName           content template name
+	 * @return      string          parsed template
+	 */
+	public function getParsedTemplate($templateName) {
+		MessageEmbeddedObjectManager::getInstance()->loadObjects('com.woltlab.wcf.box.content', [$this->boxContentID]);
+		HtmlSimpleParser::getInstance()->setContext('com.woltlab.wcf.box.content', $this->boxContentID);
+		
+		WCF::getTPL()->registerPrefilter(['simpleEmbeddedObject']);
+		
+		$returnValue = WCF::getTPL()->fetch($templateName);
+		
+		WCF::getTPL()->removePrefilter('simpleEmbeddedObject');
+		
+		return $returnValue;
+	}
 }