aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-21 19:09:12 -0800
committerfriendica <info@friendica.com>2015-01-21 19:09:12 -0800
commitb946ac63a17ce95aa80d016ca4c2195ec8d7498a (patch)
treec4bb815bbc298c157b208a73c9cbdcf235d1815f
parent0010eaa41158cd897188b441a71d7fa39c78de02 (diff)
downloadvolse-hubzilla-b946ac63a17ce95aa80d016ca4c2195ec8d7498a.tar.gz
volse-hubzilla-b946ac63a17ce95aa80d016ca4c2195ec8d7498a.tar.bz2
volse-hubzilla-b946ac63a17ce95aa80d016ca4c2195ec8d7498a.zip
couple of hubloc manager issues
-rw-r--r--mod/locs.php6
-rw-r--r--view/tpl/locmanage.tpl6
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>