[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Changes by:     Dave Hall <skwashd>     06/10/03 14:06:11

Modified files:
        inc            : class.boaccounts.inc.php 

Log message:
        fix date validation for never expiring accounts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.54&r2=1.55

Patches:
Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- class.boaccounts.inc.php    2 Oct 2006 10:23:27 -0000       1.54
+++ class.boaccounts.inc.php    3 Oct 2006 14:06:11 -0000       1.55
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.boaccounts.inc.php,v 1.54 2006/10/02 10:23:27 Caeies Exp 
$ */
+       /* $Id: class.boaccounts.inc.php,v 1.55 2006/10/03 14:06:11 skwashd Exp 
$ */
 
        //FIXME define constants for rights so we can fuck all these magic 
numbers
        
@@ -437,7 +437,8 @@
                                $error[] = lang('You must add at least 1 
permission or group to this account');
                        }
 
-                       if ($values['account_expires_month'] || 
$values['account_expires_day'] || $values['account_expires_year'] || 
$values['account_expires_never'])
+                       if ( !$values['expires_never'] 
+                               || ($values['account_expires_month'] && 
$values['account_expires_day'] && $values['account_expires_year']) )
                        {
                                if (! 
checkdate($values['account_expires_month'],$values['account_expires_day'],$values['account_expires_year']))
                                {