@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $this->setStatusCode(Template::STATUS_OK); |
| 122 | 122 | break; |
| 123 | 123 | default: |
| 124 | - $this->setStatusCode('HTTP/1.0 ' .($status ?: 200)); |
|
| 124 | + $this->setStatusCode('HTTP/1.0 '.($status ?: 200)); |
|
| 125 | 125 | break; |
| 126 | 126 | } |
| 127 | 127 | return $this; |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | private function setReponseHeaders($contentType = 'text/html', array $cookies = array()) |
| 136 | 136 | { |
| 137 | 137 | $powered = Config::getParam('poweredBy', 'PSFS'); |
| 138 | - header('X-Powered-By: ' . $powered); |
|
| 138 | + header('X-Powered-By: '.$powered); |
|
| 139 | 139 | ResponseHelper::setStatusHeader($this->getStatusCode()); |
| 140 | 140 | ResponseHelper::setAuthHeaders($this->isPublicZone()); |
| 141 | 141 | ResponseHelper::setCookieHeaders($cookies); |
| 142 | - header('Content-type: ' . $contentType); |
|
| 142 | + header('Content-type: '.$contentType); |
|
| 143 | 143 | |
| 144 | 144 | } |
| 145 | 145 | |
@@ -152,20 +152,20 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function output($output = '', $contentType = 'text/html', array $cookies = array()) |
| 154 | 154 | { |
| 155 | - if(!self::isTest()) { |
|
| 155 | + if (!self::isTest()) { |
|
| 156 | 156 | Logger::log('Start output response'); |
| 157 | 157 | ob_start(); |
| 158 | 158 | $this->setReponseHeaders($contentType, $cookies); |
| 159 | - header('Content-length: ' . strlen($output)); |
|
| 160 | - header('CRC: ' . crc32($output)); |
|
| 159 | + header('Content-length: '.strlen($output)); |
|
| 160 | + header('CRC: '.crc32($output)); |
|
| 161 | 161 | |
| 162 | 162 | $needCache = Cache::needCache(); |
| 163 | 163 | $cache = Cache::getInstance(); |
| 164 | 164 | list($path, $cacheDataName) = $cache->getRequestCacheHash(); |
| 165 | 165 | if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) { |
| 166 | 166 | Logger::log('Saving output response into cache'); |
| 167 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output); |
|
| 168 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON); |
|
| 167 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output); |
|
| 168 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON); |
|
| 169 | 169 | } elseif (Request::getInstance()->getMethod() !== 'GET') { |
| 170 | 170 | $cache->flushCache(); |
| 171 | 171 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | ob_end_clean(); |
| 176 | 176 | Logger::log('End output response'); |
| 177 | 177 | $this->closeRender(); |
| 178 | - } else { |
|
| 178 | + }else { |
|
| 179 | 179 | return $output; |
| 180 | 180 | } |
| 181 | 181 | } |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | Logger::log('Close template render'); |
| 189 | 189 | $uri = Request::requestUri(); |
| 190 | 190 | Security::getInstance()->setSessionKey('lastRequest', array( |
| 191 | - 'url' => Request::getInstance()->getRootUrl() . $uri, |
|
| 191 | + 'url' => Request::getInstance()->getRootUrl().$uri, |
|
| 192 | 192 | 'ts' => microtime(true), |
| 193 | 193 | )); |
| 194 | 194 | Security::getInstance()->updateSession(); |
| 195 | - Logger::log('End request: ' . $uri, LOG_INFO); |
|
| 195 | + Logger::log('End request: '.$uri, LOG_INFO); |
|
| 196 | 196 | exit; |
| 197 | 197 | } |
| 198 | 198 | |
@@ -230,17 +230,17 @@ discard block |
||
| 230 | 230 | ///////////////////////////////////////////////////////////// |
| 231 | 231 | // Date in the past sets the value to already have been expired. |
| 232 | 232 | header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); |
| 233 | - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 233 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 234 | 234 | header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 |
| 235 | 235 | header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 |
| 236 | 236 | header('Pragma: no-cache'); |
| 237 | 237 | header('Expires: 0'); |
| 238 | 238 | header('Content-Transfer-Encoding: binary'); |
| 239 | - header('Content-type: ' . $content); |
|
| 240 | - header('Content-length: ' . strlen($data)); |
|
| 241 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
| 239 | + header('Content-type: '.$content); |
|
| 240 | + header('Content-length: '.strlen($data)); |
|
| 241 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
| 242 | 242 | header('Access-Control-Expose-Headers: Filename'); |
| 243 | - header('Filename: ' . $filename); |
|
| 243 | + header('Filename: '.$filename); |
|
| 244 | 244 | echo $data; |
| 245 | 245 | ob_flush(); |
| 246 | 246 | ob_end_clean(); |
@@ -83,9 +83,9 @@ |
||
| 83 | 83 | 'class' => 'btn-warning md-default', |
| 84 | 84 | 'icon' => 'fa-plus', |
| 85 | 85 | ]; |
| 86 | - if(Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | - $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));'; |
|
| 88 | - } else { |
|
| 86 | + if (Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | + $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));'; |
|
| 88 | + }else { |
|
| 89 | 89 | $add['ng-click'] = 'addNewField()'; |
| 90 | 90 | } |
| 91 | 91 | $this->addButton('submit', t('Guardar configuración'), 'submit', array( |
@@ -65,8 +65,8 @@ |
||
| 65 | 65 | $model = $this->getHydratedModel(); |
| 66 | 66 | $model->save(); |
| 67 | 67 | $save = true; |
| 68 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | - } catch (\Exception $e) { |
|
| 68 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | + }catch (\Exception $e) { |
|
| 70 | 70 | Logger::log($e->getMessage(), LOG_ERR); |
| 71 | 71 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 72 | 72 | } |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | public function add($name, array $value = []) |
| 28 | 28 | { |
| 29 | 29 | $this->fields[$name] = $value; |
| 30 | - $this->fields[$name]['name'] = $this->getName() . '['.$name.']'; |
|
| 31 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
| 30 | + $this->fields[$name]['name'] = $this->getName().'['.$name.']'; |
|
| 31 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
| 32 | 32 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
| 33 | 33 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
| 34 | 34 | return $this; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $data = array(); |
| 68 | 68 | if (count($this->fields) > 0) { |
| 69 | 69 | foreach ($this->fields as $key => $field) { |
| 70 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
| 70 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
| 71 | 71 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -115,10 +115,10 @@ discard block |
||
| 115 | 115 | if (array_key_exists($key, $data[$formName])) { |
| 116 | 116 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
| 117 | 117 | $field['value'] = null; |
| 118 | - } else { |
|
| 118 | + }else { |
|
| 119 | 119 | $field['value'] = $data[$formName][$key]; |
| 120 | 120 | } |
| 121 | - } else { |
|
| 121 | + }else { |
|
| 122 | 122 | unset($field['value']); |
| 123 | 123 | } |
| 124 | 124 | return array($data, $field); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | if (null === $value) { |
| 48 | 48 | $isEmpty = true; |
| 49 | 49 | // Empty Array check |
| 50 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 50 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 51 | 51 | $isEmpty = true; |
| 52 | 52 | // Empty string check |
| 53 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 53 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 54 | 54 | $isEmpty = true; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | && array_key_exists($key, $field) |
| 77 | 77 | && !array_key_exists('error', $field[$key]) |
| 78 | 78 | && !empty($field['value']) |
| 79 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 79 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 80 | 80 | ) { |
| 81 | 81 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido'))); |
| 82 | 82 | $field['error'] = $this->getError($key); |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | private function hydrateModelField($key, $value) |
| 49 | 49 | { |
| 50 | - $setter = 'set' . ucfirst($key); |
|
| 51 | - $getter = 'get' . ucfirst($key); |
|
| 50 | + $setter = 'set'.ucfirst($key); |
|
| 51 | + $getter = 'get'.ucfirst($key); |
|
| 52 | 52 | if (method_exists($this->model, $setter)) { |
| 53 | 53 | if (method_exists($this->model, $getter)) { |
| 54 | 54 | $tmp = $this->model->$getter(); |
@@ -72,16 +72,16 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | //Extraemos el dato del modelo relacionado si existe el getter |
| 74 | 74 | $method = null; |
| 75 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
| 76 | - $classMethod = 'get' . $field['class_data']; |
|
| 75 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
| 76 | + $classMethod = 'get'.$field['class_data']; |
|
| 77 | 77 | $class = $val->$classMethod(); |
| 78 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
| 79 | - $method = 'get' . $field['class_id']; |
|
| 78 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
| 79 | + $method = 'get'.$field['class_id']; |
|
| 80 | 80 | $data[] = $class->$method(); |
| 81 | - } else { |
|
| 81 | + }else { |
|
| 82 | 82 | $data[] = $class->getPrimaryKey(); |
| 83 | 83 | } |
| 84 | - } else { |
|
| 84 | + }else { |
|
| 85 | 85 | $data[] = $val; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | private function extractModelFieldValue($key, $field) |
| 134 | 134 | { |
| 135 | 135 | //Extraemos el valor del campo del modelo |
| 136 | - $method = 'get' . ucfirst($key); |
|
| 136 | + $method = 'get'.ucfirst($key); |
|
| 137 | 137 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
| 138 | 138 | //Extraemos los campos del modelo |
| 139 | 139 | if (method_exists($this->model, $method)) { |
@@ -143,16 +143,16 @@ discard block |
||
| 143 | 143 | //Si es una relación múltiple |
| 144 | 144 | if ($value instanceof ObjectCollection) { |
| 145 | 145 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 146 | - } else { //O una relación unitaria |
|
| 146 | + }else { //O una relación unitaria |
|
| 147 | 147 | if (method_exists($value, '__toString')) { |
| 148 | 148 | $field['value'] = $value; |
| 149 | 149 | } elseif ($value instanceof \DateTime) { |
| 150 | 150 | $field['value'] = $value->format('Y-m-d H:i:s'); |
| 151 | - } else { |
|
| 151 | + }else { |
|
| 152 | 152 | $field['value'] = $value->getPrimaryKey(); |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | - } else { |
|
| 155 | + }else { |
|
| 156 | 156 | $field['value'] = $value; |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | if ('' !== $hashOrig) { |
| 31 | 31 | $this->crfs = sha1($hashOrig); |
| 32 | - $this->add($this->getName() . '_token', array( |
|
| 32 | + $this->add($this->getName().'_token', array( |
|
| 33 | 33 | 'type' => 'hidden', |
| 34 | 34 | 'value' => $this->crfs, |
| 35 | 35 | )); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | public function isValid() |
| 44 | 44 | { |
| 45 | 45 | $valid = true; |
| 46 | - $tokenField = $this->getName() . '_token'; |
|
| 46 | + $tokenField = $this->getName().'_token'; |
|
| 47 | 47 | // Check crfs token |
| 48 | 48 | if (!$this->existsFormToken($tokenField)) { |
| 49 | 49 | $this->errors[$tokenField] = t('Formulario no válido'); |
@@ -22,15 +22,15 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | private static function mapResult(ActiveRecordInterface $model, array $data = []) { |
| 24 | 24 | $result = []; |
| 25 | - foreach($data as $key => $value) { |
|
| 25 | + foreach ($data as $key => $value) { |
|
| 26 | 26 | try { |
| 27 | 27 | $realValue = $model->getByName($key); |
| 28 | - } catch(\Exception $e) { |
|
| 28 | + }catch (\Exception $e) { |
|
| 29 | 29 | $realValue = $value; |
| 30 | 30 | } |
| 31 | - if(Api::API_MODEL_KEY_FIELD === $key) { |
|
| 31 | + if (Api::API_MODEL_KEY_FIELD === $key) { |
|
| 32 | 32 | $result[$key] = (integer)$realValue; |
| 33 | - } else { |
|
| 33 | + }else { |
|
| 34 | 34 | $result[$key] = $realValue; |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | $objTableMap = get_class($formatter->getTableMap()); |
| 56 | 56 | /** @var TableMapTrait $objTableMap */ |
| 57 | 57 | $objData = $data; |
| 58 | - foreach($objTableMap::getFieldNames() as $field) { |
|
| 59 | - if(!array_key_exists($field, $objData)) { |
|
| 58 | + foreach ($objTableMap::getFieldNames() as $field) { |
|
| 59 | + if (!array_key_exists($field, $objData)) { |
|
| 60 | 60 | $objData[$field] = null; |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | $obj = @$formatter->getAllObjectsFromRow($objData); |
| 64 | 64 | $result = self::mapResult($obj, $data); |
| 65 | - if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 65 | + if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 66 | 66 | unset($result[$modelPk->getPhpName()]); |
| 67 | 67 | } |
| 68 | 68 | return $result; |
@@ -73,11 +73,11 @@ discard block |
||
| 73 | 73 | * @return string |
| 74 | 74 | */ |
| 75 | 75 | public static function getColumnMapName(ColumnMap $field) { |
| 76 | - switch(self::getFieldTypes()) { |
|
| 76 | + switch (self::getFieldTypes()) { |
|
| 77 | 77 | default: |
| 78 | 78 | case 'UpperCamelCase': |
| 79 | 79 | case TableMap::TYPE_PHPNAME: |
| 80 | - $columnName =$field->getPhpName(); |
|
| 80 | + $columnName = $field->getPhpName(); |
|
| 81 | 81 | break; |
| 82 | 82 | case 'camelCase': |
| 83 | 83 | case 'lowerCamelCase': |
@@ -42,10 +42,10 @@ discard block |
||
| 42 | 42 | $array['fields'][] = $field->__toArray(); |
| 43 | 43 | } |
| 44 | 44 | usort($array['fields'], function($fieldA, $fieldB) { |
| 45 | - if((bool)$fieldA['required'] !== (bool)$fieldB['required']) { |
|
| 46 | - if((bool)$fieldA['required']) { |
|
| 45 | + if ((bool)$fieldA['required'] !== (bool)$fieldB['required']) { |
|
| 46 | + if ((bool)$fieldA['required']) { |
|
| 47 | 47 | return -1; |
| 48 | - } else { |
|
| 48 | + }else { |
|
| 49 | 49 | return 1; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | return ($aOrder < $bOrder) ? -1 : 1; |
| 58 | 58 | }); |
| 59 | - foreach($this->actions as $action) { |
|
| 59 | + foreach ($this->actions as $action) { |
|
| 60 | 60 | $array['actions'][] = $action->__toArray(); |
| 61 | 61 | } |
| 62 | 62 | return $array; |