| @@ -100,7 +100,7 @@ discard block | ||
| 100 | 100 |          if (count($pks) === 1) { | 
| 101 | 101 | $pks = array_keys($pks); | 
| 102 | 102 | return [ | 
| 103 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD | |
| 103 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD | |
| 104 | 104 | ]; | 
| 105 | 105 | } | 
| 106 | 106 |          if (count($pks) > 1) { | 
| @@ -108,9 +108,9 @@ discard block | ||
| 108 | 108 | $principal = ''; | 
| 109 | 109 |              $sep = 'CONCAT('; | 
| 110 | 110 |              foreach ($pks as $pk) { | 
| 111 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); | |
| 112 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); | |
| 113 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; | |
| 111 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); | |
| 112 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); | |
| 113 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; | |
| 114 | 114 | } | 
| 115 | 115 | $principal .= ')'; | 
| 116 | 116 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; | 
| @@ -137,10 +137,10 @@ discard block | ||
| 137 | 137 | $pks = ''; | 
| 138 | 138 | $sep = ''; | 
| 139 | 139 |          foreach ($tableMap->getPrimaryKeys() as $pk) { | 
| 140 | - $pks .= $sep . $pk->getFullyQualifiedName(); | |
| 140 | + $pks .= $sep.$pk->getFullyQualifiedName(); | |
| 141 | 141 | $sep = ', "|", '; | 
| 142 | 142 | } | 
| 143 | -        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; | |
| 143 | +        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; | |
| 144 | 144 | } | 
| 145 | 145 | |
| 146 | 146 | /** | 
| @@ -162,7 +162,7 @@ discard block | ||
| 162 | 162 | } | 
| 163 | 163 |              if (null !== $column) { | 
| 164 | 164 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; | 
| 165 | -            } else { | |
| 165 | +            }else { | |
| 166 | 166 | $this->addClassListName($tableMap); | 
| 167 | 167 | } | 
| 168 | 168 | } | 
| @@ -173,7 +173,7 @@ discard block | ||
| 173 | 173 | * @param $action | 
| 174 | 174 | * @throws ApiException | 
| 175 | 175 | */ | 
| 176 | - private function addExtraColumns(ModelCriteria &$query, $action) | |
| 176 | + private function addExtraColumns(ModelCriteria & $query, $action) | |
| 177 | 177 |      { | 
| 178 | 178 |          if (Api::API_ACTION_LIST === $action) { | 
| 179 | 179 | $this->addDefaultListField(); | 
| @@ -182,7 +182,7 @@ discard block | ||
| 182 | 182 |          if (!empty($this->extraColumns)) { | 
| 183 | 183 |              if (Config::getParam('api.extrafields.compat', true)) { | 
| 184 | 184 | $fields = array_values($this->extraColumns); | 
| 185 | -            } else { | |
| 185 | +            }else { | |
| 186 | 186 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); | 
| 187 | 187 |                  $fields = explode(',', $returnFields ?: ''); | 
| 188 | 188 | $fields[] = self::API_MODEL_KEY_FIELD; | 
| @@ -216,32 +216,32 @@ discard block | ||
| 216 | 216 | /** | 
| 217 | 217 | * @param ModelCriteria $query | 
| 218 | 218 | */ | 
| 219 | - protected function checkI18n(ModelCriteria &$query) | |
| 219 | + protected function checkI18n(ModelCriteria & $query) | |
| 220 | 220 |      { | 
| 221 | 221 | $this->extractApiLang(); | 
| 222 | 222 | $model = $this->getModelNamespace(); | 
| 223 | - $modelI18n = $model . 'I18n'; | |
| 223 | + $modelI18n = $model.'I18n'; | |
| 224 | 224 |          if (method_exists($query, 'useI18nQuery')) { | 
| 225 | 225 | $query->useI18nQuery($this->lang); | 
| 226 | 226 |              $modelParts = explode('\\', $modelI18n); | 
| 227 | - $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap'; | |
| 227 | + $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap'; | |
| 228 | 228 | /** @var TableMap $modelI18nTableMap */ | 
| 229 | 229 | $modelI18nTableMap = $i18nMapClass::getTableMap(); | 
| 230 | 230 |              foreach ($modelI18nTableMap->getColumns() as $columnMap) { | 
| 231 | 231 |                  if (!$columnMap->isPrimaryKey()) { | 
| 232 | 232 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); | 
| 233 | 233 |                  } elseif (!$columnMap->isForeignKey()) { | 
| 234 | -                    $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "' . $this->lang . '")', ApiHelper::getColumnMapName($columnMap)); | |
| 234 | +                    $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); | |
| 235 | 235 | } | 
| 236 | 236 | } | 
| 237 | 237 | } | 
| 238 | 238 | } | 
| 239 | 239 | |
| 240 | 240 |      protected function cleanData(array &$data) { | 
| 241 | -        foreach($data as $key => &$value) { | |
| 242 | -            if(is_array($value)) { | |
| 241 | +        foreach ($data as $key => &$value) { | |
| 242 | +            if (is_array($value)) { | |
| 243 | 243 | $this->cleanData($value); | 
| 244 | -            } else if(is_string($value)) { | |
| 244 | +            }else if (is_string($value)) { | |
| 245 | 245 | $value = I18nHelper::cleanHtmlAttacks($value); | 
| 246 | 246 | } | 
| 247 | 247 | } | 
| @@ -257,12 +257,12 @@ discard block | ||
| 257 | 257 | $model->fromArray($data, ApiHelper::getFieldTypes()); | 
| 258 | 258 | $tableMap = $this->getTableMap(); | 
| 259 | 259 |          try { | 
| 260 | -            if ($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) { | |
| 261 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); | |
| 260 | +            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) { | |
| 261 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); | |
| 262 | 262 | $i18NTableMap = $relateI18n->getLocalTable(); | 
| 263 | 263 |                  $model->setLocale(array_key_exists('Locale', $data) ? $data['Locale'] : (array_key_exists('locale', $data) ? $data['locale'] : Request::header(Api::HEADER_API_LANG, 'es_ES'))); | 
| 264 | 264 |                  foreach ($i18NTableMap->getColumns() as $columnMap) { | 
| 265 | - $method = 'set' . $columnMap->getPhpName(); | |
| 265 | + $method = 'set'.$columnMap->getPhpName(); | |
| 266 | 266 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); | 
| 267 | 267 | if (array_key_exists($dtoColumnName, $data) | 
| 268 | 268 | && method_exists($model, $method) | 
| @@ -271,7 +271,7 @@ discard block | ||
| 271 | 271 | } | 
| 272 | 272 | } | 
| 273 | 273 | } | 
| 274 | -        } catch (Exception $e) { | |
| 274 | +        }catch (Exception $e) { | |
| 275 | 275 | Logger::log($e->getMessage(), LOG_DEBUG); | 
| 276 | 276 | } | 
| 277 | 277 | } |