@@ -6,8 +6,8 @@ |
||
| 6 | 6 | * We're a registering a set of directories taken from the configuration file |
| 7 | 7 | */ |
| 8 | 8 | $loader->registerNamespaces(array( |
| 9 | - 'Ajax' => __DIR__ . '/../../vendor/jcheron/phalcon-jquery/Ajax/', |
|
| 10 | - 'Library' => __DIR__ . '/../library/' |
|
| 9 | + 'Ajax' => __DIR__.'/../../vendor/jcheron/phalcon-jquery/Ajax/', |
|
| 10 | + 'Library' => __DIR__.'/../library/' |
|
| 11 | 11 | )); |
| 12 | 12 | $loader->registerDirs( |
| 13 | 13 | |
@@ -190,6 +190,6 @@ |
||
| 190 | 190 | |
| 191 | 191 | public function toString() |
| 192 | 192 | { |
| 193 | - return $this->libelle . " (" . $this->avancement . ")"; |
|
| 193 | + return $this->libelle." (".$this->avancement.")"; |
|
| 194 | 194 | } |
| 195 | 195 | } |
@@ -241,6 +241,6 @@ |
||
| 241 | 241 | |
| 242 | 242 | public function toString() |
| 243 | 243 | { |
| 244 | - return $this->nom . " (" . $this->avancement . ")"; |
|
| 244 | + return $this->nom." (".$this->avancement.")"; |
|
| 245 | 245 | } |
| 246 | 246 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | //Return a string containing the principal content of the model |
| 257 | 257 | public function getPrincipal() |
| 258 | 258 | { |
| 259 | - return "Client : " . $this->client->toString() . " <br/> Desciption : " . $this->description; |
|
| 259 | + return "Client : ".$this->client->toString()." <br/> Desciption : ".$this->description; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | $img = $this->getImage(); |
| 302 | 302 | $type = getImageSize($img); // [] if you don't have exif you could use getImageSize() |
| 303 | 303 | $allowedTypes = array( |
| 304 | - 1, // [] gif |
|
| 305 | - 2, // [] jpg |
|
| 306 | - 3, // [] png |
|
| 304 | + 1, // [] gif |
|
| 305 | + 2, // [] jpg |
|
| 306 | + 3, // [] png |
|
| 307 | 307 | 6 // [] bmp |
| 308 | 308 | ); |
| 309 | 309 | if (!in_array($type, $allowedTypes)) { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | return $this; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public function setImage($image){ |
|
| 102 | + public function setImage($image) { |
|
| 103 | 103 | $this->image = $image; |
| 104 | 104 | return $this; |
| 105 | 105 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | return $this->mail; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - public function getImage(){ |
|
| 127 | + public function getImage() { |
|
| 128 | 128 | return $this->image; |
| 129 | 129 | } |
| 130 | 130 | /** |
@@ -168,12 +168,12 @@ discard block |
||
| 168 | 168 | $this->belongsTo('idTypeUser', 'TypeUser', 'id', array('alias' => 'TypeUser')); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - public function toString(){ |
|
| 171 | + public function toString() { |
|
| 172 | 172 | return $this->identite."(".$this->mail.")"; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | //Return a string containing the principal content of the model |
| 176 | - public function getPrincipal(){ |
|
| 176 | + public function getPrincipal() { |
|
| 177 | 177 | return "Identité : ".$this->identite." <br/> Email : ".$this->mail; |
| 178 | 178 | } |
| 179 | 179 | |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | return parent::findFirst($parameters); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - public function toString(){ |
|
| 164 | + public function toString() { |
|
| 165 | 165 | return " ".$this->getRessource()->getLibelle()." accessible par ".$this->getTypeUser()->getLibelle()." en droit '".$this->getOperation()->getOperation()."'"; |
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | \ No newline at end of file |
@@ -7,17 +7,17 @@ |
||
| 7 | 7 | /** |
| 8 | 8 | * Read the configuration |
| 9 | 9 | */ |
| 10 | - $config = include __DIR__ . "/../app/config/config.php"; |
|
| 10 | + $config = include __DIR__."/../app/config/config.php"; |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * Read auto-loader |
| 14 | 14 | */ |
| 15 | - include __DIR__ . "/../app/config/loader.php"; |
|
| 15 | + include __DIR__."/../app/config/loader.php"; |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Read services |
| 19 | 19 | */ |
| 20 | - include __DIR__ . "/../app/config/services.php"; |
|
| 20 | + include __DIR__."/../app/config/services.php"; |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * Handle the request |