@@ -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 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public static function parseRawData($type, array $params = []) { |
| 18 | - switch($type) { |
|
| 18 | + switch ($type) { |
|
| 19 | 19 | default: |
| 20 | 20 | case self::TYPE_HTTP: |
| 21 | 21 | $parsedParams = http_build_query($params); |
@@ -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 | |
@@ -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 | ]; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | protected function getTmpAttribute($node = null) |
| 115 | 115 | { |
| 116 | 116 | $tmp = []; |
| 117 | - if(null !== $node) { |
|
| 117 | + if (null !== $node) { |
|
| 118 | 118 | $tmp = $node->getAttribute('value'); |
| 119 | 119 | if (!is_array($tmp)) { |
| 120 | 120 | $tmp = [$tmp]; |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | $tmp = []; |
| 137 | 137 | if (null === $node) { |
| 138 | 138 | $node = $value; |
| 139 | - } else { |
|
| 139 | + }else { |
|
| 140 | 140 | $tmp = $this->getTmpAttribute($node); |
| 141 | 141 | } |
| 142 | - if(null !== $node) { |
|
| 142 | + if (null !== $node) { |
|
| 143 | 143 | $tmp[] = $value->getAttribute('value'); |
| 144 | 144 | } |
| 145 | 145 | return [$tmp, $node]; |
@@ -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 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function generateModule() |
| 36 | 36 | { |
| 37 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
| 37 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
| 38 | 38 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 39 | 39 | $form = new ModuleForm(); |
| 40 | 40 | $form->build(); |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
| 66 | 66 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente"))); |
| 67 | 67 | // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
| 68 | - } catch (\Exception $e) { |
|
| 69 | - Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
| 68 | + }catch (\Exception $e) { |
|
| 69 | + Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
| 70 | 70 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -77,14 +77,14 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public static function createRoot($path = WEB_DIR, OutputInterface $output = null) { |
| 79 | 79 | |
| 80 | - if(null === $output) { |
|
| 80 | + if (null === $output) { |
|
| 81 | 81 | $output = new ConsoleOutput(); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | GeneratorHelper::createDir($path); |
| 85 | 85 | $paths = array("js", "css", "img", "media", "font"); |
| 86 | 86 | foreach ($paths as $htmlPath) { |
| 87 | - GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath); |
|
| 87 | + GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | // Generates the root needed files |
@@ -96,18 +96,18 @@ discard block |
||
| 96 | 96 | 'robots' => 'robots.txt', |
| 97 | 97 | ]; |
| 98 | 98 | foreach ($files as $templates => $filename) { |
| 99 | - $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig'); |
|
| 100 | - if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) { |
|
| 101 | - $output->writeln('Can\t create the file ' . $filename); |
|
| 102 | - } else { |
|
| 103 | - $output->writeln($filename . ' created successfully'); |
|
| 99 | + $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig'); |
|
| 100 | + if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) { |
|
| 101 | + $output->writeln('Can\t create the file '.$filename); |
|
| 102 | + }else { |
|
| 103 | + $output->writeln($filename.' created successfully'); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | //Export base locale translations |
| 108 | - if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) { |
|
| 109 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 110 | - GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 108 | + if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) { |
|
| 109 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 110 | + GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | \ No newline at end of file |