Completed
Push — master ( f6dfc7...eed325 )
by Hugo
02:57
created
app/config/services.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 /**
21 21
  * The URL component is used to generate all kind of urls in the application
22 22
  */
23
-$di->set('url', function () use ($config) {
23
+$di->set('url', function() use ($config) {
24 24
     $url = new UrlResolver();
25 25
     $url->setBaseUri($config->application->baseUri);
26 26
 
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 /**
31 31
  * Setting up the view component
32 32
  */
33
-$di->set('view', function () use ($config) {
33
+$di->set('view', function() use ($config) {
34 34
 
35 35
     $view = new View();
36 36
 
37 37
     $view->setViewsDir($config->application->viewsDir);
38 38
 
39 39
     $view->registerEngines(array(
40
-        '.volt' => function ($view, $di) use ($config) {
40
+        '.volt' => function($view, $di) use ($config) {
41 41
 
42 42
             $volt = new VoltEngine($view, $di);
43 43
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 /**
58 58
  * Database connection is created based in the parameters defined in the configuration file
59 59
  */
60
-$di->set('db', function () use ($config) {
60
+$di->set('db', function() use ($config) {
61 61
     return new DbAdapter(array(
62 62
         'host' => $config->database->host,
63 63
         'username' => $config->database->username,
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 });
71 71
 
72 72
 
73
-$di->set('baseUrl', function () use ($config) {
73
+$di->set('baseUrl', function() use ($config) {
74 74
     $baseUrl = $config->application->baseUri;
75 75
     return $baseUrl;
76 76
 });
@@ -78,34 +78,34 @@  discard block
 block discarded – undo
78 78
 /**
79 79
  * If the configuration specify the use of metadata adapter use it or use memory otherwise
80 80
  */
81
-$di->set('modelsMetadata', function () {
81
+$di->set('modelsMetadata', function() {
82 82
     return new MetaDataAdapter();
83 83
 });
84 84
 
85 85
 /**
86 86
  * Start the session the first time some component request the session service
87 87
  */
88
-$di->set('session', function () {
88
+$di->set('session', function() {
89 89
     $session = new SessionAdapter();
90 90
     $session->start();
91 91
 
92 92
     return $session;
93 93
 });
94 94
 
95
-$di->set("jquery", function () {
95
+$di->set("jquery", function() {
96 96
     $jquery = new JsUtils(array("driver" => "Jquery"));
97 97
     $jquery->bootstrap(new Bootstrap());
98 98
     //$jquery->ui(new Ajax\JqueryUI());//optional for JQuery UI
99 99
     return $jquery;
100 100
 });
101 101
 
102
-$di->set('dispatcher', function () {
102
+$di->set('dispatcher', function() {
103 103
 
104 104
     // Create an event manager
105 105
     $eventsManager = new EventsManager();
106 106
 
107 107
     // Attach a listener for type "dispatch"
108
-    $eventsManager->attach("dispatch", function ($event, $dispatcher) {
108
+    $eventsManager->attach("dispatch", function($event, $dispatcher) {
109 109
         // ...
110 110
     });
111 111
 
Please login to merge, or discard this patch.
app/controllers/IndexController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,10 +6,10 @@
 block discarded – undo
6 6
     protected $title;
7 7
     protected $controller;
8 8
 
9
-    public function initialize(){
9
+    public function initialize() {
10 10
         $this->model = "Index";
11 11
         $this->title = "Accueil";
12
-        $this->controller= "Index";
12
+        $this->controller = "Index";
13 13
     }
14 14
 
15 15
     public function indexAction()
Please login to merge, or discard this patch.
app/controllers/MessagesController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@
 block discarded – undo
3 3
 class MessagesController extends ControllerBase
4 4
 {
5 5
 
6
-    public function initialize(){
6
+    public function initialize() {
7 7
         $this->model = "Message";
8 8
         $this->title = "Messages";
9
-        $this->controller= "Messages";
9
+        $this->controller = "Messages";
10 10
 
11 11
     }
12 12
 }
Please login to merge, or discard this patch.
app/models/Message.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@
 block discarded – undo
249 249
         return parent::findFirst($parameters);
250 250
     }
251 251
 
252
-    public function toString(){
252
+    public function toString() {
253 253
         return $this->content;
254 254
     }
255 255
 
Please login to merge, or discard this patch.
app/controllers/ControllerBase.php 2 patches
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.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         $this->view->setVar("title", $this->title);
24 24
     }
25 25
 
26
-    public function frmAction(){
26
+    public function frmAction() {
27 27
 
28 28
     }
29 29
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             $msg = $this->_showDisplayedMessage($message);
40 40
         }
41 41
         $this->view->setVar("msg", $msg);
42
-        $objects = call_user_func($this->model . "::find");
42
+        $objects = call_user_func($this->model."::find");
43 43
         $this->view->setVar("objects", $objects);
44 44
         $this->view->pick("main/index");
45 45
         } else {
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     public function getInstance($id = NULL)
51 51
     {
52 52
         if (isset($id)) {
53
-            $object = call_user_func($this->model . "::findfirst", $id);
53
+            $object = call_user_func($this->model."::findfirst", $id);
54 54
         } else {
55 55
             $className = $this->model;
56 56
             $object = new $className();
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
     {
63 63
         if ($this->verifyAccessAction($this->controller, "read")) {
64 64
             if ($id != null) {
65
-                $object = call_user_func($this->model . '::find', "id = $id");
65
+                $object = call_user_func($this->model.'::find', "id = $id");
66 66
                 $this->view->setVar("object", $object);
67 67
                 $this->view->pick("main/read");
68 68
             }
69
-        }else{
69
+        } else {
70 70
 
71 71
         }
72 72
     }
@@ -89,16 +89,16 @@  discard block
 block discarded – undo
89 89
                 if ($id) {
90 90
                     try {
91 91
                         $object->save();
92
-                        $msg = new DisplayedMessage("Instance de " . $this->model . " modifiée");
92
+                        $msg = new DisplayedMessage("Instance de ".$this->model." modifiée");
93 93
                     } catch (\Exception $e) {
94
-                        $msg = new DisplayedMessage("Impossible d'ajouter l'instance de " . $this->model, "danger : $e");
94
+                        $msg = new DisplayedMessage("Impossible d'ajouter l'instance de ".$this->model, "danger : $e");
95 95
                     }
96 96
                 } else {
97 97
                     try {
98 98
                         $object->save();
99
-                        $msg = new DisplayedMessage("Instance de " . $this->model . " ajoutée");
99
+                        $msg = new DisplayedMessage("Instance de ".$this->model." ajoutée");
100 100
                     } catch (\Exception $e) {
101
-                        $msg = new DisplayedMessage("Impossible d'ajouter l'instance de " . $this->model, "danger : $e");
101
+                        $msg = new DisplayedMessage("Impossible d'ajouter l'instance de ".$this->model, "danger : $e");
102 102
                     }
103 103
                 }
104 104
                 $this->dispatcher->forward(array("controller" => $this->dispatcher->getControllerName(), "action" => "index", "params" => array($msg)));
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
     public function soloUpdateAction()
111 111
     {
112 112
         if ($this->verifyAccessAction($this->controller, "write")) {
113
-            if($this->session->has("user") && ($this->session->get("user")->getId() == $this->request->getPost('pk', 'int')) || $this->session->get("user")->getIdTypeUser() == 0){
113
+            if ($this->session->has("user") && ($this->session->get("user")->getId() == $this->request->getPost('pk', 'int')) || $this->session->get("user")->getIdTypeUser() == 0) {
114 114
                 $name = $this->request->getPost('name', 'string');
115 115
                 //Créer la fonction variable 'set' en fonction du name en POST
116
-                $func = 'set' . ucfirst($name);
117
-                $projet = call_user_func($this->model . '::findFirst', $_POST['pk']);
116
+                $func = 'set'.ucfirst($name);
117
+                $projet = call_user_func($this->model.'::findFirst', $_POST['pk']);
118 118
                 $projet->$func($_POST['value']);
119 119
                 $projet->save();
120 120
             }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     public function deleteAction($id = null)
127 127
     {
128 128
         if ($this->verifyAccessAction($this->controller, "write")) {
129
-            $object = call_user_func($this->model . '::findFirst', "$id");
129
+            $object = call_user_func($this->model.'::findFirst', "$id");
130 130
             $object->delete();
131 131
         }
132 132
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     }
186 186
     
187 187
     public function verifyAccessAction($activeResource, $activeOperation) {
188
-        if($this->session->has("user")){
188
+        if ($this->session->has("user")) {
189 189
             $user = $this->session->get("user");
190 190
             $typeUser = TypeUser::findFirst("id = ".$user->getIdTypeUser());
191 191
             $typeUserSession = $user->getIdTypeUser();
@@ -195,13 +195,13 @@  discard block
 block discarded – undo
195 195
             } else {
196 196
                 return 0;
197 197
             }
198
-        }else{
198
+        } else {
199 199
             return 0;
200 200
         }
201 201
     }
202 202
 
203 203
 
204
-    public function moreAction(){
204
+    public function moreAction() {
205 205
         $this->view->pick("main/more");
206 206
     }
207 207
 
@@ -267,27 +267,27 @@  discard block
 block discarded – undo
267 267
     }
268 268
 
269 269
 
270
-    public function isAdmin($userId){
270
+    public function isAdmin($userId) {
271 271
         $user = User::findFirst($userId);
272
-        if($user->getTypeUser() == 0){
272
+        if ($user->getTypeUser() == 0) {
273 273
             return true;
274
-        }else{
274
+        } else {
275 275
             return false;
276 276
         }
277 277
     }
278 278
 
279
-    public function isActual($user){
280
-        if($this->session->has("user") || $user == $this->session->get("user")->getId()){
279
+    public function isActual($user) {
280
+        if ($this->session->has("user") || $user == $this->session->get("user")->getId()) {
281 281
             return true;
282
-        }else{
282
+        } else {
283 283
             return false;
284 284
         }
285 285
     }
286 286
 
287
-    public function isAdminAndActual($user){
288
-        if($this->isAdmin($user) || $this->isActual($user)){
287
+    public function isAdminAndActual($user) {
288
+        if ($this->isAdmin($user) || $this->isActual($user)) {
289 289
             return true;
290
-        }else{
290
+        } else {
291 291
             return false;
292 292
         }
293 293
     }
Please login to merge, or discard this patch.
app/controllers/AclController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -5,24 +5,24 @@
 block discarded – undo
5 5
     protected $title;
6 6
     protected $controller;
7 7
 
8
-    public function initialize(){
8
+    public function initialize() {
9 9
         $this->model = "Acl";
10 10
         $this->title = "Acl";
11
-        $this->controller= "Acl";
11
+        $this->controller = "Acl";
12 12
     }
13 13
 
14
-    public function frmAction(){
14
+    public function frmAction() {
15 15
         $typesUser = TypeUser::find();
16 16
         $operations = Operation::find();
17 17
         $ressources = Ressource::find();
18 18
 
19
-        $this->view->setVar("operations",$operations);
20
-        $this->view->setVar("ressources",$ressources);
21
-        $this->view->setVar("typesUser",$typesUser);
19
+        $this->view->setVar("operations", $operations);
20
+        $this->view->setVar("ressources", $ressources);
21
+        $this->view->setVar("typesUser", $typesUser);
22 22
 
23 23
     }
24 24
 
25
-    public function updateAction(){
25
+    public function updateAction() {
26 26
         parent::updateAction();
27 27
         $this->response->redirect("$this->controller/index");
28 28
     }
Please login to merge, or discard this patch.
app/controllers/UsersController.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -24,30 +24,30 @@  discard block
 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 29
     		$userPseudo = User::findFirst("identite = '".$_POST['identite']."'");
30 30
 
31 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->getIdTypeUser());
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->getIdTypeUser());
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
 
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
74 74
 
75 75
         $this->jquery->compile($this->view);
76 76
 
77
-        }else {
77
+        } else {
78 78
             $this->view->pick("main/error");
79 79
         }
80 80
     }
81 81
 
82
-    public function passwordAction(){
82
+    public function passwordAction() {
83 83
         $password = password_hash("password", PASSWORD_DEFAULT);
84 84
         echo $password;
85 85
     }
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
         if ($this->verifyAccessAction($this->controller, "write")) {
90 90
             $typeUser = TypeUser::find();
91 91
             $this->view->setVar("typeUser", $typeUser);
92
-        }else {
92
+        } else {
93 93
             $this->view->pick("main/error");
94 94
         }
95 95
 
96 96
     }
97 97
 
98
-    public function updateAction(){
98
+    public function updateAction() {
99 99
         if ($this->verifyAccessAction($this->controller, "write")) {
100 100
             if ($this->request->isPost()) {
101 101
                 $user = new User();
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
                 $user->setPassword(password_hash($this->request->getPost("password", "string"), PASSWORD_DEFAULT));
104 104
                 try {
105 105
                     $user->save();
106
-                    echo "Instance de " . $this->model . " ajoutée";
106
+                    echo "Instance de ".$this->model." ajoutée";
107 107
                 } catch (\Exception $e) {
108
-                    echo "Impossible d'ajouter l'instance de " . $this->model, "danger : $e";
108
+                    echo "Impossible d'ajouter l'instance de ".$this->model, "danger : $e";
109 109
                 }
110 110
             }
111 111
         }
Please login to merge, or discard this patch.
app/controllers/ProjetsController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         $buttonFrm->onClick($dialog->jsShow());
33 33
 
34 34
         $this->jquery->compile($this->view);
35
-        }else {
35
+        } else {
36 36
             $this->view->pick("main/error");
37 37
         }
38 38
     }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             ));
48 48
             $idproj = $projet->getId();
49 49
             $this->response->redirect("Projets/read/$idproj");
50
-        }else {
50
+        } else {
51 51
             $this->view->pick("main/error");
52 52
         }
53 53
     }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 
109 109
             //Compilation de Jquery dans la vue
110 110
             $this->jquery->compile($this->view);
111
-        }else {
111
+        } else {
112 112
             $this->view->pick("main/error");
113 113
         }
114 114
     }
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
             if ($id != 1) {
142 142
                 $client .= ',';
143 143
             }
144
-            $client .= '{value: ' . $c->getId() . ', text:"' . $c->getIdentite() . '"}';
144
+            $client .= '{value: '.$c->getId().', text:"'.$c->getIdentite().'"}';
145 145
         }
146 146
 
147 147
         $client .= ']';
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
             if ($id != 1) {
209 209
                 $dev .= ',';
210 210
             }
211
-            $dev .= '{value: ' . $c->getId() . ', text:"' . $c->getIdentite() . '"}';
211
+            $dev .= '{value: '.$c->getId().', text:"'.$c->getIdentite().'"}';
212 212
         }
213 213
 
214 214
         $dev .= ']';
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
         $contributor = array_unique($contributor, SORT_REGULAR);
244 244
 
245 245
         $this->view->setVar("contributors", $contributor);
246
-        $this->view->setVar("usecases", $usecases);;
246
+        $this->view->setVar("usecases", $usecases); ;
247 247
 
248 248
     }
249 249
 
Please login to merge, or discard this patch.
app/controllers/UsecasesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,17 +14,17 @@
 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();
Please login to merge, or discard this patch.