Completed
Branch develop (b5f2d2)
by
unknown
20:52
created
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.
htdocs/expensereport/class/paymentexpensereport.class.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -715,12 +715,12 @@
 block discarded – undo
715 715
 	}
716 716
 
717 717
 		/**
718
-	 *	Return clicable link of object (with eventually picto)
719
-	 *
720
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
-	 *  @param		array		$arraydata				Array of data
722
-	 *  @return		string								HTML Code for Kanban thumb.
723
-	 */
718
+		 *	Return clicable link of object (with eventually picto)
719
+		 *
720
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
+		 *  @param		array		$arraydata				Array of data
722
+		 *  @return		string								HTML Code for Kanban thumb.
723
+		 */
724 724
 	public function getKanbanView($option = '', $arraydata = null)
725 725
 	{
726 726
 		global $langs;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			$sql .= " '".$this->db->idate($this->datep)."',";
173 173
 			$sql .= " ".price2num($totalamount).",";
174 174
 			$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".((int) $user->id).",";
175
-			$sql .= " 0)";	// fk_bank is ID of transaction into ll_bank
175
+			$sql .= " 0)"; // fk_bank is ID of transaction into ll_bank
176 176
 
177 177
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
178 178
 			$resql = $this->db->query($sql);
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 			}
665 665
 		}
666 666
 		global $action;
667
-		$hookmanager->initHooks(array($this->element . 'dao'));
667
+		$hookmanager->initHooks(array($this->element.'dao'));
668 668
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
669 669
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
670 670
 		if ($reshook > 0) {
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 		if (property_exists($this, 'fk_bank') && !is_null($this->fk_bank)) {
744 744
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Account").'</span> : <span class="info-box-label">'.$this->fk_bank.'</span>';
745 745
 		}
746
-		if (property_exists($this, 'amount') ) {
746
+		if (property_exists($this, 'amount')) {
747 747
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
748 748
 		}
749 749
 		if (method_exists($this, 'getLibStatut')) {
Please login to merge, or discard this patch.
htdocs/compta/paiement/cheque/class/remisecheque.class.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -715,12 +715,12 @@
 block discarded – undo
715 715
 	}
716 716
 
717 717
 		/**
718
-	 *	Return clicable link of object (with eventually picto)
719
-	 *
720
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
-	 *  @param		array		$arraydata				Array of data
722
-	 *  @return		string								HTML Code for Kanban thumb.
723
-	 */
718
+		 *	Return clicable link of object (with eventually picto)
719
+		 *
720
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
+		 *  @param		array		$arraydata				Array of data
722
+		 *  @return		string								HTML Code for Kanban thumb.
723
+		 */
724 724
 	public function getKanbanView($option = '', $arraydata = null)
725 725
 	{
726 726
 		global $langs;
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	//! Numero d'erreur Plage 1024-1279
54 54
 	public $errno;
55 55
 
56
-	public $type = 'CHQ';		// 'CHQ', 'TRA', ...
56
+	public $type = 'CHQ'; // 'CHQ', 'TRA', ...
57 57
 
58 58
 	public $amount;
59 59
 	public $date_bordereau;
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 		if (getDolGlobalString('CHEQUERECEIPTS_ADDON')) {
411 411
 			$mybool = false;
412 412
 
413
-			$file = getDolGlobalString('CHEQUERECEIPTS_ADDON') . ".php";
413
+			$file = getDolGlobalString('CHEQUERECEIPTS_ADDON').".php";
414 414
 			$classname = $conf->global->CHEQUERECEIPTS_ADDON;
415 415
 
416 416
 			// Include file with class
@@ -427,8 +427,8 @@  discard block
 block discarded – undo
427 427
 
428 428
 			// For compatibility
429 429
 			if (!$mybool) {
430
-				$file = getDolGlobalString('CHEQUERECEIPTS_ADDON') . ".php";
431
-				$classname = "mod_chequereceipt_" . getDolGlobalString('CHEQUERECEIPTS_ADDON');
430
+				$file = getDolGlobalString('CHEQUERECEIPTS_ADDON').".php";
431
+				$classname = "mod_chequereceipt_".getDolGlobalString('CHEQUERECEIPTS_ADDON');
432 432
 				$classname = preg_replace('/\-.*$/', '', $classname);
433 433
 				// Include file with class
434 434
 				foreach ($conf->file->dol_document_root as $dirroot) {
Please login to merge, or discard this patch.
htdocs/user/class/usergroup.class.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -715,12 +715,12 @@
 block discarded – undo
715 715
 	}
716 716
 
717 717
 		/**
718
-	 *	Return clicable link of object (with eventually picto)
719
-	 *
720
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
-	 *  @param		array		$arraydata				Array of data
722
-	 *  @return		string								HTML Code for Kanban thumb.
723
-	 */
718
+		 *	Return clicable link of object (with eventually picto)
719
+		 *
720
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
+		 *  @param		array		$arraydata				Array of data
722
+		 *  @return		string								HTML Code for Kanban thumb.
723
+		 */
724 724
 	public function getKanbanView($option = '', $arraydata = null)
725 725
 	{
726 726
 		global $langs;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 	public $members = array(); // Array of users
105 105
 
106 106
 	public $nb_rights; // Number of rights granted to the user
107
-	public $nb_users;  // Number of users in the group
107
+	public $nb_users; // Number of users in the group
108 108
 
109
-	public $rights;	// Permissions of the group
109
+	public $rights; // Permissions of the group
110 110
 
111 111
 	private $_tab_loaded = array(); // Array of cache of already loaded permissions
112 112
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
 		if ($result) {
180 180
 			if ($load_members) {
181
-				$this->members = $this->listUsersForGroup();	// This make a lot of subrequests
181
+				$this->members = $this->listUsersForGroup(); // This make a lot of subrequests
182 182
 			}
183 183
 
184 184
 			return 1;
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
 				$label = $langs->trans("ShowGroup");
849 849
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1, 1).'"';
850 850
 			}
851
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
851
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
852 852
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
853 853
 		}
854 854
 
@@ -895,13 +895,13 @@  discard block
 block discarded – undo
895 895
 		global $conf;
896 896
 		$dn = '';
897 897
 		if ($mode == 0) {
898
-			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')]."," . getDolGlobalString('LDAP_GROUP_DN');
898
+			$dn = getDolGlobalString('LDAP_KEY_GROUPS')."=".$info[getDolGlobalString('LDAP_KEY_GROUPS')].",".getDolGlobalString('LDAP_GROUP_DN');
899 899
 		}
900 900
 		if ($mode == 1) {
901 901
 			$dn = $conf->global->LDAP_GROUP_DN;
902 902
 		}
903 903
 		if ($mode == 2) {
904
-			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')];
904
+			$dn = getDolGlobalString('LDAP_KEY_GROUPS')."=".$info[getDolGlobalString('LDAP_KEY_GROUPS')];
905 905
 		}
906 906
 		return $dn;
907 907
 	}
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.