From 424fae8b888fea44886250f2c4c8ce2ecf52d9e7 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 13 Oct 2020 19:14:28 +0200
Subject: complete form conversion

---
 .../includes/openid-connect-generic-login-form.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 1ff6bae..3885000 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
@@ -134,7 +134,7 @@ class OpenID_Connect_Generic_Login_Form {
 		$user = wp_get_current_user ();
 	   	if (0 != $user->ID) {
 			$token_response = $user->get ('openid-connect-generic-last-user-claim');
-			echo "OIDC has: " . json_encode ( $token_response ) + "<br>\n";
+			echo "OIDC has: " . json_encode ( $token_response ) . "<br>\n";
                         echo "SET: " . (isset( $token_response)) . " AND " .
                              is_array ($token_response) . " AND " .
                              (array_key_exists ('address', $token_response)) . "<br>\n";
@@ -143,22 +143,22 @@ class OpenID_Connect_Generic_Login_Form {
                              $given_name = $token_response [ 'given_name' ];
                              echo "GN: " . $family_name . "<br>\n";
  			     $in['billing']['billing_given_name']['default'] = $given_name;
-			     $in['shipping']['given-name']['default'] = $given_name;
+			     $in['shipping']['shipping_given_name']['default'] = $given_name;
                         }
 			if ( (isset( $token_response)) &&
                              (array_key_exists ('family_name', $token_response)) ){
                              $family_name = $token_response [ 'family_name' ];
                              echo "FN: " . $family_name . "<br>\n";
                              (array_key_exists ('address', $token_response));
- 			     $in['billing']['billing_last_name']['default'] = $given_name;
-			     $in['shipping']['family-name']['default'] = $given_name;
+ 			     $in['billing']['billing_last_name']['default'] = $family_name;
+			     $in['shipping']['shipping_last_name']['default'] = $family_name;
                         }
 			if ( (isset( $token_response)) &&
                              (array_key_exists ('phone_number', $token_response)) ){
                              $phone_number = $token_response [ 'phone_number' ];
                              echo "TEL: " . $phone_number . "<br>\n";
- 			     $in['billing']['phone']['default'] = $phone_number;
-			     $in['shipping']['phone']['default'] = $phone_number;
+ 			     $in['billing']['billing_phone']['default'] = $phone_number;
+			     $in['shipping']['shipping_phone']['default'] = $phone_number;
                         }
                         if ( (isset( $token_response)) &&
                              (array_key_exists ('address', $token_response)) ){
-- 
cgit v1.2.3