Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 78 insertions, 50 deletions

diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index 7a625a209..afc0e2180 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_link extends Memcached_DataObject 
+class Foreign_link extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -13,7 +13,7 @@ class Foreign_link extends Memcached_DataObject
     public $user_id;                         // int(4)  primary_key not_null
     public $foreign_id;                      // int(4)  primary_key not_null
     public $service;                         // int(4)  primary_key not_null
-    public $credentials;                     // varchar(255)  
+    public $credentials;                     // varchar(255)
     public $noticesync;                      // tinyint(1)   not_null default_1
     public $friendsync;                      // tinyint(1)   not_null default_2
     public $profilesync;                     // tinyint(1)   not_null default_1
@@ -21,56 +21,84 @@ class Foreign_link extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-	// XXX:  This only returns a 1->1 single obj mapping.  Change?  Or make
-	// a getForeignUsers() that returns more than one? --Zach
-	static function getByUserID($user_id, $service) {
-		$flink = new Foreign_link();
-		$flink->service = $service;
-		$flink->user_id = $user_id;
-		$flink->limit(1);
-
-		if ($flink->find(TRUE)) {
-			return $flink;
-		}
-
-		return NULL;		
-	}
-	
-	static function getByForeignID($foreign_id, $service) {
-		$flink = new Foreign_link();
-		$flink->service = $service;
-		$flink->foreign_id = $foreign_id;
-		$flink->limit(1);
-
-		if ($flink->find(TRUE)) {
-			return $flink;
-		}
-
-		return NULL;		
-	}
-		
-	# Convenience methods
-	function getForeignUser() {		
-		$fuser = new Foreign_user();
-		$fuser->service = $this->service;
-		$fuser->id = $this->foreign_id;
-		
-		$fuser->limit(1);
-		
-		if ($fuser->find(TRUE)) {
-			return $fuser;
-		}
-		
-		return NULL;		
-	}
-	
-	function getUser() {
-		return User::staticGet($this->user_id);
-	}
-		
+    // XXX:  This only returns a 1->1 single obj mapping.  Change?  Or make
+    // a getForeignUsers() that returns more than one? --Zach
+    static function getByUserID($user_id, $service)
+    {
+        $flink = new Foreign_link();
+        $flink->service = $service;
+        $flink->user_id = $user_id;
+        $flink->limit(1);
+
+        if ($flink->find(true)) {
+            return $flink;
+        }
+
+        return null;
+    }
+
+    static function getByForeignID($foreign_id, $service)
+    {
+        $flink = new Foreign_link();
+        $flink->service = $service;
+        $flink->foreign_id = $foreign_id;
+        $flink->limit(1);
+
+        if ($flink->find(true)) {
+            return $flink;
+        }
+
+        return null;
+    }
+
+    function set_flags($noticesync, $replysync, $friendsync)
+    {
+        if ($noticesync) {
+            $this->noticesync |= FOREIGN_NOTICE_SEND;
+        } else {
+            $this->noticesync &= ~FOREIGN_NOTICE_SEND;
+        }
+
+        if ($replysync) {
+            $this->noticesync |= FOREIGN_NOTICE_SEND_REPLY;
+        } else {
+            $this->noticesync &= ~FOREIGN_NOTICE_SEND_REPLY;
+        }
+
+        if ($friendsync) {
+            $this->friendsync |= FOREIGN_FRIEND_RECV;
+        } else {
+            $this->friendsync &= ~FOREIGN_FRIEND_RECV;
+        }
+
+        $this->profilesync = 0;
+    }
+
+    # Convenience methods
+    function getForeignUser()
+    {
+        $fuser = new Foreign_user();
+        $fuser->service = $this->service;
+        $fuser->id = $this->foreign_id;
+
+        $fuser->limit(1);
+
+        if ($fuser->find(true)) {
+            return $fuser;
+        }
+
+        return null;
+    }
+
+    function getUser()
+    {
+        return User::staticGet($this->user_id);
+    }
+
 }