send email using php wrapper

bin/v-backup-user

@@ -53,11 +53,7 @@ else
     subj="$user → backup failed"
     email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \')
 fi
-if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-    send_mail="$VESTA/web/inc/mail-wrapper.php"
-else
-    send_mail=$(which mail)
-fi
+send_mail="$VESTA/web/inc/mail-wrapper.php"
 
 # Check load average
 la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.')

bin/v-restart-cron

@@ -34,11 +34,7 @@ if [ ! -z "$CRON_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$CRON_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restart-dns

@@ -34,11 +34,7 @@ if [ ! -z "$DNS_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restart-ftp

@@ -34,11 +34,7 @@ if [ ! -z "$FTP_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restart-mail

@@ -34,11 +34,7 @@ if [ ! -z "$MAIL_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restart-proxy

@@ -34,11 +34,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restart-service

@@ -30,11 +30,7 @@ check_args '1' "$#" 'SERVICE'
 if [ -x "/etc/init.d/$service" ]; then
     /etc/init.d/$service restart >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
-        else
-            send_mail=$(which mail)
-        fi
+        send_mail="$VESTA/web/inc/mail-wrapper.php"
         email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
         email=$(echo "$email" | cut -f 2 -d "'")
         tmpfile=$(mktemp)

bin/v-restart-web

@@ -34,11 +34,7 @@ if [ ! -z "$WEB_SYSTEM" ]; then
     if [ "$?" -ne 0 ]; then
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-                send_mail="$VESTA/web/inc/mail-wrapper.php"
-            else
-                send_mail=$(which mail)
-            fi
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

bin/v-restore-user

@@ -62,12 +62,7 @@ is_backup_available
 #----------------------------------------------------------#
 
 # Define email wrapper
-if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
-    send_mail="$VESTA/web/inc/mail-wrapper.php"
-else
-    send_mail=$(which mail)
-fi
-
+send_mail="$VESTA/web/inc/mail-wrapper.php"
 
 # Check user
 check_user=$(is_object_valid 'user' 'USER' "$user")