X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Findex.php;h=5a4f2128ace55ec478da35ddf9bf0fb293c0283c;hb=e15935617131743471cdc8cedc4825fc7e9692ef;hp=63fb9db9111747c0d5e187edf96ab3307e737736;hpb=12605975a99130f1a7f9f4e1975daf4492bf35b3;p=gosa.git
diff --git a/html/index.php b/html/index.php
index 63fb9db91..5a4f2128a 100644
--- a/html/index.php
+++ b/html/index.php
@@ -23,9 +23,78 @@ require_once ("../include/php_setup.inc");
require_once ("functions.inc");
header("Content-type: text/html; charset=UTF-8");
-/* Set error handler to own one, initialize time calculation
- and start session. */
-session_start ();
+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"];
+ }
+
+ /* Place ie workaround if needed */
+ if (isset($config->data['MAIN']['IE_PNG_WORKAROUND']) && preg_match("/true/i",$config->data['MAIN']['IE_PNG_WORKAROUND'])){
+ $smarty->assign('ieworkaround', 1);
+ }
+
+ $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", ""._("Warning").": "._("Session will not be encrypted.")." "._("Enter SSL session")."!");
+ } 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", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."");
+ } else {
+ $smarty->assign("php_errors", "");
+ }
+
+ $smarty->display(get_template_path('headers.tpl'));
+ $smarty->display(get_template_path('login.tpl'));
+ exit();
+}
+
+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 */
@@ -34,14 +103,11 @@ $_SESSION['errorsAlreadyPosted']= array();
$_SESSION['LastError'] = "";
/* Check if we need to run setup */
-if (!file_exists(CONFIG_DIR."/gosa.conf")){
+if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){
header("location:setup.php");
exit();
}
-/* Reset errors */
-$_SESSION['errors']= "";
-
/* Check for java script */
if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
$_SESSION['js']= TRUE;
@@ -49,14 +115,14 @@ if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
$_SESSION['js']= FALSE;
}
-/* Check if gosa.conf is accessible */
-if (!is_readable(CONFIG_DIR."/gosa.conf")){
- echo sprintf(_("GOsa configuration %s/gosa.conf is not readable. Aborted."), CONFIG_DIR);
+/* Check if CONFIG_FILE is accessible */
+if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
+ echo sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE);
exit();
}
/* Parse configuration file */
-$config= new config(CONFIG_DIR."/gosa.conf", $BASE_DIR);
+$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
$_SESSION['DEBUGLEVEL']= $config->data['MAIN']['DEBUGLEVEL'];
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
@@ -142,8 +208,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
$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();
}
@@ -152,18 +217,29 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
$config->data['MAIN']['SCHEMA_CHECK'] = "true";
}
if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
- require_once("functions_setup.inc");
- if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
+ $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
+ $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."));
- echo $_SESSION['errors'];
+ displayLogin();
exit();
}else{
- $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
+
+ $cfg = array();
+ $cfg['admin'] = $config->current['ADMIN'];
+ $cfg['password'] = $config->current['PASSWORD'];
+ $cfg['connection']= $config->current['SERVER'];
+ $cfg['tls'] = $tls;
+
+ $str = check_schema($cfg,isset($config->current['RFC2307BIS']) && preg_match("/(true|yes|on|1)/i",$config->current['RFC2307BIS']));
+
$checkarr = array();
foreach($str as $tr){
- if(isset($tr['needonstartup'])){
- print_red($tr['msg']."
"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
- print $_SESSION['errors'];
+ if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){
+ print_red($tr['MSG']."
"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+ displayLogin();
exit();
}
}
@@ -197,7 +273,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
/* Login as user, initialize user ACL's */
$ui= ldap_login_user($username, $_POST["password"]);
- if ($ui === NULL || $ui == 0){
+ if ($ui === NULL || !$ui ){
$message= _("Please check the username/password combination.");
$smarty->assign ('nextfield', 'password');
gosa_log ("Authentication failed for user \"$username\"");
@@ -215,6 +291,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
$config->make_idepartments();
$_SESSION['config']= $config;
+ /* Take care about zend.ze1_compatiblity_mode */
+ if (ini_get("zend.ze1_compatibility_mode") != 0){
+ $_SESSION['PHP4COMPATIBLE']= TRUE;
+ }
+
/* are we using accountexpiration */
if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){
@@ -268,13 +349,13 @@ $smarty->assign ("message", $message);
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
- $smarty->assign ("ssl", ""._("Warning").": "._("Session will not be encrypted.")." "._("Enter SSL session")."!");
+ $smarty->assign ("ssl", ""._("Warning").":<\/b> "._("Session will not be encrypted.")." "._("Enter SSL session")."<\/b>!");
} else {
$smarty->assign ("ssl", "");
}
/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", ""._("Warning").": "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", ""._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
/* Generate server list */
@@ -291,7 +372,6 @@ $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']);
@@ -301,72 +381,8 @@ if ($error_collector != ""){
} 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", ""._("Warning").": "._("Session will not be encrypted.")." "._("Enter SSL session")."!");
- } 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."");
- } else {
- $smarty->assign("php_errors", "");
- }
-
- $smarty->display(get_template_path('login.tpl'));
- exit();
-}
-
+displayLogin();
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>