Index: apply_for_role.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apply_for_role/apply_for_role.module,v
retrieving revision 1.2
diff -u -p -r1.2 apply_for_role.module
--- apply_for_role.module	21 Jan 2008 13:11:11 -0000	1.2
+++ apply_for_role.module	25 Feb 2008 05:33:54 -0000
@@ -199,20 +199,24 @@
 	function apply_for_role_apply_form(){
 		global $user;
 		$roles = variable_get('users_apply_roles', array());
-		foreach ($roles as $rid => $role) {
-			if(!$user->roles[$rid]){
-				$filter_roles[$rid] = $role;
-			}
-		}
-		 $form['rid'] = array(
-			  '#type' => 'select',
-			  '#title' => t('Role you want to apply for?'),
-			  '#default_value' => '',
-			  '#options' => $filter_roles,
-			);
-			
-	 	$form['submit'] = array('#type' => 'submit', '#value' => t('Apply'));
-	 	return $form;
+	  if (!empty($filter_roles[$rid])) {
+            $form['rid'] = array(
+            '#type' => 'select',
+            '#title' => t('Which role do you want to apply for?'),
+            '#default_value' => '',
+            '#options' => $filter_roles,
+          );
+
+          $form['submit'] = array(
+            '#type' => 'submit',
+            '#value' => t('Apply')
+          );
+
+          return $form;
+          }
+          else {
+            drupal_set_message('No roles are available at this time.', 'notice');
+          }
 	}
 	
 	function apply_for_role_apply_form_submit($form_id, $form_values){
@@ -289,4 +293,4 @@
 	
 	function apply_for_role_delete_role($uid, $rid){
 	  db_query('DELETE FROM {users_roles} WHERE uid = %d AND rid = %d', $uid, $rid);
-	}
\ No newline at end of file
+	}