deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 13:43:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Guard vacation info with convertUTF8, fix typo in doGetNotifications

Browse Source
This commit is contained in:
Ross Scroggs
2015-11-19 16:46:16 -08:00
parent 3edfce202f
commit 7a9bda9b1b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam.py
View File

@ -4520,7 +4520,7 @@ def getVacation(users):
emailsettings.domain = domain emailsettings.domain = domain
vacationsettings = callGData(service=emailsettings, function=u'GetVacation', soft_errors=True, username=user) vacationsettings = callGData(service=emailsettings, function=u'GetVacation', soft_errors=True, username=user)
try: try:
print u'''User %s print convertUTF8(u'''User %s
Enabled: %s Enabled: %s
Contacts Only: %s Contacts Only: %s
Domain Only: %s Domain Only: %s
@ -4529,7 +4529,7 @@ def getVacation(users):
Start Date: %s Start Date: %s
End Date: %s End Date: %s
''' % (user+u'@'+emailsettings.domain, vacationsettings[u'enable'], vacationsettings[u'contactsOnly'], vacationsettings[u'domainOnly'], vacationsettings[u'subject'], ''' % (user+u'@'+emailsettings.domain, vacationsettings[u'enable'], vacationsettings[u'contactsOnly'], vacationsettings[u'domainOnly'], vacationsettings[u'subject'],
vacationsettings[u'message'], vacationsettings[u'startDate'], vacationsettings[u'endDate']) vacationsettings[u'message'], vacationsettings[u'startDate'], vacationsettings[u'endDate']))
except TypeError: except TypeError:
pass pass
@ -6364,7 +6364,7 @@ def doGetNotifications():
if sys.argv[i].lower() == u'unreadonly': if sys.argv[i].lower() == u'unreadonly':
unread_only = True unread_only = True
else: else:
print 'ERROR: %s is not a valid argument for "gam delete notification", expected unreadonly' % sys.argv[i] print 'ERROR: %s is not a valid argument for "gam info notification", expected unreadonly' % sys.argv[i]
sys.exit(2) sys.exit(2)
i += 1 i += 1
notifications = callGAPIpages(service=cd.notifications(), function=u'list', customer=customerId) notifications = callGAPIpages(service=cd.notifications(), function=u'list', customer=customerId)