Attachment 10160 Details for Bug 50009

[patch] hotfix

50009.patch (text/plain), 1.18 KB, created by Florian Best on 2019-08-14 15:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2019-08-14 15:32 CEST

Size: 1.18 KB

patch

obsolete

>diff --git a/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py b/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py
>index 4ae829e8b..05a62ee4b 100644
>--- a/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py
>+++ b/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py
>@@ -80,9 +80,9 @@ _ = Translation('ucs-school-umc-computerroom').translate
> ROOMDIR = '/var/cache/ucs-school-umc-computerroom'
> FN_SCREENSHOT_DENIED = _('/usr/share/ucs-school-umc-computerroom/screenshot_denied.jpg')
> FN_SCREENSHOT_NOTREADY = _('/usr/share/ucs-school-umc-computerroom/screenshot_notready.jpg')
>-ROOM_DN_REGEX_TEMPLATE = r'cn=([a-zA-Z0-9_][a-zA-Z0-9. _-]+?[a-zA-Z0-9_]+?),cn={container},cn=groups,ou=(\w+?),{ldap_base}'
>+ROOM_DN_REGEX_TEMPLATE = r'cn=([\w0-9_][\w0-9. _-]+?[\w0-9_]+?),cn={container},cn=groups,ou=(\w+?),{ldap_base}'
> ROOM_DN_REGEX_COMPILED = lazy_object_proxy.Proxy(lambda: re.compile(ROOM_DN_REGEX_TEMPLATE.format(
>-	container=ucr.get('ucsschool/ldap/default/container/rooms', 'raeume'), ldap_base=ucr['ldap/base'])))
>+	container=ucr.get('ucsschool/ldap/default/container/rooms', 'raeume'), ldap_base=ucr['ldap/base']), flags=re.U))
> 
> 
> def compare_dn(a, b):

Actions: View | Diff

Attachments on bug 50009: 10158 | 10159 | 10160