Completed
Branch develop (c87f24)
by
unknown
13:17
created
htdocs/public/project/new.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
 	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD')) {
136 136
 		print '<div class="backimagepublicnewlead">';
137
-		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD').'">';
137
+		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="'.getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD').'">';
138 138
 		print '</div>';
139 139
 	}
140 140
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 		} else {
221 221
 			// Create the prospect
222 222
 			if (GETPOST('societe')) {
223
-				$thirdparty->name =  GETPOST('societe');
223
+				$thirdparty->name = GETPOST('societe');
224 224
 				$thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
225 225
 			} else {
226 226
 				$thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 		$proj->title       = $langs->trans("LeadFromPublicForm");
306 306
 		$proj->description = GETPOST("description", "alphanohtml");
307 307
 		$proj->opp_status  = $defaultoppstatus;
308
-		$proj->fk_opp_status  = $defaultoppstatus;
308
+		$proj->fk_opp_status = $defaultoppstatus;
309 309
 
310 310
 		$proj->ip = getUserRemoteIP();
311 311
 		$nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200);
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 }
549 549
 
550 550
 // Other attributes
551
-$parameters['tpl_context'] = 'public';	// define template context to public
551
+$parameters['tpl_context'] = 'public'; // define template context to public
552 552
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
553 553
 // Comments
554 554
 print '<tr>';
Please login to merge, or discard this patch.
htdocs/public/project/suggestconference.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
 // Security check
87 87
 $securekeyreceived = GETPOST('securekey', 'alpha');
88
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
88
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 'md5');
89 89
 
90 90
 if ($securekeytocompare != $securekeyreceived) {
91 91
 	print $langs->trans('MissingOrBadSecureKey');
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
 	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE')) {
160 160
 		print '<div class="backimagepublicsuggestconference">';
161
-		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE').'">';
161
+		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="'.getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE').'">';
162 162
 		print '</div>';
163 163
 	}
164 164
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 
470 470
 	if (!$error) {
471 471
 		$db->commit();
472
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
472
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 2);
473 473
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
474 474
 		header("Location: ".$redirection);
475 475
 		exit;
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</span>';
502 502
 print '<br>';
503 503
 // Title
504
-print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
504
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title.' '.$project->label).'</span><br>';
505 505
 print '</div>';
506 506
 
507 507
 // Help text
Please login to merge, or discard this patch.
htdocs/public/project/suggestbooth.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 // Security check
86 86
 $securekeyreceived = GETPOST('securekey', 'alpha');
87
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
87
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 'md5');
88 88
 
89 89
 if ($securekeytocompare != $securekeyreceived) {
90 90
 	print $langs->trans('MissingOrBadSecureKey');
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
 	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH')) {
159 159
 		print '<div class="backimagepublicsuggestbooth">';
160
-		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH').'">';
160
+		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH').'">';
161 161
 		print '</div>';
162 162
 	}
163 163
 
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
533 533
 		}
534 534
 
535
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
535
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 2);
536 536
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
537 537
 		header("Location: ".$redirection);
538 538
 		exit;
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
 print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</span>';
565 565
 print '<br>';
566 566
 // Title
567
-print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
567
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title.' '.$project->label).'</span><br>';
568 568
 print '</div>';
569 569
 
570 570
 
Please login to merge, or discard this patch.
htdocs/bom/tpl/objectline_view.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 // Select of all the sub-BOM lines
256 256
 // From this point to the end of the file, we only take care of sub-BOM lines
257 257
 $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
258
-$sql .= ' WHERE fk_bom ='. (int) $tmpbom->id;
258
+$sql .= ' WHERE fk_bom ='.(int) $tmpbom->id;
259 259
 $resql = $object->db->query($sql);
260 260
 
261 261
 if ($resql) {
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 			$total_cost .= $sub_bom_product->pmp * $sub_bom_line->qty * (float) $line->qty;
353 353
 		} else {	// Minimum purchase price if cost price and PMP aren't defined
354 354
 			$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
355
-			$sql_supplier_price .= ' WHERE fk_product = '. (int) $sub_bom_product->id;
355
+			$sql_supplier_price .= ' WHERE fk_product = '.(int) $sub_bom_product->id;
356 356
 			$resql_supplier_price = $object->db->query($sql_supplier_price);
357 357
 			if ($resql_supplier_price) {
358 358
 				$obj = $object->db->fetch_object($resql_supplier_price);
Please login to merge, or discard this patch.
htdocs/mrp/tpl/originproductline.tpl.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 if ($res) {
57 57
 	print $tmpproduct->getNomUrl(1);
58 58
 	if ($tmpbom->id) {
59
-		print ' ' . $langs->trans("or") . ' ';
59
+		print ' '.$langs->trans("or").' ';
60 60
 		print $tmpbom->getNomUrl(1);
61
-		print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">';
61
+		print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">';
62 62
 		print(!getDolGlobalString('BOM_SHOW_ALL_BOM_BY_DEFAULT') ? img_picto('', 'folder') : img_picto('', 'folder-open'));
63 63
 	}
64 64
 	print '</a>';
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
 if ($tmpbom->id > 0) {
99 99
 	print '<td class="center">';
100
-	print '<input type="checkbox" name="bomlineid[]" value="' . $line->id . '">';
100
+	print '<input type="checkbox" name="bomlineid[]" value="'.$line->id.'">';
101 101
 	print '</td>';
102 102
 } else {
103 103
 	print '<td class="center"></td>';
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 // Select of all the sub-BOM lines
113 113
 $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
114
-$sql .= ' WHERE fk_bom ='. (int) $tmpbom->id;
114
+$sql .= ' WHERE fk_bom ='.(int) $tmpbom->id;
115 115
 $resql = $db->query($sql);
116 116
 
117 117
 if ($resql) {
Please login to merge, or discard this patch.
htdocs/resource/card.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -43,16 +43,16 @@  discard block
 block discarded – undo
43 43
 $ref					= GETPOST('ref', 'alpha');
44 44
 $address				= GETPOST('address', 'alpha');
45 45
 $zip					= GETPOST('zipcode', 'alpha');
46
-$town					= GETPOST('town', 'alpha');
46
+$town = GETPOST('town', 'alpha');
47 47
 $country_id				= GETPOSTINT('country_id');
48
-$state_id				= GETPOSTINT('state_id');
48
+$state_id = GETPOSTINT('state_id');
49 49
 $description			= GETPOST('description', 'restricthtml');
50 50
 $phone					= GETPOST('phone', 'alpha');
51 51
 $email					= GETPOST('email', 'alpha');
52
-$max_users				= GETPOSTINT('max_users');
53
-$url					= GETPOST('url', 'alpha');
54
-$confirm				= GETPOST('confirm', 'aZ09');
55
-$fk_code_type_resource	= GETPOST('fk_code_type_resource', 'aZ09');
52
+$max_users = GETPOSTINT('max_users');
53
+$url = GETPOST('url', 'alpha');
54
+$confirm = GETPOST('confirm', 'aZ09');
55
+$fk_code_type_resource = GETPOST('fk_code_type_resource', 'aZ09');
56 56
 
57 57
 // Protection if external user
58 58
 if ($user->socid > 0) {
@@ -107,18 +107,18 @@  discard block
 block discarded – undo
107 107
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
108 108
 				$action = 'create';
109 109
 			} else {
110
-				$object->ref                    = $ref;
111
-				$object->address				= $address;
112
-				$object->zip					= $zip;
113
-				$object->town					= $town;
110
+				$object->ref = $ref;
111
+				$object->address = $address;
112
+				$object->zip = $zip;
113
+				$object->town = $town;
114 114
 				$object->country_id				= $country_id;
115
-				$object->state_id				= $state_id;
115
+				$object->state_id = $state_id;
116 116
 				$object->description			= $description;
117 117
 				$object->phone					= $phone;
118 118
 				$object->email					= $email;
119
-				$object->max_users				= $max_users;
120
-				$object->url					= $url;
121
-				$object->fk_code_type_resource	= $fk_code_type_resource;
119
+				$object->max_users = $max_users;
120
+				$object->url = $url;
121
+				$object->fk_code_type_resource = $fk_code_type_resource;
122 122
 
123 123
 				// Fill array 'array_options' with data from add form
124 124
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -155,18 +155,18 @@  discard block
 block discarded – undo
155 155
 		if (!$error) {
156 156
 			$res = $object->fetch($id);
157 157
 			if ($res > 0) {
158
-				$object->ref          			= $ref;
159
-				$object->address				= $address;
160
-				$object->zip					= $zip;
161
-				$object->town					= $town;
162
-				$object->country_id             = $country_id;
163
-				$object->state_id				= $state_id;
164
-				$object->description  			= $description;
158
+				$object->ref = $ref;
159
+				$object->address = $address;
160
+				$object->zip = $zip;
161
+				$object->town = $town;
162
+				$object->country_id = $country_id;
163
+				$object->state_id = $state_id;
164
+				$object->description = $description;
165 165
 				$object->phone					= $phone;
166 166
 				$object->email					= $email;
167
-				$object->max_users				= $max_users;
168
-				$object->url					= $url;
169
-				$object->fk_code_type_resource  = $fk_code_type_resource;
167
+				$object->max_users = $max_users;
168
+				$object->url = $url;
169
+				$object->fk_code_type_resource = $fk_code_type_resource;
170 170
 
171 171
 				// Fill array 'array_options' with data from add form
172 172
 				$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
Please login to merge, or discard this patch.
htdocs/eventorganization/core/actions_massactions_mail.inc.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	$nbsent = 0;
63 63
 	$nbignored = 0;
64 64
 	$langs->load("mails");
65
-	include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
65
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
66 66
 
67 67
 	$listofobjectid = array();
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	$oneemailperrecipient = (GETPOSTINT('oneemailperrecipient') ? 1 : 0);
71 71
 
72 72
 	if (!$error) {
73
-		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
73
+		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
74 74
 		$attendee = new ConferenceOrBoothAttendee($db);
75 75
 		$listofselectedid = array();
76 76
 		$listofselectedref = array();
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 			$sendtoid = array();
131 131
 
132 132
 			// Define $sendto
133
-			$sendto = $attendees->thirdparty->name . '<' . trim($attendees->email) . '>';
133
+			$sendto = $attendees->thirdparty->name.'<'.trim($attendees->email).'>';
134 134
 
135 135
 			// Define $sendtocc
136 136
 			$receivercc = GETPOST('receivercc', 'alphawithlgt');
@@ -153,9 +153,9 @@  discard block
 block discarded – undo
153 153
 			$reg = array();
154 154
 			$fromtype = GETPOST('fromtype');
155 155
 			if ($fromtype === 'user') {
156
-				$from = $user->getFullName($langs) . ' <' . $user->email . '>';
156
+				$from = $user->getFullName($langs).' <'.$user->email.'>';
157 157
 			} elseif ($fromtype === 'company') {
158
-				$from = getDolGlobalString('MAIN_INFO_SOCIETE_NOM') . ' <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '>';
158
+				$from = getDolGlobalString('MAIN_INFO_SOCIETE_NOM').' <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
159 159
 			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
160 160
 				$tmp = explode(',', $user->email_aliases);
161 161
 				$from = trim($tmp[($reg[1] - 1)]);
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 				$tmp = explode(',', getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'));
164 164
 				$from = trim($tmp[($reg[1] - 1)]);
165 165
 			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
166
-				$sql = "SELECT rowid, label, email FROM " . MAIN_DB_PREFIX . "c_email_senderprofile WHERE rowid = " . (int) $reg[1];
166
+				$sql = "SELECT rowid, label, email FROM ".MAIN_DB_PREFIX."c_email_senderprofile WHERE rowid = ".(int) $reg[1];
167 167
 				$resql = $db->query($sql);
168 168
 				$obj = $db->fetch_object($resql);
169 169
 				if ($obj) {
170
-					$from = dol_string_nospecial($obj->label, ' ', array(",")) . ' <' . $obj->email . '>';
170
+					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
171 171
 				}
172 172
 			} else {
173
-				$from = dol_string_nospecial(GETPOST('fromname'), ' ', array(",")) . ' <' . GETPOST('frommail') . '>';
173
+				$from = dol_string_nospecial(GETPOST('fromname'), ' ', array(",")).' <'.GETPOST('frommail').'>';
174 174
 			}
175 175
 
176 176
 			$replyto = $from;
@@ -184,12 +184,12 @@  discard block
 block discarded – undo
184 184
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $attendees);
185 185
 
186 186
 			if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
187
-				$urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
188
-				$urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;
189
-				$url_link = $urlwithroot . '/public/agenda/agendaexport.php?format=ical' . ($conf->entity > 1 ? "&entity=" . $conf->entity : "");
190
-				$url_link .= '&exportkey=' . ($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...');
191
-				$url_link .= "&project=" . $listofselectedref[$email]->fk_project . '&module=' . urlencode('@eventorganization') . '&status=' . ConferenceOrBooth::STATUS_CONFIRMED;
192
-				$html_link = '<a href="' . $url_link . '">' . $langs->trans('DownloadICSLink') . '</a>';
187
+				$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
188
+				$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
189
+				$url_link = $urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
190
+				$url_link .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...');
191
+				$url_link .= "&project=".$listofselectedref[$email]->fk_project.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED;
192
+				$html_link = '<a href="'.$url_link.'">'.$langs->trans('DownloadICSLink').'</a>';
193 193
 			}
194 194
 			$substitutionarray['__EVENTORGANIZATION_ICS_LINK__'] = $html_link;
195 195
 			$substitutionarray['__EVENTORGANIZATION_URL_LINK__'] = $url_link;
@@ -211,25 +211,25 @@  discard block
 block discarded – undo
211 211
 			}
212 212
 
213 213
 			// Send mail (substitutionarray must be done just before this)
214
-			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
214
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
215 215
 			$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, array(), array(), array(), $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', "attendees_".$attendees->id, '', $sendcontext);
216 216
 			if ($mailfile->error) {
217
-				$resaction .= '<div class="error">' . $mailfile->error . '</div>';
217
+				$resaction .= '<div class="error">'.$mailfile->error.'</div>';
218 218
 			} else {
219 219
 				$result = $mailfile->sendfile();
220 220
 				if ($result) {
221
-					$resaction .= $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)) . '<br>'; // Must not contain "
221
+					$resaction .= $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)).'<br>'; // Must not contain "
222 222
 					$error = 0;
223 223
 
224
-					dol_syslog("Try to insert email event into agenda for objid=" . $attendees->id . " => objectobj=" . get_class($attendees));
224
+					dol_syslog("Try to insert email event into agenda for objid=".$attendees->id." => objectobj=".get_class($attendees));
225 225
 
226 226
 					$actionmsg = $langs->transnoentities('MailSentByTo', $from, $sendto);
227 227
 					if ($message) {
228 228
 						if ($sendtocc) {
229
-							$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
229
+							$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
230 230
 						}
231
-						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subjectreplaced);
232
-						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
231
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
232
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
233 233
 						$actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
234 234
 					}
235 235
 					$actionmsg2 = '';
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 
253 253
 						if ($error) {
254 254
 							setEventMessages($db->lasterror(), $objectobj2->errors, 'errors');
255
-							dol_syslog("Error in trigger " . $triggername . ' ' . $db->lasterror(), LOG_ERR);
255
+							dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
256 256
 						}
257 257
 					}
258 258
 
@@ -261,26 +261,26 @@  discard block
 block discarded – undo
261 261
 					$langs->load("other");
262 262
 					if ($mailfile->error) {
263 263
 						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
264
-						$resaction .= '<br><div class="error">' . $mailfile->error . '</div>';
264
+						$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
265 265
 					} elseif (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
266 266
 						$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
267 267
 					} else {
268
-						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';
268
+						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto).'<br><div class="error">(unhandled error)</div>';
269 269
 					}
270 270
 				}
271 271
 			}
272 272
 		}
273 273
 	}
274 274
 	$resaction .= ($resaction ? '<br>' : $resaction);
275
-	$resaction .= '<strong>' . $langs->trans("ResultOfMailSending") . ':</strong><br>' . "\n";
276
-	$resaction .= $langs->trans("NbSelected") . ': ' . count($toselect) . "\n<br>";
277
-	$resaction .= $langs->trans("NbIgnored") . ': ' . ($nbignored ? $nbignored : 0) . "\n<br>";
278
-	$resaction .= $langs->trans("NbSent") . ': ' . ($nbsent ? $nbsent : 0) . "\n<br>";
275
+	$resaction .= '<strong>'.$langs->trans("ResultOfMailSending").':</strong><br>'."\n";
276
+	$resaction .= $langs->trans("NbSelected").': '.count($toselect)."\n<br>";
277
+	$resaction .= $langs->trans("NbIgnored").': '.($nbignored ? $nbignored : 0)."\n<br>";
278
+	$resaction .= $langs->trans("NbSent").': '.($nbsent ? $nbsent : 0)."\n<br>";
279 279
 
280 280
 	if ($nbsent) {
281 281
 		$action = ''; // Do not show form post if there was at least one successful sent
282 282
 		//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
283
-		setEventMessages($langs->trans("EMailSentForNElements", $nbsent . '/' . count($toselect)), null, 'mesgs');
283
+		setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
284 284
 		setEventMessages($resaction, null, 'mesgs');
285 285
 	} else {
286 286
 		//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
Please login to merge, or discard this patch.
dev/tools/phan/config_fixer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
30 30
 		//.'|htdocs/[^c][^o][^r][^e][^/].*'  // For testing @phpstan-ignore-line
31 31
 		//.'|htdocs/[^h].*' // For testing on restricted set @phpstan-ignore-line
32
-		.')@';  // @phpstan-ignore-line
32
+		.')@'; // @phpstan-ignore-line
33 33
 
34 34
 // $config['plugins'][] = __DIR__.'/plugins/ParamMatchRegexPlugin.php';
35 35
 $config['plugins'][] = 'DeprecateAliasPlugin';
Please login to merge, or discard this patch.
dev/tools/phan/config_extended.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -60,28 +60,28 @@
 block discarded – undo
60 60
 // Add any issue types (such as 'PhanUndeclaredMethod')
61 61
 // here to inhibit them from being reported
62 62
 $config['suppress_issue_types'] = [
63
-		'PhanCompatibleNegativeStringOffset',	// return false positive
63
+		'PhanCompatibleNegativeStringOffset', // return false positive
64 64
 
65
-		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
66
-		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
67
-		'PhanPluginShortArray',			// Dolibarr uses array()
68
-		'PhanPluginShortArrayList',		// Dolibarr uses array()
65
+		'PhanPluginWhitespaceTab', // Dolibarr used tabs
66
+		'PhanPluginCanUsePHP71Void', // Dolibarr is maintaining 7.0 compatibility
67
+		'PhanPluginShortArray', // Dolibarr uses array()
68
+		'PhanPluginShortArrayList', // Dolibarr uses array()
69 69
 		// Fixers From PHPDocToRealTypesPlugin:
70
-		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
71
-		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
72
-		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
73
-		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
70
+		'PhanPluginCanUseParamType', // Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
71
+		'PhanPluginCanUseReturnType', // Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
72
+		'PhanPluginCanUseNullableParamType', // Fixer - Report/Add nullable parameter types in the function definition
73
+		'PhanPluginCanUseNullableReturnType', // Fixer - Report/Add nullable return types in the function definition
74 74
 
75
-		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
76
-		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
77
-		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
78
-		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
79
-		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
75
+		'PhanPluginNonBoolBranch', // Not essential - 31240+ occurrences
76
+		'PhanPluginNumericalComparison', // Not essential - 19870+ occurrences
77
+		'PhanTypeMismatchArgument', // Not essential - 12300+ occurrences
78
+		'PhanPluginNonBoolInLogicalArith', // Not essential - 11040+ occurrences
79
+		'PhanPluginConstantVariableScalar', // Not essential - 5180+ occurrences
80 80
 		'PhanPluginDuplicateAdjacentStatement',
81
-		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
82
-		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
83
-		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
84
-		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
81
+		'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences
82
+		'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences
83
+		'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning
84
+		'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences
85 85
 	];
86 86
 
87 87
 return $config;
Please login to merge, or discard this patch.