Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

1 files changed, 7 insertions, 0 deletions

diff --git a/mod/locs.php b/mod/locs.php
index deb784100..d936ef5e4 100644
--- a/mod/locs.php
+++ b/mod/locs.php
@@ -11,14 +11,17 @@ function locs_post(&$a) {
 	if($_REQUEST['primary']) {
 		$hubloc_id = intval($_REQUEST['primary']);
 		if($hubloc_id) {
+
 			$r = q("select hubloc_id from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1",
 				intval($hubloc_id),
 				dbesc($channel['channel_hash'])
 			);
+
 			if(! $r) {
 				notice( t('Location not found.') . EOL);
 				return;
 			}
+
 			$r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ",
 				dbesc($channel['channel_hash'])
 			);
@@ -26,6 +29,7 @@ function locs_post(&$a) {
 				intval($hubloc_id),
 				dbesc($channel['channel_hash'])
 			);
+
 			proc_run('php','include/notifier.php','location',$channel['channel_id']);
 			return;
 		}			
@@ -33,12 +37,14 @@ function locs_post(&$a) {
 
 	if($_REQUEST['drop']) {
 		$hubloc_id = intval($_REQUEST['drop']);
+
 		if($hubloc_id) {
 			$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'])
 			);
+
 			if(! $r) {
 				notice( t('Location not found.') . EOL);
 				return;
@@ -47,6 +53,7 @@ function locs_post(&$a) {
 				notice( t('Primary location cannot be removed.') . EOL);
 				return;
 			}
+
 			$r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'",
 				intval($hubloc_id),
 				dbesc($channel['channel_hash'])