OSB enhancements to date

modules/account/classes/model/auth/roledefault.php

@@ -0,0 +1,54 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * @package    lnApp
+ * @subpackage Auth
+ * @category   Models
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Model_Auth_RoleDefault extends Model_Auth_Role {
+	protected $_table_names_plural = false;
+
+	protected $_object_formated = array();
+	protected $_formated = FALSE;
+	protected $_formats = array();
+
+	/**
+	 * Format fields for display purposes
+	 *
+	 * @param   string  column name
+	 * @return  mixed
+	 */
+	protected function _format() {
+		$format = Validate::factory($this->_object);
+
+		foreach ($this->_formats as $column => $formats)
+			$format->filters($column,$formats);
+
+		if ($format->check())
+			foreach ($format as $column => $value)
+				$this->_object_formated[$column] = $value;
+
+		$this->_formated = TRUE;
+	}
+
+	/**
+	 * Return a formated columns, as per the model definition
+	 */
+	public function display($column) {
+		// Trigger a load of the record.
+		$value = $this->__get($column);
+
+		// If some of our fields need to be formated for display purposes.
+		if ($this->_loaded AND ! $this->_formated AND $this->_formats)
+			$this->_format();
+
+		if (isset($this->_object_formated[$column]))
+			return $this->_object_formated[$column];
+		else
+			return $value;
+	}
+}
+?>

modules/account/classes/model/auth/userdefault.php

@@ -0,0 +1,77 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * @package    lnApp
+ * @subpackage Auth
+ * @category   Models
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Model_Auth_UserDefault extends Model_Auth_User {
+	protected $_table_names_plural = false;
+
+	// Validation rules
+	protected $_rules = array(
+		'username' => array(
+			'not_empty'  => NULL,
+			'min_length' => array(4),
+			'max_length' => array(32),
+		),
+		'password' => array(
+			'not_empty'  => NULL,
+			'min_length' => array(5),
+			'max_length' => array(42),
+		),
+		'password_confirm' => array(
+			'matches_ifset'    => array('password'),
+		),
+		'email' => array(
+			'not_empty'  => NULL,
+			'min_length' => array(4),
+			'max_length' => array(127),
+			'email'      => NULL,
+		),
+	);
+
+	// Validation callbacks
+	protected $_callbacks = array(
+		'username' => array('username_available'),
+		'email' => array('email_available'),
+	);
+
+	// Columns to ignore
+	protected $_ignored_columns = array('password_confirm');
+
+	/*
+	 * Complete our login
+	 *
+	 * For some database logins, we may not want to record the user last login
+	 * details in the repository, so we just override that parent function
+	 * here.
+	 *
+	 * We can also do some other post-login actions here.
+	 */
+	public function complete_login() {}
+
+	/**
+	 * Test to see if a record has been changed
+	 */
+	public function changed() {
+		return ! (empty($this->_changed));
+	}
+
+	/**
+	 * Debug function to see that has() finds
+	 * @todo This function could be removed
+	 */
+	public function has_list($alias, $model) {
+		// Return list of matches
+		return DB::select()
+			->from($this->_has_many[$alias]['through'])
+			->where($this->_has_many[$alias]['foreign_key'], '=', $this->pk())
+			->where($this->_has_many[$alias]['far_key'], '=', $model->pk())
+			->execute($this->_db)
+			->as_array();
+	}
+}