index 1330e97b9ca27d394bb208aac67715a1d1d89371..ebae5e52f7393fd19fcd7bf03632e85fdbd6fac5 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
$smarty->assign("php_errors", "");
}
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
$smarty->assign("php_errors", "");
}
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+ $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
+ $smarty->assign("usePrototype", "false");
$smarty->display (get_template_path('headers.tpl'));
$smarty->assign("version",get_gosa_version());
$smarty->display(get_template_path('login.tpl'));
$smarty->display (get_template_path('headers.tpl'));
$smarty->assign("version",get_gosa_version());
$smarty->display(get_template_path('login.tpl'));
/* Check for java script */
if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
/* Check for java script */
if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
- session::set('js',TRUE);
+ session::global_set('js',TRUE);
}elseif(isset($_POST['javascript'])) {
}elseif(isset($_POST['javascript'])) {
- session::set('js',FALSE);
+ session::global_set('js',FALSE);
}
/* Check if gosa.conf (.CONFIG_FILE) is accessible */
}
/* Check if gosa.conf (.CONFIG_FILE) is accessible */
/* Parse configuration file */
$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
/* 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");
}
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
}
/* Do we have htaccess authentification enabled? */
$htaccess_authenticated= FALSE;
/* 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;
if (!isset($_SERVER['REMOTE_USER'])){
msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
exit;
@@ -237,8 +239,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$message= "";
/* Destroy old sessions, they cause a successfull login to relog again ...*/
$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){
}
if (!$htaccess_authenticated){
@@ -255,12 +257,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* Check for schema file presence */
}
/* Check for schema file presence */
- #TODO: these three lines should go to the class_config.inc, shouldn't they?
- if(!isset($config->data['MAIN']['SCHEMACHECK'])){
- $config->data['MAIN']['SCHEMACHECK'] = "true";
- }
if ($config->get_cfg_value("schemaCheck") == "true"){
if ($config->get_cfg_value("schemaCheck") == "true"){
- $recursive = ($config->get_cfg_value("recursive") == "true");
+ $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true");
$tls = ($config->get_cfg_value("ldapTLS") == "true");
if(!count($ldap->get_objectclasses())){
$tls = ($config->get_cfg_value("ldapTLS") == "true");
if(!count($ldap->get_objectclasses())){
@@ -269,8 +267,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
exit() ;
}else{
$cfg = array();
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");
$cfg['connection']= $config->current['SERVER'];
$cfg['tls'] = $tls;
$str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true");
@@ -297,7 +295,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$ok= true;
if (!$htaccess_authenticated){
$username= $_POST["username"];
$ok= true;
if (!$htaccess_authenticated){
$username= $_POST["username"];
- if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){
+ if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)){
$message= _("Please specify a valid username!");
$ok= false;
} elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){
$message= _("Please specify a valid username!");
$ok= false;
} elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){
@@ -322,20 +320,21 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
if ($ui === NULL || !$ui){
$message= _("Please check the username/password combination.");
$smarty->assign ('nextfield', 'password');
if ($ui === NULL || !$ui){
$message= _("Please check the username/password combination.");
$smarty->assign ('nextfield', 'password');
- new log("security","login","",array(),"Authentication failed for user \"$username\"") ;
+ session::global_set('config',$config);
+ new log("security","login","",array(),"Authentication failed for user \"$username\"");
} else {
/* Remove all locks of this user */
del_user_locks($ui->dn);
/* Save userinfo and plugin structure */
} else {
/* Remove all locks of this user */
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();
/* 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"){
/* Restore filter settings from cookie, if available */
if($config->get_cfg_value("storeFilterSettings") == "true"){
@@ -352,7 +351,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])){
$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'])){
}
}
if(isset($cookie['plug'])){