From 8472e706bc8c2be81a4426586d511de21c919209 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 18:34:15 -0800 Subject: hubloc manage issue --- mod/locs.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/locs.php b/mod/locs.php index b1169fcca..7ca813c34 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -24,7 +24,7 @@ function locs_post(&$a) { intval(HUBLOC_FLAGS_PRIMARY), dbesc($channel['channel_hash']) ); - $r = q("update hubloc set hubloc_flags = (hubloc_flags & %d) where hubloc_id = %d and hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'", intval(HUBLOC_FLAGS_PRIMARY), intval($hubloc_id), dbesc($channel['channel_hash']) @@ -36,12 +36,14 @@ 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", intval($hubloc_id), dbesc(z_root()), dbesc($channel['channel_hash']) ); + if(! $r) { notice( t('Location not found.') . EOL); return; @@ -50,7 +52,7 @@ function locs_post(&$a) { notice( t('Primary location cannot be removed.') . EOL); return; } - $r = q("update hubloc set hubloc_flags = (hubloc_flags & %d) where hubloc_id = %d and hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'", intval(HUBLOC_FLAGS_DELETED), intval($hubloc_id), dbesc($channel['channel_hash']) -- cgit v1.2.3 From b946ac63a17ce95aa80d016ca4c2195ec8d7498a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 19:09:12 -0800 Subject: couple of hubloc manager issues --- mod/locs.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/locs.php b/mod/locs.php index 7ca813c34..bf2737718 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -11,15 +11,18 @@ 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_flags = (hubloc_flags & ~%d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' ", + + $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), dbesc($channel['channel_hash']) @@ -29,6 +32,7 @@ function locs_post(&$a) { intval($hubloc_id), dbesc($channel['channel_hash']) ); + proc_run('php','include/notifier.php','location',$channel['channel_id']); return; } -- cgit v1.2.3