Nitpicking bin/v-generate-password-hash (hestiacp#3874)

* nitpicking v-generate-password-hash

hestiacp#1: some errors were sent in stdout, this is a problem because in other parts of HestiaCP, for example in v-check-user-password, we just check if it printed anything at all in stdout, like

	hash=$($BIN/v-generate-password-hash "$method" "$salt" <<< "$password")
	if [[ -z "$hash" ]]; then
		echo "Error: password missmatch"


here $hash is not supposed to be "Error: not enough arguments"


also made sure we return exit code 1 (error) if the HASH_METHOD is invalid

Author: divinity76

bin/v-generate-password-hash

@@ -10,39 +10,34 @@
 
 // Checking arguments
 if ((empty($argv[1])) || (empty($argv[2]))) {
-    echo "Error: not enought arguments\n";
-    echo "Usage: " . $argv[0] ." HASH_METHOD SALT PASSWORD\n";
+    $errstr = "Error: not enought arguments\n";
+    $errstr .= "Usage: " . $argv[0] ." HASH_METHOD SALT PASSWORD (or the password can be sent in STDIN)\n";
+    fwrite(STDERR, $errstr);
     exit(1);
 }
 
 $crypt = $argv[1];
 $salt = $argv[2];
 if (empty($argv[3])) {
     $password = file_get_contents("php://stdin");
-    $password = str_replace("\n",'',$password);
+    $password = str_replace("\n", '', $password);
 } else {
     $password = $argv[3];
 }
 
 // Generating MD5 hash
 if ($crypt == 'md5' ) {
     $hash = crypt($password,  '$1$'.$salt.'$');
-}
-
-// Generating SHA-512 hash
-if ($crypt == 'sha-512' ) {
+} elseif ($crypt == 'sha-512' ) {
     $hash = crypt($password,  '$6$rounds=5000$'.$salt.'$');
     $hash = str_replace('$rounds=5000','',$hash);
-}
-
-// Generating base64 hash
-if ($crypt == 'htpasswd' ) {
+} elseif ($crypt == 'htpasswd' ) {
     $hash = crypt($password, base64_encode($password));
-}
-
-// Generating DES hash
-if ($crypt == 'des' ) {
+} elseif ($crypt == 'des' ) {
     $hash = crypt($password, $salt);
+} else {
+    fwrite(STDERR, "Error: argument #1 (HASH_METHOD) is invalid. It must be one of 'md5', 'sha-512', 'htpasswd', 'des'\n");
+    exit(1);
 }
 
 // Printing result