not being logged in is not really an error (issue1555)

1 files changed, 4 insertions, 3 deletions

diff --git a/php/admin/include/auth.class.php.in b/php/admin/include/auth.class.php.in
index 8932a10..e7ab703 100644
--- a/php/admin/include/auth.class.php.in
+++ b/php/admin/include/auth.class.php.in
@@ -89,8 +89,9 @@ class KolabAuth {
 					$this->gotoLoginPage(); 
 				}
 			} else {
-				$this->error_string = _('Please log in as a valid user');
+				//$this->error_string = _('Please log in as a valid user');
 				$this->gotoLoginPage();
+				// noreturn
 			}
 		} else {
 			// All OK, user already logged in
@@ -101,7 +102,7 @@ class KolabAuth {
 	function logout() {
 		session_unset();
 		session_destroy();
-		$this->error_string = "";
+		$this->error_string = false;
 		//$this->gotoLoginPage();
 		Header("Location: @webserver_web_prefix@/admin/");
 	}
@@ -122,7 +123,7 @@ class KolabAuth {
 		$smarty->assign( 'group', '' );
 		$smarty->assign( 'page_title', _('Login') );
 		$smarty->assign( 'menuitems', array() );
-		$smarty->assign( 'errors', array( $this->error() ) );
+		if( $this->error() ) $smarty->assign( 'errors', array( $this->error() ) );
 		$smarty->assign( 'maincontent', 'login.tpl' );
 		$smarty->display('page.tpl');
 		exit();