? bakery--751090-1.patch
Index: bakery.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bakery/bakery.info,v
retrieving revision 1.1
diff -u -p -r1.1 bakery.info
--- bakery.info	22 Jul 2009 22:41:20 -0000	1.1
+++ bakery.info	11 Apr 2010 23:31:27 -0000
@@ -1,3 +1,3 @@
 name = Bakery
 description = Provides single-sign-on support across second-level domains.
-core = 6.x
+core = 7.x
Index: bakery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bakery/bakery.module,v
retrieving revision 1.52
diff -u -p -r1.52 bakery.module
--- bakery.module	17 Feb 2010 22:49:44 -0000	1.52
+++ bakery.module	11 Apr 2010 23:31:27 -0000
@@ -76,10 +76,14 @@ function bakery_translated_menu_link_alt
 
 
 /**
- * Implementation of hook_perm().
+ * Implementation of hook_permission().
  */
-function bakery_perm() {
-  return array('administer bakery');
+function bakery_permission() {
+  return array(
+    'administer bakery' => array(
+      'title' => 'Administer Bakery',
+    ),
+  );
 }
 
 /**
@@ -294,17 +298,21 @@ function bakery_settings() {
 }
 
 function bakery_settings_submit($form, &$form_state) {
-  db_query("DELETE FROM {url_alias} WHERE src = 'bakery' AND dst IN ('user/login', 'user/register')");
+  $query = db_delete('url_alias')
+    ->condition('source', 'bakery')
+    ->condition('alias', array('user/login', 'user/register'), 'IN')
+    ->execute(
+  );
   if (!$form_state['values']['bakery_is_master']) {
     // Add URL aliases to bakery
     $aliases = array(
       array(
-        'src' => 'bakery',
-        'dst' => 'user/login',
+        'source' => 'bakery',
+        'alias' => 'user/login',
       ),
       array(
-        'src' => 'bakery',
-        'dst' => 'user/register',
+        'source' => 'bakery',
+        'alias' => 'user/register',
       ),
     );
     foreach ($aliases as $alias) {
@@ -433,7 +441,13 @@ function _bakery_taste_chocolatechip_coo
 
         // Make sure that there aren't any OTHER accounts with this init already.
         if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE init = '%s'", $cookie['init'])) == 0) {
-          db_query("UPDATE {users} SET init = '%s' WHERE uid = %d", $cookie['init'], $account->uid);
+          db_update('users')
+            ->fields(array(
+              'init' => $cookie['init'],
+            ))
+            ->condition('uid', $account->uid)
+            ->execute(
+          );
           watchdog('bakery', 'uid %uid out of sync. Changed init field from %oldinit to %newinit', array('%oldinit' => $account->init, '%newinit' => $cookie['init'], '%uid' => $account->uid));
         }
         else {
@@ -734,8 +748,22 @@ function bakery_uncrumble(&$form_state) 
   $cookie = _bakery_validate_cookie();
 
   // Analyze.
-  $samemail = db_fetch_object(db_query("SELECT uid, name, mail FROM {users} WHERE uid != 0 AND mail != '' AND LOWER(mail) = LOWER('%s')", $cookie['mail']));
-  $samename = db_fetch_object(db_query("SELECT uid, name, mail FROM {users} WHERE uid != 0 AND LOWER(name) = LOWER('%s')", $cookie['name']));
+  $query = db_select('users', 'u');
+  $query
+    ->condition('u.uid', 0, '!=')
+    ->condition('u.mail', '', '!=')
+    ->where("LOWER(u.mail) = LOWER(:mail), array(':mail' => $cookie['mail'])")
+    ->fields('u', array('uid', 'name', 'mail'));
+  $result = $query->execute();
+  $samemail = $result->fetchObject();
+    
+  $query = db_select('users', 'u');
+  $query
+    ->condition('u.uid', 0, '!=')
+    ->where("LOWER(u.name) = LOWER(:name), array(':name' => $cookie['name'])")
+    ->fields('u', array('uid', 'name', 'mail'));
+  $result = $query->execute();
+  $samename = $result->fetchObject();
 
 
   $form['name'] = array(