summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/Bootstrap.php2
-rw-r--r--application/configs/application.ini3
-rw-r--r--application/controllers/AuthController.php62
-rw-r--r--application/views/scripts/auth/login.phtml1
4 files changed, 29 insertions, 39 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 613100c..0a6a407 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -2,7 +2,5 @@
class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
{
-
-
}
diff --git a/application/configs/application.ini b/application/configs/application.ini
index 5aa767b..d421af8 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -7,13 +7,12 @@ bootstrap.class = "Bootstrap"
appnamespace = "Application"
resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
resources.frontController.params.displayExceptions = 0
-
-[database]
resources.db.adapter = PDO_MYSQL
resources.db.params.host = localhost
resources.db.params.username = root
resources.db.params.password = lsfks-openslx
resources.db.params.dbname = pbs
+resources.db.isDefaultTableAdapter = true
[staging : production]
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index c054437..0a2c8c0 100644
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -2,45 +2,39 @@
class AuthController extends Zend_Controller_Action
{
-
public function loginAction()
{
- $db = $this->_getParam('pbs_person');
+ $db = Zend_Db_Table::getDefaultAdapter();
+
if (!isset($_POST["login"])){
- $loginForm = new Application_Form_AuthLogin();
+ $loginForm = new Application_Form_AuthLogin();
} else {
+ $loginForm = new Application_Form_AuthLogin($_POST);
+
+ if ($loginForm->isValid($_POST)) {
+ $adapter = new Zend_Auth_Adapter_DbTable(
+ $db,
+ 'pbs_person',
+ 'email',
+ 'password',
+ 'MD5(CONCAT(?, password_salt))'
+ );
+
+ $adapter->setIdentity($loginForm->getValue('email'));
+ $adapter->setCredential($loginForm->getValue('password'));
+
+ $result = $adapter->authenticate();
+
+ if ($result->isValid()) {
+ //$this->_helper->FlashMessenger('Erfolgreich angemeldet');
+ $this->_redirect('/');
+ return;
+ } else {
+ //$this->_helper->FlashMessenger('E-Mail oder Passwort falsch');
+ }
+ }
+ }
- $loginForm = new Application_Form_AuthLogin($_POST);
-
- if ($loginForm->isValid($_POST)) {
-
- $adapter = new Zend_Auth_Adapter_DbTable(
- $db,
- 'users',
- 'username',
- 'password',
- 'MD5(CONCAT(?, password_salt))'
- );
-
- $adapter->setIdentity($loginForm->getValue('email'));
- $adapter->setCredential($loginForm->getValue('password'));
-
- $result = $auth->authenticate($adapter);
-
- if ($result->isValid()) {
- $this->_helper->FlashMessenger('Erfolgreich angemeldet');
- $this->redirect('/');
- return;
- }
-
- }
- }
$this->view->loginForm = $loginForm;
-
}
-
-
}
-
-
-
diff --git a/application/views/scripts/auth/login.phtml b/application/views/scripts/auth/login.phtml
index c3b3a55..8312487 100644
--- a/application/views/scripts/auth/login.phtml
+++ b/application/views/scripts/auth/login.phtml
@@ -1,6 +1,5 @@
<?php
$this->loginForm->setAction($this->url());
echo $this->loginForm;
-#var_dump($this);
?>