Completed
Branch develop (c16883)
by
unknown
22:59
created
htdocs/core/class/link.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -166,11 +166,11 @@
 block discarded – undo
166 166
 		}
167 167
 
168 168
 		// Clean parameters
169
-		$this->url       = clean_url($this->url, 1);
169
+		$this->url = clean_url($this->url, 1);
170 170
 		if (empty($this->label)) {
171 171
 			$this->label = basename($this->url);
172 172
 		}
173
-		$this->label     = trim($this->label);
173
+		$this->label = trim($this->label);
174 174
 
175 175
 
176 176
 		$this->db->begin();
Please login to merge, or discard this patch.
htdocs/salaries/admin/salaries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@
 block discarded – undo
263 263
 echo '<div>';
264 264
 echo '<table class="noborder centpercent">';
265 265
 echo '<thead>';
266
-echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>';
266
+echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>';
267 267
 echo '</thead>';
268 268
 echo '<tbody>';
269 269
 
Please login to merge, or discard this patch.
htdocs/core/boxes/box_members_subscriptions_by_year.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *	\brief      Module to show box of members
25 25
  */
26 26
 
27
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
28 28
 
29 29
 
30 30
 /**
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$this->max = $max;
85 85
 
86
-		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
87
-		require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';
86
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
87
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
88 88
 		$memberstatic = new Adherent($this->db);
89 89
 		$statictype = new AdherentType($this->db);
90 90
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			$numb = 0;
101 101
 
102 102
 			$sql = "SELECT c.subscription, c.dateadh as dateh";
103
-			$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c";
104
-			$sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")";
103
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
104
+			$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
105 105
 			$sql .= " AND d.rowid = c.fk_adherent";
106 106
 
107 107
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 				$this->info_box_contents[0][0] = array(
217 217
 					'td' => '',
218 218
 					'maxlength' => 500,
219
-					'text' => ($this->db->error() . ' sql=' . $sql),
219
+					'text' => ($this->db->error().' sql='.$sql),
220 220
 				);
221 221
 			}
222 222
 		} else {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_accountancy_last_manual_entries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 				while ($line < $num) {
101 101
 					$objp		= $this->db->fetch_object($result);
102 102
 					$date		= $this->db->jdate($objp->date_movement);
103
-					$journal	= $objp->code_journal;
103
+					$journal = $objp->code_journal;
104 104
 					$label = $objp->label_operation;
105 105
 					$amount = $objp->amount;
106 106
 
Please login to merge, or discard this patch.
htdocs/cron/info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
  * View
44 44
  */
45 45
 
46
-$form = new Form($db);	// $form is required as global value into dol_banner_tab
46
+$form = new Form($db); // $form is required as global value into dol_banner_tab
47 47
 
48 48
 llxHeader('', $langs->trans("CronInfo"));
49 49
 
Please login to merge, or discard this patch.
htdocs/admin/system/filecheck.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@
 block discarded – undo
156 156
 	}
157 157
 }
158 158
 if (GETPOST('target') == 'remote') {
159
-	$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.
159
+	$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.
160 160
 
161 161
 	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
162 162
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
Please login to merge, or discard this patch.
htdocs/datapolicy/class/datapolicycron.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -469,7 +469,7 @@
 block discarded – undo
469 469
 						$object->fetch($obj->rowid);
470 470
 						$object->id = $obj->rowid;
471 471
 
472
-						$action = 'anonymize';	// TODO Offer also action "delete" in setup of module
472
+						$action = 'anonymize'; // TODO Offer also action "delete" in setup of module
473 473
 
474 474
 						if ($action == 'anonymize') {
475 475
 							if ($object->isObjectUsed($obj->rowid) == 0) {			// If object to clean is used
Please login to merge, or discard this patch.
htdocs/fourn/facture/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@
 block discarded – undo
193 193
 			$facavoir->fetch($facid);
194 194
 			$invoicecredits[] = $facavoir->getNomUrl(1);
195 195
 		}
196
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
196
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits).')';
197 197
 	}
198 198
 	/*
199 199
 	if ($facidnext > 0) {
Please login to merge, or discard this patch.
htdocs/modulebuilder/template/class/actions_mymodule.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -335,10 +335,10 @@
 block discarded – undo
335 335
 			if (in_array($element, ['context1', 'context2'])) {
336 336
 				$datacount = 0;
337 337
 
338
-				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&amp;module='.$element;
338
+				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&amp;module='.$element;
339 339
 				$parameters['head'][$counter][1] = $langs->trans('MyModuleTab');
340 340
 				if ($datacount > 0) {
341
-					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>';
341
+					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>';
342 342
 				}
343 343
 				$parameters['head'][$counter][2] = 'mymoduleemails';
344 344
 				$counter++;
Please login to merge, or discard this patch.