Index: openidurl.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openidurl/Attic/openidurl.module,v
retrieving revision 1.7.2.11
diff -u -p -r1.7.2.11 openidurl.module
--- openidurl.module	12 Sep 2008 17:50:09 -0000	1.7.2.11
+++ openidurl.module	29 May 2009 04:27:24 -0000
@@ -83,20 +83,10 @@ function openidurl_perm() {
  */
 function openidurl_user($type, &$edit, &$user, $category = NULL) {
   switch ($type) {
-    case 'load':
-      return openidurl_load_profile($user);
-    case 'update':
-      return openidurl_save_profile($edit, $user, $category);
-    case 'insert':
-      return openidurl_save_profile($edit, $user, $category, TRUE);
     case 'view':
       return openidurl_view_profile($user);
     case 'form':
       return openidurl_form_profile($edit, $user, $category);
-    case 'validate':
-      return openidurl_validate_profile($edit, $category);
-    case 'delete':
-      db_query("DELETE FROM {variable} WHERE name LIKE 'openidurl_%d_%'", $user->uid);
   }
 }
 
@@ -111,68 +101,36 @@ function openidurl_form_profile($edit, $
       '#title' => 'OpenID URL',
       '#description' => t('Delegate your user profile as an <a href="@openid">OpenID</a>.', array('@openid' => 'http://openid.net')),
       '#collapsible' => TRUE,
-      '#collapsed' => isset($edit['openidurl_server']) ? empty($edit['openidurl_server']) : empty($user->openidurl['server']),
+      '#tree' => TRUE,
+      '#collapsed' => isset($edit['openidurl']['server']) ? empty($edit['openidurl']['server']) : empty($user->openidurl['server']),
     );
-    $fields['openidurl']['openidurl_server'] = array(
+    $fields['openidurl']['server'] = array(
       '#type' => 'textfield',
       '#title' => 'Server',
       '#description' => t('Your personal OpenID server URL (e.g. http://www.myopenid.com/server).'),
-      '#default_value' => isset($edit['openidurl_server']) ? $edit['openidurl_server'] : $user->openidurl['server'],
+      '#default_value' => isset($edit['openidurl']['server']) ? $edit['openidurl']['server'] : $user->openidurl['server'],
     );
-    $fields['openidurl']['openidurl_delegate'] = array(
+    $fields['openidurl']['delegate'] = array(
       '#type' => 'textfield',
       '#title' => 'Delegate',
       '#description' => t('This is your personal OpenID delegate (e.g. http://yourname.myopenid.com/).'),
-      '#default_value' => isset($edit['openidurl_delegate']) ? $edit['openidurl_delegate'] : $user->openidurl['delegate'],
+      '#default_value' => isset($edit['openidurl']['delegate']) ? $edit['openidurl']['delegate'] : $user->openidurl['delegate'],
     );
-    $fields['openidurl']['openidurl_xrds'] = array(
+    $fields['openidurl']['xrds'] = array(
       '#type' => 'textfield',
       '#title' => 'XRDS Location',
       '#description' => t('This is your personal OpenID XRDS location (e.g. http://yourname.myopenid.com/xrds).'),
-      '#default_value' => isset($edit['openidurl_xrds']) ? $edit['openidurl_xrds'] : $user->openidurl['xrds'],
+      '#default_value' => isset($edit['openidurl']['xrds']) ? $edit['openidurl']['xrds'] : $user->openidurl['xrds'],
     );
   }
   return $fields;
 }
 
 /**
- * Validates the profile input for the openidurl account information
- */
-function openidurl_validate_profile($edit, $category) {
-  // No validation required
-  return $edit; 
-}
-
-/**
- * Loads the OpenID URL account information from the database into the user account
- */
-function openidurl_load_profile(&$user) {
-  if(empty($user->openidurl)) {
-    $user->openidurl = array();
-    $user->openidurl['server'] = variable_get('openidurl_'. $user->uid .'_server', NULL);
-    $user->openidurl['delegate'] = variable_get('openidurl_'. $user->uid .'_delegate', NULL);
-    $user->openidurl['xrds'] = variable_get('openidurl_'. $user->uid .'_xrds', NULL);
-  }
-}
-
-/**
- * Saves the OpenID URL account information into the database
- */
-function openidurl_save_profile(&$edit, &$user, $category, $register = FALSE) {
-  if (isset($edit['openidurl'])) {
-    variable_set('openidurl_' . $user->uid .'_server', isset($edit['openidurl_server']) ? $edit['openidurl_server'] : '');
-    variable_set('openidurl_' . $user->uid .'_delegate', isset($edit['openidurl_delegate']) ? $edit['openidurl_delegate'] : '');
-    variable_set('openidurl_' . $user->uid .'_xrds', isset($edit['openidurl_xrds']) ? $edit['openidurl_xrds'] : '');
-    $edit['openidurl'] = NULL;
-  }
-}
-
-/**
  * Loads and constructs the openidurl information to be displayed
  */
 function openidurl_view_profile($user) {
   $fields = array();
-  openidurl_load_profile($user);
   if($user->openidurl) {
     _openidurl_set_html_head($user->openidurl['server'], $user->openidurl['delegate'], $user->openidurl['xrds']);
   }