Luctum / Increase

app/models/Operation.php

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     }
     
     public function toString() {
-    	return $this->operation;
+     return $this->operation;
     }
 
 }

app/models/Ressource.php

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     }
     
     public function toString() {
-    	return $this->libelle;
+     return $this->libelle;
     }
 
 }

app/controllers/ControllerBase.php

Indentation +25 added lines, -25 removed lines

@@ -43,7 +43,7 @@ 
         $this->view->pick("main/index");
         } else {
             $this->view->pick("main/error");
-    	}
+     }
     }
 
     public function getInstance($id = NULL)
@@ -141,34 +141,34 @@ 
     }    
     
     public function loadAclAction($typeUser) {
-    	$acl = new AclList();
-    	$acl->setDefaultAction(Phalcon\Acl::DENY);
+     $acl = new AclList();
+     $acl->setDefaultAction(Phalcon\Acl::DENY);
     	
-    	$roles = TypeUser::find();
-    	foreach ($roles as $role) {
-    		$acl->addRole($role->getLibelle());
-    	}
-
-    	$operationsBdd = Operation::find();
-    	$operations = array();
-    	foreach ($operationsBdd as $operation) {
-    		$operations[] = $operation->getOperation();
-    	}
+     $roles = TypeUser::find();
+     foreach ($roles as $role) {
+      $acl->addRole($role->getLibelle());
+     }
+
+     $operationsBdd = Operation::find();
+     $operations = array();
+     foreach ($operationsBdd as $operation) {
+      $operations[] = $operation->getOperation();
+     }
     	
-    	$ressources = Ressource::find();
-    	foreach ($ressources as $ressource) {
-    		$acl->addResource($ressource->getLibelle(), $operations);
-    	}
+     $ressources = Ressource::find();
+     foreach ($ressources as $ressource) {
+      $acl->addResource($ressource->getLibelle(), $operations);
+     }
  
-    	$aclsBdd = Acl::find();
-    	foreach ($aclsBdd as $aclBdd) {
-    		$typeUserBdd = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
-    		$ressourceBdd = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
-    		$operationBdd = Operation::findFirst("id = ".$aclBdd->getIdOperation());
-    		$acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation());
-    	}
+     $aclsBdd = Acl::find();
+     foreach ($aclsBdd as $aclBdd) {
+      $typeUserBdd = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
+      $ressourceBdd = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
+      $operationBdd = Operation::findFirst("id = ".$aclBdd->getIdOperation());
+      $acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation());
+     }
     	
-    	return $acl;
+     return $acl;
     }
     
     public function verifyAccessAction($activeResource, $activeOperation) {

Spacing +6 added lines, -6 removed lines

@@ -162,9 +162,9 @@ 
  
     	$aclsBdd = Acl::find();
     	foreach ($aclsBdd as $aclBdd) {
-    		$typeUserBdd = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
-    		$ressourceBdd = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
-    		$operationBdd = Operation::findFirst("id = ".$aclBdd->getIdOperation());
+    		$typeUserBdd = TypeUser::findFirst("id = " . $aclBdd->getIdTypeUser());
+    		$ressourceBdd = Ressource::findFirst("id = " . $aclBdd->getIdRessource());
+    		$operationBdd = Operation::findFirst("id = " . $aclBdd->getIdOperation());
     		$acl->allow($typeUserBdd->getLibelle(), $ressourceBdd->getLibelle(), $operationBdd->getOperation());
     	}
     	
@@ -172,9 +172,9 @@ 
     }
     
     public function verifyAccessAction($activeResource, $activeOperation) {
-        if($this->session->has("user")){
+        if ($this->session->has("user")) {
             $user = $this->session->get("user");
-            $typeUser = TypeUser::findFirst("id = ".$user->getIdTypeUser());
+            $typeUser = TypeUser::findFirst("id = " . $user->getIdTypeUser());
             $typeUserSession = $user->getIdTypeUser();
             $acl = $this->loadAclAction($typeUserSession);
             if ($acl->isAllowed($typeUser->getLibelle(), $activeResource, $activeOperation)) {
@@ -182,7 +182,7 @@ 
             } else {
                 return 0;
             }
-        }else{
+        } else {
             return 0;
         }
     }

app/controllers/UsersController.php

Indentation +22 added lines, -22 removed lines

@@ -22,34 +22,34 @@
     }
     
     public function signInAction() {
-    	$bootstrap = $this->jquery->bootstrap();
+     $bootstrap = $this->jquery->bootstrap();
     	 
-    	if(!empty($_POST['identite']) && !empty($_POST['password'])) {
+     if(!empty($_POST['identite']) && !empty($_POST['password'])) {
     		
-    		$userPseudo = User::findFirst("identite = '".$_POST['identite']."'");
+      $userPseudo = User::findFirst("identite = '".$_POST['identite']."'");
 
-    		$userMail = User::findFirst("mail = '".$_POST['identite']."'");
+      $userMail = User::findFirst("mail = '".$_POST['identite']."'");
     	
-    		if($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) {
-    			$this->session->set("user", $userPseudo);
-    			$this->response->redirect("Index/index");
-    			$this->loadAclAction($userPseudo->getRole());
-    		} else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
-    			$this->session->set("user", $userMail);
-    			$this->response->redirect("Index/index");
-    			$this->loadAclAction($userMail->getRole());
-    		} else {
-    			echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte.");
-    		}
-    	}
+      if($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) {
+       $this->session->set("user", $userPseudo);
+       $this->response->redirect("Index/index");
+       $this->loadAclAction($userPseudo->getRole());
+      } else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
+       $this->session->set("user", $userMail);
+       $this->response->redirect("Index/index");
+       $this->loadAclAction($userMail->getRole());
+      } else {
+       echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte.");
+      }
+     }
     }
 	
-	public function rulesAction() {
-		$accordion=$this->jquery->bootstrap()->htmlAccordion("accordion1");
-		$accordion->addPanel("Panel 1","Contenu du panel 1");
-		$accordion->addPanel("Panel 2","Contenu du panel 2");
-		echo $accordion;
-	}
+ public function rulesAction() {
+  $accordion=$this->jquery->bootstrap()->htmlAccordion("accordion1");
+  $accordion->addPanel("Panel 1","Contenu du panel 1");
+  $accordion->addPanel("Panel 2","Contenu du panel 2");
+  echo $accordion;
+ }
 
  
 

Spacing +9 added lines, -9 removed lines

@@ -24,30 +24,30 @@
     public function signInAction() {
     	$bootstrap = $this->jquery->bootstrap();
     	 
-    	if(!empty($_POST['identite']) && !empty($_POST['password'])) {
+    	if (!empty($_POST['identite']) && !empty($_POST['password'])) {
     		
-    		$userPseudo = User::findFirst("identite = '".$_POST['identite']."'");
+    		$userPseudo = User::findFirst("identite = '" . $_POST['identite'] . "'");
 
-    		$userMail = User::findFirst("mail = '".$_POST['identite']."'");
+    		$userMail = User::findFirst("mail = '" . $_POST['identite'] . "'");
     	
-    		if($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) {
+    		if ($userPseudo != NULL && password_verify($_POST['password'], $userPseudo->getPassword())) {
     			$this->session->set("user", $userPseudo);
     			$this->response->redirect("Index/index");
     			$this->loadAclAction($userPseudo->getRole());
-    		} else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
+    		} else if ($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
     			$this->session->set("user", $userMail);
     			$this->response->redirect("Index/index");
     			$this->loadAclAction($userMail->getRole());
     		} else {
-    			echo $bootstrap->htmlAlert("alert1","L'identifiant ou le mot de passe est incorrecte.");
+    			echo $bootstrap->htmlAlert("alert1", "L'identifiant ou le mot de passe est incorrecte.");
     		}
     	}
     }
 	
 	public function rulesAction() {
-		$accordion=$this->jquery->bootstrap()->htmlAccordion("accordion1");
-		$accordion->addPanel("Panel 1","Contenu du panel 1");
-		$accordion->addPanel("Panel 2","Contenu du panel 2");
+		$accordion = $this->jquery->bootstrap()->htmlAccordion("accordion1");
+		$accordion->addPanel("Panel 1", "Contenu du panel 1");
+		$accordion->addPanel("Panel 2", "Contenu du panel 2");
 		echo $accordion;
 	}
 

app/models/TypeUser.php

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     }
     
     public function toString() {
-    	return $this->libelle;
+     return $this->libelle;
     }
 
 }