Index: openid_cp_field.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openid_cp_field/openid_cp_field.module,v
retrieving revision 1.1.2.11
diff -u -p -r1.1.2.11 openid_cp_field.module
--- openid_cp_field.module	23 Apr 2009 19:33:52 -0000	1.1.2.11
+++ openid_cp_field.module	11 Jun 2009 12:33:26 -0000
@@ -270,40 +271,34 @@ function openid_cp_field_delete() {
 }
 
 /**
- * Implementation of hook_openid_provider_sreg()
+ * Implementation of hook_openid_provider_map()
  */
-function openid_cp_field_openid_provider_sreg($op, $fields, $request) {
+function openid_cp_field_openid_provider_map($op, $type, $fields, $request) {
   if ($op == 'load') {
     $response = array();
-    foreach ($fields as $key) {
-      $value = _openid_cp_field_get_value('openid.sreg.'. $key);
-      if (!empty($value)) {
-        $response['openid.sreg.'. $key] = $value;
+    if ($type == 'sreg') {
+      foreach ($fields as $key) {
+        $value = _openid_cp_field_get_value('openid.sreg.'. $key);
+        if (!empty($value)) {
+          $response['openid.sreg.'. $key] = $value;
+        }
       }
     }
-    return $response;
-  }
-}
-
-/**
- * Implementation of hook_openid_provider_ax()
- */
-function openid_cp_field_openid_provider_ax($op, $attributes) {
-  if ($op == 'load') {
-    $response = array();
-    $short_names = array();
-    if (isset($attributes['openid.ax.if_available'])) {
-      $short_names += explode(',', $attributes['openid.ax.if_available']);
-    }
-    if (isset($attributes['openid.ax.required'])) {
-      $short_names += explode(',', $attributes['openid.ax.required']);
-    }
-    foreach ($short_names as $key) {
-      // Get the full URL
-      $full_url = $attributes['openid.ax.type.'. $key];
-      $value = _openid_cp_field_get_value($full_url);
-      if (!empty($value)) {
-        $response['openid.ax.value.'. $key] = $value;
+    elseif ($type == 'ax') {
+      $short_names = array();
+      if (isset($request['openid.ax.if_available'])) {
+        $short_names += explode(',', $request['openid.ax.if_available']);
+      }
+      if (isset($request['openid.ax.required'])) {
+        $short_names += explode(',', $request['openid.ax.required']);
+      }
+      foreach ($short_names as $key) {
+        // Get the full URL
+        $full_url = $request['openid.ax.type.'. $key];
+        $value = _openid_cp_field_get_value($full_url);
+        if (!empty($value)) {
+          $response['openid.ax.value.'. $key] = $value;
+        }
       }
     }
     return $response;