Completed
Branch develop (4a2db9)
by
unknown
18:09
created
htdocs/recruitment/recruitmentcandidature_agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
144 144
 
145 145
 	$morehtmlref = '<div class="refidno">';
146
-	$morehtmlref.= $object->getFullName('', 1);
146
+	$morehtmlref .= $object->getFullName('', 1);
147 147
 	/*
148 148
 	// Ref customer
149 149
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_note.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
97 97
 
98 98
 	$morehtmlref = '<div class="refidno">';
99
-	$morehtmlref.= $object->getFullName('', 1);
99
+	$morehtmlref .= $object->getFullName('', 1);
100 100
 	/*
101 101
 	 // Ref customer
102 102
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -426,7 +426,7 @@
 block discarded – undo
426 426
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
427 427
 
428 428
 	$morehtmlref = '<div class="refidno">';
429
-	$morehtmlref.= $object->getFullName('', 1);
429
+	$morehtmlref .= $object->getFullName('', 1);
430 430
 	/*
431 431
 	 // Ref customer
432 432
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/core/class/vcard.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	{
135 135
 		// $type = "GIF" | "JPEG"
136 136
 		//$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
137
-		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo;		// must be url of photo
137
+		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
138 138
 		//$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
139 139
 	}
140 140
 
@@ -356,10 +356,10 @@  discard block
 block discarded – undo
356 356
 	public function getVCard()
357 357
 	{
358 358
 		$text = "BEGIN:VCARD\r\n";
359
-		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8
359
+		$text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
360 360
 		//$text.= "VERSION:2.1\r\n";
361 361
 		foreach ($this->properties as $key => $value) {
362
-			$newkey = preg_replace('/-.*$/', '', $key);	// remove suffix -twitter, -facebook, ...
362
+			$newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...
363 363
 			$text .= $newkey.":".$value."\r\n";
364 364
 		}
365 365
 		$text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";
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/admin/oauth.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 
126 126
 
127 127
 				$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
128
-				$sql.= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
129
-				$sql.= " WHERE  service = '".$db->escape($oldprovider."-".$oldlabel)."'";
128
+				$sql .= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
129
+				$sql .= " WHERE  service = '".$db->escape($oldprovider."-".$oldlabel)."'";
130 130
 
131 131
 
132 132
 				$resql = $db->query($sql);
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
 	$globalkey = empty($provider) ? $label : $label.'-'.$provider;
189 189
 
190
-	if (!dolibarr_del_const($db, $globalkey.'_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SECRET', $conf->entity) ||  !dolibarr_del_const($db, $globalkey.'_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SCOPE', $conf->entity)) {
190
+	if (!dolibarr_del_const($db, $globalkey.'_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SECRET', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SCOPE', $conf->entity)) {
191 191
 		setEventMessages($langs->trans("ErrorInEntryDeletion"), null, 'errors');
192 192
 		$error++;
193 193
 	} else {
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 			$provider.'_NAME',
263 263
 			$provider.'_ID',
264 264
 			$provider.'_SECRET',
265
-			$provider.'_URLAUTHORIZE',	// For custom oauth links
265
+			$provider.'_URLAUTHORIZE', // For custom oauth links
266 266
 			$provider.'_SCOPE'			// For custom oauth links
267 267
 		);
268 268
 	}
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
282 282
 	foreach ($listinsetup as $key) {
283 283
 		$supported = 0;
284
-		$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
284
+		$keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
285 285
 		$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
286 286
 		$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
287 287
 		if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
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.