X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Findex.php;h=7977dfab03cb46087fa67931475669ce426df3d3;hb=4ebac9cc4182bb5425873aebd91f2764ef57338f;hp=927fadfa4f4af7e3c9ae57ffb0b33c084bd5a289;hpb=8829e0b9cd7e0fed7d8cb8f720b623a6de2f490a;p=gosa.git

diff --git a/html/index.php b/html/index.php
index 927fadfa4..7977dfab0 100644
--- a/html/index.php
+++ b/html/index.php
@@ -21,6 +21,7 @@
 /* Load required includes */
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
+require_once ("class_log.inc");
 header("Content-type: text/html; charset=UTF-8");
 
 function displayLogin()
@@ -46,7 +47,7 @@ function displayLogin()
 
     /* 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>!");
+      $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
     } else {
       $smarty->assign ("ssl", "");
     }
@@ -218,23 +219,26 @@ 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");
     $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
     $tls =       (isset($config->current['TLS'])       && $config->current['TLS'] == "true");
 
-    if(!is_schema_readable($config->current['SERVER'], $config->current['ADMIN'], $config->current['PASSWORD'], $recursive, $tls)){
-
+    if(!count($ldap->get_objectclasses())){
       print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
       displayLogin();
       exit()  ;
     }else{
-      $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'], $recursive, $tls, 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']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+        if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){
+          print_red($tr['MSG']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
           displayLogin();
-          exit()  ;
+          exit();
         }
       }
     }
@@ -247,15 +251,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
     $ldap->create_missing_trees($config->current['CONFIG']);
   }
 
-  /* Check for at least one subtreeACL in the complete tree */
-  $ldap->cd($config->current['BASE']);
-  $ldap->search("(&(objectClass=gosaObject)(gosaSubtreeACL=:all))");
-  if ($ldap->count() < 1){
-    print_red(_("You're missing an administrative account for GOsa, you'll not be able to administrate anything!"));
-    displayLogin();
-    exit();
-  }
-
   /* Check for valid input */
   $username= $_POST["username"];
   if (!ereg("^[A-Za-z0-9_.-]+$", $username)){
@@ -267,10 +262,10 @@ 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\"");
+      new log("security","login","",array(),"Authentication failed for user \"$username\"") ;
     } else {
       /* Remove all locks of this user */
       del_user_locks($ui->dn);
@@ -285,6 +280,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'])){
@@ -294,13 +294,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
         if ($expired == 1){
           $message= _("Account locked. Please contact your system administrator.");
           $smarty->assign ('nextfield', 'password');
-          gosa_log ("Account for user \"$username\" has expired");
+          new log("security","login","",array(),"Account for user \"$username\" has expired") ;
         } elseif ($expired == 3){
             $plist= new pluglist($config, $ui);
             foreach ($plist->dirlist as $key => $value){
               if (preg_match("/\bpassword\b/i",$value)){
                 $plug=$key;
-                gosa_log ("User \"$username\" password forced to change");
+                new log("security","login","",array(),"User \"$username\" password forced to change") ;
                 header ("Location: main.php?plug=$plug&amp;reset=1");
                 exit;
               }
@@ -308,13 +308,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
           }
 
         /* Not account expired or password forced change go to main page */
-        gosa_log ("User \"$username\" logged in successfully");
+        new log("security","login","",array(),"User \"$username\" logged in successfully") ;
         header ("Location: main.php?global_check=1");
         exit;
         
       } else {
         /* Go to main page */
-        gosa_log ("User \"$username\" logged in successfully");
+        new log("security","login","",array(),"User \"$username\" logged in successfully") ;
         header ("Location: main.php?global_check=1");
         exit;
       }