Skip to content

Commit de68a6b

Browse files
serghey-rodinserghey-rodin
committed
send email using php wrapper
1 parent 8f03ce5 commit de68a6b

File tree

9 files changed

+9
-46
lines changed

9 files changed

+9
-46
lines changed

‎bin/v-backup-user‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ else
5353
subj="$user → backup failed"
5454
email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \')
5555
fi
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
56+
send_mail="$VESTA/web/inc/mail-wrapper.php"
6157

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

‎bin/v-restart-cron‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ 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-
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restart-dns‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ if [ ! -z "$DNS_SYSTEM" ]; then
3434
if [ $? -ne 0 ]; then
3535
/etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1
3636
if [ $? -ne 0 ]; then
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restart-ftp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ 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-
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restart-mail‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ 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-
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restart-proxy‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ 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-
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restart-service‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ 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-
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
33+
send_mail="$VESTA/web/inc/mail-wrapper.php"
3834
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
3935
email=$(echo "$email" | cut -f 2 -d "'")
4036
tmpfile=$(mktemp)

‎bin/v-restart-web‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ 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-
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
37+
send_mail="$VESTA/web/inc/mail-wrapper.php"
4238
email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
4339
email=$(echo "$email" | cut -f 2 -d "'")
4440
tmpfile=$(mktemp)

‎bin/v-restore-user‎

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

6464
# Define email wrapper
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-
65+
send_mail="$VESTA/web/inc/mail-wrapper.php"
7166

7267
# Check user
7368
check_user=$(is_object_valid 'user' 'USER' "$user")

0 commit comments

Comments
 (0)