psfs /
core
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | //Generating the templates translations |
| 39 | 39 | $translations = $this->tpl->regenerateTemplates(); |
| 40 | 40 | |
| 41 | - $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 42 | - $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 41 | + $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 42 | + $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 43 | 43 | |
| 44 | 44 | //xgettext localizations |
| 45 | 45 | $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale)); |
@@ -33,7 +33,9 @@ |
||
| 33 | 33 | public function getTranslations($locale) |
| 34 | 34 | { |
| 35 | 35 | //Default locale |
| 36 | - if (null === $locale) $locale = $this->config->get("default_language"); |
|
| 36 | + if (null === $locale) { |
|
| 37 | + $locale = $this->config->get("default_language"); |
|
| 38 | + } |
|
| 37 | 39 | |
| 38 | 40 | //Generating the templates translations |
| 39 | 41 | $translations = $this->tpl->regenerateTemplates(); |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | public function getConfigParams() { |
| 26 | 26 | $response = array_merge(Config::$required, Config::$optional); |
| 27 | 27 | $domains = Router::getInstance()->getDomains(); |
| 28 | - foreach($domains as $domain => $routes) { |
|
| 28 | + foreach ($domains as $domain => $routes) { |
|
| 29 | 29 | $pDomain = str_replace('@', '', $domain); |
| 30 | 30 | $pDomain = str_replace('/', '', $pDomain); |
| 31 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
| 31 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
| 32 | 32 | } |
| 33 | 33 | return $this->json($response); |
| 34 | 34 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function config() |
| 44 | 44 | { |
| 45 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
| 45 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
| 46 | 46 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 47 | 47 | $form = new ConfigForm(); |
| 48 | 48 | $form->build(); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | Security::getInstance()->setFlash("callback_message", _("Configuración actualizada correctamente")); |
| 81 | 81 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
| 82 | - } else { |
|
| 82 | + }else { |
|
| 83 | 83 | throw new \HttpException(_('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * @GET |
| 29 | 29 | * @route /admin/routes/show |
| 30 | 30 | * @visible false |
| 31 | - * @return mixed |
|
| 31 | + * @return string|null |
|
| 32 | 32 | */ |
| 33 | 33 | public function getRouting() |
| 34 | 34 | { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function generateModule() |
| 32 | 32 | { |
| 33 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
| 33 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
| 34 | 34 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 35 | 35 | $form = new ModuleForm(); |
| 36 | 36 | $form->build(); |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | $this->gen->createStructureModule($module, $force, $type, (bool)$is_module); |
| 62 | 62 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente"))); |
| 63 | 63 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
| 64 | - } catch (\Exception $e) { |
|
| 64 | + }catch (\Exception $e) { |
|
| 65 | 65 | pre($e->getMessage(), true); |
| 66 | - Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
| 66 | + Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
| 67 | 67 | throw new ConfigException('Error al generar el módulo, prueba a cambiar los permisos', 403); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * Método que revisa las traducciones directorio a directorio |
| 29 | - * @param $path |
|
| 29 | + * @param string $path |
|
| 30 | 30 | * @param $locale |
| 31 | 31 | * @return array |
| 32 | 32 | */ |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | 101 | * Servicio que genera la estructura base |
| 102 | - * @param $module |
|
| 103 | - * @param $mod_path |
|
| 102 | + * @param string $module |
|
| 103 | + * @param string $mod_path |
|
| 104 | 104 | * @param boolean $isModule |
| 105 | 105 | */ |
| 106 | 106 | private function createModulePathTree($module, $mod_path, $isModule = false) |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | * Method that copy resources recursively |
| 454 | 454 | * @param string $dest |
| 455 | 455 | * @param boolean $force |
| 456 | - * @param $filename_path |
|
| 456 | + * @param string $filename_path |
|
| 457 | 457 | * @param boolean $debug |
| 458 | 458 | */ |
| 459 | 459 | public static function copyResources($dest, $force, $filename_path, $debug) |
@@ -32,24 +32,24 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public static function findTranslations($path, $locale) |
| 34 | 34 | { |
| 35 | - $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 36 | - $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 35 | + $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 36 | + $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 37 | 37 | |
| 38 | 38 | $translations = array(); |
| 39 | 39 | if (file_exists($path)) { |
| 40 | 40 | $d = dir($path); |
| 41 | 41 | while (false !== ($dir = $d->read())) { |
| 42 | 42 | Config::createDir($locale_path); |
| 43 | - if (!file_exists($locale_path . 'translations.po')) { |
|
| 44 | - file_put_contents($locale_path . 'translations.po', ''); |
|
| 43 | + if (!file_exists($locale_path.'translations.po')) { |
|
| 44 | + file_put_contents($locale_path.'translations.po', ''); |
|
| 45 | 45 | } |
| 46 | - $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir); |
|
| 47 | - $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " . |
|
| 48 | - $inspect_path . DIRECTORY_SEPARATOR . |
|
| 46 | + $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir); |
|
| 47 | + $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". |
|
| 48 | + $inspect_path.DIRECTORY_SEPARATOR. |
|
| 49 | 49 | "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po"; |
| 50 | - if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) { |
|
| 51 | - $res = _('Revisando directorio: ') . $inspect_path; |
|
| 52 | - $res .= _('Comando ejecutado: ') . $cmd_php; |
|
| 50 | + if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) { |
|
| 51 | + $res = _('Revisando directorio: ').$inspect_path; |
|
| 52 | + $res .= _('Comando ejecutado: ').$cmd_php; |
|
| 53 | 53 | $res .= shell_exec($cmd_php); |
| 54 | 54 | usleep(10); |
| 55 | 55 | $translations[] = $res; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function createStructureModule($module, $force = false, $type = "", $isModule = false) |
| 72 | 72 | { |
| 73 | - $mod_path = CORE_DIR . DIRECTORY_SEPARATOR; |
|
| 73 | + $mod_path = CORE_DIR.DIRECTORY_SEPARATOR; |
|
| 74 | 74 | $module = ucfirst($module); |
| 75 | 75 | $this->createModulePath($module, $mod_path, $isModule); |
| 76 | 76 | $this->createModulePathTree($module, $mod_path, $isModule); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | Config::createDir($mod_path); |
| 94 | 94 | // Create module path |
| 95 | 95 | if (false === $isModule) { |
| 96 | - Config::createDir($mod_path . $module); |
|
| 96 | + Config::createDir($mod_path.$module); |
|
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
@@ -110,20 +110,20 @@ discard block |
||
| 110 | 110 | $paths = [ |
| 111 | 111 | "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test" |
| 112 | 112 | ]; |
| 113 | - $module_path = $isModule ? $mod_path : $mod_path . $module; |
|
| 113 | + $module_path = $isModule ? $mod_path : $mod_path.$module; |
|
| 114 | 114 | foreach ($paths as $path) { |
| 115 | - Config::createDir($module_path . DIRECTORY_SEPARATOR . $path); |
|
| 115 | + Config::createDir($module_path.DIRECTORY_SEPARATOR.$path); |
|
| 116 | 116 | } |
| 117 | 117 | //Creamos las carpetas de los assets |
| 118 | 118 | $htmlPaths = array("css", "js", "img", "media", "font"); |
| 119 | 119 | foreach ($htmlPaths as $path) { |
| 120 | - Config::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path); |
|
| 120 | + Config::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if ($isModule) { |
| 124 | 124 | return $this->writeTemplateToFile(json_encode([ |
| 125 | - "module" => "\\" . preg_replace('/(\\\|\/)/', '\\\\', $module), |
|
| 126 | - ], JSON_PRETTY_PRINT), $mod_path . DIRECTORY_SEPARATOR . "module.json", true); |
|
| 125 | + "module" => "\\".preg_replace('/(\\\|\/)/', '\\\\', $module), |
|
| 126 | + ], JSON_PRETTY_PRINT), $mod_path.DIRECTORY_SEPARATOR."module.json", true); |
|
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '', $isModule = false) |
| 139 | 139 | { |
| 140 | - $module_path = $isModule ? $mod_path : $mod_path . $module; |
|
| 140 | + $module_path = $isModule ? $mod_path : $mod_path.$module; |
|
| 141 | 141 | $this->generateControllerTemplate($module, $module_path, $force, $controllerType); |
| 142 | 142 | $this->generateServiceTemplate($module, $module_path, $force); |
| 143 | 143 | $this->genereateAutoloaderTemplate($module, $module_path, $force, $isModule); |
@@ -156,24 +156,24 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | private function createModuleModels($module, $path, $isModule = false) |
| 158 | 158 | { |
| 159 | - $module_path = $isModule ? $path : $path . $module; |
|
| 160 | - $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path); |
|
| 159 | + $module_path = $isModule ? $path : $path.$module; |
|
| 160 | + $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path); |
|
| 161 | 161 | //Generamos las clases de propel y la configuración |
| 162 | - $exec = "export PATH=\$PATH:/opt/local/bin; " . BASE_DIR . DIRECTORY_SEPARATOR . |
|
| 163 | - "vendor" . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "propel "; |
|
| 164 | - $schemaOpt = " --schema-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . |
|
| 165 | - DIRECTORY_SEPARATOR . "Config"; |
|
| 166 | - $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . |
|
| 167 | - "Config --output-dir=" . CORE_DIR . " --verbose"; |
|
| 168 | - $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n" . $exec . "build" . $opt . $schemaOpt); |
|
| 169 | - $ret = shell_exec($exec . "build" . $opt . $schemaOpt); |
|
| 162 | + $exec = "export PATH=\$PATH:/opt/local/bin; ".BASE_DIR.DIRECTORY_SEPARATOR. |
|
| 163 | + "vendor".DIRECTORY_SEPARATOR."bin".DIRECTORY_SEPARATOR."propel "; |
|
| 164 | + $schemaOpt = " --schema-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path. |
|
| 165 | + DIRECTORY_SEPARATOR."Config"; |
|
| 166 | + $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR. |
|
| 167 | + "Config --output-dir=".CORE_DIR." --verbose"; |
|
| 168 | + $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n".$exec."build".$opt.$schemaOpt); |
|
| 169 | + $ret = shell_exec($exec."build".$opt.$schemaOpt); |
|
| 170 | 170 | |
| 171 | 171 | $this->log->infoLog("[GENERATOR] Generamos clases invocando a propel:\n $ret"); |
| 172 | - $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . |
|
| 173 | - $module_path . DIRECTORY_SEPARATOR . "Config" . $schemaOpt); |
|
| 172 | + $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR. |
|
| 173 | + $module_path.DIRECTORY_SEPARATOR."Config".$schemaOpt); |
|
| 174 | 174 | $this->log->infoLog("[GENERATOR] Generamos sql invocando a propel:\n $ret"); |
| 175 | - $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . |
|
| 176 | - $module_path . DIRECTORY_SEPARATOR . "Config"); |
|
| 175 | + $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR. |
|
| 176 | + $module_path.DIRECTORY_SEPARATOR."Config"); |
|
| 177 | 177 | $this->log->infoLog("[GENERATOR] Generamos configuración invocando a propel:\n $ret"); |
| 178 | 178 | } |
| 179 | 179 | |
@@ -194,23 +194,23 @@ discard block |
||
| 194 | 194 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 195 | 195 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 196 | 196 | "class" => $class, |
| 197 | - "controllerType" => $class . "Base", |
|
| 197 | + "controllerType" => $class."Base", |
|
| 198 | 198 | "is_base" => false |
| 199 | 199 | )); |
| 200 | - $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 201 | - DIRECTORY_SEPARATOR . "{$class}Controller.php", $force); |
|
| 200 | + $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 201 | + DIRECTORY_SEPARATOR."{$class}Controller.php", $force); |
|
| 202 | 202 | |
| 203 | 203 | $controllerBody = $this->tpl->dump("generator/controller.template.twig", array( |
| 204 | 204 | "module" => $module, |
| 205 | 205 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 206 | 206 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 207 | - "class" => $class . "Base", |
|
| 207 | + "class" => $class."Base", |
|
| 208 | 208 | "service" => $class, |
| 209 | 209 | "controllerType" => $controllerType, |
| 210 | 210 | "is_base" => true |
| 211 | 211 | )); |
| 212 | - $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 213 | - DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true); |
|
| 212 | + $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 213 | + DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true); |
|
| 214 | 214 | return ($controller && $controllerBase); |
| 215 | 215 | } |
| 216 | 216 | |
@@ -225,11 +225,9 @@ discard block |
||
| 225 | 225 | { |
| 226 | 226 | $created = true; |
| 227 | 227 | $modelPath = $isModule ? |
| 228 | - $mod_path . DIRECTORY_SEPARATOR . 'Models' : |
|
| 229 | - $mod_path . $module . DIRECTORY_SEPARATOR . 'Models'; |
|
| 228 | + $mod_path.DIRECTORY_SEPARATOR.'Models' : $mod_path.$module.DIRECTORY_SEPARATOR.'Models'; |
|
| 230 | 229 | $api_path = $isModule ? |
| 231 | - $mod_path . DIRECTORY_SEPARATOR . 'Api' : |
|
| 232 | - $mod_path . $module . DIRECTORY_SEPARATOR . 'Api'; |
|
| 230 | + $mod_path.DIRECTORY_SEPARATOR.'Api' : $mod_path.$module.DIRECTORY_SEPARATOR.'Api'; |
|
| 233 | 231 | if (file_exists($modelPath)) { |
| 234 | 232 | $dir = dir($modelPath); |
| 235 | 233 | while ($file = $dir->read()) { |
@@ -257,7 +255,7 @@ discard block |
||
| 257 | 255 | //Generamos el fichero de configuración |
| 258 | 256 | $this->log->infoLog("Generamos fichero vacío de configuración"); |
| 259 | 257 | return $this->writeTemplateToFile("<?php\n\t", |
| 260 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", |
|
| 258 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", |
|
| 261 | 259 | $force); |
| 262 | 260 | } |
| 263 | 261 | |
@@ -272,10 +270,10 @@ discard block |
||
| 272 | 270 | //Generamos el fichero de configuración |
| 273 | 271 | $this->log->infoLog("Generamos ficheros para assets base"); |
| 274 | 272 | $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", |
| 275 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", |
|
| 273 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", |
|
| 276 | 274 | $force); |
| 277 | 275 | $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", |
| 278 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", |
|
| 276 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", |
|
| 279 | 277 | $force); |
| 280 | 278 | return ($css && $js); |
| 281 | 279 | } |
@@ -297,7 +295,7 @@ discard block |
||
| 297 | 295 | "class" => $class, |
| 298 | 296 | )); |
| 299 | 297 | return $this->writeTemplateToFile($controller, |
| 300 | - $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", |
|
| 298 | + $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", |
|
| 301 | 299 | $force); |
| 302 | 300 | } |
| 303 | 301 | |
@@ -318,7 +316,7 @@ discard block |
||
| 318 | 316 | "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module), |
| 319 | 317 | "is_module" => $isModule, |
| 320 | 318 | )); |
| 321 | - return $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force); |
|
| 319 | + return $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force); |
|
| 322 | 320 | } |
| 323 | 321 | |
| 324 | 322 | /** |
@@ -338,7 +336,7 @@ discard block |
||
| 338 | 336 | "db" => $this->config->get("db_name"), |
| 339 | 337 | )); |
| 340 | 338 | return $this->writeTemplateToFile($schema, |
| 341 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", |
|
| 339 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", |
|
| 342 | 340 | $force); |
| 343 | 341 | } |
| 344 | 342 | |
@@ -361,7 +359,7 @@ discard block |
||
| 361 | 359 | "namespace" => preg_replace('/(\\\|\/)/', '', $module), |
| 362 | 360 | )); |
| 363 | 361 | return $this->writeTemplateToFile($build_properties, |
| 364 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", |
|
| 362 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", |
|
| 365 | 363 | $force); |
| 366 | 364 | } |
| 367 | 365 | |
@@ -379,7 +377,7 @@ discard block |
||
| 379 | 377 | "module" => $module, |
| 380 | 378 | )); |
| 381 | 379 | return $this->writeTemplateToFile($index, |
| 382 | - $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", |
|
| 380 | + $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", |
|
| 383 | 381 | $force); |
| 384 | 382 | } |
| 385 | 383 | |
@@ -397,11 +395,11 @@ discard block |
||
| 397 | 395 | try { |
| 398 | 396 | $this->cache->storeData($filename, $fileContent, Cache::TEXT, true); |
| 399 | 397 | $created = true; |
| 400 | - } catch (\Exception $e) { |
|
| 398 | + }catch (\Exception $e) { |
|
| 401 | 399 | $this->log->errorLog($e->getMessage()); |
| 402 | 400 | } |
| 403 | - } else { |
|
| 404 | - $this->log->errorLog($filename . _(' not exists or cant write')); |
|
| 401 | + }else { |
|
| 402 | + $this->log->errorLog($filename._(' not exists or cant write')); |
|
| 405 | 403 | } |
| 406 | 404 | return $created; |
| 407 | 405 | } |
@@ -426,7 +424,7 @@ discard block |
||
| 426 | 424 | )); |
| 427 | 425 | |
| 428 | 426 | return $this->writeTemplateToFile($controller, |
| 429 | - $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true); |
|
| 427 | + $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true); |
|
| 430 | 428 | } |
| 431 | 429 | |
| 432 | 430 | /** |
@@ -449,7 +447,7 @@ discard block |
||
| 449 | 447 | "class" => $class, |
| 450 | 448 | )); |
| 451 | 449 | |
| 452 | - return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force); |
|
| 450 | + return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force); |
|
| 453 | 451 | } |
| 454 | 452 | |
| 455 | 453 | /** |
@@ -463,12 +461,12 @@ discard block |
||
| 463 | 461 | { |
| 464 | 462 | if (file_exists($filename_path)) { |
| 465 | 463 | $destfolder = basename($filename_path); |
| 466 | - if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) { |
|
| 464 | + if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) { |
|
| 467 | 465 | if (is_dir($filename_path)) { |
| 468 | - self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 469 | - } else { |
|
| 470 | - if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) { |
|
| 471 | - throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 466 | + self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 467 | + }else { |
|
| 468 | + if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) { |
|
| 469 | + throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 472 | 470 | } |
| 473 | 471 | } |
| 474 | 472 | } |
@@ -487,10 +485,10 @@ discard block |
||
| 487 | 485 | Config::createDir($dst); |
| 488 | 486 | while (false !== ($file = readdir($dir))) { |
| 489 | 487 | if (($file != '.') && ($file != '..')) { |
| 490 | - if (is_dir($src . '/' . $file)) { |
|
| 491 | - self::copyr($src . '/' . $file, $dst . '/' . $file); |
|
| 492 | - } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) { |
|
| 493 | - throw new ConfigException("Can't copy " . $src . " to " . $dst); |
|
| 488 | + if (is_dir($src.'/'.$file)) { |
|
| 489 | + self::copyr($src.'/'.$file, $dst.'/'.$file); |
|
| 490 | + } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) { |
|
| 491 | + throw new ConfigException("Can't copy ".$src." to ".$dst); |
|
| 494 | 492 | } |
| 495 | 493 | } |
| 496 | 494 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | protected function init() |
| 48 | 48 | { |
| 49 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json")) { |
|
| 49 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json")) { |
|
| 50 | 50 | $this->loadConfigData(); |
| 51 | 51 | } |
| 52 | 52 | return $this; |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public function getTemplatePath() |
| 118 | 118 | { |
| 119 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR; |
|
| 119 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR; |
|
| 120 | 120 | return realpath($path); |
| 121 | 121 | } |
| 122 | 122 | |
@@ -163,10 +163,10 @@ discard block |
||
| 163 | 163 | $final_data = self::saveExtraParams($data); |
| 164 | 164 | $saved = false; |
| 165 | 165 | try { |
| 166 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", $final_data, Cache::JSON, true); |
|
| 166 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", $final_data, Cache::JSON, true); |
|
| 167 | 167 | Config::getInstance()->loadConfigData(); |
| 168 | 168 | $saved = true; |
| 169 | - } catch (ConfigException $e) { |
|
| 169 | + }catch (ConfigException $e) { |
|
| 170 | 170 | Logger::log($e->getMessage(), LOG_ERR); |
| 171 | 171 | } |
| 172 | 172 | return $saved; |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | */ |
| 199 | 199 | public function getPropelParams() |
| 200 | 200 | { |
| 201 | - return Cache::getInstance()->getDataFromFile(__DIR__ . DIRECTORY_SEPARATOR . 'properties.json', Cache::JSON, true); |
|
| 201 | + return Cache::getInstance()->getDataFromFile(__DIR__.DIRECTORY_SEPARATOR.'properties.json', Cache::JSON, true); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
@@ -210,12 +210,12 @@ discard block |
||
| 210 | 210 | { |
| 211 | 211 | try { |
| 212 | 212 | if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) { |
| 213 | - throw new \Exception(_('Can\'t create directory ') . $dir); |
|
| 213 | + throw new \Exception(_('Can\'t create directory ').$dir); |
|
| 214 | 214 | } |
| 215 | - } catch (\Exception $e) { |
|
| 215 | + }catch (\Exception $e) { |
|
| 216 | 216 | Logger::log($e->getMessage(), LOG_WARNING); |
| 217 | 217 | if (!file_exists(dirname($dir))) { |
| 218 | - throw new ConfigException($e->getMessage() . $dir); |
|
| 218 | + throw new ConfigException($e->getMessage().$dir); |
|
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | 221 | } |
@@ -227,10 +227,10 @@ discard block |
||
| 227 | 227 | { |
| 228 | 228 | $rootDirs = array("css", "js", "media", "font"); |
| 229 | 229 | foreach ($rootDirs as $dir) { |
| 230 | - if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) { |
|
| 230 | + if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) { |
|
| 231 | 231 | try { |
| 232 | - @shell_exec("rm -rf " . WEB_DIR . DIRECTORY_SEPARATOR . $dir); |
|
| 233 | - } catch (\Exception $e) { |
|
| 232 | + @shell_exec("rm -rf ".WEB_DIR.DIRECTORY_SEPARATOR.$dir); |
|
| 233 | + }catch (\Exception $e) { |
|
| 234 | 234 | Logger::log($e->getMessage()); |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | */ |
| 243 | 243 | public function loadConfigData() |
| 244 | 244 | { |
| 245 | - $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", |
|
| 245 | + $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", |
|
| 246 | 246 | Cache::JSON, |
| 247 | 247 | TRUE) ?: []; |
| 248 | 248 | $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE; |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace PSFS\base; |
| 4 | 4 | |
| 5 | 5 | use PSFS\base\types\SingletonTrait; |
| 6 | -use PSFS\controller\UserController; |
|
| 7 | 6 | |
| 8 | 7 | |
| 9 | 8 | /** |
@@ -282,7 +282,7 @@ |
||
| 282 | 282 | /** |
| 283 | 283 | * Static wrapper for extracting params |
| 284 | 284 | * @param string $key |
| 285 | - * @param mixed|null $defaultValue |
|
| 285 | + * @param boolean $defaultValue |
|
| 286 | 286 | * @return mixed|null |
| 287 | 287 | */ |
| 288 | 288 | public static function getParam($key, $defaultValue = null) { |
@@ -5,12 +5,9 @@ |
||
| 5 | 5 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 6 | 6 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 7 | 7 | use Propel\Runtime\Connection\ConnectionInterface; |
| 8 | - use Propel\Runtime\Map\ColumnMap; |
|
| 9 | 8 | use Propel\Runtime\Map\TableMap; |
| 10 | 9 | use Propel\Runtime\Propel; |
| 11 | 10 | use PSFS\base\config\Config; |
| 12 | - use PSFS\base\dto\Field; |
|
| 13 | - use PSFS\base\dto\Form; |
|
| 14 | 11 | use PSFS\base\dto\JsonResponse; |
| 15 | 12 | use PSFS\base\dto\Order; |
| 16 | 13 | use PSFS\base\Logger; |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @param ModelCriteria $query |
| 173 | 173 | */ |
| 174 | - private function addOrders(ModelCriteria &$query) |
|
| 174 | + private function addOrders(ModelCriteria & $query) |
|
| 175 | 175 | { |
| 176 | 176 | $orderAdded = FALSE; |
| 177 | 177 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $orderAdded = TRUE; |
| 180 | 180 | if ($direction === Order::ASC) { |
| 181 | 181 | $query->addAscendingOrderByColumn($field); |
| 182 | - } else { |
|
| 182 | + }else { |
|
| 183 | 183 | $query->addDescendingOrderByColumn($field); |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * |
| 195 | 195 | * @param ModelCriteria $query |
| 196 | 196 | */ |
| 197 | - private function addExtraColumns(ModelCriteria &$query) |
|
| 197 | + private function addExtraColumns(ModelCriteria & $query) |
|
| 198 | 198 | { |
| 199 | 199 | if (!empty($this->extraColumns)) { |
| 200 | 200 | foreach ($this->extraColumns as $expression => $columnName) { |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | * |
| 209 | 209 | * @param ModelCriteria $query |
| 210 | 210 | */ |
| 211 | - protected function joinTables(ModelCriteria &$query) |
|
| 211 | + protected function joinTables(ModelCriteria & $query) |
|
| 212 | 212 | { |
| 213 | 213 | //TODO for specific implementations |
| 214 | 214 | } |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @param ModelCriteria $query |
| 220 | 220 | */ |
| 221 | - private function addFilters(ModelCriteria &$query) |
|
| 221 | + private function addFilters(ModelCriteria & $query) |
|
| 222 | 222 | { |
| 223 | 223 | if (count($this->query) > 0) { |
| 224 | 224 | foreach ($this->query as $field => $value) { |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | $text = preg_replace('/(\'|\")/', '', $value); |
| 237 | 237 | $text = preg_replace('/\ /', '%', $text); |
| 238 | 238 | $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
| 239 | - } else { |
|
| 239 | + }else { |
|
| 240 | 240 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
| 241 | 241 | } |
| 242 | 242 | } |
@@ -259,10 +259,10 @@ discard block |
||
| 259 | 259 | list($page, $limit) = $this->extractPagination(); |
| 260 | 260 | if ($limit == -1) { |
| 261 | 261 | $this->list = $query->find($this->con); |
| 262 | - } else { |
|
| 262 | + }else { |
|
| 263 | 263 | $this->list = $query->paginate($page, $limit, $this->con); |
| 264 | 264 | } |
| 265 | - } catch (\Exception $e) { |
|
| 265 | + }catch (\Exception $e) { |
|
| 266 | 266 | Logger::log($e->getMessage(), LOG_ERR); |
| 267 | 267 | } |
| 268 | 268 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $this->joinTables($query); |
| 280 | 280 | $this->addExtraColumns($query); |
| 281 | 281 | $this->model = $query->findPk($pk); |
| 282 | - } catch (\Exception $e) { |
|
| 282 | + }catch (\Exception $e) { |
|
| 283 | 283 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
| 284 | 284 | } |
| 285 | 285 | } |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | $saved = TRUE; |
| 368 | 368 | $model = $this->model->toArray(); |
| 369 | 369 | } |
| 370 | - } catch (\Exception $e) { |
|
| 370 | + }catch (\Exception $e) { |
|
| 371 | 371 | Logger::log($e->getMessage(), LOG_ERR); |
| 372 | 372 | } |
| 373 | 373 | |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $this->model->delete($this->con); |
| 396 | 396 | $deleted = TRUE; |
| 397 | 397 | } |
| 398 | - } catch (\Exception $e) { |
|
| 398 | + }catch (\Exception $e) { |
|
| 399 | 399 | Logger::getInstance(get_class($this->model))->errorLog($e->getMessage()); |
| 400 | 400 | } |
| 401 | 401 | } |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | */ |
| 440 | 440 | private function extractQuery() |
| 441 | 441 | { |
| 442 | - $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query"); |
|
| 442 | + $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query"); |
|
| 443 | 443 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 444 | 444 | $query = $queryReflector->getMethod('create')->invoke($this->con); |
| 445 | 445 | |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | if (null !== $this->con && $this->con->inTransaction()) { |
| 484 | 484 | if ($status === 200) { |
| 485 | 485 | $this->con->commit(); |
| 486 | - } else { |
|
| 486 | + }else { |
|
| 487 | 487 | $this->con->rollBack(); |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | return $this->render('api.admin.html.twig', array( |
| 528 | 528 | "api" => $this->getApi(), |
| 529 | 529 | "domain" => $this->domain, |
| 530 | - "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)), |
|
| 530 | + "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)), |
|
| 531 | 531 | ), [], ''); |
| 532 | 532 | } |
| 533 | 533 | |
@@ -561,12 +561,12 @@ discard block |
||
| 561 | 561 | $pages = 0; |
| 562 | 562 | try { |
| 563 | 563 | $this->paginate(); |
| 564 | - if(null !== $this->list) { |
|
| 564 | + if (null !== $this->list) { |
|
| 565 | 565 | $return = $this->list->toArray(); |
| 566 | 566 | $total = $this->list->getNbResults(); |
| 567 | 567 | $pages = $this->list->getLastPage(); |
| 568 | 568 | } |
| 569 | - } catch (\Exception $e) { |
|
| 569 | + }catch (\Exception $e) { |
|
| 570 | 570 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
| 571 | 571 | } |
| 572 | 572 | |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | $return = array(); |
| 586 | 586 | if (NULL === $model && method_exists($model, 'toArray')) { |
| 587 | 587 | $code = 404; |
| 588 | - } else { |
|
| 588 | + }else { |
|
| 589 | 589 | $return = $model->toArray(); |
| 590 | 590 | } |
| 591 | 591 | |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | /** |
| 618 | 618 | * Método que extrae los parámetros de una función |
| 619 | 619 | * |
| 620 | - * @param array $sr |
|
| 620 | + * @param string[] $sr |
|
| 621 | 621 | * @param \ReflectionMethod $method |
| 622 | 622 | * |
| 623 | 623 | * @return array |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | * |
| 671 | 671 | * @param string $docComments |
| 672 | 672 | * |
| 673 | - * @return bool |
|
| 673 | + * @return string |
|
| 674 | 674 | */ |
| 675 | 675 | private function extractReflectionCacheability($docComments) |
| 676 | 676 | { |
@@ -56,8 +56,10 @@ discard block |
||
| 56 | 56 | $_route = explode("/", $url['path']); |
| 57 | 57 | $_pattern = explode("/", $pattern); |
| 58 | 58 | $get = array(); |
| 59 | - if (!empty($_pattern)) foreach ($_pattern as $index => $component) { |
|
| 59 | + if (!empty($_pattern)) { |
|
| 60 | + foreach ($_pattern as $index => $component) { |
|
| 60 | 61 | $_get = array(); |
| 62 | + } |
|
| 61 | 63 | preg_match_all('/^\{(.*)\}$/i', $component, $_get); |
| 62 | 64 | if (!empty($_get[1]) && isset($_route[$index])) { |
| 63 | 65 | $get[array_pop($_get[1])] = $_route[$index]; |
@@ -151,12 +153,16 @@ discard block |
||
| 151 | 153 | $params = []; |
| 152 | 154 | $parameters = $method->getParameters(); |
| 153 | 155 | /** @var \ReflectionParameter $param */ |
| 154 | - if (count($parameters) > 0) foreach ($parameters as $param) { |
|
| 156 | + if (count($parameters) > 0) { |
|
| 157 | + foreach ($parameters as $param) { |
|
| 155 | 158 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
| 156 | 159 | $params[$param->getName()] = $param->getDefaultValue(); |
| 160 | + } |
|
| 157 | 161 | $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
| 158 | 162 | } |
| 159 | - } else $default = $regex; |
|
| 163 | + } else { |
|
| 164 | + $default = $regex; |
|
| 165 | + } |
|
| 160 | 166 | |
| 161 | 167 | return array($regex, $default, $params); |
| 162 | 168 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | public static function getClassToCall($action) |
| 21 | 21 | { |
| 22 | 22 | Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action); |
| 23 | - $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"]; |
|
| 23 | + $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"]; |
|
| 24 | 24 | $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass; |
| 25 | 25 | return $class; |
| 26 | 26 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $expr = preg_quote($expr, '/'); |
| 107 | 107 | $expr = str_replace('###', '(.*)', $expr); |
| 108 | 108 | $expr2 = preg_replace('/\(\.\*\)$/', '', $expr); |
| 109 | - $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path); |
|
| 109 | + $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path); |
|
| 110 | 110 | return $matched; |
| 111 | 111 | } |
| 112 | 112 | |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public static function extractDomainInfo(\ReflectionClass $class, $domain) |
| 119 | 119 | { |
| 120 | - $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
| 121 | - $path = realpath($path) . DIRECTORY_SEPARATOR; |
|
| 120 | + $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
| 121 | + $path = realpath($path).DIRECTORY_SEPARATOR; |
|
| 122 | 122 | $tpl_path = "templates"; |
| 123 | 123 | $public_path = "public"; |
| 124 | 124 | $model_path = "models"; |
@@ -128,12 +128,12 @@ discard block |
||
| 128 | 128 | $model_path = ucfirst($model_path); |
| 129 | 129 | } |
| 130 | 130 | if ($class->hasConstant("TPL")) { |
| 131 | - $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL"); |
|
| 131 | + $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL"); |
|
| 132 | 132 | } |
| 133 | 133 | return [ |
| 134 | - "template" => $path . $tpl_path, |
|
| 135 | - "model" => $path . $model_path, |
|
| 136 | - "public" => $path . $public_path, |
|
| 134 | + "template" => $path.$tpl_path, |
|
| 135 | + "model" => $path.$model_path, |
|
| 136 | + "public" => $path.$public_path, |
|
| 137 | 137 | ]; |
| 138 | 138 | } |
| 139 | 139 | |
@@ -155,9 +155,9 @@ discard block |
||
| 155 | 155 | if (count($parameters) > 0) foreach ($parameters as $param) { |
| 156 | 156 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
| 157 | 157 | $params[$param->getName()] = $param->getDefaultValue(); |
| 158 | - $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
|
| 158 | + $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex); |
|
| 159 | 159 | } |
| 160 | - } else $default = $regex; |
|
| 160 | + }else $default = $regex; |
|
| 161 | 161 | |
| 162 | 162 | return array($regex, $default, $params); |
| 163 | 163 | } |
@@ -212,10 +212,10 @@ discard block |
||
| 212 | 212 | { |
| 213 | 213 | $is_enabled = true; |
| 214 | 214 | // For non api routes |
| 215 | - if(strlen($api) > 0 && preg_match('/admin/i', $route)) { |
|
| 215 | + if (strlen($api) > 0 && preg_match('/admin/i', $route)) { |
|
| 216 | 216 | // If route is for api, check if admin is enabled in config |
| 217 | 217 | $admin_enabled = Config::getInstance()->get('api.admin'); |
| 218 | - if(empty($admin_enabled)) { |
|
| 218 | + if (empty($admin_enabled)) { |
|
| 219 | 219 | $is_enabled = false; |
| 220 | 220 | } |
| 221 | 221 | } |
@@ -239,8 +239,8 @@ discard block |
||
| 239 | 239 | $default = str_replace('{__API__}', $api, $default); |
| 240 | 240 | } |
| 241 | 241 | $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments); |
| 242 | - if(self::checkCanAddRoute($regex, $api)) { |
|
| 243 | - $route = $httpMethod . "#|#" . $regex; |
|
| 242 | + if (self::checkCanAddRoute($regex, $api)) { |
|
| 243 | + $route = $httpMethod."#|#".$regex; |
|
| 244 | 244 | $info = [ |
| 245 | 245 | "method" => $method->getName(), |
| 246 | 246 | "params" => $params, |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | $default = Config::getInstance()->get('admin_action') ?: 'admin-login'; |
| 268 | 268 | |
| 269 | 269 | } |
| 270 | - if(null !== $default) { |
|
| 270 | + if (null !== $default) { |
|
| 271 | 271 | return Router::getInstance()->execute(Router::getInstance()->getRoute($default)); |
| 272 | 272 | } |
| 273 | 273 | return null; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use PSFS\base\config\Config; |
| 5 | 5 | use PSFS\base\Security; |
| 6 | 6 | use PSFS\base\Service; |
| 7 | - use PSFS\controller\Admin; |
|
| 8 | 7 | use Symfony\Component\Finder\Finder; |
| 9 | 8 | |
| 10 | 9 | class AdminServices extends Service{ |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | use PSFS\controller\Admin; |
| 8 | 8 | use Symfony\Component\Finder\Finder; |
| 9 | 9 | |
| 10 | - class AdminServices extends Service{ |
|
| 10 | + class AdminServices extends Service { |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * @Inyectable |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | $platform = trim(Config::getInstance()->get("platform_name")); |
| 35 | 35 | header('HTTP/1.1 401 Unauthorized'); |
| 36 | - header('WWW-Authenticate: Basic Realm="' . $platform. '"'); |
|
| 36 | + header('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
| 37 | 37 | echo _("Zona restringida"); |
| 38 | 38 | exit(); |
| 39 | 39 | } |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | public function getAdmins() |
| 46 | 46 | { |
| 47 | 47 | $admins = $this->security->getAdmins(); |
| 48 | - if(!empty($admins)) |
|
| 48 | + if (!empty($admins)) |
|
| 49 | 49 | { |
| 50 | - if(!$this->security->checkAdmin()) |
|
| 50 | + if (!$this->security->checkAdmin()) |
|
| 51 | 51 | { |
| 52 | 52 | $this->setAdminHeaders(); |
| 53 | 53 | } |
@@ -62,17 +62,17 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | private function parseAdmins(&$admins) |
| 64 | 64 | { |
| 65 | - if(!empty($admins)) foreach($admins as &$admin) |
|
| 65 | + if (!empty($admins)) foreach ($admins as &$admin) |
|
| 66 | 66 | { |
| 67 | - if(isset($admin["profile"])) |
|
| 67 | + if (isset($admin["profile"])) |
|
| 68 | 68 | { |
| 69 | - switch($admin["profile"]) { |
|
| 69 | + switch ($admin["profile"]) { |
|
| 70 | 70 | case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break; |
| 71 | 71 | case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break; |
| 72 | 72 | default: |
| 73 | 73 | case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break; |
| 74 | 74 | } |
| 75 | - }else{ |
|
| 75 | + }else { |
|
| 76 | 76 | $admin["class"] = "primary"; |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -88,12 +88,12 @@ discard block |
||
| 88 | 88 | $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime(); |
| 89 | 89 | $logs = array(); |
| 90 | 90 | /** @var \SplFileInfo $file */ |
| 91 | - foreach($files as $file) |
|
| 91 | + foreach ($files as $file) |
|
| 92 | 92 | { |
| 93 | - $size = $file->getSize() / 8 / 1024; |
|
| 93 | + $size = $file->getSize()/8/1024; |
|
| 94 | 94 | $time = date("c", $file->getMTime()); |
| 95 | 95 | $dateTime = new \DateTime($time); |
| 96 | - if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
|
| 96 | + if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
|
| 97 | 97 | $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array( |
| 98 | 98 | "filename" => $file->getFilename(), |
| 99 | 99 | "size" => round($size, 3) |
@@ -117,27 +117,27 @@ discard block |
||
| 117 | 117 | $files->files()->in(LOG_DIR)->name($selectedLog); |
| 118 | 118 | $file = null; |
| 119 | 119 | $log = array(); |
| 120 | - foreach($files as $match) |
|
| 120 | + foreach ($files as $match) |
|
| 121 | 121 | { |
| 122 | 122 | $file = $match; |
| 123 | 123 | break; |
| 124 | 124 | } |
| 125 | 125 | /** @var \SplFileInfo $file */ |
| 126 | - if(!empty($file)) |
|
| 126 | + if (!empty($file)) |
|
| 127 | 127 | { |
| 128 | 128 | $time = date("c", $file->getMTime()); |
| 129 | 129 | $dateTime = new \DateTime($time); |
| 130 | 130 | $monthOpen = $dateTime->format("m"); |
| 131 | - $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename()); |
|
| 131 | + $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename()); |
|
| 132 | 132 | krsort($content); |
| 133 | 133 | $detailLog = array(); |
| 134 | - foreach($content as &$line) |
|
| 134 | + foreach ($content as &$line) |
|
| 135 | 135 | { |
| 136 | 136 | list($line, $detail) = $this->parseLogLine($line, $match); |
| 137 | 137 | $detailLog[] = array_merge(array( |
| 138 | 138 | "log" => $line, |
| 139 | 139 | ), $detail); |
| 140 | - if(count($detailLog) >= 1000) break; |
|
| 140 | + if (count($detailLog) >= 1000) break; |
|
| 141 | 141 | } |
| 142 | 142 | $log = $detailLog; |
| 143 | 143 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | $type = (isset($match[1][0])) ? $match[1][0] : ''; |
| 168 | 168 | $type = explode(".", $type); |
| 169 | - $type = count($type)>1 ? $type[1] : $type[0]; |
|
| 169 | + $type = count($type) > 1 ? $type[1] : $type[0]; |
|
| 170 | 170 | switch ($type) { |
| 171 | 171 | case 'INFO': |
| 172 | 172 | $detail["type"] = "success"; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | break; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - } catch (\Exception $e) { |
|
| 185 | + }catch (\Exception $e) { |
|
| 186 | 186 | $detail = array( |
| 187 | 187 | "type" => "danger", |
| 188 | 188 | ); |
@@ -62,17 +62,20 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | private function parseAdmins(&$admins) |
| 64 | 64 | { |
| 65 | - if(!empty($admins)) foreach($admins as &$admin) |
|
| 65 | + if(!empty($admins)) { |
|
| 66 | + foreach($admins as &$admin) |
|
| 66 | 67 | { |
| 67 | 68 | if(isset($admin["profile"])) |
| 68 | 69 | { |
| 69 | 70 | switch($admin["profile"]) { |
| 70 | - case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break; |
|
| 71 | + case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; |
|
| 72 | + } |
|
| 73 | + break; |
|
| 71 | 74 | case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break; |
| 72 | 75 | default: |
| 73 | 76 | case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break; |
| 74 | 77 | } |
| 75 | - }else{ |
|
| 78 | + } else{ |
|
| 76 | 79 | $admin["class"] = "primary"; |
| 77 | 80 | } |
| 78 | 81 | } |
@@ -93,7 +96,9 @@ discard block |
||
| 93 | 96 | $size = $file->getSize() / 8 / 1024; |
| 94 | 97 | $time = date("c", $file->getMTime()); |
| 95 | 98 | $dateTime = new \DateTime($time); |
| 96 | - if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
|
| 99 | + if(!isset($logs[$dateTime->format("Y")])) { |
|
| 100 | + $logs[$dateTime->format("Y")] = array(); |
|
| 101 | + } |
|
| 97 | 102 | $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array( |
| 98 | 103 | "filename" => $file->getFilename(), |
| 99 | 104 | "size" => round($size, 3) |
@@ -137,7 +142,9 @@ discard block |
||
| 137 | 142 | $detailLog[] = array_merge(array( |
| 138 | 143 | "log" => $line, |
| 139 | 144 | ), $detail); |
| 140 | - if(count($detailLog) >= 1000) break; |
|
| 145 | + if(count($detailLog) >= 1000) { |
|
| 146 | + break; |
|
| 147 | + } |
|
| 141 | 148 | } |
| 142 | 149 | $log = $detailLog; |
| 143 | 150 | } |
@@ -161,7 +168,9 @@ discard block |
||
| 161 | 168 | |
| 162 | 169 | $detail = json_decode($match[0][0], TRUE); |
| 163 | 170 | } |
| 164 | - if (empty($detail)) $detail = array(); |
|
| 171 | + if (empty($detail)) { |
|
| 172 | + $detail = array(); |
|
| 173 | + } |
|
| 165 | 174 | preg_match_all('/\>\ (.*):/i', $line, $match); |
| 166 | 175 | |
| 167 | 176 | $type = (isset($match[1][0])) ? $match[1][0] : ''; |
@@ -393,8 +393,10 @@ |
||
| 393 | 393 | throw new RouterException(_("No existe la ruta especificada")); |
| 394 | 394 | } |
| 395 | 395 | $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug]; |
| 396 | - if (!empty($params)) foreach ($params as $key => $value) { |
|
| 396 | + if (!empty($params)) { |
|
| 397 | + foreach ($params as $key => $value) { |
|
| 397 | 398 | $url = str_replace("{" . $key . "}", $value, $url); |
| 399 | + } |
|
| 398 | 400 | } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) { |
| 399 | 401 | $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
| 400 | 402 | } |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function init() |
| 61 | 61 | { |
| 62 | - if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) { |
|
| 62 | + if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) { |
|
| 63 | 63 | $this->hydrateRouting(); |
| 64 | 64 | $this->simpatize(); |
| 65 | - } else { |
|
| 66 | - list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE); |
|
| 67 | - $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE); |
|
| 65 | + }else { |
|
| 66 | + list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE); |
|
| 67 | + $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | "success" => FALSE, |
| 85 | 85 | "error" => $e->getMessage(), |
| 86 | 86 | )), 'application/json'); |
| 87 | - } else { |
|
| 87 | + }else { |
|
| 88 | 88 | if (NULL === $e) { |
| 89 | 89 | Logger::log('Not found page throwed without previous exception', LOG_WARNING); |
| 90 | 90 | $e = new \Exception(_('Page not found'), 404); |
@@ -113,8 +113,8 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function getAllRoutes() { |
| 115 | 115 | $routes = []; |
| 116 | - foreach($this->routing as $path => $route) { |
|
| 117 | - if(array_key_exists('slug', $route)) { |
|
| 116 | + foreach ($this->routing as $path => $route) { |
|
| 117 | + if (array_key_exists('slug', $route)) { |
|
| 118 | 118 | $routes[$route['slug']] = $path; |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -139,15 +139,15 @@ discard block |
||
| 139 | 139 | SecurityHelper::checkRestrictedAccess($route); |
| 140 | 140 | //Search action and execute |
| 141 | 141 | $this->searchAction($route); |
| 142 | - } catch (AccessDeniedException $e) { |
|
| 142 | + }catch (AccessDeniedException $e) { |
|
| 143 | 143 | Logger::log(_('Solicitamos credenciales de acceso a zona restringida')); |
| 144 | 144 | return Admin::staticAdminLogon($route); |
| 145 | - } catch (RouterException $r) { |
|
| 146 | - if(null === RouterHelper::checkDefaultRoute($route)) { |
|
| 145 | + }catch (RouterException $r) { |
|
| 146 | + if (null === RouterHelper::checkDefaultRoute($route)) { |
|
| 147 | 147 | Logger::log($r->getMessage(), LOG_WARNING); |
| 148 | 148 | throw $r; |
| 149 | 149 | } |
| 150 | - } catch (\Exception $e) { |
|
| 150 | + }catch (\Exception $e) { |
|
| 151 | 151 | Logger::log($e->getMessage(), LOG_ERR); |
| 152 | 152 | throw $e; |
| 153 | 153 | } |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | protected function searchAction($route) |
| 166 | 166 | { |
| 167 | - Logger::log('Searching action to execute: ' . $route, LOG_INFO); |
|
| 167 | + Logger::log('Searching action to execute: '.$route, LOG_INFO); |
|
| 168 | 168 | //Revisamos si tenemos la ruta registrada |
| 169 | 169 | $parts = parse_url($route); |
| 170 | 170 | $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $class = RouterHelper::getClassToCall($action); |
| 179 | 179 | try { |
| 180 | 180 | $this->executeCachedRoute($route, $action, $class, $get); |
| 181 | - } catch (\Exception $e) { |
|
| 181 | + }catch (\Exception $e) { |
|
| 182 | 182 | Logger::log($e->getMessage(), LOG_ERR); |
| 183 | 183 | throw new RouterException($e->getMessage(), 404, $e); |
| 184 | 184 | } |
@@ -206,13 +206,13 @@ discard block |
||
| 206 | 206 | $this->routing = $this->inspectDir($base, "PSFS", array()); |
| 207 | 207 | if (file_exists($modules)) { |
| 208 | 208 | $module = ""; |
| 209 | - if(file_exists($modules . DIRECTORY_SEPARATOR . 'module.json')) { |
|
| 210 | - $mod_cfg = json_decode(file_get_contents($modules . DIRECTORY_SEPARATOR . 'module.json'), true); |
|
| 209 | + if (file_exists($modules.DIRECTORY_SEPARATOR.'module.json')) { |
|
| 210 | + $mod_cfg = json_decode(file_get_contents($modules.DIRECTORY_SEPARATOR.'module.json'), true); |
|
| 211 | 211 | $module = $mod_cfg['module']; |
| 212 | 212 | } |
| 213 | 213 | $this->routing = $this->inspectDir($modules, $module, $this->routing); |
| 214 | 214 | } |
| 215 | - $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE); |
|
| 215 | + $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /** |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $home_params = NULL; |
| 228 | 228 | foreach ($this->routing as $pattern => $params) { |
| 229 | 229 | list($method, $route) = RouterHelper::extractHttpRoute($pattern); |
| 230 | - if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) { |
|
| 230 | + if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) { |
|
| 231 | 231 | $home_params = $params; |
| 232 | 232 | } |
| 233 | 233 | } |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->name("*.php"); |
| 253 | 253 | foreach ($files as $file) { |
| 254 | 254 | $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname())); |
| 255 | - $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing); |
|
| 255 | + $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing); |
|
| 256 | 256 | } |
| 257 | 257 | $this->finder = new Finder(); |
| 258 | 258 | |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | } |
| 292 | 292 | foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { |
| 293 | 293 | list($route, $info) = RouterHelper::extractRouteInfo($method, $api); |
| 294 | - if(null !== $route && null !== $info) { |
|
| 294 | + if (null !== $route && null !== $info) { |
|
| 295 | 295 | $info['class'] = $namespace; |
| 296 | 296 | $routing[$route] = $info; |
| 297 | 297 | } |
@@ -314,11 +314,11 @@ discard block |
||
| 314 | 314 | { |
| 315 | 315 | //Calculamos los dominios para las plantillas |
| 316 | 316 | if ($class->hasConstant("DOMAIN") && !$class->isAbstract()) { |
| 317 | - if(!$this->domains) { |
|
| 317 | + if (!$this->domains) { |
|
| 318 | 318 | $this->domains = []; |
| 319 | 319 | } |
| 320 | - $domain = "@" . $class->getConstant("DOMAIN") . "/"; |
|
| 321 | - if(!array_key_exists($domain, $this->domains)) { |
|
| 320 | + $domain = "@".$class->getConstant("DOMAIN")."/"; |
|
| 321 | + if (!array_key_exists($domain, $this->domains)) { |
|
| 322 | 322 | $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain); |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -332,11 +332,11 @@ discard block |
||
| 332 | 332 | */ |
| 333 | 333 | public function simpatize() |
| 334 | 334 | { |
| 335 | - $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php"; |
|
| 336 | - $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName; |
|
| 335 | + $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php"; |
|
| 336 | + $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName; |
|
| 337 | 337 | $this->generateSlugs($absoluteTranslationFileName); |
| 338 | 338 | Config::createDir(CONFIG_DIR); |
| 339 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 339 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 340 | 340 | |
| 341 | 341 | return $this; |
| 342 | 342 | } |
@@ -354,16 +354,16 @@ discard block |
||
| 354 | 354 | public function getRoute($slug = '', $absolute = FALSE, $params = []) |
| 355 | 355 | { |
| 356 | 356 | if (strlen($slug) === 0) { |
| 357 | - return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/'; |
|
| 357 | + return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/'; |
|
| 358 | 358 | } |
| 359 | 359 | if (NULL === $slug || !array_key_exists($slug, $this->slugs)) { |
| 360 | 360 | throw new RouterException(_("No existe la ruta especificada")); |
| 361 | 361 | } |
| 362 | - $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug]; |
|
| 362 | + $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug]; |
|
| 363 | 363 | if (!empty($params)) foreach ($params as $key => $value) { |
| 364 | - $url = str_replace("{" . $key . "}", $value, $url); |
|
| 364 | + $url = str_replace("{".$key."}", $value, $url); |
|
| 365 | 365 | } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) { |
| 366 | - $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
|
| 366 | + $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url); |
@@ -406,17 +406,17 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | protected function executeCachedRoute($route, $action, $class, $params = NULL) |
| 408 | 408 | { |
| 409 | - Logger::log('Executing route ' . $route, LOG_INFO); |
|
| 409 | + Logger::log('Executing route '.$route, LOG_INFO); |
|
| 410 | 410 | Security::getInstance()->setSessionKey("__CACHE__", $action); |
| 411 | 411 | $cache = Cache::needCache(); |
| 412 | 412 | $execute = TRUE; |
| 413 | 413 | if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) { |
| 414 | 414 | $cacheDataName = $this->cache->getRequestCacheHash(); |
| 415 | - $cachedData = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName, |
|
| 416 | - $cache, function () {}); |
|
| 415 | + $cachedData = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName, |
|
| 416 | + $cache, function() {}); |
|
| 417 | 417 | if (NULL !== $cachedData) { |
| 418 | - $headers = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName . ".headers", |
|
| 419 | - $cache, function () {}, Cache::JSON); |
|
| 418 | + $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers", |
|
| 419 | + $cache, function() {}, Cache::JSON); |
|
| 420 | 420 | Template::getInstance()->renderCache($cachedData, $headers); |
| 421 | 421 | $execute = FALSE; |
| 422 | 422 | } |
