@@ -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 | } |
@@ -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) { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $this->view->setVar("object", $object); |
| 67 | 67 | $this->view->pick("main/read"); |
| 68 | 68 | } |
| 69 | - }else{ |
|
| 69 | + } else{ |
|
| 70 | 70 | |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } else { |
| 196 | 196 | return 0; |
| 197 | 197 | } |
| 198 | - }else{ |
|
| 198 | + } else{ |
|
| 199 | 199 | return 0; |
| 200 | 200 | } |
| 201 | 201 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $user = User::findFirst($userId); |
| 272 | 272 | if($user->getTypeUser() == 0){ |
| 273 | 273 | return true; |
| 274 | - }else{ |
|
| 274 | + } else{ |
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | public function isActual($user){ |
| 280 | 280 | if($this->session->has("user") || $user == $this->session->get("user")->getId()){ |
| 281 | 281 | return true; |
| 282 | - }else{ |
|
| 282 | + } else{ |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | 285 | } |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | public function isAdminAndActual($user){ |
| 288 | 288 | if($this->isAdmin($user) || $this->isActual($user)){ |
| 289 | 289 | return true; |
| 290 | - }else{ |
|
| 290 | + } else{ |
|
| 291 | 291 | return false; |
| 292 | 292 | } |
| 293 | 293 | } |
@@ -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 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $buttonFrm->onClick($dialog->jsShow()); |
| 33 | 33 | |
| 34 | 34 | $this->jquery->compile($this->view); |
| 35 | - }else { |
|
| 35 | + } else { |
|
| 36 | 36 | $this->view->pick("main/error"); |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | )); |
| 48 | 48 | $idproj = $projet->getId(); |
| 49 | 49 | $this->response->redirect("Projets/read/$idproj"); |
| 50 | - }else { |
|
| 50 | + } else { |
|
| 51 | 51 | $this->view->pick("main/error"); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | //Compilation de Jquery dans la vue |
| 110 | 110 | $this->jquery->compile($this->view); |
| 111 | - }else { |
|
| 111 | + } else { |
|
| 112 | 112 | $this->view->pick("main/error"); |
| 113 | 113 | } |
| 114 | 114 | } |
@@ -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 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | $this->jquery->compile($this->view); |
| 76 | 76 | |
| 77 | - }else { |
|
| 77 | + } else { |
|
| 78 | 78 | $this->view->pick("main/error"); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | if ($this->verifyAccessAction($this->controller, "write")) { |
| 90 | 90 | $typeUser = TypeUser::find(); |
| 91 | 91 | $this->view->setVar("typeUser", $typeUser); |
| 92 | - }else { |
|
| 92 | + } else { |
|
| 93 | 93 | $this->view->pick("main/error"); |
| 94 | 94 | } |
| 95 | 95 | |