Completed
Branch develop (7eeef6)
by
unknown
23:28
created
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -135,8 +135,8 @@
 block discarded – undo
135 135
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
136 136
 					'firstname' => '', // For thirdparties, firstname is ''
137 137
 					'other' =>
138
-					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.	// date start real
139
-					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.			// date end planned
138
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real
139
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned
140 140
 					('Contract='.$obj->fk_contrat).';'.
141 141
 					('ContactLine='.$obj->cdid),
142 142
 					'source_url' => $this->url($obj->id),
Please login to merge, or discard this patch.
htdocs/hrm/lib/hrm.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	$h = 0;
46 46
 	$head = array();
47
-	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
47
+	$head[$h][0] = DOL_URL_ROOT."/admin/hrm.php";
48 48
 	$head[$h][1] = $langs->trans("Settings");
49 49
 	$head[$h][2] = 'settings';
50 50
 	$h++;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	$head[$h][2] = 'establishments';
55 55
 	$h++;
56 56
 
57
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
57
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php';
58 58
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
59 59
 	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
60 60
 	if ($nbExtrafields > 0) {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	$head[$h][2] = 'skillsAttributes';
64 64
 	$h++;
65 65
 
66
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
66
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php';
67 67
 	$head[$h][1] = $langs->trans("JobsExtraFields");
68 68
 	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
69 69
 	if ($nbExtrafields > 0) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	$head[$h][2] = 'jobsAttributes';
73 73
 	$h++;
74 74
 
75
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
75
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php';
76 76
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
77 77
 	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
78 78
 	if ($nbExtrafields > 0) {
Please login to merge, or discard this patch.
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/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.
dev/tools/test/namespacemig/bbb.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class Bbb
20 20
 {
21
-	const BBB='bbb';
21
+	const BBB = 'bbb';
22 22
 
23 23
 	/**
24 24
 	 * do
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	{
30 30
 		global $globalaaa, $globalbbb;
31 31
 		echo 'dobbb'."\n";
32
-		$globalaaa.='+bbb';
33
-		$globalbbb.='+bbb';
32
+		$globalaaa .= '+bbb';
33
+		$globalbbb .= '+bbb';
34 34
 	}
35 35
 }
Please login to merge, or discard this patch.