![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 238c74b956136b32a5fccecb6c5d50b35d9dbfcc..2c17abef8e17804ea28e201e91dfe46e9888505d 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
}
$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 ('personal_img', get_template_path('images/login-head.png'));
$smarty->assign ('password_img', get_template_path('images/password.png'));
$smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
$smarty->assign ("message", $message);
/* Displasy SSL mode warning? */
- if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
+ if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true'){
$smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
} else {
$smarty->assign ("ssl", "");
}
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
$smarty->display (get_template_path('headers.tpl'));
+ $smarty->assign("version",get_gosa_version());
$smarty->display(get_template_path('login.tpl'));
exit();
}
/* Check if gosa.conf (.CONFIG_FILE) is accessible */
if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
- msg_dialog::display(_("Configuration accessibility"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG);
exit();
}
/* Parse configuration file */
$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
-session::set('DEBUGLEVEL',$config->data['MAIN']['DEBUGLEVEL']);
+session::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 (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED'])){
+if ($config->get_cfg_value("compressed") != ""){
ob_start("ob_gzhandler");
}
/* Set template compile directory */
-if (isset ($config->data['MAIN']['COMPILE'])){
- $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
- $smarty->compile_dir= '/var/spool/gosa';
-}
+$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
- msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+ msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
$smarty->compile_dir),FATAL_ERROR_DIALOG);
exit();
}
}
/* If SSL is forced, just forward to the SSL enabled site */
-if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){
+if ($config->get_cfg_value("forcessl") == 'true' && $ssl != ''){
header ("Location: $ssl");
exit;
}
/* Do we have htaccess authentification enabled? */
$htaccess_authenticated= FALSE;
-if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(yes|true)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){
+if ($config->get_cfg_value("htaccess_auth") == "true" ){
if (!isset($_SERVER['REMOTE_USER'])){
msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
exit;
@@ -258,12 +255,13 @@ 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?
if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
$config->data['MAIN']['SCHEMA_CHECK'] = "true";
}
- if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
- $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
- $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true");
+ if ($config->get_cfg_value("schema_check") == "true"){
+ $recursive = ($config->get_cfg_value("recursive") == "true");
+ $tls = ($config->get_cfg_value("tls") == "true");
if(!count($ldap->get_objectclasses())){
msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
@@ -275,11 +273,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$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']));
+ $str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true");
$checkarr = array();
foreach($str as $tr){
if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){
- msg_dialog::display(_("LDAP error"), _("Your ldap setup contains old schema definitions:")."<br><br><i>".$tr['MSG']."</i>", ERROR_DIALOG);
+ msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."<br><br><i>".$tr['MSG']."</i>", ERROR_DIALOG);
displayLogin();
exit();
}
@@ -288,11 +286,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* Check for locking area */
- $ldap->cat($config->current['CONFIG'], array("dn"));
+ $ldap->cat($config->get_cfg_value("config"), array("dn"));
$attrs= $ldap->fetch();
if (!count ($attrs)){
$ldap->cd($config->current['BASE']);
- $ldap->create_missing_trees($config->current['CONFIG']);
+ $ldap->create_missing_trees($config->get_cfg_value("config"));
}
/* Check for valid input */
@@ -340,7 +338,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
session::set('config',$config);
/* Restore filter settings from cookie, if available */
- if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){
+ if($config->get_cfg_value("save_filter") == "true"){
if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
@@ -365,13 +363,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* are we using accountexpiration */
- if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
- preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){
-
+ if ($config->get_cfg_value("account_expiration") == "true"){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == 1){
- $message= _("Account locked. Please contact your system administrator.");
+ $message= _("Account locked. Please contact your system administrator!");
$smarty->assign ('nextfield', 'password');
new log("security","login","",array(),"Account for user \"$username\" has expired") ;
} elseif ($expired == 3){
@@ -403,7 +399,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
/* Fill template with required values */
$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 ('personal_img', get_template_path('images/login-head.png'));
$smarty->assign ('password_img', get_template_path('images/password.png'));
$smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
$smarty->assign ("message", $message);
/* Displasy SSL mode warning? */
-if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
+if ($ssl != "" && $config->get_cfg_value('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>!");
} else {
$smarty->assign ("ssl", "");