From bf0463310ebafdf4365b922a1df5739b31d79d7d Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Wed, 18 May 2016 22:22:29 +0200
Subject: [PATCH] some little fixes `is_loggedin()` 2 empty lines removed
 `control()` it hasn't checked if no perm_par was given

---
 application/libraries/Aauth.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php
index ea4ec3d..19120c0 100644
--- a/application/libraries/Aauth.php
+++ b/application/libraries/Aauth.php
@@ -362,11 +362,9 @@ class Aauth {
 	 */
 	public function is_loggedin() {
 
-		if ( $this->CI->session->userdata('loggedin') )
-		{ return TRUE; }
-
-		// cookie control
-		else {
+		if ( $this->CI->session->userdata('loggedin') ){ 
+			return TRUE; 
+		} else {
 			if($this->config_vars['use_cookies'] == TRUE){
 				if( ! $this->CI->input->cookie('user', TRUE) ){
 					return FALSE;
@@ -445,12 +443,27 @@ class Aauth {
 
 		$perm_id = $this->get_perm_id($perm_par);
 		$this->update_activity();
+		if($perm_par == FALSE){
+			if($this->is_loggedin()){
+				if($this->CI->session->userdata('totp_required')){
+					$this->error($this->CI->lang->line('aauth_error_no_access'));
+					redirect($this->config_vars['totp_two_step_login_redirect']);			
+				}else{
+					return TRUE;				
+				}
+			}else if(!$this->is_loggedin()){
+				$this->error($this->CI->lang->line('aauth_error_no_access'));
+				if($this->config_vars['no_permission'] !== FALSE){
+					redirect($this->config_vars['no_permission']);			
+				}
+			}
 
-		// if user or user's group not allowed
-		if ( ! $this->is_allowed($perm_id) OR ! $this->is_group_allowed($perm_id) ){
+		}else if ( ! $this->is_allowed($perm_id) OR ! $this->is_group_allowed($perm_id) ){
 			if( $this->config_vars['no_permission'] ) {
 				$this->error($this->CI->lang->line('aauth_error_no_access'));
-				redirect($this->config_vars['no_permission']);
+				if($this->config_vars['no_permission'] !== FALSE){
+					redirect($this->config_vars['no_permission']);			
+				}
 			}
 			else {
 				echo $this->CI->lang->line('aauth_error_no_access');