Completed
Branch develop (88253b)
by
unknown
18:45
created
htdocs/admin/tools/export_files.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
23 23
  *		\brief      Page to export documents into a compressed file
24 24
  */
25 25
 
26
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
27
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
26
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
27
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
28 28
 }
29 29
 
30 30
 // Load Dolibarr environment
Please login to merge, or discard this patch.
htdocs/admin/supplier_proposal.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $action = GETPOST('action', 'aZ09');
45 45
 $value = GETPOST('value', 'alpha');
46
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
46
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
47 47
 
48 48
 $label = GETPOST('label', 'alpha');
49 49
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		setEventMessages($langs->trans('Error'), null, 'errors');
212 212
 	} else {
213 213
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
214
-		header("Location: " . $_SERVER["PHP_SELF"]);
214
+		header("Location: ".$_SERVER["PHP_SELF"]);
215 215
 		exit();
216 216
 	}
217 217
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		setEventMessages($langs->trans('Error'), null, 'errors');
227 227
 	} else {
228 228
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
229
-		header("Location: " . $_SERVER["PHP_SELF"]);
229
+		header("Location: ".$_SERVER["PHP_SELF"]);
230 230
 		exit();
231 231
 	}
232 232
 }
Please login to merge, or discard this patch.
htdocs/admin/company.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), $tooltiplogo).'</label></td><td>';
490 490
 print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
491 491
 if ($maxmin > 0) {
492
-	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
492
+	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
493 493
 }
494 494
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">';
495 495
 print '</div>';
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 $maxfilesizearray = getMaxFileSizeArray();
532 532
 $maxmin = $maxfilesizearray['maxmin'];
533 533
 if ($maxmin > 0) {
534
-	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
534
+	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
535 535
 }
536 536
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">';
537 537
 print '</div>';
Please login to merge, or discard this patch.
htdocs/core/tpl/commonfields_view.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
156 156
 		$rightpart .= ' tdtop';
157 157
 	}
158
-	$rightpart.= '">';
158
+	$rightpart .= '">';
159 159
 	$labeltoshow = '';
160 160
 	if (!empty($val['help'])) {
161 161
 		$labeltoshow .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 				$out = $object->showOutputField($val, $key, $value, '', '', '', 0);
196 196
 				$rightpart .= showValueWithClipboardCPButton($out, 0, $out);
197 197
 			} else {
198
-				$rightpart.= $object->showOutputField($val, $key, $value, '', '', '', 0);
198
+				$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
199 199
 			}
200 200
 		}
201 201
 		if (preg_match('/^(text|html)/', $val['type'])) {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_graph_ticket_by_severity.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 		$badgeStatus7 = '#baa32b';
84 84
 		$badgeStatus8 = '#993013';
85 85
 		$badgeStatus9 = '#e7f0f0';
86
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
87
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
86
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
87
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
88 88
 		}
89 89
 		$this->max = $max;
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		$colorseriesstat = array();
102 102
 		if ($user->hasRight('ticket', 'read')) {
103 103
 			$sql = "SELECT cts.rowid, cts.label, cts.code";
104
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
104
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts";
105 105
 			$sql .= " WHERE cts.active = 1";
106 106
 			$sql .= $this->db->order('cts.rowid', 'ASC');
107 107
 			$resql = $this->db->query($sql);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 			$dataseries = array();
139 139
 			$data = array();
140 140
 			$sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb";
141
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
141
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
142 142
 			$sql .= " WHERE t.fk_statut <> 8";
143 143
 			$sql .= " GROUP BY t.severity_code";
144 144
 			$resql = $this->db->query($sql);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 				}
153 153
 				foreach ($listofoppcode as $rowid => $code) {
154 154
 					$dataseries[] = array(
155
-						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
155
+						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code),
156 156
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
157 157
 					);
158 158
 				}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
191 191
 				}
192 192
 				$stringtoprint .= '</div>';
193
-				$this->info_box_contents[][]=array(
193
+				$this->info_box_contents[][] = array(
194 194
 					'td' => 'class="center"',
195 195
 					'text' => $stringtoprint
196 196
 				);
Please login to merge, or discard this patch.
htdocs/core/actions_setmoduleoptions.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -78,19 +78,19 @@  discard block
 block discarded – undo
78 78
 
79 79
 	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
80 80
 	foreach ($listofdir as $key => $tmpdir) {
81
-		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
81
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
82 82
 		if (!$tmpdir) {
83 83
 			unset($listofdir[$key]);
84 84
 			continue;
85 85
 		}
86
-		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
86
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
87 87
 		if (!is_dir($tmpdir)) {
88 88
 			if (empty($nomessageinsetmoduleoptions)) {
89 89
 				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
90 90
 			}
91 91
 		} else {
92 92
 			$upload_dir = $tmpdir;
93
-			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
93
+			break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
94 94
 		}
95 95
 	}
96 96
 
@@ -130,19 +130,19 @@  discard block
 block discarded – undo
130 130
 
131 131
 		foreach ($listofdir as $key => $tmpdir) {
132 132
 			$tmpdir = trim($tmpdir);
133
-			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
133
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
134 134
 			if (!$tmpdir) {
135 135
 				unset($listofdir[$key]);
136 136
 				continue;
137 137
 			}
138
-			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
138
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
139 139
 			if (!is_dir($tmpdir)) {
140 140
 				if (empty($nomessageinsetmoduleoptions)) {
141 141
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
142 142
 				}
143 143
 			} else {
144 144
 				$upload_dir = $tmpdir;
145
-				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
145
+				break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
146 146
 			}
147 147
 		}
148 148
 
Please login to merge, or discard this patch.
htdocs/core/modules/workstation/mod_workstation_standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
  *  \ingroup    workstation
24 24
  *  \brief      File of class to manage Workstation numbering rules standard
25 25
  */
26
-require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
26
+require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php';
27 27
 
28 28
 /**
29 29
  * Class to manage the Standard numbering rule for Workstation
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -135,8 +135,8 @@
 block discarded – undo
135 135
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
136 136
 					'firstname' => '', // For thirdparties, firstname is ''
137 137
 					'other' =>
138
-					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.	// date start real
139
-					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.			// date end planned
138
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real
139
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned
140 140
 					('Contract='.$obj->fk_contrat).';'.
141 141
 					('ContactLine='.$obj->cdid),
142 142
 					'source_url' => $this->url($obj->id),
Please login to merge, or discard this patch.
htdocs/hrm/job_note.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
107 107
 
108 108
 	$morehtmlref = '<div class="refid">';
109
-	$morehtmlref.= $object->label;
109
+	$morehtmlref .= $object->label;
110 110
 	$morehtmlref .= '</div>';
111 111
 
112 112
 
Please login to merge, or discard this patch.