![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index f5267324427c54a4b1ddbb8c65294887aa17442e..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) {
if (preg_match('/'.preg_quote($block).'/', $_SERVER['HTTP_USER_AGENT'])) {
- die(sprintf(_("Your browser (%s) is blacklisted for the current theme."), $block));
+ die(sprintf(_("Your browser (%s) is blacklisted for the current theme!"), $block));
}
}
}
if(isset($_POST["username"])) {
$username= $_POST["username"];
}
+
+ $smarty->assign ("title","GOsa");
$smarty->assign("logo", image(get_template_path("images/logo.png")));
$smarty->assign('date', gmdate("D, d M Y H:i:s"));
$smarty->assign('username', $username);
$smarty->assign("message", $message);
/* Displasy SSL mode warning? */
- if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true') {
- $smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">"._("here")."</a>"));
+ 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", "");
}
if(!$config->check_session_lifetime()) {
- $smarty->assign ("lifetime", _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+ $smarty->assign ("lifetime", _("The configured session lifetime will be overridden by php.ini settings!"));
} else {
$smarty->assign ("lifetime", "");
}
$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 (!(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!"),
+ msg_dialog::display(_("Smarty error"),sprintf(_("Compile directory %s is not accessible!"),
$smarty->compile_dir),FATAL_ERROR_DIALOG);
exit();
}
}
/* 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"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"), _("Broken HTTP authentication setup!"), FATAL_ERROR_DIALOG);
exit;
}
$username= $tmp['username'];
$server= $tmp['server'];
if ($username == "") {
- msg_dialog::display(_("Error"), _("Cannot find a valid user for the current authentication setup!"), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Error"), _("Cannot find a valid user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
exit;
}
if ($server == "") {
- msg_dialog::display(_("Error"), _("User information is not unique accross the configured LDAP trees!"), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Error"), _("Cannot find a unique user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
exit;
}
@@ -270,12 +271,12 @@ 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 detect information about the installed LDAP schema!"), ERROR_DIALOG);
+ msg_dialog::display(_("LDAP error"), _("Cannot obtain information about the available LDAP schema!"), ERROR_DIALOG);
displayLogin();
exit() ;
}else{
@@ -284,11 +285,11 @@ 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']) {
- 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>".$tr['MSG'], ERROR_DIALOG);
displayLogin();
exit();
}
@@ -297,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 */
@@ -324,14 +325,14 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
if ($htaccess_authenticated) {
$ui= ldap_login_user_htaccess($username);
if ($ui === NULL || !$ui) {
- msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for htaccess authentication!"), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for HTTP authentication!"), FATAL_ERROR_DIALOG);
exit;
}
} else {
$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\"");
@@ -350,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'])) {
@@ -375,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) {
$smarty->assign ("message", $message);
/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", _("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", _("Your browser has cookies disabled: please enable cookies and reload this page before logging in!"));
/* Generate server list */
$servers= array();