From e6d29b704b5eb7e557c1200cd08e1c1327ffb21a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 13 Oct 2020 19:01:19 +0200
Subject: fix redirect to checkout page upon OIDC login

---
 .../includes/openid-connect-generic-login-form.php         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/daggerhart-openid-connect-generic/includes/openid-connect-generic-login-form.php b/daggerhart-openid-connect-generic/includes/openid-connect-generic-login-form.php
index 76107b0..a3b9804 100755
--- a/daggerhart-openid-connect-generic/includes/openid-connect-generic-login-form.php
+++ b/daggerhart-openid-connect-generic/includes/openid-connect-generic-login-form.php
@@ -142,27 +142,27 @@ class OpenID_Connect_Generic_Login_Form {
                              (array_key_exists ('address', $token_response)) ){
 				$address = $token_response [ 'address' ];
                            	echo "OIDC has address: " . json_encode ( $address ); // DEBUG
-				if ( in_array( 'postal_code', $address ) ){
+				if ( array_key_exists( 'postal_code', $address ) ){
 					$postal_code = $address [ 'postal_code' ];
 					$in['billing']['billing_postcode']['default'] = $postal_code;
 					$in['shipping']['shipping_postcode']['default'] = $postal_code;
 				}
-				if ( in_array( 'country', $address ) ){
+				if ( array_key_exists( 'country', $address ) ){
 					$country = $address [ 'country' ];
 					$in['billing']['billing_country']['default'] = $country;
 					$in['shipping']['shipping_country']['default'] = $country;
 				}
-				if ( in_array( 'locality', $address ) ){
+				if ( array_key_exists( 'locality', $address ) ){
 					$locality = $address [ 'locality' ];
 					$in['billing']['billing_city']['default'] = $locality;
 					$in['shipping']['shipping_city']['default'] = $locality;
 				}
-				if ( in_array ( 'region', $address ) ){
+				if ( array_key_exists ( 'region', $address ) ){
 					$region = $address [ 'region' ];
 					$in['billing']['billing_state']['default'] = $region;
 					$in['shipping']['shipping_state']['default'] = $region;
 				}
-				if ( in_array ( 'formatted', $address ) ){
+				if ( array_key_exists ( 'formatted', $address ) ){
 					$formatted = $address [ 'formatted' ];
 					$lines = explode ( '\r\n', $formatted );
 					if ( count($lines) > 0 ){
@@ -174,9 +174,9 @@ class OpenID_Connect_Generic_Login_Form {
 						$in['shipping']['shipping_address_2']['default'] = $lines[1];
 					}
 				}
-				if ( in_array ( 'street_address', $address ) ){
+				if ( array_key_exists ( 'street_address', $address ) ){
 					$street_address = $address [ 'street_address' ];
-					if ( ! in_array ( 'formatted', $address ) ){
+					if ( ! array_key_exists ( 'formatted', $address ) ){
 						$in['billing']['billing_address_1']['default'] = $street_address;
 						$in['shipping']['shipping_address_1']['default'] = $street_address;
 					}
-- 
cgit v1.2.3