![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6389fc4127e4456cc01e37fe7dd0dcd7618ac492..3ce811e3303898a6580dd01b72a07ae63283262c 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
error_reporting(E_ALL | E_STRICT);
/* Check theme compatibility */
- $theme= $config->get_cfg_value('theme', 'default');
+ $theme= $config->get_cfg_value("core",'theme');
if (file_exists("$BASE_DIR/ihtml/themes/$theme/blacklist")) {
$blocks= file("$BASE_DIR/ihtml/themes/$theme/blacklist");
foreach ($blocks as $block) {
$smarty->assign("message", $message);
/* Displasy SSL mode warning? */
- if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true') {
+ if ($ssl != "" && $config->get_cfg_value("core",'warnSSL') == 'true') {
$smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
} else {
$smarty->assign("ssl", "");
$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'));
/* Parse configuration file */
$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
-session::global_set('DEBUGLEVEL',$config->get_cfg_value('DEBUGLEVEL'));
+session::global_set('debugLevel',$config->get_cfg_value("core",'debugLevel'));
if ($_SERVER["REQUEST_METHOD"] != "POST") {
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
}
/* Enable compressed output */
-if ($config->get_cfg_value("sendCompressedOutput") != "") {
+if ($config->get_cfg_value("core","sendCompressedOutput") != "") {
ob_start("ob_gzhandler");
}
/* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("core","templateCompileDirectory");
$smarty->error_unassigned= true;
/* Check for compile directory */
}
/* If SSL is forced, just forward to the SSL enabled site */
-if ($config->get_cfg_value("forcessl") == 'true' && $ssl != '') {
+if ($config->get_cfg_value("core","forceSSL") == 'true' && $ssl != '') {
header ("Location: $ssl");
exit;
}
/* Do we have htaccess authentification enabled? */
$htaccess_authenticated= FALSE;
-if ($config->get_cfg_value("htaccessAuthentication") == "true" ) {
+if ($config->get_cfg_value("core","htaccessAuthentication") == "true" ) {
if (!isset($_SERVER['REMOTE_USER'])) {
msg_dialog::display(_("Configuration error"), _("Broken HTTP authentication setup!"), FATAL_ERROR_DIALOG);
exit;
@@ -272,9 +271,9 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* Check for schema file presence */
- if ($config->get_cfg_value("schemaCheck") == "true") {
- $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true");
- $tls = ($config->get_cfg_value("ldapTLS") == "true");
+ if ($config->get_cfg_value("core","schemaCheck") == "true") {
+ $recursive = ($config->get_cfg_value("core","ldapFollowReferrals") == "true");
+ $tls = ($config->get_cfg_value("core","ldapTLS") == "true");
if(!count($ldap->get_objectclasses())) {
msg_dialog::display(_("LDAP error"), _("Cannot obtain information about the available LDAP schema!"), ERROR_DIALOG);
@@ -286,7 +285,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$cfg['password'] = $config->current['ADMINPASSWORD'];
$cfg['connection']= $config->current['SERVER'];
$cfg['tls'] = $tls;
- $str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true");
+ $str = check_schema($cfg, $config->get_cfg_value("core","rfc2307bis") == "true");
$checkarr = array();
foreach($str as $tr) {
if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) {
@@ -299,11 +298,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* Check for locking area */
- $ldap->cat($config->get_cfg_value("config"), array("dn"));
+ $ldap->cat($config->get_cfg_value("core","config"), array("dn"));
$attrs= $ldap->fetch();
if (!count ($attrs)) {
$ldap->cd($config->current['BASE']);
- $ldap->create_missing_trees($config->get_cfg_value("config"));
+ $ldap->create_missing_trees($config->get_cfg_value("core","config"));
}
/* Check for valid input */
@@ -333,7 +332,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$ui= ldap_login_user($username, $_POST["password"]);
}
if ($ui === NULL || !$ui) {
- $message= _("Please check the username/password combination.");
+ $message= _("Please check the username/password combination!");
$smarty->assign ('nextfield', 'password');
session::global_set('config',$config);
new log("security","login","",array(),"Authentication failed for user \"$username\"");
@@ -352,7 +351,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
session::global_set('config',$config);
/* Restore filter settings from cookie, if available */
- if($config->get_cfg_value("storeFilterSettings") == "true") {
+ if($config->get_cfg_value("core","storeFilterSettings") == "true") {
if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])) {
@@ -377,7 +376,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* are we using accountexpiration */
- if ($config->get_cfg_value("handleExpiredAccounts") == "true") {
+ if ($config->get_cfg_value("core","handleExpiredAccounts") == "true") {
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == 1) {