From 39bdda9c7e7ee7571298c84c406a9dd74805f050 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 28 Dec 2009 14:43:34 -0800
Subject: More configuration options for location sharing

---
 classes/User.php | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'classes')

diff --git a/classes/User.php b/classes/User.php
index 2bcb7c2a0..34151778c 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -999,17 +999,25 @@ class User extends Memcached_DataObject
 
     function shareLocation()
     {
-        $share = true;
+        $cfg = common_config('location', 'share');
 
-        $prefs = User_location_prefs::staticGet('user_id', $this->id);
+        if ($cfg == 'always') {
+            return true;
+        } else if ($cfg == 'never') {
+            return false;
+        } else { // user
+            $share = true;
 
-        if (empty($prefs)) {
-            $share = common_config('location', 'share');
-        } else {
-            $share = $prefs->share_location;
-            $prefs->free();
-        }
+            $prefs = User_location_prefs::staticGet('user_id', $this->id);
 
-        return $share;
+            if (empty($prefs)) {
+                $share = common_config('location', 'sharedefault');
+            } else {
+                $share = $prefs->share_location;
+                $prefs->free();
+            }
+
+            return $share;
+        }
     }
 }
-- 
cgit v1.2.3-54-g00ecf