Completed
Branch develop (373df2)
by
unknown
27:04
created
htdocs/commande/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
 $object = new Commande($db);
75 75
 
76
-$usercancreate  =  $user->hasRight("commande", "creer");
76
+$usercancreate = $user->hasRight("commande", "creer");
77 77
 $permissiontoadd = $usercancreate;
78 78
 
79 79
 // Security check
Please login to merge, or discard this patch.
htdocs/variants/class/ProductCombination2ValuePair.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public function __toString()
71 71
 	{
72
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
73
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
72
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
73
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
74 74
 
75 75
 		$prodattr = new ProductAttribute($this->db);
76 76
 		$prodattrval = new ProductAttributeValue($this->db);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 		$prodattr->fetch($this->fk_prod_attr);
79 79
 		$prodattrval->fetch($this->fk_prod_attr_val);
80 80
 
81
-		return $prodattr->label . ': ' . $prodattrval->value;
81
+		return $prodattr->label.': '.$prodattrval->value;
82 82
 	}
83 83
 
84 84
 	/**
@@ -89,14 +89,14 @@  discard block
 block discarded – undo
89 89
 	 */
90 90
 	public function create($user)
91 91
 	{
92
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
92
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
93 93
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
94
-		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
94
+		VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
95 95
 
96 96
 		$query = $this->db->query($sql);
97 97
 
98 98
 		if ($query) {
99
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
99
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
100 100
 
101 101
 			return 1;
102 102
 		}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         c2v.fk_prod_attr_val,
118 118
         c2v.fk_prod_attr,
119 119
         c2v.fk_prod_combination
120
-        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
120
+        FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
121 121
         WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
122 122
 
123 123
 		$sql .= $this->db->order('c.position', 'asc');
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	 */
152 152
 	public function deleteByFkCombination($fk_combination)
153 153
 	{
154
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
154
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
155 155
 
156 156
 		if ($this->db->query($sql)) {
157 157
 			return 1;
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/contacts1.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 */
121 121
 	public function formFilter()
122 122
 	{
123
-		global $conf,$langs;
123
+		global $conf, $langs;
124 124
 
125 125
 		// Load translation files required by the page
126 126
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
132 132
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
133 133
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
134
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
134
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
135 135
 		$sql .= " AND sp.statut = 1";
136 136
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
137 137
 		$sql .= " GROUP BY sp.poste";
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
167 167
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
168 168
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
169
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
169
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
170 170
 		$sql .= " AND sp.statut = 1";
171 171
 		$sql .= " AND cs.fk_categorie = c.rowid";
172 172
 		$sql .= " AND cs.fk_socpeople = sp.rowid";
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
240 240
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
241 241
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
242
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
242
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
243 243
 		$sql .= " AND sp.statut = 1";
244 244
 		$sql .= " AND cs.fk_categorie = c.rowid";
245 245
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
277 277
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
278 278
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
279
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
279
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
280 280
 		$sql .= " AND sp.statut = 1";
281 281
 		$sql .= " AND cs.fk_categorie = c.rowid";
282 282
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 
435 435
 		// Filter on job position
436 436
 		$key = $filter_jobposition;
437
-		if (!empty($key) && $key != 'all'  && $key != '-1') {
437
+		if (!empty($key) && $key != 'all' && $key != '-1') {
438 438
 			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
439 439
 		}
440 440
 
Please login to merge, or discard this patch.
htdocs/core/search_page.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 $title = $langs->trans("Search");
71 71
 
72 72
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
73
-$head = '<!-- Quick access -->'."\n";	// This is used by DoliDroid to know page is a search page
73
+$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page
74 74
 $arrayofjs = array();
75 75
 $arrayofcss = array();
76 76
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 
111 111
 		$accesskey = '';
112 112
 		if (empty($accesskeyalreadyassigned[$val['label'][0]])) {
113
-			$accesskey = $val['label'][0];	// First char of string
113
+			$accesskey = $val['label'][0]; // First char of string
114 114
 			$accesskeyalreadyassigned[$accesskey] = $accesskey;
115 115
 		}
116 116
 
Please login to merge, or discard this patch.
htdocs/core/login/functions_http.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
  */
77 77
 function decodeHttpBasicAuth($value)
78 78
 {
79
-	$encoded_basic_auth = substr($value, 6);	// Remove the "Basic " string
79
+	$encoded_basic_auth = substr($value, 6); // Remove the "Basic " string
80 80
 	$decoded_basic_auth = base64_decode($encoded_basic_auth);
81 81
 	$credentials_basic_auth = explode(':', $decoded_basic_auth);
82 82
 
Please login to merge, or discard this patch.
htdocs/user/group/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@
 block discarded – undo
446 446
 				print '<td class="liste_titre right" width="5">&nbsp;</td>';
447 447
 				print "</tr>\n";
448 448
 
449
-				$object->fetch($object->id, '', true);	// true to force load of all users, member of the group
449
+				$object->fetch($object->id, '', true); // true to force load of all users, member of the group
450 450
 
451 451
 				if (!empty($object->members)) {
452 452
 					foreach ($object->members as $useringroup) {
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/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/bookmarks/bookmarks.lib.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
 	$langs->load("bookmarks");
38 38
 
39
-	$authorized_var=array('limit','optioncss','contextpage');
39
+	$authorized_var = array('limit', 'optioncss', 'contextpage');
40 40
 	$url = $_SERVER["PHP_SELF"];
41 41
 	$url_param = array();
42 42
 	if (!empty($_SERVER["QUERY_STRING"])) {
Please login to merge, or discard this patch.