Dolibarr / dolibarr

htdocs/salaries/card.php

Spacing +14 added lines, -14 removed lines

@@ -314,9 +314,9 @@ 
 			// Create a line of payments
 			$paiement = new PaymentSalary($db);
 			$paiement->fk_salary    = $object->id;
-			$paiement->chid         = $object->id;	// deprecated
+			$paiement->chid         = $object->id; // deprecated
 			$paiement->datep        = $datep;
-			$paiement->datev		= $datev;
+			$paiement->datev = $datev;
 			$paiement->amounts      = array($object->id => $amount); // Tableau de montant
 			$paiement->fk_typepayment = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
@@ -345,10 +345,10 @@ 
 
 			if (GETPOST('saveandnew', 'alpha')) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				header("Location: card.php?action=create&fk_project=" . urlencode((string) ($projectid)) . "&accountid=" . urlencode((string) ($accountid)) . '&paymenttype=' . urlencode((string) (GETPOSTINT('paymenttype'))) . '&datepday=' . GETPOSTINT("datepday") . '&datepmonth=' . GETPOSTINT("datepmonth") . '&datepyear=' . GETPOSTINT("datepyear"));
+				header("Location: card.php?action=create&fk_project=".urlencode((string) ($projectid))."&accountid=".urlencode((string) ($accountid)).'&paymenttype='.urlencode((string) (GETPOSTINT('paymenttype'))).'&datepday='.GETPOSTINT("datepday").'&datepmonth='.GETPOSTINT("datepmonth").'&datepyear='.GETPOSTINT("datepyear"));
 				exit;
 			} else {
-				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
 				exit;
 			}
 		} else {
@@ -638,7 +638,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment
 
 	// Bank
 	if (isModEnabled("bank")) {
@@ -906,10 +906,10 @@ 
 			$userstatic = new User($db);
 			$result = $userstatic->fetch($object->fk_user);
 			if ($result > 0) {
-				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
+				$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 			}
 		} else {
-			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
+			$morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
 
 			if (!empty($object->fk_user)) {
 				$userstatic = new User($db);
@@ -976,7 +976,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td class="titlefieldmiddle">' . $langs->trans("DateStartPeriod") . '</td><td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans("DateStartPeriod").'</td><td>';
 		print dol_print_date($object->datesp, 'day');
 		print '</td></tr>';
 	}
@@ -987,7 +987,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
+		print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
 		print dol_print_date($object->dateep, 'day');
 		print '</td></tr>';
 	}
@@ -1002,9 +1002,9 @@ 
 	print '</td></tr>';*/
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 	}
 
 	// Default mode of payment
@@ -1190,7 +1190,7 @@ 
 			if (empty($user->socid)) {
 				$canSendMail = true;
 
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
 			}
 		}
 
@@ -1206,12 +1206,12 @@ 
 
 		// Transfer request
 		if ($object->status == $object::STATUS_UNPAID && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) {
-			print dolGetButtonAction('', $langs->trans('MakeTransferRequest'), 'default', DOL_URL_ROOT . '/salaries/virement_request.php?id=' . $object->id, '');
+			print dolGetButtonAction('', $langs->trans('MakeTransferRequest'), 'default', DOL_URL_ROOT.'/salaries/virement_request.php?id='.$object->id, '');
 		}
 
 		// Emit payment
 		if ($object->status == $object::STATUS_UNPAID && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) {
-			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, '');
+			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Classify 'paid'

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

Indentation +138 added lines, -138 removed lines

@@ -10,142 +10,142 @@
  */
 class CurlClient extends AbstractClient
 {
-    /**
-     * If true, explicitly sets cURL to use SSL version 3. Use this if cURL
-     * compiles with GnuTLS SSL.
-     *
-     * @var bool
-     */
-    private $forceSSL3 = false;
-
-    /**
-     * Additional parameters (as `key => value` pairs) to be passed to `curl_setopt`
-     *
-     * @var array
-     */
-    private $parameters = array();
-
-    /**
-     * Additional `curl_setopt` parameters
-     *
-     * @param array $parameters
-     */
-    public function setCurlParameters(array $parameters)
-    {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * @param bool $force
-     *
-     * @return CurlClient
-     */
-    public function setForceSSL3($force)
-    {
-        $this->forceSSL3 = $force;
-
-        return $this;
-    }
-
-    /**
-     * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
-     * They should return, in string form, the response body and throw an exception on error.
-     *
-     * @param UriInterface $endpoint
-     * @param mixed        $requestBody
-     * @param array        $extraHeaders
-     * @param string       $method
-     *
-     * @return string
-     *
-     * @throws TokenResponseException
-     * @throws \InvalidArgumentException
-     */
-    public function retrieveResponse(
-        UriInterface $endpoint,
-        $requestBody,
-        array $extraHeaders = array(),
-        $method = 'POST'
-    ) {
-        // Normalize method name
-        $method = strtoupper($method);
-
-        $extraHeaders = $this->normalizeHeaders($extraHeaders);
-
-        if ($method === 'GET' && !empty($requestBody)) {
-            throw new \InvalidArgumentException('No body expected for "GET" request.');
-        }
-
-        if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
-            $extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
-        }
-
-        $extraHeaders['Host']       = 'Host: '.$endpoint->getHost();
-        $extraHeaders['Connection'] = 'Connection: close';
-
-        $ch = curl_init();
-
-        curl_setopt($ch, CURLOPT_URL, $endpoint->getAbsoluteUri());
-
-        if ($method === 'POST' || $method === 'PUT') {
-            if ($requestBody && is_array($requestBody)) {
-                $requestBody = http_build_query($requestBody, '', '&');
-            }
-
-            if ($method === 'PUT') {
-                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
-            } else {
-                curl_setopt($ch, CURLOPT_POST, true);
-            }
-
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $requestBody);
-        } else {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
-        }
-
-        if ($this->maxRedirects > 0) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->maxRedirects);
-        }
-
-        curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HEADER, false);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $extraHeaders);
-        curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
-
-        foreach ($this->parameters as $key => $value) {
-            curl_setopt($ch, $key, $value);
-        }
-
-        if ($this->forceSSL3) {
-            curl_setopt($ch, CURLOPT_SSLVERSION, 3);
-        }
-
-        // @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));
-        }
-
-        $response     = curl_exec($ch);
-        $responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-        if (false === $response) {
-            $errNo  = curl_errno($ch);
-            $errStr = curl_error($ch);
-            curl_close($ch);
-            if (empty($errStr)) {
-                throw new TokenResponseException('Failed to request resource.', $responseCode);
-            }
-            throw new TokenResponseException('cURL Error # '.$errNo.': '.$errStr, $responseCode);
-        }
-
-        curl_close($ch);
-
-        return $response;
-    }
+	/**
+	 * If true, explicitly sets cURL to use SSL version 3. Use this if cURL
+	 * compiles with GnuTLS SSL.
+	 *
+	 * @var bool
+	 */
+	private $forceSSL3 = false;
+
+	/**
+	 * Additional parameters (as `key => value` pairs) to be passed to `curl_setopt`
+	 *
+	 * @var array
+	 */
+	private $parameters = array();
+
+	/**
+	 * Additional `curl_setopt` parameters
+	 *
+	 * @param array $parameters
+	 */
+	public function setCurlParameters(array $parameters)
+	{
+		$this->parameters = $parameters;
+	}
+
+	/**
+	 * @param bool $force
+	 *
+	 * @return CurlClient
+	 */
+	public function setForceSSL3($force)
+	{
+		$this->forceSSL3 = $force;
+
+		return $this;
+	}
+
+	/**
+	 * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
+	 * They should return, in string form, the response body and throw an exception on error.
+	 *
+	 * @param UriInterface $endpoint
+	 * @param mixed        $requestBody
+	 * @param array        $extraHeaders
+	 * @param string       $method
+	 *
+	 * @return string
+	 *
+	 * @throws TokenResponseException
+	 * @throws \InvalidArgumentException
+	 */
+	public function retrieveResponse(
+		UriInterface $endpoint,
+		$requestBody,
+		array $extraHeaders = array(),
+		$method = 'POST'
+	) {
+		// Normalize method name
+		$method = strtoupper($method);
+
+		$extraHeaders = $this->normalizeHeaders($extraHeaders);
+
+		if ($method === 'GET' && !empty($requestBody)) {
+			throw new \InvalidArgumentException('No body expected for "GET" request.');
+		}
+
+		if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
+			$extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
+		}
+
+		$extraHeaders['Host']       = 'Host: '.$endpoint->getHost();
+		$extraHeaders['Connection'] = 'Connection: close';
+
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_URL, $endpoint->getAbsoluteUri());
+
+		if ($method === 'POST' || $method === 'PUT') {
+			if ($requestBody && is_array($requestBody)) {
+				$requestBody = http_build_query($requestBody, '', '&');
+			}
+
+			if ($method === 'PUT') {
+				curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+			} else {
+				curl_setopt($ch, CURLOPT_POST, true);
+			}
+
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $requestBody);
+		} else {
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+		}
+
+		if ($this->maxRedirects > 0) {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+			curl_setopt($ch, CURLOPT_MAXREDIRS, $this->maxRedirects);
+		}
+
+		curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HEADER, false);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $extraHeaders);
+		curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
+
+		foreach ($this->parameters as $key => $value) {
+			curl_setopt($ch, $key, $value);
+		}
+
+		if ($this->forceSSL3) {
+			curl_setopt($ch, CURLOPT_SSLVERSION, 3);
+		}
+
+		// @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));
+		}
+
+		$response     = curl_exec($ch);
+		$responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+		if (false === $response) {
+			$errNo  = curl_errno($ch);
+			$errStr = curl_error($ch);
+			curl_close($ch);
+			if (empty($errStr)) {
+				throw new TokenResponseException('Failed to request resource.', $responseCode);
+			}
+			throw new TokenResponseException('cURL Error # '.$errNo.': '.$errStr, $responseCode);
+		}
+
+		curl_close($ch);
+
+		return $response;
+	}
 }

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

Indentation +80 added lines, -80 removed lines

@@ -10,96 +10,96 @@
  */
 class StreamClient extends AbstractClient
 {
-    /**
-     * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
-     * They should return, in string form, the response body and throw an exception on error.
-     *
-     * @param UriInterface $endpoint
-     * @param mixed        $requestBody
-     * @param array        $extraHeaders
-     * @param string       $method
-     *
-     * @return string
-     *
-     * @throws TokenResponseException
-     * @throws \InvalidArgumentException
-     */
-    public function retrieveResponse(
-        UriInterface $endpoint,
-        $requestBody,
-        array $extraHeaders = array(),
-        $method = 'POST'
-    ) {
-        // Normalize method name
-        $method = strtoupper($method);
+	/**
+	 * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
+	 * They should return, in string form, the response body and throw an exception on error.
+	 *
+	 * @param UriInterface $endpoint
+	 * @param mixed        $requestBody
+	 * @param array        $extraHeaders
+	 * @param string       $method
+	 *
+	 * @return string
+	 *
+	 * @throws TokenResponseException
+	 * @throws \InvalidArgumentException
+	 */
+	public function retrieveResponse(
+		UriInterface $endpoint,
+		$requestBody,
+		array $extraHeaders = array(),
+		$method = 'POST'
+	) {
+		// Normalize method name
+		$method = strtoupper($method);
 
-        $extraHeaders = $this->normalizeHeaders($extraHeaders);
+		$extraHeaders = $this->normalizeHeaders($extraHeaders);
 
-        if ($method === 'GET' && !empty($requestBody)) {
-            throw new \InvalidArgumentException('No body expected for "GET" request.');
-        }
+		if ($method === 'GET' && !empty($requestBody)) {
+			throw new \InvalidArgumentException('No body expected for "GET" request.');
+		}
 
-        if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
-            $extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
-        }
+		if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
+			$extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
+		}
 
-        $host = 'Host: '.$endpoint->getHost();
-        // Append port to Host if it has been specified
-        if ($endpoint->hasExplicitPortSpecified()) {
-            $host .= ':'.$endpoint->getPort();
-        }
+		$host = 'Host: '.$endpoint->getHost();
+		// Append port to Host if it has been specified
+		if ($endpoint->hasExplicitPortSpecified()) {
+			$host .= ':'.$endpoint->getPort();
+		}
 
-        $extraHeaders['Host']       = $host;
-        $extraHeaders['Connection'] = 'Connection: close';
+		$extraHeaders['Host']       = $host;
+		$extraHeaders['Connection'] = 'Connection: close';
 
-        if (is_array($requestBody)) {
-            $requestBody = http_build_query($requestBody, '', '&');
-        }
-        $extraHeaders['Content-length'] = 'Content-length: '.strlen($requestBody);
+		if (is_array($requestBody)) {
+			$requestBody = http_build_query($requestBody, '', '&');
+		}
+		$extraHeaders['Content-length'] = 'Content-length: '.strlen($requestBody);
 
-        //var_dump($requestBody); var_dump($extraHeaders);var_dump($method);exit;
-        $context = $this->generateStreamContext($requestBody, $extraHeaders, $method);
+		//var_dump($requestBody); var_dump($extraHeaders);var_dump($method);exit;
+		$context = $this->generateStreamContext($requestBody, $extraHeaders, $method);
 
 		// @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));
-        }
+		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));
+		}
 
-        $level = error_reporting(0);
-        $response = file_get_contents($endpoint->getAbsoluteUri(), false, $context);
-        error_reporting($level);
-        if (false === $response) {
-            $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')
-                );
-            }
-            throw new TokenResponseException($lastError['message']);
-        }
+		$level = error_reporting(0);
+		$response = file_get_contents($endpoint->getAbsoluteUri(), false, $context);
+		error_reporting($level);
+		if (false === $response) {
+			$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')
+				);
+			}
+			throw new TokenResponseException($lastError['message']);
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 
-    private function generateStreamContext($body, $headers, $method)
-    {
-        return stream_context_create(
-            array(
-                'http' => array(
-                    'method'           => $method,
-                    'header'           => implode("\r\n", array_values($headers)),
-                    'content'          => $body,
-                    'protocol_version' => '1.1',
-                    'user_agent'       => $this->userAgent,
-                    'max_redirects'    => $this->maxRedirects,
-                    'timeout'          => $this->timeout
-                ),
-            )
-        );
-    }
+	private function generateStreamContext($body, $headers, $method)
+	{
+		return stream_context_create(
+			array(
+				'http' => array(
+					'method'           => $method,
+					'header'           => implode("\r\n", array_values($headers)),
+					'content'          => $body,
+					'protocol_version' => '1.1',
+					'user_agent'       => $this->userAgent,
+					'max_redirects'    => $this->maxRedirects,
+					'timeout'          => $this->timeout
+				),
+			)
+		);
+	}
 }

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

Indentation +53 added lines, -53 removed lines

@@ -7,66 +7,66 @@
  */
 abstract class AbstractClient implements ClientInterface
 {
-    /**
-     * @var string The user agent string passed to services
-     */
-    protected $userAgent;
+	/**
+	 * @var string The user agent string passed to services
+	 */
+	protected $userAgent;
 
-    /**
-     * @var int The maximum number of redirects
-     */
-    protected $maxRedirects = 5;
+	/**
+	 * @var int The maximum number of redirects
+	 */
+	protected $maxRedirects = 5;
 
-    /**
-     * @var int The maximum timeout
-     */
-    protected $timeout = 15;
+	/**
+	 * @var int The maximum timeout
+	 */
+	protected $timeout = 15;
 
-    /**
-     * Creates instance
-     *
-     * @param string $userAgent The UA string the client will use
-     */
-    public function __construct($userAgent = 'PHPoAuthLib')
-    {
-        $this->userAgent = $userAgent;
-    }
+	/**
+	 * Creates instance
+	 *
+	 * @param string $userAgent The UA string the client will use
+	 */
+	public function __construct($userAgent = 'PHPoAuthLib')
+	{
+		$this->userAgent = $userAgent;
+	}
 
-    /**
-     * @param int $redirects Maximum redirects for client
-     *
-     * @return ClientInterface
-     */
-    public function setMaxRedirects($redirects)
-    {
-        $this->maxRedirects = $redirects;
+	/**
+	 * @param int $redirects Maximum redirects for client
+	 *
+	 * @return ClientInterface
+	 */
+	public function setMaxRedirects($redirects)
+	{
+		$this->maxRedirects = $redirects;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param int $timeout Request timeout time for client in seconds
-     *
-     * @return ClientInterface
-     */
-    public function setTimeout($timeout)
-    {
-        $this->timeout = $timeout;
+	/**
+	 * @param int $timeout Request timeout time for client in seconds
+	 *
+	 * @return ClientInterface
+	 */
+	public function setTimeout($timeout)
+	{
+		$this->timeout = $timeout;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param array $headers
-     */
-    public function normalizeHeaders($headers)
-    {
-        $normalizeHeaders = [];
-        foreach ($headers as $key => $val) {
-            $val = ucfirst(strtolower($key)) . ': ' . $val;
-            $normalizeHeaders[$key] = $val;
-        }
+	/**
+	 * @param array $headers
+	 */
+	public function normalizeHeaders($headers)
+	{
+		$normalizeHeaders = [];
+		foreach ($headers as $key => $val) {
+			$val = ucfirst(strtolower($key)) . ': ' . $val;
+			$normalizeHeaders[$key] = $val;
+		}
 
-        return $normalizeHeaders;
-    }
+		return $normalizeHeaders;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     {
         $normalizeHeaders = [];
         foreach ($headers as $key => $val) {
-            $val = ucfirst(strtolower($key)) . ': ' . $val;
+            $val = ucfirst(strtolower($key)).': '.$val;
             $normalizeHeaders[$key] = $val;
         }
 

htdocs/categories/class/categorie.class.php

Spacing +21 added lines, -21 removed lines

@@ -50,25 +50,25 @@ 
 class Categorie extends CommonObject
 {
 	// Categories types (we use string because we want to accept any modules/types in a future)
-	const TYPE_PRODUCT				= 'product';
+	const TYPE_PRODUCT = 'product';
 	const TYPE_SUPPLIER				= 'supplier';
 	const TYPE_CUSTOMER				= 'customer';
-	const TYPE_MEMBER				= 'member';
+	const TYPE_MEMBER = 'member';
 	const TYPE_CONTACT				= 'contact';
-	const TYPE_USER					= 'user';
+	const TYPE_USER = 'user';
 	const TYPE_PROJECT				= 'project';
 	const TYPE_ACCOUNT				= 'bank_account';
 	const TYPE_BANK_LINE			= 'bank_line';
 	const TYPE_WAREHOUSE			= 'warehouse';
-	const TYPE_ACTIONCOMM			= 'actioncomm';
-	const TYPE_WEBSITE_PAGE			= 'website_page';
-	const TYPE_TICKET				= 'ticket';
-	const TYPE_KNOWLEDGEMANAGEMENT	= 'knowledgemanagement';
-	const TYPE_FICHINTER			= 'fichinter';
-	const TYPE_ORDER				= 'order';
-	const TYPE_INVOICE				= 'invoice';
-	const TYPE_SUPPLIER_ORDER		= 'supplier_order';
-	const TYPE_SUPPLIER_INVOICE		= 'supplier_invoice';
+	const TYPE_ACTIONCOMM = 'actioncomm';
+	const TYPE_WEBSITE_PAGE = 'website_page';
+	const TYPE_TICKET = 'ticket';
+	const TYPE_KNOWLEDGEMANAGEMENT = 'knowledgemanagement';
+	const TYPE_FICHINTER = 'fichinter';
+	const TYPE_ORDER = 'order';
+	const TYPE_INVOICE = 'invoice';
+	const TYPE_SUPPLIER_ORDER = 'supplier_order';
+	const TYPE_SUPPLIER_INVOICE = 'supplier_invoice';
 
 
 	/**
@@ -757,7 +757,7 @@ 
 			'categorie_contact' => 'fk_categorie',
 			'categorie_fournisseur' => 'fk_categorie',
 			'categorie_knowledgemanagement' => array('field' => 'fk_categorie', 'enabled' => isModEnabled('knowledgemanagement')),
-			'categorie_fichinter' => array('field' => 'fk_categorie', 'enabled' => false ),  // not yet fully implemented (wait 22) isModEnabled('intervention')),
+			'categorie_fichinter' => array('field' => 'fk_categorie', 'enabled' => false), // not yet fully implemented (wait 22) isModEnabled('intervention')),
 			'categorie_member' => 'fk_categorie',
 			'categorie_user' => 'fk_categorie',
 			'categorie_product' => 'fk_categorie',
@@ -1359,14 +1359,14 @@ 
 					|| preg_match('/'.$keyfilter3.'/', $fullpath) || preg_match('/'.$keyfilter4.'/', $fullpath));
 
 				if (($test && !$include) || (!$test && $include)) {
-					unset($this->cats[$key]);  // @phpstan-ignore-line
+					unset($this->cats[$key]); // @phpstan-ignore-line
 				}
 			}
 		}
 
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 
-		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1);		// Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
+		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1); // Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
 
 		return $this->cats;
 	}
@@ -1624,7 +1624,7 @@ 
 		$parents = $this->get_meres();
 		if (is_array($parents)) {
 			foreach ($parents as $parent) {
-				$all_ways = $parent->get_all_ways();	// recursivity. TODO Add a protection for infinite loop
+				$all_ways = $parent->get_all_ways(); // recursivity. TODO Add a protection for infinite loop
 				foreach ($all_ways as $way) {
 					$w = $way;
 					$w[] = $this;
@@ -1784,10 +1784,10 @@ 
 	 */
 	public function isAnyPhotoAvailable($sdir)
 	{
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$sdir .= '/' . get_exdir($this->id, 2, 0, 0, $this, 'category') . $this->id . "/photos/";
+		$sdir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/photos/";
 
 		$dir_osencoded = dol_osencode($sdir);
 		if (file_exists($dir_osencoded)) {
@@ -1797,7 +1797,7 @@ 
 					if (!utf8_check($file)) {
 						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
 					}
-					if (dol_is_file($sdir . $file) && image_format_supported($file) >= 0) {
+					if (dol_is_file($sdir.$file) && image_format_supported($file) >= 0) {
 						return true;
 					}
 				}
@@ -1920,7 +1920,7 @@ 
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/public/stripe/ipn.php

Spacing +32 added lines, -32 removed lines

@@ -194,12 +194,12 @@ 
 		if (!empty($user->email)) {
 			$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
 		} else {
-			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '" <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'" <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 		}
 		$replyto = $sendto;
 		$sendtocc = '';
 		if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
+			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'" <'.getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 		}
 
 		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
@@ -297,12 +297,12 @@ 
 				if (!empty($user->email)) {
 					$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
 				} else {
-					$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '" <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+					$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'" <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 				}
 				$replyto = $sendto;
 				$sendtocc = '';
 				if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-					$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
+					$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'" <'.getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 				}
 
 				$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." has been done to your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
@@ -348,19 +348,19 @@ 
 	dol_syslog("object = ".var_export($event->data, true));
 	dol_syslog("object = ".var_export($event->data, true), LOG_DEBUG, 0, '_payment');
 
-	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 	global $stripearrayofkeysbyenv;
 	$error = 0;
 	$object = $event->data->object;
-	$TRANSACTIONID = $object->id;	// Example pi_123456789...
+	$TRANSACTIONID = $object->id; // Example pi_123456789...
 	$ipaddress = $object->metadata->ipaddress;
 	$now = dol_now();
 	$currencyCodeType = strtoupper($object->currency);
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$invoice_id = "";
-	$paymentTypeCode = "";			// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -433,7 +433,7 @@ 
 		$s = new \Stripe\StripeClient($stripeacc);
 
 		$paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid);
-		$paymentTypeCode =  $paymentmethodstripe->type;
+		$paymentTypeCode = $paymentmethodstripe->type;
 		if ($paymentTypeCode == "ban" || $paymentTypeCode == "sepa_debit") {
 			$paymentTypeCode = "PRE";
 		} elseif ($paymentTypeCode == "card") {
@@ -460,9 +460,9 @@ 
 			$paiement->datepaye = $now;
 			$paiement->date = $now;
 			if ($currencyCodeType == $conf->currency) {
-				$paiement->amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching with invoice id
+				$paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id
 			} else {
-				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching
+				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching
 
 				$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 				$ispostactionok = -1;
@@ -485,8 +485,8 @@ 
 
 			$paiement->num_payment = '';
 			$paiement->note_public = '';
-			$paiement->note_private = 'Stripe Sepa payment received by IPN service listening webhooks - ' . dol_print_date($now, 'standard') . ' (TZ server) using servicestatus=' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
-			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];		// May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+			$paiement->note_private = 'Stripe Sepa payment received by IPN service listening webhooks - '.dol_print_date($now, 'standard').' (TZ server) using servicestatus='.$servicestatus.($ipaddress ? ' from ip '.$ipaddress : '').' - Transaction ID = '.$TRANSACTIONID;
+			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue.
 			$paiement->ext_payment_site = $service;
 
 			$ispaymentdone = 0;
@@ -505,23 +505,23 @@ 
 			$db->begin();
 
 			if (!$error && !$ispaymentdone) {
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.');
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
 
 				// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
 				$paiement_id = $paiement->create($user, 1);
 				if ($paiement_id < 0) {
-					$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+					$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 					$ispostactionok = -1;
 					$error++;
 
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id);
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id);
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				} else {
 					$postactionmessages[] = 'Payment created';
 
-					dol_syslog("The payment has been created for invoice id " . $invoice_id);
-					dol_syslog("The payment has been created for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("The payment has been created for invoice id ".$invoice_id);
+					dol_syslog("The payment has been created for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				}
 			}
 
@@ -553,14 +553,14 @@ 
 						$label = '(CustomerInvoicePayment)';
 						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $customer_id, '');
 						if ($result < 0) {
-							$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+							$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						} else {
 							$postactionmessages[] = 'Bank transaction of payment created (by ipn.php file)';
 						}
 					} else {
-						$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
 					}
@@ -732,7 +732,7 @@ 
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -766,7 +766,7 @@ 
 		$companypaymentmode->card_type       = $event->data->object->card->branding;
 
 		$companypaymentmode->owner_name      = $event->data->object->billing_details->name;
-		$companypaymentmode->proprio         = $companypaymentmode->owner_name;			// We may still need this formodulebuilder because name of field is "proprio"
+		$companypaymentmode->proprio         = $companypaymentmode->owner_name; // We may still need this formodulebuilder because name of field is "proprio"
 
 		$companypaymentmode->exp_date_month  = (int) $event->data->object->card->exp_month;
 		$companypaymentmode->exp_date_year   = (int) $event->data->object->card->exp_year;
@@ -808,7 +808,7 @@ 
 		$companypaymentmode->label           = '';
 		$companypaymentmode->number          = $db->escape($event->data->object->id);
 		$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
-		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name);	// deprecated
+		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name); // deprecated
 		$companypaymentmode->owner_name      = $db->escape($event->data->object->billing_details->name);
 		$companypaymentmode->exp_date_month  = (int) $event->data->object->card->exp_month;
 		$companypaymentmode->exp_date_year   = (int) $event->data->object->card->exp_year;
@@ -864,12 +864,12 @@ 
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$reason = $object->reason;
-	$amountdisputestripe = $object->amoutndispute;	// In stripe format
-	$amountdispute = $amountdisputestripe;			// In real currency format
+	$amountdisputestripe = $object->amoutndispute; // In stripe format
+	$amountdispute = $amountdisputestripe; // In real currency format
 
 	$invoice_id = 0;
-	$paymentTypeCode = "";			// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -951,7 +951,7 @@ 
 	$paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching
 	*/
 	$paiement->paiementid   = dol_getIdFromCode($db, 'PRE', 'c_paiement', 'code', 'id', 1);
-	$paiement->num_payment  = $object->id;	// A string like 'du_...'
+	$paiement->num_payment  = $object->id; // A string like 'du_...'
 	$paiement->note_public = 'Fund withdrawn by bank. Reason: '.$reason;
 	$paiement->note_private = '';
 	$paiement->fk_account   = $accountfrom->id;
@@ -967,7 +967,7 @@ 
 		$error++;
 	}
 
-	if (! $error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
+	if (!$error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
 		// Switch back the invoice to status validated
 		$result = $tmpinvoice->setStatut(Facture::STATUS_VALIDATED);
 		if ($result < 0) {
@@ -976,7 +976,7 @@ 
 		}
 	}
 
-	if (! $error) {
+	if (!$error) {
 		$paiement_id = $paiement->create($user, 0, $tmpinvoice->thirdparty); // This include regenerating documents
 		if ($paiement_id < 0) {
 			$errormsg = $paiement->error.implode(', ', $paiement->errors);