aboutsummaryrefslogtreecommitdiffstats
path: root/mod/locs.php
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2015-01-22 04:58:34 +0100
committermarijus <mario@mariovavti.com>2015-01-22 04:58:34 +0100
commitcad8228db3a6b3df0ffa01c84bb2d430749f42c9 (patch)
tree6389d0bf442513190f49f7cbc3739f8c2f3a5f5e /mod/locs.php
parent3731ff97ffa9d6c98c7287458edd783823f68305 (diff)
parentb946ac63a17ce95aa80d016ca4c2195ec8d7498a (diff)
downloadvolse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.tar.gz
volse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.tar.bz2
volse-hubzilla-cad8228db3a6b3df0ffa01c84bb2d430749f42c9.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/locs.php')
-rw-r--r--mod/locs.php12
1 files changed, 9 insertions, 3 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'])