Dolibarr / dolibarr

htdocs/admin/oauth.php

Spacing +4 added lines, -4 removed lines

@@ -136,8 +136,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);
@@ -300,7 +300,7 @@ 
 			$provider.'_NAME',
 			$provider.'_ID',
 			$provider.'_SECRET',
-			$provider.'_URL',	// For custom oauth links
+			$provider.'_URL', // For custom oauth links
 			$provider.'_SCOPE'	// For custom oauth links
 		);
 	}
@@ -319,7 +319,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/admin/fediverse.php

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 		print '<table class="noborder centpercent">'."\n";
 
 		print '<tr class="liste_titre">';
-		print "<td>".$langs->trans("SocialNetworks")." ".($i+1)."</td>";
+		print "<td>".$langs->trans("SocialNetworks")." ".($i + 1)."</td>";
 		print '<td class="right">';
 		print '<a class="viewfielda reposition marginleftonly marginrighttonly showInputBtn" href="'.$_SERVER["PHP_SELF"].'?action=editsocialnetwork&token='.newToken().'&key='.urlencode($key).'">'.img_edit().'</a>';
 		print '<a class="deletefielda reposition marginleftonly right" href="'.$_SERVER["PHP_SELF"].'?action=deletesocialnetwork&token='.newToken().'&key='.urlencode($key).'">'.img_delete().'</a>';

htdocs/admin/oauthlogintokens.php

Spacing +6 added lines, -6 removed lines

@@ -166,13 +166,13 @@ 
 		if ($apiService instanceof OAuth\OAuth2\Service\AbstractService || $apiService instanceof OAuth\OAuth1\Service\AbstractService) {
 			// ServiceInterface does not provide refreshAccessToekn, AbstractService does
 			dol_syslog("oauthlogintokens.php: call refreshAccessToken to get the new access token");
-			$tokenobj = $apiService->refreshAccessToken($tokenobj);		// This call refresh and store the new token (but does not include the refresh token)
+			$tokenobj = $apiService->refreshAccessToken($tokenobj); // This call refresh and store the new token (but does not include the refresh token)
 
 			dol_syslog("oauthlogintokens.php: call setRefreshToken");
-			$tokenobj->setRefreshToken($refreshtoken);	// Restore the refresh token
+			$tokenobj->setRefreshToken($refreshtoken); // Restore the refresh token
 
 			dol_syslog("oauthlogintokens.php: call storeAccessToken to save the new access token + the old refresh token");
-			$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);	// This save the new token including the refresh token
+			$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj); // This save the new token including the refresh token
 
 			if ($expire) {
 				setEventMessages($langs->trans("OldTokenWasExpiredItHasBeenRefresh"), null, 'mesgs');
@@ -231,7 +231,7 @@ 
 				$provider.'_NAME',
 				$provider.'_ID',
 				$provider.'_SECRET',
-				$provider.'_URL',			// For custom oauth links
+				$provider.'_URL', // For custom oauth links
 				$provider.'_SCOPE'			// For custom oauth links
 			);
 		}
@@ -243,7 +243,7 @@ 
 	if (!empty($listinsetup)) {
 		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)) {
@@ -263,7 +263,7 @@ 
 			if (getDolGlobalString($key[4])) {
 				$shortscope = getDolGlobalString($key[4]);
 			}
-			$state = $shortscope;	// TODO USe a better state
+			$state = $shortscope; // TODO USe a better state
 
 			$urltorefresh = $_SERVER["PHP_SELF"].'?action=refreshtoken&token='.newToken();
 

htdocs/contrat/card.php

Spacing +16 added lines, -16 removed lines

@@ -110,7 +110,7 @@ 
 $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
-$permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd   = $user->hasRight('contrat', 'creer'); //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontoedit = $permissiontoadd;
 $permissiontoactivate = $user->hasRight('contrat', 'activer');
 $error = 0;
@@ -155,7 +155,7 @@ 
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once'
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) {
 		$date_start = '';
@@ -533,8 +533,8 @@ 
 					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
-							$price_min =  price($prodcustprice->lines[0]->price_min);
-							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_min = price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
 							/*$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
 								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
@@ -767,7 +767,7 @@ 
 			// update price_ht with discount
 			// TODO Use object->updateline instead objectline->update
 
-			$price_ht =  price2num(GETPOST('elprice'), 'MU');
+			$price_ht = price2num(GETPOST('elprice'), 'MU');
 			$remise_percent = price2num(GETPOST('elremise_percent'), '', 2);
 			if ($remise_percent > 0) {
 				$remise = round(((float) $price_ht * (float) $remise_percent / 100), 2);
@@ -874,7 +874,7 @@ 
 	} elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) {
 		$date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear'));
 		$date_end   = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear'));
-		$comment      = GETPOST('comment', 'alpha');
+		$comment = GETPOST('comment', 'alpha');
 		$result = $object->activateAll($user, $date_start, 0, $comment, $date_end);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1408,7 +1408,7 @@ 
 		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
 		// Ref supplier
 		$morehtmlref .= '<br>';
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
@@ -1502,7 +1502,7 @@ 
 		}
 
 
-		$arrayothercontracts = $object->getListOfContracts('others');	// array or -1 if technical error
+		$arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error
 
 		/*
 		 * Lines of contracts
@@ -1740,7 +1740,7 @@ 
 					// Ligne carac
 					print '<tr class="oddeven">';
 					print '<td>';
-					$currentLineProductId=GETPOSTISSET('idprod')?GETPOST('idprod'):(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0);
+					$currentLineProductId = GETPOSTISSET('idprod') ?GETPOST('idprod') : (!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0);
 					if ($objp->fk_product > 0) {
 						$canchangeproduct = 1;
 
@@ -1754,7 +1754,7 @@ 
 							print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 							print '<input type="hidden" name="idprod" value="'.$currentLineProductId.'">';
 						} else {
-							$senderissupplier = 0;	// @TODO Option to allow purchased products ?
+							$senderissupplier = 0; // @TODO Option to allow purchased products ?
 							if (empty($senderissupplier)) {
 								print $form->select_produits($currentLineProductId, 'idprod', '', 0, 0, 1, 2, '', 0, array(), 0, 1, 0, 'minwidth250onall maxwidth500 widthcentpercentminusx');
 							} else {
@@ -1773,7 +1773,7 @@ 
 					if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
 						$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 					}
-					$doleditor = new DolEditor('product_desc', (GETPOSTISSET('product_desc')?GETPOST('product_desc'):$objp->description), '', 92, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), $nbrows, '90%');
+					$doleditor = new DolEditor('product_desc', (GETPOSTISSET('product_desc') ?GETPOST('product_desc') : $objp->description), '', 92, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), $nbrows, '90%');
 					$doleditor->Create();
 
 					print '</td>';
@@ -1784,7 +1784,7 @@ 
 					print '</td>';
 
 					// Price
-					print '<td class="right"><input class="width50" type="text" name="elprice" value="'.(GETPOSTISSET('elprice')?GETPOST('elprice'):price($objp->subprice)).'"></td>';
+					print '<td class="right"><input class="width50" type="text" name="elprice" value="'.(GETPOSTISSET('elprice') ?GETPOST('elprice') : price($objp->subprice)).'"></td>';
 
 					// Price multicurrency
 					/*if (isModEnabled("multicurrency")) {
@@ -1792,24 +1792,24 @@ 
 					 }*/
 
 					// Quantity
-					print '<td class="center"><input size="2" type="text" name="elqty" value="'.(GETPOSTISSET('elqty')?GETPOST('elqty'):$objp->qty).'"></td>';
+					print '<td class="center"><input size="2" type="text" name="elqty" value="'.(GETPOSTISSET('elqty') ?GETPOST('elqty') : $objp->qty).'"></td>';
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						print '<td class="left">';
-						print $form->selectUnits((GETPOSTISSET('unit')?GETPOST('unit'):$objp->fk_unit), "unit");
+						print $form->selectUnits((GETPOSTISSET('unit') ?GETPOST('unit') : $objp->fk_unit), "unit");
 						print '</td>';
 					}
 
 					// Discount
-					print '<td class="nowraponall right"><input size="1" type="text" name="elremise_percent" value="'.(GETPOSTISSET('elremise_percent')?GETPOST('elremise_percent'):$objp->remise_percent).'">%</td>';
+					print '<td class="nowraponall right"><input size="1" type="text" name="elremise_percent" value="'.(GETPOSTISSET('elremise_percent') ?GETPOST('elremise_percent') : $objp->remise_percent).'">%</td>';
 
 					if (!empty($usemargins)) {
 						print '<td class="right">';
 						if ($objp->fk_product) {
 							print '<select id="fournprice" name="fournprice"></select>';
 						}
-						print '<input id="buying_price" type="text" class="width50" name="buying_price" value="'.price((GETPOSTISSET('buying_price')?GETPOST('buying_price'):$objp->pa_ht), 0, '', 0).'"></td>';
+						print '<input id="buying_price" type="text" class="width50" name="buying_price" value="'.price((GETPOSTISSET('buying_price') ?GETPOST('buying_price') : $objp->pa_ht), 0, '', 0).'"></td>';
 					}
 					print '<td class="center">';
 					print '<input type="submit" class="button margintoponly marginbottomonly" name="save" value="'.$langs->trans("Modify").'">';

htdocs/ticket/class/ticket.class.php

Spacing +18 added lines, -18 removed lines

@@ -261,14 +261,14 @@ 
 	/**
 	 * Status
 	 */
-	const STATUS_NOT_READ = 0;			// Draft. Not take into account yet.
-	const STATUS_READ = 1;				// Ticket was read.
-	const STATUS_ASSIGNED = 2;			// Ticket was just assigned to someone. Not in progress yet.
-	const STATUS_IN_PROGRESS = 3;		// In progress
-	const STATUS_NEED_MORE_INFO = 5;	// Waiting requester feedback
-	const STATUS_WAITING = 7;			// On hold
-	const STATUS_CLOSED = 8;			// Closed - Solved
-	const STATUS_CANCELED = 9;			// Closed - Not solved
+	const STATUS_NOT_READ = 0; // Draft. Not take into account yet.
+	const STATUS_READ = 1; // Ticket was read.
+	const STATUS_ASSIGNED = 2; // Ticket was just assigned to someone. Not in progress yet.
+	const STATUS_IN_PROGRESS = 3; // In progress
+	const STATUS_NEED_MORE_INFO = 5; // Waiting requester feedback
+	const STATUS_WAITING = 7; // On hold
+	const STATUS_CLOSED = 8; // Closed - Solved
+	const STATUS_CANCELED = 9; // Closed - Not solved
 
 
 	/**
@@ -1597,9 +1597,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('category') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_TICKET, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_TICKET, 1);
 		}
 
 		return $datas;
@@ -1838,7 +1838,7 @@ 
 		// Insert entry into agenda with code 'TICKET_MSG'
 		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code = 'AC_OTH_AUTO';	// This is not an entry that must appears into manual calendar but only into CRM calendar
+		$actioncomm->type_code = 'AC_OTH_AUTO'; // This is not an entry that must appears into manual calendar but only into CRM calendar
 		$actioncomm->code = 'TICKET_MSG';
 		if ($this->private) {
 			$actioncomm->code = 'TICKET_MSG_PRIVATE';
@@ -1852,7 +1852,7 @@ 
 		$actioncomm->socid = $this->socid;
 		$actioncomm->label = $this->subject;
 		$actioncomm->note_private = $this->message;
-		$actioncomm->userassigned = array($user->id => array('id' => $user->id,'transparency' => 0));
+		$actioncomm->userassigned = array($user->id => array('id' => $user->id, 'transparency' => 0));
 		$actioncomm->userownerid = $user->id;
 		$actioncomm->datep = $now;
 		$actioncomm->percentage = -1; // percentage is not relevant for punctual events
@@ -1900,7 +1900,7 @@ 
 					if (dol_mkdir($destdir) >= 0) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						dol_move($filespath, $destfile);
-						if (in_array($actioncomm->code,  array('TICKET_MSG', 'TICKET_MSG_SENTBYMAIL'))) {
+						if (in_array($actioncomm->code, array('TICKET_MSG', 'TICKET_MSG_SENTBYMAIL'))) {
 							$ecmfile = new EcmFiles($this->db);
 							$destdir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $destdir);
 							$destdir = preg_replace('/[\\/]$/', '', $destdir);
@@ -2427,7 +2427,7 @@ 
 						'email' => $obj->email,
 						'rowid' => $obj->rowid,
 						'code' => $obj->code,
-						'libelle' => $labelType,		// deprecated, replaced with labeltype
+						'libelle' => $labelType, // deprecated, replaced with labeltype
 						'labeltype' => $labelType,
 						'status' => $obj->statuslink,
 						'statuscontact' => $obj->statuscontact,
@@ -2512,7 +2512,7 @@ 
 			if (is_resource($handle)) {
 				while (($file = readdir($handle)) !== false) {
 					if (!utf8_check($file)) {
-						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1');	// To be sure data is stored in UTF8 in memory
+						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
 					}
 					if (dol_is_file($dir.$file)) {
 						return true;
@@ -2550,7 +2550,7 @@ 
 		$formmail->trackid = (is_null($forcetrackid) ? 'tic'.$this->id : '');
 		$attachedfiles = $formmail->get_attached_files();
 
-		$filepath = $attachedfiles['paths'];	// path is for example user->dir_temp.'/'.$user->id.'/'...
+		$filepath = $attachedfiles['paths']; // path is for example user->dir_temp.'/'.$user->id.'/'...
 		$filename = $attachedfiles['names'];
 		$mimetype = $attachedfiles['mimes'];
 
@@ -2940,7 +2940,7 @@ 
 
 								// If public interface is not enable, use link to internal page into mail
 								$url_public_ticket = (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE') ?
-										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
+										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE').'/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
 
 								$message .= '<br>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$object->track_id.'</a><br>';
 
@@ -2977,7 +2977,7 @@ 
 									if ($result) {
 										// update last_msg_sent date (for last message sent to external users)
 										$this->date_last_msg_sent = dol_now();
-										$this->update($user, 1);	// disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
+										$this->update($user, 1); // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
 									}
 								}
 							}

htdocs/includes/OAuth/OAuth2/Service/Generic.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         if ($data === null || !is_array($data)) {
             throw new TokenResponseException('Unable to parse response.');
         } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+            throw new TokenResponseException('Error in retrieving token: "'.$data['error'].'"');
         }
 
         $token = new StdOAuth2Token();

htdocs/includes/OAuth/Common/Http/Client/CurlClient.php

Spacing +5 added lines, -5 removed lines

@@ -124,11 +124,11 @@
 
         // @CHANGE DOL_LDR Add log
         if (function_exists('getDolGlobalString') && getDolGlobalString('OAUTH_DEBUG')) {
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $endpoint->getAbsoluteUri()."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $requestBody."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $method."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", var_export($extraHeaders, true)."\n", FILE_APPEND);
-        	@chmod(DOL_DATA_ROOT . "/dolibarr_oauth.log", octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $endpoint->getAbsoluteUri()."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $requestBody."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $method."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", var_export($extraHeaders, true)."\n", FILE_APPEND);
+        	@chmod(DOL_DATA_ROOT."/dolibarr_oauth.log", octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
         }
 
         $response     = curl_exec($ch);

htdocs/includes/OAuth/Common/Http/Client/StreamClient.php

Spacing +7 added lines, -7 removed lines

@@ -62,11 +62,11 @@ 
 
 		// @CHANGE DOL_LDR Add log
         if (function_exists('getDolGlobalString') && getDolGlobalString('OAUTH_DEBUG')) {
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $endpoint->getAbsoluteUri()."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $requestBody."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $method."\n", FILE_APPEND);
-        	file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", var_export($extraHeaders, true)."\n", FILE_APPEND);
-        	@chmod(DOL_DATA_ROOT . "/dolibarr_oauth.log", octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $endpoint->getAbsoluteUri()."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $requestBody."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", $method."\n", FILE_APPEND);
+        	file_put_contents(DOL_DATA_ROOT."/dolibarr_oauth.log", var_export($extraHeaders, true)."\n", FILE_APPEND);
+        	@chmod(DOL_DATA_ROOT."/dolibarr_oauth.log", octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
         }
 
         $level = error_reporting(0);
@@ -76,8 +76,8 @@ 
             $lastError = error_get_last();
             if (is_null($lastError)) {
                 throw new TokenResponseException(
-                    'Failed to request resource. HTTP Code: ' .
-                    ((isset($http_response_header[0]))?$http_response_header[0]:'No response')
+                    'Failed to request resource. HTTP Code: '.
+                    ((isset($http_response_header[0])) ? $http_response_header[0] : 'No response')
                 );
             }
             throw new TokenResponseException($lastError['message']);

htdocs/core/multicompany_page.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 $title = $langs->trans("Multicompanies");
 
 // URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Multicompany selection -->'."\n";	// This is used by DoliDroid to know page is a multicompany selection page
+$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
@@ -120,7 +120,7 @@ 
 	$multicompanyList .= '<ul class="ullistonly left" style="list-style: none; padding: 0">';
 	foreach ($listofentities as $entityid => $entitycursor) {
 		// Check if the user has the right to access the entity
-		if (getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')	&& !empty($user->entity) && $mc->checkRight($user->id, $entityid) < 0) {
+		if (getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') && !empty($user->entity) && $mc->checkRight($user->id, $entityid) < 0) {
 			continue;
 		}
 		$url = DOL_URL_ROOT.'/core/multicompany_page.php?action=switchentity&token='.newToken().'&entity='.((int) $entityid).($backtourl ? '&backtourl='.urlencode($backtourl) : '');