@@ -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 | } |
@@ -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 | } |
@@ -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 | |
@@ -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 t('Zona restringida'); |
| 38 | 38 | exit(); |
| 39 | 39 | } |
@@ -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 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $logs = array(); |
| 94 | 94 | /** @var \SplFileInfo $file */ |
| 95 | 95 | foreach ($files as $file) { |
| 96 | - $size = $file->getSize() / 8 / 1024; |
|
| 96 | + $size = $file->getSize()/8/1024; |
|
| 97 | 97 | $time = date('c', $file->getMTime()); |
| 98 | 98 | $dateTime = new \DateTime($time); |
| 99 | 99 | if (!isset($logs[$dateTime->format('Y')])) { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $files->files()->in(LOG_DIR)->name($selectedLog); |
| 123 | 123 | $file = $match = null; |
| 124 | 124 | $log = array(); |
| 125 | - foreach($files as $item) { |
|
| 125 | + foreach ($files as $item) { |
|
| 126 | 126 | $file = $item; |
| 127 | 127 | $match = $item; |
| 128 | 128 | break; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $time = date('c', $file->getMTime()); |
| 133 | 133 | $dateTime = new \DateTime($time); |
| 134 | 134 | $monthOpen = $dateTime->format('m'); |
| 135 | - $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename()); |
|
| 135 | + $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename()); |
|
| 136 | 136 | krsort($content); |
| 137 | 137 | $detailLog = array(); |
| 138 | 138 | foreach ($content as &$line) { |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | break; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - } catch (\Exception $e) { |
|
| 193 | + }catch (\Exception $e) { |
|
| 194 | 194 | $detail = [ |
| 195 | 195 | 'type' => 'danger', |
| 196 | 196 | ]; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $routes = []; |
| 33 | 33 | foreach ($systemRoutes as $params) { |
| 34 | - if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) { |
|
| 34 | + if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) { |
|
| 35 | 35 | $module = strtoupper($params['module']); |
| 36 | 36 | $mode = $params['visible'] ? 'visible' : 'hidden'; |
| 37 | 37 | $routes[$module][$mode][] = [ |
@@ -41,11 +41,11 @@ discard block |
||
| 41 | 41 | ]; |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | - foreach($routes as $module => &$route) { |
|
| 45 | - if(array_key_exists('visible', $route)) { |
|
| 44 | + foreach ($routes as $module => &$route) { |
|
| 45 | + if (array_key_exists('visible', $route)) { |
|
| 46 | 46 | uasort($route['visible'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel'); |
| 47 | 47 | } |
| 48 | - if(array_key_exists('hidden', $route)) { |
|
| 48 | + if (array_key_exists('hidden', $route)) { |
|
| 49 | 49 | uasort($route['hidden'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel'); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | unset($_SERVER["PHP_AUTH_USER"]); |
| 41 | 41 | unset($_SERVER["PHP_AUTH_PW"]); |
| 42 | 42 | header_remove("Authorization"); |
| 43 | - } elseif(!self::isTest()) { |
|
| 43 | + } elseif (!self::isTest()) { |
|
| 44 | 44 | header('Authorization:'); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -68,9 +68,9 @@ discard block |
||
| 68 | 68 | Logger::log('Adding debug headers to render response'); |
| 69 | 69 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
| 70 | 70 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 71 | - header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
| 72 | - header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
| 73 | - header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
| 71 | + header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
| 72 | + header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
| 73 | + header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | return $vars; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
| 34 | 34 | ) { |
| 35 | 35 | if (!self::isTest() && |
| 36 | - null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
| 36 | + null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
| 37 | 37 | throw new AdminCredentialsException(); |
| 38 | 38 | } |
| 39 | 39 | if (!Security::getInstance()->checkAdmin()) { |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | $token = ''; |
| 54 | 54 | $ct = strlen($ts); |
| 55 | 55 | for ($i = 0; $i < $ct; $i++) { |
| 56 | - $token = substr($hash, $i, 1) . |
|
| 57 | - substr($ts, $i, 1) . |
|
| 56 | + $token = substr($hash, $i, 1). |
|
| 57 | + substr($ts, $i, 1). |
|
| 58 | 58 | $token; |
| 59 | 59 | } |
| 60 | 60 | return $token; |
@@ -72,16 +72,16 @@ discard block |
||
| 72 | 72 | $charsLength = strlen(self::RAND_SEP) - 1; |
| 73 | 73 | $tsLength = strlen($ts); |
| 74 | 74 | $i = 0; |
| 75 | - $ct = ceil($hashRest / 4); |
|
| 76 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 77 | - while(false !== $part) { |
|
| 78 | - $mixedToken .= $part . |
|
| 79 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
| 75 | + $ct = ceil($hashRest/4); |
|
| 76 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 77 | + while (false !== $part) { |
|
| 78 | + $mixedToken .= $part. |
|
| 79 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
| 80 | 80 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
| 81 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 81 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 82 | 82 | $i++; |
| 83 | 83 | } |
| 84 | - return $mixedToken . $token; |
|
| 84 | + return $mixedToken.$token; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | private static function getTs($isOdd = null) { |
| 92 | 92 | $ts = time(); |
| 93 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
| 94 | - if(false === $isOdd && !$tsIsOdd) { |
|
| 93 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
| 94 | + if (false === $isOdd && !$tsIsOdd) { |
|
| 95 | 95 | $ts--; |
| 96 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
| 96 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
| 97 | 97 | $ts--; |
| 98 | 98 | } |
| 99 | 99 | return $ts; |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | $partToken = ''; |
| 126 | 126 | $ts = ''; |
| 127 | 127 | $part = strrev($part); |
| 128 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 129 | - if($i % 2 == 0) { |
|
| 128 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 129 | + if ($i%2 == 0) { |
|
| 130 | 130 | $ts .= substr($part, $i, 1); |
| 131 | - } else { |
|
| 131 | + }else { |
|
| 132 | 132 | $partToken .= substr($part, $i, 1); |
| 133 | 133 | } |
| 134 | 134 | } |
@@ -143,11 +143,11 @@ discard block |
||
| 143 | 143 | private static function parseTokenParts(array $parts) { |
| 144 | 144 | $token = ''; |
| 145 | 145 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
| 146 | - if($ts > 0) { |
|
| 147 | - foreach($parts as $part) { |
|
| 146 | + if ($ts > 0) { |
|
| 147 | + foreach ($parts as $part) { |
|
| 148 | 148 | $token .= $part; |
| 149 | 149 | } |
| 150 | - $token = $partToken . $token; |
|
| 150 | + $token = $partToken.$token; |
|
| 151 | 151 | } |
| 152 | 152 | return [$token, $ts]; |
| 153 | 153 | } |
@@ -175,8 +175,8 @@ discard block |
||
| 175 | 175 | * @return array |
| 176 | 176 | */ |
| 177 | 177 | private static function extractTokenParts($token) { |
| 178 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 179 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
| 178 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 179 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
| 180 | 180 | } |
| 181 | 181 | return array_unique(explode('||', $token)); |
| 182 | 182 | } |