From e0b494e88d11bb77e646190493d49d3b5ea95057 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 25 Oct 2015 00:44:16 +0200
Subject: [PATCH] Some cleanup and minor fixes

---
 .../install/files/acp/templates/header.tpl    |  2 +-
 .../acp/templates/packageStartInstall.tpl     | 29 +++--------
 .../form/PackageStartInstallForm.class.php    | 51 -------------------
 wcfsetup/install/files/style/ui/tabMenu.scss  |  2 +
 4 files changed, 9 insertions(+), 75 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 70bfbeedc0..aa42fab752 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -7,7 +7,7 @@
 	<title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
 	
 	<!-- Stylesheets -->
-	<!--<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>-->
+	<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
 	{@$__wcf->getStyleHandler()->getStylesheet(true)}
 	<link href="{@$__wcf->getPath()}acp/style/acpMenu.css" type="text/css" rel="stylesheet">
 	{event name='stylesheets'}
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 9581d909d3..1d676871e1 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -49,8 +49,8 @@
 	</nav>
 	
 	<div id="packageSearch" class="container containerPadding tabMenuContent">
-		<fieldset>
-			<legend>{lang}wcf.acp.package.search.conditions{/lang}</legend>
+		<section>
+			<h1>{lang}wcf.acp.package.search.conditions{/lang}</h1>
 			
 			<dl>
 				<dt><label for="packageName">{lang}wcf.acp.package.search.packageName{/lang}</label></dt>
@@ -67,7 +67,7 @@
 					<small>{lang}wcf.acp.package.search.package.description{/lang}</small>
 				</dd>
 			</dl>
-		</fieldset>
+		</section>
 		
 		<div class="formSubmit">
 			<button class="jsButtonPackageSearch">{lang}wcf.global.button.submit{/lang}</button>
@@ -84,8 +84,8 @@
 	
 	<div id="upload" class="container containerPadding tabMenuContent">
 		<form method="post" action="{link controller='PackageStartInstall'}{/link}" enctype="multipart/form-data">
-			<fieldset>
-				<legend>{lang}wcf.acp.package.source{/lang}</legend>
+			<section>
+				<h1>{lang}wcf.acp.package.source{/lang}</h1>
 				
 				<dl{if $errorField == 'uploadPackage'} class="formError"{/if}>
 					<dt><label for="uploadPackage">{lang}wcf.acp.package.source.upload{/lang}</label></dt>
@@ -106,24 +106,7 @@
 						<small>{lang}wcf.acp.package.source.upload.description{/lang}</small>
 					</dd>
 				</dl>
-				
-				<dl{if $errorField == 'downloadPackage'} class="formError"{/if}>
-					<dt><label for="downloadPackage">{lang}wcf.acp.package.source.download{/lang}</label></dt>
-					<dd>
-						<input type="text" id="downloadPackage" name="downloadPackage" value="" class="long" />
-						{if $errorField == 'downloadPackage'}
-							<small class="innerError">
-								{lang}wcf.acp.package.error.{@$errorType}{/lang}
-							</small>
-						{/if}
-						<small>{lang}wcf.acp.package.source.download.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				{event name='sourceFields'}
-			</fieldset>
-			
-			{event name='fieldsets'}
+			</section>
 			
 			<div class="formSubmit">
 				<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
index ccb620d6ac..b7b8f2e546 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
@@ -37,12 +37,6 @@ class PackageStartInstallForm extends AbstractForm {
 	 */
 	public $package = null;
 	
-	/**
-	 * url to the package to download
-	 * @var	string
-	 */
-	public $downloadPackage = '';
-	
 	/**
 	 * data of the uploaded package
 	 * @var	array<string>
@@ -86,7 +80,6 @@ class PackageStartInstallForm extends AbstractForm {
 		parent::readFormParameters();
 		
 		if (!$this->stylePackageImportLocation) {
-			if (isset($_POST['downloadPackage'])) $this->downloadPackage = StringUtil::trim($_POST['downloadPackage']);
 			if (isset($_FILES['uploadPackage'])) $this->uploadPackage = $_FILES['uploadPackage'];
 		}
 	}
@@ -110,9 +103,6 @@ class PackageStartInstallForm extends AbstractForm {
 		else if (!empty($this->uploadPackage['name'])) {
 			$this->validateUploadPackage();
 		}
-		else if (!empty($this->downloadPackage)) {
-			$this->validateDownloadPackage();
-		}
 		else {
 			throw new UserInputException('uploadPackage');
 		}
@@ -156,46 +146,6 @@ class PackageStartInstallForm extends AbstractForm {
 		$this->package = PackageValidationManager::getInstance()->getPackageValidationArchive()->getPackage();
 	}
 	
-	/**
-	 * Validates the download package input.
-	 */
-	protected function validateDownloadPackage() {
-		$this->activeTabMenuItem = 'upload';
-		
-		if (FileUtil::isURL($this->downloadPackage)) {
-			// download package
-			$this->archive = new PackageArchive($this->downloadPackage, $this->package);
-			
-			try {
-				$this->downloadPackage = $this->archive->downloadArchive();
-			}
-			catch (SystemException $e) {
-				throw new UserInputException('downloadPackage', 'downloadFailed');
-			}
-		}
-		else {
-			// probably local path
-			if (!file_exists($this->downloadPackage)) {
-				throw new UserInputException('downloadPackage', 'downloadFailed');
-			}
-		}
-		
-		if (!PackageValidationManager::getInstance()->validate($this->downloadPackage, false)) {
-			$exception = PackageValidationManager::getInstance()->getException();
-			if ($exception instanceof PackageValidationException) {
-				switch ($exception->getCode()) {
-					case PackageValidationException::INVALID_PACKAGE_NAME:
-					case PackageValidationException::MISSING_PACKAGE_XML:
-						throw new UserInputException('downloadPackage', 'noValidPackage');
-					break;
-				}
-			}
-		}
-		
-		$this->package = PackageValidationManager::getInstance()->getPackageValidationArchive()->getPackage();
-		
-	}
-	
 	/**
 	 * @see	\wcf\form\IForm::save()
 	 */
@@ -208,7 +158,6 @@ class PackageStartInstallForm extends AbstractForm {
 		// obey foreign key
 		$packageID = ($this->package) ? $this->package->packageID : null;
 		
-		$archive = $this->downloadPackage;
 		if ($this->stylePackageImportLocation) {
 			$archive = $this->stylePackageImportLocation;
 		}
diff --git a/wcfsetup/install/files/style/ui/tabMenu.scss b/wcfsetup/install/files/style/ui/tabMenu.scss
index 17ef3a3033..2c99eb15e3 100644
--- a/wcfsetup/install/files/style/ui/tabMenu.scss
+++ b/wcfsetup/install/files/style/ui/tabMenu.scss
@@ -8,6 +8,8 @@
 	position: relative;
 	
 	> ul {
+		border-bottom: 1px solid $wcfContentBorderInner;
+		
 		@extend .inlineList;
 		
 		> li {
-- 
2.20.1