Completed
Branch develop (7997db)
by
unknown
16:44
created
htdocs/compta/prelevement/class/rejetprelevement.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@
 block discarded – undo
178 178
 			// Make a negative payment
179 179
 			// Amount must be an array (id of invoice -> amount)
180 180
 			$pai->amounts = array();
181
-			$pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1);		// The payment must be negative because it is a refund
181
+			$pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1); // The payment must be negative because it is a refund
182 182
 
183 183
 			$pai->datepaye = $date_rejet;
184 184
 			$pai->paiementid = 3; // type of payment: withdrawal
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorbooth_list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 // Default sort order (if not yet defined by previous GETPOST)
87 87
 if (!$sortfield) {
88
-	reset($object->fields);					// Reset is required to avoid key() to return null.
88
+	reset($object->fields); // Reset is required to avoid key() to return null.
89 89
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
90 90
 }
91 91
 if (!$sortorder) {
@@ -295,9 +295,9 @@  discard block
 block discarded – undo
295 295
 	}
296 296
 
297 297
 	$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
298
-	$title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
298
+	$title = $langs->trans("Project").' - '.$langs->trans("EventOrganizationConfOrBoothes").' - '.$project->ref.' '.$project->name;
299 299
 	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $project->name) {
300
-		$title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
300
+		$title = $project->ref.' '.$project->name.' - '.$langs->trans("ListOfConferencesOrBooths");
301 301
 	}
302 302
 }
303 303
 
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
920 920
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
921 921
 	}
922
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
922
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
923 923
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
924 924
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
925 925
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/core/class/html.formsetup.class.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -164,12 +164,12 @@  discard block
 block discarded – undo
164 164
 			$out .= $this->htmlBeforeOutputForm;
165 165
 
166 166
 			if ($editMode) {
167
-				$out .= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
167
+				$out .= '<form '.self::generateAttributesStringFromArray($this->formAttributes).' >';
168 168
 
169 169
 				// generate hidden values from $this->formHiddenInputs
170 170
 				if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) {
171 171
 					foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) {
172
-						$out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
172
+						$out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="'.dol_escape_htmltag($hiddenValue).'">';
173 173
 					}
174 174
 				}
175 175
 			}
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 			} elseif ($editMode) {
189 189
 				$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes
190 190
 				$out .= $this->htmlOutputMoreButton;
191
-				$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
+				$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
192 192
 				/*$out .= ' &nbsp;&nbsp; ';
193 193
 				$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$this->langs->trans('Cancel').'</a>';
194 194
 				*/
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
 			if (empty($hideTitle)) {
233 233
 				$out .= '<thead>';
234 234
 				$out .= '<tr class="liste_titre">';
235
-				$out .= '	<td>' . $this->langs->trans("Parameter") . '</td>';
236
-				$out .= '	<td>' . $this->langs->trans("Value") . '</td>';
235
+				$out .= '	<td>'.$this->langs->trans("Parameter").'</td>';
236
+				$out .= '	<td>'.$this->langs->trans("Value").'</td>';
237 237
 				$out .= '</tr>';
238 238
 				$out .= '</thead>';
239 239
 			}
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 		if (!empty($this->helpText)) {
826 826
 			return $this->helpText;
827 827
 		}
828
-		return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
828
+		return (($this->langs->trans($this->confKey.'Tooltip') != $this->confKey.'Tooltip') ? $this->langs->trans($this->confKey.'Tooltip') : '');
829 829
 	}
830 830
 
831 831
 	/**
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 
843 843
 		// if conf defined on entity 0, prepend a picto to indicate it will apply across all entities
844 844
 		if (isModEnabled('multicompany') && $this->entity == 0) {
845
-			$out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh') . '&nbsp;' . $out;
845
+			$out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh').'&nbsp;'.$out;
846 846
 		}
847 847
 
848 848
 		return $out;
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
 		} elseif ($this->type == 'html') {
891 891
 			$out .= $this->generateInputFieldHtml();
892 892
 		} elseif ($this->type == 'color') {
893
-			$out .=  $this->generateInputFieldColor();
893
+			$out .= $this->generateInputFieldColor();
894 894
 		} elseif ($this->type == 'yesno') {
895 895
 			if (!empty($conf->use_javascript_ajax)) {
896 896
 				$out .= ajax_constantonoff($this->confKey);
@@ -948,7 +948,7 @@  discard block
 block discarded – undo
948 948
 	 */
949 949
 	public function generateInputFieldTextarea()
950 950
 	{
951
-		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n";
951
+		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">'."\n";
952 952
 		$out .= dol_htmlentities($this->fieldValue);
953 953
 		$out .= "</textarea>\n";
954 954
 		return $out;
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
962 962
 	public function generateInputFieldHtml()
963 963
 	{
964 964
 		global $conf;
965
-		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
965
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
966 966
 		$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
967 967
 		return $doleditor->Create(1);
968 968
 	}
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 
1001 1001
 		$out = '';
1002 1002
 		if (preg_match('/emailtemplate:/', $this->type)) {
1003
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
1003
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
1004 1004
 			$formmail = new FormMail($this->db);
1005 1005
 
1006 1006
 			$tmp = explode(':', $this->type);
@@ -1010,10 +1010,10 @@  discard block
 block discarded – undo
1010 1010
 				foreach ($formmail->lines_model as $modelMail) {
1011 1011
 					$moreonlabel = '';
1012 1012
 					if (!empty($arrayOfMessageName[$modelMail->label])) {
1013
-						$moreonlabel = ' <span class="opacitymedium">(' . $this->langs->trans("SeveralLangugeVariatFound") . ')</span>';
1013
+						$moreonlabel = ' <span class="opacitymedium">('.$this->langs->trans("SeveralLangugeVariatFound").')</span>';
1014 1014
 					}
1015 1015
 					// The 'label' is the key that is unique if we exclude the language
1016
-					$arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)) . $moreonlabel;
1016
+					$arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)).$moreonlabel;
1017 1017
 				}
1018 1018
 			}
1019 1019
 			$out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
 			$min = $genhandler->length;
1070 1070
 			$max = $genhandler->length2;
1071 1071
 		}
1072
-		$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).'" minlength="' . $min . '" maxlength="' . $max . '">';
1072
+		$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).'" minlength="'.$min.'" maxlength="'.$max.'">';
1073 1073
 		return $out;
1074 1074
 	}
1075 1075
 
@@ -1187,9 +1187,9 @@  discard block
 block discarded – undo
1187 1187
 		} elseif ($this->type == 'selectUser') {
1188 1188
 			$out .= $this->generateOutputFieldSelectUser();
1189 1189
 		} elseif ($this->type == 'html') {
1190
-			$out .=  $this->fieldValue;
1190
+			$out .= $this->fieldValue;
1191 1191
 		} elseif ($this->type == 'color') {
1192
-			$out .=  $this->generateOutputFieldColor();
1192
+			$out .= $this->generateOutputFieldColor();
1193 1193
 		} elseif ($this->type == 'yesno') {
1194 1194
 			if (!empty($conf->use_javascript_ajax)) {
1195 1195
 				$out .= ajax_constantonoff($this->confKey, array(), $this->entity); // TODO possibility to add $input parameter
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
 			}
1203 1203
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
1204 1204
 			if ($this->fieldValue > 0) {
1205
-				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
1205
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
1206 1206
 				$formmail = new FormMail($this->db);
1207 1207
 
1208 1208
 				$tmp = explode(':', $this->type);
@@ -1223,9 +1223,9 @@  discard block
 block discarded – undo
1223 1223
 			$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
1224 1224
 			$toprint = array();
1225 1225
 			foreach ($ways as $way) {
1226
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
1226
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
1227 1227
 			}
1228
-			$out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
1228
+			$out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
1229 1229
 		} elseif (preg_match('/thirdparty_type/', $this->type)) {
1230 1230
 			if ($this->fieldValue == 2) {
1231 1231
 				$out .= $this->langs->trans("Prospect");
@@ -1343,7 +1343,7 @@  discard block
 block discarded – undo
1343 1343
 		$outPut = '';
1344 1344
 		$user = new User($this->db);
1345 1345
 		$user->fetch($this->fieldValue);
1346
-		$outPut = $user->firstname . " "  . $user->lastname;
1346
+		$outPut = $user->firstname." ".$user->lastname;
1347 1347
 		return $outPut;
1348 1348
 	}
1349 1349
 
Please login to merge, or discard this patch.