Completed
Branch develop (6cdb7c)
by
unknown
19:03
created
htdocs/compta/facture/invoicetemplate_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 $search_date_endday = GETPOST('search_date_endday', 'int');
81 81
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
82 82
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
83
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
83
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
84 84
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
85 85
 $search_date_when_startday = GETPOST('search_date_when_startday', 'int');
86 86
 $search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 $search_date_when_endday = GETPOST('search_date_when_endday', 'int');
89 89
 $search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
90 90
 $search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
91
-$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
91
+$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver
92 92
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
93 93
 $search_recurring = GETPOST('search_recurring', 'int');
94 94
 $search_frequency = GETPOST('search_frequency', 'alpha');
Please login to merge, or discard this patch.
htdocs/fourn/paiement/list.php 2 patches
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.
Spacing   +10 added lines, -10 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
63
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64 64
 $search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65 65
 $search_company			= GETPOST('search_company', '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');
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
 	$sql .= natural_search('p.ref', $search_ref);
208 208
 }
209 209
 if ($search_date_start) {
210
-	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
210
+	$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
211 211
 }
212 212
 if ($search_date_end) {
213
-	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
213
+	$sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
214 214
 }
215 215
 
216 216
 if ($search_company) {
Please login to merge, or discard this patch.
htdocs/core/ajax/fetchKnowledgeRecord.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,12 +81,12 @@
 block discarded – undo
81 81
 		$response = array();
82 82
 		while ($i < $num) {
83 83
 			$obj = $db->fetch_object($resql);
84
-			$response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url);
84
+			$response[] = array('title'=>$obj->question, 'ref'=>$obj->ref, 'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url'=>$obj->url);
85 85
 			$i++;
86 86
 		}
87 87
 	} else {
88 88
 		dol_print_error($db);
89 89
 	}
90
-	$response =json_encode($response);
90
+	$response = json_encode($response);
91 91
 	echo $response;
92 92
 }
Please login to merge, or discard this patch.
htdocs/salaries/document.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -214,16 +214,16 @@
 block discarded – undo
214 214
 	print '<table class="border tableforfield centpercent">';
215 215
 
216 216
 	print "<tr>";
217
-	print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>';
217
+	print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>';
218 218
 	print dol_print_date($object->datesp, 'day');
219 219
 	print '</td></tr>';
220 220
 
221 221
 	print "<tr>";
222
-	print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
222
+	print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
223 223
 	print dol_print_date($object->dateep, 'day');
224 224
 	print '</td></tr>';
225 225
 
226
-	print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
226
+	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
227 227
 
228 228
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
229 229
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,9 @@
 block discarded – undo
132 132
  */
133 133
 
134 134
 $form = new Form($db);
135
-if (isModEnabled('project')) $formproject = new FormProjets($db);
135
+if (isModEnabled('project')) {
136
+	$formproject = new FormProjets($db);
137
+}
136 138
 
137 139
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
138 140
 $help_url = "";
Please login to merge, or discard this patch.
htdocs/core/class/rssparser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
 			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
241 241
 				//print 'xx'.LIBXML_NOCDATA;
242 242
 				libxml_use_internal_errors(false);
243
-				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA|LIBXML_NOCDATA);
243
+				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA | LIBXML_NOCDATA);
244 244
 			} else {
245 245
 				if (!function_exists('xml_parser_create')) {
246 246
 					$this->error = 'Function xml_parser_create are not supported by your PHP';
Please login to merge, or discard this patch.
htdocs/admin/system/dolibarr.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
52 52
 	//var_dump($result['content']);
53 53
 	if (function_exists('simplexml_load_string')) {
54
-		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
54
+		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
55 55
 	} else {
56 56
 		setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
57 57
 	}
Please login to merge, or discard this patch.
htdocs/admin/system/filecheck.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -165,13 +165,13 @@
 block discarded – undo
165 165
 	}
166 166
 }
167 167
 if (GETPOST('target') == 'remote') {
168
-	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into api_setup.class.php.
168
+	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
169 169
 
170 170
 	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
171 171
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
172 172
 		$xmlfile = $xmlarray['content'];
173 173
 		//print "xmlfilestart".$xmlfile."xmlfileend";
174
-		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
174
+		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
175 175
 	} else {
176 176
 		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
177 177
 		setEventMessages($errormsg, null, 'errors');
Please login to merge, or discard this patch.
htdocs/projet/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	while ($i < $num) {
153 153
 		$objp = $db->fetch_object($resql);
154 154
 		$listofoppstatus[$objp->rowid] = $objp->percent;
155
-		$listofopplabel[$objp->rowid] = $objp->label;		// default label if translation from "OppStatus".code not found.
155
+		$listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
156 156
 		$listofoppcode[$objp->rowid] = $objp->code;
157 157
 		switch ($objp->code) {
158 158
 			case 'PROSP':
Please login to merge, or discard this patch.
htdocs/hrm/position_document.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -81,9 +81,9 @@
 block discarded – undo
81 81
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
82 82
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
83 83
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
84
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
85
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
86
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
84
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
85
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
86
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
87 87
 
88 88
 // Load translation files required by the page
89 89
 $langs->loadLangs(array("hrm", "companies", "other", "mails"));
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.