|
@@ -163,12 +163,12 @@ discard block |
|
|
block discarded – undo |
|
163
|
163
|
$out .= $this->htmlBeforeOutputForm; |
|
164
|
164
|
|
|
165
|
165
|
if ($editMode) { |
|
166
|
|
- $out .= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >'; |
|
|
166
|
+ $out .= '<form '.self::generateAttributesStringFromArray($this->formAttributes).' >'; |
|
167
|
167
|
|
|
168
|
168
|
// generate hidden values from $this->formHiddenInputs |
|
169
|
169
|
if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) { |
|
170
|
170
|
foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) { |
|
171
|
|
- $out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">'; |
|
|
171
|
+ $out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="'.dol_escape_htmltag($hiddenValue).'">'; |
|
172
|
172
|
} |
|
173
|
173
|
} |
|
174
|
174
|
} |
|
@@ -187,7 +187,7 @@ discard block |
|
|
block discarded – undo |
|
187
|
187
|
} elseif ($editMode) { |
|
188
|
188
|
$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes |
|
189
|
189
|
$out .= $this->htmlOutputMoreButton; |
|
190
|
|
- $out .= '<input class="button button-save" type="submit" value="' . $this->langs->trans("Save") . '">'; // Todo fix dolibarr style for <button and use <button instead of input |
|
|
190
|
+ $out .= '<input class="button button-save" type="submit" value="'.$this->langs->trans("Save").'">'; // Todo fix dolibarr style for <button and use <button instead of input |
|
191
|
191
|
/*$out .= ' '; |
|
192
|
192
|
$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$this->langs->trans('Cancel').'</a>'; |
|
193
|
193
|
*/ |
|
@@ -231,8 +231,8 @@ discard block |
|
|
block discarded – undo |
|
231
|
231
|
if (empty($hideTitle)) { |
|
232
|
232
|
$out .= '<thead>'; |
|
233
|
233
|
$out .= '<tr class="liste_titre">'; |
|
234
|
|
- $out .= ' <td>' . $this->langs->trans("Parameter") . '</td>'; |
|
235
|
|
- $out .= ' <td>' . $this->langs->trans("Value") . '</td>'; |
|
|
234
|
+ $out .= ' <td>'.$this->langs->trans("Parameter").'</td>'; |
|
|
235
|
+ $out .= ' <td>'.$this->langs->trans("Value").'</td>'; |
|
236
|
236
|
$out .= '</tr>'; |
|
237
|
237
|
$out .= '</thead>'; |
|
238
|
238
|
} |
|
@@ -837,7 +837,7 @@ discard block |
|
|
block discarded – undo |
|
837
|
837
|
if (!empty($this->helpText)) { |
|
838
|
838
|
return $this->helpText; |
|
839
|
839
|
} |
|
840
|
|
- return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : ''); |
|
|
840
|
+ return (($this->langs->trans($this->confKey.'Tooltip') != $this->confKey.'Tooltip') ? $this->langs->trans($this->confKey.'Tooltip') : ''); |
|
841
|
841
|
} |
|
842
|
842
|
|
|
843
|
843
|
/** |
|
@@ -854,7 +854,7 @@ discard block |
|
|
block discarded – undo |
|
854
|
854
|
|
|
855
|
855
|
// if conf defined on entity 0, prepend a picto to indicate it will apply across all entities |
|
856
|
856
|
if (isModEnabled('multicompany') && $this->entity == 0) { |
|
857
|
|
- $out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh') . ' ' . $out; |
|
|
857
|
+ $out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh').' '.$out; |
|
858
|
858
|
} |
|
859
|
859
|
|
|
860
|
860
|
return $out; |
|
@@ -902,7 +902,7 @@ discard block |
|
|
block discarded – undo |
|
902
|
902
|
} elseif ($this->type == 'html') { |
|
903
|
903
|
$out .= $this->generateInputFieldHtml(); |
|
904
|
904
|
} elseif ($this->type == 'color') { |
|
905
|
|
- $out .= $this->generateInputFieldColor(); |
|
|
905
|
+ $out .= $this->generateInputFieldColor(); |
|
906
|
906
|
} elseif ($this->type == 'yesno') { |
|
907
|
907
|
if (!empty($conf->use_javascript_ajax)) { |
|
908
|
908
|
$input = $this->fieldParams['input'] ?? array(); |
|
@@ -964,7 +964,7 @@ discard block |
|
|
block discarded – undo |
|
964
|
964
|
*/ |
|
965
|
965
|
public function generateInputFieldTextarea() |
|
966
|
966
|
{ |
|
967
|
|
- $out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n"; |
|
|
967
|
+ $out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">'."\n"; |
|
968
|
968
|
$out .= dol_htmlentities($this->fieldValue); |
|
969
|
969
|
$out .= "</textarea>\n"; |
|
970
|
970
|
return $out; |
|
@@ -978,7 +978,7 @@ discard block |
|
|
block discarded – undo |
|
978
|
978
|
public function generateInputFieldHtml() |
|
979
|
979
|
{ |
|
980
|
980
|
global $conf; |
|
981
|
|
- require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
|
981
|
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
982
|
982
|
$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%'); |
|
983
|
983
|
return $doleditor->Create(1); |
|
984
|
984
|
} |
|
@@ -1016,7 +1016,7 @@ discard block |
|
|
block discarded – undo |
|
1016
|
1016
|
|
|
1017
|
1017
|
$out = ''; |
|
1018
|
1018
|
if (preg_match('/emailtemplate:/', $this->type)) { |
|
1019
|
|
- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; |
|
|
1019
|
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; |
|
1020
|
1020
|
$formmail = new FormMail($this->db); |
|
1021
|
1021
|
|
|
1022
|
1022
|
$tmp = explode(':', $this->type); |
|
@@ -1026,10 +1026,10 @@ discard block |
|
|
block discarded – undo |
|
1026
|
1026
|
foreach ($formmail->lines_model as $modelMail) { |
|
1027
|
1027
|
$moreonlabel = ''; |
|
1028
|
1028
|
if (!empty($arrayOfMessageName[$modelMail->label])) { |
|
1029
|
|
- $moreonlabel = ' <span class="opacitymedium">(' . $this->langs->trans("SeveralLangugeVariatFound") . ')</span>'; |
|
|
1029
|
+ $moreonlabel = ' <span class="opacitymedium">('.$this->langs->trans("SeveralLangugeVariatFound").')</span>'; |
|
1030
|
1030
|
} |
|
1031
|
1031
|
// The 'label' is the key that is unique if we exclude the language |
|
1032
|
|
- $arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)) . $moreonlabel; |
|
|
1032
|
+ $arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)).$moreonlabel; |
|
1033
|
1033
|
} |
|
1034
|
1034
|
} |
|
1035
|
1035
|
$out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1); |
|
@@ -1088,10 +1088,10 @@ discard block |
|
|
block discarded – undo |
|
1088
|
1088
|
} |
|
1089
|
1089
|
$out = '<input required="required" type="password" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'"'; |
|
1090
|
1090
|
if ($min) { |
|
1091
|
|
- $out .= ' minlength="' . $min . '"'; |
|
|
1091
|
+ $out .= ' minlength="'.$min.'"'; |
|
1092
|
1092
|
} |
|
1093
|
1093
|
if ($max) { |
|
1094
|
|
- $out .= ' maxlength="' . $max . '"'; |
|
|
1094
|
+ $out .= ' maxlength="'.$max.'"'; |
|
1095
|
1095
|
} |
|
1096
|
1096
|
$out .= '>'; |
|
1097
|
1097
|
return $out; |
|
@@ -1218,9 +1218,9 @@ discard block |
|
|
block discarded – undo |
|
1218
|
1218
|
} elseif ($this->type == 'selectUser') { |
|
1219
|
1219
|
$out .= $this->generateOutputFieldSelectUser(); |
|
1220
|
1220
|
} elseif ($this->type == 'html') { |
|
1221
|
|
- $out .= $this->fieldValue; |
|
|
1221
|
+ $out .= $this->fieldValue; |
|
1222
|
1222
|
} elseif ($this->type == 'color') { |
|
1223
|
|
- $out .= $this->generateOutputFieldColor(); |
|
|
1223
|
+ $out .= $this->generateOutputFieldColor(); |
|
1224
|
1224
|
} elseif ($this->type == 'yesno') { |
|
1225
|
1225
|
if (!empty($conf->use_javascript_ajax)) { |
|
1226
|
1226
|
$revertonoff = $this->fieldParams['revertonoff'] ? 1 : 0; |
|
@@ -1236,7 +1236,7 @@ discard block |
|
|
block discarded – undo |
|
1236
|
1236
|
} |
|
1237
|
1237
|
} elseif (preg_match('/emailtemplate:/', $this->type)) { |
|
1238
|
1238
|
if ($this->fieldValue > 0) { |
|
1239
|
|
- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; |
|
|
1239
|
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; |
|
1240
|
1240
|
$formmail = new FormMail($this->db); |
|
1241
|
1241
|
|
|
1242
|
1242
|
$tmp = explode(':', $this->type); |
|
@@ -1257,9 +1257,9 @@ discard block |
|
|
block discarded – undo |
|
1257
|
1257
|
$ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text |
|
1258
|
1258
|
$toprint = array(); |
|
1259
|
1259
|
foreach ($ways as $way) { |
|
1260
|
|
- $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>'; |
|
|
1260
|
+ $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>'; |
|
1261
|
1261
|
} |
|
1262
|
|
- $out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>'; |
|
|
1262
|
+ $out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>'; |
|
1263
|
1263
|
} elseif (preg_match('/thirdparty_type/', $this->type)) { |
|
1264
|
1264
|
if ($this->fieldValue == 2) { |
|
1265
|
1265
|
$out .= $this->langs->trans("Prospect"); |
|
@@ -1377,7 +1377,7 @@ discard block |
|
|
block discarded – undo |
|
1377
|
1377
|
$outPut = ''; |
|
1378
|
1378
|
$user = new User($this->db); |
|
1379
|
1379
|
$user->fetch($this->fieldValue); |
|
1380
|
|
- $outPut = $user->firstname . " " . $user->lastname; |
|
|
1380
|
+ $outPut = $user->firstname." ".$user->lastname; |
|
1381
|
1381
|
return $outPut; |
|
1382
|
1382
|
} |
|
1383
|
1383
|
|