Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / classes / Status_network.php

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 5d01e72ccc9041c62f1313891963bf820fdfaa37..ffbf9d5a3c0efd0c9c708739aff459a9702bc117 100644 (file)
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -42,7 +42,8 @@ class Status_network extends Safe_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) {
+    static function getKV($k,$v=NULL) {
+        // TODO: This must probably be turned into a non-static call
         $i = DB_DataObject::staticGet('Status_network',$k,$v);
 
         // Don't use local process cache; if we're fetching multiple
@@ -56,8 +57,9 @@ class Status_network extends Safe_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    static $cache = null;
-    static $cacheInitialized = false;
+    // XXX: made public so Status_network_tag can eff with it
+    public static $cache = null;
+    public static $cacheInitialized = false;
     static $base = null;
     static $wildcard = null;
 
@@ -68,13 +70,16 @@ class Status_network extends Safe_DataObject
      * @param string $dbname
      * @param array $servers memcached servers to use for caching config info
      */
-    static function setupDB($dbhost, $dbuser, $dbpass, $dbname, $servers)
+    static function setupDB($dbhost, $dbuser, $dbpass, $dbname, array $servers)
     {
         global $config;
 
         $config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
         $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
-        $config['db']['table_status_network'] = $dbname;
+
+        foreach (array('status_network', 'status_network_tag', 'unavailable_status_network') as $table) {
+            $config['db']['table_'.$table] = $dbname;
+        }
 
         if (class_exists('Memcache')) {
             self::$cache = new Memcache();
@@ -88,12 +93,18 @@ class Status_network extends Safe_DataObject
             // or a single-process script which is switching
             // configurations.
             $persist = php_sapi_name() != 'cli' || self::$cacheInitialized;
-            if (is_array($servers)) {
-                foreach($servers as $server) {
-                    self::$cache->addServer($server, 11211, $persist);
+            if (!is_array($servers)) {
+                $servers = array($servers);
+            } 
+            foreach($servers as $server) {
+                $parts = explode(':', $server);
+                $server = $parts[0];
+                if (count($parts) > 1) {
+                    $port = $parts[1];
+                } else {
+                    $port = 11211;
                 }
-            } else {
-                self::$cache->addServer($servers, 11211, $persist);
+                self::$cache->addServer($server, $port, $persist);
             }
             self::$cacheInitialized = true;
         }
@@ -102,13 +113,13 @@ class Status_network extends Safe_DataObject
     }
 
     static function cacheKey($k, $v) {
-        return 'statusnet:' . self::$base . ':status_network:'.$k.':'.$v;
+        return 'gnusocial:' . self::$base . ':status_network:'.$k.':'.$v;
     }
 
     static function memGet($k, $v)
     {
         if (!self::$cache) {
-            return self::staticGet($k, $v);
+            return self::getKV($k, $v);
         }
 
         $ck = self::cacheKey($k, $v);
@@ -116,7 +127,7 @@ class Status_network extends Safe_DataObject
         $sn = self::$cache->get($ck);
 
         if (empty($sn)) {
-            $sn = self::staticGet($k, $v);
+            $sn = self::getKV($k, $v);
             if (!empty($sn)) {
                 self::$cache->set($ck, clone($sn));
             }
@@ -136,12 +147,12 @@ class Status_network extends Safe_DataObject
         }
     }
 
-    function update($orig=null)
+    function update($dataObject=false)
     {
-        if (is_object($orig)) {
-            $orig->decache(); # might be different keys
+        if (is_object($dataObject)) {
+            $dataObject->decache(); # might be different keys
         }
-        return parent::update($orig);
+        return parent::update($dataObject);
     }
 
     /**
@@ -172,10 +183,10 @@ class Status_network extends Safe_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->decache(); # while we still have the values!
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**
@@ -307,14 +318,7 @@ class Status_network extends Safe_DataObject
      */
     function getTags()
     {
-        $result = Status_network_tag::getTags($this->site_id);
-
-        // XXX : for backwards compatibility
-        if (empty($result)) {
-            return explode('|', $this->tags);
-        }
-
-        return $result;
+        return Status_network_tag::getTags($this->site_id);
     }
 
     /**
@@ -322,7 +326,7 @@ class Status_network extends Safe_DataObject
      * @param array tags
      * @fixme only add/remove differentials
      */
-    function setTags($tags)
+    function setTags(array $tags)
     {
         $this->clearTags();
         foreach ($tags as $tag) {