Skip to content

Commit 8f03ce5

Browse files
committed
send email using php wrapper
1 parent f70ba76 commit 8f03ce5

File tree

8 files changed

+41
-8
lines changed

8 files changed

+41
-8
lines changed

bin/v-backup-user

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ else
5353
subj="$user → backup failed"
5454
email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \')
5555
fi
56-
send_mail="$VESTA/web/inc/mail-wrapper.php"
56+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
57+
send_mail="$VESTA/web/inc/mail-wrapper.php"
58+
else
59+
send_mail=$(which mail)
60+
fi
5761

5862
# Check load average
5963
la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.')

bin/v-restart-cron

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if [ ! -z "$CRON_SYSTEM" ]; then
3434
if [ $? -ne 0 ]; then
3535
/etc/init.d/$CRON_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
37-
send_mail="$VESTA/web/inc/mail-wrapper.php"
37+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
38+
send_mail="$VESTA/web/inc/mail-wrapper.php"
39+
else
40+
send_mail=$(which mail)
41+
fi
3842
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3943
email=$(echo "$email" | cut -f 2 -d "'")
4044
tmpfile=$(mktemp)

bin/v-restart-ftp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if [ ! -z "$FTP_SYSTEM" ]; then
3434
if [ $? -ne 0 ]; then
3535
/etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
37-
send_mail="$VESTA/web/inc/mail-wrapper.php"
37+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
38+
send_mail="$VESTA/web/inc/mail-wrapper.php"
39+
else
40+
send_mail=$(which mail)
41+
fi
3842
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3943
email=$(echo "$email" | cut -f 2 -d "'")
4044
tmpfile=$(mktemp)

bin/v-restart-mail

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if [ ! -z "$MAIL_SYSTEM" ]; then
3434
if [ $? -ne 0 ]; then
3535
/etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
37-
send_mail="$VESTA/web/inc/mail-wrapper.php"
37+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
38+
send_mail="$VESTA/web/inc/mail-wrapper.php"
39+
else
40+
send_mail=$(which mail)
41+
fi
3842
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3943
email=$(echo "$email" | cut -f 2 -d "'")
4044
tmpfile=$(mktemp)

bin/v-restart-proxy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
3434
if [ $? -ne 0 ]; then
3535
/etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
37-
send_mail="$VESTA/web/inc/mail-wrapper.php"
37+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
38+
send_mail="$VESTA/web/inc/mail-wrapper.php"
39+
else
40+
send_mail=$(which mail)
41+
fi
3842
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3943
email=$(echo "$email" | cut -f 2 -d "'")
4044
tmpfile=$(mktemp)

bin/v-restart-service

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ check_args '1' "$#" 'SERVICE'
3030
if [ -x "/etc/init.d/$service" ]; then
3131
/etc/init.d/$service restart >/dev/null 2>&1
3232
if [ $? -ne 0 ]; then
33-
send_mail="$VESTA/web/inc/mail-wrapper.php"
33+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
34+
send_mail="$VESTA/web/inc/mail-wrapper.php"
35+
else
36+
send_mail=$(which mail)
37+
fi
3438
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3539
email=$(echo "$email" | cut -f 2 -d "'")
3640
tmpfile=$(mktemp)

bin/v-restart-web

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if [ ! -z "$WEB_SYSTEM" ]; then
3434
if [ "$?" -ne 0 ]; then
3535
/etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
37-
send_mail="$VESTA/web/inc/mail-wrapper.php"
37+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
38+
send_mail="$VESTA/web/inc/mail-wrapper.php"
39+
else
40+
send_mail=$(which mail)
41+
fi
3842
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3943
email=$(echo "$email" | cut -f 2 -d "'")
4044
tmpfile=$(mktemp)

bin/v-restore-user

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,12 @@ is_backup_available
6262
#----------------------------------------------------------#
6363

6464
# Define email wrapper
65-
send_mail="$VESTA/web/inc/mail-wrapper.php"
65+
if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
66+
send_mail="$VESTA/web/inc/mail-wrapper.php"
67+
else
68+
send_mail=$(which mail)
69+
fi
70+
6671

6772
# Check user
6873
check_user=$(is_object_valid 'user' 'USER' "$user")

0 commit comments

Comments
 (0)