From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 30 Jan 2012 19:34:54 +0000 (+0100)
Subject: Fixed check for unique packages
X-Git-Tag: 2.0.0_Beta_1~1374
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c442546b05f07d61359d1d20fd7a93ba837b9cf;p=GitHub%2FWoltLab%2FWCF.git

Fixed check for unique packages

Fixes #343
---

diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
index fab8bae64d..7955c427db 100644
--- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
@@ -484,27 +484,44 @@ class PackageArchive {
 	}
 	
 	/**
-	 * checks if the current package is already installed
+	 * Checks if the current package is already installed, as it is not
+	 * possible to install non-applications multiple times within the
+	 * same environment.
 	 * 
-	 * if the package is not a unique package, this method
-	 * returns false, because a non-unique package may be
-	 * installed as many times as one wants while a unique 
-	 * package can only be installed once.
-	 *
-	 * @return 	boolean 	isAlreadyInstalled
-	 * @todo	FIX THIS (isUnique is deprecated)
+	 * @return	boolean
 	 */
 	public function isAlreadyInstalled() {
-		// is not a unique package and can be
-		// installed as many times as you want
-		//if ($this->packageInfo['isUnique'] == 0) {
-		//	return false;
-		//}
-		// this package may only be installed
-		// once (e. g. library package)
-		//else {
-			return (count($this->getDuplicates()) != 0);
-		//}
+		$duplicates = $this->getDuplicates();
+		
+		// package is not installed
+		if (empty($duplicates)) {
+			return false;
+		}
+		
+		$parentPackageIDs = array();
+		foreach ($duplicates as $package) {
+			// standalones are always allowed
+			if ($package['standalone']) {
+				return false;
+			}
+			
+			// wcf packages must be unique
+			if (!$package['parentPackageID']) {
+				return true;
+			}
+			
+			$parentPackageIDs[] = $package['parentPackageID'];
+		}
+		
+		// determine if plugin is unique within current application
+		$packageIDs = PackageDependencyHandler::getDependencies();
+		foreach ($parentPackageIDs as $packageID) {
+			if (in_array($packageID, $packageIDs)) {
+				return true;
+			}
+		}
+		
+		return false;
 	}
 	
 	/**