@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | protected function init() |
| 87 | 87 | { |
| 88 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) { |
|
| 88 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) { |
|
| 89 | 89 | $this->loadConfigData(); |
| 90 | 90 | } |
| 91 | 91 | return $this; |
@@ -201,10 +201,10 @@ discard block |
||
| 201 | 201 | $finalData = array_filter($finalData, function($key, $value) { |
| 202 | 202 | return in_array($key, self::$required, true) || !empty($value); |
| 203 | 203 | }, ARRAY_FILTER_USE_BOTH); |
| 204 | - $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT))); |
|
| 204 | + $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT))); |
|
| 205 | 205 | self::getInstance()->loadConfigData(); |
| 206 | 206 | $saved = true; |
| 207 | - } catch (ConfigException $e) { |
|
| 207 | + }catch (ConfigException $e) { |
|
| 208 | 208 | Logger::log($e->getMessage(), LOG_ERR); |
| 209 | 209 | } |
| 210 | 210 | return $saved; |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | public function loadConfigData() |
| 238 | 238 | { |
| 239 | - $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: []; |
|
| 239 | + $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: []; |
|
| 240 | 240 | $this->debug = array_key_exists('debug', $this->config) ? (bool)$this->config['debug'] : FALSE; |
| 241 | - if(array_key_exists('cache.var', $this->config)) { |
|
| 241 | + if (array_key_exists('cache.var', $this->config)) { |
|
| 242 | 242 | Security::getInstance()->setSessionKey('config.cache.var', $this->config['cache.var']); |
| 243 | 243 | } |
| 244 | 244 | } |
@@ -260,8 +260,8 @@ discard block |
||
| 260 | 260 | */ |
| 261 | 261 | public static function getParam($key, $defaultValue = null, $module = null) |
| 262 | 262 | { |
| 263 | - if(null !== $module) { |
|
| 264 | - return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue)); |
|
| 263 | + if (null !== $module) { |
|
| 264 | + return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue)); |
|
| 265 | 265 | } |
| 266 | 266 | $param = self::getInstance()->get($key); |
| 267 | 267 | return (null !== $param) ? $param : $defaultValue; |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | const TYPE_HTTP = 2; |
| 12 | 12 | |
| 13 | 13 | public static function parseRawData($type, $params) { |
| 14 | - switch($type) { |
|
| 14 | + switch ($type) { |
|
| 15 | 15 | default: |
| 16 | 16 | case self::TYPE_HTTP: |
| 17 | 17 | $parsedParams = http_build_query($params); |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | if (!defined('LOG_DIR')) { |
| 21 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 22 | - define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 21 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 22 | + define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | $args = func_get_args(); |
| 59 | 59 | list($logger, $debug, $path) = $this->setup($args); |
| 60 | - $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+'); |
|
| 60 | + $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+'); |
|
| 61 | 61 | if (is_resource($this->stream)) { |
| 62 | 62 | $this->addPushLogger($logger, $debug); |
| 63 | - } else { |
|
| 63 | + }else { |
|
| 64 | 64 | throw new ConfigException(t('Error creating logger')); |
| 65 | 65 | } |
| 66 | 66 | $this->logLevel = strtoupper(Config::getParam('log.level', 'NOTICE')); |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | private function createLoggerPath() |
| 142 | 142 | { |
| 143 | 143 | $logger = $this->setLoggerName(); |
| 144 | - $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m'); |
|
| 144 | + $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m'); |
|
| 145 | 145 | GeneratorHelper::createDir($path); |
| 146 | 146 | return $path; |
| 147 | 147 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | { |
| 88 | 88 | $headers = []; |
| 89 | 89 | foreach ($this->getHeaders() as $key => $value) { |
| 90 | - $headers[] = $key . ': ' . $value; |
|
| 90 | + $headers[] = $key.': '.$value; |
|
| 91 | 91 | } |
| 92 | 92 | $headers[self::PSFS_TRACK_HEADER] = Logger::getUid(); |
| 93 | 93 | if (count($headers)) { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | case Request::VERB_GET: |
| 118 | 118 | if (!empty($this->params)) { |
| 119 | 119 | $sep = false === strpos($this->getUrl(), '?') ? '?' : ''; |
| 120 | - $this->setUrl($this->getUrl() . $sep . http_build_query($this->getParams()), false); |
|
| 120 | + $this->setUrl($this->getUrl().$sep.http_build_query($this->getParams()), false); |
|
| 121 | 121 | } |
| 122 | 122 | break; |
| 123 | 123 | case Request::VERB_POST: |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | if ($this->isDebug() && is_resource($verbose)) { |
| 150 | 150 | $this->dumpVerboseLogs($verbose); |
| 151 | 151 | } |
| 152 | - Logger::log($this->getUrl() . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
| 152 | + Logger::log($this->getUrl().' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
| 153 | 153 | $this->info = array_merge($this->info, curl_getinfo($this->con)); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @return ParameterTrait |
| 50 | 50 | */ |
| 51 | 51 | public function dropParam($key) { |
| 52 | - if(array_key_exists($key, $this->params)) { |
|
| 52 | + if (array_key_exists($key, $this->params)) { |
|
| 53 | 53 | unset($this->params[$key]); |
| 54 | 54 | } |
| 55 | 55 | return $this; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @return mixed|null |
| 61 | 61 | */ |
| 62 | 62 | public function getParam($key) { |
| 63 | - if(array_key_exists($key, $this->params)) { |
|
| 63 | + if (array_key_exists($key, $this->params)) { |
|
| 64 | 64 | return $this->params[$key]; |
| 65 | 65 | } |
| 66 | 66 | return null; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * @return OptionTrait |
| 49 | 49 | */ |
| 50 | 50 | public function dropOption($key) { |
| 51 | - if(array_key_exists($key, $this->options)) { |
|
| 51 | + if (array_key_exists($key, $this->options)) { |
|
| 52 | 52 | unset($this->options[$key]); |
| 53 | 53 | } |
| 54 | 54 | return $this; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | * @return mixed|null |
| 60 | 60 | */ |
| 61 | 61 | public function getOption($key) { |
| 62 | - if(array_key_exists($key, $this->options)) { |
|
| 62 | + if (array_key_exists($key, $this->options)) { |
|
| 63 | 63 | return $this->options[$key]; |
| 64 | 64 | } |
| 65 | 65 | return null; |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | protected $isMultipart = false; |
| 73 | 73 | |
| 74 | 74 | protected function closeConnection() { |
| 75 | - if(null !== $this->con) { |
|
| 76 | - if(is_resource($this->con)) { |
|
| 75 | + if (null !== $this->con) { |
|
| 76 | + if (is_resource($this->con)) { |
|
| 77 | 77 | curl_close($this->con); |
| 78 | - } else { |
|
| 78 | + }else { |
|
| 79 | 79 | $this->setCon(null); |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $this->params = []; |
| 92 | 92 | $this->headers = []; |
| 93 | 93 | $this->debug = 'debug' === strtolower(Config::getParam('log.level', 'notice')); |
| 94 | - Logger::log('Context service for ' . static::class . ' cleared!'); |
|
| 94 | + Logger::log('Context service for '.static::class.' cleared!'); |
|
| 95 | 95 | $this->closeConnection(); |
| 96 | 96 | } |
| 97 | 97 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $this->clearContext(); |
| 101 | 101 | $con = curl_init($this->url); |
| 102 | - if(is_resource($con)) { |
|
| 102 | + if (is_resource($con)) { |
|
| 103 | 103 | $this->setCon($con); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | public function setUrl($url, $cleanContext = true) |
| 120 | 120 | { |
| 121 | 121 | $this->url = $url; |
| 122 | - if($cleanContext) { |
|
| 122 | + if ($cleanContext) { |
|
| 123 | 123 | $this->initialize(); |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | public function setIsJson($isJson = true) { |
| 186 | 186 | $this->isJson = $isJson; |
| 187 | - if($isJson) { |
|
| 187 | + if ($isJson) { |
|
| 188 | 188 | $this->setIsMultipart(false); |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | public function setIsMultipart($isMultipart = true) { |
| 203 | 203 | $this->isMultipart = $isMultipart; |
| 204 | - if($isMultipart) { |
|
| 204 | + if ($isMultipart) { |
|
| 205 | 205 | $this->setIsJson(false); |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | Logger::log('Configuration saved successful'); |
| 63 | 63 | Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente")); |
| 64 | 64 | Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true)); |
| 65 | - } else { |
|
| 65 | + }else { |
|
| 66 | 66 | throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos')); |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | if ($this->isAdmin()) { |
| 100 | 100 | return $this->redirect('admin'); |
| 101 | - } else { |
|
| 101 | + }else { |
|
| 102 | 102 | return Admin::staticAdminLogon($route); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -35,9 +35,9 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | public static function staticAdminLogon($route = null) |
| 37 | 37 | { |
| 38 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) { |
|
| 38 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) { |
|
| 39 | 39 | return AdminServices::getInstance()->setAdminHeaders(); |
| 40 | - } else { |
|
| 40 | + }else { |
|
| 41 | 41 | return UserController::showAdminManager(); |
| 42 | 42 | } |
| 43 | 43 | } |