From 9cf2c25a64a23a1be36f9cd0af8aac150b659f14 Mon Sep 17 00:00:00 2001 From: latham <latham@ispconfig3> Date: Fri, 28 Oct 2011 11:33:06 -0400 Subject: [PATCH] start adding SPF by adding enum in table --- interface/web/client/client_edit.php | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php index 843e435..5896361 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -149,19 +149,12 @@ $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 exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); - $app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$this->id; + $app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa.pub'))."' WHERE client_id = ".$this->id); exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); // Create the controlpaneluser for the client @@ -248,4 +241,4 @@ $page = new page_action; $page->onLoad(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1