Initial user doesn't need as strict checking on email

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

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 551e690e24a57e55c8850fb526be1848e31f4dc8..b30e3b244e8ebdf9f6b1c487c949f77ecabb89e4 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for profile_block
@@ -25,7 +25,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_block extends Memcached_DataObject
+class Profile_block extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -35,17 +35,28 @@ class Profile_block extends Memcached_DataObject
     public $blocked;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function get($blocker, $blocked)
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
+                'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
+            ),
+            'foreign keys' => array(
+                'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
+                'profile_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
+            ),
+            'primary key' => array('blocker', 'blocked'),
+        );
+    }
+
+    static function exists(Profile $blocker, Profile $blocked)
     {
-        return Memcached_DataObject::pkeyGet('Profile_block',
-                                             array('blocker' => $blocker,
-                                                   'blocked' => $blocked));
-     }
+        return Profile_block::pkeyGet(array('blocker' => $blocker->id,
+                                            'blocked' => $blocked->id));
+    }
 }