From 8472e706bc8c2be81a4426586d511de21c919209 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 21 Jan 2015 18:34:15 -0800
Subject: hubloc manage issue

---
 mod/locs.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 <info@friendica.com>
Date: Wed, 21 Jan 2015 19:09:12 -0800
Subject: couple of hubloc manager issues

---
 mod/locs.php           | 6 +++++-
 view/tpl/locmanage.tpl | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

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;
 		}			
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 5a25850a1..d1bb00543 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -2,10 +2,10 @@
 
 <script>
 function primehub(id) {
-	$.post('locs','primary='+id,function(data) { window.location.href=window.location.href; });
+	$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
 }
 function drophub(id) {
-	$.post('locs','drop='+id,function(data) { window.location.href=window.location.href; });
+	$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
 }
 </script>
 
@@ -17,7 +17,7 @@ function drophub(id) {
 {{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td>
 <td>
 
-{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std"><i class="icon-check-empty" onclick="primehub({{$hub.hubloc_id}}); return false;" ></i></button>{{/if}}
+{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty"  ></i></button>{{/if}}
 </td>
 <td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-remove"></i></button>{{/if}}{{/if}}</td>
 </tr>
-- 
cgit v1.2.3