Completed
Branch develop (f5af02)
by
unknown
17:35
created
htdocs/recruitment/recruitmentcandidature_card.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/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/compta/cashcontrol/cashcontrol_list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cashcontrol'; // To manage different context of search
42 42
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
43 43
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
44
-$mode       = GETPOST('mode', 'alpha');  // for mode view result
44
+$mode       = GETPOST('mode', 'alpha'); // for mode view result
45 45
 $id = GETPOST('id', 'int');
46 46
 
47 47
 // Load variable for pagination
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 // Default sort order (if not yet defined by previous GETPOST)
75 75
 if (!$sortfield) {
76
-	reset($object->fields);					// Reset is required to avoid key() to return null.
76
+	reset($object->fields); // Reset is required to avoid key() to return null.
77 77
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
78 78
 }
79 79
 if (!$sortorder) {
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 		}
247 247
 	} else {
248 248
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
249
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
249
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
250 250
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
251 251
 				if (preg_match('/_dtstart$/', $key)) {
252 252
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
473 473
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
474 474
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
475
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
475
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
476 476
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
477 477
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
478 478
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
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/accountancy/expensereport/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@
 block discarded – undo
165 165
 		$db->rollback();
166 166
 	} else {
167 167
 		$db->commit();
168
-		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null,  ($notpossible ? 'warnings' : 'mesgs'));
168
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
169 169
 		if ($nbbindfailed) {
170 170
 			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
171 171
 		}
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.