From 50ddf8b99c56663bb844a5f66b5aac86e0d38c09 Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 9 Nov 2015 16:59:48 +0100 Subject: [PATCH 1/3] fix for allow_user and allow_group problem #90 --- application/libraries/Aauth.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php index 0ecff64..a927c05 100644 --- a/application/libraries/Aauth.php +++ b/application/libraries/Aauth.php @@ -1555,6 +1555,10 @@ class Aauth { $perm_id = $this->get_perm_id($perm_par); + if( ! $perm_id) { + return TRUE; + } + $query = $this->aauth_db->where('user_id',$user_id); $query = $this->aauth_db->where('perm_id',$perm_id); $query = $this->aauth_db->get($this->config_vars['perm_to_user']); @@ -1601,8 +1605,17 @@ class Aauth { public function allow_group($group_par, $perm_par) { $perm_id = $this->get_perm_id($perm_par); + + if( ! $perm_id) { + return TRUE; + } + $group_id = $this->get_group_id($group_par); + if( ! $group_id) { + return TRUE; + } + $query = $this->aauth_db->where('group_id',$group_id); $query = $this->aauth_db->where('perm_id',$perm_id); $query = $this->aauth_db->get($this->config_vars['perm_to_group']); From c7e05f0265347068d176f6eb09143220e227455e Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 10 Nov 2015 11:54:28 +0100 Subject: [PATCH 2/3] sry thats was my failure --- application/libraries/Aauth.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php index a927c05..0eed802 100644 --- a/application/libraries/Aauth.php +++ b/application/libraries/Aauth.php @@ -1556,7 +1556,7 @@ class Aauth { $perm_id = $this->get_perm_id($perm_par); if( ! $perm_id) { - return TRUE; + return FALSE; } $query = $this->aauth_db->where('user_id',$user_id); @@ -1607,13 +1607,13 @@ class Aauth { $perm_id = $this->get_perm_id($perm_par); if( ! $perm_id) { - return TRUE; + return FALSE; } $group_id = $this->get_group_id($group_par); if( ! $group_id) { - return TRUE; + return FALSE; } $query = $this->aauth_db->where('group_id',$group_id); From a858c1abf459b165dfc1ccb61c554c26ab9125cc Mon Sep 17 00:00:00 2001 From: REJack Date: Sun, 15 Nov 2015 18:51:51 +0100 Subject: [PATCH 3/3] changed 'TOTP Code' to 'Authentication Code' in english lang file --- application/language/english/aauth_lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/language/english/aauth_lang.php b/application/language/english/aauth_lang.php index 437a69d..ced329e 100644 --- a/application/language/english/aauth_lang.php +++ b/application/language/english/aauth_lang.php @@ -25,8 +25,8 @@ $lang['aauth_error_email_invalid'] = 'Invalid e-mail address'; $lang['aauth_error_password_invalid'] = 'Invalid password'; $lang['aauth_error_username_invalid'] = 'Invalid Username'; $lang['aauth_error_username_required'] = 'Username required'; -$lang['aauth_error_totp_code_required'] = 'TOTP Code required'; -$lang['aauth_error_totp_code_invalid'] = 'Invalid TOTP Code'; +$lang['aauth_error_totp_code_required'] = 'Authentication Code required'; +$lang['aauth_error_totp_code_invalid'] = 'Invalid Authentication Code'; // Account update errors