From 75588f468fffd41d17572ba0d1a5c1a70ef4918a Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 11 Oct 2011 18:37:00 +0200
Subject: [PATCH] Fixed some errors during installation

---
 com.woltlab.wcf/acpMenu.xml                   | 40 +++++++++----------
 .../install/files/acp/templates/header.tpl    |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 6ee1be7e60..28f0a71932 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -25,7 +25,7 @@
 		<acpmenuitem name="wcf.acp.menu.link.option.importAndExport">
 			<parent>wcf.acp.menu.link.option.management</parent>
 			<showorder>1</showorder>
-			<link>index.php?form=OptionImport</link>
+			<link>index.php/OptionImport/</link>
 		</acpmenuitem>
 		<!-- /options -->
 		
@@ -42,14 +42,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.list">
-			<link>index.php?page=PackageList</link>
+			<link>index.php/PackageList</link>
 			<parent>wcf.acp.menu.link.package.management</parent>
 			<permissions>admin.system.package.canUpdatePackage,admin.system.package.canUninstallPackage</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.install">
-			<link>index.php?form=PackageStartInstall&amp;action=install</link>
+			<link>index.php/PackageStartInstall/?action=install</link>
 			<parent>wcf.acp.menu.link.package.management</parent>
 			<permissions>admin.system.package.canInstallPackage</permissions>
 			<showorder>2</showorder>
@@ -61,14 +61,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.autoupdate">
-			<link>index.php?page=PackageAutoUpdateList</link>
+			<link>index.php/PackageAutoUpdateList/</link>
 			<parent>wcf.acp.menu.link.package.update</parent>
 			<permissions>admin.system.package.canUpdatePackage</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.database">
-			<link>index.php?form=PackageUpdateSearch</link>
+			<link>index.php/PackageUpdateSearch/</link>
 			<parent>wcf.acp.menu.link.package.update</parent>
 			<permissions>admin.system.package.canInstallPackage,admin.system.package.canUpdatePackage</permissions>
 			<showorder>2</showorder>
@@ -80,14 +80,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.server.list">
-			<link>index.php?page=UpdateServerList</link>
+			<link>index.php/UpdateServerList/</link>
 			<parent>wcf.acp.menu.link.package.server</parent>
 			<permissions>admin.system.package.canEditServer</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.server.add">
-			<link>index.php?form=UpdateServerAdd</link>
+			<link>index.php/UpdateServerAdd/</link>
 			<parent>wcf.acp.menu.link.package.server</parent>
 			<permissions>admin.system.package.canEditServer</permissions>
 			<showorder>2</showorder>
@@ -101,14 +101,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.cronjob.list">
-			<link>index.php?page=CronjobList</link>
+			<link>index.php/CronjobList/</link>
 			<parent>wcf.acp.menu.link.cronjob</parent>
 			<permissions>admin.system.cronjobs.canEditCronjob,admin.system.cronjob.canDeleteCronjob,admin.system.cronjobs.canEnableDisableCronjob</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.cronjob.add">
-			<link>index.php?form=CronjobAdd</link>
+			<link>index.php/CronjobAdd/</link>
 			<parent>wcf.acp.menu.link.cronjob</parent>
 			<permissions>admin.system.cronjob.canAddCronjob</permissions>
 			<showorder>2</showorder>
@@ -122,19 +122,19 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.log.session">
-			<link>index.php?page=ACPSessionLogList</link>
+			<link>index.php/ACPSessionLogList/</link>
 			<parent>wcf.acp.menu.link.log</parent>
 			<permissions>admin.system.canViewLog</permissions>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.log.cache">
-			<link>index.php?page=CacheList</link>
+			<link>index.php/CacheList/</link>
 			<parent>wcf.acp.menu.link.log</parent>
 			<permissions>admin.system.canViewLog</permissions>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.log.cronjob">
-			<link>index.php?page=CronjobLogList</link>
+			<link>index.php/CronjobLogList/</link>
 			<parent>wcf.acp.menu.link.log</parent>
 			<permissions>admin.system.cronjob.canEditCronjob,admin.system.cronjob.canDeleteCronjob</permissions>
 		</acpmenuitem>
@@ -156,21 +156,21 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.list">
-			<link>index.php?page=UserList</link>
+			<link>index.php/UserList/</link>
 			<parent>wcf.acp.menu.link.user.management.general</parent>
 			<permissions>admin.user.canSearchUser</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.search">
-			<link>index.php?form=UserSearch</link>
+			<link>index.php/UserSearch/</link>
 			<parent>wcf.acp.menu.link.user.management.general</parent>
 			<permissions>admin.user.canSearchUser</permissions>
 			<showorder>2</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.add">
-			<link>index.php?form=UserAdd</link>
+			<link>index.php/UserAdd/</link>
 			<parent>wcf.acp.menu.link.user.management.general</parent>
 			<permissions>admin.user.canAddUser</permissions>
 			<showorder>3</showorder>
@@ -182,14 +182,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.massProcessing">
-			<link>index.php?form=UsersMassProcessing</link>
+			<link>index.php/UsersMassProcessing/</link>
 			<parent>wcf.acp.menu.link.user.management.additional</parent>
 			<permissions>admin.user.canEditUser,admin.user.canDeleteUser,admin.user.canMailUser</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.mail">
-			<link>index.php?form=UserMail&amp;action=all</link>
+			<link>index.php/UserMail/?action=all</link>
 			<parent>wcf.acp.menu.link.user.management.additional</parent>
 			<permissions>admin.user.canMailUser</permissions>
 			<showorder>2</showorder>
@@ -208,14 +208,14 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.group.list">
-			<link>index.php?page=UserGroupList</link>
+			<link>index.php/UserGroupList/</link>
 			<parent>wcf.acp.menu.link.group.general</parent>
 			<permissions>admin.user.canEditGroup,admin.user.canDeleteGroup</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>	
 		
 		<acpmenuitem name="wcf.acp.menu.link.group.add">
-			<link>index.php?form=UserGroupAdd</link>
+			<link>index.php/UserGroupAdd/</link>
 			<parent>wcf.acp.menu.link.group.general</parent>
 			<permissions>admin.user.canAddGroup</permissions>
 			<showorder>2</showorder>
@@ -227,7 +227,7 @@
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.group.mail">
-			<link>index.php?form=UserMail&amp;action=group</link>
+			<link>index.php/UserMail/?action=group</link>
 			<parent>wcf.acp.menu.link.group.additional</parent>
 			<permissions>admin.user.canMailUser</permissions>
 			<showorder>1</showorder>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 8445738801..828f2e9ffe 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -6,6 +6,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<script type="text/javascript">
 		//<![CDATA[
+		var SID_ARG_1ST = '{@SID_ARG_1ST}';
 		var SID_ARG_2ND	= '{@SID_ARG_2ND_NOT_ENCODED}';
 		var RELATIVE_WCF_DIR = '{@RELATIVE_WCF_DIR}';
 		var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
-- 
2.20.1