Index: password_reset.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/password_reset/password_reset.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 password_reset.module
--- password_reset.module	27 Nov 2007 17:14:12 -0000	1.1.2.2
+++ password_reset.module	18 Feb 2008 18:11:40 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: password_reset.module,v 1.1.2.2 2007/11/27 17:14:12 karthik Exp $
+// $Id: password_reset.module,v 1.1.2.1 2007/10/28 19:41:21 karthik Exp $
 
 /**
  * @file
@@ -127,6 +127,10 @@ function password_reset_form($form_value
           '#weight' => 3
         );
       }
+      else {
+        $contact_method = module_exists('contact') ? l('contact' , 'contact') : t('contact');
+        drupal_set_message(t('You have not answered the security question in your profile. Please ' . $contact_method . ' the administrator for access to your account.'));
+      }
       break;
     case 3:
       // This step should technically be handled in the submit stage of step 2.
@@ -218,6 +222,13 @@ function password_reset_form_alter($form
  */
 function password_reset_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
+    case 'view':
+      global $user;
+      //set nag message if user hasn't answered security question.
+      if(!password_reset_user_question_get($uid)) {
+        drupal_set_message(t('Please answer the security question on your ' . l('edit', "user/{$user->uid}/edit") . ' page.'), 'error');
+      }
+      break;
     case 'update':
       $qid = $edit['password_reset']['question'];
       $answer = trim($edit['password_reset']['answer']);