appdb/ cron/cleanup.php include/user.php

[WineHQ]

ChangeSet ID:	23745
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2006/03/23 21:20:34

Modified files:
    cron           : cleanup.php 
    include        : user.php

Log message:
    Tony Lambregts 
    Fix up inactivity warnings and include login link on inactivity email

Patch: http://cvs.winehq.org/patch.py?id=23745

Old revision  New revision  Changes     Path
 1.24          1.25          +2 -2       appdb/cron/cleanup.php
 1.64          1.65          +3 -2       appdb/include/user.php

Index: appdb/cron/cleanup.php
diff -u -p appdb/cron/cleanup.php:1.24 appdb/cron/cleanup.php:1.25
--- appdb/cron/cleanup.php:1.24	24 Mar 2006  3:20:34 -0000
+++ appdb/cron/cleanup.php	24 Mar 2006  3:20:34 -0000
@@ -103,7 +103,7 @@ function deleteUser($iUserId)
 function warnUserDeleted($sEmail)
 {
     $sSubject  = "Warning: account removed";
-    $sMsg  = "You didn't log in in the past seven month to the AppDB.\r\n";
+    $sMsg  = "You didn't log in in the past seven months to the AppDB.\r\n";
     $sMsg .= "As you don't have any data associated to your account we have removed it.\r\n";
     $sMsg .= "Please feel free to recreate an account anytime.\r\n";

@@ -166,4 +166,4 @@ function orphanVersionCheck()
     $sEmail = get_notify_email_address_list(null, null); /* get list admins */
     if($sEmail)
         mail_appdb($sEmail, $sSubject, $sMsg);
-}
\ No newline at end of file
+}
Index: appdb/include/user.php
diff -u -p appdb/include/user.php:1.64 appdb/include/user.php:1.65
--- appdb/include/user.php:1.64	24 Mar 2006  3:20:34 -0000
+++ appdb/include/user.php	24 Mar 2006  3:20:34 -0000
@@ -656,15 +656,16 @@ class User {
          if($this->isMaintainer())
          {
              $sSubject  = "Warning: inactivity detected";
-             $sMsg  = "You didn't log in in the past six month to the AppDB.\r\n";
+             $sMsg  = "You didn't log in in the past six months to the AppDB.\r\n";
              $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n";
              $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n";
          } else
          {
              $sSubject  = "Warning: inactivity detected";
-             $sMsg  = "You didn't log in in the past six month to the AppDB.\r\n";
+             $sMsg  = "You didn't log in in the past six months to the AppDB.\r\n";
              $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n";
          }
+         $sMsg .= APPDB_ROOT."account.php?cmd=login\r\n";

mail_appdb($this->sEmail, $sSubject, $sMsg);