From 0ee22c71f98b4d9481c03bf3032e1b8d94c8f12f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 26 Sep 2011 09:54:48 -0400
Subject: [PATCH] - Removed ufw configuration from installer to avoid "PHP Notice:  Undefined index: ufw in /tmp/trunk/install/install.php on line 251". - Changed phpMyAdmin location in ISPConfig nginx vhost to allow phpmyadmin and phpmyadmin/ (with and without trailing slash).

---
 interface/web/client/client_edit.php |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 4581397..5896361 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -149,14 +149,7 @@
 		$type = 'user';
 		$active = 1;
 		$language = $app->db->quote($this->dataRecord["language"]);
-		
-		$salt="$1$";
-		$base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-		for ($n=0;$n<8;$n++) {
-			$salt.=$base64_alphabet[mt_rand(0,63)];
-		}
-		$salt.="$";
-		$password = crypt(stripslashes($password),$salt);
+		$password = $app->auth->crypt_password($password);
 		
 		// Create the controlpaneluser for the client
 		//Generate ssh-rsa-keys

--
Gitblit v1.9.1