Fixed problem with quotes in names

[gosa.git] / gosa-core / setup / class_setupStep_Config1.inc

diff --git a/gosa-core/setup/class_setupStep_Config1.inc b/gosa-core/setup/class_setupStep_Config1.inc
index d418df8639fe6fb9a43d6c8efc1e2e4746dc3f99..7d585f3d028cbe999c143209b1c13c14946585e2 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config1.inc
+++ b/gosa-core/setup/class_setupStep_Config1.inc
@@ -31,12 +31,12 @@ class Step_Config1 extends setup_step
   var $strict     = TRUE;
   var $compressed = TRUE;
 
-  var $header_image = "images/ldapserver.png";
+  var $header_image = "images/setup/server.png";
   var $account_expiration  =FALSE;
   var $base_hook         = ""; 
   var $base_hook_active  = FALSE; 
 
-  var $encryption = "crypt";
+  var $encryption = "crypt/md5";
   var $theme      = "default"; 
 
   var $include_personal_title = FALSE;
@@ -62,7 +62,7 @@ class Step_Config1 extends setup_step
   {
     $this->update_strings();
 
-    $tmp = @passwordMethod::get_available_methods();
+    $tmp = passwordMethod::get_available_methods();
     foreach($tmp['name'] as $name){
       $this->crypt_methods[$name] = $name;
     }
@@ -81,13 +81,13 @@ class Step_Config1 extends setup_step
   {
     $smarty = get_smarty();
     $smarty->assign("peopledns",array("uid","cn"));
-    $smarty->assign("id_settings",$this->id_settings);
-    $smarty->assign("crypt_methods",$this->crypt_methods);
-    $smarty->assign("themes",$this->get_themes());
-    $smarty->assign("pwd_rules",$this->pwd_rules);
+    $smarty->assign("id_settings",   reverse_html_entities($this->id_settings));
+    $smarty->assign("crypt_methods", reverse_html_entities($this->crypt_methods));
+    $smarty->assign("themes",        reverse_html_entities($this->get_themes()));
+    $smarty->assign("pwd_rules",     reverse_html_entities($this->pwd_rules));
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
     foreach($this->attributes as $attr){
-      $smarty->assign($attr,xmlentities($this->$attr));
+      $smarty->assign($attr,htmlentities($this->$attr,ENT_QUOTES,"UTF-8"));
     }
 
     /* !!! Attention strict is inverse. If you change this,