Dolibarr / dolibarr

htdocs/expedition/list.php

Spacing +5 added lines, -5 removed lines

@@ -151,7 +151,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 $expeditionid = GETPOSTINT('id');
@@ -232,7 +232,7 @@ 
 		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
-		$lastid= 0;
+		$lastid = 0;
 		$lastref = '';
 
 		$db->begin();
@@ -552,7 +552,7 @@ 
 			if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 				$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 			}
-			if ($search_datedelivery_start)	{
+			if ($search_datedelivery_start) {
 				$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
 			}
 			if ($search_datedelivery_end) {
@@ -790,7 +790,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -820,7 +820,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_elementdet = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -441,8 +441,10 @@
 							);
 							if ($result > 0) {
 								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep sending
+								if (!empty($createbills_onebythird)) {
+									//increment rang to keep sending
 									$TFactThirdNbLines[$expd->socid]++;
+								}
 							} else {
 								$lineid = 0;
 								$error++;

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

Indentation +127 added lines, -127 removed lines

@@ -12,131 +12,131 @@
 
 class Microsoft extends AbstractService
 {
-    const SCOPE_BASIC = 'basic';
-    const SCOPE_OFFLINE_ACCESS = 'offline_access';
-    const SCOPE_SIGNIN = 'signin';
-    const SCOPE_BIRTHDAY = 'birthday';
-    const SCOPE_CALENDARS = 'calendars';
-    const SCOPE_CALENDARS_UPDATE = 'calendars_update';
-    const SCOPE_CONTACTS_BIRTHDAY = 'contacts_birthday';
-    const SCOPE_CONTACTS_CREATE = 'contacts_create';
-    const SCOPE_CONTACTS_CALENDARS = 'contacts_calendars';
-    const SCOPE_CONTACTS_PHOTOS = 'contacts_photos';
-    const SCOPE_CONTACTS_SKYDRIVE = 'contacts_skydrive';
-    const SCOPE_EMAIL = 'email';
-    const SCOPE_EVENTS_CREATE = 'events_create';
-    const SCOPE_MESSENGER = 'messenger';
-    const SCOPE_OPENID = 'openid';
-    const SCOPE_PHONE_NUMBERS = 'phone_numbers';
-    const SCOPE_PHOTOS = 'photos';
-    const SCOPE_POSTAL_ADDRESSES = 'postal_addresses';
-    const SCOPE_PROFILE = 'profile';
-    const SCOPE_SHARE = 'share';
-    const SCOPE_SKYDRIVE = 'skydrive';
-    const SCOPE_SKYDRIVE_UPDATE = 'skydrive_update';
-    const SCOPE_WORK_PROFILE = 'work_profile';
-    const SCOPE_APPLICATIONS = 'applications';
-    const SCOPE_APPLICATIONS_CREATE = 'applications_create';
-    const SCOPE_IMAP = 'imap';
-    const SCOPE_IMAP_ACCESSASUSERALL = 'https://outlook.office.com/.default';
-    const SCOPE_SMTPSEND = 'https://outlook.office.com/.default';
-    const SCOPE_USERREAD = 'User.Read';
-    const SCOPE_MAILREAD = 'Mail.Read';
-    const SCOPE_MAILSEND = 'Mail.Send';
-
-    protected $storage;
-
-
-    /**
-     * MS uses some magical not officialy supported scope to get even moar info like full emailaddresses.
-     * They agree that giving 3rd party apps access to 3rd party emailaddresses is a pretty lame thing to do so in all
-     * their wisdom they added this scope because fuck you that's why.
-     *
-     * https://github.com/Lusitanian/PHPoAuthLib/issues/214
-     * http://social.msdn.microsoft.com/Forums/live/en-US/c6dcb9ab-aed4-400a-99fb-5650c393a95d/how-retrieve-users-
-     *                                  contacts-email-address?forum=messengerconnect
-     *
-     * Considering this scope is not officially supported: use with care
-     */
-    const SCOPE_CONTACTS_EMAILS = 'contacts_emails';
-
-
-    public function __construct(
-        CredentialsInterface $credentials,
-        ClientInterface $httpClient,
-        TokenStorageInterface $storage,
-        $scopes = array(),
-        UriInterface $baseApiUri = null
-    ) {
-        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
-
-        $this->storage = $storage;
-
-        if (null === $baseApiUri) {
-            $this->baseApiUri = new Uri('https://apis.live.net/v5.0/');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationEndpoint()
-    {
-    	$tenant = $this->storage->getTenant();
-
-    	//return new Uri('https://login.live.com/oauth20_authorize.srf');
-        //return new Uri('https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize');
-        return new Uri('https://login.microsoftonline.com/'.$tenant.'/oauth2/v2.0/authorize');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessTokenEndpoint()
-    {
-    	$tenant = $this->storage->getTenant();
-
-        //return new Uri('https://login.live.com/oauth20_token.srf');
-        //return new Uri('https://login.microsoftonline.com/organizations/oauth2/v2.0/token');
-        return new Uri('https://login.microsoftonline.com/'.$tenant.'/oauth2/v2.0/token');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationMethod()
-    {
-        return static::AUTHORIZATION_METHOD_QUERY_STRING;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseAccessTokenResponse($responseBody)
-    {
-        $data = json_decode($responseBody, true);
-
-        if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
-        } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
-        }
-        //print $data['access_token'];exit;
-
-        $token = new StdOAuth2Token();
-        $token->setAccessToken($data['access_token']);
-        $token->setLifetime($data['expires_in']);
-
-        if (isset($data['refresh_token'])) {
-            $token->setRefreshToken($data['refresh_token']);
-            unset($data['refresh_token']);
-        }
-
-        unset($data['access_token']);
-        unset($data['expires_in']);
-
-        $token->setExtraParams($data);
-
-        return $token;
-    }
+	const SCOPE_BASIC = 'basic';
+	const SCOPE_OFFLINE_ACCESS = 'offline_access';
+	const SCOPE_SIGNIN = 'signin';
+	const SCOPE_BIRTHDAY = 'birthday';
+	const SCOPE_CALENDARS = 'calendars';
+	const SCOPE_CALENDARS_UPDATE = 'calendars_update';
+	const SCOPE_CONTACTS_BIRTHDAY = 'contacts_birthday';
+	const SCOPE_CONTACTS_CREATE = 'contacts_create';
+	const SCOPE_CONTACTS_CALENDARS = 'contacts_calendars';
+	const SCOPE_CONTACTS_PHOTOS = 'contacts_photos';
+	const SCOPE_CONTACTS_SKYDRIVE = 'contacts_skydrive';
+	const SCOPE_EMAIL = 'email';
+	const SCOPE_EVENTS_CREATE = 'events_create';
+	const SCOPE_MESSENGER = 'messenger';
+	const SCOPE_OPENID = 'openid';
+	const SCOPE_PHONE_NUMBERS = 'phone_numbers';
+	const SCOPE_PHOTOS = 'photos';
+	const SCOPE_POSTAL_ADDRESSES = 'postal_addresses';
+	const SCOPE_PROFILE = 'profile';
+	const SCOPE_SHARE = 'share';
+	const SCOPE_SKYDRIVE = 'skydrive';
+	const SCOPE_SKYDRIVE_UPDATE = 'skydrive_update';
+	const SCOPE_WORK_PROFILE = 'work_profile';
+	const SCOPE_APPLICATIONS = 'applications';
+	const SCOPE_APPLICATIONS_CREATE = 'applications_create';
+	const SCOPE_IMAP = 'imap';
+	const SCOPE_IMAP_ACCESSASUSERALL = 'https://outlook.office.com/.default';
+	const SCOPE_SMTPSEND = 'https://outlook.office.com/.default';
+	const SCOPE_USERREAD = 'User.Read';
+	const SCOPE_MAILREAD = 'Mail.Read';
+	const SCOPE_MAILSEND = 'Mail.Send';
+
+	protected $storage;
+
+
+	/**
+	 * MS uses some magical not officialy supported scope to get even moar info like full emailaddresses.
+	 * They agree that giving 3rd party apps access to 3rd party emailaddresses is a pretty lame thing to do so in all
+	 * their wisdom they added this scope because fuck you that's why.
+	 *
+	 * https://github.com/Lusitanian/PHPoAuthLib/issues/214
+	 * http://social.msdn.microsoft.com/Forums/live/en-US/c6dcb9ab-aed4-400a-99fb-5650c393a95d/how-retrieve-users-
+	 *                                  contacts-email-address?forum=messengerconnect
+	 *
+	 * Considering this scope is not officially supported: use with care
+	 */
+	const SCOPE_CONTACTS_EMAILS = 'contacts_emails';
+
+
+	public function __construct(
+		CredentialsInterface $credentials,
+		ClientInterface $httpClient,
+		TokenStorageInterface $storage,
+		$scopes = array(),
+		UriInterface $baseApiUri = null
+	) {
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+		$this->storage = $storage;
+
+		if (null === $baseApiUri) {
+			$this->baseApiUri = new Uri('https://apis.live.net/v5.0/');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		$tenant = $this->storage->getTenant();
+
+		//return new Uri('https://login.live.com/oauth20_authorize.srf');
+		//return new Uri('https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize');
+		return new Uri('https://login.microsoftonline.com/'.$tenant.'/oauth2/v2.0/authorize');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		$tenant = $this->storage->getTenant();
+
+		//return new Uri('https://login.live.com/oauth20_token.srf');
+		//return new Uri('https://login.microsoftonline.com/organizations/oauth2/v2.0/token');
+		return new Uri('https://login.microsoftonline.com/'.$tenant.'/oauth2/v2.0/token');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationMethod()
+	{
+		return static::AUTHORIZATION_METHOD_QUERY_STRING;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
+
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response.');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+		}
+		//print $data['access_token'];exit;
+
+		$token = new StdOAuth2Token();
+		$token->setAccessToken($data['access_token']);
+		$token->setLifetime($data['expires_in']);
+
+		if (isset($data['refresh_token'])) {
+			$token->setRefreshToken($data['refresh_token']);
+			unset($data['refresh_token']);
+		}
+
+		unset($data['access_token']);
+		unset($data['expires_in']);
+
+		$token->setExtraParams($data);
+
+		return $token;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
         if (null === $data || !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'].'"');
         }
         //print $data['access_token'];exit;
 

htdocs/core/lib/oauth.lib.php

Spacing +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
 	// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 	$supportedoauth2array = array(
 		'OAUTH_GOOGLE_NAME' => array(
-			'callbackfile' => 'google',		// used to generate the filename: google_oauthcallback.php
+			'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php
 			'picto' => 'google',
 			'urlforapp' => 'OAUTH_GOOGLE_DESC',
 			'name' => 'Google',