@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | //Generating the templates translations |
| 43 | 43 | $translations = $this->tpl->regenerateTemplates(); |
| 44 | 44 | |
| 45 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 46 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 45 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 46 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 47 | 47 | |
| 48 | 48 | //xgettext localizations |
| 49 | 49 | $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale)); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $translations = array_merge($translations, GeneratorService::findTranslations(CACHE_DIR, $locale)); |
| 52 | 52 | |
| 53 | 53 | $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo"; |
| 54 | - $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo'); |
|
| 54 | + $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo'); |
|
| 55 | 55 | return $this->render('translations.html.twig', array( |
| 56 | 56 | 'translations' => $translations, |
| 57 | 57 | )); |
@@ -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', _('Guardar configuración'), 'submit', array( |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | public function add($name, array $value = array()) |
| 70 | 70 | { |
| 71 | 71 | $this->fields[$name] = $value; |
| 72 | - $this->fields[$name]['name'] = $this->getName() . '['.$name.']'; |
|
| 73 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
| 72 | + $this->fields[$name]['name'] = $this->getName().'['.$name.']'; |
|
| 73 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
| 74 | 74 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
| 75 | 75 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
| 76 | 76 | return $this; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | if ('' !== $hashOrig) { |
| 135 | 135 | $this->crfs = sha1($hashOrig); |
| 136 | - $this->add($this->getName() . '_token', array( |
|
| 136 | + $this->add($this->getName().'_token', array( |
|
| 137 | 137 | 'type' => 'hidden', |
| 138 | 138 | 'value' => $this->crfs, |
| 139 | 139 | )); |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | public function isValid() |
| 203 | 203 | { |
| 204 | 204 | $valid = true; |
| 205 | - $tokenField = $this->getName() . '_token'; |
|
| 205 | + $tokenField = $this->getName().'_token'; |
|
| 206 | 206 | //Controlamos CSRF token |
| 207 | 207 | if (!$this->existsFormToken($tokenField)) { |
| 208 | 208 | $this->errors[$tokenField] = t('Formulario no válido'); |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $data = array(); |
| 277 | 277 | if (count($this->fields) > 0) { |
| 278 | 278 | foreach ($this->fields as $key => $field) { |
| 279 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
| 279 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
| 280 | 280 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
| 281 | 281 | } |
| 282 | 282 | } |
@@ -390,8 +390,8 @@ discard block |
||
| 390 | 390 | $model = $this->getHydratedModel(); |
| 391 | 391 | $model->save(); |
| 392 | 392 | $save = true; |
| 393 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
| 394 | - } catch (\Exception $e) { |
|
| 393 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
| 394 | + }catch (\Exception $e) { |
|
| 395 | 395 | Logger::log($e->getMessage(), LOG_ERR); |
| 396 | 396 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 397 | 397 | } |
@@ -410,10 +410,10 @@ discard block |
||
| 410 | 410 | if (null === $value) { |
| 411 | 411 | $isEmpty = true; |
| 412 | 412 | // Empty Array check |
| 413 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 413 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 414 | 414 | $isEmpty = true; |
| 415 | 415 | // Empty string check |
| 416 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 416 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 417 | 417 | $isEmpty = true; |
| 418 | 418 | } |
| 419 | 419 | |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | && array_key_exists($key, $field) |
| 441 | 441 | && !array_key_exists('error', $field[$key]) |
| 442 | 442 | && !empty($field['value']) |
| 443 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 443 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 444 | 444 | ) { |
| 445 | 445 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido'))); |
| 446 | 446 | $field['error'] = $this->getError($key); |
@@ -462,10 +462,10 @@ discard block |
||
| 462 | 462 | if (array_key_exists($key, $data[$formName])) { |
| 463 | 463 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
| 464 | 464 | $field['value'] = null; |
| 465 | - } else { |
|
| 465 | + }else { |
|
| 466 | 466 | $field['value'] = $data[$formName][$key]; |
| 467 | 467 | } |
| 468 | - } else { |
|
| 468 | + }else { |
|
| 469 | 469 | unset($field['value']); |
| 470 | 470 | } |
| 471 | 471 | return array($data, $field); |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | private function hydrateModelField($key, $value) |
| 481 | 481 | { |
| 482 | - $setter = 'set' . ucfirst($key); |
|
| 483 | - $getter = 'get' . ucfirst($key); |
|
| 482 | + $setter = 'set'.ucfirst($key); |
|
| 483 | + $getter = 'get'.ucfirst($key); |
|
| 484 | 484 | if (method_exists($this->model, $setter)) { |
| 485 | 485 | if (method_exists($this->model, $getter)) { |
| 486 | 486 | $tmp = $this->model->$getter(); |
@@ -505,16 +505,16 @@ discard block |
||
| 505 | 505 | { |
| 506 | 506 | //Extraemos el dato del modelo relacionado si existe el getter |
| 507 | 507 | $method = null; |
| 508 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
| 509 | - $classMethod = 'get' . $field['class_data']; |
|
| 508 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
| 509 | + $classMethod = 'get'.$field['class_data']; |
|
| 510 | 510 | $class = $val->$classMethod(); |
| 511 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
| 512 | - $method = 'get' . $field['class_id']; |
|
| 511 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
| 512 | + $method = 'get'.$field['class_id']; |
|
| 513 | 513 | $data[] = $class->$method(); |
| 514 | - } else { |
|
| 514 | + }else { |
|
| 515 | 515 | $data[] = $class->getPrimaryKey(); |
| 516 | 516 | } |
| 517 | - } else { |
|
| 517 | + }else { |
|
| 518 | 518 | $data[] = $val; |
| 519 | 519 | } |
| 520 | 520 | |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | private function extractModelFieldValue($key, $field) |
| 531 | 531 | { |
| 532 | 532 | //Extraemos el valor del campo del modelo |
| 533 | - $method = 'get' . ucfirst($key); |
|
| 533 | + $method = 'get'.ucfirst($key); |
|
| 534 | 534 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
| 535 | 535 | //Extraemos los campos del modelo |
| 536 | 536 | if (method_exists($this->model, $method)) { |
@@ -540,16 +540,16 @@ discard block |
||
| 540 | 540 | //Si es una relación múltiple |
| 541 | 541 | if ($value instanceof ObjectCollection) { |
| 542 | 542 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 543 | - } else { //O una relación unitaria |
|
| 543 | + }else { //O una relación unitaria |
|
| 544 | 544 | if (method_exists($value, '__toString')) { |
| 545 | 545 | $field['value'] = $value; |
| 546 | 546 | } elseif ($value instanceof \DateTime) { |
| 547 | 547 | $field['value'] = $value->format('Y-m-d H:i:s'); |
| 548 | - } else { |
|
| 548 | + }else { |
|
| 549 | 549 | $field['value'] = $value->getPrimaryKey(); |
| 550 | 550 | } |
| 551 | 551 | } |
| 552 | - } else { |
|
| 552 | + }else { |
|
| 553 | 553 | $field['value'] = $value; |
| 554 | 554 | } |
| 555 | 555 | } |