Updating all Memcached_DataObject extended classes to Managed_DataObject

[quix0rs-gnu-social.git] / plugins / OStatus / classes / Magicsig.php

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 31d061e6a0148ab90522db25ce3c5f7857440e73..01c4689676ec903dc901a81e0a7c079a17cc1bec 100644 (file)
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
 
 require_once 'Crypt/RSA.php';
 
-class Magicsig extends Memcached_DataObject
+class Magicsig extends Managed_DataObject
 {
     const PUBLICKEYREL = 'magic-public-key';
 
@@ -81,32 +81,6 @@ class Magicsig extends Memcached_DataObject
         $this->alg = $alg;
     }
 
-    /**
-     * Fetch a Magicsig object from the cache or database on a field match.
-     *
-     * @param string $k
-     * @param mixed $v
-     * @return Magicsig
-     */
-    public /*static*/ function staticGet($k, $v=null)
-    {
-        $obj =  parent::staticGet(__CLASS__, $k, $v);
-        if (!empty($obj)) {
-            $obj = Magicsig::fromString($obj->keypair);
-
-            // Double check keys: Crypt_RSA did not
-            // consistently generate good keypairs.
-            // We've also moved to 1024 bit keys.
-            if (strlen($obj->publicKey->modulus->toBits()) != 1024) {
-                $obj->delete();
-                return false;
-            }
-        }
-
-        return $obj;
-    }
-
-
     function table()
     {
         return array(