pkeyGet is now static and more similar to getKV

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

diff --git a/classes/Config.php b/classes/Config.php
index 6d914ca1f6e6a39b7e87c025be556c7e9a097d42..bf9d880caef6168009fb25c615aa3d9a39dfef8a 100644 (file)
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -27,7 +27,7 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Config extends Memcached_DataObject
+class Config extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -37,19 +37,32 @@ class Config extends Memcached_DataObject
     public $setting;                         // varchar(32)  primary_key not_null
     public $value;                           // varchar(255)
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Config',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration section'),
+                'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration setting'),
+                'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
+            ),
+            'primary key' => array('section', 'setting'),
+        );
+    }
+
     const settingsKey = 'config:settings';
 
     static function loadSettings()
     {
-        $settings = self::_getSettings();
-        if (!empty($settings)) {
-            self::_applySettings($settings);
+        try {
+            $settings = self::_getSettings();
+            if (!empty($settings)) {
+                self::_applySettings($settings);
+            }
+        } catch (Exception $e) {
+            return;
         }
     }
 
@@ -58,7 +71,7 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $settings = $c->get(common_cache_key(self::settingsKey));
+            $settings = $c->get(Cache::key(self::settingsKey));
             if ($settings !== false) {
                 return $settings;
             }
@@ -77,7 +90,7 @@ class Config extends Memcached_DataObject
         $config->free();
 
         if (!empty($c)) {
-            $c->set(common_cache_key(self::settingsKey), $settings);
+            $c->set(Cache::key(self::settingsKey), $settings);
         }
 
         return $settings;
@@ -120,11 +133,6 @@ class Config extends Memcached_DataObject
         return $result;
     }
 
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Config', $kv);
-    }
-
     static function save($section, $setting, $value)
     {
         $result = null;
@@ -154,7 +162,7 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $c->delete(common_cache_key(self::settingsKey));
+            $c->delete(Cache::key(self::settingsKey));
         }
     }
 }