@@ -102,7 +102,7 @@ |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function toString() { |
| 105 | - return $this->operation; |
|
| 105 | + return $this->operation; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | } |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function toString() { |
| 105 | - return $this->libelle; |
|
| 105 | + return $this->libelle; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | } |
@@ -1,11 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use Phalcon\Mvc\Controller; |
| 4 | - |
|
| 5 | 4 | use Phalcon\Acl\Adapter\Memory as AclList; |
| 6 | -use Phalcon\Acl\Role; |
|
| 7 | -use Phalcon\Acl\Resource; |
|
| 8 | -use Phalcon\Mvc\Url; |
|
| 9 | 5 | |
| 10 | 6 | class ControllerBase extends Controller |
| 11 | 7 | { |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $this->view->pick("main/index"); |
| 44 | 44 | } else { |
| 45 | 45 | $this->view->pick("main/error"); |
| 46 | - } |
|
| 46 | + } |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | public function getInstance($id = NULL) |
@@ -141,34 +141,34 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | public function loadAclAction($typeUser) { |
| 144 | - $acl = new AclList(); |
|
| 145 | - $acl->setDefaultAction(Phalcon\Acl::DENY); |
|
| 144 | + $acl = new AclList(); |
|
| 145 | + $acl->setDefaultAction(Phalcon\Acl::DENY); |
|
| 146 | 146 | |
| 147 | - $roles = TypeUser::find(); |
|
| 148 | - foreach ($roles as $role) { |
|
| 149 | - $acl->addRole($role->getLibelle()); |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - $operationsBdd = Operation::find(); |
|
| 153 | - $operations = array(); |
|
| 154 | - foreach ($operationsBdd as $operation) { |
|
| 155 | - $operations[] = $operation->getOperation(); |
|
| 156 | - } |
|
| 147 | + $roles = TypeUser::find(); |
|
| 148 | + foreach ($roles as $role) { |
|
| 149 | + $acl->addRole($role->getLibelle()); |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + $operationsBdd = Operation::find(); |
|
| 153 | + $operations = array(); |
|
| 154 | + foreach ($operationsBdd as $operation) { |
|
| 155 | + $operations[] = $operation->getOperation(); |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | - $ressources = Ressource::find(); |
|
| 159 | - foreach ($ressources as $ressource) { |
|
| 160 | - $acl->addResource($ressource->getLibelle(), $operations); |
|
| 161 | - } |
|
| 158 | + $ressources = Ressource::find(); |
|
| 159 | + foreach ($ressources as $ressource) { |
|
| 160 | + $acl->addResource($ressource->getLibelle(), $operations); |
|
| 161 | + } |
|
| 162 | 162 | |
| 163 | - $aclsBdd = Acl::find(); |
|
| 164 | - foreach ($aclsBdd as $aclBdd) { |
|
| 165 | - $typeUserBdd = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser()); |
|
| 166 | - $ressourceBdd = Ressource::findFirst("id = ".$aclBdd->getIdRessource()); |
|
| 167 | - $operationBdd = Operation::findFirst("id = ".$aclBdd->getIdOperation()); |
|
| 168 | - $acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation()); |
|
| 169 | - } |
|
| 163 | + $aclsBdd = Acl::find(); |
|
| 164 | + foreach ($aclsBdd as $aclBdd) { |
|
| 165 | + $typeUserBdd = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser()); |
|
| 166 | + $ressourceBdd = Ressource::findFirst("id = ".$aclBdd->getIdRessource()); |
|
| 167 | + $operationBdd = Operation::findFirst("id = ".$aclBdd->getIdOperation()); |
|
| 168 | + $acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation()); |
|
| 169 | + } |
|
| 170 | 170 | |
| 171 | - return $acl; |
|
| 171 | + return $acl; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | public function verifyAccessAction($activeResource, $activeOperation) { |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function toString() { |
| 105 | - return $this->libelle; |
|
| 105 | + return $this->libelle; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | } |
@@ -22,34 +22,34 @@ |
||
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function signInAction() { |
| 25 | - $bootstrap = $this->jquery->bootstrap(); |
|
| 25 | + $bootstrap = $this->jquery->bootstrap(); |
|
| 26 | 26 | |
| 27 | - if(!empty($_POST['identite']) && !empty($_POST['password'])) { |
|
| 27 | + if(!empty($_POST['identite']) && !empty($_POST['password'])) { |
|
| 28 | 28 | |
| 29 | - $userPseudo = User::findFirst("identite = '".$_POST['identite']."'"); |
|
| 29 | + $userPseudo = User::findFirst("identite = '".$_POST['identite']."'"); |
|
| 30 | 30 | |
| 31 | - $userMail = User::findFirst("mail = '".$_POST['identite']."'"); |
|
| 31 | + $userMail = User::findFirst("mail = '".$_POST['identite']."'"); |
|
| 32 | 32 | |
| 33 | - if($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) { |
|
| 34 | - $this->session->set("user", $userPseudo); |
|
| 35 | - $this->response->redirect("Index/index"); |
|
| 36 | - $this->loadAclAction($userPseudo->getIdTypeUser()); |
|
| 37 | - } else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) { |
|
| 38 | - $this->session->set("user", $userMail); |
|
| 39 | - $this->response->redirect("Index/index"); |
|
| 40 | - $this->loadAclAction($userMail->getIdTypeUser()); |
|
| 41 | - } else { |
|
| 42 | - echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte."); |
|
| 43 | - } |
|
| 44 | - } |
|
| 33 | + if($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) { |
|
| 34 | + $this->session->set("user", $userPseudo); |
|
| 35 | + $this->response->redirect("Index/index"); |
|
| 36 | + $this->loadAclAction($userPseudo->getIdTypeUser()); |
|
| 37 | + } else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) { |
|
| 38 | + $this->session->set("user", $userMail); |
|
| 39 | + $this->response->redirect("Index/index"); |
|
| 40 | + $this->loadAclAction($userMail->getIdTypeUser()); |
|
| 41 | + } else { |
|
| 42 | + echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte."); |
|
| 43 | + } |
|
| 44 | + } |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function rulesAction() { |
|
| 48 | - $accordion=$this->jquery->bootstrap()->htmlAccordion("accordion1"); |
|
| 49 | - $accordion->addPanel("Panel 1","Contenu du panel 1"); |
|
| 50 | - $accordion->addPanel("Panel 2","Contenu du panel 2"); |
|
| 51 | - echo $accordion; |
|
| 52 | - } |
|
| 47 | + public function rulesAction() { |
|
| 48 | + $accordion=$this->jquery->bootstrap()->htmlAccordion("accordion1"); |
|
| 49 | + $accordion->addPanel("Panel 1","Contenu du panel 1"); |
|
| 50 | + $accordion->addPanel("Panel 2","Contenu du panel 2"); |
|
| 51 | + echo $accordion; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 | |