Index: password_policy.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/password_policy/password_policy.install,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 password_policy.install
--- password_policy.install	16 Jul 2008 11:04:47 -0000	1.1.4.2
+++ password_policy.install	2 Oct 2008 22:14:32 -0000
@@ -21,14 +21,14 @@
         uid int(10) unsigned NOT NULL default '0',
         pass varchar(32) NOT NULL default '',
         created int(11) NOT NULL default '0',
-        KEY (id)
+        KEY (uid)
       ) /*!40100 DEFAULT CHARACTER SET utf8 */");
       db_query("CREATE TABLE {password_policy_expiration} (
         uid int(10) unsigned NOT NULL,
         warning int(11) default NULL,
         blocked int(11) default NULL,
         unblocked int(11) default NULL,
-        KEY (id)
+        KEY (uid)
       ) /*!40100 DEFAULT CHARACTER SET utf8 */");
       break;
   }
@@ -74,7 +74,7 @@
         warning int(11) default NULL,
         blocked int(11) default NULL,
         unblocked int(11) default NULL,
-        KEY (id)
+        KEY (uid)
       ) /*!40100 DEFAULT CHARACTER SET utf8 */");
       $ret[] = update_sql("ALTER TABLE {password_policy} ADD created int(11) default NULL");
 
Index: password_policy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/password_policy/password_policy.module,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 password_policy.module
--- password_policy.module	11 Jul 2008 17:26:53 -0000	1.3.2.1
+++ password_policy.module	2 Oct 2008 22:14:33 -0000
@@ -548,7 +548,7 @@
       $expiration_seconds = $expiration*60*60*24;
       $warning_seconds = $warning*60*60*24;
 
-      $policy_enabled = _password_policy_enebled($expiration_seconds);
+      $policy_enabled = _password_policy_enabled($expiration_seconds);
     }
     if (!empty($expiration)) {
       $result = db_query_range("SELECT * FROM {password_policy_users} WHERE uid = %d ORDER BY created DESC", $user->uid, 0, 1);
@@ -832,7 +832,7 @@
   $subject = _user_mail_text('pass_subject', $variables);
   $body = _user_mail_text('pass_body', $variables);
   $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
-  $mail_success = drupal_mail($account->mail, $subject, $body, $headers);
+  $mail_success = drupal_mail('password-policy-send-login', $account->mail, $subject, $body, $from, $headers);
 
   if ($mail_success) {
     watchdog('password_policy', t('Password reset instructions mailed to %name at %email.', array('%name' => theme('placeholder', $account->name), '%email' => theme('placeholder', $account->mail))));
@@ -855,8 +855,9 @@
     $warnings = explode(',', $constraint->getWarning());
 
     if (!empty($expiration)) {
+      $accounts = array();
       // Get all users' last password change time. We don't touch blocked accounts
-      $result = db_query("SELECT u.*, u.created created_u, p.created created_p, e.warning warning, e.unblocked unblocked FROM {users} u LEFT JOIN {password_policy_users} p ON u.uid = p.uid LEFT JOIN {password_policy_expiration} e ON u.uid = e.uid WHERE u.uid > 0 AND u.status = '1' ORDER BY p.created ASC");
+      $result = db_query("SELECT u.*, u.created created_u, p.created created_p, e.warning warning, e.unblocked unblocked FROM {users} u LEFT JOIN {password_policy_users} p ON u.uid = p.uid LEFT JOIN {password_policy_expiration} e ON u.uid = e.uid WHERE u.uid > 0 AND u.status = 1 ORDER BY p.created ASC");
       while ($row = db_fetch_object($result)) {
         if ($row->uid == 1 && !variable_get('password_policy_admin', false)) {
           continue;
@@ -867,7 +868,7 @@
       }
 
       $expiration_seconds = $expiration*60*60*24;
-      $policy_enabled = _password_policy_enebled($expiration_seconds);
+      $policy_enabled = _password_policy_enabled($expiration_seconds);
       rsort($warnings, SORT_NUMERIC);
       $time = time();
       foreach ($accounts as $uid => $last_change) {
@@ -890,7 +891,7 @@
               $subject = _password_policy_mail_text('warning_subject', $variables);
               $body = _password_policy_mail_text('warning_body', $variables);
               $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
-              $mail_success = drupal_mail($account->mail, $subject, $body, $headers);
+              $mail_success = drupal_mail('password-policy-cron-warning', $account->mail, $subject, $body, $from, $headers);
 
               if ($mail_success) {
                 watchdog('password_policy', t('Password expiration warning mailed to %username at %email.', array('%username' => theme('placeholder', $account->name), '%email' => theme('placeholder', $account->mail))));
@@ -949,7 +950,7 @@
 /**
  * Returns starting point of active policy
  */
-function _password_policy_enebled($expiration_seconds = 0) {
+function _password_policy_enabled($expiration_seconds = 0) {
   $result = db_query_range("SELECT * FROM {password_policy} WHERE enabled = 1 ORDER BY enabled DESC", 0, 1);
   if ($row = db_fetch_object($result)) {
     $policy_enabled = $row->created;