From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 23 Mar 2014 23:53:50 +0000 (+0100)
Subject: Added colored usernames in message sidebar
X-Git-Tag: 2.1.0_Alpha_1~956^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fd304c64d0d6e85d02aebf13ee8307f399333a3;p=GitHub%2FWoltLab%2FWCF.git

Added colored usernames in message sidebar
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e22db648d6..8768b66803 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1129,6 +1129,12 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 			</option>
+			<option name="message_sidebar_enable_user_online_marking">
+				<categoryname>message.sidebar</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+				<options>module_users_online</options>
+			</option>
 			<option name="message_sidebar_user_options">
 				<categoryname>message.sidebar</categoryname>
 				<optiontype>useroptions</optiontype>
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 645a7ea8e2..5bd409de14 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -21,7 +21,7 @@
 			<header>
 				<h2 class="username">
 					<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userProfile->userID}" rel="author">
-						<span itemprop="name">{$username}</span>
+						<span itemprop="name">{if MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING}{@$userProfile->getFormattedUsername()}{else}{$username}{/if}</span>
 					</a>
 				</h2>
 				
diff --git a/wcfsetup/install/files/lib/data/user/UserProfile.class.php b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
index 2637fc2e6f..189cbbf6d5 100644
--- a/wcfsetup/install/files/lib/data/user/UserProfile.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
@@ -3,6 +3,7 @@ namespace wcf\data\user;
 use wcf\data\user\avatar\DefaultAvatar;
 use wcf\data\user\avatar\Gravatar;
 use wcf\data\user\avatar\UserAvatar;
+use wcf\data\user\group\UserGroup;
 use wcf\data\user\online\UserOnline;
 use wcf\data\user\option\ViewableUserOption;
 use wcf\data\user\rank\UserRank;
@@ -772,4 +773,22 @@ class UserProfile extends DatabaseObjectDecorator implements IBreadcrumbProvider
 		$option->setOptionValue($this->getDecoratedObject());
 		return $option->optionValue;
 	}
+	
+	/**
+	 * Returns the formatted username.
+	 *
+	 * @return	string
+	 */
+	public function getFormattedUsername() {
+		$username = StringUtil::encodeHTML($this->username);
+	
+		if ($this->userOnlineGroupID) {
+			$group = UserGroup::getGroupByID($this->userOnlineGroupID);
+			if ($group !== null && $group->userOnlineMarking && $group->userOnlineMarking != '%s') {
+				return sprintf($group->userOnlineMarking, $username);
+			}
+		}
+		
+		return $username;
+	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e2699d3af7..240062baa1 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -876,6 +876,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Zoom durch Doppelklick zulassen]]></item>
 		<item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Standard-Kartenposition (Breitengrad)]]></item>
 		<item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Standard-Kartenposition (Längengrad)]]></item>
+		<item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[„Benutzer online“-Darstellung für Benutzernamen verwenden]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c132fec057..05010b6add 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -876,6 +876,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Enable Zoom by Double-Clicking]]></item>
 		<item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Default Map Position (Latitude)]]></item>
 		<item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></item>
+		<item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[TODO: „Benutzer online“-Darstellung für Benutzernamen verwenden]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">