wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More configuration options for location sharing

Browse Source
This commit is contained in:
Evan Prodromou 2009-12-28 14:43:34 -08:00
parent 29a1669c01
commit 39bdda9c7e
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/User.php
View File

@ -999,12 +999,19 @@ class User extends Memcached_DataObject
function shareLocation() function shareLocation()
{ {
$cfg = common_config('location', 'share');
if ($cfg == 'always') {
return true;
} else if ($cfg == 'never') {
return false;
} else { // user
$share = true; $share = true;
$prefs = User_location_prefs::staticGet('user_id', $this->id); $prefs = User_location_prefs::staticGet('user_id', $this->id);
if (empty($prefs)) { if (empty($prefs)) {
$share = common_config('location', 'share'); $share = common_config('location', 'sharedefault');
} else { } else {
$share = $prefs->share_location; $share = $prefs->share_location;
$prefs->free(); $prefs->free();
@ -1013,3 +1020,4 @@ class User extends Memcached_DataObject
return $share; return $share;
} }
} }
}

3
lib/default.php
View File

@ -226,7 +226,8 @@ $default =
'message' => 'message' =>
array('contentlimit' => null), array('contentlimit' => null),
'location' => 'location' =>
array(), array('share' => 'user', // whether to share location; 'always', 'user', 'never'
'sharedefault' => true),
'omb' => 'omb' =>
array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
'logincommand' => 'logincommand' =>