| 1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-quota-1.10.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota mezzanine_patched_e-smith-quota-1.10.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota |
| 2 |
--- e-smith-quota-1.10.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota 2003-06-24 17:18:03.000000000 -0400 |
| 3 |
+++ mezzanine_patched_e-smith-quota-1.10.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota 2006-07-16 14:15:59.000000000 -0400 |
| 4 |
@@ -131,8 +131,7 @@ |
| 5 |
<entry> |
| 6 |
<base>ERR_HARD_LT_SOFT</base> |
| 7 |
<trans> |
| 8 |
- Error: absolute limit must be greater than or equal to limit with |
| 9 |
- grace time. |
| 10 |
+ Error: absolute limit must be greater than limit with grace time. |
| 11 |
</trans> |
| 12 |
</entry> |
| 13 |
<entry> |
| 14 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-quota-1.10.0/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl mezzanine_patched_e-smith-quota-1.10.0/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl |
| 15 |
--- e-smith-quota-1.10.0/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl 2006-03-16 01:56:02.000000000 -0500 |
| 16 |
+++ mezzanine_patched_e-smith-quota-1.10.0/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl 2006-07-16 14:16:35.000000000 -0400 |
| 17 |
@@ -19,7 +19,8 @@ |
| 18 |
$OUT .= gettext("Your current disk usage:"). |
| 19 |
" $data{usage} ".gettext("Mb")."\n"; |
| 20 |
$OUT .= gettext("Your maximum usage:"). |
| 21 |
- " $data{hardQuota} ".gettext("Mb")."\n"; |
| 22 |
+ ($data{hardQuota} == 0 ? gettext(" no limit set") : |
| 23 |
+ " $data{hardQuota} ".gettext("Mb"))."\n"; |
| 24 |
$OUT .= gettext("Warnings start at:"). |
| 25 |
" $data{softQuota} ".gettext("Mb")."\n"; |
| 26 |
$OUT .= gettext("Grace period ends:")." $gracePeriodEnds\n"; |
| 27 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-quota-1.10.0/root/sbin/e-smith/warnquota mezzanine_patched_e-smith-quota-1.10.0/root/sbin/e-smith/warnquota |
| 28 |
--- e-smith-quota-1.10.0/root/sbin/e-smith/warnquota 2006-03-16 01:56:02.000000000 -0500 |
| 29 |
+++ mezzanine_patched_e-smith-quota-1.10.0/root/sbin/e-smith/warnquota 2006-07-16 14:14:36.000000000 -0400 |
| 30 |
@@ -143,7 +143,7 @@ |
| 31 |
gracePeriod => $bt |
| 32 |
}; |
| 33 |
} |
| 34 |
- elsif ( ($bc > $bh) || ($bc > $bs) ) |
| 35 |
+ elsif ( (($bc > $bh) && ($bh > 0)) || (($bc > $bs) && ($bs > 0)) ) |
| 36 |
{ |
| 37 |
# User is over quota |
| 38 |
# gracePeriod is 0 if over hard limit |
| 39 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-quota-1.10.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/quota.pm mezzanine_patched_e-smith-quota-1.10.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/quota.pm |
| 40 |
--- e-smith-quota-1.10.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/quota.pm 2006-07-16 14:18:00.000000000 -0400 |
| 41 |
+++ mezzanine_patched_e-smith-quota-1.10.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/quota.pm 2006-07-16 14:15:59.000000000 -0400 |
| 42 |
@@ -304,7 +304,7 @@ |
| 43 |
# Make sure that soft limit is less than hard limit. |
| 44 |
#------------------------------------------------------------ |
| 45 |
|
| 46 |
- unless ($hardlim == 0 or $hardlim >= $softlim) |
| 47 |
+ unless ($hardlim == 0 or $hardlim > $softlim) |
| 48 |
{ |
| 49 |
return $self->error('ERR_HARD_LT_SOFT', 'Initial'); |
| 50 |
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
