Updated setup to use xmlentities

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

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index ed52e7cd5ea192f9391c25634d5af4eb5158befa..cec90017e36f65a445f076e5711699bdda8aee76 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -1020,10 +1020,7 @@ class Step_Migrate extends setup_step
       $dn = "uid=".$uid.",".$people_ou.$cv['base'];
     }
 
-    $methods = @passwordMethod::get_available_methods();
-    $p_m = $methods[$cv['encryption']];
-    $p_c = new $p_m(array());
-    $hash = $p_c->generate_hash($pw2);
+    $hash = passwordMethod::make_hash($pw2, $cv['encryption']);
 
     $new_user=array();
     $new_user['objectClass']= array("top","person","gosaAccount","organizationalPerson","inetOrgPerson");
@@ -1410,9 +1407,9 @@ class Step_Migrate extends setup_step
         $uid = $_POST['new_user_uid'];
       }
 
-      $smarty->assign("new_user_uid",$uid);
-      $smarty->assign("new_user_password",@$_POST['new_user_password']);
-      $smarty->assign("new_user_password2",@$_POST['new_user_password2']);
+      $smarty->assign("new_user_uid", xmlentities($uid));
+      $smarty->assign("new_user_password",xmlentities(@$_POST['new_user_password']));
+      $smarty->assign("new_user_password2",xmlentities(@$_POST['new_user_password2']));
       $smarty->assign("method","create_acls");
       $smarty->assign("acl_create_selected",$this->acl_create_selected);
       $smarty->assign("what_will_be_done_now",$this->acl_create_changes);