Index: account_expiry.info =================================================================== RCS file: /cvs/drupal/contributions/modules/account_expiry/account_expiry.info,v retrieving revision 1.1 diff -u -r1.1 account_expiry.info --- account_expiry.info 28 Jan 2008 07:30:28 -0000 1.1 +++ account_expiry.info 2 Nov 2008 09:17:12 -0000 @@ -1,4 +1,4 @@ -; $Id: account_expiry.info,v 1.1 2008/01/28 07:30:28 jdsaward Exp $ +; $Id: account_expiry.info,v 1.1 2008/01/28 07:30:28 jdsaward Exp $ name = Account expiry dependencies = accounttypes description = "Maintaining expiry date for user account" Index: README.txt =================================================================== RCS file: /cvs/drupal/contributions/modules/account_expiry/README.txt,v retrieving revision 1.1 diff -u -r1.1 README.txt --- README.txt 28 Jan 2008 09:00:13 -0000 1.1 +++ README.txt 2 Nov 2008 09:17:12 -0000 @@ -1,4 +1,4 @@ -// $Id: +// $Id$ --Accountexpiry Module-- Index: account_expiry.module =================================================================== RCS file: /cvs/drupal/contributions/modules/account_expiry/account_expiry.module,v retrieving revision 1.3 diff -u -r1.3 account_expiry.module --- account_expiry.module 2 May 2008 04:04:17 -0000 1.3 +++ account_expiry.module 2 Nov 2008 09:17:12 -0000 @@ -1,5 +1,5 @@ $uid))); } } else { - drupal_set_message(t('Account Expiry update failed for user ') . $uid, 'error'); + drupal_set_message(t('Account Expiry update failed for user %uid', array('%uid' => $uid)), 'error'); } } } @@ -349,11 +348,11 @@ $sql = "UPDATE {users} SET status = 0 WHERE uid = %d"; $result = FALSE; if (db_query($sql, $uid)) { - drupal_set_message(t('Account blocked for user '. $uid)); + drupal_set_message(t('Account blocked for user %uid', array('%uid' => $uid))); $result = TRUE; } else { - drupal_set_message(t('Account has NOT been blocked for user '. $uid), 'error'); + drupal_set_message(t('Account has NOT been blocked for user %uid', array('%uid' => $uid)), 'error'); } return $result; } @@ -361,17 +360,17 @@ function account_expiry_activate($uid) { $sql = "UPDATE {users} SET status = 1 WHERE uid = %d"; if (db_query($sql, $uid)) { - drupal_set_message(t('Account set to Active for user '. $uid)); + drupal_set_message(t('Account set to Active for user %uid', array('%uid' => $uid))); } else { - drupal_set_message(t('Account has NOT been set to Active for user '. $uid), 'error'); + drupal_set_message(t('Account has NOT been set to Active for user %uid', array('%uid' => $uid)), 'error'); } } function account_expiry_delete($uid) { $sql = "DELETE FROM {account_expiry} WHERE uid = %d"; if (db_query($sql, $uid)) { - drupal_set_message(t('Expiry date removed for user '. $uid)); + drupal_set_message(t('Expiry date removed for user %uid', array('%uid' => $uid))); } } @@ -432,4 +431,4 @@ } } return $accountexpire; -} \ No newline at end of file +} Index: account_expiry.install =================================================================== RCS file: /cvs/drupal/contributions/modules/account_expiry/account_expiry.install,v retrieving revision 1.1 diff -u -r1.1 account_expiry.install --- account_expiry.install 28 Jan 2008 07:30:28 -0000 1.1 +++ account_expiry.install 2 Nov 2008 09:17:12 -0000 @@ -1,7 +1,8 @@ -