Changeset 1534

Timestamp:

12/14/2007 12:52:49 PM (11 months ago)

Author:

Shadowhand

Message:

Updates to Auth/ORM:

• User_Model no longer assumes that digit strings are usernames (fix to where_key)
  
• Implemented many<>many deletion in ORM::delete()
  

Location:

trunk

Files:

• modules/auth/models/user.php (modified) (1 diff)
• system/libraries/ORM.php (modified) (1 diff)

trunk/modules/auth/models/user.php

@@ -76 +76 @@
 
         /**
-         * Removes all roles for this user when the object is deleted.
+         * Allows a model to be loaded by username or email address.
          */
-        public function delete()
-        {
-                $where = array($this->class.'_id' => $this->object->id);
-                $table = $this->related_table('roles');
-
-                if ($return = parent::delete())
-                {
-                        // Remove users<>roles relationships
-                        self::$db
-                                ->where($where)
-                                ->delete($table);
-                }
-
-                return $return;
-        }
-
         protected function where_key($id = NULL)
         {
-                if (is_string($id) AND ! is_numeric($id))
+                if ( ! empty($id) AND is_string($id) AND ! ctype_digit($id))
                 {
                         return valid::email($id) ? 'email' : 'username';

trunk/system/libraries/ORM.php

@@ -546 +546 @@
                                 return FALSE;
 
+                        if ( ! empty($this->has_any_belongs_to_many))
+                        {
+                                // Foreign WHERE for this object
+                                $where = array($this->class.'_id' => $this->object->id);
+
+                                foreach($this->has_and_belongs_to_many as $table)
+                                {
+                                        // Delete all many<>many relationships for this object
+                                        self::$db->delete($this->table_name.'_'.$table, $where);
+                                }
+                        }
+
                         // WHERE for this object
                         $where = array('id' => $this->object->id);