Index: modules/inactive_user/inactive_user.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/inactive_user/inactive_user.module,v
retrieving revision 1.7
diff -u -r1.7 inactive_user.module
--- modules/inactive_user/inactive_user.module	7 May 2007 01:26:33 -0000	1.7
+++ modules/inactive_user/inactive_user.module	16 Jul 2007 16:43:55 -0000
@@ -258,7 +258,7 @@
         }
       }
       if ($user_list) {
-        _inactive_user_mail(t('[%sitename] Inactive users', array('%sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('notify_admin_text'), $notify_time, NULL, $user_list);
+        _inactive_user_mail(t('[@sitename] Inactive users', array('@sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('notify_admin_text'), $notify_time, NULL, $user_list);
         unset($user_list);
       }
     }
@@ -272,7 +272,7 @@
           if (!db_affected_rows()) {
             @db_query('INSERT INTO {inactive_users} (uid, notified_user) VALUES(%d, 1)', $user->uid);
           }
-          _inactive_user_mail(t('[%sitename] Account inactivity', array('%sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_notify_text', _inactive_user_mail_text('notify_text')), $notify_time, $user, NULL);
+          _inactive_user_mail(t('[@sitename] Account inactivity', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_notify_text', _inactive_user_mail_text('notify_text')), $notify_time, $user, NULL);
           watchdog('user', t('user %user notified of inactivity', array('%user' => $user->name)), WATCHDOG_NOTICE, l(t('edit user'), "admin/user/edit/$uid"));
         }
       }
@@ -288,7 +288,7 @@
           if (!db_affected_rows()) {
             @db_query('INSERT INTO {inactive_users} (uid, warned_user_block_timestamp) VALUES(%d, %d)', $user->uid, time() + $warn_time);
           }
-          _inactive_user_mail(t('[%sitename] Account inactivity', array('%sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_block_warn_text', _inactive_user_mail_text('block_warn_text')), $warn_time, $user, NULL);
+          _inactive_user_mail(t('[@sitename] Account inactivity', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_block_warn_text', _inactive_user_mail_text('block_warn_text')), $warn_time, $user, NULL);
           watchdog('user', t('user %user warned will be blocked due to inactivity', array('%user' => $user->name)), WATCHDOG_NOTICE, l(t('edit user'), "admin/user/edit/$uid"));
         }
       }
@@ -309,7 +309,7 @@
               if (!db_affected_rows()) {
                 @db_query('INSERT INTO {inactive_users} (uid, notified_user_block) VALUES(%d, 1)', $user->uid);
               }
-              _inactive_user_mail(t('[%sitename] Account blocked due to inactivity', array('%sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_block_notify_text', _inactive_user_mail_text('block_notify_text')), $block_time, $user, NULL);
+              _inactive_user_mail(t('[@sitename] Account blocked due to inactivity', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_block_notify_text', _inactive_user_mail_text('block_notify_text')), $block_time, $user, NULL);
               watchdog('user', t('user %user blocked due to inactivity', array('%user' => $user->name)), WATCHDOG_NOTICE, l(t('edit user'), "admin/user/edit/$uid"));
             }
           }
@@ -326,7 +326,7 @@
           }
         }
         if ($user_list) {
-          _inactive_user_mail(t('[%sitename] Blocked users', array('%sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('block_notify_admin_text'), $block_time, NULL, $user_list);
+          _inactive_user_mail(t('[@sitename] Blocked users', array('@sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('block_notify_admin_text'), $block_time, NULL, $user_list);
         unset($user_list);
         }
       }
@@ -349,7 +349,7 @@
             @db_query('INSERT INTO {inactive_users} (uid, warned_user_delete_timestamp, protected) VALUES(%d, %d, %d)', $user->uid, time() + $warn_time, $protected);
           }
           if (!$protected) {
-            _inactive_user_mail(t('[%sitename] Account inactivity', array('%sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_delete_warn_text', _inactive_user_mail_text('delete_warn_text')), $warn_time, $user, NULL);
+            _inactive_user_mail(t('[@sitename] Account inactivity', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_delete_warn_text', _inactive_user_mail_text('delete_warn_text')), $warn_time, $user, NULL);
             watchdog('user', t('user %user warned will be deleted due to inactivity', array('%user' => $user->mail)), WATCHDOG_NOTICE, l(t('edit user'), "admin/user/edit/$uid"));
           }
         }
@@ -375,7 +375,7 @@
             db_query("DELETE FROM {authmap} WHERE uid = %d", $user->uid);
             module_invoke_all('user', 'delete', $array, $user);
             if (variable_get('inactive_user_notify_delete', 0)) {
-              _inactive_user_mail(t('[%sitename] Account removed', array('%sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_delete_notify_text', _inactive_user_mail_text('delete_notify_text')), $delete_time, $user, NULL);
+              _inactive_user_mail(t('[@sitename] Account removed', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_delete_notify_text', _inactive_user_mail_text('delete_notify_text')), $delete_time, $user, NULL);
             }
             if (variable_get('inactive_user_notify_delete_admin', 0)) {
               $user_list .= "$user->name ($user->mail) last active on ". format_date($user->access, 'large'). ".\n";
@@ -385,7 +385,7 @@
         }
       }
       if ($user_list) {
-        _inactive_user_mail(t('[%sitename] Deleted accounts', array('%sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('delete_notify_admin_text'), $delete_time, NULL, $user_list);
+        _inactive_user_mail(t('[@sitename] Deleted accounts', array('@sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('delete_notify_admin_text'), $delete_time, NULL, $user_list);
         unset($user_list);
       }
     }