Dolibarr / dolibarr

htdocs/theme/md/manifest.json.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
 	$icon = new stdClass();
 	$icon->src = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL');
 	if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE')) {
-		$icon->sizes = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE') . "x" . getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE');
+		$icon->sizes = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE')."x".getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE');
 	} else {
 		$icon->sizes = "512x512";
 	}
@@ -96,7 +96,7 @@ 
 	$manifest->icons[] = $icon;
 } elseif (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
 	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI')) {
-		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
+		$iconRelativePath = 'logos/thumbs/'.getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);
@@ -111,7 +111,7 @@ 
 	}
 
 	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL')) {
-		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL');
+		$iconRelativePath = 'logos/thumbs/'.getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);
@@ -126,7 +126,7 @@ 
 	}
 
 	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
-		$iconRelativePath = 'logos/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
+		$iconRelativePath = 'logos/'.getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);

scripts/company/sync_contacts_dolibarr2ldap.php

Spacing +4 added lines, -4 removed lines

@@ -86,11 +86,11 @@
 print "database=".$conf->db->name."\n";
 print "\n";
 print "----- To LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN target=" . getDolGlobalString('LDAP_CONTACT_DN')."\n";
+print "DN target=".getDolGlobalString('LDAP_CONTACT_DN')."\n";
 print "\n";
 
 if (!$confirmed) {

scripts/members/sync_members_ldap2dolibarr.php

Spacing +6 added lines, -6 removed lines

@@ -115,15 +115,15 @@
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN to extract=" . getDolGlobalString('LDAP_MEMBER_DN')."\n";
+print "DN to extract=".getDolGlobalString('LDAP_MEMBER_DN')."\n";
 if (getDolGlobalString('LDAP_MEMBER_FILTER')) {
-	print 'Filter=(' . getDolGlobalString('LDAP_MEMBER_FILTER').')'."\n"; // Note: filter is defined into function getRecords
+	print 'Filter=('.getDolGlobalString('LDAP_MEMBER_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-	print 'Filter=(' . getDolGlobalString('LDAP_KEY_MEMBERS').'=*)'."\n";
+	print 'Filter=('.getDolGlobalString('LDAP_KEY_MEMBERS').'=*)'."\n";
 }
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";

scripts/members/sync_members_dolibarr2ldap.php

Spacing +4 added lines, -4 removed lines

@@ -87,11 +87,11 @@
 print "database=".$conf->db->name."\n";
 print "\n";
 print "----- To LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN target=" . getDolGlobalString('LDAP_MEMBER_DN')."\n";
+print "DN target=".getDolGlobalString('LDAP_MEMBER_DN')."\n";
 print "\n";
 
 if (!$confirmed) {

scripts/members/sync_members_types_ldap2dolibarr.php

Spacing +5 added lines, -5 removed lines

@@ -97,12 +97,12 @@
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN to extract=" . getDolGlobalString('LDAP_MEMBER_TYPE_DN')."\n";
-print 'Filter=(' . getDolGlobalString('LDAP_KEY_MEMBERS_TYPES').'=*)'."\n";
+print "DN to extract=".getDolGlobalString('LDAP_MEMBER_TYPE_DN')."\n";
+print 'Filter=('.getDolGlobalString('LDAP_KEY_MEMBERS_TYPES').'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";

scripts/emailings/mailing-send.php

Spacing +12 added lines, -12 removed lines

@@ -151,7 +151,7 @@ 
 			$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 			$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id);
 			if (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && empty($max)) {
-				$sql2 .= " LIMIT " . getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
+				$sql2 .= " LIMIT ".getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
 			} elseif (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && $max > 0) {
 				$sql2 .= " LIMIT ".min(getDolGlobalInt('MAILING_LIMIT_SENDBYCLI'), $max);
 			} elseif ($max > 0) {
@@ -229,9 +229,9 @@ 
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
-						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid);
+						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid);
 
 						$onlinepaymentenabled = 0;
 						if (isModEnabled('paypal')) {
@@ -251,10 +251,10 @@ 
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'membersubscription'.$obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'order'.$obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'invoice'.$obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'contractline'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'order'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'invoice'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'contractline'.$obj->source_id, 2);
 							}
 						}
 						/* For backward compatibility */
@@ -264,25 +264,25 @@ 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'membersubscription'.$obj->source_id, 2);
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'order'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'order'.$obj->source_id, 2);
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'invoice'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'invoice'.$obj->source_id, 2);
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'contractline'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'contractline'.$obj->source_id, 2);
 							}
 						}
 

scripts/user/sync_users_ldap2dolibarr.php

Spacing +6 added lines, -6 removed lines

@@ -110,15 +110,15 @@
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN to extract=" . getDolGlobalString('LDAP_USER_DN')."\n";
+print "DN to extract=".getDolGlobalString('LDAP_USER_DN')."\n";
 if (getDolGlobalString('LDAP_FILTER_CONNECTION')) {
-	print 'Filter=(' . getDolGlobalString('LDAP_FILTER_CONNECTION').')'."\n"; // Note: filter is defined into function getRecords
+	print 'Filter=('.getDolGlobalString('LDAP_FILTER_CONNECTION').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-	print 'Filter=(' . getDolGlobalString('LDAP_KEY_USERS').'=*)'."\n";
+	print 'Filter=('.getDolGlobalString('LDAP_KEY_USERS').'=*)'."\n";
 }
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";

scripts/user/sync_groups_ldap2dolibarr.php

Spacing +6 added lines, -6 removed lines

@@ -92,15 +92,15 @@
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
-print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
-print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "host=".getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".getDolGlobalString('LDAP_ADMIN_DN')."\n";
 print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
-print "DN to extract=" . getDolGlobalString('LDAP_GROUP_DN')."\n";
+print "DN to extract=".getDolGlobalString('LDAP_GROUP_DN')."\n";
 if (getDolGlobalString('LDAP_GROUP_FILTER')) {
-	print 'Filter=(' . getDolGlobalString('LDAP_GROUP_FILTER').')'."\n"; // Note: filter is defined into function getRecords
+	print 'Filter=('.getDolGlobalString('LDAP_GROUP_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-	print 'Filter=(' . getDolGlobalString('LDAP_KEY_GROUPS').'=*)'."\n";
+	print 'Filter=('.getDolGlobalString('LDAP_KEY_GROUPS').'=*)'."\n";
 }
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";