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/Controller/User/Account.php
+++ b/application/classes/Controller/User/Account.php
@@ -0,0 +1,105 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides User Account Update functions
+ *
+ * @package    OSB
+ * @subpackage Account
+ * @category   Controllers/User
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_User_Account extends Controller_TemplateDefault_User {
+	protected $secure_actions = array(
+		'edit'=>TRUE,
+		'resetpassword'=>TRUE,
+	);
+
+	public function action_resetpassword() {
+		// @todo Fix this next logic, since matches_ifset is not being called when the value is on the form, but empty
+		if (empty($_POST['password_confirm']))
+			$_POST['password_confirm'] = ' ';
+
+		// Store our new values
+		$this->ao->values($_POST);
+
+		// Run validation and save
+		if ($this->ao->changed())
+			if ($this->ao->check()) {
+				SystemMessage::add(array(
+					'title'=>_('Record updated'),
+					'type'=>'info',
+					'body'=>_('Your account record has been updated.')
+				));
+
+				$this->ao->save();
+
+				// Log the password reset
+				$this->ao->log('Password reset');
+
+				HTTP::redirect('login');
+
+			} else {
+				$output = '';
+				foreach ($this->ao->validation()->errors('forms/login') as $field => $error)
+					$output .= sprintf('<li><b>%s</b> %s</li>',$field,$error);
+
+				if ($output)
+					$output = sprintf('<ul>%s</ul>',$output);
+
+				SystemMessage::add(array(
+					'title'=>_('Record NOT updated'),
+					'type'=>'error',
+					'body'=>_('Your updates didnt pass validation.').'<br/>'.$output,
+				));
+			}
+
+		Block::add(array(
+			'title'=>_('Password Reset'),
+			'body'=>View::factory($this->viewpath())
+				->set('record',$this->ao),
+			));
+	}
+
+	/**
+	 * Show a product
+	 */
+	public function action_edit() {
+		// Store our new values
+		$this->ao->values($_POST);
+
+		// Run validation and save
+		if ($this->ao->changed())
+			if ($this->ao->check()) {
+				SystemMessage::add(array(
+					'title'=>_('Record updated'),
+					'type'=>'info',
+					'body'=>_('Your account record has been updated.')
+				));
+
+				$this->ao->save();
+
+			} else {
+				$output = '';
+				foreach ($this->ao->validation()->errors('forms/login') as $field => $error)
+					$output .= sprintf('<li><b>%s</b> %s</li>',$field,$error);
+
+				if ($output)
+					$output = sprintf('<ul>%s</ul>',$output);
+
+				SystemMessage::add(array(
+					'title'=>_('Record NOT updated'),
+					'type'=>'error',
+					'body'=>_('Your updates didnt pass validation.').'<br/>'.$output,
+				));
+			}
+
+		Block::add(array(
+			'title'=>sprintf('%s: %s - %s',_('Account Edit'),$this->ao->accnum(),$this->ao->name(TRUE)),
+			'body'=>View::factory($this->viewpath())
+				->set('record',$this->ao),
+			));
+	}
+}
+?>
--- a/application/classes/Controller/User/Welcome.php
+++ b/application/classes/Controller/User/Welcome.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp Main home page
+ *
+ * @package    lnApp
+ * @subpackage Page/Home
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_User_Welcome extends Controller_TemplateDefault_User {
+	protected $secure_actions = array(
+		'index'=>FALSE,
+        );
+
+	public function action_index() {
+		$ao = ORM::factory('Account',Auth::instance()->get_user()->id);
+
+		Block::add(array(
+			'title'=>sprintf('%s: %s %s',$ao->accnum(),$ao->first_name,$ao->last_name),
+			'body'=>'Please select from the tree on the left',
+		));
+	}
+}
+?>