From c5e91feb02f5ef5d0facf21e3cb78958f610e17e Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 24 Aug 2011 21:37:06 +0200
Subject: [PATCH] Updates xml files and renames template folder

---
 com.woltlab.wcf/{cronjobs.xml => cronjob.xml}        |  0
 com.woltlab.wcf/{options.xml => option.xml}          |  0
 com.woltlab.wcf/package.xml                          | 12 ++++++------
 .../{styleattributes.xml => styleattribute.xml}      |  0
 .../{templates => template}/breadcrumbs.tpl          |  0
 .../{templates => template}/documentHeader.tpl       |  0
 com.woltlab.wcf/{templates => template}/footer.tpl   |  0
 .../{templates => template}/footerMenu.tpl           |  0
 .../{templates => template}/headInclude.tpl          |  0
 com.woltlab.wcf/{templates => template}/header.tpl   |  0
 .../{templates => template}/headerMenu.tpl           |  0
 .../{templates => template}/imageViewer.tpl          |  0
 .../{templates => template}/optionTypeBoolean.tpl    |  0
 .../{templates => template}/optionTypeDate.tpl       |  0
 .../optionTypeMultiselect.tpl                        |  0
 .../optionTypeRadiobuttons.tpl                       |  0
 .../{templates => template}/optionTypeSelect.tpl     |  0
 .../{templates => template}/optionTypeText.tpl       |  0
 .../{templates => template}/optionTypeTextarea.tpl   |  0
 .../{templates => template}/permissionDenied.tpl     |  0
 com.woltlab.wcf/{templates => template}/redirect.tpl |  0
 .../{templates => template}/userException.tpl        |  0
 .../{usergroupoptions.xml => usergroupoption.xml}    |  0
 com.woltlab.wcf/{useroptions.xml => useroption.xml}  |  0
 wcfsetup/install/files/lib/system/WCFSetup.class.php |  2 +-
 .../PackageUninstallationNodeBuilder.class.php       |  2 +-
 26 files changed, 8 insertions(+), 8 deletions(-)
 rename com.woltlab.wcf/{cronjobs.xml => cronjob.xml} (100%)
 rename com.woltlab.wcf/{options.xml => option.xml} (100%)
 rename com.woltlab.wcf/{styleattributes.xml => styleattribute.xml} (100%)
 rename com.woltlab.wcf/{templates => template}/breadcrumbs.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/documentHeader.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/footer.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/footerMenu.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/headInclude.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/header.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/headerMenu.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/imageViewer.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeBoolean.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeDate.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeMultiselect.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeRadiobuttons.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeSelect.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeText.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/optionTypeTextarea.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/permissionDenied.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/redirect.tpl (100%)
 rename com.woltlab.wcf/{templates => template}/userException.tpl (100%)
 rename com.woltlab.wcf/{usergroupoptions.xml => usergroupoption.xml} (100%)
 rename com.woltlab.wcf/{useroptions.xml => useroption.xml} (100%)

diff --git a/com.woltlab.wcf/cronjobs.xml b/com.woltlab.wcf/cronjob.xml
similarity index 100%
rename from com.woltlab.wcf/cronjobs.xml
rename to com.woltlab.wcf/cronjob.xml
diff --git a/com.woltlab.wcf/options.xml b/com.woltlab.wcf/option.xml
similarity index 100%
rename from com.woltlab.wcf/options.xml
rename to com.woltlab.wcf/option.xml
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 0db299ecc5..659f763eff 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -15,15 +15,15 @@
 	</authorinformation>
 	
 	<instructions type="install">
-		<instruction type="packageinstallationplugins">pip.xml</instruction>
+		<instruction type="packageinstallationplugin">pip.xml</instruction>
 		<instruction type="acpmenu">acpmenu.xml</instruction>
-		<instruction type="usergroupoptions">usergroupoptions.xml</instruction>
-		<instruction type="options">options.xml</instruction>
-		<instruction type="useroptions">useroptions.xml</instruction>
-		<instruction type="templates">templates.tar</instruction>
+		<instruction type="usergroupoption">usergroupoption.xml</instruction>
+		<instruction type="option">option.xml</instruction>
+		<instruction type="useroption">useroption.xml</instruction>
+		<instruction type="template">template.tar</instruction>
 		<instruction type="eventlistener">eventlistener.xml</instruction>
 		<instruction type="script">acp/install.php</instruction>
-		<instruction type="cronjobs">cronjobs.xml</instruction>
+		<instruction type="cronjob">cronjob.xml</instruction>
 		<instruction type="coreobject">coreobject.xml</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/styleattributes.xml b/com.woltlab.wcf/styleattribute.xml
similarity index 100%
rename from com.woltlab.wcf/styleattributes.xml
rename to com.woltlab.wcf/styleattribute.xml
diff --git a/com.woltlab.wcf/templates/breadcrumbs.tpl b/com.woltlab.wcf/template/breadcrumbs.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/breadcrumbs.tpl
rename to com.woltlab.wcf/template/breadcrumbs.tpl
diff --git a/com.woltlab.wcf/templates/documentHeader.tpl b/com.woltlab.wcf/template/documentHeader.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/documentHeader.tpl
rename to com.woltlab.wcf/template/documentHeader.tpl
diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/template/footer.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/footer.tpl
rename to com.woltlab.wcf/template/footer.tpl
diff --git a/com.woltlab.wcf/templates/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/footerMenu.tpl
rename to com.woltlab.wcf/template/footerMenu.tpl
diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/headInclude.tpl
rename to com.woltlab.wcf/template/headInclude.tpl
diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/template/header.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/header.tpl
rename to com.woltlab.wcf/template/header.tpl
diff --git a/com.woltlab.wcf/templates/headerMenu.tpl b/com.woltlab.wcf/template/headerMenu.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/headerMenu.tpl
rename to com.woltlab.wcf/template/headerMenu.tpl
diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/template/imageViewer.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/imageViewer.tpl
rename to com.woltlab.wcf/template/imageViewer.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeBoolean.tpl b/com.woltlab.wcf/template/optionTypeBoolean.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeBoolean.tpl
rename to com.woltlab.wcf/template/optionTypeBoolean.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeDate.tpl b/com.woltlab.wcf/template/optionTypeDate.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeDate.tpl
rename to com.woltlab.wcf/template/optionTypeDate.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeMultiselect.tpl b/com.woltlab.wcf/template/optionTypeMultiselect.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeMultiselect.tpl
rename to com.woltlab.wcf/template/optionTypeMultiselect.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeRadiobuttons.tpl b/com.woltlab.wcf/template/optionTypeRadiobuttons.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeRadiobuttons.tpl
rename to com.woltlab.wcf/template/optionTypeRadiobuttons.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeSelect.tpl b/com.woltlab.wcf/template/optionTypeSelect.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeSelect.tpl
rename to com.woltlab.wcf/template/optionTypeSelect.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeText.tpl b/com.woltlab.wcf/template/optionTypeText.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeText.tpl
rename to com.woltlab.wcf/template/optionTypeText.tpl
diff --git a/com.woltlab.wcf/templates/optionTypeTextarea.tpl b/com.woltlab.wcf/template/optionTypeTextarea.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/optionTypeTextarea.tpl
rename to com.woltlab.wcf/template/optionTypeTextarea.tpl
diff --git a/com.woltlab.wcf/templates/permissionDenied.tpl b/com.woltlab.wcf/template/permissionDenied.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/permissionDenied.tpl
rename to com.woltlab.wcf/template/permissionDenied.tpl
diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/redirect.tpl
rename to com.woltlab.wcf/template/redirect.tpl
diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/template/userException.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/userException.tpl
rename to com.woltlab.wcf/template/userException.tpl
diff --git a/com.woltlab.wcf/usergroupoptions.xml b/com.woltlab.wcf/usergroupoption.xml
similarity index 100%
rename from com.woltlab.wcf/usergroupoptions.xml
rename to com.woltlab.wcf/usergroupoption.xml
diff --git a/com.woltlab.wcf/useroptions.xml b/com.woltlab.wcf/useroption.xml
similarity index 100%
rename from com.woltlab.wcf/useroptions.xml
rename to com.woltlab.wcf/useroption.xml
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 50cc72ec2e..a43bbaffc8 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -693,7 +693,7 @@ class WCFSetup extends WCF {
 			VALUES		(?, ?, ?)";
 		$statement = self::getDB()->prepareStatement($sql);
 		$statement->execute(array(
-			'packageinstallationplugins',
+			'packageinstallationplugin',
 			1,
 			'wcf\system\package\plugin\PIPPackageInstallationPlugin'
 		));
diff --git a/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
index cf1a571fa1..e8966519fe 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
@@ -36,7 +36,7 @@ class PackageUninstallationNodeBuilder extends PackageInstallationNodeBuilder {
 		// fetch ordered pips
 		$pips = array();
 		$sql = "SELECT		pluginName, className,
-					CASE pluginName WHEN 'packageinstallationplugins' THEN 1 WHEN 'files' THEN 2 ELSE 0 END 'pluginOrder'
+					CASE pluginName WHEN 'packageinstallationplugin' THEN 1 WHEN 'files' THEN 2 ELSE 0 END 'pluginOrder'
 			FROM		wcf".WCF_N."_package_installation_plugin
 			ORDER BY	pluginOrder, priority";
 		$statement = WCF::getDB()->prepareStatement($sql);
-- 
2.20.1