SD-SimpleDesk

@@ -11,7 +11,6 @@ php:

 matrix:

   include:

-    - php: hhvm

       dist: xenial

 script:

@@ -58,15 +58,6 @@ foreach (sd_get_install_tables() as $table)

 		);

 }

-// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.

-$query = $smcFunc['db_query']('', '

-	DELETE FROM {db_prefix}package_servers

-	WHERE url LIKE {string:plugins}',

-	array(

-		'plugins' => 'http://www.simpledesk.net/download%',

-	)

-);

-

 // Create new rows, if any

 foreach (sd_get_install_rows() as $row)

 	$smcFunc['db_insert']($row['method'], $row['table_name'], $row['columns'], $row['data'], $row['keys']);

@@ -189,6 +180,9 @@ function sd_get_install_modSettings($getAll = false)

 */

 function sd_get_install_rows()

 {

+	global $smcFunc;

+	static $current_package_server_url = 'https://www.simpledesk.net/download/plugins/2.0';

+

 	$rows = array();

 	$rows[] = array(

 		'method' => 'replace',

@@ -212,6 +206,53 @@ function sd_get_install_rows()

 		'keys' => array('task'),

 	);

+

+	// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.

+	$query = $smcFunc['db_query']('', '

+		DELETE FROM {db_prefix}package_servers

+		WHERE

+			(

+				url LIKE {string:plugins_http_wild}

+				OR url LIKE {string:plugins_https_wild}

+			)

+			AND URL != {string:plugins}',

+		array(

+			'plugins' => $current_package_server_url,

+			'plugins_http_wild' => 'http://www.simpledesk.net/download%',

+			'plugins_https_wild' => 'https://www.simpledesk.net/download%',

+		)

+	);

+

+	// Do we have lots of extras?

+	$request = $smcFunc['db_query']('', '

+		SELECT

+			COUNT(url) as total,

+			MAX(id_server) AS lastID

+		FROM {db_prefix}package_servers

+		WHERE url LIKE {string:plugins}',

+		array(

+			'plugins' => $current_package_server_url,

+		)

+	);

+	$results = $smcFunc['db_fetch_assoc']($request);

+	$smcFunc['db_free_result']($request);

+

+	// Get rid of any duplicates.

+	if ($results['total'] > 1 && !empty($results['lastID']))

+		$query = $smcFunc['db_query']('', '

+			DELETE FROM {db_prefix}package_servers

+			WHERE

+				url LIKE {string:plugins_wild}

+				OR url LIKE {string:plugins_https_wild}

+				AND id_server != {int:current_server}',

+			array(

+				'current_server' => $results['lastID'],

+				'plugins_wild' => 'http://www.simpledesk.net/download%',

+				'plugins_https_wild' => 'https://www.simpledesk.net/download%',

+			)

+		);

+	// No results, need to add a entry.

+	elseif (empty($results) || empty($results['total']))

 		$rows[] = array(

 			'method' => 'insert',

 			'table_name' => '{db_prefix}package_servers',

@@ -221,7 +262,7 @@ function sd_get_install_rows()

 			),

 			'data' => array(

 				'SimpleDesk Plugins',

-			'https://www.simpledesk.net/download/plugins/2.0', // !!! This should be updated in later releases!

+				$current_package_server_url, // !!! This should be updated in later releases!

 			),

 			'keys' => array('id_server'),

 		);

@@ -134,7 +134,7 @@ shd_plugins.prototype.togglePlugin = function (e)

 	this.itemID = e.currentTarget.dataset.plugin;

 	// Toggle the hidden item.

-	this.oItemValueHandle = $('#' + this.opt.sFeatureClass.replace('%itemid%', itemID));

+	this.oItemValueHandle = $('#' + this.opt.sFeatureClass.replace('%itemid%', this.itemID));

 	this.bItemValue = this.oItemValueHandle.val() == '0' ? 1 : 0;

 	// Change the image, alternative text and the title.