@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $this->success = $result; |
| 44 | 44 | $this->total = $total ?: (is_array($data) ? count($data) : 0); |
| 45 | 45 | $this->pages = $pages; |
| 46 | - if(null !== $message) { |
|
| 46 | + if (null !== $message) { |
|
| 47 | 47 | $this->message = $message; |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -48,14 +48,14 @@ |
||
| 48 | 48 | /* @var $file SplFileInfo */ |
| 49 | 49 | foreach ($finder as $file) { |
| 50 | 50 | $path = $file->getRealPath(); |
| 51 | - if(!in_array($path, $loaded_files)) { |
|
| 51 | + if (!in_array($path, $loaded_files)) { |
|
| 52 | 52 | $loaded_files[] = $path; |
| 53 | 53 | require_once($path); |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | -if(!function_exists('t')) { |
|
| 58 | +if (!function_exists('t')) { |
|
| 59 | 59 | function t($message, $key = null, $reload = false) { |
| 60 | 60 | return CustomTranslateExtension::_($message, $key, $reload); |
| 61 | 61 | } |
@@ -34,9 +34,10 @@ |
||
| 34 | 34 | function getallheaders() |
| 35 | 35 | { |
| 36 | 36 | $headers = []; |
| 37 | - foreach ($_SERVER as $h => $v) |
|
| 38 | - if (preg_match('/HTTP_(.+)/', $h, $hp)) { |
|
| 37 | + foreach ($_SERVER as $h => $v) { |
|
| 38 | + if (preg_match('/HTTP_(.+)/', $h, $hp)) { |
|
| 39 | 39 | $headers[$hp[1]] = $v; |
| 40 | + } |
|
| 40 | 41 | } |
| 41 | 42 | return $headers; |
| 42 | 43 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | public static function dropInstance() { |
| 42 | 42 | $class = static::class; |
| 43 | - if(isset(self::$instance[$class])) { |
|
| 43 | + if (isset(self::$instance[$class])) { |
|
| 44 | 44 | self::$instance[$class] = null; |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | foreach ($domains as $domain => $routes) { |
| 32 | 32 | $pDomain = str_replace('@', '', $domain); |
| 33 | 33 | $pDomain = str_replace('/', '', $pDomain); |
| 34 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
| 34 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
| 35 | 35 | } |
| 36 | 36 | return $this->json($response); |
| 37 | 37 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function config() |
| 47 | 47 | { |
| 48 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
| 48 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
| 49 | 49 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 50 | 50 | $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig()); |
| 51 | 51 | $form->build(); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente")); |
| 84 | 84 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
| 85 | - } else { |
|
| 85 | + }else { |
|
| 86 | 86 | throw new \HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function init() |
| 14 | 14 | { |
| 15 | - if(!Security::getInstance()->isLogged()) { |
|
| 15 | + if (!Security::getInstance()->isLogged()) { |
|
| 16 | 16 | throw new ApiException(t('Resource not authorized'), 401); |
| 17 | 17 | } |
| 18 | 18 | parent::init(); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | $this->con = Propel::getConnection($tableMap::DATABASE_NAME); |
| 34 | 34 | $this->con->beginTransaction(); |
| 35 | - if(method_exists($this->con, 'useDebug')) { |
|
| 35 | + if (method_exists($this->con, 'useDebug')) { |
|
| 36 | 36 | Logger::log('Enabling debug queries mode', LOG_INFO); |
| 37 | 37 | $this->con->useDebug(Config::getParam('debug')); |
| 38 | 38 | } |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | protected function closeTransaction($status) |
| 47 | 47 | { |
| 48 | - if(null !== $this->con) { |
|
| 48 | + if (null !== $this->con) { |
|
| 49 | 49 | $this->traceDebugQuery(); |
| 50 | 50 | if (null !== $this->con && $this->con->inTransaction()) { |
| 51 | 51 | if ($status === 200) { |
| 52 | 52 | $this->con->commit(); |
| 53 | - } else { |
|
| 53 | + }else { |
|
| 54 | 54 | $this->con->rollBack(); |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | protected function traceDebugQuery() |
| 65 | 65 | { |
| 66 | 66 | if (Config::getParam('debug')) { |
| 67 | - Logger::log($this->con->getLastExecutedQuery()?: 'Empty Query', LOG_DEBUG); |
|
| 67 | + Logger::log($this->con->getLastExecutedQuery() ?: 'Empty Query', LOG_DEBUG); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | * Checks if the connection has a transaction initialized |
| 73 | 73 | */ |
| 74 | 74 | protected function checkTransaction() { |
| 75 | - if(null !== $this->con && !$this->con->inTransaction()) { |
|
| 75 | + if (null !== $this->con && !$this->con->inTransaction()) { |
|
| 76 | 76 | $this->con->beginTransaction(); |
| 77 | 77 | } |
| 78 | - if(null !== $this->con && $this->con->inTransaction()) { |
|
| 78 | + if (null !== $this->con && $this->con->inTransaction()) { |
|
| 79 | 79 | $this->items++; |
| 80 | 80 | } |
| 81 | - if($this->items >= Config::getParam('api.block.limit', 1000)) { |
|
| 81 | + if ($this->items >= Config::getParam('api.block.limit', 1000)) { |
|
| 82 | 82 | $this->con->commit(); |
| 83 | 83 | $this->items = 0; |
| 84 | 84 | } |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $filePath = ''; |
| 41 | 41 | if (!file_exists($filePath)) { |
| 42 | - $filePath = BASE_DIR . $string; |
|
| 42 | + $filePath = BASE_DIR.$string; |
|
| 43 | 43 | } |
| 44 | 44 | $filenamePath = AssetsParser::findDomainPath($string, $filePath); |
| 45 | 45 | |
| 46 | 46 | $filePath = self::processAsset($string, $name, $return, $filenamePath); |
| 47 | 47 | $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl()); |
| 48 | - $returnPath = empty($name) ? $basePath . '/' . $filePath : $name; |
|
| 48 | + $returnPath = empty($name) ? $basePath.'/'.$filePath : $name; |
|
| 49 | 49 | return $return ? $returnPath : ''; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $router = Router::getInstance(); |
| 63 | 63 | try { |
| 64 | 64 | return $router->getRoute($path, $absolute, $params); |
| 65 | - } catch (\Exception $e) { |
|
| 65 | + }catch (\Exception $e) { |
|
| 66 | 66 | return $router->getRoute('', $absolute, $params); |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | { |
| 206 | 206 | $data = file_get_contents($filenamePath); |
| 207 | 207 | if (!empty($name)) { |
| 208 | - file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
| 208 | + file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
| 209 | 209 | }else { |
| 210 | - file_put_contents($base . $filePath, $data); |
|
| 210 | + file_put_contents($base.$filePath, $data); |
|
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | |
@@ -226,9 +226,9 @@ discard block |
||
| 226 | 226 | if (file_exists($filenamePath)) { |
| 227 | 227 | list($base, $htmlBase, $filePath) = AssetsParser::calculateAssetPath($string, $name, $return, $filenamePath); |
| 228 | 228 | //Creamos el directorio si no existe |
| 229 | - GeneratorHelper::createDir($base . $htmlBase); |
|
| 229 | + GeneratorHelper::createDir($base.$htmlBase); |
|
| 230 | 230 | //Si se ha modificado |
| 231 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) { |
|
| 231 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) { |
|
| 232 | 232 | if ($htmlBase === 'css') { |
| 233 | 233 | self::processCssLines($filenamePath); |
| 234 | 234 | } |
@@ -206,7 +206,7 @@ |
||
| 206 | 206 | $data = file_get_contents($filenamePath); |
| 207 | 207 | if (!empty($name)) { |
| 208 | 208 | file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
| 209 | - }else { |
|
| 209 | + } else { |
|
| 210 | 210 | file_put_contents($base . $filePath, $data); |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -45,10 +45,10 @@ discard block |
||
| 45 | 45 | if (!headers_sent()) { |
| 46 | 46 | // TODO include this headers in Template class output method |
| 47 | 47 | header('Access-Control-Allow-Credentials: true'); |
| 48 | - header('Access-Control-Allow-Origin: ' . Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
| 48 | + header('Access-Control-Allow-Origin: '.Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
| 49 | 49 | header('Vary: Origin'); |
| 50 | 50 | header('Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS'); |
| 51 | - header('Access-Control-Allow-Headers: ' . implode(', ', self::getCorsHeaders())); |
|
| 51 | + header('Access-Control-Allow-Headers: '.implode(', ', self::getCorsHeaders())); |
|
| 52 | 52 | } |
| 53 | 53 | if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) { |
| 54 | 54 | Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | return $ip; |
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | - } else { |
|
| 81 | + }else { |
|
| 82 | 82 | if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
| 83 | 83 | return $_SERVER['HTTP_X_FORWARDED_FOR']; |
| 84 | 84 | } |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | protected function hydrateBulkRequest() { |
| 97 | 97 | $class = new \ReflectionClass($this->getModelNamespace()); |
| 98 | 98 | $this->list = []; |
| 99 | - foreach($this->data as $item) { |
|
| 100 | - if(is_array($item)) { |
|
| 101 | - if(count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
| 99 | + foreach ($this->data as $item) { |
|
| 100 | + if (is_array($item)) { |
|
| 101 | + if (count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
| 102 | 102 | /** @var ActiveRecordInterface $model */ |
| 103 | 103 | $model = $class->newInstance(); |
| 104 | 104 | $this->hydrateModelFromRequest($model, $item); |
| 105 | 105 | $this->list[] = $model; |
| 106 | - } else { |
|
| 107 | - Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items')); |
|
| 106 | + }else { |
|
| 107 | + Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items')); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | protected function saveBulk() { |
| 117 | 117 | $tablemap = $this->getTableMap(); |
| 118 | - foreach($this->list as &$model) { |
|
| 118 | + foreach ($this->list as &$model) { |
|
| 119 | 119 | $con = Propel::getWriteConnection($tablemap::DATABASE_NAME); |
| 120 | 120 | try { |
| 121 | 121 | $model->save($con); |
| 122 | 122 | $con->commit(); |
| 123 | - } catch(\Exception $e) { |
|
| 123 | + }catch (\Exception $e) { |
|
| 124 | 124 | Logger::log($e->getMessage(), LOG_ERR, $model->toArray()); |
| 125 | 125 | $con->rollBack(); |
| 126 | 126 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | protected function exportList() { |
| 134 | 134 | $list = []; |
| 135 | 135 | /** @var ActiveRecordInterface $item */ |
| 136 | - foreach($this->list as $item) { |
|
| 136 | + foreach ($this->list as $item) { |
|
| 137 | 137 | $list[] = $item->toArray(); |
| 138 | 138 | } |
| 139 | 139 | return $list; |
@@ -157,18 +157,18 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | protected function findPk(ModelCriteria $query, $primaryKey) { |
| 159 | 159 | $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey)); |
| 160 | - if(count($pks) === 1 && !empty($pks[0])) { |
|
| 160 | + if (count($pks) === 1 && !empty($pks[0])) { |
|
| 161 | 161 | $query->filterByPrimaryKey($pks[0]); |
| 162 | - } else { |
|
| 162 | + }else { |
|
| 163 | 163 | $item = 0; |
| 164 | - foreach($this->getPkDbName() as $phpName) { |
|
| 164 | + foreach ($this->getPkDbName() as $phpName) { |
|
| 165 | 165 | try { |
| 166 | 166 | $query->filterBy($phpName, $pks[$item]); |
| 167 | 167 | $item++; |
| 168 | - if($item >= count($pks)) { |
|
| 168 | + if ($item >= count($pks)) { |
|
| 169 | 169 | break; |
| 170 | 170 | } |
| 171 | - } catch(\Exception $e) { |
|
| 171 | + }catch (\Exception $e) { |
|
| 172 | 172 | Logger::log($e->getMessage(), LOG_DEBUG); |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -198,8 +198,8 @@ discard block |
||
| 198 | 198 | try { |
| 199 | 199 | $query = $this->prepareQuery(); |
| 200 | 200 | $this->model = $this->findPk($query, $primaryKey); |
| 201 | - } catch (\Exception $e) { |
|
| 202 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 201 | + }catch (\Exception $e) { |
|
| 202 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |