diff options
| author | friendica <info@friendica.com> | 2013-05-28 17:16:16 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-28 17:16:16 -0700 |
| commit | 0daaf35ff8cc863ad95d68302fb14dbcea740374 (patch) | |
| tree | 8af0d6c4b2836e4b38bb831b592b661ca26c05c9 | |
| parent | 6bb35832674e35aa4505cd636b6f42c6d0a1a7f4 (diff) | |
| download | volse-hubzilla-0daaf35ff8cc863ad95d68302fb14dbcea740374.tar.gz volse-hubzilla-0daaf35ff8cc863ad95d68302fb14dbcea740374.tar.bz2 volse-hubzilla-0daaf35ff8cc863ad95d68302fb14dbcea740374.zip | |
fix location setting stuff
| -rw-r--r-- | mod/channel.php | 5 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mod/channel.php b/mod/channel.php index ff6f1f309..1442070a9 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -118,9 +118,8 @@ function channel_content(&$a, $update = 0, $load = false) { $x = array( 'is_owner' => $is_owner, -// FIXME - 'allow_location' => ((($is_owner || $observer) && $a->profile['allow_location']) ? true : false), - 'default_location' => (($is_owner) ? $a->profile['default_location'] : ''), + 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig($a->profile['profile_uid'],'system','use_browser_location')))) ? true : false), + 'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''), 'nickname' => $a->profile['channel_address'], 'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel, false) : ''), diff --git a/mod/network.php b/mod/network.php index ca55d9e23..bbd9f9de7 100644 --- a/mod/network.php +++ b/mod/network.php @@ -403,7 +403,7 @@ function network_content(&$a, $update = 0, $load = false) { $x = array( 'is_owner' => true, - 'allow_location' => $a->user['allow_location'], // FIXME + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), diff --git a/mod/settings.php b/mod/settings.php index 2a3e76dd8..5ee6b5d15 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -500,9 +500,10 @@ function settings_post(&$a) { ); */ - $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", + $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", dbesc($username), dbesc($timezone), + dbesc($defloc), intval($notify), intval($unkmail), intval($maxreq), |