X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=f247a370e46ff81187efe132c56d2c8d95f6895a;hb=ab4969a15a39924f83e8129d3ebf9b39da0e8338;hp=e9723e0e7b578e16705797dcda709b320d15806c;hpb=06cc53394cf695b3bc663073e526d7d94e4bb2d6;p=gosa.git

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index e9723e0e7..f247a370e 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -90,6 +90,7 @@ function displayLogin()
     $smarty->assign("php_errors", "");
   }
   $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+  $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
   $smarty->display (get_template_path('headers.tpl'));
   $smarty->assign("version",get_gosa_version());
   $smarty->display(get_template_path('login.tpl'));
@@ -132,9 +133,9 @@ session::set('errors',"");
 
 /* Check for java script */
 if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
-  session::set('js',TRUE);
+  session::global_set('js',TRUE);
 }elseif(isset($_POST['javascript'])) {
-  session::set('js',FALSE);
+  session::global_set('js',FALSE);
 }
 
 /* Check if gosa.conf (.CONFIG_FILE) is accessible */
@@ -145,7 +146,7 @@ if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
 
 /* Parse configuration file */
 $config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
-session::set('DEBUGLEVEL',$config->get_cfg_value('DEBUGLEVEL'));
+session::global_set('DEBUGLEVEL',$config->get_cfg_value('DEBUGLEVEL'));
 if ($_SERVER["REQUEST_METHOD"] != "POST"){
   @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
 }
@@ -209,7 +210,7 @@ if ($config->get_cfg_value("forcessl") == 'true' && $ssl != ''){
 
 /* Do we have htaccess authentification enabled? */
 $htaccess_authenticated= FALSE;
-if ($config->get_cfg_value("htaccess_auth") == "true" ){
+if ($config->get_cfg_value("htaccessAuthentication") == "true" ){
   if (!isset($_SERVER['REMOTE_USER'])){
     msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
     exit;
@@ -237,8 +238,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
   $message= "";
 
   /* Destroy old sessions, they cause a successfull login to relog again ...*/
-  if(session::is_set('_LAST_PAGE_REQUEST')){
-    session::set('_LAST_PAGE_REQUEST',time());
+  if(session::global_is_set('_LAST_PAGE_REQUEST')){
+    session::global_set('_LAST_PAGE_REQUEST',time());
   }
 
   if (!$htaccess_authenticated){
@@ -260,8 +261,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
     $config->data['MAIN']['SCHEMACHECK'] = "true";
   }
   if ($config->get_cfg_value("schemaCheck") == "true"){
-    $recursive = ($config->get_cfg_value("recursive") == "true");
-    $tls =       ($config->get_cfg_value("tls") == "true");
+    $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true");
+    $tls =       ($config->get_cfg_value("ldapTLS") == "true");
 
     if(!count($ldap->get_objectclasses())){
       msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
@@ -269,8 +270,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       exit()  ;
     }else{
       $cfg = array();
-      $cfg['admin']     = $config->current['ADMIN'];
-      $cfg['password']  = $config->current['PASSWORD'];
+      $cfg['admin']     = $config->current['ADMINDN'];
+      $cfg['password']  = $config->current['ADMINPASSWORD'];
       $cfg['connection']= $config->current['SERVER'];
       $cfg['tls']       = $tls;
       $str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true");
@@ -328,14 +329,14 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       del_user_locks($ui->dn);
 
       /* Save userinfo and plugin structure */
-      session::set('ui',$ui);
-      session::set('session_cnt',0);
+      session::global_set('ui',$ui);
+      session::global_set('session_cnt',0);
 
       /* Let GOsa trigger a new connection for each POST, save
          config to session. */
       $config->get_departments();
       $config->make_idepartments();
-      session::set('config',$config);
+      session::global_set('config',$config);
 
       /* Restore filter settings from cookie, if available */
       if($config->get_cfg_value("storeFilterSettings") == "true"){
@@ -352,7 +353,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::set($var,$cookie[$var]);
+                session::global_set($var,$cookie[$var]);
               }
             }
             if(isset($cookie['plug'])){
@@ -363,7 +364,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       }
 
       /* are we using accountexpiration */
-      if ($config->get_cfg_value("account_expiration") == "true"){
+      if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
         $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
         if ($expired == 1){