Completed
Branch develop (88253b)
by
unknown
18:45
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/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/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/boxes/box_birthdays_members.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
94 94
 			$sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED;
95 95
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
96
-			$sql .= " ORDER BY daya ASC";	// We want to have date of the month sorted by the day without taking into consideration the year
96
+			$sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
97 97
 			$sql .= $this->db->plimit($max, 0);
98 98
 
99 99
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
Please login to merge, or discard this patch.
htdocs/core/boxes/box_graph_product_distribution.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 		$userid = 0; // No filter on user creation
151 151
 
152 152
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
153
-		$HEIGHT = '150';	// Height require to have 5+1 entries into legend visible.
153
+		$HEIGHT = '150'; // Height require to have 5+1 entries into legend visible.
154 154
 
155 155
 		if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
156 156
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
Please login to merge, or discard this patch.
htdocs/core/boxes/box_scheduled_jobs.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *      \brief      Widget of scheduled jobs
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
 /**
@@ -80,14 +80,14 @@  discard block
 block discarded – undo
80 80
 		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
81 81
 
82 82
 		if ($user->hasRight('cron', 'read')) {
83
-			include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
83
+			include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
84 84
 			$cronstatic = new Cronjob($this->db);
85 85
 			$resultarray = array();
86 86
 
87 87
 			$result = 0;
88 88
 			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun, t.datestart,";
89 89
 			$sql .= " t.label, t.status, t.test, t.lastresult, t.processing";
90
-			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
90
+			$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
91 91
 			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
92 92
 			$sql .= " AND entity IN (0, ".$conf->entity.")";
93 93
 			$sql .= $this->db->order("t.datelastrun", "DESC");
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 				$this->info_box_contents[0][0] = array(
193 193
 					'td' => '',
194 194
 					'maxlength' => 500,
195
-					'text' => ($this->db->lasterror() . ' sql=' . $sql)
195
+					'text' => ($this->db->lasterror().' sql='.$sql)
196 196
 				);
197 197
 			}
198 198
 		} else {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_birthdays.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 			$sql .= " AND u.statut = ".User::STATUS_ENABLED;
103 103
 			$sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0);
104 104
 			$sql .= " AND u.dateemployment < '".$this->db->idate(dol_get_first_day($tmparray['year']))."'";
105
-			$sql .= " ORDER BY daya ASC";	// We want to have date of the month sorted by the day without taking into consideration the year
105
+			$sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
106 106
 			$sql .= $this->db->plimit($max, 0);
107 107
 
108 108
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
Please login to merge, or discard this patch.