X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FStatus_network.php;h=a452c32ce0b53d5eab0d685e634b3054102c38da;hb=c6f09306b1c72296db8b55500a5d6a2ea8cd5dd2;hp=445f8a5a3c5759e0c5a4b00ca1861ce85a9af5e3;hpb=238998eca017a3ddd6cc0c01a75f8ace37661b5d;p=quix0rs-gnu-social.git

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 445f8a5a3c..a452c32ce0 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -21,7 +21,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-class Status_network extends DB_DataObject
+class Status_network extends Safe_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -39,14 +39,25 @@ class Status_network extends DB_DataObject
     public $logo;                            // varchar(255)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $tags;                            // text
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Status_network',$k,$v); }
+    function staticGet($k,$v=NULL) {
+        $i = DB_DataObject::staticGet('Status_network',$k,$v);
+
+        // Don't use local process cache; if we're fetching multiple
+        // times it's because we're reloading it in a long-running
+        // process; we need a fresh copy!
+        global $_DB_DATAOBJECT;
+        unset($_DB_DATAOBJECT['CACHE']['status_network']);
+        return $i;
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
     static $cache = null;
+    static $cacheInitialized = false;
     static $base = null;
     static $wildcard = null;
 
@@ -68,11 +79,15 @@ class Status_network extends DB_DataObject
         if (class_exists('Memcache')) {
             self::$cache = new Memcache();
 
-            // Can't close persistent connections, making forking painful.
+            // If we're a parent command-line process we need
+            // to be able to close out the connection after
+            // forking, so disable persistence.
             //
-            // @fixme only do this in *parent* CLI processes.
-            // single-process and child-processes *should* use persistent.
-            $persist = php_sapi_name() != 'cli';
+            // We'll turn it back on again the second time
+            // through which will either be in a child process,
+            // 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);
@@ -80,6 +95,7 @@ class Status_network extends DB_DataObject
             } else {
                 self::$cache->addServer($servers, 11211, $persist);
             }
+            self::$cacheInitialized = true;
         }
 
         self::$base = $dbname;
@@ -245,4 +261,23 @@ class Status_network extends DB_DataObject
             return $this->nickname . '.' . self::$wildcard;
         }
     }
+
+    /**
+     * Return site meta-info tags as an array
+     * @return array of strings
+     */
+    function getTags()
+    {
+        return array_filter(explode("|", strval($this->tags)));
+    }
+
+    /**
+     * Check if this site record has a particular meta-info tag attached.
+     * @param string $tag
+     * @return bool
+     */
+    function hasTag($tag)
+    {
+        return in_array($tag, $this->getTags());
+    }
 }