From b1efa11308ba1ae2649fd1fa73e491fe1ad50770 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 25 Apr 2020 12:34:56 -0400
Subject: [PATCH 1/3] Update function definition in library/OAuth1

- Move optional token parameter at the end of OAuthRequest::from_consumer_and_token() function definition
- Make token parameter optional in OAuthSignatureMethod->build_signature
- Move optional token parameter at the end of OAuthSignatureMethod->check_signature() function definition
---
 library/OAuth1.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/library/OAuth1.php b/library/OAuth1.php
index 041b0e6904..813234b67b 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -96,7 +96,7 @@ abstract class OAuthSignatureMethod
 	 * @param OAuthToken    $token
 	 * @return string
 	 */
-	abstract public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token);
+	abstract public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null);
 
 	/**
 	 * Verifies that a given signature is correct
@@ -107,7 +107,7 @@ abstract class OAuthSignatureMethod
 	 * @param string        $signature
 	 * @return bool
 	 */
-	public function check_signature($request, $consumer, $token, $signature)
+	public function check_signature(OAuthRequest $request, OAuthConsumer $consumer, $signature, OAuthToken $token = null)
 	{
 		$built = $this->build_signature($request, $consumer, $token);
 		return ($built == $signature);
@@ -134,7 +134,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod
 	 * @param OAuthToken    $token
 	 * @return string
 	 */
-	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
+	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
 	{
 		$base_string = $request->get_signature_base_string();
 		$request->base_string = $base_string;
@@ -179,7 +179,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod
 	 * @param $token
 	 * @return string
 	 */
-	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
+	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
 	{
 		$key_parts = array(
 			$consumer->secret,
@@ -223,7 +223,7 @@ abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
 	// Either way should return a string representation of the certificate
 	protected abstract function fetch_private_cert(&$request);
 
-	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
+	public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
 	{
 		$base_string = $request->get_signature_base_string();
 		$request->base_string = $base_string;
@@ -243,7 +243,7 @@ abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
 		return base64_encode($signature);
 	}
 
-	public function check_signature($request, $consumer, $token, $signature)
+	public function check_signature(OAuthRequest $request, OAuthConsumer $consumer, $signature, OAuthToken $token = null)
 	{
 		$decoded_sig = base64_decode($signature);
 
@@ -358,7 +358,7 @@ class OAuthRequest
 	 * @param array|null    $parameters
 	 * @return OAuthRequest
 	 */
-	public static function from_consumer_and_token(OAuthConsumer $consumer, OAuthToken $token, $http_method, $http_url, array $parameters = NULL)
+	public static function from_consumer_and_token(OAuthConsumer $consumer, $http_method, $http_url, array $parameters = null, OAuthToken $token = null)
 	{
 		@$parameters or $parameters = array();
 		$defaults = array(
@@ -788,11 +788,10 @@ class OAuthServer
 		$valid_sig = $signature_method->check_signature(
 			$request,
 			$consumer,
-			$token,
-			$signature
+			$signature,
+			$token
 		);
 
-
 		if (!$valid_sig) {
 			throw new OAuthException("Invalid signature");
 		}

From 66021480a7cc933d2d535b0e20866c97cac44a1d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 25 Apr 2020 15:36:22 -0400
Subject: [PATCH 2/3] [frio] Align brand name color on nav icon

---
 view/theme/frio/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index ac6b5210c6..3dd4b8eb46 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -391,6 +391,7 @@ header #banner #logo-img,
 }
 #navbrand-container #navbar-brand-text {
     padding-left: 5px;
+	color: $nav_icon_color;
 }
 
 /* NavBar */

From a708627b45aa072be46e5b53a14b40a88787bc08 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 26 Apr 2020 09:49:35 +0200
Subject: [PATCH 3/3] Fix travis services entry

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4ea3ac7ab2..5e4c3483b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ php:
 
 services:
  - mysql
- - redis-server
+ - redis
  - memcached
 env:
  - MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_USERNAME=travis MYSQL_PASSWORD="" MYSQL_DATABASE=test