steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include auth.class.php.in, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Mon Jan 8 05:01:45 CET 2007
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv29084/kolab-webadmin/php/admin/include
Modified Files:
auth.class.php.in
Log Message:
not being logged in is not really an error (issue1555)
Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- auth.class.php.in 30 Dec 2005 11:07:17 -0000 1.1
+++ auth.class.php.in 8 Jan 2007 04:01:43 -0000 1.2
@@ -89,8 +89,9 @@
$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 @@
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 @@
$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();
More information about the commits
mailing list