Completed
Branch develop (e77b47)
by
unknown
22:03
created
htdocs/societe/paymentmodes.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 // Check permission on company
98 98
 $result = restrictedArea($user, 'societe', '', '');
99 99
 
100
-$stripe = null;  // Stripe object
100
+$stripe = null; // Stripe object
101 101
 $stripeacc = null; // Stripe Account
102 102
 $stripecu = null; // Remote stripe customer
103 103
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		}
178 178
 
179 179
 		if (!$error) {
180
-			$companybankaccount->oldcopy = dol_clone($companybankaccount, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
180
+			$companybankaccount->oldcopy = dol_clone($companybankaccount, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
181 181
 
182 182
 			$companybankaccount->socid           = $object->id;
183 183
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 
255 255
 		$companypaymentmode->fetch($id);
256 256
 		if (!$error) {
257
-			$companypaymentmode->oldcopy = dol_clone($companypaymentmode, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
257
+			$companypaymentmode->oldcopy = dol_clone($companypaymentmode, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
258 258
 
259 259
 			$companypaymentmode->fk_soc          = $object->id;
260 260
 
@@ -540,8 +540,8 @@  discard block
 block discarded – undo
540 540
 			'use_companybankid' => GETPOST('companybankid'),
541 541
 			'force_dir_output' => $conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName((string) $object->id)
542 542
 		);
543
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOSTINT('companybankid'), 'alphanohtml');	// This is required by core/action_builddoc.inc.php
544
-		$_POST['model'] = GETPOST('modelrib'.GETPOSTINT('companybankid'), 'alphanohtml'); 		// This is required by core/action_builddoc.inc.php
543
+		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php
544
+		$_POST['model'] = GETPOST('modelrib'.GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php
545 545
 	}
546 546
 
547 547
 	$id = $socid;
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 		}
613 613
 		if ($action == 'syncsepatostripe' && $permissiontoaddupdatepaymentinformation && $stripeacc !== null) {
614 614
 			// Create the bank account on current Stripe env
615
-			$companypaymentmode = new CompanyPaymentMode($db);	// Get record in llx_societe_rib
615
+			$companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib
616 616
 			$companypaymentmode->fetch($id);
617 617
 
618 618
 			if ($companypaymentmode->type != 'ban') {
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
1218 1218
 		print '<table class="liste centpercent noborder">'."\n";
1219 1219
 		print '<tr class="liste_titre">';
1220 1220
 		print '<td>'.$langs->trans('Label').'</td>';
1221
-		print '<td>'.$form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")).'</td>';	// external system ID
1221
+		print '<td>'.$form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")).'</td>'; // external system ID
1222 1222
 		print '<td>'.$langs->trans('Type').'</td>';
1223 1223
 		print '<td>'.$langs->trans('Informations').'</td>';
1224 1224
 		print '<td></td>';
@@ -1559,7 +1559,7 @@  discard block
 block discarded – undo
1559 1559
 
1560 1560
 	// List of bank accounts
1561 1561
 	if ($permissiontoaddupdatepaymentinformation) {
1562
-		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&action=create');
1562
+		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=create');
1563 1563
 	}
1564 1564
 
1565 1565
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
@@ -1576,7 +1576,7 @@  discard block
 block discarded – undo
1576 1576
 
1577 1577
 		print '<tr class="liste_titre">';
1578 1578
 		print_liste_field_titre("Label");
1579
-		print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")));		// external system ID
1579
+		print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID
1580 1580
 		//print_liste_field_titre("Bank");
1581 1581
 		print_liste_field_titre("RIB");
1582 1582
 		print_liste_field_titre("IBAN");
@@ -1685,7 +1685,7 @@  discard block
 block discarded – undo
1685 1685
 				// RUM
1686 1686
 				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
1687 1687
 				print '<td class="tdoverflowmax100 small" title="'.dolPrintHTMLForAttribute($rib->rum).'">'.dolPrintHTML($rib->rum);
1688
-				print '<br><span class="opacitymedium">'.dolPrintHTML($rib->frstrecur).'</span>';	// FRST or RCUR
1688
+				print '<br><span class="opacitymedium">'.dolPrintHTML($rib->frstrecur).'</span>'; // FRST or RCUR
1689 1689
 				print '</td>';
1690 1690
 
1691 1691
 				// Date
@@ -1764,7 +1764,7 @@  discard block
 block discarded – undo
1764 1764
 				$useonlinesignature = 1;
1765 1765
 				if ($useonlinesignature) {
1766 1766
 					$rib->entity = $object->entity; //Assign $rib->entity necessary for a valid multicompany hash
1767
-					require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php';
1767
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
1768 1768
 					print showOnlineSignatureUrl($companybankaccount->element, (string) $rib->id, $rib, 'short');
1769 1769
 				}
1770 1770
 				print '</td>';
Please login to merge, or discard this patch.
htdocs/webportal/class/webportalorder.class.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  */
26 26
 
27 27
 // Put here all includes required by your class file
28
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
28
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
29 29
 
30 30
 /**
31 31
  * Class for WebPortalOrder
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 		if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER')) {
174 174
 			return ['optimize' => $langs->trans("WebPortalOrder")];
175 175
 		}
176
-		$datas['picto'] = img_picto('', $this->picto) . ' <u>' . $langs->trans("WebPortalOrder") . '</u>';
177
-		$datas['picto'] .= ' ' . $this->getLibStatut(5);
176
+		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("WebPortalOrder").'</u>';
177
+		$datas['picto'] .= ' '.$this->getLibStatut(5);
178 178
 
179
-		$datas['ref'] = '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
179
+		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
180 180
 
181 181
 		return $datas;
182 182
 	}
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 		$dataparams = '';
222 222
 		if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
223 223
 			$classfortooltip = 'classforajaxtooltip';
224
-			$dataparams = ' data-params="' . dol_escape_htmltag(json_encode($params)) . '"';
224
+			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';
225 225
 			$label = '';
226 226
 		} else {
227 227
 			$label = implode($this->getTooltipContentArray($params));
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
229 229
 
230 230
 		$linkclose = '';
231 231
 
232
-		$linkstart = '<a href="' . $url . '"';
233
-		$linkstart .= $linkclose . '>';
232
+		$linkstart = '<a href="'.$url.'"';
233
+		$linkstart .= $linkclose.'>';
234 234
 		$linkend = '</a>';
235 235
 
236 236
 		if ($option === 'nolink') {
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 		$result .= $linkend;
249 249
 
250 250
 		global $action;
251
-		$hookmanager->initHooks(array($this->element . 'dao'));
251
+		$hookmanager->initHooks(array($this->element.'dao'));
252 252
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
253 253
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
254 254
 		if ($reshook > 0) {
@@ -278,17 +278,17 @@  discard block
 block discarded – undo
278 278
 		$return .= img_picto('', 'order');
279 279
 		$return .= '</div>';
280 280
 		$return .= '<div class="info-box-content">';
281
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . (method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref) . '</span>';
282
-		$return .= '<input id="cb' . $this->id . '" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="' . $this->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
281
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
282
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
283 283
 
284 284
 		if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
285
-			$return .= '<br><div class="info-box-ref tdoverflowmax150">' . $this->thirdparty->getNomUrl(1) . '</div>';
285
+			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';
286 286
 		}
287 287
 		if (property_exists($this, 'total_ht')) {
288
-			$return .= '<div class="info-box-ref amount">' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ' . $langs->trans('HT') . '</div>';
288
+			$return .= '<div class="info-box-ref amount">'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'</div>';
289 289
 		}
290 290
 		if (method_exists($this, 'getLibStatut')) {
291
-			$return .= '<div class="info-box-status margintoponly">' . $this->getLibStatut(5) . '</div>';
291
+			$return .= '<div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
292 292
 		}
293 293
 		$return .= '</div>';
294 294
 		$return .= '</div>';
Please login to merge, or discard this patch.
htdocs/webportal/class/webportalpartnership.class.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  */
26 26
 
27 27
 // Put here all includes required by your class file
28
-require_once DOL_DOCUMENT_ROOT . '/partnership/class/partnership.class.php';
28
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
29 29
 
30 30
 /**
31 31
  * Class for WebPortalPartnership
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 		if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER')) {
199 199
 			return ['optimize' => $langs->trans("WebPortalPartnership")];
200 200
 		}
201
-		$datas['picto'] = img_picto('', $this->picto) . ' <u>' . $langs->trans("WebPortalPartnership") . '</u>';
201
+		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("WebPortalPartnership").'</u>';
202 202
 		if (isset($this->status)) {
203
-			$datas['picto'] .= ' ' . $this->getLibStatut(5);
203
+			$datas['picto'] .= ' '.$this->getLibStatut(5);
204 204
 		}
205
-		$datas['ref'] = '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
205
+		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
206 206
 
207 207
 		return $datas;
208 208
 	}
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 		$dataparams = '';
238 238
 		if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
239 239
 			$classfortooltip = 'classforajaxtooltip';
240
-			$dataparams = ' data-params="' . dol_escape_htmltag(json_encode($params)) . '"';
240
+			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';
241 241
 			$label = '';
242 242
 		} else {
243 243
 			$label = implode($this->getTooltipContentArray($params));
@@ -261,20 +261,20 @@  discard block
 block discarded – undo
261 261
 		if (empty($notooltip)) {
262 262
 			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
263 263
 				$label = $langs->trans("ShowPartnership");
264
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
264
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
265 265
 			}
266
-			$linkclose .= ($label ? ' title="' . dol_escape_htmltag($label, 1) . '"' : ' title="tocomplete"');
267
-			$linkclose .= $dataparams . ' class="' . $classfortooltip . ($morecss ? ' ' . $morecss : '') . '"';
266
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
267
+			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
268 268
 		} else {
269
-			$linkclose = ($morecss ? ' class="' . $morecss . '"' : '');
269
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
270 270
 		}
271 271
 
272 272
 		if ($option == 'nolink') {
273 273
 			$linkstart = '<span';
274 274
 		} else {
275
-			$linkstart = '<a href="' . $url . '"';
275
+			$linkstart = '<a href="'.$url.'"';
276 276
 		}
277
-		$linkstart .= $linkclose . '>';
277
+		$linkstart .= $linkclose.'>';
278 278
 		if ($option == 'nolink') {
279 279
 			$linkend = '</span>';
280 280
 		} else {
@@ -285,29 +285,29 @@  discard block
 block discarded – undo
285 285
 
286 286
 		if (empty($this->showphoto_on_popup)) {
287 287
 			if ($withpicto) {
288
-				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams . ' class="' . (($withpicto != 2) ? 'paddingright ' : '') . $classfortooltip . '"'), 0, 0, $notooltip ? 0 : 1);
288
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1);
289 289
 			}
290 290
 		} else {
291 291
 			if ($withpicto) {
292
-				require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
292
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
293 293
 
294 294
 				list($class, $module) = explode('@', $this->picto);
295
-				$upload_dir = $conf->$module->multidir_output[$conf->entity] . "/$class/" . dol_sanitizeFileName($this->ref);
295
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
296 296
 				$filearray = dol_dir_list($upload_dir, "files");
297 297
 				$filename = $filearray[0]['name'];
298 298
 				if (!empty($filename)) {
299 299
 					$pospoint = strpos($filearray[0]['name'], '.');
300 300
 
301
-					$pathtophoto = $class . '/' . $this->ref . '/thumbs/' . substr($filename, 0, $pospoint) . '_mini' . substr($filename, $pospoint);
302
-					if (!getDolGlobalString(strtoupper($module . '_' . $class) . '_FORMATLISTPHOTOSASUSERS')) {
303
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $module . '" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div></div>';
301
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
302
+					if (!getDolGlobalString(strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS')) {
303
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
304 304
 					} else {
305
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div>';
305
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
306 306
 					}
307 307
 
308 308
 					$result .= '</div>';
309 309
 				} else {
310
-					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
310
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
311 311
 				}
312 312
 			}
313 313
 		}
Please login to merge, or discard this patch.
htdocs/webportal/class/webportalpropal.class.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  */
26 26
 
27 27
 // Put here all includes required by your class file
28
-require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
28
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
29 29
 
30 30
 /**
31 31
  * Class for WebPortalPropal
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 		if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER')) {
174 174
 			return ['optimize' => $langs->trans("WebPortalPropal")];
175 175
 		}
176
-		$datas['picto'] = img_picto('', $this->picto) . ' <u>' . $langs->trans("WebPortalPropal") . '</u>';
176
+		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("WebPortalPropal").'</u>';
177 177
 		if (isset($this->status)) {
178
-			$datas['picto'] .= ' ' . $this->getLibStatut(5);
178
+			$datas['picto'] .= ' '.$this->getLibStatut(5);
179 179
 		}
180
-		$datas['ref'] = '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
180
+		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
181 181
 
182 182
 		return $datas;
183 183
 	}
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$dataparams = '';
213 213
 		if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
214 214
 			$classfortooltip = 'classforajaxtooltip';
215
-			$dataparams = ' data-params="' . dol_escape_htmltag(json_encode($params)) . '"';
215
+			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';
216 216
 			$label = '';
217 217
 		} else {
218 218
 			$label = implode($this->getTooltipContentArray($params));
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 
224 224
 		$linkclose = '';
225 225
 
226
-		$linkstart = '<a href="' . $url . '"';
227
-		$linkstart .= $linkclose . '>';
226
+		$linkstart = '<a href="'.$url.'"';
227
+		$linkstart .= $linkclose.'>';
228 228
 		$linkend = '</a>';
229 229
 
230 230
 		if ($option === 'nolink') {
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 
235 235
 		$result .= $linkstart;
236 236
 		if ($withpicto) {
237
-			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams . ' class="' . (($withpicto != 2) ? 'paddingright ' : '') . $classfortooltip . '"'), 0, 0, $notooltip ? 0 : 1);
237
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1);
238 238
 		}
239 239
 		if ($withpicto != 2) {
240 240
 			$result .= $this->ref;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		$result .= $linkend;
243 243
 
244 244
 		global $action;
245
-		$hookmanager->initHooks(array($this->element . 'dao'));
245
+		$hookmanager->initHooks(array($this->element.'dao'));
246 246
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
247 247
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
248 248
 		if ($reshook > 0) {
@@ -272,19 +272,19 @@  discard block
 block discarded – undo
272 272
 		$return .= img_picto('', $this->picto);
273 273
 		$return .= '</span>';
274 274
 		$return .= '<div class="info-box-content">';
275
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . (method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref) . '</span>';
275
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
276 276
 		if ($selected >= 0) {
277
-			$return .= '<input id="cb' . $this->id . '" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="' . $this->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
277
+			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
278 278
 		}
279 279
 		if (property_exists($this, 'label')) {
280
-			$return .= ' <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">' . $this->label . '</div>';
280
+			$return .= ' <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">'.$this->label.'</div>';
281 281
 		}
282 282
 		if (property_exists($this, 'amount')) {
283 283
 			$return .= '<br>';
284
-			$return .= '<span class="info-box-label amount">' . price($this->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span>';
284
+			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
285 285
 		}
286 286
 		if (method_exists($this, 'getLibStatut')) {
287
-			$return .= '<br><div class="info-box-status margintoponly">' . $this->getLibStatut(3) . '</div>';
287
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
288 288
 		}
289 289
 		$return .= '</div>';
290 290
 		$return .= '</div>';
Please login to merge, or discard this patch.
htdocs/webportal/class/webportalmember.class.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  */
26 26
 
27 27
 // Put here all includes required by your class file
28
-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
28
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
29 29
 
30 30
 /**
31 31
  * Class for WebPortalMember
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
 		if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER')) {
230 230
 			return ['optimize' => $langs->trans("WebPortalMember")];
231 231
 		}
232
-		$datas['picto'] = img_picto('', $this->picto) . ' <u>' . $langs->trans("WebPortalMember") . '</u>';
232
+		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("WebPortalMember").'</u>';
233 233
 		if (isset($this->status)) {
234
-			$datas['picto'] .= ' ' . $this->getLibStatut(5);
234
+			$datas['picto'] .= ' '.$this->getLibStatut(5);
235 235
 		}
236
-		$datas['ref'] = '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
236
+		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
237 237
 
238 238
 		return $datas;
239 239
 	}
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 		];
275 275
 		if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
276 276
 			$classfortooltip = 'classforajaxtooltip';
277
-			$dataparams = ' data-params="' . dol_escape_htmltag(json_encode($params)) . '"';
277
+			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';
278 278
 			$label = '';
279 279
 		} else {
280 280
 			$label = implode($this->getTooltipContentArray($params));
@@ -297,19 +297,19 @@  discard block
 block discarded – undo
297 297
 		//    }
298 298
 		//}
299 299
 
300
-		$linkstart .= '<a href="' . $url . '"';
300
+		$linkstart .= '<a href="'.$url.'"';
301 301
 		$linkclose = "";
302 302
 		if (empty($notooltip)) {
303 303
 			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
304 304
 				$langs->load("users");
305 305
 				$label = $langs->trans("ShowUser");
306
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
306
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
307 307
 			}
308
-			$linkclose .= ($label ? ' title="' . dol_escape_htmltag($label, 1) . '"' : ' title="tocomplete"');
309
-			$linkclose .= $dataparams . ' class="' . $classfortooltip . ($morecss ? ' ' . $morecss : '') . '"';
308
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
309
+			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
310 310
 		}
311 311
 
312
-		$linkstart .= $linkclose . '>';
312
+		$linkstart .= $linkclose.'>';
313 313
 		$linkend = '</a>';
314 314
 
315 315
 		if ($option === 'nolink') {
@@ -328,19 +328,19 @@  discard block
 block discarded – undo
328 328
 			}
329 329
 			// Only picto
330 330
 			if ($withpictoimg > 0) {
331
-				$picto = '<span class="nopadding' . ($morecss ? ' userimg' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : $dataparams), 0, 0, $notooltip ? 0 : 1) . '</span>';
331
+				$picto = '<span class="nopadding'.($morecss ? ' userimg'.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : $dataparams), 0, 0, $notooltip ? 0 : 1).'</span>';
332 332
 			} else {
333 333
 				// Picto must be a photo
334
-				$picto = '<span class="nopadding' . ($morecss ? ' userimg' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>';
335
-				$picto .= Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto' . (($withpictoimg == -3 || $withpictoimg == -4) ? 'small' : ''), 'mini', 0, 1);
334
+				$picto = '<span class="nopadding'.($morecss ? ' userimg'.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>';
335
+				$picto .= Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.(($withpictoimg == -3 || $withpictoimg == -4) ? 'small' : ''), 'mini', 0, 1);
336 336
 				$picto .= '</span>';
337 337
 			}
338 338
 			$result .= $picto;
339 339
 		}
340 340
 		if (($withpictoimg > -2 && $withpictoimg != 2) || $withpictoimg == -4) {
341 341
 			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
342
-				$result .= '<span class="nopadding valignmiddle' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') .
343
-					($morecss ? ' usertext' . $morecss : '') . '">';
342
+				$result .= '<span class="nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').
343
+					($morecss ? ' usertext'.$morecss : '').'">';
344 344
 			}
345 345
 			if ($mode == 'login') {
346 346
 				$result .= dol_trunc($this->login, $maxlen);
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 		//    }
370 370
 		//}
371 371
 		global $action;
372
-		$hookmanager->initHooks(array($this->element . 'dao'));
372
+		$hookmanager->initHooks(array($this->element.'dao'));
373 373
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
374 374
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
375 375
 		if ($reshook > 0) {
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		$outdone = 0;
430 430
 		$coords = $this->getFullAddress(1, ', ', getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT'));
431 431
 		if ($coords) {
432
-			$address = dol_print_address($coords, 'address_' . $htmlkey . '_' . $this->id, $this->element, $this->id, 1, ', ');
432
+			$address = dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
433 433
 			if ($address) {
434 434
 				$out .= $address;
435 435
 				$outdone++;
@@ -444,13 +444,13 @@  discard block
 block discarded – undo
444 444
 
445 445
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
446 446
 				if (!is_object($extralanguages)) {
447
-					include_once DOL_DOCUMENT_ROOT . '/core/class/extralanguages.class.php';
447
+					include_once DOL_DOCUMENT_ROOT.'/core/class/extralanguages.class.php';
448 448
 					$extralanguages = new ExtraLanguages($this->db);
449 449
 				}
450 450
 				$extralanguages->fetch_name_extralanguages($elementforaltlanguage);
451 451
 
452 452
 				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town'])) {
453
-					$out .= "<!-- alternatelanguage for '" . $elementforaltlanguage . "' set to fields '" . implode(',', $extralanguages->attributes[$elementforaltlanguage]) . "' -->\n";
453
+					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".implode(',', $extralanguages->attributes[$elementforaltlanguage])."' -->\n";
454 454
 					$this->fetchValuesForExtraLanguages();
455 455
 					if (!is_object($form)) {
456 456
 						$form = new Form($this->db);
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 						$s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
462 462
 						// This also call dol_format_address()
463 463
 						$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode);
464
-						$htmltext .= $s . dol_print_address($coords, 'address_' . $htmlkey . '_' . $this->id, $this->element, $this->id, 1, ', ');
464
+						$htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
465 465
 					}
466 466
 					$out .= $form->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
467 467
 				}
@@ -472,15 +472,15 @@  discard block
 block discarded – undo
472 472
 		if (!in_array($this->country_code, $countriesusingstate) && !getDolGlobalString('MAIN_FORCE_STATE_INTO_ADDRESS')
473 473
 			&& !getDolGlobalString('SOCIETE_DISABLE_STATE') && $this->state) {
474 474
 			if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 && $this->region) {
475
-				$out .= ($outdone ? ' - ' : '') . $this->region . ' - ' . $this->state;
475
+				$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
476 476
 			} else {
477
-				$out .= ($outdone ? ' - ' : '') . $this->state;
477
+				$out .= ($outdone ? ' - ' : '').$this->state;
478 478
 			}
479 479
 			$outdone++;
480 480
 		}
481 481
 
482 482
 		if ($outdone) {
483
-			$out = '<div class="address inline-block">' . $out . '</div>';
483
+			$out = '<div class="address inline-block">'.$out.'</div>';
484 484
 		}
485 485
 
486 486
 		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
Please login to merge, or discard this patch.