1 files changed, 31 insertions, 16 deletions

diff --git a/mod/locs.php b/mod/locs.php
index 5b04bb343..9f66e3263 100644
--- a/mod/locs.php
+++ b/mod/locs.php
@@ -22,13 +22,10 @@ function locs_post(&$a) {
 				return;
 			}
 
-			$r = q("update hubloc set hubloc_flags = (hubloc_flags - %d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' ",
-				intval(HUBLOC_FLAGS_PRIMARY),
-				intval(HUBLOC_FLAGS_PRIMARY),
+			$r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ",
 				dbesc($channel['channel_hash'])
 			);
-			$r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'",
-				intval(HUBLOC_FLAGS_PRIMARY),
+			$r = q("update hubloc set hubloc_primary = 1 where hubloc_id = %d and hubloc_hash = '%s'",
 				intval($hubloc_id),
 				dbesc($channel['channel_hash'])
 			);
@@ -38,11 +35,12 @@ function locs_post(&$a) {
 		}			
 	}
 
+
 	if($_REQUEST['drop']) {
 		$hubloc_id = intval($_REQUEST['drop']);
 
 		if($hubloc_id) {
-			$r = q("select hubloc_id, hubloc_flags from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1",
+			$r = q("select * from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1",
 				intval($hubloc_id),
 				dbesc(z_root()),
 				dbesc($channel['channel_hash'])
@@ -52,12 +50,21 @@ function locs_post(&$a) {
 				notice( t('Location not found.') . EOL);
 				return;
 			}
-			if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) {
-				notice( t('Primary location cannot be removed.') . EOL);
-				return;
+			if(intval($r[0]['hubloc_primary'])) {
+				$x = q("select hubloc_id from hubloc where hubloc_primary = 1 and hubloc_hash = '%s'",
+					dbesc($channel['channel_hash'])
+				);
+				if(! $x) {
+					notice( t('Location lookup failed.'));
+					return;
+				}
+				if(count($x) == 1) {
+					notice( t('Please select another location to become primary before removing the primary location.') . EOL);
+					return;
+				}
 			}
-			$r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'",
-				intval(HUBLOC_FLAGS_DELETED),
+
+			$r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'",
 				intval($hubloc_id),
 				dbesc($channel['channel_hash'])
 			);
@@ -72,7 +79,6 @@ function locs_post(&$a) {
 function locs_content(&$a) {
 
 
-
 	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -80,6 +86,13 @@ function locs_content(&$a) {
 
 	$channel = $a->get_channel();
 
+	if($_REQUEST['sync']) {
+		proc_run('php','include/notifier.php','location',$channel['channel_id']);
+		info( t('Syncing locations') . EOL);
+		goaway(z_root() . '/locs');
+	}
+
+
 	$r = q("select * from hubloc where hubloc_hash = '%s'",
 		dbesc($channel['channel_hash'])
 	);
@@ -91,18 +104,20 @@ function locs_content(&$a) {
 
 
 	for($x = 0; $x < count($r); $x ++) {
-		$r[$x]['primary'] = (($r[$x]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false);
-		$r[$x]['deleted'] = (($r[$x]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false);
+		$r[$x]['primary'] = (intval($r[$x]['hubloc_primary']) ? true : false);
+		$r[$x]['deleted'] = (intval($r[$x]['hubloc_deleted']) ? true : false);
 	}
 
-
-
 	$o = replace_macros(get_markup_template('locmanage.tpl'), array(
 		'$header' => t('Manage Channel Locations'),
 		'$loc' => t('Location (address)'),
 		'$mkprm' => t('Primary Location'),
 		'$drop' => t('Drop location'),
 		'$submit' => t('Submit'),
+		'$sync' => t('Sync now'),
+		'$sync_text' => t('Please wait several minutes between consecutive operations.'),
+		'$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
+		'$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
 		'$hubs' => $r
 	));