X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fpassword.php;h=5aadb15a201d1687eda5d261fa54495a17062ee8;hb=1e902786fc6a29c7471f9e4650d11137b5a5a9e1;hp=0d807407fc82ae7ccac3a211099526f03e38ca94;hpb=b5216eb39c3051ae688dd810c738de7836247d0d;p=gosa.git

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 0d807407f..5aadb15a2 100644
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -1,21 +1,23 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003-2007  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 function displayPWchanger()
@@ -53,27 +55,23 @@ session::set('LastError',"");
 
 /* 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);
-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 (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(_("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;
 }
@@ -82,10 +80,10 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
 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= $config->data['MAIN']['LANG'];
+  $lang= $config->get_cfg_value("lang");
 }
 $lang.=".UTF-8";
 putenv("LANGUAGE=");
@@ -146,13 +144,13 @@ if (!isset($_SERVER['HTTPS']) ||
 }
 
 /* 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 */
-$method= $config->current['HASH'];
+$method= $config->get_cfg_value("hash", "crypt/md5");
 if (isset($_GET['method'])){
 	$method= validate($_GET['method']);
 	$tmp = new passwordMethod($config);
@@ -200,14 +198,14 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
   }
 
   /* 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 (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.");
 	  }
   }
@@ -235,13 +233,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
   /* 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= "";
-	  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);
@@ -249,7 +247,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
 	  }
 	  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);
@@ -278,7 +276,7 @@ $smarty->assign ('uid', $uid);
 $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", "");
@@ -296,6 +294,7 @@ if ($error_collector != ""){
   $smarty->assign("php_errors", "");
 }
 
+$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
 displayPWchanger();
 
 ?>