Completed
Branch develop (c4a19f)
by
unknown
19:22
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/core/db/sqlite3.class.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1270,7 +1270,7 @@
 block discarded – undo
1270 1270
 
1271 1271
 		// TODO prendre en compte le filtre
1272 1272
 		foreach ($pragmas as $var) {
1273
-			$sql = "PRAGMA $var";
1273
+			$sql = "pragma $var";
1274 1274
 			$resql = $this->query($sql);
1275 1275
 			if ($resql) {
1276 1276
 				$obj = $this->fetch_row($resql);
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/projet/class/project.class.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,8 +126,8 @@
 block discarded – undo
126 126
 	public $usage_bill_time; // Is the time spent on project must be invoiced or not
127 127
 
128 128
 	/**
129
-	   * @var integer		Event organization: Use Event Organization
130
-	   */
129
+	 * @var integer		Event organization: Use Event Organization
130
+	 */
131 131
 	public $usage_organize_event;
132 132
 
133 133
 	/**
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1741,7 +1741,7 @@  discard block
 block discarded – undo
1741 1741
 		global $langs, $conf;
1742 1742
 
1743 1743
 		$error = 0;
1744
-		$clone_project_id = 0;   // For static toolcheck
1744
+		$clone_project_id = 0; // For static toolcheck
1745 1745
 
1746 1746
 		dol_syslog("createFromClone clone_contact=".json_encode($clone_contact)." clone_task=".json_encode($clone_task)." clone_project_file=".json_encode($clone_project_file)." clone_note=".json_encode($clone_note)." move_date=".json_encode($move_date), LOG_DEBUG);
1747 1747
 
@@ -2035,7 +2035,7 @@  discard block
 block discarded – undo
2035 2035
 		if ($tableName == "actioncomm") {
2036 2036
 			$sql .= " SET fk_project=".$this->id;
2037 2037
 			$sql .= " WHERE id=".((int) $elementSelectId);
2038
-		} elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) {
2038
+		} elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) {
2039 2039
 			$sql .= " SET fk_project=".$this->id;
2040 2040
 			$sql .= " WHERE rowid=".((int) $elementSelectId);
2041 2041
 		} else {
@@ -2226,7 +2226,7 @@  discard block
 block discarded – undo
2226 2226
 					$date = explode('-', $obj->element_date);
2227 2227
 					$week_number = getWeekNumber((int) $date[2], (int) $date[1], (int) $date[0]);
2228 2228
 				}
2229
-				'@phan-var-force int $week_number';  // Needed because phan considers it might be null
2229
+				'@phan-var-force int $week_number'; // Needed because phan considers it might be null
2230 2230
 				if (empty($weekalreadyfound[$week_number])) {
2231 2231
 					$this->monthWorkLoad[$week_number] = $obj->element_duration;
2232 2232
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration;
@@ -2570,7 +2570,7 @@  discard block
 block discarded – undo
2570 2570
 			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Author").'</span>';
2571 2571
 			$return .= '<span> : '.$user->getNomUrl(1).'</span>';
2572 2572
 		}*/
2573
-		$return .= '<br><div>';	// start div line status
2573
+		$return .= '<br><div>'; // start div line status
2574 2574
 		if ($this->usage_opportunity && $this->opp_status_code) {
2575 2575
 			//$return .= '<br><span class="info-bo-label opacitymedium">'.$langs->trans("OpportunityStatusShort").'</span>';
2576 2576
 			//$return .= '<div class="small inline-block">'.dol_trunc($langs->trans("OppStatus".$this->opp_status_code), 5).'</div>';
@@ -2580,7 +2580,7 @@  discard block
 block discarded – undo
2580 2580
 		if (method_exists($this, 'getLibStatut')) {
2581 2581
 			$return .= '<div class="info-box-status small inline-block valignmiddle">'.$this->getLibStatut(3).'</div>';
2582 2582
 		}
2583
-		$return .= '</div>';	// end div line status
2583
+		$return .= '</div>'; // end div line status
2584 2584
 
2585 2585
 		$return .= '</div>';
2586 2586
 		$return .= '</div>';
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.