index 5bef30f7251132069e5742918b56c35a41c96338..5aadb15a201d1687eda5d261fa54495a17062ee8 100644 (file)
/* Check if CONFIG_FILE is accessible */
if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
/* Check if CONFIG_FILE is accessible */
if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
- msg_dialog::display("", sprintf(_("GOsa configuration %s/%s is not readable. Aborted."),CONFIG_DIR,CONFIG_FILE), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Fatal 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);
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");
}
/* Set template compile directory */
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
}
/* 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))){
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
- msg_dialog::display(_("Accessibility"), sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+ msg_dialog::display(_("Configuration error"), sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
$smarty->compile_dir), FATAL_ERROR_DIALOG);
exit;
}
$smarty->compile_dir), FATAL_ERROR_DIALOG);
exit;
}
clean_smarty_compile_dir($smarty->compile_dir);
/* Language setup */
clean_smarty_compile_dir($smarty->compile_dir);
/* Language setup */
-if ($config->data['MAIN']['LANG'] == ""){
+if ($config->get_cfg_value("lang") == ""){
$lang= get_browser_language();
} else {
$lang= get_browser_language();
} else {
- $lang= $config->data['MAIN']['LANG'];
+ $lang= $config->get_cfg_value("lang");
}
$lang.=".UTF-8";
putenv("LANGUAGE=");
}
$lang.=".UTF-8";
putenv("LANGUAGE=");
}
/* If SSL is forced, just forward to the SSL enabled site */
}
/* 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;
}
/* Check for selected password method */
header ("Location: $ssl");
exit;
}
/* Check for selected password method */
-$method= $config->current['HASH'];
+$method= $config->get_cfg_value("hash", "crypt/md5");
if (isset($_GET['method'])){
$method= validate($_GET['method']);
$tmp = new passwordMethod($config);
if (isset($_GET['method'])){
$method= validate($_GET['method']);
$tmp = new passwordMethod($config);
}
/* Password policy fulfilled? */
}
/* Password policy fulfilled? */
- if (isset($config->data['MAIN']['PWDIFFER'])){
- $l= $config->data['MAIN']['PWDIFFER'];
+ if ($config->get_cfg_value("pwdiffer") != ""){
+ $l= $config->get_cfg_value("pwdiffer");
if (substr($_POST['current_password'], 0, $l) == substr($_POST['new_password'], 0, $l)){
$message[]= _("The password used as new and current are too similar.");
}
}
if (substr($_POST['current_password'], 0, $l) == substr($_POST['new_password'], 0, $l)){
$message[]= _("The password used as new and current are too similar.");
}
}
- if (isset($config->data['MAIN']['PWMINLEN'])){
- if (strlen($_POST['new_password']) < $config->data['MAIN']['PWMINLEN']){
+ if ($config->get_cfg_value("pwminlen") != ""){
+ if (strlen($_POST['new_password']) < $config->get_cfg_value("pwminlen")){
$message[]= _("The password used as new is to short.");
}
}
$message[]= _("The password used as new is to short.");
}
}
/* Do we need to show error messages? */
if (count ($message) != 0){
/* Show error message and continue editing */
/* Do we need to show error messages? */
if (count ($message) != 0){
/* Show error message and continue editing */
- show_errors($message);
+ msg_dialog::displayChecks($message);
} else {
/* Passed quality check, just try to change the password now */
$output= "";
} else {
/* Passed quality check, just try to change the password now */
$output= "";
- if (isset($config->data['MAIN']['EXTERNALPWDHOOK'])){
- exec($config->data['MAIN']['EXTERNALPWDHOOK']." ".$ui->username." ".
+ if ($config->get_cfg_value("externalpwdhook") != ""){
+ exec($config->get_cfg_value("externalpwdhook")." ".$ui->username." ".
$_POST['current_password']." ".$_POST['new_password'], $resarr);
if(count($resarr) > 0) {
$output= join('\n', $resarr);
$_POST['current_password']." ".$_POST['new_password'], $resarr);
if(count($resarr) > 0) {
$output= join('\n', $resarr);
}
if ($output != ""){
$message[]= _("External password changer reported a problem: ".$output);
}
if ($output != ""){
$message[]= _("External password changer reported a problem: ".$output);
- show_errors($message);
+ msg_dialog::displayChecks($message);
} else {
if ($method != ""){
change_password ($ui->dn, $_POST['new_password'], 0, $method);
} else {
if ($method != ""){
change_password ($ui->dn, $_POST['new_password'], 0, $method);
$smarty->assign ('password_img', get_template_path('images/password.png'));
/* Displasy SSL mode warning? */
$smarty->assign ('password_img', get_template_path('images/password.png'));
/* 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=\"".htmlentities($ssl)."\"><b>"._("Enter SSL session")."</b></a>!");
} else {
$smarty->assign ("ssl", "");
$smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"".htmlentities($ssl)."\"><b>"._("Enter SSL session")."</b></a>!");
} else {
$smarty->assign ("ssl", "");
$smarty->assign("php_errors", "");
}
$smarty->assign("php_errors", "");
}
+$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
displayPWchanger();
?>
displayPWchanger();
?>