Forgot to signoff

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
SimpleMachines · 1e5c36c0bc42629bd753079a68a65d6588058b6b · Nov 5, 2013
commit 1e5c36c0bc42629bd753079a68a65d6588058b6b
1 parent 6b0e105
@@ -1600,8 +1600,6 @@ function InstallSmileySet()
 
 		package_flush_cache();
 
-		// Time to tell pacman we have a new package installed!
-		package_put_contents($packagesdir . '/installed.list', time());
 		// Credits tag?
 		$credits_tag = (empty($credits_tag)) ? '' : serialize($credits_tag);
 		$smcFunc['db_insert']('',
@@ -109,15 +109,14 @@ function PackageServers()
 	}
 	$smcFunc['db_free_result']($request);
 
-	$context['package_download_broken'] = !is_writable($packagesdir) || !is_writable($packagesdir . '/installed.list');
+	$context['package_download_broken'] = !is_writable($packagesdir);
 
 	if ($context['package_download_broken'])
 	{
 		@chmod($packagesdir, 0777);
-		@chmod($packagesdir . '/installed.list', 0777);
 	}
 
-	$context['package_download_broken'] = !is_writable($packagesdir) || !is_writable($packagesdir . '/installed.list');
+	$context['package_download_broken'] = !is_writable($packagesdir);
 
 	if ($context['package_download_broken'])
 	{
@@ -168,8 +167,6 @@ function PackageServers()
 			$context['package_download_broken'] = false;
 
 			$ftp->chmod('.', 0777);
-			$ftp->chmod('installed.list', 0666);
-
 			$ftp->close();
 		}
 	}
@@ -1058,9 +1058,6 @@ function PackageInstall()
 
 		package_flush_cache();
 
-		// First, ensure this change doesn't get removed by putting a stake in the ground (So to speak).
-		package_put_contents($packagesdir . '/installed.list', time());
-
 		// See if this is already installed, and change it's state as required.
 		$request = $smcFunc['db_query']('', '
 			SELECT package_id, install_state, db_changes
@@ -1318,9 +1315,6 @@ function FlushInstall()
 
 	include_once($sourcedir . '/Subs-Package.php');
 
-	// Record when we last did this.
-	package_put_contents($packagesdir . '/installed.list', time());
-
 	// Set everything as uninstalled.
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}log_packages
@@ -1344,7 +1338,7 @@ function PackageRemove()
 	checkSession('get');
 
 	// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
-	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'installed.list' || $_GET['package'] == 'backups')
+	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups')
 		redirectexit('action=admin;area=packages;sa=browse');
 	$_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_')));
 
@@ -2024,10 +2018,6 @@ function PackagePermissions()
 						'backup' => array(
 							'type' => 'dir',
 						),
-						'installed.list' => array(
-							'type' => 'file',
-							'writable_on' => 'standard',
-						),
 					),
 				),
 			),
@@ -376,7 +376,6 @@ function url_exists($url)
 
 /**
  * Loads and returns an array of installed packages.
- * - gets this information from Packages/installed.list.
  * - returns the array of data.
  * - default sort order is package_installed time
  *
@@ -384,23 +383,7 @@ function url_exists($url)
  */
 function loadInstalledPackages()
 {
-	global $boarddir, $packagesdir, $smcFunc;
-
-	// First, check that the database is valid, installed.list is still king.
-	$install_file = implode('', file($packagesdir . '/installed.list'));
-	if (trim($install_file) == '')
-	{
-		$smcFunc['db_query']('', '
-			UPDATE {db_prefix}log_packages
-			SET install_state = {int:not_installed}',
-			array(
-				'not_installed' => 0,
-			)
-		);
-
-		// Don't have anything left, so send an empty array.
-		return array();
-	}
+	global $smcFunc;
 
 	// Load the packages from the database - note this is ordered by install time to ensure latest package uninstalled first.
 	$request = $smcFunc['db_query']('', '
@@ -542,7 +542,6 @@ function CheckFilesWritable()
 		'avatars',
 		'cache',
 		'Packages',
-		'Packages/installed.list',
 		'Smileys',
 		'Themes',
 		'agreement.txt',
@@ -496,4 +496,12 @@ $get_questions = upgrade_query("
 		");
 	}
 ---}
----#
+---#
+
+/******************************************************************************/
+--- Marking packages as uninstalled...
+/******************************************************************************/
+upgrade_query("
+	UPDATE {$db_prefix}log_packages
+	SET install_state = 0
+");
@@ -570,4 +570,12 @@ CREATE TABLE {$db_prefix}qanda (
 /******************************************************************************/
 ---# Changing ip to bigint
 ALTER TABLE {$db_prefix}log_online ALTER ip TYPE bigint;
----#
+---#
+
+/******************************************************************************/
+--- Marking packages as uninstalled...
+/******************************************************************************/
+upgrade_query("
+	UPDATE {$db_prefix}log_packages
+	SET install_state = 0
+");
@@ -553,4 +553,12 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}qanda (
 		");
 	}
 ---}
----#
+---#
+
+/******************************************************************************/
+--- Marking packages as uninstalled...
+/******************************************************************************/
+upgrade_query("
+	UPDATE {$db_prefix}log_packages
+	SET install_state = 0
+");