From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 10 Jul 2014 20:38:03 +0000 (+0200)
Subject: Add canViewTag permission
X-Git-Tag: 2.1.0_Alpha_1~585
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84f9fc4958d360d1206560b4050da2f49142bc50;p=GitHub%2FWoltLab%2FWCF.git

Add canViewTag permission
---

diff --git a/com.woltlab.wcf/templates/tagInput.tpl b/com.woltlab.wcf/templates/tagInput.tpl
index dd779043c3..aeb8daaf84 100644
--- a/com.woltlab.wcf/templates/tagInput.tpl
+++ b/com.woltlab.wcf/templates/tagInput.tpl
@@ -1,19 +1,22 @@
-<dl class="jsOnly">
-	<dt><label for="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}">{lang}wcf.tagging.tags{/lang}</label></dt>
-	<dd>
-		<div id="tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" class="editableItemList"></div>
-		<input id="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" type="text" value="" class="long" />
-		<small>{lang}wcf.tagging.tags.description{/lang}</small>
-	</dd>
-</dl>
-<script data-relocate="true">
-	//<![CDATA[
-	$(function() {
-		var $tagList = new WCF.Tagging.TagList('#tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', '#tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', {@TAGGING_MAX_TAG_LENGTH});
-		
-		{if $tags|isset && $tags|count}
-			$tagList.load([ {implode from=$tags item=tag}'{$tag|encodeJS}'{/implode} ]);
-		{/if}
-	});
-	//]]>
-</script>
\ No newline at end of file
+{if $__wcf->session->getPermission('user.tag.canViewTag')}
+	<dl class="jsOnly">
+		<dt><label for="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}">{lang}wcf.tagging.tags{/lang}</label></dt>
+		<dd>
+			<div id="tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" class="editableItemList"></div>
+			<input id="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" type="text" value="" class="long" />
+			<small>{lang}wcf.tagging.tags.description{/lang}</small>
+		</dd>
+	</dl>
+	
+	<script data-relocate="true">
+		//<![CDATA[
+		$(function() {
+			var $tagList = new WCF.Tagging.TagList('#tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', '#tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', {@TAGGING_MAX_TAG_LENGTH});
+			
+			{if $tags|isset && $tags|count}
+				$tagList.load([ {implode from=$tags item=tag}'{$tag|encodeJS}'{/implode} ]);
+			{/if}
+		});
+		//]]>
+	</script>
+{/if}
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 65706b31e9..1141a04be6 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -734,6 +734,14 @@ png]]></defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			
+			<!-- todo: find better category -->
+			<option name="user.tag.canViewTag">
+				<categoryname>user.message</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+				<options>module_tagging</options>
+			</option>
 		</options>
 	</import>
 </data>
diff --git a/wcfsetup/install/files/lib/page/TaggedPage.class.php b/wcfsetup/install/files/lib/page/TaggedPage.class.php
index 45f766129f..7591f65654 100644
--- a/wcfsetup/install/files/lib/page/TaggedPage.class.php
+++ b/wcfsetup/install/files/lib/page/TaggedPage.class.php
@@ -22,6 +22,11 @@ class TaggedPage extends MultipleLinkPage {
 	 */
 	public $neededModules = array('MODULE_TAGGING');
 	
+	/**
+	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('user.tag.canViewTag');
+	
 	/**
 	 * tag id
 	 * @var	integer