? .git
? openidadmin_drupal_7.patch
Index: openidadmin.info
===================================================================
RCS file: /cvs/drupal/contributions/modules/openidadmin/openidadmin.info,v
retrieving revision 1.1
diff -u -p -r1.1 openidadmin.info
--- openidadmin.info	22 Sep 2009 20:52:59 -0000	1.1
+++ openidadmin.info	1 Sep 2010 21:18:07 -0000
@@ -2,5 +2,7 @@
 name = OpenID Admin
 description = "Allows bulk operations for OpenID administration."
 dependencies[] = openid
-core = 6.x
+core = 7.x
+files[] = openidadmin.module
+files[] = openidadmin.drush.inc
 
Index: openidadmin.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/openidadmin/openidadmin.module,v
retrieving revision 1.2
diff -u -p -r1.2 openidadmin.module
--- openidadmin.module	10 Jan 2010 20:52:01 -0000	1.2
+++ openidadmin.module	1 Sep 2010 21:18:14 -0000
@@ -13,10 +13,15 @@
  */
 
 /**
- * Implementation of hook_perm()
+ * Implementation of hook_permission()
  */
-function openidadmin_perm() {
-  return array('add list of open ids');
+function openidadmin_permission() {
+  return array(
+    'add list of open ids' => array(
+      'title' => t('Add list of open ids'),
+      'description' => t('Add list of open ids')
+    )
+  );
 }
 
 /**
@@ -37,7 +42,7 @@ function openidadmin_form_openid_user_ad
       '#element_validate' => array('openidadmin_list_form_validate'),
     );
     $form['submit']['#value'] = t('Add');
-    $form['submit']['#submit'] = array('openidadmin_list_form_submit');
+    $form['actions']['submit']['#submit'][] = 'openidadmin_list_form_submit';
   }
 }
 
@@ -47,9 +52,9 @@ function openidadmin_form_openid_user_ad
 function openidadmin_list_form_validate($element, &$form_state) {
   foreach (openidadmin_normalize_list($element['#value']) as $claimed_id) {
     // Check for existing entries.
-    if ($uid = db_result(db_query("SELECT uid FROM {authmap} WHERE authname='%s'", $claimed_id))) {
-      $account = user_load(array('uid' => $uid));
-      form_set_error('list', t('The OpenID %identity is already in use on this site for the user !name.', array('%identity' => $claimed_id, '!name' => theme('username', $account))));
+    if ($uid = db_query("SELECT uid FROM {authmap} WHERE authname = :claimed_id", array(':claimed_id' => $claimed_id,))->fetchField()) {
+      $account = user_load($uid);
+      form_set_error('list', t('The OpenID %identity is already in use on this site for the user !name.'));
     }
   }
 }
@@ -61,7 +66,7 @@ function openidadmin_list_form_submit($f
   $account = $form_state['values']['account'];
   $add_list = openidadmin_normalize_list($form_state['values']['list']);
   foreach ($add_list as $claimed_id) {
-    db_query("INSERT INTO {authmap}(uid, authname, module) VALUES(%d, '%s', 'openid')", $account->uid, $claimed_id);
+    db_query("INSERT INTO {authmap}(uid, authname, module) VALUES(:uid, :claimed_id, 'openid')", array(':uid' => $account->uid, ':claimed_id' => $claimed_id));
   }
   drupal_set_message(format_plural(count($add_list), 'One OpenID has been added.', '@count OpenIDs have been added.'));
   return "user/$account->uid/openid";
@@ -77,7 +82,7 @@ function openidadmin_normalize_list($tex
   $normalized = array();
   foreach ($list as $identity) {
     if ($identity = trim($identity)) {
-      $claimed_id = _openid_normalize($identity);
+      $claimed_id = openid_normalize($identity);
       // This will take care of duplicates
       $normalized[$claimed_id] = $claimed_id;
     }