summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/controllers/AuthController.php26
-rw-r--r--application/controllers/PersonController.php4
2 files changed, 15 insertions, 15 deletions
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index 5371cf5..1faaab7 100644
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -42,7 +42,7 @@ class AuthController extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
$adapter = new Zend_Auth_Adapter_DbTable( $this->db, 'pbs_person', 'email', 'password', 'MD5(CONCAT(?, password_salt))');
-
+
$adapter->setIdentity($loginForm->getValue('email'));
$adapter->setCredential($loginForm->getValue('password'));
@@ -57,16 +57,16 @@ class AuthController extends Zend_Controller_Action
$date = new DateTime();
$person->setLogindate($date->getTimestamp());
if($person->getSuspend()) {
- $pbsNotifier = new Pbs_Notifier();
- $this->view->notification = $pbsNotifier->notify('Your Account is suspended', 'error');
+ $poolctrlNotifier = new Pool_Notifier();
+ $this->view->notification = $poolctrlNotifier->notify('Your Account is suspended', 'error');
} else {
$this->personmapper->save($person);
$this->_helper->redirector('selectmembership', 'person');
return;
}
} else {
- $pbsNotifier = new Pbs_Notifier();
- $this->view->notification = $pbsNotifier->notify('Wrong Email or Password', 'error');
+ $poolctrlNotifier = new Pool_Notifier();
+ $this->view->notification = $poolctrlNotifier->notify('Wrong Email or Password', 'error');
}
}
}
@@ -95,9 +95,9 @@ class AuthController extends Zend_Controller_Action
$person = $this->personmapper->find($personID);
$date = new DateTime();
$person->setPassword($_POST['password'])
- ->setPasswordSalt(MD5($date->getTimestamp()))
- ->setLoginPassword(crypt($person->getPassword(), '$6$'.randomString(8).'$'))
- ->setPassword(MD5($person->getPassword() . $person->getPasswordSalt()));
+ ->setPasswordSalt(MD5($date->getTimestamp()))
+ ->setLoginPassword(crypt($person->getPassword(), '$6$'.randomString(8).'$'))
+ ->setPassword(MD5($person->getPassword() . $person->getPasswordSalt()));
try {
$this->personmapper->save($person);
} catch(Zend_Exception $e)
@@ -150,14 +150,14 @@ class AuthController extends Zend_Controller_Action
$mailbody = 'Um das Passwort zu ändern klicken Sie auf folgenden Link<br /><br /><a href="'. $url . '/auth/recoverpassword/?recoveryid='. $recoveryid . '">Passwort ändern</a>';
$mail = new Zend_Mail();
$mail->setBodyHtml($mailbody, 'utf8')
- ->getBodyHtml()->getContent()
- ->setFrom('admin@local', 'Admin')
- ->addTo($email, $name)
- ->setSubject('Password Wiederherstellung Preboot Server');
+ ->getBodyHtml()->getContent()
+ ->setFrom('admin@local', 'Admin')
+ ->addTo($email, $name)
+ ->setSubject('Password Wiederherstellung Preboot Server');
$passwordRecoveryMapper = new Application_Model_PasswordRecoveryMapper();
$passwordRecoveryObject = new Application_Model_PasswordRecovery();
$passwordRecoveryObject->setID($person->getID())
- ->setRecoveryID($recoveryid);
+ ->setRecoveryID($recoveryid);
try {
$passwordRecoveryMapper->save($passwordRecoveryObject);
$mail->send();
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 4476f4e..9f056c8 100644
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -108,8 +108,8 @@ class PersonController extends Zend_Controller_Action
}
if(count($suspendlist) >=1){
- $pbsNotifier = new Pbs_Notifier();
- $this->view->notification = $pbsNotifier->notify("Actually ".count($suspendlist)." Memberships are suspended", 'error' );
+ $poolNotifier = new Pool_Notifier();
+ $this->view->notification = $poolNotifier->notify("Actually ".count($suspendlist)." Memberships are suspended", 'error' );
}
}
$membershipSelectForm = new Application_Form_MembershipSelect(array('membershiplist' => $membershipList));