瀏覽代碼

Merge pull request #1988 from serghey-rodin/Skamasle-patch-9

Fix reset password from CLI / roundcube
Serghey Rodin 4 年之前
父節點
當前提交
fb9d3fddb0
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      bin/v-change-mail-account-password

+ 4 - 1
bin/v-change-mail-account-password

@@ -52,8 +52,11 @@ salt=$(generate_password "$PW_MATRIX" "8")
 md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
 md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
 
 
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
+    quota=$(grep $account $VESTA/data/users/${user}/mail/${domain}.conf)
+    quota=$(echo $quota | awk '{ print $7 }' | sed -e "s/'//g" )
+    quota=$(echo $quota | cut -d "=" -f 2 | sed -e "s/unlimited/0/g")
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
-    str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
+    str="$account:$md5:$user:mail::$HOMEDIR/$user:${quota}M"
     echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
     echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
 fi
 fi