From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 1 Mar 2012 13:34:39 +0000 (+0100)
Subject: Fixed multiple issues
X-Git-Tag: 2.0.0_Beta_1~1289
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=136fba63a2a5f33baa6acdb832e3fbe999e37cbf;p=GitHub%2FWoltLab%2FWCF.git

Fixed multiple issues
---

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 9c7ae20221..b1732bf3d9 100644
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -14,7 +14,7 @@
 				{include file='footerMenu'}
 				
 				<ul>
-					<li id="toTopLink" class="toTopLink"><a href="{@$__wcf->getAnchor('top')}" title="{lang}wcf.global.scrollUp{/lang}" class="jsTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
+					<li id="toTopLink" class="toTopLink"><a href="{$__wcf->getAnchor('top')}" title="{lang}wcf.global.scrollUp{/lang}" class="jsTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
 					{if SHOW_CLOCK}
 						<li><p><img src="{icon size='S'}time1{/icon}" alt="" /> <span>{@TIME_NOW|plainTime}</span></p></li>
 					{/if}
diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 3f84461a91..03abcb10f2 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -38,7 +38,7 @@
 			{include file='mainMenuSubMenu'}
 			
 			<ul>
-				<li id="toBottomLink" class="wcf-toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="jsTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
+				<li id="toBottomLink" class="wcf-toBottomLink"><a href="{$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="jsTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
 				{event name='headerNavigation'}
 			</ul>
 		</nav>
diff --git a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
index fa1cfab972..e1c1765f14 100644
--- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
@@ -35,8 +35,9 @@ class ViewableUserOption extends DatabaseObjectDecorator {
 	 * Sets option values for a specific user.
 	 * 
 	 * @param	wcf\data\user\User	$user
+	 * @param	string			$outputType
 	 */
-	public function setOptionValue(User $user) {
+	public function setOptionValue(User $user, $outputType = 'normal') {
 		$userOption = 'userOption' . $this->optionID;
 		$optionValue = $user->{$userOption};
 		
@@ -48,9 +49,9 @@ class ViewableUserOption extends DatabaseObjectDecorator {
 				$this->outputData = $outputObj->getOutputData($user, $this->getDecoratedObject(), $optionValue);
 			}
 			
-			if ($this->outputType == 'normal') $this->optionValue = $outputObj->getOutput($user, $this->getDecoratedObject(), $optionValue);
-			else if ($this->outputType == 'short') $this->optionValue = $outputObj->getShortOutput($user, $this->getDecoratedObject(), $optionValue);
-			else $this->optionValue = $outputObj->getMediumOutput($user, $this->getDecoratedObject(), $optionValue);
+			if ($outputType == 'normal') $this->optionValue = $outputObj->getOutput($user, $this->getDecoratedObject(), $optionValue);
+			else if ($outputType == 'short') $this->optionValue = $outputObj->getShortOutput($user, $this->getDecoratedObject(), $optionValue);
+			else $outputType = $outputObj->getMediumOutput($user, $this->getDecoratedObject(), $optionValue);
 		}
 		else {
 			$this->optionValue = StringUtil::encodeHTML($optionValue);
diff --git a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
index d18dd5fc71..dffe972f2b 100644
--- a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
@@ -31,7 +31,7 @@ class DateOptionType extends TextOptionType {
 	public function validate(Option $option, $newValue) {
 		if (empty($newValue)) return;
 		
-		if (!preg_match('^(\d{4})-(\d{2})-(\d{2})$', $newValue, $match)) {
+		if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $newValue, $match)) {
 			throw new UserInputException($option->optionName, 'validationFailed');
 		}
 		
diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php
index 2a367060fa..06e1a490f1 100644
--- a/wcfsetup/install/files/lib/util/DateUtil.class.php
+++ b/wcfsetup/install/files/lib/util/DateUtil.class.php
@@ -250,4 +250,29 @@ class DateUtil {
 	public static function getAvailableTimezones() {
 		return self::$availableTimezones;
 	}
+	
+	/**
+	 * Calculates the age of a given date.
+	 * 
+	 * @param	string		$date		format YYYY-MM-DD
+	 * @return	integer
+	 */
+	public static function getAge($date) {
+		// split date
+		$year = $month = $day = 0;
+		$value = explode('-', $date);
+		if (isset($value[0])) $year = intval($value[0]);
+		if (isset($value[1])) $month = intval($value[1]);
+		if (isset($value[2])) $day = intval($value[2]);
+			
+		// calc
+		if ($year) {
+			$age = self::format(null, 'Y') - $year;
+			if (intval(self::format(null, 'n')) < intval($month)) $age--;
+			else if (intval(self::formatDate(null, 'j')) == intval($month) && self::formatDate(null, 'n') < intval($day)) $age--;
+			return $age;
+		}
+		
+		return 0;
+	}
 }