diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
| commit | c05f0ec40784a17de2e675c4d684d3a0c54228b0 (patch) | |
| tree | fdab07506568d57c9abbac72511c5c04ea46f2fd /mod/locs.php | |
| parent | 6d291d880e14c0489277fd670f235bdb60bcfcd5 (diff) | |
| parent | 7d0e0366b946093f81e1ea4e358697fe5a22be64 (diff) | |
| download | volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.gz volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.bz2 volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/locs.php')
| -rw-r--r-- | mod/locs.php | 12 |
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']) |