Merge remote-tracking branch 'serghey-rodin/master'

# Conflicts:
#	web/inc/i18n/tw.php

Author: clarkchentw

.gitignore

@@ -0,0 +1,4 @@
+*.tar
+*.zip
+*.gzip
+*.gz

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -13,17 +13,23 @@ Connect to your server as root via SSH
 ssh root@your.server
 ```
 
-Download the installation script
+Download the installation script, and run it:
 ```bash
-curl -O http://vestacp.com/pub/vst-install.sh
+curl http://vestacp.com/pub/vst-install.sh | bash
 ```
 
-Run it
+If the above example does not work, try this 2 step method:
+
+Download the installation script:
+```bash
+curl -O http://vestacp.com/pub/vst-install.sh
+```
+Then run it:
 ```bash
 bash vst-install.sh
 ```
 
 License
 ----------------------------
-Vesta is licensed under  [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE.txt) license
+Vesta is licensed under  [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE) license
 

README.md

@@ -0,0 +1,66 @@
+#!/bin/bash
+# info: update user notification
+# options: USER NOTIFICATION
+#
+# The function updates user notification.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+user=$1
+nid=$2
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '2' "$#" 'USER NOTIFICATION'
+validate_format 'user' 'nid'
+is_object_valid 'user' 'USER' "$user"
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Updating notification
+update_object_value 'notifications' 'NID' "$nid" '$ACK' 'yes' 2>/dev/null
+
+# Checking last notification
+if [ -e "$USER_DATA/notifications.conf" ]; then
+    if [ -z "$(grep NID= $USER_DATA/notifications.conf)" ]; then
+        notice='no'
+    fi
+    if [ -z "$(grep "ACK='no'" $USER_DATA/notifications.conf)" ]; then
+        notice='no'
+    fi
+else
+    notice='no'
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Updating notification counter
+if [ "$notice" = 'no' ]; then
+    if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then
+        sed -i "s/^TIME/NOTIFICATIONS='no'\nTIME/g" $USER_DATA/user.conf
+    else
+        update_user_value "$user" '$NOTIFICATIONS' "no"
+    fi
+fi
+
+# Logging
+log_event "$OK" "$EVENT"
+
+exit

bin/v-acknowledge-user-notification

@@ -0,0 +1,67 @@
+#!/bin/bash
+# info: activate vesta license
+# options: MODULE LICENSE
+#
+# The function activates and registers the vesta license
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+module=$(echo $1 | tr '[:lower:]' '[:upper:]')
+license=$2
+
+# Importing system environment
+source /etc/profile
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Checking arg number
+check_args '2' "$#" 'MODULE LICENSE'
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Activating license
+v_host='https://vestacp.com/checkout'
+answer=$(curl -s $v_host/activate.php?licence_key=$license&module=$module)
+check_result $? "cant' connect to vestacp.com " $E_CONNECT
+
+# Checking server answer
+if [[ "$answer" != '0' ]]; then
+    echo "Error: $module license $license is invalid"
+    exit $E_INVALID
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Updating vesta.conf
+if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then
+    echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf
+else
+    sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf
+fi
+
+# Activating sftpjail
+if [ "$module" = 'SFTPJAIL' ]; then
+    setsid $BIN/v-add-sys-sftp-jail 2>/dev/null
+fi
+
+# Logging
+log_event "$OK" "$EVENT"
+
+exit

bin/v-activate-vesta-license

@@ -2,29 +2,25 @@
 # info: add backup host
 # options: TYPE HOST USERNAME PASSWORD [PATH] [PORT]
 #
-# The function adds backup host
+# This function adds a backup host
 
 
 #----------------------------------------------------------#
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Argument defenition
+# Argument definition
 type=$1
 host=$2
 user=$3
-password=$4
+password=$4; HIDE=4
 path=${5-/backup}
 port=$6
 
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/conf/vesta.conf
 
-# Hiding password
-A4='******'
-EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
-
 # Defining ftp command function
 ftpc() {
     ftp -p -n $host $port <<EOF
@@ -102,11 +98,7 @@ if [ "$type" != 'local' ];then
     is_password_valid
     if [ "$type" = 'sftp' ]; then
         which expect >/dev/null 2>&1
-        if [ $? -ne 0 ];then
-            echo "Error: expect utility not found"
-            log_event "$E_NOTEXIST" "$EVENT"
-            exit $E_NOTEXIST
-        fi
+        check_result $? "expect command not found"  $E_NOTEXIST
     fi
 fi
 

bin/v-add-backup-host

@@ -10,7 +10,7 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Argument defenition
+# Argument definition
 user=$1
 min=$2
 hour=$3
@@ -25,7 +25,7 @@ restart=$9
 source $VESTA/func/main.sh
 source $VESTA/conf/vesta.conf
 
-# Assing new value
+# Assigning new value
 A7="$command"
 
 
@@ -72,11 +72,9 @@ sync_cron_jobs
 # Increasing cron value
 increase_user_value $user '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "added cron job $job"

bin/v-add-cron-job

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add cron reports
-# opions: user
+# options: user
 #
 # The script for enabling reports on cron tasks and administrative
 # notifications.
@@ -10,7 +10,7 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Argument defenition
+# Argument definition
 user=$1
 
 # Includes
@@ -46,9 +46,7 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "enabled cron reporting"

bin/v-add-cron-reports

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add cron reports
-# opions: NONE
+# options: NONE
 #
 # The script for enabling restart cron tasks
 

bin/v-add-cron-restart-job

@@ -9,7 +9,7 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Argument defenition
+# Argument definition
 user=admin
 
 # Includes
@@ -34,7 +34,7 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Define time somewhere at nigth
+# Define time somewhere at night
 min=$(gen_password '012345' '2')
 hour=$(gen_password '1234567' '1')
 day='*'
@@ -66,11 +66,9 @@ sync_cron_jobs
 # Increasing cron value
 increase_user_value $user '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "added cron job $job"