Completed
Branch develop (d8116b)
by
unknown
20:02
created
htdocs/projet/activity/perday.php 1 patch
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,14 @@
 block discarded – undo
96 96
 }
97 97
 
98 98
 $daytoparsegmt = dol_now('gmt');
99
-if ($yearofday && $monthofday && $dayofday) $daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt'); // xxxofday is value of day after submit action 'addtime'
100
-elseif ($year && $month && $day) $daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt'); // this are value submited after submit of action 'submitdateselect'
99
+if ($yearofday && $monthofday && $dayofday) {
100
+	$daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt');
101
+}
102
+// xxxofday is value of day after submit action 'addtime'
103
+elseif ($year && $month && $day) {
104
+	$daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt');
105
+}
106
+// this are value submited after submit of action 'submitdateselect'
101 107
 
102 108
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
103 109
 	$usertoprocess = $user;
Please login to merge, or discard this patch.
htdocs/expensereport/payment/list.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,20 +53,20 @@  discard block
 block discarded – undo
53 53
 // Security check
54 54
 if ($user->socid) $socid = $user->socid;
55 55
 
56
-$search_ref				= GETPOST('search_ref', 'alpha');
57
-$search_date_startday	= GETPOST('search_date_startday', 'int');
58
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
59
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
56
+$search_ref = GETPOST('search_ref', 'alpha');
57
+$search_date_startday = GETPOST('search_date_startday', 'int');
58
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
59
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
60 60
 $search_date_endday		= GETPOST('search_date_endday', 'int');
61
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
61
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62 62
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
63
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
64
-$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65
-$search_user			= GETPOST('search_user', 'alpha');
63
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65
+$search_user = GETPOST('search_user', 'alpha');
66 66
 $search_payment_type	= GETPOST('search_payment_type');
67
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
67
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
68 68
 $search_bank_account	= GETPOST('search_bank_account', 'int');
69
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
69
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
70 70
 
71 71
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
72 72
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 	$sql .= natural_search('pndf.rowid', $search_ref);
199 199
 }
200 200
 if ($search_date_start) {
201
-	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
201
+	$sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'";
202 202
 }
203 203
 if ($search_date_end) {
204
-	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
204
+	$sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'";
205 205
 }
206 206
 
207 207
 if ($search_user) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,9 @@
 block discarded – undo
49 49
 $socid = GETPOST('socid', 'int');
50 50
 
51 51
 // Security check
52
-if ($user->socid) $socid = $user->socid;
52
+if ($user->socid) {
53
+	$socid = $user->socid;
54
+}
53 55
 
54 56
 $search_ref				= GETPOST('search_ref', 'alpha');
55 57
 $search_date_startday	= GETPOST('search_date_startday', 'int');
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentjobposition_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -303,7 +303,7 @@
 block discarded – undo
303 303
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
304 304
 				}
305 305
 				if (preg_match('/_dtend$/', $key)) {
306
-					$sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'";
306
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
307 307
 				}
308 308
 			}
309 309
 		}
Please login to merge, or discard this patch.
htdocs/debugbar/class/DataCollector/DolLogsCollector.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 	{
74 74
 		global $conf;
75 75
 
76
-		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
76
+		$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
77 77
 
78 78
 		if ($uselogfile) {
79 79
 			$this->getStorageLogs($this->path);
Please login to merge, or discard this patch.
htdocs/admin/emailcollector_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -507,7 +507,7 @@
 block discarded – undo
507 507
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
508 508
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
509 509
 	}
510
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
510
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
511 511
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
512 512
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
513 513
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
 			if (!function_exists('simplexml_load_string')) {
236 236
 				throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.');
237 237
 			}
238
-			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
238
+			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
239 239
 			if (libxml_get_errors()) {
240 240
 				$msg = var_export(libxml_get_errors(), true);
241 241
 				libxml_clear_errors();
Please login to merge, or discard this patch.
htdocs/adherents/partnership.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,9 @@
 block discarded – undo
129 129
 }
130 130
 
131 131
 $object->fields['fk_member']['visible'] = 0;
132
-if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
132
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) {
133
+	$object->fields['reason_decline_or_cancel']['visible'] = 1;
134
+}
133 135
 $object->fields['note_public']['visible'] = 1;
134 136
 
135 137
 
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36
-$langs->loadLangs(array("companies","members","partnership", "other"));
36
+$langs->loadLangs(array("companies", "members", "partnership", "other"));
37 37
 
38 38
 // Get parameters
39 39
 $id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 }
53 53
 
54 54
 // Initialize technical objects
55
-$object 		= new Partnership($db);
56
-$extrafields 	= new ExtraFields($db);
57
-$adht 			= new AdherentType($db);
55
+$object = new Partnership($db);
56
+$extrafields = new ExtraFields($db);
57
+$adht = new AdherentType($db);
58 58
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
59 59
 $hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
60 60
 
Please login to merge, or discard this patch.
htdocs/core/lib/website2.lib.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		if ($backupold) {
158 158
 			dol_delete_file($filetpl.'.old');
159 159
 			$result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0);
160
-			if (! $result) {
160
+			if (!$result) {
161 161
 				return false;
162 162
 			}
163 163
 		} else {
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
347 347
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
348 348
 						$indexcontent .= "}\n";
349
-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
349
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of .
350 350
 						$indexcontent .= '// END PHP ?>'."\n";
351 351
 						$result = file_put_contents($fileindexsub, $indexcontent);
352 352
 						if ($result === false) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,7 +109,9 @@  discard block
 block discarded – undo
109 109
 			$filename = basename($filealias);
110 110
 			foreach (explode(',', $object->otherlang) as $sublang) {
111 111
 				// Avoid to erase main alias file if $sublang is empty string
112
-				if (empty(trim($sublang))) continue;
112
+				if (empty(trim($sublang))) {
113
+					continue;
114
+				}
113 115
 				$filealiassub = $dirname.'/'.$sublang.'/'.$filename;
114 116
 
115 117
 				$aliascontent = '<?php'."\n";
@@ -332,7 +334,9 @@  discard block
 block discarded – undo
332 334
 					$dirname = dirname($fileindex);
333 335
 					foreach (explode(',', $object->otherlang) as $sublang) {
334 336
 						// Avoid to erase main alias file if $sublang is empty string
335
-						if (empty(trim($sublang))) continue;
337
+						if (empty(trim($sublang))) {
338
+							continue;
339
+						}
336 340
 						$fileindexsub = $dirname.'/'.$sublang.'/index.php';
337 341
 
338 342
 						// Same indexcontent than previously but with ../ instead of ./ for master and tpl file include/require_once.
Please login to merge, or discard this patch.
htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -254,7 +254,7 @@
 block discarded – undo
254 254
 		// Clean data
255 255
 		// $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
256 256
 
257
-		if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) {
257
+		if ($this->knowledgerecord->create(DolibarrApiAccess::$user) < 0) {
258 258
 			throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors));
259 259
 		}
260 260
 		return $this->knowledgerecord->id;
Please login to merge, or discard this patch.