webinterface.git

@@ -1,21 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-This code is published under a 0BSD license.

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

-function encrypt_mail_password($newpass)

-{

-    DEBUG("unencrypted PW: »" . $newpass . "«");

-    require_once('inc/base.php');

-    $newpass = crypt($newpass, '$6$' . random_string(8) . '$');

-    DEBUG("encrypted PW: " . $newpass);

-    return chop($newpass);

-}

@@ -17,8 +17,6 @@ require_once('inc/security.php');

 require_once('class/domain.php');

-require_once('common.php');

-

 function mailaccounts($uid)

 {

     $uid = (int) $uid;

@@ -86,7 +84,7 @@ function change_mailaccount($id, $arr)

         if ($result !== true) {

             system_failure("Unsicheres Passwort: " . $result);

         }

-        $encpw = encrypt_mail_password($arr['password']);

+        $encpw = gen_pw_hash($arr['password']);

         array_push($conditions, "`password`=:password");

         $values[":password"] = $encpw;

     }

@@ -140,7 +138,7 @@ function create_mailaccount($arr)

         if ($result !== true) {

             system_failure("Unsicheres Passwort: " . $result);

         }

-        $values[':password'] = encrypt_mail_password($arr['password']);

+        $values[':password'] = gen_pw_hash($arr['password']);

     }

     if (isset($arr['enabled'])) {

@@ -16,8 +16,6 @@ require_once('inc/debug.php');

 require_once('hasdomain.php');

-require_once('common.php');

-

 function forward_type($target)

 {

@@ -172,7 +170,7 @@ function find_account_id($accname)

 function change_vmail_password($accname, $newpass)

 {

     $accid = find_account_id($accname);

-    $encpw = encrypt_mail_password($newpass);

+    $encpw = gen_pw_hash($newpass);

     db_query("UPDATE mail.vmail_accounts SET password=:encpw WHERE id=:accid", [":encpw" => $encpw, ":accid" => $accid]);

 }

@@ -288,7 +286,7 @@ function save_vmail_account($account)

                 system_failure('Ihr Passwort ist zu einfach. bitte wählen Sie ein sicheres Passwort!' . "\nDie Fehlermeldung lautet: »{$crack}«");

                 return false;

             }

-            $password = encrypt_mail_password($account['password']);

+            $password = gen_pw_hash($account['password']);

         }

         $set_password = ($id == null || $password != null);

         if ($account['password'] === null) {