--- old\user_badges.module	2011-09-13 16:52:48.000000000 -0400
+++ new\user_badges.module	2011-10-10 00:19:28.000000000 -0400
@@ -79,7 +79,7 @@ function user_badges_menu() {
   $items = array();
   $access = array('manage badges');
 
-  $items['admin/user/user_badges'] = array(
+  $items['admin/config/people/user_badges'] = array(
     'title' => 'Badges',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_badgelist_form'),
@@ -87,7 +87,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/list'] = array(
+  $items['admin/config/people/user_badges/list'] = array(
     'title' => 'List',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_badgelist_form'),
@@ -97,7 +97,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/add'] = array(
+  $items['admin/config/people/user_badges/add'] = array(
     'title' => 'Add',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_edit_form'),
@@ -106,7 +106,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/images'] = array(
+  $items['admin/config/people/user_badges/images'] = array(
     'title' => 'Images',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_images_form'),
@@ -115,7 +115,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/roles'] = array(
+  $items['admin/config/people/user_badges/roles'] = array(
     'title' => 'Roles',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_roles_form'),
@@ -124,7 +124,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/settings'] = array(
+  $items['admin/config/people/user_badges/settings'] = array(
     'title' => 'Settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_settings_form'),
@@ -133,7 +133,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/edit/%'] = array(
+  $items['admin/config/people/user_badges/edit/%'] = array(
     'title' => 'Edit badge',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_edit_form', 4),
@@ -142,7 +142,7 @@ function user_badges_menu() {
     'file' => 'user_badges.admin.inc',
   );
 
-  $items['admin/user/user_badges/delete/%'] = array(
+  $items['admin/config/people/user_badges/delete/%'] = array(
     'title' => 'Delete badge',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_delete_form', 4),
@@ -193,7 +193,7 @@ function user_badges_menu() {
  */
 function user_badges_user_load($users) {
   global $user;
-  
+
   // Have we loaded this user before?
   if (isset($badges[$user->uid])) {
     $user->badges = $badges[$user->uid];
@@ -442,7 +442,7 @@ function user_badges_userweight_form($fo
 
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Submit'),
+    '#value' => t('Save configuration'),
   );
 
 
@@ -538,7 +538,7 @@ function user_badges_badge_autocomplete(
 
   if (preg_match('/^[^(]+/', $string, $searchstring)) {
     $trimstring = trim($searchstring[0]);
-    
+
     $result = db_select('user_badges_badges', 'ubb')
       -> fields('ubb')
       -> condition('name', '%' . db_like($trimstring) . '%', 'LIKE')
@@ -546,7 +546,7 @@ function user_badges_badge_autocomplete(
       -> limit(5)
       -> execute();
 
-    foreach ($result as $badge) {          
+    foreach ($result as $badge) {
       $matches[$badge->name . ' (' . t('Badge ID') . ' ' . $badge->bid . ')'] = check_plain($badge->name) . ' ' . theme('user_badge', array('badge' => $badge));
     }
   }
@@ -571,7 +571,7 @@ function user_badges_badge_autocomplete(
  */
 function user_badges_badge_autocomplete_validation($value) {
   if (preg_match('/\(' . t('Badge ID') . ' (\d+)\)/', $value, $matches)) {
-    //The format was correct, but we need to check the bid exists    
+    //The format was correct, but we need to check the bid exists
     $bid = $matches[1];
     $records = db_select('user_badges_badges', 'ubb')
       -> fields('ubb')
@@ -663,7 +663,7 @@ function user_badges_change_form($form, 
   for ($i = 1; $i <= 5; $i++) {
     $form['add']['add' . $i] = array(
       '#type' => 'textfield',
-      '#title' => t('New Badge !number', array('!number' => $i)),
+      '#title' => t('New Badge @number', array('@number' => $i)),
       '#size' => 40,
       '#maxlength' => 255,
       '#autocomplete_path' => 'user_badges/autocomplete',
@@ -742,7 +742,7 @@ function user_badges_change_form_submit(
     foreach ($badges_to_go as $bid) {
       user_badges_user_remove_badge($uid, $bid);
     }
-    drupal_set_message(t('!removalcount badge(s) removed.', array('!removalcount' => count($badges_to_go))));
+    drupal_set_message(t('@removalcount badge(s) removed.', array('@removalcount' => count($badges_to_go))));
   }
 
 }
@@ -890,7 +890,7 @@ function user_badges_get_badges($uid, $o
           WHERE u.uid = :uid AND r.rid = :rid
           ORDER BY coalescedweight, b.name', array(':uid' => $uid, ':rid' => 0));
       }
-      else {        
+      else {
         $sql = db_query('SELECT DISTINCT b.bid, b.weight, b.name, b.image, b.href,
           b.unhideable, b.fixedweight, b.doesnotcounttolimit, u.userweight, b.tid,
           CASE WHEN b.fixedweight = 1 THEN b.weight ELSE COALESCE(u.userweight,b.weight) END coalescedweight
@@ -911,8 +911,8 @@ function user_badges_get_badges($uid, $o
       // Set to -1 for no limit.
       $limit = -1;
     }
-  
-    foreach ($sql as $badge) {          
+
+    foreach ($sql as $badge) {
       // Display the badge if there's no limit or if the badge is unhideable or if we are within our limit.
       if ($limit != 0 || $badge->unhideable == 1) {
         if ($uid == 'select') {
@@ -1002,18 +1002,18 @@ function user_badges_get_roles($rid = NU
   $roles = array();
   $options = array_merge(array('returnbadges' => 'FALSE'), $options);
 
-  $query = db_select('user_badges_roles', 'ubr')    
-    -> fields('ubr', array('rid', 'bid'))  
+  $query = db_select('user_badges_roles', 'ubr')
+    -> fields('ubr', array('rid', 'bid'))
     -> fields('ubb', array('name', 'image', 'weight', 'href', 'tid'));
-    
+
   if ($rid) {
     $query -> condition('ubr.rid', $rid);
   }
-    
+
   $alias = $query -> join('user_badges_badges', 'ubb', 'ubr.bid = ubb.bid');
   $records = $query -> execute();
 
-  foreach ($records as $row) {      
+  foreach ($records as $row) {
     if ($options['returnbadges']) {
       $row->image = _user_badges_build_image($row);
       $roles[$row->rid] = $row;
@@ -1038,7 +1038,7 @@ function user_badges_save_roles($roles) 
 
     db_delete('user_badges_roles')
       ->execute();
-    
+
     db_delete('user_badges_user')
       ->condition('type', 'role')
       ->execute();
@@ -1048,10 +1048,10 @@ function user_badges_save_roles($roles) 
     foreach ($roles as $rid => $bid) {
       if ($bid) {
         // First of all, insert all the role and badge relationship
-        // into user_badges_roles.  
+        // into user_badges_roles.
         $id = db_insert('user_badges_roles')
           ->fields(array(
-              'rid' => $rid, 
+              'rid' => $rid,
               'bid' => $bid,
             ))
           ->execute();
@@ -1193,7 +1193,7 @@ function _user_badges_build_image($badge
 
   if (variable_get('user_badges_imagecache', 0)) {
     // TODO Please change this theme call to use an associative array for the $variables parameter.
-    $image = theme('imagecache', 'user-badges', $badge->image, $badge->name, $badge->name, array('class' => $badge->class));    
+    $image = theme('imagecache', 'user-badges', $badge->image, $badge->name, $badge->name, array('class' => $badge->class));
   }
   else {
     // If we have a full image URL, don't require theme_image to get the size
@@ -1202,7 +1202,7 @@ function _user_badges_build_image($badge
       $image = theme('image', array('path' => $badge->image, 'width' => $badge->name, 'height' => $badge->name, 'alt' => array('class' => $badge->class), 'title' => !$get_size));
     }
     else {
-      $image = theme('image', array('path' => 'public://badges/' . $badge->image, 'width' => $badge->name, 'height' => $badge->name, 'alt' => array('class' => $badge->class), 'title' => !$get_size)); 
+      $image = theme('image', array('path' => 'public://badges/' . $badge->image, 'width' => $badge->name, 'height' => $badge->name, 'alt' => array('class' => $badge->class), 'title' => !$get_size));
     }
   }
 
@@ -1230,8 +1230,8 @@ function theme_user_badge($variables) {
 
   // We don't link the badge if there is no link and no default,
   // or if the default is overridden.
-  if (($badge->href == "" && !variable_get('user_badges_defaulthref', ''))
-     || drupal_strtolower($badge->href) == '<none>') {
+  if (($badge->href == '' && !variable_get('user_badges_defaulthref', ''))
+    || drupal_strtolower($badge->href) == '<none>') {
     return $image;
   }
   else {
@@ -1239,7 +1239,7 @@ function theme_user_badge($variables) {
 
     // Implement token replacement.
     if (module_exists('token')) {
-      $href = token_replace($href, array('userbadge' => $badge, 'user' => $account));      
+      $href = token_replace($href, array('userbadge' => $badge, 'user' => $account));
     }
 
     $pieces = parse_url($href);
@@ -1508,7 +1508,7 @@ function user_badges_block_save($delta =
 }
 
 /**
- * Implements hook_cron()
+ * Implements hook_cron().
  * UNCOMMENT in order to get User Badges to work along with Auto Assign Role
  * notes: - this is a quite fast solution in order to solve Auto Assign Role issue
  *        - do not forget to set up your cron