index 2c17abef8e17804ea28e201e91dfe46e9888505d..f247a370e46ff81187efe132c56d2c8d95f6895a 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
if(!$config->check_session_lifetime()){
$smarty->assign ("lifetime", _("Warning").": ".
if(!$config->check_session_lifetime()){
$smarty->assign ("lifetime", _("Warning").": ".
- _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+ _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
}else{
$smarty->assign ("lifetime", "");
}
}else{
$smarty->assign ("lifetime", "");
}
$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->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");
}
/* Enable compressed output */
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
}
/* Enable compressed output */
-if ($config->get_cfg_value("compressed") != ""){
+if ($config->get_cfg_value("sendCompressedOutput") != ""){
ob_start("ob_gzhandler");
}
/* Set template compile directory */
ob_start("ob_gzhandler");
}
/* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
- $smarty->compile_dir),FATAL_ERROR_DIALOG);
+ $smarty->compile_dir),FATAL_ERROR_DIALOG);
exit();
}
exit();
}
/* 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 +238,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){
@@ -256,12 +257,12 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
/* Check for schema file presence */
#TODO: these three lines should go to the class_config.inc, shouldn't they?
/* Check for schema file presence */
#TODO: these three lines should go to the class_config.inc, shouldn't they?
- if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
- $config->data['MAIN']['SCHEMA_CHECK'] = "true";
+ if(!isset($config->data['MAIN']['SCHEMACHECK'])){
+ $config->data['MAIN']['SCHEMACHECK'] = "true";
}
}
- if ($config->get_cfg_value("schema_check") == "true"){
- $recursive = ($config->get_cfg_value("recursive") == "true");
- $tls = ($config->get_cfg_value("tls") == "true");
+ if ($config->get_cfg_value("schemaCheck") == "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);
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();
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");
@@ -306,7 +307,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$ok= false;
}
}
$ok= false;
}
}
-
+
if ($ok) {
/* Login as user, initialize user ACL's */
if ($ok) {
/* Login as user, initialize user ACL's */
@@ -328,17 +329,17 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
del_user_locks($ui->dn);
/* Save userinfo and plugin structure */
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 */
/* Restore filter settings from cookie, if available */
- if($config->get_cfg_value("save_filter") == "true"){
+ if($config->get_cfg_value("storeFilterSettings") == "true"){
if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
@@ -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])){
$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'])){
@@ -363,7 +364,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* are we using accountexpiration */
}
/* 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){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == 1){
$smarty->assign("focus", $focus);
displayLogin();
$smarty->assign("focus", $focus);
displayLogin();
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+// vim:tabstop=2:expandtab:shiftwidth=2:softtabstop=2:filetype=php:syntax:ruler:
?>
</body>
?>
</body>