Completed
Pull Request — master (#17)
by Hugo
03:16
created
app/controllers/ProjetsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@
 block discarded – undo
180 180
         $contributor = array_unique($contributor, SORT_REGULAR);
181 181
 
182 182
         $this->view->setVar("contributors", $contributor);
183
-        $this->view->setVar("usecases", $usecases);;
183
+        $this->view->setVar("usecases", $usecases); ;
184 184
 
185 185
     }
186 186
 
Please login to merge, or discard this patch.
app/controllers/UsecasesController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,21 +14,21 @@
 block discarded – undo
14 14
         $this->controller = "Usecases";
15 15
     }
16 16
 
17
-    public function updateAction($id=null){
17
+    public function updateAction($id = null) {
18 18
         parent::updateAction();
19 19
         $this->response->redirect("Projets/read/$id/2");
20 20
     }
21 21
 
22
-    public function deleteAction($id = null){
22
+    public function deleteAction($id = null) {
23 23
         $object = Usecase::findFirst("id = $id");
24 24
         $codeUseCase = $object->getCode();
25 25
         $taches = Tache::find("codeUseCase = '$codeUseCase'");
26 26
         //Deletion des taches liés avant deletion de la UseCase
27
-        foreach($taches as $t){
27
+        foreach ($taches as $t) {
28 28
             $t->delete();
29 29
         }
30 30
         $object->delete();
31
-        $this->response->redirect($_SERVER['HTTP_REFERER']."/2");
31
+        $this->response->redirect($_SERVER['HTTP_REFERER'] . "/2");
32 32
     }
33 33
 }
34 34
 
Please login to merge, or discard this patch.
app/controllers/ControllerBase.php 5 patches
Doc Comments   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -171,6 +171,10 @@  discard block
 block discarded – undo
171 171
     	return $acl;
172 172
     }
173 173
     
174
+    /**
175
+     * @param string $activeResource
176
+     * @param string $activeOperation
177
+     */
174 178
     public function verifyAccessAction($activeResource, $activeOperation) {
175 179
         if($this->session->has("user")){
176 180
             $user = $this->session->get("user");
@@ -200,7 +204,7 @@  discard block
 block discarded – undo
200 204
      * Affiche un message Alert bootstrap
201 205
      * @param string $message texte du message
202 206
      * @param string $type type du message (info, success, warning ou danger)
203
-     * @param number $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
207
+     * @param integer $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
204 208
      * @param string $dismissable si vrai, l'alert dispose d'une croix de fermeture
205 209
      */
206 210
     public function _showMessage($message, $type = "success", $timerInterval = 0, $dismissable = true, $visible = true)
@@ -218,7 +222,7 @@  discard block
 block discarded – undo
218 222
     /**
219 223
      * Affiche un message Alert bootstrap de type warning
220 224
      * @param string $message texte du message
221
-     * @param number $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
225
+     * @param integer $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
222 226
      * @param string $dismissable si vrai, l'alert dispose d'une croix de fermeture
223 227
      */
224 228
     public function messageWarning($message, $timerInterval = 0, $dismissable = true)
@@ -229,7 +233,7 @@  discard block
 block discarded – undo
229 233
     /**
230 234
      * Affiche un message Alert bootstrap de type danger
231 235
      * @param string $message texte du message
232
-     * @param number $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
236
+     * @param integer $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
233 237
      * @param string $dismissable si vrai, l'alert dispose d'une croix de fermeture
234 238
      */
235 239
     public function messageDanger($message, $timerInterval = 0, $dismissable = true)
@@ -240,7 +244,7 @@  discard block
 block discarded – undo
240 244
     /**
241 245
      * Affiche un message Alert bootstrap de type info
242 246
      * @param string $message texte du message
243
-     * @param number $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
247
+     * @param integer $timerInterval durée en millisecondes d'affichage du message (0 pour que le message reste affiché)
244 248
      * @param string $dismissable si vrai, l'alert dispose d'une croix de fermeture
245 249
      */
246 250
     public function messageInfo($message, $timerInterval = 0, $dismissable = true)
Please login to merge, or discard this patch.
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -1,11 +1,7 @@
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this 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.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@
 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 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -22,34 +22,34 @@
 block discarded – undo
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->getRole());
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->getRole());
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->getRole());
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->getRole());
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
 
Please login to merge, or discard this 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.