Dolibarr / dolibarr

htdocs/admin/modules.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 // if we set another view list mode, we keep it (till we change one more time)
 if (GETPOSTISSET('mode')) {
 	$mode = GETPOST('mode', 'alpha');
-	if ($mode =='common' || $mode =='commonkanban')
+	if ($mode == 'common' || $mode == 'commonkanban')
 		dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
 } else {
 	$mode = (!getDolGlobalString('MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT') ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT);
@@ -541,7 +541,7 @@ 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-$deschelp  = '';
+$deschelp = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}');
@@ -1146,7 +1146,7 @@ 
 			<div id="category-tree-left">
 				<ul class="tree">
 					<?php
-					echo $dolistore->get_categories();	// Do not use dol_escape_htmltag here, it is already a structured content
+					echo $dolistore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content
 					?>
 				</ul>
 			</div>

Braces +13 added lines, -6 removed lines

@@ -47,9 +47,10 @@ 
 // if we set another view list mode, we keep it (till we change one more time)
 if (GETPOSTISSET('mode')) {
 	$mode = GETPOST('mode', 'alpha');
-	if ($mode =='common' || $mode =='commonkanban')
-		dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
-} else {
+	if ($mode =='common' || $mode =='commonkanban') {
+			dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
+	}
+	} else {
 	$mode = (!getDolGlobalString('MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT') ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT);
 }
 
@@ -534,9 +535,15 @@ 
 $nbofactivatedmodules = count($conf->modules);
 
 $nbmodulesnotautoenabled = count($conf->modules);
-if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+if (in_array('fckeditor', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('export', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('import', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 

htdocs/admin/mails_templates.php

Spacing +7 added lines, -7 removed lines

@@ -44,13 +44,13 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load translation files required by the page
-$langsArray=array("errors", "admin", "mails", "languages");
+$langsArray = array("errors", "admin", "mails", "languages");
 
 if (isModEnabled('adherent')) {
-	$langsArray[]='members';
+	$langsArray[] = 'members';
 }
 if (isModEnabled('eventorganization')) {
-	$langsArray[]='eventorganization';
+	$langsArray[] = 'eventorganization';
 }
 
 $langs->loadLangs($langsArray);
@@ -1037,7 +1037,7 @@ 
 		}
 		$sortfieldtouse = ($sortable ? $fieldlist[$field] : '');
 		if ($sortfieldtouse == 'type_template') {
-			$sortfieldtouse.= 'type_template,lang,position,label';
+			$sortfieldtouse .= 'type_template,lang,position,label';
 		}
 		print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], $sortfieldtouse, ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $css.' ');
 	}
@@ -1095,7 +1095,7 @@ 
 				print '<tr class="oddeven nohover'.(in_array($tmpfieldlist, array('topic', 'joinfiles')) ? ' nobottom' : '').'" id="tr-'.$tmpfieldlist.'-'.$rowid.'">';
 				print '<td colspan="10">';
 
-				$fieldsforcontent = array('topic', 'email_from','joinfiles', 'content');
+				$fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content');
 				if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) {
 					$fieldsforcontent[] = 'content_lines';
 				}
@@ -1408,7 +1408,7 @@ 
 				print '<input type="hidden" name="type_template" value="'.$obj->type_template.'">';
 				print $obj->type_template;
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template:''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth75 maxwidth125', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template : ''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth75 maxwidth125', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
@@ -1449,7 +1449,7 @@ 
 					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1);
 				}
 			} else {
-				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'. $value .'">';
+				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'.$value.'">';
 			}
 			print '</td>';
 		}

htdocs/admin/system/security.php

Spacing +6 added lines, -6 removed lines

@@ -136,7 +136,7 @@ 
 $todisabletext = '';
 $i = 0;
 foreach ($arrayoffunctionstodisable as $functiontodisable) {
-	if (! in_array($functiontodisable, $arrayoffunctionsdisabled)) {
+	if (!in_array($functiontodisable, $arrayoffunctionsdisabled)) {
 		if ($i > 0) {
 			$todisabletext .= ', ';
 		}
@@ -151,7 +151,7 @@ 
 $todisabletext = '';
 $i = 0;
 foreach ($arrayoffunctionstodisable2 as $functiontodisable) {
-	if (! in_array($functiontodisable, $arrayoffunctionsdisabled)) {
+	if (!in_array($functiontodisable, $arrayoffunctionsdisabled)) {
 		if ($i > 0) {
 			$todisabletext .= ', ';
 		}
@@ -228,7 +228,7 @@ 
 print '<br>';
 print '<br>';
 
-print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: ';		// $conffile is defined into filefunc.inc.php
+print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: '; // $conffile is defined into filefunc.inc.php
 $perms = fileperms($dolibarr_main_document_root.'/'.$conffile);
 if ($perms) {
 	if (($perms & 0x0004) || ($perms & 0x0002)) {
@@ -428,7 +428,7 @@ 
 if (!getDolGlobalString('MAIN_ANTIVIRUS_COMMAND')) {
 	print ' - <span class="opacitymedium">'.$langs->trans("Recommended").': '.$langs->trans("DefinedAPathForAntivirusCommandIntoSetup", $langs->transnoentitiesnoconv("Home")." - ".$langs->transnoentitiesnoconv("Setup")." - ".$langs->transnoentitiesnoconv("Security")).'</span>';
 } else {
-	print ' &nbsp; - ' . getDolGlobalString('MAIN_ANTIVIRUS_COMMAND');
+	print ' &nbsp; - '.getDolGlobalString('MAIN_ANTIVIRUS_COMMAND');
 	if (defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 	}
@@ -439,11 +439,11 @@ 
 $umask = getDolGlobalString('MAIN_UMASK');
 
 print '<strong>'.$langs->trans("UMask").'</strong>: ';
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
 	print img_warning().' ';
 }
 print $umask;
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
 	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660)</span>';
 }
 print '<br>';

htdocs/admin/mailing.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 	$checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha');
 	$contactbulkdefault = GETPOST('MAILING_CONTACT_DEFAULT_BULK_STATUS', 'int');
 	if (GETPOST('MAILING_DELAY', 'alpha') != '') {
-		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3);		// Not less than 1 millisecond.
+		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond.
 	} else {
 		$mailingdelay = '';
 	}
@@ -140,7 +140,7 @@ 
 print '<tr class="oddeven"><td>';
 $help = img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));
 print $langs->trans("MailingEMailFrom").' '.$help.'</td><td>';
-print '<input class="minwidth100" type="text" name="MAILING_EMAIL_FROM" value="' . getDolGlobalString('MAILING_EMAIL_FROM').'">';
+print '<input class="minwidth100" type="text" name="MAILING_EMAIL_FROM" value="'.getDolGlobalString('MAILING_EMAIL_FROM').'">';
 if (getDolGlobalString('MAILING_EMAIL_FROM') && !isValidEmail($conf->global->MAILING_EMAIL_FROM)) {
 	print ' '.img_warning($langs->trans("BadEMail"));
 }
@@ -181,9 +181,9 @@ 
 
 // default blacklist from mailing
 print '<tr class="oddeven">';
-print '<td>' . $langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")) . '</td>';
+print '<td>'.$langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")).'</td>';
 print '<td>';
-$blacklist_setting=array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory'));
+$blacklist_setting = array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory'));
 print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS);
 print '</td>';
 print '<td class="hideonsmartphone"></td>';

htdocs/api/index.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
+call_user_func(function() {
 	$loader = Luracast\Restler\AutoLoader::instance();
 	spl_autoload_register($loader);
 	return $loader;
@@ -112,7 +112,7 @@ 
 }
 
 // Enable and test if module Api is enabled
-if (!isModEnabled('api') ) {
+if (!isModEnabled('api')) {
 	$langs->load("admin");
 	dol_syslog("Call of Dolibarr API interfaces with module API REST are disabled");
 	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
@@ -169,7 +169,7 @@ 
 // If MAIN_API_DEBUG is set to 1, we save logs into file "dolibarr_api.log"
 if (getDolGlobalString('MAIN_API_DEBUG')) {
 	$r = $api->r;
-	$r->onCall(function () use ($r) {
+	$r->onCall(function() use ($r) {
 		// Don't log Luracast Restler Explorer recources calls
 		//if (!preg_match('/^explorer/', $r->url)) {
 		//	'method'  => $api->r->requestMethod,
@@ -201,7 +201,7 @@ 
 	$allowedip = explode(' ', $conf->global->API_RESTRICT_ON_IP);
 	$ipremote = getUserRemoteIP();
 	if (!in_array($ipremote, $allowedip)) {
-		dol_syslog('Remote ip is '.$ipremote.', not into list ' . getDolGlobalString('API_RESTRICT_ON_IP'));
+		dol_syslog('Remote ip is '.$ipremote.', not into list '.getDolGlobalString('API_RESTRICT_ON_IP'));
 		print 'APIs are not allowed from the IP '.$ipremote;
 		header('HTTP/1.1 503 API not allowed from your IP '.$ipremote);
 		//session_destroy();
@@ -354,7 +354,7 @@ 
 			}
 		}
 
-		if (! $endpointisallowed) {
+		if (!$endpointisallowed) {
 			dol_syslog('The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES', LOG_WARNING);
 			print 'The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES';
 			header('HTTP/1.1 501 API is forbidden by API_ENDPOINT_RULES');

htdocs/api/class/api_login.class.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-		$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api');		// Check credentials.
+		$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api'); // Check credentials.
 		if ($login === '--bad-login-validity--') {
 			$login = '';
 		}
@@ -153,7 +153,7 @@ 
 			}
 
 			// Generate token for user
-			$token = dol_hash($login.uniqid().(!getDolGlobalString('MAIN_API_KEY')?'':$conf->global->MAIN_API_KEY), 1);
+			$token = dol_hash($login.uniqid().(!getDolGlobalString('MAIN_API_KEY') ? '' : $conf->global->MAIN_API_KEY), 1);
 
 			// We store API token into database
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";

htdocs/main.inc.php

Spacing +12 added lines, -12 removed lines

@@ -98,9 +98,9 @@ 
 	//print "before decoding $val\n";
 	do {
 		$oldval = $val;
-		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);	// Decode ':', ''', '	', '&NewLine', ...
+		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode ':', ''', '	', '&NewLine', ...
 		// Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
-		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
+		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function($m) {
 			// Decode 'n', ...
 			return realCharForNumericEntities($m); }, $val);
 
@@ -138,7 +138,7 @@ 
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
-		$inj += preg_match('/update[^&=\w].*set.+=/i', $val);	// the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
+		$inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
 		$inj += preg_match('/union.+select/i', $val);
 	}
 	if ($type == 3) {
@@ -349,7 +349,7 @@ 
 		session_set_cookie_params($sessioncookieparams);
 	}
 	session_name($sessionname);
-	session_start();	// This call the open and read of session handler
+	session_start(); // This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
 }
 
@@ -595,7 +595,7 @@ 
 	$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
 	// TODO Get the sessiontokenforthisurl into an array of session token (one array per base URL so we can use the CSRF per page and we keep ability for several tabs per url in a browser)
 	if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
-			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".(empty($_SERVER['HTTP_REFERER'])?'':$_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
+			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
 			//dol_syslog("_SESSION['token']=".$sessiontokenforthisurl, LOG_DEBUG);
 			// Do not output anything on standard output because this create problems when using the BACK button on browsers. So we just set a message into session.
 		if (!defined('NOTOKENRENEWAL')) {
@@ -611,7 +611,7 @@ 
 			unset($_GET['action']);
 			unset($_GET['confirmmassaction']);
 			unset($_GET['massaction']);
-			unset($_GET['token']);			// TODO Make a redirect if we have a token in url to remove it ?
+			unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
 		if (isset($savid)) {
 			$_POST['id'] = ((int) $savid);
 		}
@@ -778,7 +778,7 @@ 
 
 		$allowedmethodtopostusername = 3;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
-			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');	// Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
+			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
 		}
 		// TODO Remove use of $_COOKIE['login_dolibarr'] ? Replace $usertotest = with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername);
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
@@ -901,7 +901,7 @@ 
 				if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
 					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));	// This include http headers
+				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
 			}
 			exit;
 		}
@@ -1246,7 +1246,7 @@ 
 } else {
 	// We may have NOLOGIN set, but NOREQUIREUSER not
 	if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-		$user->loadDefaultValues();		// Load default values for everybody (works even if $user->id = 0
+		$user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
 	}
 }
 
@@ -1426,7 +1426,7 @@ 
 
 if (!empty(GETPOST('seteventmessages', 'alpha'))) {
 	$message = GETPOST('seteventmessages', 'alpha');
-	$messages  = explode(',', $message);
+	$messages = explode(',', $message);
 	foreach ($messages as $key => $msg) {
 		$tmp = explode(':', $msg);
 		setEventMessages($tmp[0], null, !empty($tmp[1]) ? $tmp[1] : 'mesgs');
@@ -2801,7 +2801,7 @@ 
 		$langs->load(explode('@', $item['name'])[1]);
 		$dropDownQuickAddHtml .= '
 			<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
-			'. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
+			'. img_picto('', $item['picto'], 'style="width:18px;"').' '.$langs->trans(explode('@', $item['name'])[0]).'</a>
 		';
 	}
 
@@ -3645,7 +3645,7 @@ 
 		$forceping = GETPOST('forceping', 'alpha');
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
-			$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);	// Do not use dol_hash(), must not change if salt changes.
+			$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id); // Do not use dol_hash(), must not change if salt changes.
 
 			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
 				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))

htdocs/adherents/subscription.php

Spacing +3 added lines, -3 removed lines

@@ -462,7 +462,7 @@ 
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if (! ($object->id > 0)) {
+if (!($object->id > 0)) {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
@@ -1003,7 +1003,7 @@ 
 
 	if ($adht->subscription) {
 		// Amount
-		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td>';
@@ -1082,7 +1082,7 @@ 
 				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
 					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 				}
-				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product')|| isModEnabled('service'))) {
+				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product') || isModEnabled('service'))) {
 					$prodtmp = new Product($db);
 					$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 					if ($result < 0) {

htdocs/adherents/subscription/card.php

Spacing +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 
 	// Confirmation to delete subscription
 	if ($action == 'delete') {
-		$formquestion=array();
+		$formquestion = array();
 		//$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
 		if (isModEnabled("banque") && getDolGlobalString('ADHERENT_BANK_USE')) {