diff options
| author | marijus <mario@mariovavti.com> | 2015-01-22 04:58:34 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2015-01-22 04:58:34 +0100 |
| commit | cad8228db3a6b3df0ffa01c84bb2d430749f42c9 (patch) | |
| tree | 6389d0bf442513190f49f7cbc3739f8c2f3a5f5e | |
| parent | 3731ff97ffa9d6c98c7287458edd783823f68305 (diff) | |
| parent | b946ac63a17ce95aa80d016ca4c2195ec8d7498a (diff) | |
| download | volse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.tar.gz volse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.tar.bz2 volse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | mod/locs.php | 12 | ||||
| -rw-r--r-- | view/tpl/locmanage.tpl | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mod/locs.php b/mod/locs.php index b1169fcca..bf2737718 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -11,24 +11,28 @@ 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']) ); - $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']) ); + proc_run('php','include/notifier.php','location',$channel['channel_id']); return; } @@ -36,12 +40,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 +56,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']) 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> |