Dolibarr / dolibarr

htdocs/admin/oauth.php

Spacing +5 added lines, -5 removed lines

@@ -125,8 +125,8 @@ 
 
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-				$sql.= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
-				$sql.= " WHERE  service = '".$db->escape($oldprovider."-".$oldlabel)."'";
+				$sql .= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
+				$sql .= " WHERE  service = '".$db->escape($oldprovider."-".$oldlabel)."'";
 
 
 				$resql = $db->query($sql);
@@ -187,7 +187,7 @@ 
 
 	$globalkey = empty($provider) ? $label : $label.'-'.$provider;
 
-	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)) {
+	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)) {
 		setEventMessages($langs->trans("ErrorInEntryDeletion"), null, 'errors');
 		$error++;
 	} else {
@@ -262,7 +262,7 @@ 
 			$provider.'_NAME',
 			$provider.'_ID',
 			$provider.'_SECRET',
-			$provider.'_URLAUTHORIZE',	// For custom oauth links
+			$provider.'_URLAUTHORIZE', // For custom oauth links
 			$provider.'_SCOPE'			// For custom oauth links
 		);
 	}
@@ -281,7 +281,7 @@ 
 	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
 	foreach ($listinsetup as $key) {
 		$supported = 0;
-		$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
+		$keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
 		$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
 		$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
 		if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {

htdocs/api/class/api_setup.class.php

Spacing +5 added lines, -5 removed lines

@@ -1032,7 +1032,7 @@ 
 					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
 					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
 					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : '');	// This may be a string encoded with serialise() or json_encode()
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode()
 					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
 					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
 					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
@@ -1671,7 +1671,7 @@ 
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			for ($i = 0; $i < $min; $i++) {
-				$type =$this->db->fetch_object($result);
+				$type = $this->db->fetch_object($result);
 				$this->translateLabel($type, $lang, 'TicketTypeShort', array('ticket'));
 				$list[] = $type;
 			}
@@ -1734,7 +1734,7 @@ 
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			for ($i = 0; $i < $min; $i++) {
-				$type =$this->db->fetch_object($result);
+				$type = $this->db->fetch_object($result);
 				$list[] = $type;
 			}
 		} else {
@@ -1961,13 +1961,13 @@ 
 				throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
 			}
 		} else {
-			$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into filecheck.php.
+			$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php.
 
 			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
 			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
 				$xmlfile = $xmlarray['content'];
 				//print "xmlfilestart".$xmlfile."endxmlfile";
-				$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+				$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
 			} else {
 				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
 				throw new RestException(500, $errormsg);

htdocs/fourn/class/api_supplier_orders.class.php

Spacing +3 added lines, -3 removed lines

@@ -320,7 +320,7 @@ 
 
 		if ($source == 'all' || $source == 'external') {
 			$tmpContacts = $this->order->liste_contact(-1, 'external', 0, $type);
-			$contacts =	array_merge($contacts, $tmpContacts);
+			$contacts = array_merge($contacts, $tmpContacts);
 		}
 
 		if ($source == 'all' || $source == 'internal') {
@@ -665,9 +665,9 @@ 
 		}
 
 		foreach ($lines as $line) {
-			$lineObj =(object) $line;
+			$lineObj = (object) $line;
 
-			$result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
+			$result = $this->order->dispatchProduct(DolibarrApiAccess::$user,
 				  $lineObj->fk_product,
 				  $lineObj->qty,
 				  $lineObj->warehouse,

htdocs/user/group/card.php

Spacing +1 added lines, -1 removed lines

@@ -446,7 +446,7 @@
 				print '<td class="liste_titre right" width="5">&nbsp;</td>';
 				print "</tr>\n";
 
-				$object->fetch($object->id, '', true);	// true to force load of all users, member of the group
+				$object->fetch($object->id, '', true); // true to force load of all users, member of the group
 
 				if (!empty($object->members)) {
 					foreach ($object->members as $useringroup) {

htdocs/projet/class/api_projects.class.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
 		}

htdocs/core/modules/modTicket.class.php

Spacing +9 added lines, -9 removed lines

@@ -332,19 +332,19 @@
 
 		// Export list of tickets and attributes
 		$langs->load("ticket");
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'ExportDataset_ticket_1'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("ticket", "export"));
-		$this->export_icon[$r]='ticket';
-		$keyforclass = 'Ticket';$keyforclassfile='/ticket/class/ticket.class.php';$keyforelement='ticket';
+		$this->export_icon[$r] = 'ticket';
+		$keyforclass = 'Ticket'; $keyforclassfile = '/ticket/class/ticket.class.php'; $keyforelement = 'ticket';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		$keyforselect='ticket'; $keyforaliasextra='extra'; $keyforelement='ticket';
+		$keyforselect = 'ticket'; $keyforaliasextra = 'extra'; $keyforelement = 'ticket';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'ticket as t';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'ticket as t';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'ticket_extrafields as extra on (t.rowid = extra.fk_object)';
-		$this->export_sql_end[$r] .=' WHERE 1 = 1';
-		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('ticket').')';
+		$this->export_sql_end[$r] .= ' WHERE 1 = 1';
+		$this->export_sql_end[$r] .= ' AND t.entity IN ('.getEntity('ticket').')';
 		$r++;
 	}
 

htdocs/printing/admin/printing.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 			$i++;
 
 			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') {
-				$keyforprovider = '';	// @BUG This must be set
+				$keyforprovider = ''; // @BUG This must be set
 
 				// Token
 				print '<tr class="oddeven">';

htdocs/admin/oauthlogintokens.php

Spacing +4 added lines, -4 removed lines

@@ -147,18 +147,18 @@ 
 				$provider.'_NAME',
 				$provider.'_ID',
 				$provider.'_SECRET',
-				$provider.'_URLAUTHORIZE',	// For custom oauth links
+				$provider.'_URLAUTHORIZE', // For custom oauth links
 				$provider.'_SCOPE'			// For custom oauth links
 			);
 		}
 	}
 
-	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+	$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
 
 	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
 	foreach ($listinsetup as $key) {
 		$supported = 0;
-		$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
+		$keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
 		$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
 		$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
 		if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
@@ -178,7 +178,7 @@ 
 		if (getDolGlobalString($key[4])) {
 			$shortscope = getDolGlobalString($key[4]);
 		}
-		$state = $shortscope;	// TODO USe a better state
+		$state = $shortscope; // TODO USe a better state
 
 		// Define $urltorenew, $urltodelete, $urltocheckperms
 		if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') {

htdocs/admin/defaultvalues.php

Spacing +22 added lines, -22 removed lines

@@ -140,13 +140,13 @@ 
 
 	if (!$error) {
 		if ($action == 'add' || (GETPOST('add') && $action != 'update')) {
-			$object->type=$mode;
-			$object->user_id=0;
-			$object->page=$defaulturl;
-			$object->param=$defaultkey;
-			$object->value=$defaultvalue;
-			$object->entity=$conf->entity;
-			$result=$object->create($user);
+			$object->type = $mode;
+			$object->user_id = 0;
+			$object->page = $defaulturl;
+			$object->param = $defaultkey;
+			$object->value = $defaultvalue;
+			$object->entity = $conf->entity;
+			$result = $object->create($user);
 			if ($result < 0) {
 				$action = '';
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -159,14 +159,14 @@ 
 			}
 		}
 		if (GETPOST('actionmodify')) {
-			$object->id=$id;
-			$object->type=$mode;
-			$object->page=$urlpage;
-			$object->param=$key;
-			$object->value=$value;
-			$object->entity=$conf->entity;
-			$result=$object->update($user);
-			if ($result<0) {
+			$object->id = $id;
+			$object->type = $mode;
+			$object->page = $urlpage;
+			$object->param = $key;
+			$object->value = $value;
+			$object->entity = $conf->entity;
+			$result = $object->update($user);
+			if ($result < 0) {
 				$action = '';
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
@@ -182,9 +182,9 @@ 
 
 // Delete line from delete picto
 if ($action == 'delete') {
-	$object->id=$id;
-	$result=$object->delete($user);
-	if ($result<0) {
+	$object->id = $id;
+	$result = $object->delete($user);
+	if ($result < 0) {
 		$action = '';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -339,11 +339,11 @@ 
 // Limit to superadmin
 if (isModEnabled('multicompany') && !$user->entity) {
 	print '<td>';
-	print '<input type="text" class="flat" size="1" disabled name="entity" value="' . $conf->entity . '">'; // We see environment, but to change it we must switch on other entity
+	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
 } else {
 	print '<td class="center">';
-	print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 }
 print '<td class="center">';
@@ -355,7 +355,7 @@ 
 print '</td>'."\n";
 print '</tr>'."\n";
 
-$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode,'t.entity'=>array($user->entity,$conf->entity)));
+$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode, 't.entity'=>array($user->entity, $conf->entity)));
 
 if (!is_array($result) && $result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
@@ -387,7 +387,7 @@ 
 
 		// Actions
 		print '<td class="center">';
-		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id)	{
+		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) {
 			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
 			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 		} else {