@@ -144,7 +144,7 @@ |
||
| 144 | 144 | * @param string $path |
| 145 | 145 | * @param $domains |
| 146 | 146 | * |
| 147 | - * @return mixed |
|
| 147 | + * @return string |
|
| 148 | 148 | */ |
| 149 | 149 | private static function extractPathname($path, $domains) |
| 150 | 150 | { |
@@ -39,12 +39,12 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $file_path = ""; |
| 41 | 41 | if (!file_exists($file_path)) { |
| 42 | - $file_path = BASE_DIR . $string; |
|
| 42 | + $file_path = BASE_DIR.$string; |
|
| 43 | 43 | } |
| 44 | 44 | $filename_path = AssetsParser::findDomainPath($string, $file_path); |
| 45 | 45 | |
| 46 | 46 | $file_path = self::processAsset($string, $name, $return, $filename_path); |
| 47 | - $return_path = (empty($name)) ? Request::getInstance()->getRootUrl() . '/' . $file_path : $name; |
|
| 47 | + $return_path = (empty($name)) ? Request::getInstance()->getRootUrl().'/'.$file_path : $name; |
|
| 48 | 48 | return ($return) ? $return_path : ''; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $router = Router::getInstance(); |
| 62 | 62 | try { |
| 63 | 63 | return $router->getRoute($path, $absolute, $params); |
| 64 | - } catch (\Exception $e) { |
|
| 64 | + }catch (\Exception $e) { |
|
| 65 | 65 | return $router->getRoute('', $absolute, $params); |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -187,8 +187,8 @@ discard block |
||
| 187 | 187 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
| 188 | 188 | { |
| 189 | 189 | $data = file_get_contents($filename_path); |
| 190 | - if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
| 191 | - else file_put_contents($base . $file_path, $data); |
|
| 190 | + if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
| 191 | + else file_put_contents($base.$file_path, $data); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | if (file_exists($filename_path)) { |
| 207 | 207 | list($base, $html_base, $file_path) = AssetsParser::calculateAssetPath($string, $name, $return, $filename_path); |
| 208 | 208 | //Creamos el directorio si no existe |
| 209 | - GeneratorHelper::createDir($base . $html_base); |
|
| 209 | + GeneratorHelper::createDir($base.$html_base); |
|
| 210 | 210 | //Si se ha modificado |
| 211 | - if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($filename_path)) { |
|
| 211 | + if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($filename_path)) { |
|
| 212 | 212 | if ($html_base == 'css') { |
| 213 | 213 | self::processCssLines($filename_path); |
| 214 | 214 | } |
@@ -187,8 +187,11 @@ |
||
| 187 | 187 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
| 188 | 188 | { |
| 189 | 189 | $data = file_get_contents($filename_path); |
| 190 | - if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
| 191 | - else file_put_contents($base . $file_path, $data); |
|
| 190 | + if (!empty($name)) { |
|
| 191 | + file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
| 192 | + } else { |
|
| 193 | + file_put_contents($base . $file_path, $data); |
|
| 194 | + } |
|
| 192 | 195 | } |
| 193 | 196 | |
| 194 | 197 | /** |
@@ -48,6 +48,9 @@ discard block |
||
| 48 | 48 | return $this; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | + /** |
|
| 52 | + * @param string|null $action |
|
| 53 | + */ |
|
| 51 | 54 | public function setAction($action) |
| 52 | 55 | { |
| 53 | 56 | $this->action = $action; |
@@ -562,7 +565,7 @@ discard block |
||
| 562 | 565 | } |
| 563 | 566 | |
| 564 | 567 | /** |
| 565 | - * @param $token_field |
|
| 568 | + * @param string $token_field |
|
| 566 | 569 | * @return bool |
| 567 | 570 | */ |
| 568 | 571 | protected function existsFormToken($token_field) |
@@ -594,7 +597,7 @@ discard block |
||
| 594 | 597 | /** |
| 595 | 598 | * Método que extrae el valor de un campo del formulario del modelo |
| 596 | 599 | * @param $field |
| 597 | - * @param $value |
|
| 600 | + * @param ObjectCollection $value |
|
| 598 | 601 | * @param $type |
| 599 | 602 | * @return mixed |
| 600 | 603 | */ |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | public function add($name, array $value = array()) |
| 70 | 70 | { |
| 71 | 71 | $this->fields[$name] = $value; |
| 72 | - $this->fields[$name]['name'] = $this->getName() . "[{$name}]"; |
|
| 73 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
| 72 | + $this->fields[$name]['name'] = $this->getName()."[{$name}]"; |
|
| 73 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
| 74 | 74 | $this->fields[$name]['placeholder'] = (array_key_exists('placeholder', $value)) ? $value['placeholder'] : $name; |
| 75 | 75 | $this->fields[$name]['hasLabel'] = (array_key_exists('hasLabel', $value)) ? $value['hasLabel'] : true; |
| 76 | 76 | return $this; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | if ('' !== $hash_orig) { |
| 135 | 135 | $this->crfs = sha1($hash_orig); |
| 136 | - $this->add($this->getName() . '_token', array( |
|
| 136 | + $this->add($this->getName().'_token', array( |
|
| 137 | 137 | "type" => "hidden", |
| 138 | 138 | "value" => $this->crfs, |
| 139 | 139 | )); |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | public function isValid() |
| 203 | 203 | { |
| 204 | 204 | $valid = true; |
| 205 | - $token_field = $this->getName() . '_token'; |
|
| 205 | + $token_field = $this->getName().'_token'; |
|
| 206 | 206 | //Controlamos CSRF token |
| 207 | 207 | if (!$this->existsFormToken($token_field)) { |
| 208 | 208 | $this->errors[$token_field] = _('Formulario no válido'); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | $data = array(); |
| 275 | 275 | if (count($this->fields) > 0) { |
| 276 | 276 | foreach ($this->fields as $key => $field) { |
| 277 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . "_token")) { |
|
| 277 | + if (self::SEPARATOR !== $key && $key !== ($this->getName()."_token")) { |
|
| 278 | 278 | $data[$key] = (array_key_exists('value', $field)) ? $field["value"] : null; |
| 279 | 279 | } |
| 280 | 280 | } |
@@ -389,8 +389,8 @@ discard block |
||
| 389 | 389 | $model = $this->getHydratedModel(); |
| 390 | 390 | $model->save(); |
| 391 | 391 | $save = true; |
| 392 | - Logger::getInstance()->infoLog(get_class($this->model) . " guardado con id " . $this->model->getPrimaryKey()); |
|
| 393 | - } catch (\Exception $e) { |
|
| 392 | + Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey()); |
|
| 393 | + }catch (\Exception $e) { |
|
| 394 | 394 | Logger::getInstance()->errorLog($e->getMessage()); |
| 395 | 395 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 396 | 396 | } |
@@ -409,10 +409,10 @@ discard block |
||
| 409 | 409 | if (null === $value) { |
| 410 | 410 | $isEmpty = true; |
| 411 | 411 | // Empty Array check |
| 412 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 412 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 413 | 413 | $isEmpty = true; |
| 414 | 414 | // Empty string check |
| 415 | - } else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) { |
|
| 415 | + }else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) { |
|
| 416 | 416 | $isEmpty = true; |
| 417 | 417 | } |
| 418 | 418 | |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | && array_key_exists($key, $field) |
| 440 | 440 | && !array_key_exists('error', $field[$key]) |
| 441 | 441 | && !empty($field["value"]) |
| 442 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 442 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 443 | 443 | ) { |
| 444 | 444 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", _("El campo %s no tiene un formato válido"))); |
| 445 | 445 | $field["error"] = $this->getError($key); |
@@ -461,10 +461,10 @@ discard block |
||
| 461 | 461 | if (array_key_exists($key, $data[$form_name])) { |
| 462 | 462 | if (preg_match("/id/i", $key) && ($data[$form_name][$key] === 0 || $data[$form_name][$key] === "%" || $data[$form_name][$key] === "")) { |
| 463 | 463 | $field["value"] = null; |
| 464 | - } else { |
|
| 464 | + }else { |
|
| 465 | 465 | $field["value"] = $data[$form_name][$key]; |
| 466 | 466 | } |
| 467 | - } else { |
|
| 467 | + }else { |
|
| 468 | 468 | unset($field["value"]); |
| 469 | 469 | } |
| 470 | 470 | return array($data, $field); |
@@ -478,8 +478,8 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | private function hydrateModelField($key, $value) |
| 480 | 480 | { |
| 481 | - $setter = "set" . ucfirst($key); |
|
| 482 | - $getter = "get" . ucfirst($key); |
|
| 481 | + $setter = "set".ucfirst($key); |
|
| 482 | + $getter = "get".ucfirst($key); |
|
| 483 | 483 | if (method_exists($this->model, $setter)) { |
| 484 | 484 | if (method_exists($this->model, $getter)) { |
| 485 | 485 | $tmp = $this->model->$getter(); |
@@ -504,16 +504,16 @@ discard block |
||
| 504 | 504 | { |
| 505 | 505 | //Extraemos el dato del modelo relacionado si existe el getter |
| 506 | 506 | $method = null; |
| 507 | - if (array_key_exists('class_data', $field) && method_exists($val, "get" . $field["class_data"])) { |
|
| 508 | - $class_method = "get" . $field["class_data"]; |
|
| 507 | + if (array_key_exists('class_data', $field) && method_exists($val, "get".$field["class_data"])) { |
|
| 508 | + $class_method = "get".$field["class_data"]; |
|
| 509 | 509 | $class = $val->$class_method(); |
| 510 | - if (array_key_exists('class_id', $field) && method_exists($class, "get" . $field["class_id"])) { |
|
| 511 | - $method = "get" . $field["class_id"]; |
|
| 510 | + if (array_key_exists('class_id', $field) && method_exists($class, "get".$field["class_id"])) { |
|
| 511 | + $method = "get".$field["class_id"]; |
|
| 512 | 512 | $data[] = $class->$method(); |
| 513 | - } else { |
|
| 513 | + }else { |
|
| 514 | 514 | $data[] = $class->getPrimaryKey(); |
| 515 | 515 | } |
| 516 | - } else { |
|
| 516 | + }else { |
|
| 517 | 517 | $data[] = $val; |
| 518 | 518 | } |
| 519 | 519 | |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | private function extractModelFieldValue($key, $field) |
| 530 | 530 | { |
| 531 | 531 | //Extraemos el valor del campo del modelo |
| 532 | - $method = "get" . ucfirst($key); |
|
| 532 | + $method = "get".ucfirst($key); |
|
| 533 | 533 | $type = (array_key_exists('type', $field)) ? $field["type"] : "text"; |
| 534 | 534 | //Extraemos los campos del modelo |
| 535 | 535 | if (method_exists($this->model, $method)) { |
@@ -539,16 +539,16 @@ discard block |
||
| 539 | 539 | //Si es una relación múltiple |
| 540 | 540 | if ($value instanceof ObjectCollection) { |
| 541 | 541 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 542 | - } else { //O una relación unitaria |
|
| 542 | + }else { //O una relación unitaria |
|
| 543 | 543 | if (method_exists($value, "__toString")) { |
| 544 | 544 | $field["value"] = $value; |
| 545 | 545 | } elseif ($value instanceof \DateTime) { |
| 546 | 546 | $field["value"] = $value->format("Y-m-d H:i:s"); |
| 547 | - } else { |
|
| 547 | + }else { |
|
| 548 | 548 | $field["value"] = $value->getPrimaryKey(); |
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | - } else { |
|
| 551 | + }else { |
|
| 552 | 552 | $field["value"] = $value; |
| 553 | 553 | } |
| 554 | 554 | } |
@@ -212,7 +212,9 @@ |
||
| 212 | 212 | //Validamos los campos del formulario |
| 213 | 213 | if ($valid && count($this->fields) > 0) { |
| 214 | 214 | foreach ($this->fields as $key => &$field) { |
| 215 | - if ($key === $token_field || $key === self::SEPARATOR) continue; |
|
| 215 | + if ($key === $token_field || $key === self::SEPARATOR) { |
|
| 216 | + continue; |
|
| 217 | + } |
|
| 216 | 218 | list($field, $valid) = $this->checkFieldValidation($field, $key); |
| 217 | 219 | } |
| 218 | 220 | } |
@@ -8,7 +8,13 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | interface ControllerInterface |
| 10 | 10 | { |
| 11 | + /** |
|
| 12 | + * @return string|null |
|
| 13 | + */ |
|
| 11 | 14 | public function render($template, array $vars = [], $cookies = []); |
| 12 | 15 | |
| 16 | + /** |
|
| 17 | + * @return void |
|
| 18 | + */ |
|
| 13 | 19 | public function response($response, $type = 'text/html'); |
| 14 | 20 | } |
@@ -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 |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | { |
| 35 | 35 | $platform = trim(Config::getInstance()->get("platform_name")); |
| 36 | 36 | header('HTTP/1.1 401 Unauthorized'); |
| 37 | - header('WWW-Authenticate: Basic Realm="' . $platform . '"'); |
|
| 37 | + header('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
| 38 | 38 | echo _("Zona restringida"); |
| 39 | 39 | exit(); |
| 40 | 40 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $admin['class'] = 'primary'; |
| 76 | 76 | break; |
| 77 | 77 | } |
| 78 | - } else { |
|
| 78 | + }else { |
|
| 79 | 79 | $admin["class"] = "primary"; |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $logs = array(); |
| 93 | 93 | /** @var \SplFileInfo $file */ |
| 94 | 94 | foreach ($files as $file) { |
| 95 | - $size = $file->getSize() / 8 / 1024; |
|
| 95 | + $size = $file->getSize()/8/1024; |
|
| 96 | 96 | $time = date("c", $file->getMTime()); |
| 97 | 97 | $dateTime = new \DateTime($time); |
| 98 | 98 | if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
@@ -128,7 +128,7 @@ discard block |
||
| 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 | 134 | foreach ($content as &$line) { |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | break; |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - } catch (\Exception $e) { |
|
| 184 | + }catch (\Exception $e) { |
|
| 185 | 185 | $detail = array( |
| 186 | 186 | "type" => "danger", |
| 187 | 187 | ); |
@@ -61,11 +61,13 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | private function parseAdmins(&$admins) |
| 63 | 63 | { |
| 64 | - if (!empty($admins)) foreach ($admins as &$admin) { |
|
| 64 | + if (!empty($admins)) { |
|
| 65 | + foreach ($admins as &$admin) { |
|
| 65 | 66 | if (isset($admin["profile"])) { |
| 66 | 67 | switch ($admin["profile"]) { |
| 67 | 68 | case Security::MANAGER_ID_TOKEN: |
| 68 | 69 | $admin['class'] = 'warning'; |
| 70 | + } |
|
| 69 | 71 | break; |
| 70 | 72 | case Security::ADMIN_ID_TOKEN: |
| 71 | 73 | $admin['class'] = 'info'; |
@@ -95,7 +97,9 @@ discard block |
||
| 95 | 97 | $size = $file->getSize() / 8 / 1024; |
| 96 | 98 | $time = date("c", $file->getMTime()); |
| 97 | 99 | $dateTime = new \DateTime($time); |
| 98 | - if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
|
| 100 | + if (!isset($logs[$dateTime->format("Y")])) { |
|
| 101 | + $logs[$dateTime->format("Y")] = array(); |
|
| 102 | + } |
|
| 99 | 103 | $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array( |
| 100 | 104 | "filename" => $file->getFilename(), |
| 101 | 105 | "size" => round($size, 3) |
@@ -136,7 +140,9 @@ discard block |
||
| 136 | 140 | $detailLog[] = array_merge(array( |
| 137 | 141 | "log" => $line, |
| 138 | 142 | ), $detail); |
| 139 | - if (count($detailLog) >= 1000) break; |
|
| 143 | + if (count($detailLog) >= 1000) { |
|
| 144 | + break; |
|
| 145 | + } |
|
| 140 | 146 | } |
| 141 | 147 | $log = $detailLog; |
| 142 | 148 | } |
@@ -160,7 +166,9 @@ discard block |
||
| 160 | 166 | |
| 161 | 167 | $detail = json_decode($match[0][0], TRUE); |
| 162 | 168 | } |
| 163 | - if (empty($detail)) $detail = array(); |
|
| 169 | + if (empty($detail)) { |
|
| 170 | + $detail = array(); |
|
| 171 | + } |
|
| 164 | 172 | preg_match_all('/\>\ (.*):/i', $line, $match); |
| 165 | 173 | |
| 166 | 174 | $type = (isset($match[1][0])) ? $match[1][0] : ''; |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | )) |
| 38 | 38 | ->addButton('submit', _("Acceder como {{username}}")) |
| 39 | 39 | ->addButton("cancel", _("Cancelar"), "button", array( |
| 40 | - "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";", |
|
| 40 | + "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";", |
|
| 41 | 41 | "class" => "btn-link", |
| 42 | 42 | )); |
| 43 | 43 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | { |
| 63 | 63 | if (preg_match('/^asc$/i', $direction)) { |
| 64 | 64 | return Order::ASC; |
| 65 | - } else { |
|
| 65 | + }else { |
|
| 66 | 66 | return Order::DESC; |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -26,13 +26,13 @@ |
||
| 26 | 26 | { |
| 27 | 27 | $namespace = explode('\\', $this->getModelTableMap()); |
| 28 | 28 | $module = strtolower($namespace[0]); |
| 29 | - $secret = Config::getInstance()->get($module . '.api.secret'); |
|
| 29 | + $secret = Config::getInstance()->get($module.'.api.secret'); |
|
| 30 | 30 | if (NULL === $secret) { |
| 31 | 31 | $secret = Config::getInstance()->get("api.secret"); |
| 32 | 32 | } |
| 33 | 33 | if (NULL === $secret) { |
| 34 | 34 | $auth = TRUE; |
| 35 | - } else { |
|
| 35 | + }else { |
|
| 36 | 36 | $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN'); |
| 37 | 37 | if (array_key_exists('API_TOKEN', $this->query)) { |
| 38 | 38 | $token = $this->query['API_TOKEN']; |
@@ -30,16 +30,16 @@ |
||
| 30 | 30 | $scripts = $this->getNode("scripts"); |
| 31 | 31 | |
| 32 | 32 | //Creamos el parser |
| 33 | - $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\'' . $this->type . '\')') |
|
| 33 | + $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\''.$this->type.'\')') |
|
| 34 | 34 | ->raw(";\n"); |
| 35 | 35 | |
| 36 | 36 | //Asociamos el hash |
| 37 | - $compiler->write('$parser->setHash(\'' . $this->hash . '\')') |
|
| 37 | + $compiler->write('$parser->setHash(\''.$this->hash.'\')') |
|
| 38 | 38 | ->raw(";\n"); |
| 39 | 39 | |
| 40 | 40 | //Asociamos los ficheros |
| 41 | 41 | foreach ($scripts->getAttribute("value") as $value) { |
| 42 | - $compiler->write('$parser->addFile(\'' . $value . '\')')->raw(";\n"); |
|
| 42 | + $compiler->write('$parser->addFile(\''.$value.'\')')->raw(";\n"); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | //Procesamos los ficheros |
@@ -139,7 +139,7 @@ |
||
| 139 | 139 | $tmp = array(); |
| 140 | 140 | if (NULL === $node) { |
| 141 | 141 | $node = $value; |
| 142 | - } else { |
|
| 142 | + }else { |
|
| 143 | 143 | $tmp = $this->getTmpAttribute($node); |
| 144 | 144 | } |
| 145 | 145 | $tmp[] = $value->getAttribute("value"); |