View | Details | Raw Unified | Return to bug 33256 | Differences between
and this patch

Collapse All | Expand All

(-)modules/univention/admin/mapping.py (-4 / +11 lines)
 Lines 73-83    Link Here 
73
	if list != 'None':
82
	if list != 'None':
74
		return list
83
		return list
75
84
85
def StringToInt(value):
86
	try:
87
		result = int(value)
88
	except ValueError:
89
		return 0
90
	return result
91
76
def unmapUNIX_TimeInterval( value ):
92
def unmapUNIX_TimeInterval( value ):
77
	if type(value) == types.ListType:
93
	if type(value) == types.ListType:
78
		value = int(value[0])
94
		value = StringToInt(value[0])
79
	else:
95
	else:
80
		value = int(value)
96
		value = StringToInt(value)
81
	unit = 'seconds'
97
	unit = 'seconds'
82
	if value % 60 == 0:
98
	if value % 60 == 0:
83
		value /= 60
99
		value /= 60
 Lines 95-103    Link Here 
95
	if isinstance( value, ( tuple, list ) ):
111
	if isinstance( value, ( tuple, list ) ):
96
		if len( value ) > 1:
112
		if len( value ) > 1:
97
			unit = value[ 1 ]
113
			unit = value[ 1 ]
98
		value = int( value[ 0 ] )
114
		value = StringtoInt( value[ 0 ] )
99
	else:
115
	else:
100
		value = int( value )
116
		value = StringToInt( value )
101
	if unit == 'days':
117
	if unit == 'days':
102
		value *= 24 * 60 * 60
118
		value *= 24 * 60 * 60
103
	elif unit == 'hours':
119
	elif unit == 'hours':

Return to bug 33256