From 49ecfc9fbdac0578e1923d38fd03002fd0e2c8dc Mon Sep 17 00:00:00 2001
From: Fredric N <fredric@fiktivkod.org>
Date: Wed, 22 Sep 2010 20:50:09 +0200
Subject: [PATCH] Small fixes to user model + Form decorators

---
 application/models/Mapper/User.php                |  2 +-
 application/models/Table/User.php                 |  4 ++--
 .../default/controllers/AuthController.php        | 15 ++-------------
 library/Fiktiv/Db/Table/Abstract.php              | 10 ++++++++++
 library/Fiktiv/Form.php                           |  6 ++++++
 library/Fiktiv/Form/Decorator/Abstract.php        |  6 ++++++
 library/Fiktiv/Form/Decorator/Standard.php        |  6 ++++++
 7 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 library/Fiktiv/Db/Table/Abstract.php
 create mode 100644 library/Fiktiv/Form.php
 create mode 100644 library/Fiktiv/Form/Decorator/Abstract.php
 create mode 100644 library/Fiktiv/Form/Decorator/Standard.php

diff --git a/application/models/Mapper/User.php b/application/models/Mapper/User.php
index e5ba43d..49ad3f6 100644
--- a/application/models/Mapper/User.php
+++ b/application/models/Mapper/User.php
@@ -77,7 +77,7 @@ class Mapper_User extends Fiktiv_Model_Mapper_DbTableAbstract
         $auth = Zend_Auth::getInstance();
 
         // Setup auth adapter
-        $authAdapter = new Zend_Auth_Adapter_DbTable($this->getAdapter(), $this->_name, 'email', 'password');
+        $authAdapter = new Zend_Auth_Adapter_DbTable($this->_dbTable->getAdapter(), $this->_dbTable->_name, 'email', 'password');
 
         // Set credentials
         $authAdapter->setIdentity($email);
diff --git a/application/models/Table/User.php b/application/models/Table/User.php
index 6e854b1..b4f56db 100644
--- a/application/models/Table/User.php
+++ b/application/models/Table/User.php
@@ -1,9 +1,9 @@
 <?php
 
-class Table_User extends Zend_Db_Table_Abstract
+class Table_User extends Fiktiv_Db_Table_Abstract
 {
     protected $_schema   = 'fiktivkod';
     protected $_name     = 'User';
     protected $_primary  = 'id';
-    
+
 }
\ No newline at end of file
diff --git a/application/modules/default/controllers/AuthController.php b/application/modules/default/controllers/AuthController.php
index a411b78..13aca48 100644
--- a/application/modules/default/controllers/AuthController.php
+++ b/application/modules/default/controllers/AuthController.php
@@ -42,28 +42,17 @@ class AuthController extends Fiktiv_Controller_Action
 
         if ($this->_request->isPost() && $form->isValid($this->_request->getParams())) {
 
-            $users = new Users();
+            $users = $this->dataService->User;
 
             if ($users->login($this->_request->getParam('email'), $this->_request->getParam('password'))) {
 
                 // TODO: redirect user
+                $this->_redirect('/');
             } else {
                 // TODO: Wrong email / password
-                var_dump($emailElement->getErrors());
-                echo "Wrong email / password";
             }
         }
 
-
-        echo "You are ";
-        $auth = Zend_Auth::getInstance();
-        if ($auth->hasIdentity()) {
-            $user = $auth->getIdentity();
-            echo $user->firstName;
-        } else {
-            echo "Nobody";
-        }
-
         $this->view->form = $form;
 
     }
diff --git a/library/Fiktiv/Db/Table/Abstract.php b/library/Fiktiv/Db/Table/Abstract.php
new file mode 100644
index 0000000..87fb490
--- /dev/null
+++ b/library/Fiktiv/Db/Table/Abstract.php
@@ -0,0 +1,10 @@
+<?php
+
+class Fiktiv_Db_Table_Abstract extends Zend_Db_Table_Abstract
+{
+    public function __get($name)
+    {
+        if ('_name' === $name)
+            return $this->$name;
+    }
+}
\ No newline at end of file
diff --git a/library/Fiktiv/Form.php b/library/Fiktiv/Form.php
new file mode 100644
index 0000000..da5bcf2
--- /dev/null
+++ b/library/Fiktiv/Form.php
@@ -0,0 +1,6 @@
+<?php
+
+class Fiktiv_Form extends Zend_Form
+{
+    
+}
\ No newline at end of file
diff --git a/library/Fiktiv/Form/Decorator/Abstract.php b/library/Fiktiv/Form/Decorator/Abstract.php
new file mode 100644
index 0000000..ea9e598
--- /dev/null
+++ b/library/Fiktiv/Form/Decorator/Abstract.php
@@ -0,0 +1,6 @@
+<?php
+
+abstract class Fiktiv_Form_Decorator_Abstract extends Zend_Form_Decorator_Abstract
+{
+    
+}
\ No newline at end of file
diff --git a/library/Fiktiv/Form/Decorator/Standard.php b/library/Fiktiv/Form/Decorator/Standard.php
new file mode 100644
index 0000000..7f18979
--- /dev/null
+++ b/library/Fiktiv/Form/Decorator/Standard.php
@@ -0,0 +1,6 @@
+<?php
+
+class Fiktiv_Form_Decorator_Standard extends Fiktiv_Form_Decorator_Abstract
+{
+    
+}
\ No newline at end of file