Completed
Branch develop (6b48e0)
by
unknown
14:33
created
htdocs/core/modules/modWebhook.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -259,17 +259,17 @@
 block discarded – undo
259 259
 		$r = 0;
260 260
 		// Add here entries to declare new permissions
261 261
 		/* BEGIN MODULEBUILDER PERMISSIONS */
262
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
262
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
263 263
 		$this->rights[$r][1] = 'Read Webhooks'; // Permission label
264 264
 		$this->rights[$r][4] = 'webhook_target';
265 265
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->read)
266 266
 		$r++;
267
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
267
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
268 268
 		$this->rights[$r][1] = 'Create/Update Webhooks'; // Permission label
269 269
 		$this->rights[$r][4] = 'webhook_target';
270 270
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->write)
271 271
 		$r++;
272
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
272
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
273 273
 		$this->rights[$r][1] = 'Delete Webhooks'; // Permission label
274 274
 		$this->rights[$r][4] = 'webhook_target';
275 275
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->delete)
Please login to merge, or discard this patch.
htdocs/core/modules/printing/printgcp.modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 				'type'=>'info',
117 117
 			);
118 118
 		} else {
119
-			$keyforprovider = '';	// @FIXME
119
+			$keyforprovider = ''; // @FIXME
120 120
 
121 121
 			$this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
122 122
 			$this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 		global $conf;
259 259
 		$ret = array();
260 260
 
261
-		$keyforprovider = '';	// @FIXME
261
+		$keyforprovider = ''; // @FIXME
262 262
 
263 263
 		// Token storage
264 264
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			'contentType' => $contenttype,
401 401
 		);
402 402
 
403
-		$keyforprovider = '';	// @FIXME
403
+		$keyforprovider = ''; // @FIXME
404 404
 
405 405
 		// Dolibarr Token storage
406 406
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 		$error = 0;
453 453
 		$html = '';
454 454
 
455
-		$keyforprovider = '';	// @FIXME
455
+		$keyforprovider = ''; // @FIXME
456 456
 
457 457
 		// Token storage
458 458
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
Please login to merge, or discard this patch.
htdocs/core/class/commonobjectline.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 
77 77
 	public $multilangs;
78 78
 
79
-	public $product_type;		// type in line
80
-	public $fk_product;			// product id in line (when line is linked to a product)
79
+	public $product_type; // type in line
80
+	public $fk_product; // product id in line (when line is linked to a product)
81 81
 
82 82
 	/**
83 83
 	 * Description of the line
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
93 93
 	 */
94 94
 	public $description;
95 95
 
96
-	public $product;			// To store full product object after a fetch_product() on a line
97
-	public $product_ref;		// ref in product table
98
-	public $product_label;		// label in product table
99
-	public $product_barcode;	// barcode in product table
100
-	public $product_desc;		// desc in product table
101
-	public $fk_product_type;	// type in product table
96
+	public $product; // To store full product object after a fetch_product() on a line
97
+	public $product_ref; // ref in product table
98
+	public $product_label; // label in product table
99
+	public $product_barcode; // barcode in product table
100
+	public $product_desc; // desc in product table
101
+	public $fk_product_type; // type in product table
102 102
 
103 103
 	public $qty;
104 104
 	public $duree;
Please login to merge, or discard this patch.
htdocs/core/class/fiscalyear.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@
 block discarded – undo
244 244
 
245 245
 			$this->id = $obj->rowid;
246 246
 			$this->ref = $obj->rowid;
247
-			$this->date_start	= $this->db->jdate($obj->date_start);
247
+			$this->date_start = $this->db->jdate($obj->date_start);
248 248
 			$this->date_end = $this->db->jdate($obj->date_end);
249 249
 			$this->label = $obj->label;
250 250
 			$this->statut = $obj->status;
Please login to merge, or discard this patch.
htdocs/core/ajax/ajaxinvoiceline.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 		$showempty = 0;
61 61
 	}
62 62
 
63
-	$return['value']	= $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1);
63
+	$return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1);
64 64
 	//$return['num'] = $form->num;
65 65
 	//$return['error']	= $form->error;
66 66
 
Please login to merge, or discard this patch.
htdocs/core/ajax/extraparams.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 //print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n";
58 58
 
59 59
 // Security check
60
-$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1);	// Call with mode return
60
+$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return
61 61
 if (!$result) {
62 62
 	httponly_accessforbidden('Not allowed by restrictArea');
63 63
 }
Please login to merge, or discard this patch.
htdocs/core/ajax/ajaxtooltip.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
 
42 42
 $id = GETPOST('id', 'aZ09');
43
-$objecttype = GETPOST('objecttype', 'aZ09arobase');	// 'module' or 'myobject@mymodule', 'mymodule_myobject'
43
+$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject'
44 44
 
45 45
 $params = array('fromajaxtooltip' => 1);
46 46
 if (GETPOSTISSET('infologin')) {
Please login to merge, or discard this patch.
htdocs/core/ajax/flowjs-server.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 $flowChunkSize = GETPOST('flowChunkSize', 'alpha');
56 56
 $flowTotalSize = GETPOST('flowTotalSize', 'alpha');
57 57
 
58
-$result = restrictedArea($user, $module, 0, '', 0, 'fk_soc', 'rowid', 0, 1);	// Call with mode return
58
+$result = restrictedArea($user, $module, 0, '', 0, 'fk_soc', 'rowid', 0, 1); // Call with mode return
59 59
 
60 60
 if ($action != 'upload') {
61 61
 	httponly_accessforbidden("Param action must be 'upload'");
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
160 160
 
161 161
 	// check that all the parts are present
162 162
 	// the size of the last part is between chunkSize and 2*$chunkSize
163
-	if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
163
+	if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) {
164 164
 		// create the final destination file
165 165
 		if (($fp = fopen($upload_dir.'/'.$fileName, 'w')) !== false) {
166
-			for ($i=1; $i<=$total_files; $i++) {
166
+			for ($i = 1; $i <= $total_files; $i++) {
167 167
 				fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
168 168
 				dol_syslog('writing chunk '.$i);
169 169
 			}
Please login to merge, or discard this patch.
htdocs/core/tpl/extrafields_view.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 
216 216
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : '';
217 217
 
218
-			print '<td id="' . $html_id . '" class="valuefield ' . $object->element . '_extras_' . $tmpkeyextra . ' wordbreakimp"' . (!empty($cols) ? ' colspan="' . $cols . '"' : '') . '>';
218
+			print '<td id="'.$html_id.'" class="valuefield '.$object->element.'_extras_'.$tmpkeyextra.' wordbreakimp"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>';
219 219
 
220 220
 			// Convert date into timestamp format
221 221
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date'))) {
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 				if ($object->table_element == 'societe') {
244 244
 					$fieldid = 'socid';
245 245
 				}
246
-				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"] . '?' . $fieldid . '=' . $object->id . '" method="post" name="formextra">';
246
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?'.$fieldid.'='.$object->id.'" method="post" name="formextra">';
247 247
 				print '<input type="hidden" name="action" value="update_extras">';
248 248
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
249 249
 				print '<input type="hidden" name="token" value="'.newToken().'">';
Please login to merge, or discard this patch.