Completed
Pull Request — master (#17)
by Hugo
03:16
created
app/controllers/ControllerBase.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
  
163 163
     	$aclsBdd = Acl::find();
164 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());
165
+    		$typeUserBdd = TypeUser::findFirst("id = " . $aclBdd->getIdTypeUser());
166
+    		$ressourceBdd = Ressource::findFirst("id = " . $aclBdd->getIdRessource());
167
+    		$operationBdd = Operation::findFirst("id = " . $aclBdd->getIdOperation());
168 168
     		$acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation());
169 169
     	}
170 170
     	
@@ -172,9 +172,9 @@  discard block
 block discarded – undo
172 172
     }
173 173
     
174 174
     public function verifyAccessAction($activeResource, $activeOperation) {
175
-        if($this->session->has("user")){
175
+        if ($this->session->has("user")) {
176 176
             $user = $this->session->get("user");
177
-            $typeUser = TypeUser::findFirst("id = ".$user->getIdTypeUser());
177
+            $typeUser = TypeUser::findFirst("id = " . $user->getIdTypeUser());
178 178
             $typeUserSession = $user->getIdTypeUser();
179 179
             $acl = $this->loadAclAction($typeUserSession);
180 180
             if ($acl->isAllowed($typeUser->getLibelle(), $activeResource, $activeOperation)) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
             } else {
183 183
                 return 0;
184 184
             }
185
-        }else{
185
+        } else {
186 186
             return 0;
187 187
         }
188 188
     }
Please login to merge, or discard this patch.
app/controllers/UsersController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -24,30 +24,30 @@
 block discarded – undo
24 24
     public function signInAction() {
25 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())) {
33
+    		if ($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) {
34 34
     			$this->session->set("user", $userPseudo);
35 35
     			$this->response->redirect("Index/index");
36 36
     			$this->loadAclAction($userPseudo->getRole());
37
-    		} else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
37
+    		} else if ($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
38 38
     			$this->session->set("user", $userMail);
39 39
     			$this->response->redirect("Index/index");
40 40
     			$this->loadAclAction($userMail->getRole());
41 41
     		} else {
42
-    			echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte.");
42
+    			echo $bootstrap->htmlAlert("alert1", "L'identifiant ou le mot de passe est incorrecte.");
43 43
     		}
44 44
     	}
45 45
     }
46 46
 	
47 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");
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 51
 		echo $accordion;
52 52
 	}
53 53
 
Please login to merge, or discard this patch.