Luctum / Increase

app/controllers/IndexController.php

Spacing +2 added lines, -2 removed lines

@@ -6,10 +6,10 @@
     protected $title;
     protected $controller;
 
-    public function initialize(){
+    public function initialize() {
         $this->model = "Index";
         $this->title = "Accueil";
-        $this->controller= "Index";
+        $this->controller = "Index";
     }
 
     public function indexAction()

app/config/services.php

Indentation +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@
         'username' => $config->database->username,
         'password' => $config->database->password,
         'dbname' => $config->database->dbname,
-    		'options' => array(
-    				PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
-    		)
+      'options' => array(
+        PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
+      )
     ));
 });
 

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * The URL component is used to generate all kind of urls in the application
  */
-$di->set('url', function () use ($config) {
+$di->set('url', function() use ($config) {
     $url = new UrlResolver();
     $url->setBaseUri($config->application->baseUri);
 
@@ -30,14 +30,14 @@ 
 /**
  * Setting up the view component
  */
-$di->set('view', function () use ($config) {
+$di->set('view', function() use ($config) {
 
     $view = new View();
 
     $view->setViewsDir($config->application->viewsDir);
 
     $view->registerEngines(array(
-        '.volt' => function ($view, $di) use ($config) {
+        '.volt' => function($view, $di) use ($config) {
 
             $volt = new VoltEngine($view, $di);
 
@@ -57,7 +57,7 @@ 
 /**
  * Database connection is created based in the parameters defined in the configuration file
  */
-$di->set('db', function () use ($config) {
+$di->set('db', function() use ($config) {
     return new DbAdapter(array(
         'host' => $config->database->host,
         'username' => $config->database->username,
@@ -70,7 +70,7 @@ 
 });
 
 
-$di->set('baseUrl', function () use ($config) {
+$di->set('baseUrl', function() use ($config) {
     $baseUrl = $config->application->baseUri;
     return $baseUrl;
 });
@@ -78,34 +78,34 @@ 
 /**
  * If the configuration specify the use of metadata adapter use it or use memory otherwise
  */
-$di->set('modelsMetadata', function () {
+$di->set('modelsMetadata', function() {
     return new MetaDataAdapter();
 });
 
 /**
  * Start the session the first time some component request the session service
  */
-$di->set('session', function () {
+$di->set('session', function() {
     $session = new SessionAdapter();
     $session->start();
 
     return $session;
 });
 
-$di->set("jquery",function(){
-    $jquery= new JsUtils(array("driver"=>"Jquery"));
+$di->set("jquery", function() {
+    $jquery = new JsUtils(array("driver"=>"Jquery"));
     $jquery->bootstrap(new Bootstrap());
-    $jquery->ui(new Ajax\JqueryUI());//optional for JQuery UI
+    $jquery->ui(new Ajax\JqueryUI()); //optional for JQuery UI
     return $jquery;
 });
 
-$di->set('dispatcher', function () {
+$di->set('dispatcher', function() {
 
     // Create an event manager
     $eventsManager = new EventsManager();
 
     // Attach a listener for type "dispatch"
-    $eventsManager->attach("dispatch", function ($event, $dispatcher) {
+    $eventsManager->attach("dispatch", function($event, $dispatcher) {
         // ...
     });
 

app/controllers/ControllerBase.php

Spacing +16 added lines, -16 removed lines

@@ -2,60 +2,60 @@
 
 use Phalcon\Mvc\Controller;
 
-class ControllerBase extends Controller{
+class ControllerBase extends Controller {
 
     protected $model;
     protected $title;
     protected $controller;
 
-    public function afterExecuteRoute($dispatcher){
+    public function afterExecuteRoute($dispatcher) {
         $baseUrl = $this->baseUrl;
         $this->view->setVar("baseUrl", $baseUrl);
         $this->view->setVar("controller", $this->controller);
         $this->view->setVar("title", $this->title);
     }
 
-    public function indexAction(){
-        $objects = call_user_func($this->model."::find");
-        $this->view->setVar("objects",$objects);
+    public function indexAction() {
+        $objects = call_user_func($this->model . "::find");
+        $this->view->setVar("objects", $objects);
         $this->view->pick("main/index");
     }
 
-    public function frmAction($id =  NULL){
+    public function frmAction($id = NULL) {
         echo "Pas encore implémenté...";
     }
 
-    public function readAction($id = NULL){
-        if($id != null){
-            $object = call_user_func($this->model.'::find', "id = $id");
-            $this->view->setVar("object",$object);
+    public function readAction($id = NULL) {
+        if ($id != null) {
+            $object = call_user_func($this->model . '::find', "id = $id");
+            $this->view->setVar("object", $object);
             $this->view->pick("main/read");
         }
     }
 
-    public function updateAction(){
+    public function updateAction() {
         echo "Pas encore implémenté...";
     }
 
-    public function deleteAction($id = null){
-        $object = call_user_func($this->model.'::findFirst', "id = $id");
+    public function deleteAction($id = null) {
+        $object = call_user_func($this->model . '::findFirst', "id = $id");
         $object->delete();
         $this->response->redirect("Index/index");
     }
 
-    public function asAdminAction(){
+    public function asAdminAction() {
         $user = User::findFirst("id=3");
         $this->session->set("user", $user);
         $this->response->redirect("Index/index");
     }
 
-    public function asUserAction(){
+    public function asUserAction() {
         $user = User::findFirst("id=1");
         $this->session->set("user", $user);
         $this->response->redirect("Index/index");
     }
 
-    public function logoutAction(){
+    public function logoutAction() {
         $this->session->destroy();
         $this->response->redirect("Index/index");
     }

app/models/Projet.php

Spacing +5 added lines, -5 removed lines

@@ -221,7 +221,7 @@ 
      *
      * @return string
      */
-    public function getSource(){
+    public function getSource() {
         return 'projet';
     }
 
@@ -231,7 +231,7 @@ 
      * @param mixed $parameters
      * @return Projet[]
      */
-    public static function find($parameters = null){
+    public static function find($parameters = null) {
         return parent::find($parameters);
     }
 
@@ -246,12 +246,12 @@ 
         return parent::findFirst($parameters);
     }
 
-    public function toString(){
+    public function toString() {
         return $this->nom;
     }
 
     //Return a string containing the principal content of the model
-    public function getPrincipal(){
-        return "Client : ".$this->client->toString()." <br/> Desciption : ".$this->description;
+    public function getPrincipal() {
+        return "Client : " . $this->client->toString() . " <br/> Desciption : " . $this->description;
     }
 }

app/models/Tache.php

Spacing +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@
         return parent::findFirst($parameters);
     }
 
-    public function toString(){
-        return $this->libelle."(".$this->avancement.")";
+    public function toString() {
+        return $this->libelle . "(" . $this->avancement . ")";
     }
 }

app/models/Usecase.php

Spacing +2 added lines, -2 removed lines

@@ -219,7 +219,7 @@
         return parent::findFirst($parameters);
     }
 
-    public function toString(){
-        return $this->nom."(".$this->avancement.")";
+    public function toString() {
+        return $this->nom . "(" . $this->avancement . ")";
     }
 }

app/models/User.php

Spacing +4 added lines, -4 removed lines

@@ -158,13 +158,13 @@
         $this->hasMany('id', 'Usecase', 'idDev', array('alias' => 'Usecases'));
     }
 
-    public function toString(){
-        return $this->identite."(".$this->mail.")";
+    public function toString() {
+        return $this->identite . "(" . $this->mail . ")";
     }
 
     //Return a string containing the principal content of the model
-    public function getPrincipal(){
-        return "Identité : ".$this->identite." <br/> Email : ".$this->mail;
+    public function getPrincipal() {
+        return "Identité : " . $this->identite . " <br/> Email : " . $this->mail;
     }
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
     /**
      * Returns the value of field role
      *
-     * @return string
+     * @return integer
      */
     public function getRole()
     {
@@ -193,7 +193,7 @@ 
     /**
      * Allows to query the first record that match the specified conditions
      *
-     * @param mixed $parameters
+     * @param string $parameters
      * @return User
      */
     public static function findFirst($parameters = null)

app/controllers/UsersController.php

Doc Comments +3 added lines

@@ -43,6 +43,9 @@
     	}
     }
     
+    /**
+     * @param integer $typeUser
+     */
     public function loadAclAction($typeUser) {
     	$acl = new AclList();
     	$acl->setDefaultAction(Phalcon\Acl::DENY);

Indentation +30 added lines, -30 removed lines

@@ -21,47 +21,47 @@
     }
     
     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 loadAclAction($typeUser) {
-    	$acl = new AclList();
-    	$acl->setDefaultAction(Phalcon\Acl::DENY);
-    	$roleBdd = TypeUser::findFirst("id = ".$typeUser);
+     $acl = new AclList();
+     $acl->setDefaultAction(Phalcon\Acl::DENY);
+     $roleBdd = TypeUser::findFirst("id = ".$typeUser);
     	
-    	$aclsBdd = Acl::find("idTypeUser = ".$typeUser);
-    	foreach ($aclsBdd as $aclBdd) {
-    		$role = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
-    		$ressource = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
-    		$operation = Operation::findFirst("id = ".$aclBdd->getIdOperation());
-    		$acl->addRole(new Role($role->getLibelle()));
-    		$acl->addResource(new Resource($ressource->getLibelle(), $operation->getOperation()));
-    	}
+     $aclsBdd = Acl::find("idTypeUser = ".$typeUser);
+     foreach ($aclsBdd as $aclBdd) {
+      $role = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
+      $ressource = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
+      $operation = Operation::findFirst("id = ".$aclBdd->getIdOperation());
+      $acl->addRole(new Role($role->getLibelle()));
+      $acl->addResource(new Resource($ressource->getLibelle(), $operation->getOperation()));
+     }
     	
-	}
+ }
 	
-	public function readAction($id = NULL) {
+ public function readAction($id = NULL) {
 		
-	}
+ }
 
  
 

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
     protected $title;
     protected $controller;
 
-    public function initialize(){
+    public function initialize() {
         $this->model = "User";
         $this->title = "Utilisateurs";
         $this->controller = "Users";
@@ -23,22 +23,22 @@ 
     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.");
     		}
     	}
     }
@@ -46,13 +46,13 @@ 
     public function loadAclAction($typeUser) {
     	$acl = new AclList();
     	$acl->setDefaultAction(Phalcon\Acl::DENY);
-    	$roleBdd = TypeUser::findFirst("id = ".$typeUser);
+    	$roleBdd = TypeUser::findFirst("id = " . $typeUser);
     	
-    	$aclsBdd = Acl::find("idTypeUser = ".$typeUser);
+    	$aclsBdd = Acl::find("idTypeUser = " . $typeUser);
     	foreach ($aclsBdd as $aclBdd) {
-    		$role = TypeUser::findFirst("id = ".$aclBdd->getIdTypeUser());
-    		$ressource = Ressource::findFirst("id = ".$aclBdd->getIdRessource());
-    		$operation = Operation::findFirst("id = ".$aclBdd->getIdOperation());
+    		$role = TypeUser::findFirst("id = " . $aclBdd->getIdTypeUser());
+    		$ressource = Ressource::findFirst("id = " . $aclBdd->getIdRessource());
+    		$operation = Operation::findFirst("id = " . $aclBdd->getIdOperation());
     		$acl->addRole(new Role($role->getLibelle()));
     		$acl->addResource(new Resource($ressource->getLibelle(), $operation->getOperation()));
     	}

app/models/TypeUser.php

Doc Comments +1 added lines, -2 removed lines

@@ -31,7 +31,6 @@ 
     /**
      * Method to set the value of field objet
      *
-     * @param string $objet
      * @return $this
      */
     public function setLibelle($libelle)
@@ -94,7 +93,7 @@ 
     /**
      * Allows to query the first record that match the specified conditions
      *
-     * @param mixed $parameters
+     * @param string $parameters
      * @return TypeUser
      */
     public static function findFirst($parameters = null)

Indentation +1 added lines, -1 removed lines

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