Completed
Branch develop (f5af02)
by
unknown
17:35
created
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/class/cunits.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -429,7 +429,7 @@
 block discarded – undo
429 429
 		if ($mode == 'short_label') {
430 430
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");
431 431
 		} elseif ($mode == 'code') {
432
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '". $this->db->escape($unit_type) ."'");
432
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");
433 433
 		}
434 434
 
435 435
 		return $code;
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/product_batch/mod_sn_advanced.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
 			}
155 155
 		}
156 156
 
157
-		if (!$mask)	{
157
+		if (!$mask) {
158 158
 			$this->error = 'NotConfigured';
159 159
 			return 0;
160 160
 		}
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/projet/tasks/task.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
 $title = $object->ref;
227 227
 if (!empty($withproject)) {
228
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
228
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
229 229
 }
230 230
 $help_url = '';
231 231
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 		// Title
267 267
 		$morehtmlref .= $projectstatic->title;
268 268
 		// Thirdparty
269
-		if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) {
269
+		if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
270 270
 			$morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project');
271 271
 		}
272 272
 		$morehtmlref .= '</div>';
Please login to merge, or discard this patch.
htdocs/knowledgemanagement/knowledgerecord_card.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search
45 45
 $backtopage = GETPOST('backtopage', 'alpha');
46 46
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
47
-$lineid   = GETPOST('lineid', 'int');
47
+$lineid = GETPOST('lineid', 'int');
48 48
 
49 49
 // Initialize technical objects
50 50
 $object = new KnowledgeRecord($db);
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 	print '<table class="border centpercent tableforfield">'."\n";
426 426
 
427 427
 	// Common attributes
428
-	$keyforbreak='fk_c_ticket_category';	// We change column just before this field
428
+	$keyforbreak = 'fk_c_ticket_category'; // We change column just before this field
429 429
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
430 430
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
431 431
 	$object->fields['answer']['enabled'] = 0;
Please login to merge, or discard this patch.
htdocs/expedition/list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 
216 216
 // If massaction is close
217 217
 if ($massaction == 'classifyclose') {
218
-	$error=0;
218
+	$error = 0;
219 219
 	$selectids = GETPOST('toselect', 'array');
220 220
 	foreach ($selectids as $selectid) {
221 221
 		//	$object->fetch($selectid);
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
 			if ($searchCategoryProductOperator == 0) {
421 421
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
422 422
 			} else {
423
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
423
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
424 424
 			}
425 425
 		}
426 426
 	}
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
536 536
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
537 537
 }
538
-if ($search_datedelivery_start)	{
538
+if ($search_datedelivery_start) {
539 539
 	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
540 540
 }
541 541
 if ($search_datedelivery_end) {
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 
892 892
 	$shipment->id = $obj->rowid;
893 893
 	$shipment->ref = $obj->ref;
894
-	$shipment->shipping_method_id=$obj->fk_shipping_method;
894
+	$shipment->shipping_method_id = $obj->fk_shipping_method;
895 895
 
896 896
 	$companystatic->id = $obj->socid;
897 897
 	$companystatic->ref = $obj->name;
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
 		}
1028 1028
 		if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
1029 1029
 			// Get code using getLabelFromKey
1030
-			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
1030
+			$code = $langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
1031 1031
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
1032 1032
 			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
1033 1033
 			print '</td>';
Please login to merge, or discard this patch.
htdocs/debugbar/class/DataCollector/DolPhpCollector.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	{
61 61
 		$messages = $this->messages;
62 62
 
63
-		usort($messages, function ($itemA, $itemB) {
63
+		usort($messages, function($itemA, $itemB) {
64 64
 			if ($itemA['time'] === $itemB['time']) {
65 65
 				return 0;
66 66
 			}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			if ($type = $severity & (2 ** $i)) {
120 120
 				$label = $this->friendlyErrorType($type);
121 121
 				$this->messages[] = [
122
-					'message' => $message . ' (' . $fileName . ':' . $line . ')',
122
+					'message' => $message.' ('.$fileName.':'.$line.')',
123 123
 					'message_html' => null,
124 124
 					'is_string' => true,
125 125
 					'label' => $label,
Please login to merge, or discard this patch.