Updating all Memcached_DataObject extended classes to Managed_DataObject

In some brief tests, this causes no problems.

In this state however, you would need to modify DB_DataObject to have a static declaration of staticget (and probably pkeyGet). The next commit will change the staticGet overload to a unique function name (like getKV for getKeyValue), which means we can properly call the function by PHP Strict Standards.
This commit is contained in:
Mikael Nordfeldth
2013-08-18 12:10:44 +02:00
parent c36608b233
commit e95f77d34c
41 changed files with 40 additions and 488 deletions

View File

@@ -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(