import v1.1.0_beta1 | 2009-08-21

modules/default/models/Association.php

@@ -10,6 +10,6 @@
 */
 
 
-class Association extends Zend_Db_Table_Row_Abstract
+class Model_Association extends Zend_Db_Table_Row_Abstract
 {
 }

modules/default/models/Associations.php

@@ -10,11 +10,11 @@
 */
 
 
-class Associations extends Monkeys_Db_Table_Gateway
+class Model_Associations extends Monkeys_Db_Table_Gateway
 {
     protected $_name = 'associations';
     protected $_primary = 'handle';
-    protected $_rowClass = 'Association';
+    protected $_rowClass = 'Model_Association';
 
     public function getAssociationGivenHandle($handle)
     {

modules/default/models/Field.php

@@ -10,7 +10,7 @@
 */
 
 
-class Field extends Zend_Db_Table_Row_Abstract
+class Model_Field extends Zend_Db_Table_Row_Abstract
 {
     const TYPE_TEXT     = 1;
     const TYPE_DATE     = 2;

modules/default/models/Fields.php

@@ -10,15 +10,15 @@
 */
 
 
-class Fields extends Monkeys_Db_Table_Gateway
+class Model_Fields extends Monkeys_Db_Table_Gateway
 {
     protected $_name = 'fields';
     protected $_primary = 'id';
-    protected $_rowClass = 'Field';
+    protected $_rowClass = 'Model_Field';
 
     private $_fieldsNames= array();
 
-    public function getValues(User $user)
+    public function getValues(Users_Model_User $user)
     {
         $userId = (int)$user->id;
         $select = $this->select()

modules/default/models/FieldsValue.php

@@ -10,6 +10,6 @@
 */
 
 
-class FieldsValue extends Zend_Db_Table_Row_Abstract
+class Model_FieldsValue extends Zend_Db_Table_Row_Abstract
 {
 }

modules/default/models/FieldsValues.php

@@ -10,13 +10,13 @@
 */
 
 
-class FieldsValues extends Monkeys_Db_Table_Gateway
+class Model_FieldsValues extends Monkeys_Db_Table_Gateway
 {
     protected $_name = 'fields_values';
     protected $_primary = array('user_id', 'field_id');
-    protected $_rowClass = 'FieldsValue';
+    protected $_rowClass = 'Model_FieldsValue';
 
-    public function deleteForUser(User $user)
+    public function deleteForUser(Users_Model_User $user)
     {
         $where = $this->getAdapter()->quoteInto('user_id=?', $user->id);
         $this->delete($where);

modules/default/models/Histories.php

@@ -10,17 +10,37 @@
 */
 
 
-class Histories extends Monkeys_Db_Table_Gateway
+class Model_Histories extends Monkeys_Db_Table_Gateway
 {
+    const DIR_ASC = 0;
+    const DIR_DESC = 1;
+
+    private $_sortFields = array(
+        'date'          => array('date', 'site', 'ip', 'result'),
+        'site'          => array('site', 'date', 'ip', 'result'),
+        'ip'            => array('ip', 'date', 'site', 'result'),
+        'result'        => array('result', 'date', 'site', 'ip'),
+    );
+
     protected $_name = 'history';
     protected $_primary = 'id';
-    protected $_rowClass = 'History';
+    protected $_rowClass = 'Model_History';
 
-    public function get(User $user, $startIndex, $results)
+    public function get(Users_Model_User $user, $startIndex = false, $results = false, $sort = false, $dir = false)
     {
         $select = $this->select()
                        ->where('user_id=?', $user->id);
 
+        if ($sort && isset($this->_sortFields[$sort])) {
+            $dir = ($dir == self::DIR_ASC? 'ASC' : 'DESC');
+            $sortSql = array();
+            foreach ($this->_sortFields[$sort] as $field) {
+                $sortSql[] = "$field $dir";
+            }
+
+            $select = $select->order($sortSql);
+        }
+
         if ($startIndex !== false && $results !== false) {
             $select = $select->limit($results, $startIndex);
         }
@@ -28,14 +48,14 @@ class Histories extends Monkeys_Db_Table_Gateway
         return $this->fetchAll($select);
     }
 
-    public function getNumHistories(User $user)
+    public function getNumHistories(Users_Model_User $user)
     {
-        $sites = $this->get($user, false, false);
+        $sites = $this->get($user);
 
         return count($sites);
     }
 
-    public function clear(User $user)
+    public function clear(Users_Model_User $user)
     {
         $where = $this->getAdapter()->quoteInto('user_id=?', $user->id);
         $this->delete($where);

modules/default/models/History.php

@@ -10,7 +10,7 @@
 */
 
 
-class History extends Zend_Db_Table_Row_Abstract
+class Model_History extends Zend_Db_Table_Row_Abstract
 {
     const DENIED        = 0;
     const AUTHORIZED    = 1;

modules/default/models/Settings.php

@@ -9,12 +9,13 @@
 * @packager Keyboard Monkeys
 */
 
-class Settings extends Monkeys_Db_Table_Gateway
+class Model_Settings extends Monkeys_Db_Table_Gateway
 {
     protected $_name = 'settings';
     protected $_primary = 'name';
 
     const MAINTENANCE_MODE = 'maintenance_mode';
+    const VERSION = 'version';
 
     public function get($name)
     {
@@ -23,6 +24,10 @@ class Settings extends Monkeys_Db_Table_Gateway
 
         $row = $this->fetchRow($select);
 
+        if (!$row) {
+            return null;
+        }
+
         return $row->value;
     }
 
@@ -35,4 +40,9 @@ class Settings extends Monkeys_Db_Table_Gateway
     {
         return $this->get(self::MAINTENANCE_MODE);
     }
+
+    public function getVersion()
+    {
+        return $this->get(self::VERSION);
+    }
 }

modules/default/models/Site.php

@@ -10,6 +10,6 @@
 */
 
 
-class Site extends Zend_Db_Table_Row_Abstract
+class Model_Site extends Zend_Db_Table_Row_Abstract
 {
 }

modules/default/models/Sites.php

@@ -10,20 +10,34 @@
 */
 
 
-class Sites extends Monkeys_Db_Table_Gateway
+class Model_Sites extends Monkeys_Db_Table_Gateway
 {
     protected $_name = 'sites';
     protected $_primary = 'id';
-    protected $_rowClass = 'Site';
+    protected $_rowClass = 'Model_Site';
 
-    public function deleteForUserSite(User $user, $site)
+    private $_userSites = array();
+
+    public function deleteForUserSite(Users_Model_User $user, $site)
     {
         $where1 = $this->getAdapter()->quoteInto('user_id=?',$user->id);
         $where2 = $this->getAdapter()->quoteInto('site=?', $site);
         $this->delete("$where1 AND $where2");
     }
 
-    public function get(User $user, $startIndex, $results)
+    public function getSites(Users_Model_User $user)
+    {
+        if (!isset($this->_userSites[$user->username])) {
+            $select = $this->select()
+                           ->where('user_id=?', $user->id);
+
+            $this->_userSites[$user->username] = $this->fetchAll($select);
+        }
+
+        return $this->_userSites[$user->username];
+    }
+
+    public function get(Users_Model_User $user, $startIndex, $results)
     {
         $select = $this->select()
                        ->where('user_id=?', $user->id);
@@ -35,18 +49,32 @@ class Sites extends Monkeys_Db_Table_Gateway
         return $this->fetchAll($select);
     }
 
-    public function getNumSites(User $user)
+    public function getNumSites(Users_Model_User $user)
     {
         $sites = $this->get($user, false, false);
 
         return count($sites);
     }
 
-    public function getTrusted(User $user)
+    public function isTrusted(Users_Model_User $user, $site)
     {
-        $select = $this->select()
-                       ->where('user_id=?', $user->id);
+        foreach ($this->getSites($user) as $userSite) {
+            if ($userSite->site == $site && $userSite->trusted != 'b:0;') {
+                return true;
+            }
+        }
 
-        return $this->fetchAll($select);
+        return false;
+    }
+
+    public function isNeverTrusted(Users_Model_User $user, $site)
+    {
+        foreach ($this->getSites($user) as $userSite) {
+            if ($userSite->site == $site && $userSite->trusted == 'b:0;') {
+                return true;
+            }
+        }
+
+        return false;
     }
 }