diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index dfa8f4919..2082949f0 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -418,7 +418,7 @@ def _check_and_normalize_permission_path(url): import re, sre_constants # Uri without domain - if url.startwith('re:/'): + if url.startswith('re:/'): regex = url[4:] # check regex try: @@ -433,7 +433,7 @@ def _check_and_normalize_permission_path(url): # Uri with domain domains = domain_list()['domains'] - if url.startwith('re:'): + if url.startswith('re:'): if '/' not in url: raise YunohostError('regex_with_only_domain') domain = url[3:].split('/')[0] diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index 29872d044..f2c6eb36d 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -169,7 +169,7 @@ def user_permission_update(operation_logger, permission, add=None, remove=None, if "visitors" not in new_allowed_groups or len(new_allowed_groups) >= 3: logger.warning(m18n.n("permission_currently_allowed_for_all_users")) - if existing_permission['url'].startswith('re:') and show_tile: + if existing_permission['url'] and existing_permission['url'].startswith('re:') and show_tile: logger.warning(m18n.n('regex_incompatible_with_tile', regex=existing_permission['url'], permission=permission)) # Commit the new allowed group list @@ -334,7 +334,7 @@ def permission_url(operation_logger, permission, """ from yunohost.app import app_setting from yunohost.utils.ldap import _get_ldap_interface - from yunohost.domain import _check_and_normalize_permission_path, domain_url_available + from yunohost.domain import _check_and_normalize_permission_path, _get_conflicting_apps ldap = _get_ldap_interface() # By default, manipulate main permission @@ -359,7 +359,7 @@ def permission_url(operation_logger, permission, else: url = _check_and_normalize_permission_path(url) domain, path = _get_full_url(url, app_main_path).split('/', 1) - conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.spit('.')[0]) + conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.split('.')[0]) if url.startswith('re:') and existing_permission['show_tile']: logger.warning(m18n.n('regex_incompatible_with_tile', regex=url, permission=permission)) @@ -383,9 +383,9 @@ def permission_url(operation_logger, permission, if ur in current_additional_urls: logger.warning(m18n.n('additional_urls_already_added', permission=permission, url=url)) else: - new_url = _check_and_normalize_permission_path(new_url) - domain, path = _get_full_url(new_url, app_main_path).split('/', 1) - conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.spit('.')[0]) + ur = _check_and_normalize_permission_path(ur) + domain, path = _get_full_url(ur, app_main_path).split('/', 1) + conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.split('.')[0]) if conflicts: apps = [] @@ -398,7 +398,7 @@ def permission_url(operation_logger, permission, )) raise YunohostError('app_location_unavailable', apps="\n".join(apps)) - new_additional_urls += [new_url] + new_additional_urls += [ur] if remove_url: for ur in remove_url: diff --git a/src/yunohost/user.py b/src/yunohost/user.py index 739fbcb02..ff31bbb62 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -462,7 +462,7 @@ def user_info(username): if service_status("dovecot")["status"] != "running": logger.warning(m18n.n('mailbox_used_space_dovecot_down')) - elif username not in user_permission_list(full=True, full_path=False)["permissions"]["mail.main"]["corresponding_users"]: + elif username not in user_permission_list(full=True)["permissions"]["mail.main"]["corresponding_users"]: logger.warning(m18n.n('mailbox_disabled', user=username)) else: cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0]