mirror of
https://github.com/GAM-team/GAM.git
synced 2025-07-07 13:13:34 +00:00
Merge remote-tracking branch 'jay0lee/master'
This commit is contained in:
10
src/gam.py
10
src/gam.py
@ -4884,13 +4884,13 @@ def doWebClips(users):
|
|||||||
def doVacation(users):
|
def doVacation(users):
|
||||||
subject = message = u''
|
subject = message = u''
|
||||||
if sys.argv[4].lower() in true_values:
|
if sys.argv[4].lower() in true_values:
|
||||||
enable = u'true'
|
enable = True
|
||||||
elif sys.argv[4].lower() in false_values:
|
elif sys.argv[4].lower() in false_values:
|
||||||
enable = u'false'
|
enable = False
|
||||||
else:
|
else:
|
||||||
print u'ERROR: value for "gam <users> vacation" must be true or false, got %s' % sys.argv[4]
|
print u'ERROR: value for "gam <users> vacation" must be true or false, got %s' % sys.argv[4]
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
contacts_only = domain_only = u'false'
|
contacts_only = domain_only = False
|
||||||
start_date = end_date = None
|
start_date = end_date = None
|
||||||
i = 5
|
i = 5
|
||||||
while i < len(sys.argv):
|
while i < len(sys.argv):
|
||||||
@ -4901,10 +4901,10 @@ def doVacation(users):
|
|||||||
message = sys.argv[i+1]
|
message = sys.argv[i+1]
|
||||||
i += 2
|
i += 2
|
||||||
elif sys.argv[i].lower() == u'contactsonly':
|
elif sys.argv[i].lower() == u'contactsonly':
|
||||||
contacts_only = u'true'
|
contacts_only = True
|
||||||
i += 1
|
i += 1
|
||||||
elif sys.argv[i].lower() == u'domainonly':
|
elif sys.argv[i].lower() == u'domainonly':
|
||||||
domain_only = u'true'
|
domain_only = True
|
||||||
i += 1
|
i += 1
|
||||||
elif sys.argv[i].lower() == u'startdate':
|
elif sys.argv[i].lower() == u'startdate':
|
||||||
start_date = sys.argv[i+1]
|
start_date = sys.argv[i+1]
|
||||||
|
Reference in New Issue
Block a user