Luctum / Increase

app/controllers/AclController.php

Spacing +7 added lines, -7 removed lines

@@ -5,24 +5,24 @@
     protected $title;
     protected $controller;
 
-    public function initialize(){
+    public function initialize() {
         $this->model = "Acl";
         $this->title = "Acl";
-        $this->controller= "Acl";
+        $this->controller = "Acl";
     }
 
-    public function frmAction(){
+    public function frmAction() {
         $typesUser = TypeUser::find();
         $operations = Operation::find();
         $ressources = Ressource::find();
 
-        $this->view->setVar("operations",$operations);
-        $this->view->setVar("ressources",$ressources);
-        $this->view->setVar("typesUser",$typesUser);
+        $this->view->setVar("operations", $operations);
+        $this->view->setVar("ressources", $ressources);
+        $this->view->setVar("typesUser", $typesUser);
 
     }
 
-    public function updateAction(){
+    public function updateAction() {
         parent::updateAction();
         $this->response->redirect("$this->controller/index");
     }

app/controllers/ControllerBase.php

Spacing +19 added lines, -19 removed lines

@@ -23,7 +23,7 @@ 
         $this->view->setVar("title", $this->title);
     }
 
-    public function frmAction(){
+    public function frmAction() {
 
     }
 
@@ -66,7 +66,7 @@ 
                 $this->view->setVar("object", $object);
                 $this->view->pick("main/read");
             }
-        }else{
+        } else {
 
         }
     }
@@ -110,7 +110,7 @@ 
     public function soloUpdateAction()
     {
         if ($this->verifyAccessAction($this->controller, "write")) {
-            if($this->session->has("user") && ($this->session->get("user")->getId() == $this->request->getPost('pk', 'int')) || $this->session->get("user")->getIdTypeUser() == 0){
+            if ($this->session->has("user") && ($this->session->get("user")->getId() == $this->request->getPost('pk', 'int')) || $this->session->get("user")->getIdTypeUser() == 0) {
                 $name = $this->request->getPost('name', 'string');
                 //Créer la fonction variable 'set' en fonction du name en POST
                 $func = 'set' . ucfirst($name);
@@ -175,9 +175,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());
     	}
     	
@@ -185,9 +185,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)) {
@@ -195,13 +195,13 @@ 
             } else {
                 return 0;
             }
-        }else{
+        } else {
             return 0;
         }
     }
 
 
-    public function moreAction(){
+    public function moreAction() {
         $this->view->pick("main/more");
     }
 
@@ -267,27 +267,27 @@ 
     }
 
 
-    public function isAdmin($userId){
+    public function isAdmin($userId) {
         $user = User::findFirst($userId);
-        if($user->getTypeUser() == 0){
+        if ($user->getTypeUser() == 0) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }
 
-    public function isActual($user){
-        if($this->session->has("user") || $user == $this->session->get("user")->getId()){
+    public function isActual($user) {
+        if ($this->session->has("user") || $user == $this->session->get("user")->getId()) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }
 
-    public function isAdminAndActual($user){
-        if($this->isAdmin($user) || $this->isActual($user)){
+    public function isAdminAndActual($user) {
+        if ($this->isAdmin($user) || $this->isActual($user)) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }

Braces +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
                 $this->view->setVar("object", $object);
                 $this->view->pick("main/read");
             }
-        }else{
+        } else{
 
         }
     }
@@ -195,7 +195,7 @@ 
             } else {
                 return 0;
             }
-        }else{
+        } else{
             return 0;
         }
     }
@@ -271,7 +271,7 @@ 
         $user = User::findFirst($userId);
         if($user->getTypeUser() == 0){
             return true;
-        }else{
+        } else{
             return false;
         }
     }
@@ -279,7 +279,7 @@ 
     public function isActual($user){
         if($this->session->has("user") || $user == $this->session->get("user")->getId()){
             return true;
-        }else{
+        } else{
             return false;
         }
     }
@@ -287,7 +287,7 @@ 
     public function isAdminAndActual($user){
         if($this->isAdmin($user) || $this->isActual($user)){
             return true;
-        }else{
+        } else{
             return false;
         }
     }

app/controllers/ProjetsController.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
         $buttonFrm->onClick($dialog->jsShow());
 
         $this->jquery->compile($this->view);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -47,7 +47,7 @@ 
             ));
             $idproj = $projet->getId();
             $this->response->redirect("Projets/read/$idproj");
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -108,7 +108,7 @@ 
 
             //Compilation de Jquery dans la vue
             $this->jquery->compile($this->view);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -243,7 +243,7 @@ 
         $contributor = array_unique($contributor, SORT_REGULAR);
 
         $this->view->setVar("contributors", $contributor);
-        $this->view->setVar("usecases", $usecases);;
+        $this->view->setVar("usecases", $usecases); ;
 
     }
 

Braces +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
         $buttonFrm->onClick($dialog->jsShow());
 
         $this->jquery->compile($this->view);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -47,7 +47,7 @@ 
             ));
             $idproj = $projet->getId();
             $this->response->redirect("Projets/read/$idproj");
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -108,7 +108,7 @@ 
 
             //Compilation de Jquery dans la vue
             $this->jquery->compile($this->view);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }

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->getIdTypeUser());
-    		} else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
-    			$this->session->set("user", $userMail);
-    			$this->response->redirect("Index/index");
-    			$this->loadAclAction($userMail->getIdTypeUser());
-    		} 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->getIdTypeUser());
+      } else if($userMail != NULL && password_verify($_POST['password'], $userMail->getPassword())) {
+       $this->session->set("user", $userMail);
+       $this->response->redirect("Index/index");
+       $this->loadAclAction($userMail->getIdTypeUser());
+      } 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 +11 added lines, -11 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->getIdTypeUser());
-    		} 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->getIdTypeUser());
     		} 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;
 	}
 
@@ -74,12 +74,12 @@ 
 
         $this->jquery->compile($this->view);
 
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
 
-    public function passwordAction(){
+    public function passwordAction() {
         $password = password_hash("password", PASSWORD_DEFAULT);
         echo $password;
     }

Braces +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
         $this->jquery->compile($this->view);
 
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }

app/models/Acl.php

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@
         return parent::findFirst($parameters);
     }
 
-    public function toString(){
-        return " ".$this->getRessource()->getLibelle()." accessible par ".$this->getTypeUser()->getLibelle()." en droit '".$this->getOperation()->getOperation()."'";
+    public function toString() {
+        return " " . $this->getRessource()->getLibelle() . " accessible par " . $this->getTypeUser()->getLibelle() . " en droit '" . $this->getOperation()->getOperation() . "'";
     }
 }
\ No newline at end of file