--- og_user_roles.module.6.x-1.2.orig	2009-01-05 12:33:05.000000000 -0800
+++ og_user_roles.module	2009-01-05 12:36:17.000000000 -0800
@@ -1,5 +1,5 @@
 <?php
-// $Id: og_user_roles.module,v 1.1.2.15.2.8 2008/12/31 21:21:26 somebodysysop Exp $
+// $Id: og_user_roles.module,v 1.1.2.4 2008/07/03 19:50:44 somebodysysop Exp $
 
 /**
  * @file
@@ -83,7 +83,7 @@ function og_user_roles_admin_settings() 
       '#type' => 'checkbox',
       '#title' => t('<strong>Set default basic group (group limited) role for users who join groups of this type: %type_name?</strong>', array('%type_name' => $name)),
       '#default_value' => variable_get("og_user_roles_assign_typegrouprole_$type", 0),
-      '#description' => t('Do you wish to automatically assign a specific "basic group role" to <b>every new group subscriber</b> at the time he subscribes to a group of this type: %type_name? The role is limited to the group that he is subscribed to. This role assignment can be removed by the groups\' admins', array('%type_name' => $name)),
+      '#description' => t('Do you wish to automatically assign a specific "basic group role" to <strong>every new group subscriber</strong> at the time he subscribes to a group of this type: %type_name? The role is limited to the group that he is subscribed to. This role assignment can be removed by the groups\' admins', array('%type_name' => $name)),
     );
     $form["og_user_roles_$type"]["og_user_roles_typegrouprole_value_$type"] = array(
       '#type' => 'select',
@@ -97,7 +97,7 @@ function og_user_roles_admin_settings() 
   $form['og_user_roles_regcode_gid_default'] = array(
     '#type' => 'fieldset',
     '#title' => t('Allow Group Admins to define Registration Codes for new group subscribers to moderated groups.'),
-    '#description' => t('Allows you to allow Group Administrators to define Registration Codes to allow users to subscribe to moderated groups without administrator approval.  Your Group Admins must have the <b>manage registration codes</b> permission to use this setting.'),
+    '#description' => t('Allows you to allow Group Administrators to define Registration Codes to allow users to subscribe to moderated groups without administrator approval.  Your Group Admins must have the <strong>manage registration codes</strong> permission to use this setting.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -105,7 +105,7 @@ function og_user_roles_admin_settings() 
     '#type' => 'checkbox',
     '#title' => t('Allow Group Admins to set Registration Codes for users to join their moderated groups without admin approval?'),
     '#default_value' => variable_get('og_user_roles_assign_regcode_gid', 0),
-    '#description' => t('Do you wish to allow Group Admins to define "Registration Codes" to allow users to subscribe to their groups without admin approval? The Group Admin will be able to define the Registration Codes on <b>edit</b> (not creation) of the group node.  Group Admin must have <b>manage registration codes</b> permission.'),
+    '#description' => t('Do you wish to allow Group Admins to define "Registration Codes" to allow users to subscribe to their groups without admin approval? The Group Admin will be able to define the Registration Codes on <strong>edit</strong> (not creation) of the group node.  Group Admin must have <strong>manage registration codes</strong> permission.'),
   );
 
   $form['og_user_roles_approval'] = array(
@@ -153,7 +153,7 @@ function og_user_roles_admin_settings() 
     '#type' => 'checkbox',
     '#title' => t('Set default basic group (group limited) role for users who join groups?'),
     '#default_value' => variable_get('og_user_roles_assign_basicgrouprole', 0),
-    '#description' => t('Do you wish to automatically assign a specific "basic group role" to <b>every new group subscriber</b> at the time he subscribes to the group? The role is limited to the group that he is subscribed to. This role assignment can be removed by the groups\' admins'),
+    '#description' => t('Do you wish to automatically assign a specific "basic group role" to <strong>every new group subscriber</strong> at the time he subscribes to the group? The role is limited to the group that he is subscribed to. This role assignment can be removed by the groups\' admins'),
   );
   $form['og_user_roles_basicgrouprole']['og_user_roles_basicgrouprole_value'] = array(
     '#type' => 'select',
@@ -166,7 +166,7 @@ function og_user_roles_admin_settings() 
   $form['og_user_roles_basicgrouprole_gid_default'] = array(
     '#type' => 'fieldset',
     '#title' => t('Allow Group Admins to define Default Basic Group Role for new group subscribers.'),
-    '#description' => t('Allows you to allow Group Administrators to define a default group role to automatically assign to users who join their groups. The role is specific to the group to which the user is subscribing.  That is, the user will only have the privileges of the role in the group he is subscribed to.  Your Group Admins must have the <b>configure member roles</b> permission to use this setting.'),
+    '#description' => t('Allows you to allow Group Administrators to define a default group role to automatically assign to users who join their groups. The role is specific to the group to which the user is subscribing.  That is, the user will only have the privileges of the role in the group he is subscribed to.  Your Group Admins must have the <strong>configure member roles</strong> permission to use this setting.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -174,7 +174,7 @@ function og_user_roles_admin_settings() 
     '#type' => 'checkbox',
     '#title' => t('Allow Group Admins to set default basic group (group limited) role for users who join their groups?'),
     '#default_value' => variable_get('og_user_roles_assign_basicgrouprole_gid', 0),
-    '#description' => t('Do you wish to allow Group Admins to define a specific "basic group role" for <b>every new subscriber to their group</b> at the time he subscribes to the group? The role is limited to the group that he is subscribed to. This role assignment can be be removed by the groups\' admin(s).  The Group Admin will be able to define the default group role on <b>edit</b> (not creation) of the group node.  Group Admin must have <b>configure member roles</b> permission.'),
+    '#description' => t('Do you wish to allow Group Admins to define a specific "basic group role" for <strong>every new subscriber to their group</strong> at the time he subscribes to the group? The role is limited to the group that he is subscribed to. This role assignment can be be removed by the groups\' admin(s).  The Group Admin will be able to define the default group role on <strong>edit</strong> (not creation) of the group node.  Group Admin must have <strong>configure member roles</strong> permission.'),
   );
 
   $form['og_user_roles_founder'] = array(
@@ -209,7 +209,7 @@ function og_user_roles_admin_settings() 
     '#type' => 'checkbox',
     '#title' => t('Set default group (group limited) administrator role for users who are elevated to group administrator?'),
     '#default_value' => variable_get('og_user_roles_assign_admingrouprole', 0),
-    '#description' => t('Do you wish to automatically assign a specific "administrator group role" to <b>every new group administrator</b> at the time he is elevated to group administrator status? The role is limited to the group that he is the administrator for. This role assignment can only be removed by removing the user as a group administrator.'),
+    '#description' => t('Do you wish to automatically assign a specific "administrator group role" to <strong>every new group administrator</strong> at the time he is elevated to group administrator status? The role is limited to the group that he is the administrator for. This role assignment can only be removed by removing the user as a group administrator.'),
   );
   $form['og_user_roles_admingrouprole']['og_user_roles_admingrouprole_value'] = array(
     '#type' => 'select',
@@ -266,7 +266,7 @@ function og_user_roles_admin_settings() 
     '#type' => 'checkbox',
     '#title' => t('Integrate TAC and OG Access Control?'),
     '#default_value' => variable_get('og_user_roles_tac_og_value', 0),
-    '#description' => t('Do you have Taxonomy Access installed and do you wish to make its access control work with Organic Groups?  Note that this feature requires that you install the ' . l("Taxonomy Access Control Module", "http://www.drupal.org/project/taxonomy_access") . '.  The <b>taxonomy_access.module</b> is currently <b>' . $taxonomy_access . '</b>.  Details here: ' . l("How to Make OG and TAC Work Together: Step 2", "http://groups.drupal.org/node/3700")),
+    '#description' => t('Do you have Taxonomy Access installed and do you wish to make its access control work with Organic Groups?  Note that this feature requires that you install the ' . l("Taxonomy Access Control Module", "http://www.drupal.org/project/taxonomy_access") . '.  The <strong>taxonomy_access.module</strong> is currently <strong>' . $taxonomy_access . '</strong>.  Details here: ' . l("How to Make OG and TAC Work Together: Step 2", "http://groups.drupal.org/node/3700")),
     '#disabled' => $disabled,
   );
 
@@ -366,9 +366,9 @@ function og_user_roles_admin_settings() 
   $form['og_user_roles_counter'] = array(
     '#type' => 'textfield',
     '#size' => 10,
-    '#title' => t('Counter for <b>og_users_roles</b> table'),
+    '#title' => t('Counter for <strong>og_users_roles</strong> table'),
     '#default_value' => variable_get('og_user_roles_counter', 0),
-    '#description' => t('This is the counter for the <b>og_users_roles</b> table. You do not need to set this.  It will update itself.  It should NOT be set lower than the number of records currently in the table.'),
+    '#description' => t('This is the counter for the <strong>og_users_roles</strong> table. You do not need to set this.  It will update itself.  It should NOT be set lower than the number of records currently in the table.'),
   );
 
   return system_settings_form($form);
@@ -2661,7 +2661,7 @@ function og_user_roles_ognodeadd() {
 	  // Old = type, message, severity, link
 	  // New = type, message, variables, severity, link
 
-      watchdog('access denied', 'User can not create this node type:<b> '.$type.'</b>', $variables = array() , WATCHDOG_WARNING, 'node/ognodeadd?type='. $type .'&gids[]='. $gids[0]);
+      watchdog('access denied', 'User can not create this node type:<strong> '.$type.'</strong>', $variables = array() , WATCHDOG_WARNING, 'node/ognodeadd?type='. $type .'&gids[]='. $gids[0]);
     }
 
   }else{
@@ -2869,7 +2869,7 @@ function og_user_roles_user_manage($gid)
     }
   } // end while
 
-  if ($output == "") $output = "<b>No users have been located for this group or you are not an admin user for this group!</b>";
+  if ($output == "") $output = "<strong>No users have been located for this group or you are not an admin user for this group!</strong>";
 
   return $output;
 }
@@ -3183,7 +3183,7 @@ function og_user_roles_form_alter(&$form
         $form['og_user_roles_basicgrouprole_gid'] = array(
           '#type' => 'fieldset',
           '#title' => t('Default Basic Group Role for new subscribers to this group.'),
-          '#description' => t('Allows you to select a group role to automatically assign to users who join this group. The role is specific to this group. That is, the user will only have the privileges of the role while he is visiting this group.  You must have the <b>configure member roles</b> permission to use this setting.'),
+          '#description' => t('Allows you to select a group role to automatically assign to users who join this group. The role is specific to this group. That is, the user will only have the privileges of the role while he is visiting this group.  You must have the <strong>configure member roles</strong> permission to use this setting.'),
           '#collapsible' => TRUE,
           '#collapsed' => TRUE,
           );
@@ -3191,7 +3191,7 @@ function og_user_roles_form_alter(&$form
           '#type' => 'checkbox',
           '#title' => t('Set default basic group (group limited) role for users who join this group?'),
           '#default_value' => variable_get('og_user_roles_assign_basicgrouprole_' . $gid, 0),
-          '#description' => t('Do you wish to automatically assign a specific "basic group role" to <b>every new subscriber to this group</b> at the time he subscribes to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'),
+          '#description' => t('Do you wish to automatically assign a specific "basic group role" to <strong>every new subscriber to this group</strong> at the time he subscribes to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'),
           );
         $form['og_user_roles_basicgrouprole_gid']['og_user_roles_basicgrouprole_value_' . $gid] = array(
           '#type' => 'select',
@@ -3294,7 +3294,7 @@ function og_user_roles_form_alter(&$form
           $form['og_user_roles_regcode_gid'] = array(
             '#type' => 'fieldset',
             '#title' => t('Registration code for new subscribers to this group.'),
-            '#description' => t('Allows you to enter registration codes that can be used for new users to automatically subscribe to this group and bypass moderation. This will only work if this group is in <b>moderation</b> status.  You must have the <b>manage registration codes</b> permission to use this setting.'),
+            '#description' => t('Allows you to enter registration codes that can be used for new users to automatically subscribe to this group and bypass moderation. This will only work if this group is in <strong>moderation</strong> status.  You must have the <strong>manage registration codes</strong> permission to use this setting.'),
             '#collapsible' => TRUE,
             '#collapsed' => TRUE,
             );
@@ -3326,7 +3326,7 @@ function og_user_roles_form_alter(&$form
               '#type' => 'checkbox',
               '#title' => t('Set default basic group (group limited) role for users who join this group using this registration code?'),
               '#default_value' => variable_get('og_user_roles_assign_regcoderole_' . $gid, 0),
-              '#description' => t('Do you wish to automatically assign a specific "registration code group role" to new subscribers to this group <b>who use this registration code to subscribe</b> to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'),
+              '#description' => t('Do you wish to automatically assign a specific "registration code group role" to new subscribers to this group <strong>who use this registration code to subscribe</strong> to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'),
               );
             $form['og_user_roles_regcode_gid']['og_user_roles_regcoderole_value_' . $gid] = array(
               '#type' => 'select',
@@ -3424,9 +3424,9 @@ function og_user_roles_regcode_form_vali
             if ($duplicated = array_intersect($regcode_array, $group_array)) {
               // If there are duplicates, then display the group in which they are duplicated ONLY if this is a site admin
               if (user_access('administer nodes')) {
-                form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes <b>" . implode(', ', $duplicated) . "</b> duplicated in group " . l($title, 'node/' . $group));
+                form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes <strong>" . implode(', ', $duplicated) . "</strong> duplicated in group " . l($title, 'node/' . $group));
 			  } else {
-                form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes <b>" . implode(', ', $duplicated) . "</b> duplicated.");
+                form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes <strong>" . implode(', ', $duplicated) . "</strong> duplicated.");
 			  }
             }
     	  }