Merge branch 'master' of github.com:Block8/PHPCI into feature/bootstrapv3

This commit is contained in:
Dan Cryer 2013-08-01 11:55:22 +01:00
commit a053c44b75
19 changed files with 74 additions and 20 deletions

View file

@ -21,7 +21,7 @@ class SessionController extends \PHPCI\Controller
{
public function init()
{
$this->response->disableLayout();
$this->response->disableLayout();
$this->_userStore = b8\Store\Factory::getStore('User');
}
@ -29,7 +29,7 @@ class SessionController extends \PHPCI\Controller
* Handles user login (form and processing)
*/
public function login()
{
{
if ($this->request->getMethod() == 'POST') {
$user = $this->_userStore->getByEmail($this->getParam('email'));
@ -42,7 +42,7 @@ class SessionController extends \PHPCI\Controller
$form = new b8\Form();
$form->setMethod('POST');
$form->setAction('/session/login');
$form->setAction(PHPCI_URL.'session/login');
$email = new b8\Form\Element\Email('email');
$email->setLabel('Email Address');