--- old\user_badges.admin.inc	2011-09-13 16:52:48.000000000 -0400
+++ new\user_badges.admin.inc	2011-10-10 00:26:15.984375000 -0400
@@ -40,15 +40,15 @@ function user_badges_badgelist_form($for
   );
 
   $result = db_select('user_badges_badges', 'ubb')
-    ->fields('ubb', array('bid', 'name', 'image', 'weight', 'href'))    
+    ->fields('ubb', array('bid', 'name', 'image', 'weight', 'href'))
     ->extend('TableSort')
     ->orderByHeader($form['header']['#value'])
     ->extend('PagerDefault')
     ->limit(50)
     ->execute();
 
-  // Build a table listing the appropriate badges.    
-  foreach ($result as $badge) {  
+  // Build a table listing the appropriate badges.
+  foreach ($result as $badge) {
     $badge->class = 'badge ' . _user_badges_class($badge);
     $form['name'][$badge->bid] = array('#value' => check_plain($badge->name));
     $form['badge'][$badge->bid] = array('#value' => theme('user_badge', array('badge' => $badge)));
@@ -63,7 +63,7 @@ function user_badges_badgelist_form($for
   }
 
   $form['submit'] = array(
-    '#submit' => t('Update'),    
+    '#submit' => t('Update'),
   );
 
   $form['pager'] = array('#value' => theme('pager', array('tags' => NULL, 'element' => 0)));
@@ -93,9 +93,9 @@ function user_badges_badgelist_form_vali
  */
 function user_badges_badgelist_form_submit($form, &$form_state) {
   if (isset($form['weight']) && is_array($form['weight'])) {
-    foreach (element_children($form['weight']) as $bid) {    
+    foreach (element_children($form['weight']) as $bid) {
       db_update('user_badges_badges')
-        ->fields(array('weight' => $form_state['values'][$bid],))
+        ->fields(array('weight' => $form_state['values'][$bid]))
         ->condition('bid', $bid)
         ->execute();
     }
@@ -128,7 +128,7 @@ function theme_user_badges_badgelist_for
       $row[] = $form['badge'][$key]['#value'];
       $row[] = $form['weight'][$key]['#value'];
       $row[] = $form['edit'][$key]['#value'];
-      $row[] = $form['delete'][$key]['#value'];      
+      $row[] = $form['delete'][$key]['#value'];
       $rows[] = $row;
     }
 
@@ -139,7 +139,7 @@ function theme_user_badges_badgelist_for
         'align' => 'center',
         'colspan' => '20',
       ),
-    );    
+    );
   }
   else {
     $rows[] = array(array(
@@ -172,7 +172,7 @@ function user_badges_edit_form($form, $f
       ->fields('ubb')
       ->condition('bid', $bid)
       ->execute();
-                
+
     if ($edit->rowCount() > 0) {
       $form['bid'] = array(
         '#type' => 'value',
@@ -189,7 +189,7 @@ function user_badges_edit_form($form, $f
   if ( isset($edit) && valid_url($edit->image, TRUE) ) {
     $imageurl = $edit->image;
     $libraryimage = '';
-  }  
+  }
 
   $form['name'] = array(
     '#type' => 'textfield',
@@ -256,21 +256,24 @@ function user_badges_edit_form($form, $f
     );
     $form['token_help']['help'] = array(
       // Ignore Coder flag on the link.
-      '#value' => t('Install the !link module if you want this URL to include dynamic elements such as badge ID numbers.', array('!link' => l('Token', 'http://drupal.org/project/token', array('absolute' => TRUE)))),
+      '#value' => t('Install the !link module if you want this URL to include dynamic elements such as badge ID numbers.',
+      array('!link' => l('Token', 'http://drupal.org/project/token',
+        array('absolute' => TRUE))
+      )),
     );
   }
 
   if (module_exists('taxonomy')) {
     $badges_vid = variable_get('user_badges_vid', '');
-        
+
     if (!empty($badges_vid)) {
-      $terms = user_badges_get_term_from_vid($badges_vid);      
+      $terms = user_badges_get_term_from_vid($badges_vid);
       $form['tid'] = array(
         '#title' => t('Taxonomy Relation'),
         '#type' => 'select',
         '#options' => !empty($terms) ? $terms : array(t('There are no terms in the selected vocabulery')),
         '#default_value' => !empty($edit) ? $edit->tid : '',
-      );         
+      );
     }
     else {
       $form['tid']['help'] = array(
@@ -297,10 +300,12 @@ function user_badges_edit_form($form, $f
     '#default_value' => !empty($edit) ? $edit->doesnotcounttolimit : '',
     '#description' => t('If this is set, the badge does not count towards the limit for number of badges to display per user.'),
   );
+
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Submit'),
+    '#value' => t('Save badge'),
   );
+
   $selects = array('' => t('Use the image URL above instead of a library image.')) + user_badges_image_selects();
 
   if (count($selects)) {
@@ -322,7 +327,7 @@ function user_badges_edit_form($form, $f
   }
   $form['submit2'] = array(
     '#type' => 'submit',
-    '#value' => t('Submit'),
+    '#value' => t('Save badge'),
   );
   return $form;
 }
@@ -362,20 +367,20 @@ function user_badges_edit_form_submit($f
 
   $image = $edit->imageurl ? trim($edit->imageurl) : 'public://' . $edit->image;
 
-  // If the badge already exists, delete it and re-insert it.  
+  // If the badge already exists, delete it and re-insert it.
   $result = db_merge('user_badges_badges')
     ->key(array('bid' => $edit->bid))
     ->fields(array(
-      'name' => array(trim($edit->name), 
-      'image' => $image, 
-      'weight' => $edit->weight, 
-      'href' => (!empty($edit->href) ? trim($edit->href) : NULL), 
-      'unhideable' => $edit->unhideable, 
-      'fixedweight' => $edit->fixedweight, 
-      'doesnotcounttolimit' => $edit->doesnotcounttolimit, 
+      'name' => array(trim($edit->name),
+      'image' => $image,
+      'weight' => $edit->weight,
+      'href' => (!empty($edit->href) ? trim($edit->href) : NULL),
+      'unhideable' => $edit->unhideable,
+      'fixedweight' => $edit->fixedweight,
+      'doesnotcounttolimit' => $edit->doesnotcounttolimit,
       'tid' => (!empty($edit->tid) ? $edit->tid : NULL))
-    ))      
-    ->execute();  
+    ))
+    ->execute();
 
   if ($result) {
     drupal_set_message(t('Badge %badgename saved.', array('%badgename' => $edit->name)));
@@ -390,7 +395,7 @@ function user_badges_edit_form_submit($f
  * form to upload the badge images or to delete existing ones
  */
 function user_badges_images_form($form, $form_state) {
-  $form = array('#skip_duplicate_check' => TRUE);  
+  $form = array('#skip_duplicate_check' => TRUE);
   $form['new']['upload'] = array(
     '#type' => 'file',
     '#title' => t('Upload image'),
@@ -399,14 +404,14 @@ function user_badges_images_form($form, 
   $form['new']['attach'] = array(
     '#type' => 'submit',
     '#value' => t('Upload'),
-  );    
+  );
 
   $form['#attributes']['enctype'] = 'multipart/form-data';
 
   $selects = user_badges_image_selects();
   if (count($selects)) {
     $form['images'] = array('#tree' => TRUE);
-    foreach ($selects as $imagepath => $imageimg) {      
+    foreach ($selects as $imagepath => $imageimg) {
       $form['images'][$imagepath] = array(
         '#type' => 'checkbox',
         '#title' => $imageimg,
@@ -433,16 +438,16 @@ function user_badges_images_form($form, 
  */
 function user_badges_images_form_validate($form, &$form_state) {
   $op = $form_state['clicked_button']['#value'];
-  if ($op == t('Upload')) {    
-    $dir = 'public://badges';    
+  if ($op == t('Upload')) {
+    $dir = 'public://badges';
 
-    $is_writable = file_prepare_directory($dir, 1);    
+    $is_writable = file_prepare_directory($dir, 1);
     if ($is_writable) {
       $validators = array(
         'file_validate_extensions' => array('png jpg jpeg gif'),
       );
 
-      if ($file = file_save_upload('upload', $validators, $dir)) {                
+      if ($file = file_save_upload('upload', $validators, $dir)) {
         if (!image_get_info($file->uri)) {
           file_delete($file->uri);
           form_set_error('upload', t('Uploaded image file does not appear to be a valid image file.  Please try again'));
@@ -508,11 +513,11 @@ function user_badges_images_form_submit(
  * Delete the specified image
  */
 function user_badges_image_delete($to_delete) {
-  $dir = 'public://badges/';  
+  $dir = 'public://badges/';
 
-  $is_writable = file_prepare_directory($dir, 1);    
+  $is_writable = file_prepare_directory($dir, 1);
   if ($is_writable) {
-    foreach ($to_delete as $path) {  
+    foreach ($to_delete as $path) {
       $uri = $dir . $path;
 
       $fid = db_select('file_managed', 'f')
@@ -520,9 +525,9 @@ function user_badges_image_delete($to_de
         ->condition('f.uri', $uri)
         ->execute()
         ->fetchField();
-      
-      $file = file_load($fid);      
-      file_delete($file);  
+
+      $file = file_load($fid);
+      file_delete($file);
     }
   }
 }
@@ -563,7 +568,7 @@ function user_badges_roles_form($form, &
   foreach ($roles as $rid => $role) {
     $form['roles'][$rid] = array(
       '#type' => 'textfield',
-      '#title' => $role,
+      '#title' => check_plain($role),
       '#maxlength' => 255,
       '#autocomplete_path' => 'user_badges/autocomplete',
       '#default_value' => isset($badges[$rid]) ? $badges[$rid]->name . ' '
@@ -797,16 +802,16 @@ function user_badges_settings_form_submi
  */
 function user_badges_image_selects() {
   $selects = array();
-  
+
   //$dir = file_create_path('badges');
-  
+
   $path = 'public://badges';
   file_prepare_directory($path, FILE_CREATE_DIRECTORY);
   $dir = drupal_realpath($path);
 
   $files = file_scan_directory($dir, '/.*\.(((J|j)(p|P)(g|G))|((p|P)(n|N)(g|G))|((g|G)(i|I)(f|F)))/', array('recurse' => FALSE));
   foreach ($files as $file) {
-    $image = image_get_info($file->uri);    
+    $image = image_get_info($file->uri);
     $selects[$file->filename] = theme('image', array('path' => $path . '/' . $file->filename, 'width' => $image['width'], 'height' => $image['height']));
   }