diff --git a/html/index.php b/html/index.php
index e55d51c7dd8fcf9fca497921c95ced564d9149d7..c5bea796f15b49532b4aa7366a9afe170bb65c0c 100644 (file)
--- a/html/index.php
+++ b/html/index.php
require_once ("functions.inc");
header("Content-type: text/html; charset=UTF-8");
require_once ("functions.inc");
header("Content-type: text/html; charset=UTF-8");
+function displayLogin()
+{
+ global $smarty,$message,$config,$ssl,$error_collector;
+ error_reporting(E_ALL);
+ /* Fill template with required values */
+ $username = "";
+ if(isset($_POST["username"])){
+ $username= $_POST["username"];
+ }
+ $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
+ $smarty->assign ('username', $username);
+ $smarty->assign ('personal_img', get_template_path('images/personal.png'));
+ $smarty->assign ('password_img', get_template_path('images/password.png'));
+ $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
+
+ /* Some error to display? */
+ if (!isset($message)){
+ $message= "";
+ }
+ $smarty->assign ("message", $message);
+
+ /* Displasy SSL mode warning? */
+ if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
+ $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
+ } else {
+ $smarty->assign ("ssl", "");
+ }
+
+ /* Generate server list */
+ $servers= array();
+ if (isset($_POST['server'])){
+ $selected= validate($_POST['server']);
+ } else {
+ $selected= $config->data['MAIN']['DEFAULT'];
+ }
+ foreach ($config->data['LOCATIONS'] as $key => $ignored){
+ $servers[$key]= $key;
+ }
+ $smarty->assign ("server_options", $servers);
+ $smarty->assign ("server_id", $selected);
+
+ /* show login screen */
+ $smarty->assign ("PHPSESSID", session_id());
+ if (isset($_SESSION['errors'])){
+ $smarty->assign("errors", $_SESSION['errors']);
+ }
+ if ($error_collector != ""){
+ $smarty->assign("php_errors", $error_collector."</div>");
+ } else {
+ $smarty->assign("php_errors", "");
+ }
+
+ $smarty->display (get_template_path('headers.tpl'));
+ $smarty->display(get_template_path('login.tpl'));
+ exit();
+}
+
+
+
/* Set error handler to own one, initialize time calculation
and start session. */
session_start ();
/* Set error handler to own one, initialize time calculation
and start session. */
session_start ();
+
+/* 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();
+}
+
$username= "";
/* Reset errors */
$username= "";
/* Reset errors */
$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."));
$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."));
- echo $_SESSION['errors'];
- $smarty->display(get_template_path('login.tpl'));
+ displayLogin();
exit();
}
exit();
}
require_once("functions_setup.inc");
if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
require_once("functions_setup.inc");
if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
- echo $_SESSION['errors'];
+ $smarty->display(get_template_path('headers.tpl'));
+ echo "<body>".$_SESSION['errors']."</body></html>";
exit();
}else{
$str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
exit();
}else{
$str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
foreach($str as $tr){
if(isset($tr['needonstartup'])){
print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
foreach($str as $tr){
if(isset($tr['needonstartup'])){
print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
- print $_SESSION['errors'];
+ $smarty->display(get_template_path('headers.tpl'));
+ echo "<body>".$_SESSION['errors']."</body></html>";
exit();
}
}
exit();
}
}
$_SESSION['config']= $config;
/* are we using accountexpiration */
$_SESSION['config']= $config;
/* are we using accountexpiration */
- if((isset($config->data['MAIN']['ACCOUNTEXPIRED'])) &&
- preg_match('/true/i', $config->data['MAIN']['ACCOUNTEXPIRED'])){
+ if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
+ preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if (preg_match("/\bpassword\b/i",$value)){
$plug=$key;
gosa_log ("User \"$username\" password forced to change");
if (preg_match("/\bpassword\b/i",$value)){
$plug=$key;
gosa_log ("User \"$username\" password forced to change");
- header ("Location: main.php?plug=$plug&reset=1");
+ header ("Location: main.php?plug=$plug&reset=1");
exit;
}
}
exit;
}
}
} else {
$smarty->assign("php_errors", "");
}
} else {
$smarty->assign("php_errors", "");
}
-$smarty->display (get_template_path('login.tpl'));
-
-
-
-
-
-
-
-function displayLogin()
-{
- global $smarty,$message,$config,$ssl,$error_collector;
- error_reporting(E_ALL);
- /* Fill template with required values */
- $username = "";
- if(isset($_POST["username"])){
- $username= $_POST["username"];
- }
- $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
- $smarty->assign ('username', $username);
- $smarty->assign ('personal_img', get_template_path('images/personal.png'));
- $smarty->assign ('password_img', get_template_path('images/password.png'));
- $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
-
- /* Some error to display? */
- if (!isset($message)){
- $message= "";
- }
- $smarty->assign ("message", $message);
-
- /* Displasy SSL mode warning? */
- if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
- $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
- } else {
- $smarty->assign ("ssl", "");
- }
-
- /* Generate server list */
- $servers= array();
- if (isset($_POST['server'])){
- $selected= validate($_POST['server']);
- } else {
- $selected= $config->data['MAIN']['DEFAULT'];
- }
- foreach ($config->data['LOCATIONS'] as $key => $ignored){
- $servers[$key]= $key;
- }
- $smarty->assign ("server_options", $servers);
- $smarty->assign ("server_id", $selected);
-
- /* show login screen */
- $smarty->display (get_template_path('headers.tpl'));
- $smarty->assign ("PHPSESSID", session_id());
- if (isset($_SESSION['errors'])){
- $smarty->assign("errors", $_SESSION['errors']);
- }
- if ($error_collector != ""){
- $smarty->assign("php_errors", $error_collector."</div>");
- } else {
- $smarty->assign("php_errors", "");
- }
-
- $smarty->display(get_template_path('login.tpl'));
- exit();
-}
-
+displayLogin();
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: