X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=347abae1b10c53ff235f6bdb004e379213dbd50c;hb=d304d276784b0675372dcdb402a61bfdd3f8488d;hp=39f8b74f4ed16911ee4294d50cb71c694f6f4953;hpb=8e7ac286389669883b1a5684127b6d1e0a63b91f;p=gosa.git diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index 39f8b74f4..347abae1b 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -1,21 +1,23 @@ assign ("PHPSESSID", session_id()); - if (isset($_SESSION['errors'])){ - $smarty->assign("errors", $_SESSION['errors']); + if (session::is_set('errors')){ + $smarty->assign("errors", session::get('errors')); } if ($error_collector != ""){ $smarty->assign("php_errors", $error_collector.""); @@ -90,23 +97,28 @@ function displayLogin() +/***************************************************************************** + * M A I N * + *****************************************************************************/ + /* Set error handler to own one, initialize time calculation and start session. */ -session_start (); +session::start(); +session::set('errorsAlreadyPosted',array()); /* Destroy old session if exists. Else you will get your old session back, if you not logged out correctly. */ -if(is_array($_SESSION) && count($_SESSION)){ - session_destroy(); - session_start(); +if(is_array(session::get_all()) && count(session::get_all())){ + session::destroy(); + session::start(); } $username= ""; /* Reset errors */ -$_SESSION['errors'] = ""; -$_SESSION['errorsAlreadyPosted']= array(); -$_SESSION['LastError'] = ""; +session::set('errors',""); +session::set('errorsAlreadyPosted',""); +session::set('LastError',""); /* Check if we need to run setup */ if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){ @@ -115,13 +127,13 @@ if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){ } /* Reset errors */ -$_SESSION['errors']= ""; +session::set('errors',""); /* Check for java script */ if(isset($_POST['javascript']) && $_POST['javascript'] == "true") { - $_SESSION['js']= TRUE; + session::set('js',TRUE); }elseif(isset($_POST['javascript'])) { - $_SESSION['js']= FALSE; + session::set('js',FALSE); } /* Check if gosa.conf (.CONFIG_FILE) is accessible */ @@ -132,7 +144,7 @@ if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){ /* Parse configuration file */ $config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR); -$_SESSION['DEBUGLEVEL']= $config->data['MAIN']['DEBUGLEVEL']; +session::set('DEBUGLEVEL',$config->data['MAIN']['DEBUGLEVEL']); if ($_SERVER["REQUEST_METHOD"] != "POST"){ @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config"); } @@ -169,7 +181,7 @@ $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/'; /* Set the text domain as 'messages' */ $domain = 'messages'; -bindtextdomain($domain, "$BASE_DIR/locale"); +bindtextdomain($domain, LOCALE_DIR); textdomain($domain); $smarty->assign ('nextfield', 'username'); @@ -202,20 +214,20 @@ if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){ $htaccess_authenticated= FALSE; if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(yes|true)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){ if (!isset($_SERVER['REMOTE_USER'])){ - print_red(_("There is a problem with the authentication setup. Please inform your system administrator.")); - display_error_page(); + msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG); + exit; } $tmp= process_htaccess($_SERVER['REMOTE_USER'], isset($_SERVER['KRB5CCNAME'])); $username= $tmp['username']; $server= $tmp['server']; if ($username == ""){ - print_red(_("Cannot find a valid user for the current authentication setup.")); - display_error_page(); + msg_dialog::display(_("Error"), _("Cannot find a valid user for the current authentication setup!"), FATAL_ERROR_DIALOG); + exit; } if ($server == ""){ - print_red(_("User information is not uniq accross the configured directories. Cannot authenticated.")); - display_error_page(); + msg_dialog::display(_("Error"), _("User information is not unique accross the configured LDAP trees!"), FATAL_ERROR_DIALOG); + exit; } $htaccess_authenticated= TRUE; @@ -228,8 +240,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $message= ""; /* Destroy old sessions, they cause a successfull login to relog again ...*/ - if(isset($_SESSION['_LAST_PAGE_REQUEST'])){ - $_SESSION['_LAST_PAGE_REQUEST'] = time(); + if(session::is_set('_LAST_PAGE_REQUEST')){ + session::set('_LAST_PAGE_REQUEST',time()); } if (!$htaccess_authenticated){ @@ -240,7 +252,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces /* Admin-logon and verify */ $ldap = $config->get_ldap_link(); if (is_null($ldap) || (is_int($ldap) && $ldap == 0)){ - print_red (_("Can't bind to LDAP. Please contact the system administrator.")); + msg_dialog::display(_("LDAP error"), _("Can't bind to LDAP. Please contact the system administrator."), ERROR_DIALOG); displayLogin(); exit(); } @@ -254,7 +266,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true"); if(!count($ldap->get_objectclasses())){ - print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible.")); + msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG); displayLogin(); exit() ; }else{ @@ -267,7 +279,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $checkarr = array(); foreach($str as $tr){ if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){ - print_red($tr['MSG']."
"._("Your ldap setup contains old schema definitions. Please re-run the setup.")); + msg_dialog::display(_("LDAP error"), _("Your ldap setup contains old schema definitions:")."

".$tr['MSG']."", ERROR_DIALOG); displayLogin(); exit(); } @@ -303,8 +315,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces if ($htaccess_authenticated){ $ui= ldap_login_user_htaccess($username); if ($ui === NULL || !$ui){ - print_red(_("Authentication via htaccess not possible. Unable to retrieve user information.")); - display_error_page(); + msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for htaccess authentication!"), FATAL_ERROR_DIALOG); + exit; } } else { $ui= ldap_login_user($username, $_POST["password"]); @@ -318,14 +330,14 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces del_user_locks($ui->dn); /* Save userinfo and plugin structure */ - $_SESSION['ui']= $ui; - $_SESSION['session_cnt']= 0; + session::set('ui',$ui); + session::set('session_cnt',0); /* Let GOsa trigger a new connection for each POST, save config to session. */ $config->get_departments(); $config->make_idepartments(); - $_SESSION['config']= $config; + session::set('config',$config); /* Restore filter settings from cookie, if available */ if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){ @@ -342,7 +354,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug"); foreach($cookie_vars as $var){ if(isset($cookie[$var])){ - $_SESSION[$var] = $cookie[$var]; + session::set($var,$cookie[$var]); } } if(isset($cookie['plug'])){ @@ -412,7 +424,6 @@ if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){ /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */ $smarty->assign ("cookies", ""._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!")); - /* Generate server list */ $servers= array(); if (isset($_POST['server'])){ @@ -428,8 +439,8 @@ $smarty->assign ("server_id", $selected); /* show login screen */ $smarty->assign ("PHPSESSID", session_id()); -if (isset($_SESSION['errors'])){ - $smarty->assign("errors", $_SESSION['errors']); +if (session::is_set('errors')){ + $smarty->assign("errors", session::get('errors')); } if ($error_collector != ""){ $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector).""); @@ -439,7 +450,7 @@ if ($error_collector != ""){ /* Set focus to the error button if we've an error message */ $focus= ""; -if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){ +if (session::is_set('errors') && session::get('errors') != ""){ $focus= '';