From b87c06378211d1f6b01793148617bbf7861a2c4f Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 29 Apr 2011 10:18:39 +0200 Subject: Paar Mapper angepasst --- .../modules/user/controllers/AuthController.php | 34 +++++++++++----------- .../modules/user/controllers/ClientController.php | 25 +++++----------- .../modules/user/controllers/FilterController.php | 33 ++++++++++----------- .../modules/user/controllers/GroupController.php | 14 ++++----- .../modules/user/controllers/SessionController.php | 8 ++--- 5 files changed, 51 insertions(+), 63 deletions(-) (limited to 'application/modules/user/controllers') diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php index 7fafa9d..cc3fec4 100644 --- a/application/modules/user/controllers/AuthController.php +++ b/application/modules/user/controllers/AuthController.php @@ -104,11 +104,11 @@ class User_AuthController extends Zend_Controller_Action $person = new Application_Model_Person($_POST); $this->personmapper = new Application_Model_PersonMapper(); $date = new DateTime(); - $person->setSuspend(0); - $person->setRegisterdate($date->getTimestamp()); - $person->setPasswordSalt(MD5($date->getTimestamp())); - $person->setLoginPassword(crypt($person->getPassword(), '$6$'.randomString(8).'$')); - $person->setPassword(MD5($person->getPassword() . $person->getPasswordSalt())); + $person->setSuspend(0) + ->setRegisterdate($date->getTimestamp()) + ->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) @@ -178,10 +178,10 @@ class User_AuthController extends Zend_Controller_Action $this->personmapper = new Application_Model_PersonMapper(); $person = $this->personmapper->find($personID); $date = new DateTime(); - $person->setPassword($_POST['password']); - $person->setPasswordSalt(MD5($date->getTimestamp())); - $person->setLoginPassword(crypt($person->getPassword(), '$6$'.randomString(8).'$')); - $person->setPassword(MD5($person->getPassword() . $person->getPasswordSalt())); + $person->setPassword($_POST['password']) + ->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) @@ -233,15 +233,15 @@ class User_AuthController extends Zend_Controller_Action $recoveryid = randomString(100); $mailbody = 'Um das Passwort zu ändern klicken Sie auf folgenden Link

Passwort ändern'; $mail = new Zend_Mail(); - $mail->setBodyHtml($mailbody, 'utf8'); - $mail->getBodyHtml()->getContent(); - $mail->setFrom('admin@local', 'Admin'); - $mail->addTo($email, $name); - $mail->setSubject('Password Wiederherstellung Preboot Server'); + $mail->setBodyHtml($mailbody, 'utf8') + ->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()); - $passwordRecoveryObject->setRecoveryID($recoveryid); + $passwordRecoveryObject->setID($person->getID()) + ->setRecoveryID($recoveryid); try { $passwordRecoveryMapper->save($passwordRecoveryObject); $mail->send(); @@ -258,4 +258,4 @@ class User_AuthController extends Zend_Controller_Action } $this->view->recoverPasswordForm = $recoverPasswordForm; } -} \ No newline at end of file +} diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php index 589fcdc..76419a8 100644 --- a/application/modules/user/controllers/ClientController.php +++ b/application/modules/user/controllers/ClientController.php @@ -77,10 +77,10 @@ class User_ClientController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(10); - $pagination->setElement($clientsInGroup); - $pagination->setRequestPage($this->_request->getParam('page')); - $pagination->setPageUrl('/user/client/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $pagination->setPerPage(10) + ->setElement($clientsInGroup) + ->setRequestPage($this->_request->getParam('page')) + ->setPageUrl('/user/client/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $clientsInGroup = $pagination->getElements(); $this->view->pagination = $pagination->pagination(); @@ -115,10 +115,10 @@ class User_ClientController extends Zend_Controller_Action $client = new Application_Model_Client($_POST); $mac = ($mac!='')?$mac:$_POST['macadress']; $hh = ($hh!='')?$hh:$_POST['hardwarehash']; - $client->setMacadress($mac); - $client->setHardwarehash($hh); - $client->setCreated(time()); - $client->setGroupID($this->membership->getGroupID()); + $client->setMacadress($mac) + ->setHardwarehash($hh) + ->setCreated(time()) + ->setGroupID($this->membership->getGroupID()); $clientmapper = new Application_Model_ClientMapper(); $clientmapper->save($client); $this->_redirect('/user/client/index/addresult/ok'); @@ -200,13 +200,4 @@ class User_ClientController extends Zend_Controller_Action $this->view->editclient = $editclient; } } - - } - - - - - - - diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index ae91b4e..37f9307 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -72,8 +72,7 @@ class User_FilterController extends Zend_Controller_Action // Search $search = $this->_request->getParam('search'); $mySearch = new Pbs_Search(); - $mySearch->setSearchTerm($search); - $mySearch->setModule('filter'); + $mySearch->setSearchTerm($search)->setModule('filter'); if($search != ''){ $this->view->search = $mySearch->getSearchTerm(); $allFilter = $mySearch->search($allFilter); @@ -82,10 +81,10 @@ class User_FilterController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(10); - $pagination->setElement($allFilter); - $pagination->setRequestPage($this->_request->getParam('page')); - $pagination->setPageUrl('/user/filter/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $pagination->setPerPage(10) + ->setElement($allFilter) + ->setRequestPage($this->_request->getParam('page')) + ->setPageUrl('/user/filter/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $allFilter = $pagination->getElements(); $this->view->pagination = $pagination->pagination(); @@ -131,17 +130,17 @@ class User_FilterController extends Zend_Controller_Action if ($addfilterform->isValid($_POST)) { try{ $newfilter = new Application_Model_Filter($_POST); - $newfilter->setCreated(time()); - $newfilter->setGroupID($this->membership->getGroupID()); - $newfilter->setMembershipID(null); + $newfilter->setCreated(time()) + ->setGroupID($this->membership->getGroupID()) + ->setMembershipID(null); $newfilter2 = new Application_Model_FilterMapper(); $id = $newfilter2->save($newfilter); $filterentriesMapper = new Application_Model_FilterEntriesMapper(); $filterentry = new Application_Model_FilterEntries(); - $filterentry->setFilterID($id); - $filterentry->setFiltertypeID(6); - $filterentry->setFiltervalue($this->membership->getGroupID()); + $filterentry->setFilterID($id) + ->setFiltertypeID(6) + ->setFiltervalue($this->membership->getGroupID()); $filterentriesMapper->save($filterentry); $this->_redirect('/user/filter/index/page/'.$this->page.'/addresult/ok'); @@ -229,9 +228,9 @@ class User_FilterController extends Zend_Controller_Action $filtermapper = new Application_Model_FilterMapper(); $newfilterentry = new Application_Model_Filter($_POST); - $newfilterentry->setID($this->_request->getParam('filterID')); - $newfilterentry->setGroupID($this->membership->getGroupID()); - $newfilterentry->setMembershipID(null); + $newfilterentry->setID($this->_request->getParam('filterID')) + ->setGroupID($this->membership->getGroupID()) + ->setMembershipID(null); // ACL: if he is only allowed to edit filterpriority if(Pbs_Acl::checkRight('fefp') && !Pbs_Acl::checkRight('fe')){ @@ -328,8 +327,8 @@ class User_FilterController extends Zend_Controller_Action if ($addform->isValid($_POST)) { # print_a('valid'); $newfilterenty = new Application_Model_FilterEntries(); - $newfilterenty->setFilterID($filterID); - $newfilterenty->setFiltertypeID($_POST['filtertypeID']); + $newfilterenty->setFilterID($filterID) + ->setFiltertypeID($_POST['filtertypeID']); if($_POST['filtertypeID'] == 1){ $newfilterenty->setFiltervalue($this->fillup($_POST['filtervalue'],3,'.')); diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php index a8c6b00..a262375 100644 --- a/application/modules/user/controllers/GroupController.php +++ b/application/modules/user/controllers/GroupController.php @@ -290,8 +290,8 @@ class User_GroupController extends Zend_Controller_Action // Member Pagination $memberPagination = new Pbs_Pagination(); $memberPagination->setPerPage(10); - $memberPagination->setElement($membersList); - $memberPagination->setRequestPage($this->_request->getParam('page')); + ->setElement($membersList) + ->setRequestPage($this->_request->getParam('page')); if($this->_request->getParam('groupID')) { $memberPagination->setPageUrl('/user/group/show/groupID/' . $groupID . ((isset($this->view->search))?'/search/'.$this->view->search:'')); } else { @@ -425,19 +425,17 @@ class User_GroupController extends Zend_Controller_Action return; } $membership = new Application_Model_Membership(); - $membership->setGroupID($groupRequest->getGroupID()); - $membership->setPersonID($groupRequest->getPersonID()); - $membership->setRoleID($_POST['roleID']); - $membership->setSuspend(0); + $membership->setGroupID($groupRequest->getGroupID()) + ->setPersonID($groupRequest->getPersonID()) + ->setRoleID($_POST['roleID']) + ->setSuspend(0); $apikey = randomString(32); $membership->setApikey($apikey); try { $id = $this->membershipMapper->save($membership); - $membership->setID($id); - $newMember = new Pbs_NewMember(); $newMember->createDefaults($membership); } catch(Zend_Exception $e) diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php index b2fe874..0e32e48 100644 --- a/application/modules/user/controllers/SessionController.php +++ b/application/modules/user/controllers/SessionController.php @@ -95,10 +95,10 @@ class User_SessionController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(10); - $pagination->setElement($mySessions); - $pagination->setRequestPage($this->_request->getParam('page')); - $pagination->setPageUrl('/user/session/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $pagination->setPerPage(10) + ->setElement($mySessions) + ->setRequestPage($this->_request->getParam('page')) + ->setPageUrl('/user/session/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $mySessions = $pagination->getElements(); $this->view->pagination = $pagination->pagination(); -- cgit v1.2.3-55-g7522