Completed
Branch develop (630c19)
by
unknown
15:51
created
htdocs/projet/class/api_projects.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
123 123
 		}
124 124
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
125
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
125
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
126 126
 		if ($category > 0) {
127 127
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
128 128
 		}
Please login to merge, or discard this patch.
htdocs/expedition/class/api_shipments.class.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -623,15 +623,15 @@
 block discarded – undo
623 623
 	*/
624 624
 
625 625
 	/**
626
-	* Close a shipment (Classify it as "Delivered")
627
-	*
628
-	* @param   int     $id             Expedition ID
629
-	* @param   int     $notrigger      Disabled triggers
630
-	*
631
-	* @url POST    {id}/close
632
-	*
633
-	* @return  object
634
-	*/
626
+	 * Close a shipment (Classify it as "Delivered")
627
+	 *
628
+	 * @param   int     $id             Expedition ID
629
+	 * @param   int     $notrigger      Disabled triggers
630
+	 *
631
+	 * @url POST    {id}/close
632
+	 *
633
+	 * @return  object
634
+	 */
635 635
 	public function close($id, $notrigger = 0)
636 636
 	{
637 637
 		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
Please login to merge, or discard this patch.
htdocs/printing/admin/printing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
 			$i++;
202 202
 
203 203
 			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') {
204
-				$keyforprovider = '';	// @BUG This must be set
204
+				$keyforprovider = ''; // @BUG This must be set
205 205
 
206 206
 				// Token
207 207
 				print '<tr class="oddeven">';
Please login to merge, or discard this patch.
htdocs/admin/oauthlogintokens.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -147,18 +147,18 @@  discard block
 block discarded – undo
147 147
 				$provider.'_NAME',
148 148
 				$provider.'_ID',
149 149
 				$provider.'_SECRET',
150
-				$provider.'_URLAUTHORIZE',	// For custom oauth links
150
+				$provider.'_URLAUTHORIZE', // For custom oauth links
151 151
 				$provider.'_SCOPE'			// For custom oauth links
152 152
 			);
153 153
 		}
154 154
 	}
155 155
 
156
-	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
156
+	$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
157 157
 
158 158
 	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
159 159
 	foreach ($listinsetup as $key) {
160 160
 		$supported = 0;
161
-		$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
161
+		$keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
162 162
 		$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
163 163
 		$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
164 164
 		if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		if (getDolGlobalString($key[4])) {
179 179
 			$shortscope = getDolGlobalString($key[4]);
180 180
 		}
181
-		$state = $shortscope;	// TODO USe a better state
181
+		$state = $shortscope; // TODO USe a better state
182 182
 
183 183
 		// Define $urltorenew, $urltodelete, $urltocheckperms
184 184
 		if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_last_modified_knowledgerecord.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 				$sql .= " AND k.fk_soc= ".((int) $user->socid);
119 119
 			}
120 120
 
121
-			$sql.= " AND k.status > 0";
121
+			$sql .= " AND k.status > 0";
122 122
 
123 123
 			$sql .= " ORDER BY k.tms DESC, k.rowid DESC ";
124 124
 			$sql .= $this->db->plimit($max, 0);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 					$labellang = ($objp->lang ? $langs->trans('Language_'.$objp->lang) : '');
164 164
 					$this->info_box_contents[$i][$r] = array(
165 165
 						'td' => 'class="tdoverflowmax100"',
166
-						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang,
166
+						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"').$labellang,
167 167
 						'asis' => 1,
168 168
 					);
169 169
 					$r++;
Please login to merge, or discard this patch.
htdocs/core/boxes/box_last_knowledgerecord.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 				$sql .= " AND k.fk_soc= ".((int) $user->socid);
119 119
 			}
120 120
 
121
-			$sql.= " AND k.status > 0";
121
+			$sql .= " AND k.status > 0";
122 122
 
123 123
 			$sql .= " ORDER BY k.date_creation DESC, k.rowid DESC ";
124 124
 			$sql .= $this->db->plimit($max, 0);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 					$labellang = ($objp->lang ? $langs->trans('Language_'.$objp->lang) : '');
164 164
 					$this->info_box_contents[$i][$r] = array(
165 165
 						'td' => 'class="tdoverflowmax100"',
166
-						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang,
166
+						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"').$labellang,
167 167
 						'asis' => 1,
168 168
 					);
169 169
 					$r++;
Please login to merge, or discard this patch.
htdocs/user/virtualcard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	print $langs->trans("Text");
289 289
 	print '</td><td>';
290 290
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
291
-	$extendededitor = 0;	// We force no WYSIWYG editor
291
+	$extendededitor = 0; // We force no WYSIWYG editor
292 292
 	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, $extendededitor, ROWS_5, '90%');
293 293
 	$doleditor->Create();
294 294
 	print "</td></tr>\n";
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 	print '<br>';
304 304
 
305
-	print '</div>';	// End hide/show
305
+	print '</div>'; // End hide/show
306 306
 
307 307
 	print '<br>';
308 308
 
Please login to merge, or discard this patch.
htdocs/barcode/printsheet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BarcodeValue")), null, 'errors');
117 117
 		$error++;
118 118
 	}
119
-	$MAXLENGTH = 51200;	// Limit set to 50Ko
119
+	$MAXLENGTH = 51200; // Limit set to 50Ko
120 120
 	if (dol_strlen($forbarcode) > $MAXLENGTH) {			// barcode value
121 121
 		setEventMessages($langs->trans("ErrorFieldTooLong", $langs->transnoentitiesnoconv("BarcodeValue")).' ('.$langs->trans("RequireXStringMax", $MAXLENGTH).')', null, 'errors');
122 122
 		$error++;
Please login to merge, or discard this patch.
htdocs/product/stock/stats/commande_fournisseur.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 
40 40
 $id = GETPOST('id', 'int');
41 41
 $ref = GETPOST('ref', 'alpha');
42
-$batch  	= GETPOST('batch', 'alpha');
43
-$objectid  = GETPOST('productid', 'int');
42
+$batch = GETPOST('batch', 'alpha');
43
+$objectid = GETPOST('productid', 'int');
44 44
 
45 45
 // Security check
46 46
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
Please login to merge, or discard this patch.