Fixes to OSB to work with KH 3.3

2012-11-10 10:13:57 +11:00
parent ea36639638
commit 6db02ae77d
238 changed files with 813 additions and 938 deletions
--- a/application/classes/Model/Module/Method/Token.php
+++ b/application/classes/Model/Module/Method/Token.php
@@ -0,0 +1,109 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * OSB Application Module Method Token Model
+ *
+ * @package    OSB
+ * @subpackage Modules
+ * @category   Models
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Model_Module_Method_Token extends ORM_OSB {
+	// Relationships
+	protected $_belongs_to = array(
+		'account'=>array(),
+		'module_method'=>array('foreign_key'=>'method_id'),
+	);
+	protected $_has_one = array(
+		'record_id'=>array(),
+	);
+
+	// This module doesnt keep track of column updates automatically
+	protected $_update_column = FALSE;
+
+	public function method(array $modmeth) {
+		list($module,$method) = $modmeth;
+
+		if (! $method instanceof Model_Module_Method) {
+			if (is_numeric($module))
+				$mo = ORM::factory('Module',$module);
+			elseif (is_string($module))
+				$mo = ORM::factory('Module',array('name'=>$module));
+			elseif (! $module instanceof Model_Module)
+				throw new Kohana_Exception('Unknown module :module',array(':module'=>serialize($module)));
+			else
+				$mo = $module;
+
+			if (! $mo->loaded())
+				throw new Kohana_Exception('Unknown module :module - not loaded?',array(':module'=>$mo->id));
+
+			if (is_numeric($method))
+				$mmo = ORM::factory('Module_Method',$method);
+			elseif (is_string($method))
+				$mmo = ORM::factory('Module_Method',array('name'=>$method,'module_id'=>$mo->id));
+			else
+				throw new Kohana_Exception('Unknown method :method',array(':method'=>serialize($method)));
+		} else
+			$mmo = $method;
+
+		if (! $mmo->loaded())
+			throw new Kohana_Exception('Unknown method :method - not loaded?',array(':method'=>$mmo->id));
+
+		$this->method_id = $mmo->id;
+
+		return $this;
+	}
+
+	public function account($account) {
+		if (! $account instanceof Model_Account) {
+			if (is_numeric($account))
+				$ao = ORM::factory('Account',$account);
+			else
+				throw new Kohana_Exception('Unknown account :account',array(':account'=>serialize($account)));
+		} else
+			$ao = $account;
+
+		$this->account_id = $ao->id;
+
+		return $this;
+	}
+
+	public function uses($uses) {
+		$this->uses = $uses;
+
+		return $this;
+	}
+
+	public function expire($expire) {
+		$this->date_expire = $expire;
+
+		return $this;
+	}
+
+	// @todo Login Reset: When called within a timelimit (so existing token already exists), is returning true but password reset emails have blanks where the tokens are
+	public function generate() {
+		if (! $this->account_id OR ! $this->method_id OR ! ($this->date_expire OR $this->uses))
+			return NULL;
+
+		// Check we dont already have a valid token
+		$mmto = ORM::factory('Module_Method_Token')
+			->where('account_id','=',$this->account_id)
+			->where('method_id','=',$this->method_id)
+			->find();
+
+		if ($mmto->loaded()) {
+			if ((is_null($mmto->date_expire) OR $mmto->date_expire > time()) AND (is_null($mmto->uses) OR $mmto->uses > 0))
+				return $mmto->token;
+			else
+				$mmto->delete();
+		}
+
+		$this->token = md5(sprintf('%s:%s:%s',$this->account_id,$this->method_id,time()));
+		$this->save();
+
+		return $this->saved() ? $this->token : NULL;
+	}
+}
+?>