From 87d877bf4f036ca698a3b5a35489d51ef3222d7b Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 5 Feb 2012 22:07:20 +0100
Subject: [PATCH] Introduced getAnchor() for qualified anchors

Fixes #288
---
 com.woltlab.wcf/template/footerMenu.tpl          |  2 +-
 com.woltlab.wcf/template/header.tpl              |  2 +-
 wcfsetup/install/files/acp/templates/footer.tpl  |  2 +-
 wcfsetup/install/files/acp/templates/header.tpl  |  2 +-
 .../files/acp/templates/masterPasswordInit.tpl   |  2 +-
 .../files/acp/templates/packageListDetailed.tpl  |  2 +-
 wcfsetup/install/files/lib/system/WCF.class.php  | 16 ++++++++++++++++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index 2f3d492f51..9d33cbe039 100644
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -1,6 +1,6 @@
 <nav id="footerNavigation" class="footerNavigation">
 	<ul>
-		<li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><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="balloonTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
 		{if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
 				<li><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index d9e958ad93..247000beeb 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -40,7 +40,7 @@
 				<!-- /main menu sub menu -->
 				
 				<ul>
-					<li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
+					<li id="toBottomLink" class="toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
 					{event name='headerNavigation'}
 				</ul>
 			</div>
diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl
index fcf710cbe8..bdd2d80625 100644
--- a/wcfsetup/install/files/acp/templates/footer.tpl
+++ b/wcfsetup/install/files/acp/templates/footer.tpl
@@ -9,7 +9,7 @@
 		<div>
 			<nav id="footerNavigation" class="footerNavigation">
 				<ul>
-					<li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toTop.svg" 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="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
 				</ul>
 			</nav>
 		</div>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index fa44f20c4d..9a1955ad1e 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -137,7 +137,7 @@
 			<nav class="headerNavigation">
 				<div>
 					<ul>
-						<li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toBottom.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
+						<li id="toBottomLink" class="toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toBottom.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
 					</ul>
 				</div>
 			</nav>
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index c766bb16a0..39e74ad17f 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -65,7 +65,7 @@
 			<dl>
 				<dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
 				<dd>
-					<p><a href="#" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
+					<p><a id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
 					<input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
 				</dd>
 			</dl>
diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index f1932a58b9..e99639c51a 100644
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -38,7 +38,7 @@
 {if $objects|count > 0}
 	<div class="wcf-border wcf-boxTitle">
 		<hgroup>
-			<h1><a href="#">{lang}wcf.acp.package.list{/lang} <span class="badge" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></a></h1>
+			<h1><a href="{link controller='PackageList'}{/link}">{lang}wcf.acp.package.list{/lang} <span class="badge" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></a></h1>
 		</hgroup>
 		
 		<table>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index b94c769825..50855c8a8b 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -1,5 +1,7 @@
 <?php
 namespace wcf\system;
+use wcf\util\StringStack;
+
 use wcf\data\application\Application;
 use wcf\data\package\Package;
 use wcf\data\package\PackageCache;
@@ -622,4 +624,18 @@ class WCF {
 		
 		return $this->applications[$abbreviation]->domainName . $this->applications[$abbreviation]->domainPath;
 	}
+	
+	/**
+	 * Returns a fully qualified anchor for current page.
+	 * 
+	 * @param	string		$fragment
+	 * @return	string
+	 */
+	public function getAnchor($fragment) {
+		// resolve path and query components
+		$path = str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['REQUEST_URI']);
+		$baseHref = self::getTPL()->get('baseHref');
+		
+		return $baseHref . 'index.php' . $path . '#' . $fragment;
+	}
 }
-- 
2.20.1