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/ProjetsController.php

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");
         }
     }

Spacing +6 added lines, -6 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");
         }
     }
@@ -141,7 +141,7 @@ 
             if ($id != 1) {
                 $client .= ',';
             }
-            $client .= '{value: ' . $c->getId() . ', text:"' . $c->getIdentite() . '"}';
+            $client .= '{value: '.$c->getId().', text:"'.$c->getIdentite().'"}';
         }
 
         $client .= ']';
@@ -208,7 +208,7 @@ 
             if ($id != 1) {
                 $dev .= ',';
             }
-            $dev .= '{value: ' . $c->getId() . ', text:"' . $c->getIdentite() . '"}';
+            $dev .= '{value: '.$c->getId().', text:"'.$c->getIdentite().'"}';
         }
 
         $dev .= ']';
@@ -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); ;
 
     }
 

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 +13 added lines, -13 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']."'");
 
     		$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;
     }
@@ -89,13 +89,13 @@ 
         if ($this->verifyAccessAction($this->controller, "write")) {
             $typeUser = TypeUser::find();
             $this->view->setVar("typeUser", $typeUser);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
 
     }
 
-    public function updateAction(){
+    public function updateAction() {
         if ($this->verifyAccessAction($this->controller, "write")) {
             if ($this->request->isPost()) {
                 $user = new User();
@@ -103,9 +103,9 @@ 
                 $user->setPassword(password_hash($this->request->getPost("password", "string"), PASSWORD_DEFAULT));
                 try {
                     $user->save();
-                    echo "Instance de " . $this->model . " ajoutée";
+                    echo "Instance de ".$this->model." ajoutée";
                 } catch (\Exception $e) {
-                    echo "Impossible d'ajouter l'instance de " . $this->model, "danger : $e";
+                    echo "Impossible d'ajouter l'instance de ".$this->model, "danger : $e";
                 }
             }
         }

Braces +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 
         $this->jquery->compile($this->view);
 
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
     }
@@ -89,7 +89,7 @@ 
         if ($this->verifyAccessAction($this->controller, "write")) {
             $typeUser = TypeUser::find();
             $this->view->setVar("typeUser", $typeUser);
-        }else {
+        } else {
             $this->view->pick("main/error");
         }
 

app/controllers/UsecasesController.php

Spacing +3 added lines, -3 removed lines

@@ -14,17 +14,17 @@
         $this->controller = "Usecases";
     }
 
-    public function updateAction($id=null){
+    public function updateAction($id = null) {
         parent::updateAction();
         $this->response->redirect("Projets/read/$id/2");
     }
 
-    public function deleteAction($id = null){
+    public function deleteAction($id = null) {
         $object = Usecase::findFirst("id = $id");
         $codeUseCase = $object->getCode();
         $taches = Tache::find("codeUseCase = '$codeUseCase'");
         //Deletion des taches liés avant deletion de la UseCase
-        foreach($taches as $t){
+        foreach ($taches as $t) {
             $t->delete();
         }
         $object->delete();

app/config/config.php

Spacing +6 added lines, -6 removed lines

@@ -9,12 +9,12 @@
         'dbname'      => 'increase',
     ),
     'application' => array(
-        'controllersDir' => __DIR__ . '/../../app/controllers/',
-        'modelsDir'      => __DIR__ . '/../../app/models/',
-        'viewsDir'       => __DIR__ . '/../../app/views/',
-        'pluginsDir'     => __DIR__ . '/../../app/plugins/',
-        'libraryDir'     => __DIR__ . '/../../app/library/',
-        'cacheDir'       => __DIR__ . '/../../app/cache/',
+        'controllersDir' => __DIR__.'/../../app/controllers/',
+        'modelsDir'      => __DIR__.'/../../app/models/',
+        'viewsDir'       => __DIR__.'/../../app/views/',
+        'pluginsDir'     => __DIR__.'/../../app/plugins/',
+        'libraryDir'     => __DIR__.'/../../app/library/',
+        'cacheDir'       => __DIR__.'/../../app/cache/',
         'baseUri'        => '/increase/',
     )
 ));

app/config/loader.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
  * We're a registering a set of directories taken from the configuration file
  */
 $loader->registerNamespaces(array(
-    'Ajax' => __DIR__ . '/../../vendor/jcheron/phalcon-jquery/Ajax/',
-    'Library' => __DIR__ . '/../library/'
+    'Ajax' => __DIR__.'/../../vendor/jcheron/phalcon-jquery/Ajax/',
+    'Library' => __DIR__.'/../library/'
 ));
 $loader->registerDirs(
 

app/models/Tache.php

Spacing +1 added lines, -1 removed lines

@@ -190,6 +190,6 @@
 
     public function toString()
     {
-        return $this->libelle . " (" . $this->avancement . ")";
+        return $this->libelle." (".$this->avancement.")";
     }
 }

app/models/Usecase.php

Spacing +1 added lines, -1 removed lines

@@ -241,6 +241,6 @@
 
     public function toString()
     {
-        return $this->nom . " (" . $this->avancement . ")";
+        return $this->nom." (".$this->avancement.")";
     }
 }

app/models/Projet.php

Spacing +4 added lines, -4 removed lines

@@ -256,7 +256,7 @@ 
     //Return a string containing the principal content of the model
     public function getPrincipal()
     {
-        return "Client : " . $this->client->toString() . " <br/> Desciption : " . $this->description;
+        return "Client : ".$this->client->toString()." <br/> Desciption : ".$this->description;
     }
 
 
@@ -301,9 +301,9 @@ 
         $img = $this->getImage();
         $type = getImageSize($img); // [] if you don't have exif you could use getImageSize()
         $allowedTypes = array(
-            1,  // [] gif
-            2,  // [] jpg
-            3,  // [] png
+            1, // [] gif
+            2, // [] jpg
+            3, // [] png
             6   // [] bmp
         );
         if (!in_array($type, $allowedTypes)) {