ChangeSet ID: 23749
CVSROOT: /opt/cvs-commit
Module name: lostwages
Changes by: wineowner(a)winehq.org 2006/03/24 01:05:25
Modified files:
wwn : wn20060324_309.xml
Log message:
minor edits
Patch: http://cvs.winehq.org/patch.py?id=23749
Old revision New revision Changes Path
1.1 1.2 +4 -5 lostwages/wwn/wn20060324_309.xml
Index: lostwages/wwn/wn20060324_309.xml
diff -u -p lostwages/wwn/wn20060324_309.xml:1.1 lostwages/wwn/wn20060324_309.xml:1.2
--- lostwages/wwn/wn20060324_309.xml:1.1 24 Mar 2006 7: 5:25 -0000
+++ lostwages/wwn/wn20060324_309.xml 24 Mar 2006 7: 5:25 -0000
@@ -37,13 +37,12 @@ Its main goal is to become long overdue
<person posts="2" size="5" who="a_villacis at palosanto.com (=?ISO-8859-1?Q?Alex_Villac=ED=ADs_Lasso?=)" />
<person posts="2" size="5" who="scott at open-vote.org (Scott Ritchie)" />
<person posts="2" size="4" who="nunoplopes at gmail.com (Nuno Lopes)" />
-<person posts="2" size="3" who="meissner at suse.de (Marcus Meissner)" />
+<person posts="4" size="5" who="meissner at suse.de (Marcus Meissner)" />
<person posts="2" size="2" who="jim at pagesmiths.com (Jim White)" />
<person posts="2" size="2" who="wes.parish at paradise.net.nz (Wesley Parish)" />
<person posts="2" size="2" who="Paul.Vriens at xs4all.nl (Paul Vriens)" />
<person posts="2" size="2" who="eric.pouech at wanadoo.fr (Eric Pouech)" />
<person posts="2" size="2" who="fgouget at free.fr (Francois Gouget)" />
-<person posts="2" size="2" who="marcus at jet.franken.de (Marcus Meissner)" />
<person posts="2" size="2" who="jacek at codeweavers.com (Jacek Caban)" />
<person posts="2" size="2" who="andi at rhlx01.fht-esslingen.de (Andreas Mohr)" />
<person posts="2" size="1" who="jeffl at yless4u.com.au (Jeff Latimer)" />
@@ -93,7 +92,7 @@ Its main goal is to become long overdue
posts="1"
>
<topic>News</topic>
-<p>On Wednesday, Alexandre released Wine 0.9.10. It followed less than
+<p>Last Wednesday, Alexandre released Wine 0.9.10. It followed less than
2 weeks on the heels of 0.9.9. He noted the following changes:</p>
<quote who="Alexandre Julliard"><p>
<ul>
@@ -156,7 +155,7 @@ And even a "yum install wine" should do
<p>Well, that's pretty simple. Andreas Bierfert noted that Wine made it
into the x86_64 tree of Fedora Extras as well and a
-<tt>yum install wine</tt> should work there as well.</p>
+<tt>yum install wine</tt> should work.</p>
<p>Eddy Nigg of <a href="http://www.startcom.org">StartCom Linux</a>
mentioned they had Wine in RPM packages that should be compatible:</p>
@@ -359,7 +358,7 @@ typesafe, it just looks like it is.</p><
within applications:</p>
<quote who="Rauschi"><p>
-I think it would be very usefull to disallow an application started with wine i
+I think it would be very useful to disallow an application started with wine i
to connect to the network/internet by an options flag.</p></quote>
<p>That's a valid question - a lot of apps like to "phone home" and that's
ChangeSet ID: 23745
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner(a)winehq.org 2006/03/23 21:20:34
Modified files:
cron : cleanup.php
include : user.php
Log message:
Tony Lambregts <tony.lambregts(a)gmail.com>
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);