@@ -22,10 +22,10 @@ |
||
| 22 | 22 | * |
| 23 | 23 | * @var integer |
| 24 | 24 | */ |
| 25 | - const FILE_PERMISSION_DENIED = 1; |
|
| 26 | - const FILE_NOT_FOUND = 2; |
|
| 27 | - const FILE_EXISTS = 3; |
|
| 28 | - const NOT_DIRECTORY = 4; |
|
| 25 | + const FILE_PERMISSION_DENIED = 1; |
|
| 26 | + const FILE_NOT_FOUND = 2; |
|
| 27 | + const FILE_EXISTS = 3; |
|
| 28 | + const NOT_DIRECTORY = 4; |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Common JSON errors |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | |
| 59 | 59 | $constName = null; |
| 60 | 60 | |
| 61 | - foreach ($constants as $name => $value ) |
|
| 61 | + foreach ($constants as $name => $value) |
|
| 62 | 62 | { |
| 63 | 63 | if ($value == $code) |
| 64 | 64 | { |
@@ -67,12 +67,13 @@ |
||
| 67 | 67 | */ |
| 68 | 68 | protected function error($code, $message = null) |
| 69 | 69 | { |
| 70 | - if (!array_key_exists($code, $this->errors)) |
|
| 71 | - $this->errors[$code] = (array_key_exists($code, $this->standardErrors)) |
|
| 70 | + if (!array_key_exists($code, $this->errors)) { |
|
| 71 | + $this->errors[$code] = (array_key_exists($code, $this->standardErrors)) |
|
| 72 | 72 | ? |
| 73 | 73 | is_null($message) |
| 74 | 74 | ? $this->standardErrors[$code] |
| 75 | 75 | : preg_replace('/%[a-zA-Z]*%/', $message, $this->standardErrors[$code]) |
| 76 | 76 | : $message; |
| 77 | + } |
|
| 77 | 78 | } |
| 78 | 79 | } |
| 79 | 80 | \ No newline at end of file |
@@ -70,8 +70,9 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $parameters = $this->getParams(); |
| 72 | 72 | |
| 73 | - if (array_key_exists($param, $parameters)) |
|
| 74 | - return true; |
|
| 73 | + if (array_key_exists($param, $parameters)) { |
|
| 74 | + return true; |
|
| 75 | + } |
|
| 75 | 76 | |
| 76 | 77 | return false; |
| 77 | 78 | } |
@@ -39,9 +39,9 @@ |
||
| 39 | 39 | $again = true; |
| 40 | 40 | $new_config[$param . $glue . $key] = $value; |
| 41 | 41 | } |
| 42 | + } else { |
|
| 43 | + $new_config[$param] = $configure; |
|
| 42 | 44 | } |
| 43 | - else |
|
| 44 | - $new_config[$param] = $configure; |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | return (!$again) ? $new_config : self::toUnidimensional($new_config, $glue); |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | |
| 61 | 61 | if (!empty($string)) |
| 62 | 62 | { |
| 63 | - $data = json_decode($string, true); |
|
| 63 | + $data = json_decode($string, true); |
|
| 64 | 64 | |
| 65 | 65 | # json_encode can return TRUE, FALSE or NULL (http://php.net/manual/en/function.json-decode.php) |
| 66 | 66 | if (is_null($data) || $data === false) |
@@ -76,17 +76,20 @@ |
||
| 76 | 76 | "object" => serialize($exception) |
| 77 | 77 | ]; |
| 78 | 78 | |
| 79 | - if (!function_exists('mb_detect_encoding')) |
|
| 80 | - throw new \RuntimeException("mbstring library is not installed!"); |
|
| 79 | + if (!function_exists('mb_detect_encoding')) { |
|
| 80 | + throw new \RuntimeException("mbstring library is not installed!"); |
|
| 81 | + } |
|
| 81 | 82 | |
| 82 | 83 | /* |
| 83 | 84 | * Encodes to UTF8 all messages. It ensures JSON encoding. |
| 84 | 85 | */ |
| 85 | - if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true)) |
|
| 86 | - $data[$id]["message"] = utf8_encode($data[$id]["message"]); |
|
| 86 | + if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true)) { |
|
| 87 | + $data[$id]["message"] = utf8_encode($data[$id]["message"]); |
|
| 88 | + } |
|
| 87 | 89 | |
| 88 | - if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true)) |
|
| 89 | - $data[$id]["object"] = utf8_decode($data[$id]["object"]); |
|
| 90 | + if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true)) { |
|
| 91 | + $data[$id]["object"] = utf8_decode($data[$id]["object"]); |
|
| 92 | + } |
|
| 90 | 93 | |
| 91 | 94 | if (($encoded_data = json_encode($data)) === false) |
| 92 | 95 | { |
@@ -145,8 +145,9 @@ discard block |
||
| 145 | 145 | $module = (is_null($this->identifiers["module"]) || empty($this->identifiers["module"])) |
| 146 | 146 | ? $this->routes["defaults"]["module"] : $this->identifiers["module"]; |
| 147 | 147 | |
| 148 | - if (!array_key_exists($module, $this->routes)) |
|
| 149 | - throw new Exception\ModuleNotFoundException("The key '$module' does not exists in routes!"); |
|
| 148 | + if (!array_key_exists($module, $this->routes)) { |
|
| 149 | + throw new Exception\ModuleNotFoundException("The key '$module' does not exists in routes!"); |
|
| 150 | + } |
|
| 150 | 151 | |
| 151 | 152 | $controller = (is_null($this->identifiers["controller"]) || empty($this->identifiers["controller"])) |
| 152 | 153 | ? $this->routes[$module]["controller"] : $this->identifiers["controller"]; |
@@ -156,10 +157,11 @@ discard block |
||
| 156 | 157 | |
| 157 | 158 | $fqn_controller = '\\' . $module . "\Controller\\" . $controller; |
| 158 | 159 | |
| 159 | - if (class_exists($fqn_controller)) |
|
| 160 | - $this->controller = new $fqn_controller($module, $view, $this->basePath); |
|
| 161 | - else |
|
| 162 | - throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!"); |
|
| 160 | + if (class_exists($fqn_controller)) { |
|
| 161 | + $this->controller = new $fqn_controller($module, $view, $this->basePath); |
|
| 162 | + } else { |
|
| 163 | + throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!"); |
|
| 164 | + } |
|
| 163 | 165 | } |
| 164 | 166 | |
| 165 | 167 | /** |
@@ -176,8 +178,9 @@ discard block |
||
| 176 | 178 | $key = array_keys($route); |
| 177 | 179 | $key = array_shift($key); |
| 178 | 180 | |
| 179 | - if (array_key_exists($key, $this->routes)) |
|
| 180 | - throw new \LogicException("The key '$key' was already defined as route"); |
|
| 181 | + if (array_key_exists($key, $this->routes)) { |
|
| 182 | + throw new \LogicException("The key '$key' was already defined as route"); |
|
| 183 | + } |
|
| 181 | 184 | |
| 182 | 185 | $this->routes = array_merge($this->routes, $route); |
| 183 | 186 | } |
@@ -132,8 +132,8 @@ |
||
| 132 | 132 | * This instruction include each module declared in application.config.php |
| 133 | 133 | * Each module has an autoloader to load its classes (controllers and models) |
| 134 | 134 | */ |
| 135 | - if (file_exists("module/".$module."/Module.php")) |
|
| 136 | - include("module/".$module."/Module.php"); |
|
| 135 | + if (file_exists("module/" . $module . "/Module.php")) |
|
| 136 | + include("module/" . $module . "/Module.php"); |
|
| 137 | 137 | |
| 138 | 138 | spl_autoload_register($module . "\Module::loader"); |
| 139 | 139 | } |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | public function prepare() |
| 59 | 59 | { |
| 60 | 60 | # start sessions |
| 61 | - if (!isset($_SESSION)) |
|
| 62 | - session_start(); |
|
| 61 | + if (!isset($_SESSION)) { |
|
| 62 | + session_start(); |
|
| 63 | + } |
|
| 63 | 64 | } |
| 64 | 65 | |
| 65 | 66 | /** |
@@ -91,8 +92,7 @@ discard block |
||
| 91 | 92 | |
| 92 | 93 | // Best way to view all possible errors |
| 93 | 94 | error_reporting(-1); |
| 94 | - } |
|
| 95 | - else { |
|
| 95 | + } else { |
|
| 96 | 96 | ini_set('display_errors', 0); |
| 97 | 97 | error_reporting(-1); |
| 98 | 98 | } |
@@ -132,14 +132,15 @@ discard block |
||
| 132 | 132 | * This instruction include each module declared in application.config.php |
| 133 | 133 | * Each module has an autoloader to load its classes (controllers and models) |
| 134 | 134 | */ |
| 135 | - if (file_exists("module/".$module."/Module.php")) |
|
| 136 | - include("module/".$module."/Module.php"); |
|
| 135 | + if (file_exists("module/".$module."/Module.php")) { |
|
| 136 | + include("module/".$module."/Module.php"); |
|
| 137 | + } |
|
| 137 | 138 | |
| 138 | 139 | spl_autoload_register($module . "\Module::loader"); |
| 139 | 140 | } |
| 141 | + } else { |
|
| 142 | + throw new \RuntimeException("The application must have at least one module"); |
|
| 140 | 143 | } |
| 141 | - else |
|
| 142 | - throw new \RuntimeException("The application must have at least one module"); |
|
| 143 | 144 | } |
| 144 | 145 | |
| 145 | 146 | /** |
@@ -80,7 +80,8 @@ |
||
| 80 | 80 | |
| 81 | 81 | $class = "module/" . $module . "/source/" . implode("/", $nm) . ".php"; |
| 82 | 82 | |
| 83 | - if (file_exists($class)) |
|
| 84 | - include $class; |
|
| 83 | + if (file_exists($class)) { |
|
| 84 | + include $class; |
|
| 85 | + } |
|
| 85 | 86 | } |
| 86 | 87 | } |
| 87 | 88 | \ No newline at end of file |
@@ -168,7 +168,7 @@ |
||
| 168 | 168 | if ($_SERVER['REQUEST_METHOD'] != 'JSON') |
| 169 | 169 | throw new \LogicException("Request method is not JSON"); |
| 170 | 170 | |
| 171 | - $input = file_get_contents('php://input'); |
|
| 171 | + $input = file_get_contents('php://input'); |
|
| 172 | 172 | $array = explode("&", $input); |
| 173 | 173 | |
| 174 | 174 | $result = array(); |
@@ -150,8 +150,9 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | public function getPost() |
| 152 | 152 | { |
| 153 | - if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) |
|
| 154 | - $_POST = json_decode(file_get_contents('php://input'), true); |
|
| 153 | + if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) { |
|
| 154 | + $_POST = json_decode(file_get_contents('php://input'), true); |
|
| 155 | + } |
|
| 155 | 156 | |
| 156 | 157 | return (array) $_POST; |
| 157 | 158 | } |
@@ -165,8 +166,9 @@ discard block |
||
| 165 | 166 | */ |
| 166 | 167 | public function getJson() |
| 167 | 168 | { |
| 168 | - if ($_SERVER['REQUEST_METHOD'] != 'JSON') |
|
| 169 | - throw new \LogicException("Request method is not JSON"); |
|
| 169 | + if ($_SERVER['REQUEST_METHOD'] != 'JSON') { |
|
| 170 | + throw new \LogicException("Request method is not JSON"); |
|
| 171 | + } |
|
| 170 | 172 | |
| 171 | 173 | $input = file_get_contents('php://input'); |
| 172 | 174 | $array = explode("&", $input); |
@@ -254,8 +256,9 @@ discard block |
||
| 254 | 256 | $this->module = new $fqn($module, $this); |
| 255 | 257 | |
| 256 | 258 | # detects method change inside Module.php |
| 257 | - if (!is_null($this->getMethod())) |
|
| 258 | - $method = $this->getMethod(); |
|
| 259 | + if (!is_null($this->getMethod())) { |
|
| 260 | + $method = $this->getMethod(); |
|
| 261 | + } |
|
| 259 | 262 | |
| 260 | 263 | if (!is_null($method) && $this->initExecution) |
| 261 | 264 | { |
@@ -265,8 +268,9 @@ discard block |
||
| 265 | 268 | |
| 266 | 269 | $reflection = new \ReflectionMethod($this, $method); |
| 267 | 270 | |
| 268 | - if (!$reflection->isPublic()) |
|
| 269 | - throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'"); |
|
| 271 | + if (!$reflection->isPublic()) { |
|
| 272 | + throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'"); |
|
| 273 | + } |
|
| 270 | 274 | |
| 271 | 275 | $this->method = $method; |
| 272 | 276 | |
@@ -282,8 +286,7 @@ discard block |
||
| 282 | 286 | $layoutManager = new Layout($layout_params); |
| 283 | 287 | $layoutManager->fromController($this); |
| 284 | 288 | } |
| 285 | - } |
|
| 286 | - else { |
|
| 289 | + } else { |
|
| 287 | 290 | $class = __CLASS__; |
| 288 | 291 | throw new Exception\PageNotFoundException("The method '$method' doesn't exists in the control class '$class'"); |
| 289 | 292 | } |
@@ -308,8 +311,9 @@ discard block |
||
| 308 | 311 | public function isXmlHttpRequest() |
| 309 | 312 | { |
| 310 | 313 | # non standard (HTTP_X_REQUESTED_WITH is not a part of PHP) |
| 311 | - if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) |
|
| 312 | - return true; |
|
| 314 | + if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) { |
|
| 315 | + return true; |
|
| 316 | + } |
|
| 313 | 317 | return false; |
| 314 | 318 | } |
| 315 | 319 | |
@@ -320,8 +324,9 @@ discard block |
||
| 320 | 324 | */ |
| 321 | 325 | public function isPost() |
| 322 | 326 | { |
| 323 | - if ($_SERVER["REQUEST_METHOD"] == "POST") |
|
| 324 | - return true; |
|
| 327 | + if ($_SERVER["REQUEST_METHOD"] == "POST") { |
|
| 328 | + return true; |
|
| 329 | + } |
|
| 325 | 330 | return false; |
| 326 | 331 | } |
| 327 | 332 | |
@@ -332,8 +337,9 @@ discard block |
||
| 332 | 337 | */ |
| 333 | 338 | public function isGet() |
| 334 | 339 | { |
| 335 | - if ($_SERVER["REQUEST_METHOD"] == "GET") |
|
| 336 | - return true; |
|
| 340 | + if ($_SERVER["REQUEST_METHOD"] == "GET") { |
|
| 341 | + return true; |
|
| 342 | + } |
|
| 337 | 343 | return false; |
| 338 | 344 | } |
| 339 | 345 | |
@@ -357,10 +363,11 @@ discard block |
||
| 357 | 363 | $i = 1; |
| 358 | 364 | foreach ($params as $item) |
| 359 | 365 | { |
| 360 | - if ($i % 2 != 0) |
|
| 361 | - $vars[] = $item; |
|
| 362 | - else |
|
| 363 | - $values[] = $item; |
|
| 366 | + if ($i % 2 != 0) { |
|
| 367 | + $vars[] = $item; |
|
| 368 | + } else { |
|
| 369 | + $values[] = $item; |
|
| 370 | + } |
|
| 364 | 371 | $i++; |
| 365 | 372 | } |
| 366 | 373 | |
@@ -368,10 +375,11 @@ discard block |
||
| 368 | 375 | |
| 369 | 376 | for ($i = 0; $i < $vars_count; $i++) |
| 370 | 377 | { |
| 371 | - if (array_key_exists($i, $values)) |
|
| 372 | - $_GET[$vars[$i]] = $values[$i]; |
|
| 373 | - else |
|
| 374 | - $_GET[$vars[$i]] = ''; |
|
| 378 | + if (array_key_exists($i, $values)) { |
|
| 379 | + $_GET[$vars[$i]] = $values[$i]; |
|
| 380 | + } else { |
|
| 381 | + $_GET[$vars[$i]] = ''; |
|
| 382 | + } |
|
| 375 | 383 | } |
| 376 | 384 | |
| 377 | 385 | unset($_GET["params"]); |