Dolibarr / dolibarr

htdocs/public/members/new.php

Spacing +15 added lines, -15 removed lines

@@ -249,7 +249,7 @@ 
 		}
 	}
 
-	if (!$memberfound && GETPOST("morphy") == 'mor' && GETPOSTISSET("societe") ) {
+	if (!$memberfound && GETPOST("morphy") == 'mor' && GETPOSTISSET("societe")) {
 		$sql = "SELECT a.rowid as id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
 		$sql .= " JOIN ".MAIN_DB_PREFIX."societe as s";
@@ -378,7 +378,7 @@ 
 	$ok = false;
 	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_MEMBER') && is_object($captchaobj)) {
 		if (method_exists($captchaobj, 'validateCodeAfterLoginSubmit')) {
-			$ok = $captchaobj->validateCodeAfterLoginSubmit();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$ok = $captchaobj->validateCodeAfterLoginSubmit(); // @phan-suppress-current-line PhanUndeclaredMethod
 		} else {
 			print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
 		}
@@ -419,9 +419,9 @@ 
 		$adh->note_private = GETPOST('note_private');
 		$adh->morphy      = getDolGlobalString("MEMBER_NEWFORM_FORCEMORPHY", GETPOST('morphy'));
 		$adh->birth       = $birthday;
-		$adh->phone   = GETPOST('phone');
+		$adh->phone = GETPOST('phone');
 		$adh->phone_perso = GETPOST('phone_perso');
-		$adh->phone_mobile= GETPOST('phone_mobile');
+		$adh->phone_mobile = GETPOST('phone_mobile');
 
 		$adh->ip = getUserRemoteIP();
 
@@ -533,7 +533,7 @@ 
 					$to = $adh->makeSubstitution(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));
 					$from = getDolGlobalString('ADHERENT_MAIL_FROM', $conf->email_from);
 					$mailfile = new CMailFile(
-						'['.$appli.'] ' . getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'),
+						'['.$appli.'] '.getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'),
 						$to,
 						$from,
 						$adh->makeSubstitution(getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL')),
@@ -723,7 +723,7 @@ 
 		}
 	} else {
 		$adht->fetch(getDolGlobalInt('MEMBER_NEWFORM_FORCETYPE'));
-		print '<input type="hidden" id="typeid" name="typeid" value="' . getDolGlobalString('MEMBER_NEWFORM_FORCETYPE').'">';
+		print '<input type="hidden" id="typeid" name="typeid" value="'.getDolGlobalString('MEMBER_NEWFORM_FORCETYPE').'">';
 	}
 	print '</td></tr>'."\n";
 
@@ -733,7 +733,7 @@ 
 		"mor" => $langs->trans("Moral"),
 	];
 	$checkednature = GETPOST("morphy", 'alpha');
-	$listetype_natures = $adht->morphyByType(1);		// Load the array of morphy per typeof membership
+	$listetype_natures = $adht->morphyByType(1); // Load the array of morphy per typeof membership
 	$listetype_natures_json = json_encode($listetype_natures);
 
 	if (!getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY')) {
@@ -826,7 +826,7 @@ 
 			print '</td></tr>'."\n";
 	} else {
 		//print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-		print '<input type="hidden" id="morphy" name="morphy" value="' . getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY').'">';
+		print '<input type="hidden" id="morphy" name="morphy" value="'.getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY').'">';
 	}
 
 	// Company   // TODO : optional hide
@@ -935,7 +935,7 @@ 
 	}
 
 	// Other attributes
-	$parameters['tpl_context'] = 'public';	// define template context to public
+	$parameters['tpl_context'] = 'public'; // define template context to public
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	// Comments
@@ -991,14 +991,14 @@ 
 		$adht = new AdherentType($db);
 		$adht->fetch($typeid);
 		$caneditamount = $adht->caneditamount;
-		$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+		$amountbytype = $adht->amountByType(1); // Load the array of amount per type
 		foreach ($amountbytype as $k => $v) {
 			$amount = max(0, (float) $v, (float) getDolGlobalInt("MEMBER_MIN_AMOUNT"));
 			$amountbytype[$k] = $amount;
 		}
 
 		$amountbytype_json = json_encode($amountbytype);
-		$caneditamountbytype = $adht->caneditamountByType(1);		// Load the array of caneditamount per type
+		$caneditamountbytype = $adht->caneditamountByType(1); // Load the array of caneditamount per type
 		$caneditamountbytype_json = json_encode($caneditamountbytype);
 
 
@@ -1022,7 +1022,7 @@ 
 
 		print '<tr><td>'.$langs->trans("Subscription");
 		if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) {
-			print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
+			print ' - <a href="'.getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 		}
 		print '</td><td class="nowrap">';
 
@@ -1090,7 +1090,7 @@ 
 	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_MEMBER') && is_object($captchaobj)) {
 		print '<tr><td><label><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td><br>';
 		if (method_exists($captchaobj, 'getCaptchaCodeForForm')) {
-			print $captchaobj->getCaptchaCodeForForm('');  // @phan-suppress-current-line PhanUndeclaredMethod
+			print $captchaobj->getCaptchaCodeForForm(''); // @phan-suppress-current-line PhanUndeclaredMethod
 		} else {
 			print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method getCaptchaCodeForForm()';
 		}
@@ -1158,10 +1158,10 @@ 
 
 		$i = 0;
 		while ($i < $num) {
-			$objp = $db->fetch_object($result);	// Load the member type and information on it
+			$objp = $db->fetch_object($result); // Load the member type and information on it
 
 			$caneditamount = $objp->caneditamount;
-			$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+			$amountbytype = $adht->amountByType(1); // Load the array of amount per type
 
 			print '<tr class="oddeven">';
 			// Label

htdocs/core/actions_sendmails.inc.php

Spacing +5 added lines, -5 removed lines

@@ -313,11 +313,11 @@ 
 			$fromtype = GETPOST('fromtype', 'alpha');
 			$emailsendersignature = '';
 			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'>';
+				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'>';
 			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 			} elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[((int) $reg[1] - 1)]);
@@ -360,7 +360,7 @@ 
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
 			if (!empty($autocopy)) {
-				$sendtobcc .= (getDolGlobalString($autocopy) ? (($sendtobcc ? ", " : "") . getDolGlobalString($autocopy)) : '');
+				$sendtobcc .= (getDolGlobalString($autocopy) ? (($sendtobcc ? ", " : "").getDolGlobalString($autocopy)) : '');
 			}
 
 			$deliveryreceipt = GETPOSTINT('deliveryreceipt') ? 1 : 0;
@@ -431,7 +431,7 @@ 
 						$object->actionmsg = $message; // Long text
 						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentByTo')...);
 						if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
-							$object->actionmsg2		= $subject; // Short text
+							$object->actionmsg2 = $subject; // Short text
 						}
 
 						$object->trackid = $trackid;
@@ -464,7 +464,7 @@ 
 								}
 							}
 
-							$result = $object->call_trigger($triggersendname, $user);  // @phan-suppress-current-line PhanPossiblyUndeclaredGlobalVariable
+							$result = $object->call_trigger($triggersendname, $user); // @phan-suppress-current-line PhanPossiblyUndeclaredGlobalVariable
 							if ($result < 0) {
 								$error++;
 							}