Merge changes from upstream

bin/v-add-dns-on-web-alias

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 # info: add dns domain or dns record based on web domain alias restart
 # options: USER DOMAIN
@@ -50,15 +49,21 @@ get_domain_values 'web'
 # Check if it a simple domain
 if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
     if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then
-        $BIN/v-add-dns-domain $user $dom_alias $IP '' '' '' '' '' $restart
+        $BIN/v-add-dns-domain \
+            $user $dom_alias $IP '' '' '' '' '' $restart > /dev/null
     fi
 else
     # Check subdomain
     sub=$(echo "$dom_alias" | cut -f1 -d . -s)
     dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
     if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then
-        $BIN/v-add-dns-domain $user $dom $IP '' '' '' '' '' $restart
+        $BIN/v-add-dns-domain \
-        $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
+            $user $dom $IP '' '' '' '' '' $restart > /dev/null
+
+        if [ $? -eq 0 ]; then
+            $BIN/v-add-dns-domain-record \
+                $user $dom "$sub" A $IP '' '' $restart
+        fi
     else
         if [ "$sub" == '*' ]; then
             rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf)
@@ -66,7 +71,8 @@ else
             rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf)
         fi
         if [ -z "$rec" ]; then
-            $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
+            $BIN/v-add-dns-domain-record \
+                 $user $dom "$sub" A $IP '' '' $restart > /dev/null
         fi
     fi
 fi
@@ -79,92 +85,3 @@ fi
 # No Logging
 
 exit
-=======
-#!/bin/bash
-# info: add dns domain or dns record based on web domain alias restart
-# options: USER DOMAIN
-#
-# The function adds dns domain or dns record based on web domain alias.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument defenition
-user=$1
-domain=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g')
-domain_idn=$(idn -t --quiet -a "$domain")
-dom_alias=$(idn -t --quiet -u "$3" )
-dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
-dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
-dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
-restart="$4"
-
-# Includes
-source $VESTA/conf/vesta.conf
-source $VESTA/func/main.sh
-source $VESTA/func/domain.sh
-
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '3' "$#" 'USER DOMAIN ALIAS'
-validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
-is_system_enabled "$DNS_SYSTEM"
-is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
-is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-# Parsing domain values
-get_domain_values 'web'
-
-# Check if it a simple domain
-if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
-    if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then
-        $BIN/v-add-dns-domain \
-            $user $dom_alias $IP '' '' '' '' '' $restart > /dev/null
-    fi
-else
-    # Check subdomain
-    sub=$(echo "$dom_alias" | cut -f1 -d . -s)
-    dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
-    if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then
-        $BIN/v-add-dns-domain \
-            $user $dom $IP '' '' '' '' '' $restart > /dev/null
-
-        if [ $? -eq 0 ]; then
-            $BIN/v-add-dns-domain-record \
-                $user $dom "$sub" A $IP '' '' $restart
-        fi
-    else
-        if [ "$sub" == '*' ]; then
-            rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf)
-        else
-            rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf)
-        fi
-        if [ -z "$rec" ]; then
-            $BIN/v-add-dns-domain-record \
-                 $user $dom "$sub" A $IP '' '' $restart > /dev/null
-        fi
-    fi
-fi
-
-
-#----------------------------------------------------------#
-#                       Vesta                              #
-#----------------------------------------------------------#
-
-# No Logging
-
-exit
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

bin/v-add-web-domain-ftp

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 # info: add ftp account for web domain.
 # options: USER DOMAIN FTP_USER FTP_PASSWORD
@@ -44,8 +43,14 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get domain values
 get_domain_values 'web'
+check_ftp_user=$(grep "^$ftp_user:" /etc/passwd)
+if [ ! -z "$check_ftp_user" ] && [ "$FTP_USER" != "$ftp_user" ]; then
+    echo "Error: ftp user $ftp_user already exists"
+    log_event "$E_EXISTS $EVENT"
+    exit $E_EXISTS
+fi
+
 if [ ! -z "$FTP_USER" ]; then
     /usr/sbin/userdel $FTP_USER
 fi
@@ -70,82 +75,3 @@ log_history "added ftp account $ftp_user for $domain"
 log_event "$OK" "$EVENT"
 
 exit
-=======
-#!/bin/bash
-# info: add ftp account for web domain.
-# options: USER DOMAIN FTP_USER FTP_PASSWORD
-#
-# The function creates addutional ftp account for web domain.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument defenition
-user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
-ftp_user=${1}_${3}
-ftp_password=$4
-
-# Includes
-source $VESTA/conf/vesta.conf
-source $VESTA/func/main.sh
-source $VESTA/func/domain.sh
-
-# Hiding password
-A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD'
-validate_format 'user' 'domain' 'ftp_user' 'ftp_password'
-is_system_enabled "$WEB_SYSTEM"
-is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
-is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-get_domain_values 'web'
-check_ftp_user=$(grep "^$ftp_user:" /etc/passwd)
-if [ ! -z "$check_ftp_user" ] && [ "$FTP_USER" != "$ftp_user" ]; then
-    echo "Error: ftp user $ftp_user already exists"
-    log_event "$E_EXISTS $EVENT"
-    exit $E_EXISTS
-fi
-
-if [ ! -z "$FTP_USER" ]; then
-    /usr/sbin/userdel $FTP_USER
-fi
-
-# Adding user
-/usr/sbin/adduser $ftp_user -g $user -s /sbin/nologin -M \
-    -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
-echo "$ftp_password" | /usr/bin/passwd "$ftp_user" --stdin &>/dev/null
-ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)"
-
-
-#----------------------------------------------------------#
-#                       Vesta                              #
-#----------------------------------------------------------#
-
-# Update config
-update_object_value 'web' 'DOMAIN' "$domain" '$FTP_USER' "$ftp_user"
-update_object_value 'web' 'DOMAIN' "$domain" '$FTP_MD5' "$ftp_md5"
-
-# Logging
-log_history "added ftp account $ftp_user for $domain"
-log_event "$OK" "$EVENT"
-
-exit
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

bin/v-list-sys-services

@@ -0,0 +1,188 @@
+#!/bin/bash
+# info: list system config
+# options: [FORMAT]
+#
+# The function for obtaining the list of system parameters.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+format=${1-shell}
+
+# Includes
+source $VESTA/conf/vesta.conf
+source $VESTA/func/main.sh
+
+get_srv_state() {
+    srv=$1
+    proc_name=${2-$1}
+
+    # Check service status
+    /etc/init.d/$srv status > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        state='running'
+
+        # Calculate cpu and memory usage
+        cpu=0
+        mem=0
+        for pid in $(/sbin/pidof $proc_name); do
+            pid_mem=$(pmap -x $pid | tail -n1 | awk '{print $3}')
+            pid_cpu=$(grep "^$pid " $tmp_file | cut -f 2 -d ' ')
+            cpu=$((cpu + pid_cpu))
+            mem=$((mem + pid_mem))
+        done
+        mem=$((mem / 1024))
+
+        # Get pid date
+        if [ ! -z $pid ] && [ -e "/proc/$pid/cmdline" ]; then
+            mtime=$(stat -c "%Y" /proc/$pid/cmdline)
+            rtime=$((ctime - mtime))
+            rtime=$((rtime  / 60))
+        fi
+    else
+        # Service is stopped
+        state='stopped'
+        mem=0
+        cpu=0
+        rtime="0"
+    fi
+}
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Save current proccess list
+tmp_file=$(mktemp)
+if [ "$format" = 'json' ]; then
+    ps aux | awk '{print $2" "$3}' | tr -d '.' > $tmp_file
+else
+    ps aux | awk '{print $2" "$3}' | cut -f 1 -d '.' > $tmp_file
+fi
+
+# Get current time
+ctime=$(date +%s)
+
+# Proxy
+service=$PROXY_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service
+    str="NAME='$service' SYSTEM='reverse proxy' STATE='$state' CPU='$cpu'"
+    str="$str MEM='$mem' RTIME='$rtime'"
+fi
+
+# Web
+service=$WEB_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    if [ "$service" == 'apache' ]; then
+        service='httpd'
+    fi
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='web server' STATE='$state' CPU='$cpu'"
+    str="$str MEM='$mem' RTIME='$rtime'"
+
+fi
+
+# DNS
+service=$DNS_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    if [ "$service" == 'bind' ]; then
+        service='named'
+    fi
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='dns server' STATE='$state' CPU='$cpu'"
+    str="$str MEM='$mem' RTIME='$rtime'"
+fi
+
+# MAIL
+service=$MAIL_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='mail server' STATE='$state' CPU='$cpu'"
+    str="$str MEM='$mem' RTIME='$rtime'"
+fi
+
+# IMAP
+service=$IMAP_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='pop/imap server' STATE='$state'"
+    str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+fi
+
+# ANTIVIRUS
+service=$ANTIVIRUS_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    if [ "$ANTIVIRUS_SYSTEM" = 'clamav' ]; then
+        service='clamd'
+    fi
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='email antivirus' STATE='$state'"
+    str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+fi
+
+# ANTISPAM
+service=$ANTISPAM_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service spamd
+    str="$str\nNAME='$service' SYSTEM='email antispam' STATE='$state'"
+    str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+fi
+
+# DB
+service=$DB_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    for db in ${DB_SYSTEM//,/ }; do
+        service="$db"
+        if [ "$service" == 'mysql' ] && [ ! -e "/etc/init.d/$service" ]; then
+            service='mysqld'
+        fi
+        get_srv_state $service
+        str="$str\nNAME='$service' SYSTEM='database server' STATE='$state'"
+        str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+    done
+fi
+
+# FTP
+service=$FTP_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='ftp server' STATE='$state' CPU='$cpu'"
+    str="$str MEM='$mem' RTIME='$rtime'"
+fi
+
+# CRON
+service=$CRON_SYSTEM
+if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
+    get_srv_state $service
+    str="$str\nNAME='$service' SYSTEM='job scheduler' STATE='$state'"
+    str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+fi
+
+# Defining config
+echo -e "$str" > $tmp_file
+conf=$tmp_file
+
+# Defining fileds to select
+fields="\$NAME \$SYSTEM \$STATE \$CPU \$MEM \$RTIME"
+
+# Listing services
+case $format in 
+    json)   json_list ;;
+    plain)  nohead=1; shell_list ;;
+    shell)  fields='$NAME $STATE $CPU $MEM $RTIME'
+            shell_list | column -t ;;
+    *)      check_args '1' '0' 'USER [FORMAT]'
+esac
+
+rm -f $tmp_file
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit

bin/v-list-user-stats

@@ -32,6 +32,9 @@ is_object_valid 'user' 'USER' "$user"
 
 # Defining config
 conf=$USER_DATA/stats.log
+if [ ! -e "$conf" ]; then
+    touch $conf
+fi
 
 # Defining fileds to select
 fields="\$DATE \$TIME \$PACKAGE \$IP_OWNED \$DISK_QUOTA \$U_DISK \$U_DISK_DIRS"

bin/v-list-users-stats

@@ -29,6 +29,9 @@ check_args '0' "$#" '[FORMAT]'
 
 # Defining config
 conf=$VESTA/data/users/admin/overall_stats.log
+if [ ! -e "$conf" ]; then
+    touch $conf
+fi
 
 # Defining fileds to select
 fields="\$DATE \$TIME \$PACKAGE \$IP_OWNED \$DISK_QUOTA \$U_DISK \$U_DISK_DIRS"

bin/v-rebuild-user

@@ -143,7 +143,7 @@ fi
 if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
     touch $USER_DATA/db.conf
     chmod 660 $USER_DATA/db.conf
-    echo "v_update_datbases_disk $user" >> $VESTA/data/queue/disk.pipe
+    echo "v-update-datbases-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
 if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then

bin/v-rebuild-web-domains

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 # info: rebuild dns domains
 # options: USER [RESTART]
@@ -79,7 +78,7 @@ for domain in $(shell_list) ; do
 
     chmod 551 $HOMEDIR/$user/web/$domain
     chmod 771 $HOMEDIR/$user/web/$domain/private
-    chmod 771 $HOMEDIR/$user/web/$domain/cgi-bin
+    chmod 751 $HOMEDIR/$user/web/$domain/cgi-bin
     chmod 771 $HOMEDIR/$user/web/$domain/public_html
     chmod 771 $HOMEDIR/$user/web/$domain/public_shtml
     chmod 771 $HOMEDIR/$user/web/$domain/document_errors
@@ -311,317 +310,3 @@ fi
 log_event "$OK" "$EVENT"
 
 exit
-=======
-#!/bin/bash
-# info: rebuild dns domains
-# options: USER [RESTART]
-#
-# The function rebuilds BIND configuration files for all dns domains.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument defenition
-user=$1
-restart=$2
-
-# Includes
-source $VESTA/conf/vesta.conf
-source $VESTA/func/main.sh
-source $VESTA/func/domain.sh
-source $VESTA/func/ip.sh
-
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '1' "$#" 'USER [RESTART]'
-validate_format 'user'
-is_system_enabled "$WEB_SYSTEM"
-is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-user_domains=0
-user_ssl=0
-user_aliases=0
-suspended_web=0
-
-# Clean up old config
-rm -f $HOMEDIR/$user/conf/tmp_*.conf
-
-# Defining config
-conf=$USER_DATA/web.conf
-fields='$DOMAIN'
-nohead=1
-
-# Starting loop
-for domain in $(shell_list) ; do
-
-    # Rebuilding directories
-    mkdir -p $HOMEDIR/$user/web/$domain \
-        $HOMEDIR/$user/web/$domain/public_html \
-        $HOMEDIR/$user/web/$domain/public_shtml \
-        $HOMEDIR/$user/web/$domain/document_errors \
-        $HOMEDIR/$user/web/$domain/cgi-bin \
-        $HOMEDIR/$user/web/$domain/private \
-        $HOMEDIR/$user/web/$domain/stats \
-        $HOMEDIR/$user/web/$domain/logs
-    if [ ! -e "$HOMEDIR/$user/web/$domain/logs/$domain.log" ]; then
-        ln -s /var/log/httpd/domains/$domain.error.log \
-            $HOMEDIR/$user/web/$domain/logs/$domain.log
-    fi
-    if [ ! -e "$HOMEDIR/$user/web/$domain/logs/$domain.error.log" ]; then
-        ln -s /var/log/httpd/domains/$domain.error.log \
-            $HOMEDIR/$user/web/$domain/logs/$domain.error.log
-    fi
-    if [ -e "$WEBTPL/skel/document_errors/" ]; then
-        cp -r $WEBTPL/skel/document_errors/ $HOMEDIR/$user/web/$domain/
-    fi
-
-    touch /var/log/httpd/domains/$domain.bytes \
-          /var/log/httpd/domains/$domain.log \
-          /var/log/httpd/domains/$domain.error.log
-
-    chmod 551 $HOMEDIR/$user/web/$domain
-    chmod 771 $HOMEDIR/$user/web/$domain/private
-    chmod 751 $HOMEDIR/$user/web/$domain/cgi-bin
-    chmod 771 $HOMEDIR/$user/web/$domain/public_html
-    chmod 771 $HOMEDIR/$user/web/$domain/public_shtml
-    chmod 771 $HOMEDIR/$user/web/$domain/document_errors
-    chmod 551 $HOMEDIR/$user/web/$domain/stats
-    chmod 551 $HOMEDIR/$user/web/$domain/logs
-    chmod 640 /var/log/httpd/domains/$domain.*
-
-    chown $user:$user $HOMEDIR/$user/web/$domain
-    chown $user:$user $HOMEDIR/$user/web/$domain/private
-    chown $user:$user $HOMEDIR/$user/web/$domain/cgi-bin
-    chown $user:$user $HOMEDIR/$user/web/$domain/public_html
-    chown $user:$user $HOMEDIR/$user/web/$domain/public_shtml
-    chown -R $user:$user $HOMEDIR/$user/web/$domain/document_errors
-    chown root:$user /var/log/httpd/domains/$domain.*
-    chown root:apache $conf
-
-    # Parsing domain values
-    domain_idn=$(idn -t --quiet -a "$domain")
-    get_domain_values 'web'
-
-    # Preparing domain values for the template substitution
-    upd_web_domain_values
-
-    # Adding domain to the tmp_httpd.conf
-    tpl_file="$WEBTPL/apache_$TPL.tpl"
-    conf="$HOMEDIR/$user/conf/web/tmp_httpd.conf"
-    add_web_config
-    chown root:apache $conf
-    chmod 640 $conf
-
-    # Running template trigger
-    if [ -x $WEBTPL/apache_$TPL.sh ]; then
-        $WEBTPL/apache_$TPL.sh $user $domain $ip $HOMEDIR $docroot
-    fi
-
-    # Checking aliases
-    if [ ! -z "$ALIAS" ]; then
-        aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
-        user_aliases=$((user_aliases + aliases))
-    fi
-
-    # Checking stats
-    if [ ! -z "$STATS" ]; then
-        cat $WEBTPL/$STATS.tpl |\
-            sed -e "s/%ip%/$ip/g" \
-                -e "s/%web_port%/$WEB_PORT/g" \
-                -e "s/%web_ssl_port%/$WEB_SSL_PORT/g" \
-                -e "s/%proxy_port%/$PROXY_PORT/g" \
-                -e "s/%proxy_ssl_port%/$PROXY_SSL_PORT/g" \
-                -e "s/%domain_idn%/$domain_idn/g" \
-                -e "s/%domain%/$domain/g" \
-                -e "s/%user%/$user/g" \
-                -e "s/%home%/${HOMEDIR////\/}/g" \
-                -e "s/%alias%/${aliases//,/ }/g" \
-                -e "s/%alias_idn%/${aliases_idn//,/ }/g" \
-                > $HOMEDIR/$user/conf/web/$STATS.$domain.conf
-
-        if [ "$STATS" == 'awstats' ]; then
-            if [ ! -e "/etc/awstats/$STATS.$domain.conf" ]; then
-                ln -s $HOMEDIR/$user/conf/web/$STATS.$domain.conf /etc/awstats/
-            fi
-        fi
-
-        webstats="$BIN/v-update-web-domain-stat $user $domain"
-        check_webstats=$(grep "$webstats" $VESTA/data/queue/webstats.pipe)
-        if [ -z "$check_webstats" ]; then
-            echo "$webstats" >> $VESTA/data/queue/webstats.pipe
-        fi
-
-        if [ ! -z "$STATS_USER" ]; then
-            # Definining statistic dir
-            stats_dir="$HOMEDIR/$user/web/$domain/stats"
-
-            # Adding htaccess file
-            echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess
-            echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess
-            echo "AuthType Basic" >> $stats_dir/.htaccess
-            echo "Require valid-user" >> $stats_dir/.htaccess
-
-            # Generating htaccess user and password
-            echo "$STATS_USER:$STATS_CRYPT" > $stats_dir/.htpasswd
-        fi
-    fi
-
-    # Checking ssl
-    if [ "$SSL" = 'yes' ]; then
-        # Adding domain to the shttpd.conf
-        conf="$HOMEDIR/$user/conf/web/tmp_shttpd.conf"
-        tpl_file="$WEBTPL/apache_$TPL.stpl"
-        add_web_config
-        chown root:apache $conf
-        chmod 640 $conf
-
-        cp -f $USER_DATA/ssl/$domain.crt \
-            $HOMEDIR/$user/conf/web/ssl.$domain.crt
-        cp -f $USER_DATA/ssl/$domain.key \
-            $HOMEDIR/$user/conf/web/ssl.$domain.key
-        cp -f $USER_DATA/ssl/$domain.pem \
-            $HOMEDIR/$user/conf/web/ssl.$domain.pem
-        if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-            cp -f $USER_DATA/ssl/$domain.ca \
-                $HOMEDIR/$user/conf/web/ssl.$domain.ca
-        fi
-
-        # Running template trigger
-        if [ -x $WEBTPL/apache_$TPL.sh ]; then
-            $WEBTPL/apache_$TPL.sh $user $domain $ip $HOMEDIR $sdocroot
-        fi
-
-        user_ssl=$((user_ssl + 1))
-        ssl_change='yes'
-    fi
-
-    # Checking nginx
-    if [ ! -z "$NGINX" ]; then
-        tpl_file="$WEBTPL/nginx_$NGINX.tpl"
-        conf="$HOMEDIR/$user/conf/web/tmp_nginx.conf"
-        add_web_config
-        chown root:nginx $conf
-        chmod 640 $conf
-
-        if [ "$SSL" = 'yes' ]; then
-            tpl_file="$WEBTPL/nginx_$NGINX.stpl"
-            conf="$HOMEDIR/$user/conf/web/tmp_snginx.conf"
-            add_web_config
-            chown root:nginx $conf
-            chmod 640 $conf
-        fi
-	ngix_change='yes'
-    fi
-    if [ "$SUSPENDED" = 'yes' ]; then
-        suspended_web=$((suspended_web + 1))
-    fi
-    user_domains=$((user_domains + 1))
-
-    # Checking ftp
-    if [ ! -z "$FTP_USER" ]; then
-        if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then
-            /usr/sbin/adduser $FTP_USER -g $user -s /sbin/nologin -M \
-                -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
-
-            shadow='/etc/shadow'
-            shdw=$(grep "^$FTP_USER:" $shadow)
-            shdw3=$(echo "$shdw" | cut -f3 -d :)
-            shdw4=$(echo "$shdw" | cut -f4 -d :)
-            shdw5=$(echo "$shdw" | cut -f5 -d :)
-            shdw6=$(echo "$shdw" | cut -f6 -d :)
-            shdw7=$(echo "$shdw" | cut -f7 -d :)
-            shdw8=$(echo "$shdw" | cut -f8 -d :)
-            shdw9=$(echo "$shdw" | cut -f9 -d :)
-            chmod u+w $shadow
-            sed -i "/^$FTP_USER:*/d" $shadow
-            shdw_str="$FTP_USER:$FTP_MD5:$shdw3:$shdw4:$shdw5:$shdw6"
-            shdw_str="$shdw_str:$shdw7:$shdw8:$shdw9"
-            echo "$shdw_str" >> $shadow
-            chmod u-w $shadow
-        fi
-    fi
-
-done
-
-# Renaming tmp config
-tmp_conf="$HOMEDIR/$user/conf/web/tmp_httpd.conf"
-conf="$HOMEDIR/$user/conf/web/httpd.conf"
-if [ -e "$tmp_conf" ]; then
-    mv $tmp_conf $conf
-fi
-
-# Checking include in main httpd.conf
-main_conf='/etc/httpd/conf.d/vesta.conf'
-main_conf_check=$(grep "$conf" $main_conf )
-if [ ! -z "$domain" ] && [ -z "$main_conf_check" ]; then
-    echo "Include $conf" >>$main_conf
-fi
-
-# Checking ssl 
-if [ "$ssl_change" = 'yes' ]; then
-    tmp_conf="$HOMEDIR/$user/conf/web/tmp_shttpd.conf"
-    conf="$HOMEDIR/$user/conf/web/shttpd.conf"
-    mv $tmp_conf $conf
-
-    # Checking include in main httpd.conf
-    main_conf_check=$(grep "$conf" $main_conf )
-    if [ -z "$main_conf_check" ]; then
-        echo "Include $conf" >>$main_conf
-    fi
-fi
-
-# Checking nginx
-if [ "$ngix_change" = 'yes' ]; then
-    nginx_conf='/etc/nginx/conf.d/vesta_users.conf'
-    tmp_conf="$HOMEDIR/$user/conf/web/tmp_nginx.conf"
-    conf="$HOMEDIR/$user/conf/web/nginx.conf"
-    mv $tmp_conf $conf
-
-    nginx_conf_check=$(grep "$conf" $nginx_conf )
-    if [ -z "$nginx_conf_check" ]; then
-        echo "include $conf;" >>$nginx_conf
-    fi
-
-    # Checking ssl for nginx
-    if [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_snginx.conf"
-        conf="$HOMEDIR/$user/conf/web/snginx.conf"
-        mv $tmp_conf $conf
-        nginx_conf_check=$(grep "$conf" $nginx_conf )
-        if [ -z "$nginx_conf_check" ]; then
-            echo "include $conf;" >>$nginx_conf
-        fi
-    fi
-fi
-
-#----------------------------------------------------------#
-#                       Vesta                              #
-#----------------------------------------------------------#
-
-# Updating counters
-update_user_value "$user" '$SUSPENDED_WEB' "$suspended_web"
-update_user_value "$user" '$U_WEB_DOMAINS' "$user_domains"
-update_user_value "$user" '$U_WEB_SSL' "$user_ssl"
-update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
-
-# Restart web server
-if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
-fi
-
-# Logging
-log_event "$OK" "$EVENT"
-
-exit
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

bin/v-restart-cron

@@ -12,7 +12,6 @@
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
-EVENT=${1-$EVENT}
 
 
 #----------------------------------------------------------#
@@ -21,11 +20,10 @@ EVENT=${1-$EVENT}
 
 # Parsing config / or just source config
 if [ "$CRON_SYSTEM" = 'crond' ]; then
-    /etc/init.d/crond 'reload' &>/dev/null
+    /etc/init.d/crond 'reload' >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        /etc/init.d/crond 'restart' &>/dev/null
+        /etc/init.d/crond 'restart' >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     fi

bin/v-restart-dns

@@ -12,18 +12,17 @@
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
-EVENT=${1-$EVENT}
+
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 if [ "$DNS_SYSTEM" = 'bind' ]; then
-    /etc/init.d/named reload &>/dev/null
+    /etc/init.d/named reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        /etc/init.d/named restart &>/dev/null
+        /etc/init.d/named restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     fi

bin/v-restart-mail

@@ -12,18 +12,17 @@
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
-EVENT=${1-$EVENT}
+
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 if [ "$MAIL_SYSTEM" = 'exim' ]; then
-    /etc/init.d/exim reload &>/dev/null
+    /etc/init.d/exim reload  >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        /etc/init.d/exim restart &>/dev/null
+        /etc/init.d/exim restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     fi

bin/v-restart-service

@@ -0,0 +1,42 @@
+#!/bin/bash
+# info: restart service
+# options: service
+#
+# The function restarts system service.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+service=$1
+
+# Includes
+source $VESTA/func/main.sh
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '1' "$#" 'SERVICE'
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+if [ -x "/etc/init.d/$service" ]; then
+    /etc/init.d/$service restart >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        exit $E_RESTART
+    fi
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit

bin/v-restart-web

@@ -1,8 +1,8 @@
 #!/bin/bash
-# info: restart dns service
+# info: restart web services
 # options: NONE
 #
-# The function tells BIND service to reload dns zone files.
+# The function reloads web server configuration.
 
 
 #----------------------------------------------------------#
@@ -12,41 +12,37 @@
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
-EVENT=${1-$EVENT}
+
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 if [ "$WEB_SYSTEM" = 'apache' ]; then
-    /etc/init.d/httpd status &>/dev/null
+    /etc/init.d/httpd status >/dev/null 2>&1
     if [ $? -eq 0 ]; then
-        /etc/init.d/httpd graceful &>/dev/null
+        /etc/init.d/httpd graceful >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     else
-        /etc/init.d/httpd start &>/dev/null
+        /etc/init.d/httpd start >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     fi
 fi
 
 if [ "$PROXY_SYSTEM" = 'nginx' ]; then
-    /etc/init.d/nginx status &>/dev/null
+    /etc/init.d/nginx status >/dev/null 2>&1
     if [ $? -eq 0 ]; then
-        /etc/init.d/nginx reload &>/dev/null
+        /etc/init.d/nginx reload >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     else
-        /etc/init.d/nginx start &>/dev/null
+        /etc/init.d/nginx start >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            log_event "$E_RESTART" "$EVENT"
             exit $E_RESTART
         fi
     fi

bin/v-start-service

@@ -0,0 +1,42 @@
+#!/bin/bash
+# info: start service
+# options: service
+#
+# The function starts system service.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+service=$1
+
+# Includes
+source $VESTA/func/main.sh
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '1' "$#" 'SERVICE'
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+if [ -x "/etc/init.d/$service" ]; then
+    /etc/init.d/$service start >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        exit $E_RESTART
+    fi
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit

bin/v-stop-service

@@ -0,0 +1,42 @@
+#!/bin/bash
+# info: stop service
+# options: service
+#
+# The function stops system service.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+service=$1
+
+# Includes
+source $VESTA/func/main.sh
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '1' "$#" 'SERVICE'
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+if [ -x "/etc/init.d/$service" ]; then
+    /etc/init.d/$service stop >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        exit $E_RESTART
+    fi
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit

bin/v-update-user-stats

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 # info: update user statistics
 # options: USER
@@ -69,7 +68,7 @@ TOTAL_U_BACKUPS=0
 for user in $user_list; do 
     USER_DATA=$VESTA/data/users/$user
     source $USER_DATA/user.conf
-    next_month=$(date +'%m/01' -d '+ 1 month')
+    next_month=$(date +'%m/01/%y' -d '+ 1 month')
     DATE=$(date -d "$next_month -1day" +%F)
 
     # Compiling report string
@@ -168,174 +167,3 @@ fi
 log_event "$OK" "$EVENT"
 
 exit
-=======
-#!/bin/bash
-# info: update user statistics
-# options: USER
-#
-# Function logs user parameters into statistics database.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument defenition
-user=$1
-
-# Importing system enviroment  as we run this script 
-#       mostly by cron wich not read it by itself
-source /etc/profile
-
-# Includes
-source $VESTA/conf/vesta.conf
-source $VESTA/func/main.sh
-source $VESTA/func/domain.sh
-
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '0' "$#" 'USER'
-if [ ! -z "$user" ]; then
-    validate_format 'user'
-    is_object_valid 'user' 'USER' "$user"
-fi
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-# Creating user_list
-if [ -z "$user" ]; then
-    user_list=$(ls $VESTA/data/users)
-else
-    user_list="$user"
-fi
-
-# Reset overal statistics
-TOTAL_IP_OWNED=0
-TOTAL_U_DISK=0
-TOTAL_U_DISK_DIRS=0
-TOTAL_U_DISK_WEB=0
-TOTAL_U_DISK_MAIL=0
-TOTAL_U_DISK_DB=0
-TOTAL_U_BANDWIDTH=0
-TOTAL_U_WEB_DOMAINS=0
-TOTAL_U_WEB_SSL=0
-TOTAL_U_WEB_ALIASES=0
-TOTAL_U_DNS_DOMAINS=0
-TOTAL_U_DNS_RECORDS=0
-TOTAL_U_MAIL_DOMAINS=0
-TOTAL_U_MAIL_DKIM=0
-TOTAL_U_MAIL_ACCOUNTS=0
-TOTAL_U_DATABASES=0
-TOTAL_U_CRON_JOBS=0
-TOTAL_U_BACKUPS=0
-
-# Updating user stats
-for user in $user_list; do 
-    USER_DATA=$VESTA/data/users/$user
-    source $USER_DATA/user.conf
-    next_month=$(date +'%m/01/%y' -d '+ 1 month')
-    DATE=$(date -d "$next_month -1day" +%F)
-
-    # Compiling report string
-    s="DATE='$DATE' TIME='$TIME' PACKAGE='$PACKAGE' IP_OWNED='$IP_OWNED'" 
-    s="$s DISK_QUOTA='$DISK_QUOTA' U_DISK='$U_DISK' U_DISK_DIRS='$U_DISK_DIRS'"
-    s="$s U_DISK_WEB='$U_DISK_WEB' U_DISK_MAIL='$U_DISK_MAIL'" 
-    s="$s U_DISK_DB='$U_DISK_DB' BANDWIDTH='$BANDWIDTH'"
-    s="$s U_BANDWIDTH='$U_BANDWIDTH' U_WEB_DOMAINS='$U_WEB_DOMAINS'"
-    s="$s U_WEB_SSL='$U_WEB_SSL' U_WEB_ALIASES='$U_WEB_ALIASES'"
-    s="$s U_DNS_DOMAINS='$U_DNS_DOMAINS' U_DNS_RECORDS='$U_DNS_RECORDS'"
-    s="$s U_MAIL_DOMAINS='$U_MAIL_DOMAINS' U_MAIL_DKIM='$U_MAIL_DKIM'"
-    s="$s U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS' U_DATABASES='$U_DATABASES'"
-    s="$s U_CRON_JOBS='$U_CRON_JOBS' U_BACKUPS='$U_BACKUPS'"
-
-    # Updating user stats log
-    stats="$USER_DATA/stats.log"
-    if [ -e "$stats" ]; then
-        # Checking dublicates
-        check_month=$(grep -n "DATE='$DATE'" $stats|cut -f 1 -d :)
-        if [ -z "$check_month" ]; then
-            # Updating as there no dublicates
-            echo "$s" >> $stats
-            chmod 660 $stats
-        else
-            # Replacing string with new data
-            sed -i "$check_month s/.*/$s/" $stats
-        fi
-    else
-        # Creating stats log
-        echo "$s" >$stats
-        chmod 660 $stats
-    fi
-
-    # Increase overall counters
-    TOTAL_IP_OWNED=$((TOTAL_IP_OWNED + IP_OWNED))
-    TOTAL_U_DISK=$((TOTAL_U_DISK + U_DISK))
-    TOTAL_U_DISK_DIRS=$((TOTAL_U_DISK_DIRS + U_DISK_DIRS))
-    TOTAL_U_DISK_WEB=$((TOTAL_U_DISK_WEB + U_DISK_WEB))
-    TOTAL_U_DISK_MAIL=$((TOTAL_U_DISK_MAIL + U_DISK_MAIL))
-    TOTAL_U_DISK_DB=$((TOTAL_U_DISK_DB + U_DISK_DB))
-    TOTAL_U_BANDWIDTH=$((TOTAL_U_BANDWIDTH + U_BANDWIDTH))
-    TOTAL_U_WEB_DOMAINS=$((TOTAL_U_WEB_DOMAINS + U_WEB_DOMAINS))
-    TOTAL_U_WEB_SSL=$((TOTAL_U_WEB_SSL + U_WEB_SSL))
-    TOTAL_U_WEB_ALIASES=$((TOTAL_U_WEB_ALIASES + U_WEB_ALIASES))
-    TOTAL_U_DNS_DOMAINS=$((TOTAL_U_DNS_DOMAINS + U_DNS_DOMAINS))
-    TOTAL_U_DNS_RECORDS=$((TOTAL_U_DNS_RECORDS + U_DNS_RECORDS))
-    TOTAL_U_MAIL_DOMAINS=$((TOTAL_U_MAIL_DOMAINS + U_MAIL_DOMAINS))
-    TOTAL_U_MAIL_DKIM=$((TOTAL_U_MAIL_DKIM + U_MAIL_DKIM))
-    TOTAL_U_MAIL_ACCOUNTS=$((TOTAL_U_MAIL_ACCOUNTS + U_MAIL_ACCOUNTS))
-    TOTAL_U_DATABASES=$((TOTAL_U_DATABASES + U_DATABASES))
-    TOTAL_U_CRON_JOBS=$((TOTAL_U_CRON_JOBS + U_CRON_JOBS))
-    TOTAL_U_BACKUPS=$((TOTAL_U_BACKUPS + U_BACKUPS))
-
-done
-
-# Updating overall stats
-stats="$VESTA/data/users/admin/overall_stats.log"
-
-s="DATE='$DATE' TIME='$TIME' PACKAGE='default' IP_OWNED='$TOTAL_IP_OWNED'" 
-s="$s DISK_QUOTA='0' U_DISK='$TOTAL_U_DISK' U_DISK_DIRS='$TOTAL_U_DISK_DIRS'"
-s="$s U_DISK_WEB='$TOTAL_U_DISK_WEB' U_DISK_MAIL='$TOTAL_U_DISK_MAIL'" 
-s="$s U_DISK_DB='$TOTAL_U_DISK_DB' BANDWIDTH='0'"
-s="$s U_BANDWIDTH='$TOTAL_U_BANDWIDTH' U_WEB_DOMAINS='$TOTAL_U_WEB_DOMAINS'"
-s="$s U_WEB_SSL='$TOTAL_U_WEB_SSL' U_WEB_ALIASES='$TOTAL_U_WEB_ALIASES'"
-s="$s U_DNS_DOMAINS='$TOTAL_U_DNS_DOMAINS'"
-s="$s U_DNS_RECORDS='$TOTAL_U_DNS_RECORDS'"
-s="$s U_MAIL_DOMAINS='$TOTAL_U_MAIL_DOMAINS' U_MAIL_DKIM='$TOTAL_U_MAIL_DKIM'"
-s="$s U_MAIL_ACCOUNTS='$TOTAL_U_MAIL_ACCOUNTS'"
-s="$s  U_DATABASES='$TOTAL_U_DATABASES'"
-s="$s U_CRON_JOBS='$TOTAL_U_CRON_JOBS' U_BACKUPS='$TOTAL_U_BACKUPS'"
-
-if [ -e "$stats" ]; then
-    # Checking dublicates
-    check_month=$(grep -n "DATE='$DATE'" $stats|cut -f 1 -d :)
-    if [ -z "$check_month" ]; then
-        # Updating as there no dublicates
-        echo "$s" >> $stats
-        chmod 660 $stats
-    else
-        # Replacing string with new data
-        sed -i "$check_month s/.*/$s/" $stats
-    fi
-else
-    # Creating stats log
-    echo "$s" >$stats
-    chmod 660 $stats
-fi
-
-
-
-#----------------------------------------------------------#
-#                       Vesta                              #
-#----------------------------------------------------------#
-
-# Logging
-log_event "$OK" "$EVENT"
-
-exit
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

func/domain.sh

@@ -49,9 +49,9 @@ is_domain_new() {
     type="$1"
     dom=${2-$domain}
 
-    web=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
+    web=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
-    dns=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
+    dns=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
-    mail=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
+    mail=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
 
     # Check web domain
     if [ ! -z "$web" ] && [ "$type" == 'web' ]; then
@@ -101,10 +101,10 @@ is_domain_new() {
     # Check web aliases
     web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf)
     if [ ! -z "$web_alias" ]; then
-        c1=$(grep "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
+        c1=$(grep -H "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
-        c2=$(grep "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
+        c2=$(grep -H "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
-        c3=$(grep ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
+        c3=$(grep -H ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
-        c4=$(grep ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
+        c4=$(grep -H ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
         if [ ! -z "$c1" ] && [ "$type" == "web"  ]; then
             echo "Error: domain $dom exist"
             log_event "$E_EXISTS" "$EVENT"

func/main.sh

@@ -64,7 +64,7 @@ log_history() {
 
     touch $log
     if [ '99' -lt "$(wc -l $log |cut -f 1 -d ' ')" ]; then
-        tail -n 99 $log > $log.moved
+        tail -n 49 $log > $log.moved
         mv -f $log.moved $log
         chmod 660 $log
     fi

install/0.9.7/rhel/roundcube-driver.php

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 
 /**
@@ -26,25 +25,31 @@ class rcube_vesta_password
             $vesta_port = '8083';
         }
 
-        $request  = 'email='.$_SESSION['username'].'&';
+        $postvars = array(
-        $request .= 'password='.$curpass.'&';
+          'email' => $_SESSION['username'],
-        $request .= 'new='.$passwd.'&';
+          'password' => $curpass,
+          'new' => $passwd
+        );
+
+        $postdata = http_build_query($postvars);
+
+        $send  = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
+        $send .= 'Host: ' . $vesta_host . PHP_EOL;
+        $send .= 'User-Agent: PHP Script' . PHP_EOL;
+        $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
+        $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
+        $send .= 'Connection: close' . PHP_EOL;
+        $send .= PHP_EOL;
+        $send .= $postdata . PHP_EOL . PHP_EOL;
+
+        $fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
+        fputs($fp, $send);
+        $result = fread($fp, 2048);
+        fclose($fp);
 
 
-        $context = stream_context_create(array(
+        if(strpos($result, 'ok') && !strpos($html, 'error'))
-            'http' => array(
+        {
-                'method' => 'POST',
-                'header' => 'Content-Type: application/x-www-form-urlencoded' . PHP_EOL,
-                'content' => $request,
-            ),
-        ));
-
-        $result = file_get_contents(
-            $file = "https://".$vesta_host.":".$vesta_port."/reset/mail/?",
-            $use_include_path = false,
-            $context);
-
-        if ($result == 'ok'){
             return PASSWORD_SUCCESS;
         }
         else {
@@ -53,65 +58,3 @@ class rcube_vesta_password
 
     }
 }
-=======
-<?php
-
-/**
- * Vesta Control Panel Password Driver
- *
- * @version 1.0
- * @author Serghey Rodin <skid@vestacp.com>
- */
-
-class rcube_vesta_password
-{
-    function save($curpass, $passwd)
-    {
-        $rcmail = rcmail::get_instance();
-        $vesta_host = $rcmail->config->get('password_vesta_host');
-
-        if (empty($vesta_host))
-        {
-            $vesta_host = 'localhost';
-        }
-
-        $vesta_port = $rcmail->config->get('password_vesta_port');
-        if (empty($vesta_port))
-        {
-            $vesta_port = '8083';
-        }
-
-        $postvars = array(
-          'email' => $_SESSION['username'],
-          'password' => $curpass,
-          'new' => $passwd
-        );
-
-        $postdata = http_build_query($postvars);
-
-        $send  = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
-        $send .= 'Host: ' . $vesta_host . PHP_EOL;
-        $send .= 'User-Agent: PHP Script' . PHP_EOL;
-        $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
-        $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
-        $send .= 'Connection: close' . PHP_EOL;
-        $send .= PHP_EOL;
-        $send .= $postdata . PHP_EOL . PHP_EOL;
-
-        $fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
-        fputs($fp, $send);
-        $result = fread($fp, 2048);
-        fclose($fp);
-
-
-        if(strpos($result, 'ok') && !strpos($html, 'error'))
-        {
-            return PASSWORD_SUCCESS;
-        }
-        else {
-            return PASSWORD_ERROR;
-        }
-
-    }
-}
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

install/0.9.7/rhel/templates/web/apache_phpcgi.stpl

@@ -1,34 +1,35 @@
-<VirtualHost %ip%:%web_ssl_port%>
+<VirtualHost %ip%:%web_ssl_port%>
-
+
-    ServerName %domain_idn%
+    ServerName %domain_idn%
-    %alias_string%
+    %alias_string%
-    ServerAdmin %email%
+    ServerAdmin %email%
-    DocumentRoot %sdocroot%
+    DocumentRoot %sdocroot%
-    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
-    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
-    SuexecUserGroup %user% %group%
+    SuexecUserGroup %user% %group%
-    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
+    CustomLog /var/log/httpd/domains/%domain%.log combined
-    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
-    <Directory %sdocroot%>
+    <Directory %sdocroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
+        SSLRequireSSL
-        SSLRequireSSL
+        AllowOverride All
-        Options +Includes -Indexes %cgi_option%
+        Options +Includes -Indexes +ExecCGI
-        php_admin_flag engine off
+        Action phpcgi-script /cgi-bin/php
-        Action phpcgi-script /cgi-bin/php
+        <Files *.php>
-        AddHandler phpcgi-script .php
+            SetHandler phpcgi-script
-    </Directory>
+        </Files>
-    <Directory %home%/%user%/web/%domain%/stats>
+    </Directory>
-        AllowOverride All
+    <Directory %home%/%user%/web/%domain%/stats>
-    </Directory>
+        AllowOverride All
-    SSLEngine on
+    </Directory>
-    SSLVerifyClient none
+    SSLEngine on
-    SSLCertificateFile %ssl_crt%
+    SSLVerifyClient none
-    SSLCertificateKeyFile %ssl_key%
+    SSLCertificateFile %ssl_crt%
-    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+    SSLCertificateKeyFile %ssl_key%
-
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+
-
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
-</VirtualHost>
+
-
+</VirtualHost>
+

install/0.9.7/rhel/templates/web/apache_phpcgi.tpl

@@ -1,27 +1,28 @@
-<VirtualHost %ip%:%web_port%>
+<VirtualHost %ip%:%web_port%>
-
+
-    ServerName %domain_idn%
+    ServerName %domain_idn%
-    %alias_string%
+    %alias_string%
-    ServerAdmin %email%
+    ServerAdmin %email%
-    DocumentRoot %docroot%
+    DocumentRoot %docroot%
-    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
-    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
-    SuexecUserGroup %user% %group%
+    SuexecUserGroup %user% %group%
-    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
+    CustomLog /var/log/httpd/domains/%domain%.log combined
-    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
-    <Directory %docroot%>
+    <Directory %docroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
+        AllowOverride All
-        Options +Includes -Indexes %cgi_option%
+        Options +Includes -Indexes +ExecCGI
-        php_admin_flag engine off
+        Action phpcgi-script /cgi-bin/php
-        Action phpcgi-script /cgi-bin/php
+        <Files *.php>
-        AddHandler phpcgi-script .php
+            SetHandler phpcgi-script
-    </Directory>
+        </Files>
-    <Directory %home%/%user%/web/%domain%/stats>
+    </Directory>
-        AllowOverride All
+    <Directory %home%/%user%/web/%domain%/stats>
-    </Directory>
+        AllowOverride All
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
+    </Directory>
-
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
-</VirtualHost>
+
-
+</VirtualHost>
+

install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl

@@ -1,35 +1,36 @@
-<VirtualHost %ip%:%web_ssl_port%>
+<VirtualHost %ip%:%web_ssl_port%>
-
+
-    ServerName %domain_idn%
+    ServerName %domain_idn%
-    %alias_string%
+    %alias_string%
-    ServerAdmin %email%
+    ServerAdmin %email%
-    DocumentRoot %sdocroot%
+    DocumentRoot %sdocroot%
-    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
-    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
-    SuexecUserGroup %user% %group%
+    SuexecUserGroup %user% %group%
-    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
+    CustomLog /var/log/httpd/domains/%domain%.log combined
-    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
-    <Directory %sdocroot%>
+    <Directory %sdocroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
+        SSLRequireSSL
-        SSLRequireSSL
+        AllowOverride All
-        Options +Includes -Indexes %cgi_option%
+        Options +Includes -Indexes +ExecCGI
-        php_admin_flag engine off
+        <Files *.php>
-        AddHandler fcgid-script .php
+          SetHandler fcgid-script
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </Files>
-    </Directory>
+        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
-    <Directory %home%/%user%/web/%domain%/stats>
+    </Directory>
-        AllowOverride All
+    <Directory %home%/%user%/web/%domain%/stats>
-    </Directory>
+        AllowOverride All
-    php_admin_value open_basedir none
+    </Directory>
-    SSLEngine on
+    php_admin_value open_basedir none
-    SSLVerifyClient none
+    SSLEngine on
-    SSLCertificateFile %ssl_crt%
+    SSLVerifyClient none
-    SSLCertificateKeyFile %ssl_key%
+    SSLCertificateFile %ssl_crt%
-    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+    SSLCertificateKeyFile %ssl_key%
-
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+
-
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
-</VirtualHost>
+
-
+</VirtualHost>
+

install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl

@@ -1,27 +1,28 @@
-<VirtualHost %ip%:%web_port%>
+<VirtualHost %ip%:%web_port%>
-
+
-    ServerName %domain_idn%
+    ServerName %domain_idn%
-    %alias_string%
+    %alias_string%
-    ServerAdmin %email%
+    ServerAdmin %email%
-    DocumentRoot %docroot%
+    DocumentRoot %docroot%
-    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
-    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
-    SuexecUserGroup %user% %group%
+    SuexecUserGroup %user% %group%
-    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
+    CustomLog /var/log/httpd/domains/%domain%.log combined
-    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
-    <Directory %docroot%>
+    <Directory %docroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
+        AllowOverride All
-        Options +Includes -Indexes %cgi_option%
+        Options +Includes -Indexes +ExecCGI
-        php_admin_flag engine off
+        <Files *.php>
-        AddHandler fcgid-script .php
+          SetHandler fcgid-script
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </Files>
-    </Directory>
+        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
-    <Directory %home%/%user%/web/%domain%/stats>
+    </Directory>
-        AllowOverride All
+    <Directory %home%/%user%/web/%domain%/stats>
-    </Directory>
+        AllowOverride All
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
+    </Directory>
-
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
-</VirtualHost>
+
-
+</VirtualHost>
+

install/vst-install.sh

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 # Vesta installer
 
@@ -11,9 +10,9 @@ VERSION='0.9.7'
 YUM_REPO='/etc/yum.repos.d/vesta.repo'
 arch=$(uname -i)
 
-tools="screen mc libpng libjpeg curl curl libmcrypt libmcrypt mhash mhash
+tools="screen mc libpng libjpeg curl libmcrypt mhash zip unzip freetype ntp
-    freetype openssl flex libxml2 ImageMagick sqlite sqlite pcre pcre sudo bc
+    openssl flex libxml2 ImageMagick sqlite pcre sudo bc jwhois mailx lsof
-    mailx lsof ntp tar whois telnet rsync"
+    tar telnet rsync"
 
 rpms="nginx httpd mod_ssl mod_ruid2 mod_extract_forwarded mod_fcgid ftp
     webalizer awstats mysql mysql-server php php-bcmath php-cli php-common
@@ -41,6 +40,7 @@ release=$(grep -o "[0-9]" /etc/redhat-release |head -n1)
 
 help() {
     echo "usage: $0 [OPTIONS]
+   -d, --disable-remi         Disable remi
    -e, --email                Define email address
    -h, --help                 Print this help and exit
    -f, --force                Force installation"
@@ -52,6 +52,7 @@ for arg; do
     delim=""
     case "$arg" in
         --help)         args="${args}-h " ;;
+        --disable-remi) args="${args}-d " ;;
         --force)        args="${args}-f " ;;
         --email)        args="${args}-e " ;;
         *)              [[ "${arg:0:1}" == "-" ]] || delim="\""
@@ -61,8 +62,9 @@ done
 eval set -- "$args"
 
 # Getopt
-while getopts "hfe:" Option; do
+while getopts "dhfe:" Option; do
     case $Option in
+        d) disable_remi='yes' ;;          # Disable remi repo
         h) help ;;                        # Help
         e) email=$OPTARG ;;               # Contact email
         f) force=yes ;;                   # Force install
@@ -250,8 +252,12 @@ if [ -e '/root/.my.cnf' ]; then
     mv -f /root/.my.cnf
 fi
 
-# Vesta packages
+# Install Vesta packages
-yum -y --enablerepo=remi install $rpms
+if [ -z "$disable_remi" ]; then 
+    yum -y --enablerepo=remi install $rpms
+else
+    yum -y install $rpms
+fi
 if [ $? -ne 0 ]; then
     echo 'Error: yum install failed'
     exit 1
@@ -406,6 +412,9 @@ chmod 640 /var/log/httpd/error_log
 chmod 640 /var/log/httpd/suexec.log
 chmod 751 /var/log/httpd/domains
 
+# Enable short_open_tag in php config
+sed -i 's/short_open_tag = Off/short_open_tag = On/g' /etc/php.ini
+
 # Nginx
 if [ -e '/etc/nginx/nginx.conf' ]; then
     mv /etc/nginx/nginx.conf $vst_backups/nginx/
@@ -502,6 +511,8 @@ sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php
 wget $CHOST/$VERSION/httpd-webmail.conf -O /etc/httpd/conf.d/roundcubemail.conf
 wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcubemail/main.inc.php
 wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcubemail/db.inc.php
+wget $CHOST/$VERSION/roundcube-driver.php -O /usr/share/roundcubemail/plugins/password/vesta.php
+wget $CHOST/$VERSION/roundcube-pw.conf -O /usr/share/roundcubemail/plugins/password/config.inc.php
 
 r="$(gen_pass)"
 mysql -e "CREATE DATABASE roundcube"
@@ -537,7 +548,7 @@ $VESTA/bin/v-add-cron-job 'admin' '*/30' '*' '*' '*' '*' "$command"
 command='sudo /usr/local/vesta/bin/v-backup-users'
 $VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
 command='sudo /usr/local/vesta/bin/v-update-user-stats'
-$VESTA/bin/v-add-cron-job 'admin' '20' '00' '01' '*' '*' "$command"
+$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
 command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
 $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
 
@@ -637,652 +648,3 @@ cd
 bash
 
 # EOF
-=======
-#!/bin/bash
-# Vesta installer
-
-# Define Variables
-RHOST='r.vestacp.com'
-CHOST='c.vestacp.com'
-
-REPO='cmmnt'
-VERSION='0.9.7'
-YUM_REPO='/etc/yum.repos.d/vesta.repo'
-arch=$(uname -i)
-
-tools="screen mc libpng libjpeg curl libmcrypt mhash zip unzip freetype ntp
-    openssl flex libxml2 ImageMagick sqlite pcre sudo bc jwhois mailx lsof
-    tar telnet rsync"
-
-rpms="nginx httpd mod_ssl mod_ruid2 mod_extract_forwarded mod_fcgid ftp
-    webalizer awstats mysql mysql-server php php-bcmath php-cli php-common
-    php-gd php-imap php-mbstring php-mcrypt php-mysql php-pdo php-soap php-tidy
-    php-xml php-xmlrpc phpMyAdmin exim dovecot clamd spamassassin roundcubemail
-    bind bind-utils bind-libs vsftpd rrdtool GeoIP vesta vesta-nginx vesta-php"
-
-# Am I root?
-if [ "x$(id -u)" != 'x0' ]; then
-    echo 'Error: this script can only be executed by root'
-    exit 1
-fi
-
-# Check supported version
-if [ ! -e '/etc/redhat-release' ]; then
-    echo 'Error: sorry, we currently support RHEL and CentOS only'
-    exit 1
-fi
-
-os=$(cut -f 1 -d ' ' /etc/redhat-release)
-if [ $os !=  'CentOS' ] && [ $os != 'Red' ]; then
-    echo 'Error: sorry, we currently support RHEL and CentOS only'
-fi
-release=$(grep -o "[0-9]" /etc/redhat-release |head -n1)
-
-help() {
-    echo "usage: $0 [OPTIONS]
-   -d, --disable-remi         Disable remi
-   -e, --email                Define email address
-   -h, --help                 Print this help and exit
-   -f, --force                Force installation"
-    exit 1
-}
-
-# Translating argument to --gnu-long-options
-for arg; do
-    delim=""
-    case "$arg" in
-        --help)         args="${args}-h " ;;
-        --disable-remi) args="${args}-d " ;;
-        --force)        args="${args}-f " ;;
-        --email)        args="${args}-e " ;;
-        *)              [[ "${arg:0:1}" == "-" ]] || delim="\""
-                        args="${args}${delim}${arg}${delim} ";;
-    esac
-done
-eval set -- "$args"
-
-# Getopt
-while getopts "dhfe:" Option; do
-    case $Option in
-        d) disable_remi='yes' ;;          # Disable remi repo
-        h) help ;;                        # Help
-        e) email=$OPTARG ;;               # Contact email
-        f) force=yes ;;                   # Force install
-        *) help ;;                        # Default
-    esac
-done
-
-# Are you sure ?
-if [ -z $email ]; then
-    echo
-    echo
-    echo
-    echo
-    echo
-    echo '         ***********************************************************'
-    echo
-    echo '             _|      _|  _|_|_|_|    _|_|_|  _|_|_|_|_|    _|_|     '
-    echo '             _|      _|  _|        _|            _|      _|    _|   '
-    echo '             _|      _|  _|_|_|      _|_|        _|      _|_|_|_|   '
-    echo '               _|  _|    _|              _|      _|      _|    _|   '
-    echo '                 _|      _|_|_|_|  _|_|_|        _|      _|    _|   '
-    echo
-    echo
-    echo
-    echo
-    echo
-    echo
-    echo
-    echo
-    echo '         ***********************************************************'
-    echo
-    echo
-    read -n 1 -p 'Do you want to install Vesta Control Panel? [y/n]): ' answer
-    if [ "$answer" != 'y'  ] && [ "$answer" != 'Y'  ]; then
-        echo 'Goodbye'
-        exit 1
-    fi
-    echo
-
-    # Check email
-    read -p 'Please enter valid email address: ' email
-fi
-
-# Validate email
-local_part=$(echo $email | cut  -s -f1 -d\@)
-remote_host=$(echo $email | cut -s -f2 -d\@)
-mx_failed=1
-if [ ! -z "$remote_host" ] && [ ! -z "$local_part" ]; then
-    /usr/bin/host -t mx "$remote_host" &> /dev/null
-    mx_failed="$?"
-fi
-
-if [ "$mx_failed" -eq 1 ]; then
-    echo "Error: email $email is not valid"
-    exit 1
-fi
-
-echo
-echo
-echo
-echo
-echo 'Installation will take about 15 minutes ...'
-echo
-sleep 2
-
-# Check wget
-if [ ! -e '/usr/bin/wget' ]; then
-    yum -y install wget
-    if [ $? -ne 0 ]; then
-        echo "Error: can't install wget"
-        exit 1
-    fi
-fi
-
-# Check repo availability
-wget "$RHOST/$REPO/vesta.conf" -O /dev/null
-if [ $? -ne 0 ]; then
-    echo "Error: no access to $REPO repository"
-    exit 1
-fi
-
-# Check installed packages
-tmpfile=$(mktemp -p /tmp)
-rpm -qa > $tmpfile
-for rpm in $rpms; do 
-    if [ ! -z "$(grep ^$rpm. $tmpfile)" ]; then
-        conflicts="$rpm $conflicts"
-    fi
-done
-rm -f $tmpfile
-
-if [ ! -z "$conflicts" ] && [ -z "$force" ]; then
-    echo
-    echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
-    echo
-    echo 'Following rpm packages aleady installed:'
-    echo "$conflicts"
-    echo
-    echo 'It is highly recommended to remove them before proceeding.'
-    echo
-    echo 'If you want to force installation run this script with -f option:'
-    echo "Example: bash $0 --force"
-    echo
-    echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
-    echo
-    exit 1
-fi
-
-# Password generator
-gen_pass() {
-    MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-    LENGTH=10
-    while [ ${n:=1} -le $LENGTH ]; do
-        PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
-        let n+=1
-    done
-    echo "$PASS"
-}
-
-# Update system
-yum -y update
-if [ $? -ne 0 ]; then
-    echo 'Error: yum update failed'
-    exit 1
-fi
-
-# Install additional packages
-yum -y install $tools
-if [ $? -ne 0 ]; then
-    echo 'Error: yum install failed'
-    exit 1
-fi
-
-# Install EPEL repo
-if [ ! -e '/etc/yum.repos.d/epel.repo' ]; then
-    if [ "$release" -eq '5' ]; then
-        epel="5/$arch/epel-release-5-4.noarch.rpm"
-    fi
-
-    if [ "$release" -eq '6' ]; then
-        epel="6/$arch/epel-release-6-8.noarch.rpm"
-    fi
-
-    rpm -ivh http://dl.fedoraproject.org/pub/epel/$epel
-    if [ $? -ne 0 ]; then
-        echo "Error: can't install EPEL repository"
-        exit 1
-    fi
-fi
-
-# Install remi repo
-if [ ! -e '/etc/yum.repos.d/remi.repo' ]; then
-    if [ "$release" -eq '5' ]; then
-        remi="remi-release-5.rpm"
-    fi
-
-    if [ "$release" -eq '6' ]; then
-        remi="remi-release-6.rpm"
-    fi
-
-    rpm -ivh http://rpms.famillecollet.com/enterprise/$remi
-    if [ $? -ne 0 ]; then
-        echo "Error: can't install remi repository"
-        exit 1
-    fi
-fi
-
-# Install vesta repo
-echo "[vesta]
-name=Vesta - $REPO
-baseurl=http://$RHOST/$REPO/$release/\$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA" > $YUM_REPO
-wget $CHOST/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA
-
-# Checking if old MySQL stuff exists
-if [ -e '/var/lib/mysql' ]; then
-    mv -f /var/lib/mysql /var/lib/mysql_old
-fi
-if [ -e '/etc/my.cnf' ]; then 
-    mv -f /etc/my.cnf /etc/my.cnf_old
-fi
-if [ -e '/root/.my.cnf' ]; then
-    mv -f /root/.my.cnf
-fi
-
-# Install Vesta packages
-if [ -z "$disable_remi" ]; then 
-    yum -y --enablerepo=remi install $rpms
-else
-    yum -y install $rpms
-fi
-if [ $? -ne 0 ]; then
-    echo 'Error: yum install failed'
-    exit 1
-fi
-
-# Configuring run levels
-chkconfig iptables off
-if [ -e /etc/init.d/sendmail ]; then
-    chkconfig sendmail off
-fi
-if [ -e /etc/init.d/postfix ]; then
-    chkconfig postfix off
-fi
-chkconfig vesta on
-chkconfig httpd on
-chkconfig nginx on
-chkconfig mysqld on
-chkconfig vsftpd on
-chkconfig named on
-chkconfig exim on
-chkconfig clamd on
-chkconfig spamassassin on
-chkconfig dovecot on
-
-# Make dirs more visible
-echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile
-
-# Vesta does not support SELINUX for now
-if [ -e '/etc/sysconfig/selinux' ]; then
-    sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/sysconfig/selinux
-    setenforce 0
-fi
-if [ -e '/etc/selinux/config' ]; then
-    sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
-    setenforce 0
-fi
-
-# Vesta use own webalizer routine
-rm -f /etc/cron.daily/00webalizer
-
-# NTP Synchronization
-echo '#!/bin/sh' > /etc/cron.daily/ntpdate
-echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate
-chmod 775 /etc/cron.daily/ntpdate
-ntpdate -s pool.ntp.org
-
-# Vesta Environment
-echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
-chmod 755 /etc/profile.d/vesta.sh
-source /etc/profile.d/vesta.sh
-echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
-echo 'export PATH' >> /root/.bash_profile
-source /root/.bash_profile
-mkdir -p $VESTA/conf
-mkdir -p $VESTA/log
-mkdir -p $VESTA/data
-mkdir -p $VESTA/ssl
-chmod 770 $VESTA/conf
-
-# Make backup directory
-vst_backups="/root/vst_install_backups/$(date +%s)"
-mkdir -p $vst_backups
-mkdir -p $vst_backups/nginx
-mkdir -p $vst_backups/httpd
-mkdir -p $vst_backups/mysql
-mkdir -p $vst_backups/exim
-mkdir -p $vst_backups/dovecot
-mkdir -p $vst_backups/clamd
-mkdir -p $vst_backups/vsftpd
-mkdir -p $vst_backups/named
-
-wget $RHOST/$REPO/vesta.conf -O $VESTA/conf/vesta.conf
-if [ -e '/etc/sudoers' ]; then
-    mv /etc/sudoers $vst_backups/
-fi
-wget $CHOST/$VERSION/sudoers.conf -O /etc/sudoers
-chmod 0440 /etc/sudoers
-wget $CHOST/$VERSION/vesta.log -O /etc/logrotate.d/vesta
-
-sed -i "s/umask 022/umask 002/g" /etc/profile
-
-# Create backup directory
-adduser backup
-ln -s /home/backup /backup
-chmod a+x /backup
-
-# Configuring data templates
-cd /usr/local/vesta/data
-mkdir ips
-mkdir queue
-mkdir users
-touch queue/backup.pipe
-touch queue/disk.pipe
-touch queue/webstats.pipe
-touch queue/restart.pipe
-touch queue/traffic.pipe
-chmod 750 users
-chmod 750 ips
-chmod -R 750 queue
-wget $CHOST/$VERSION/packages.tar.gz -O packages.tar.gz
-tar -xzf packages.tar.gz
-rm -f packages.tar.gz
-cd /usr/local/vesta/data
-wget $CHOST/$VERSION/templates.tar.gz -O templates.tar.gz
-tar -xzf templates.tar.gz
-rm -f templates.tar.gz
-chmod -R 755 /usr/local/vesta/data/templates
-
-cp templates/web/skel/public_html/index.html /var/www/html/
-sed -i 's/%domain%/It worked!/g' /var/www/html/index.html
-
-# Configuring ssl keys
-cd /usr/local/vesta/ssl
-wget $CHOST/$VERSION/certificate.crt -O certificate.crt
-wget $CHOST/$VERSION/certificate.key -O certificate.key
-
-# Adding admin user
-vpass=$(gen_pass)
-$VESTA/bin/v-add-user admin $vpass $email default System Administrator
-if [ $? -ne 0 ]; then
-    echo "Error: can't create admin user"
-    exit 1
-fi
-
-# Set shell
-$VESTA/bin/v-change-user-shell admin bash
-
-# Apache
-if [ -e '/etc/httpd/conf/httpd.conf' ]; then
-    mv /etc/httpd/conf/httpd.conf $vst_backups/httpd/
-fi
-if [ -e '/etc/httpd/conf.d/ssl.conf' ]; then
-    mv /etc/httpd/conf.d/ssl.conf $vst_backups/httpd/
-fi
-if [ -e '/etc/httpd/conf.d/proxy_ajp.conf' ]; then
-    mv /etc/httpd/conf.d/proxy_ajp.conf $vst_backups/httpd/
-fi
-wget $CHOST/$VERSION/httpd.conf -O /etc/httpd/conf/httpd.conf
-wget $CHOST/$VERSION/httpd-status.conf -O /etc/httpd/conf.d/status.conf
-wget $CHOST/$VERSION/httpd-ssl.conf -O /etc/httpd/conf.d/ssl.conf
-wget $CHOST/$VERSION/httpd.log -O /etc/logrotate.d/httpd
-echo "MEFaccept 127.0.0.1" >> /etc/httpd/conf.d/mod_extract_forwarded.conf
-echo > /etc/httpd/conf.d/proxy_ajp.conf
-echo > /etc/httpd/conf.d/vesta.conf
-touch /var/log/httpd/access_log
-touch /var/log/httpd/error_log
-touch /var/log/httpd/suexec.log
-mkdir -p /var/log/httpd/domains
-chmod a+x /var/log/httpd
-chmod 640 /var/log/httpd/access_log
-chmod 640 /var/log/httpd/error_log
-chmod 640 /var/log/httpd/suexec.log
-chmod 751 /var/log/httpd/domains
-
-# Nginx
-if [ -e '/etc/nginx/nginx.conf' ]; then
-    mv /etc/nginx/nginx.conf $vst_backups/nginx/
-fi
-if [ -f '/etc/nginx/conf.d/default.conf' ]; then
-    mv /etc/nginx/conf.d/default.conf $vst_backups/nginx/
-fi
-if [ -e '/etc/nginx/conf.d/example_ssl.conf' ]; then
-    mv /etc/nginx/conf.d/example_ssl.conf $vst_backups/nginx/
-fi
-
-wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf
-wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf
-touch /etc/nginx/conf.d/vesta_ip.conf
-touch /etc/nginx/conf.d/vesta_users.conf
-
-# VsFTP
-if [ -e '/etc/vsftpd/vsftpd.conf' ]; then
-    mv /etc/vsftpd/vsftpd.conf $vst_backups/vsftpd/
-fi
-wget $CHOST/$VERSION/vsftpd.conf -O /etc/vsftpd/vsftpd.conf
-
-# MySQL
-if [ -e '/etc/my.cnf' ]; then
-    mv /etc/my.cnf $vst_backups/mysql/
-fi
-
-if [ -e '/root/.my.cnf' ]; then
-    mv /root/.my.cnf $vst_backups/mysql/
-fi
-mpass=$(gen_pass)
-server_memory="$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])"
-if [ "$server_memory" -gt '1000000' ]; then
-    wget $CHOST/$VERSION/mysql.cnf -O /etc/my.cnf
-else
-    wget $CHOST/$VERSION/mysql-512.cnf -O /etc/my.cnf
-fi
-service mysqld start
-mysqladmin -u root password $mpass
-echo -e "[client]\npassword='$mpass'\n" >/root/.my.cnf
-$VESTA/bin/v-add-database-server mysql localhost 3306 root $mpass
-$VESTA/bin/v-add-database admin default default $(gen_pass) mysql
-
-# Bind
-if [ -e '/etc/named.conf' ]; then
-    mv /etc/named.conf $vst_backups/named/
-fi
-wget $CHOST/$VERSION/named.conf -O /etc/named.conf
-chown root:named /etc/named.conf
-chmod 640 /etc/named.conf
-
-# Exim
-if [ -e '/etc/exim/exim.conf' ]; then
-    mv /etc/exim/exim.conf $vst_backups/exim/
-fi
-if [ -e '/etc/clamd.conf' ]; then
-    mv /etc/clamd.conf $vst_backups/clamd/
-fi
-wget $CHOST/$VERSION/exim.conf -O /etc/exim/exim.conf
-wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim/dnsbl.conf
-wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim/spam-blocks.conf
-wget $CHOST/$VERSION/clamd.conf -O /etc/clamd.conf
-mkdir /etc/exim/domains
-chmod 640 /etc/exim/exim.conf
-gpasswd -a clam exim
-gpasswd -a exim mail
-gpasswd -a clam mail
-gpasswd -a dovecot mail
-/usr/bin/freshclam
-
-# Dovecot config
-if [ "$release" -eq '5' ]; then
-    if -e [ '/etc/dovecot.conf' ]; then
-        mv /etc/dovecot.conf $vst_backups/dovecot/
-    fi
-    wget $CHOST/$VERSION/dovecot.conf -O /etc/dovecot.conf
-    
-else
-    if [ -e '/etc/dovecot' ]; then
-        mv /etc/dovecot/* $vst_backups/dovecot/
-    fi
-    wget $CHOST/$VERSION/dovecot.tar.gz -O  /etc/dovecot.tar.gz
-    cd /etc/
-    tar -xzf dovecot.tar.gz
-    rm -f dovecot.tar.gz
-fi
-
-# PMA
-wget $CHOST/$VERSION/httpd-pma.conf -O /etc/httpd/conf.d/phpMyAdmin.conf
-wget $CHOST/$VERSION/pma.conf -O /etc/phpMyAdmin/config.inc.php
-sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php
-
-# Roundcube setup
-wget $CHOST/$VERSION/httpd-webmail.conf -O /etc/httpd/conf.d/roundcubemail.conf
-wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcubemail/main.inc.php
-wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcubemail/db.inc.php
-wget $CHOST/$VERSION/roundcube-driver.php -O /usr/share/roundcubemail/plugins/password/vesta.php
-wget $CHOST/$VERSION/roundcube-pw.conf -O /usr/share/roundcubemail/plugins/password/config.inc.php
-
-r="$(gen_pass)"
-mysql -e "CREATE DATABASE roundcube"
-mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'"
-sed -i "s/%password%/$r/g" /etc/roundcubemail/db.inc.php
-mysql roundcube < /usr/share/doc/roundcubemail-*/SQL/mysql.initial.sql
-
-# Configuring ip
-$VESTA/bin/v-update-sys-ip
-
-# Get main ip
-main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 |\
-    cut -f2 -d: | cut -f1 -d ' ')
-
-# Add default web domain on main ip
-$VESTA/bin/v-add-web-domain admin default.domain $main_ip
-
-# Add default dns domain on main ip
-$VESTA/bin/v-add-dns-domain admin default.domain $main_ip
-
-# Add default mail domain
-$VESTA/bin/v-add-mail-domain admin default.domain
-
-# Configuring crond
-command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
-$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
-$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
-$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
-$VESTA/bin/v-add-cron-job 'admin' '*/30' '*' '*' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-backup-users'
-$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-update-user-stats'
-$VESTA/bin/v-add-cron-job 'admin' '20' '00' '01' '*' '*' "$command"
-command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
-$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
-
-# Creating symlink
-ln -s /usr/local/vesta/log /var/log/vesta
-
-# Stop unused services
-services='iptables sendmail postfix'
-for srv in $services; do
-    service $srv status > /dev/null
-    if [ $? -eq 0 ]; then
-        service $srv stop
-    fi
-done
-
-# Start system service
-services='vesta httpd nginx vsftpd exim dovecot clamd spamassassin named crond'
-for srv in $services; do
-    service $srv status > /dev/null
-    if [ $? -gt 0 ]; then
-        service $srv start
-    else
-        service $srv restart
-    fi
-done
-
-# Change sendmail client
-rm -f /etc/alternatives/mta
-ln -s /usr/sbin/sendmail.exim /etc/alternatives/mta
-
-# Build inititall rrd images
-$VESTA/bin/v-update-sys-rrd
-
-# Send notification to vestacp.com
-wget vestacp.com/notify/?$REPO -O /dev/null
-
-# Get server ip
-vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null)
-if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then
-    # Assign passive ip address
-    echo "pasv_address=$vst_ip" >> /etc/vsftpd/vsftpd.conf
-fi
-
-if [ -z "$vst_ip" ]; then
-    vst_ip=$main_ip
-fi
-
-# Send email
-echo -e "Congratulations, you have just successfully installed \
-the Vesta Control Panel
-
-You can login in Vesta with following credentials:
-    username: admin
-    password: $vpass
-    https://$vst_ip:8083
-
-We hope that you enjoy your installation of Vesta. Please \
-feel free to contact us anytime if you have any questions.
-Thank you.
-
---
-Sincerely yours
-vestacp.com team
-" > $tmpfile
-
-cat $tmpfile | mail -s "Vesta Control Panel" $email
-rm -f $tmpfile
-
-# Congrats
-echo
-echo
-echo '         ***********************************************************'
-echo
-echo '             _|      _|  _|_|_|_|    _|_|_|  _|_|_|_|_|    _|_|     '
-echo '             _|      _|  _|        _|            _|      _|    _|   '
-echo '             _|      _|  _|_|_|      _|_|        _|      _|_|_|_|   '
-echo '               _|  _|    _|              _|      _|      _|    _|   '
-echo '                 _|      _|_|_|_|  _|_|_|        _|      _|    _|   '
-echo
-echo '           Congratulations, you have just successfully installed'
-echo '           the Vesta Control Panel!'
-echo
-echo '           Now you can login in Vesta with following credentials:'
-echo '               username: admin'
-echo "               password: $vpass"
-echo "               https://$vst_ip:8083/"
-echo
-echo
-echo '           Thank you for using our product.'
-echo
-echo '         ***********************************************************'
-echo
-echo
-
-# Tricky way to get new PATH variable
-cd
-bash
-
-# EOF
->>>>>>> 994c40901078e48fe939536f7b366e29c2e44a1d

web/add/db/index.php

@@ -1,93 +1,107 @@
-<?php
+<?php
-// Init
+// Init
-error_reporting(NULL);
+error_reporting(NULL);
-ob_start();
+ob_start();
-session_start();
+session_start();
-$TAB = 'DB';
+$TAB = 'DB';
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
-
+
-// Header
+// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
+include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
+
-// Panel
+// Panel
-top_panel($user,$TAB);
+top_panel($user,$TAB);
-
+
-// Are you admin?
+// Are you admin?
-//if ($_SESSION['user'] == 'admin') {
+//if ($_SESSION['user'] == 'admin') {
-if (!empty($_POST['ok'])) {
+if (!empty($_POST['ok'])) {
-    // Check input
+    // Check input
-    if (empty($_POST['v_database'])) $errors[] = _('database');
+    if (empty($_POST['v_database'])) $errors[] = _('database');
-    if (empty($_POST['v_dbuser'])) $errors[] = _('username');
+    if (empty($_POST['v_dbuser'])) $errors[] = _('username');
-    if (empty($_POST['v_password'])) $errors[] = _('password');
+    if (empty($_POST['v_password'])) $errors[] = _('password');
-    if (empty($_POST['v_type'])) $errors[] = _('type');
+    if (empty($_POST['v_type'])) $errors[] = _('type');
-    if (empty($_POST['v_charset'])) $errors[] = _('charset');
+    if (empty($_POST['v_charset'])) $errors[] = _('charset');
-
+
-    // Protect input
+        // Protect input
-    $v_database = escapeshellarg($_POST['v_database']);
+        $v_database = escapeshellarg($_POST['v_database']);
-    $v_dbuser = escapeshellarg($_POST['v_dbuser']);
+        $v_dbuser = escapeshellarg($_POST['v_dbuser']);
-    $v_password = escapeshellarg($_POST['v_password']);
+        $v_password = escapeshellarg($_POST['v_password']);
-    $v_type = $_POST['v_type'];
+        $v_type = $_POST['v_type'];
-    $v_charset = $_POST['v_charset'];
+        $v_charset = $_POST['v_charset'];
-
+        if (empty($_POST['v_notify'])) $v_notify = 'off';
-    if (empty($_POST['v_notify'])) $v_notify = 'off';
+
-
+    // Check for errors
-    // Check for errors
+    if (!empty($errors[0])) {
-    if (!empty($errors[0])) {
+        foreach ($errors as $i => $error) {
-        foreach ($errors as $i => $error) {
+            if ( $i == 0 ) {
-            if ( $i == 0 ) {
+                $error_msg = $error;
-                $error_msg = $error;
+            } else {
-            } else {
+                $error_msg = $error_msg.", ".$error;
-                $error_msg = $error_msg.", ".$error;
+            }
-            }
+        }
-        }
+        $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg);
-        $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg);
+    } else {
-    } else {
+        // Add Database
-        // Add Database
+        $v_type = escapeshellarg($_POST['v_type']);
-        $v_type = escapeshellarg($_POST['v_type']);
+        $v_charset = escapeshellarg($_POST['v_charset']);
-        $v_charset = escapeshellarg($_POST['v_charset']);
+        exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var);
-        exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var);
+        $v_type = $_POST['v_type'];
-        $v_type = $_POST['v_type'];
+        $v_charset = $_POST['v_charset'];
-        $v_charset = $_POST['v_charset'];
+        if ($return_var != 0) {
-        if ($return_var != 0) {
+            $error = implode('<br>', $output);
-            $error = implode('<br>', $output);
+            if (empty($error)) $error = _('Error: vesta did not return any output.');
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            $_SESSION['error_msg'] = $error;
-            $_SESSION['error_msg'] = $error;
+            unset($v_password);
-            unset($v_password);
+            unset($output);
-            unset($output);
+        } else {
-        } else {
+            // Add Database
-            if (empty($v_notify)) {
+            $v_type = escapeshellarg($_POST['v_type']);
-                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
+            $v_charset = escapeshellarg($_POST['v_charset']);
-                if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+            exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var);
-                if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
+            $v_type = $_POST['v_type'];
-
+            $v_charset = $_POST['v_charset'];
-                $to = $panel[$user]['CONTACT'];
+            if ($return_var != 0) {
-                $subject = _("Database Credentials");
+                $error = implode('<br>', $output);
-                $hostname = exec('hostname');
+                if (empty($error)) $error = _('Error: vesta did not return any output.');
-                $from = _('MAIL_FROM',$hostname);
+                $_SESSION['error_msg'] = $error;
-                $mailtext = _('DATABASE_READY',$panel[$user]['FNAME'],$panel[$user]['LNAME'],$_POST['v_type'],$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
+                unset($v_password);
-                $mailtext .= $db_admin_link."\n\n";
+                unset($output);
-
+            } else {
-                $mailtext .= "--\n"._('Vesta Control Panel')."\n";
+            if (empty($v_notify)) {
-                send_email($to, $subject, $mailtext, $from);
+                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
-            }
+                if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
-            $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
+                if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
-            unset($v_database);
+
-            unset($v_dbuser);
+                $to = $panel[$user]['CONTACT'];
-            unset($v_password);
+                $subject = _("Database Credentials");
-            unset($v_type);
+                $hostname = exec('hostname');
-            unset($v_charset);
+                $from = _('MAIL_FROM',$hostname);
-            unset($output);
+                $mailtext = _('DATABASE_READY',$panel[$user]['FNAME'],$panel[$user]['LNAME'],$_POST['v_type'],$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
-        }
+                $mailtext .= $db_admin_link."\n\n";
-    }
+
-}
+                $mailtext .= "--\n"._('Vesta Control Panel')."\n";
-exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
+                send_email($to, $subject, $mailtext, $from);
-$db_types = json_decode(implode('', $output), true);
+                
-unset($output);
+            }
-
+            $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
+            unset($v_database);
-unset($_SESSION['error_msg']);
+            unset($v_dbuser);
-unset($_SESSION['ok_msg']);
+            unset($v_password);
-//}
+            unset($v_type);
-
+            unset($v_charset);
-// Footer
+            unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+        }
+    }
+}
+exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
+$db_types = json_decode(implode('', $output), true);
+unset($output);
+
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
+unset($_SESSION['error_msg']);
+unset($_SESSION['ok_msg']);
+//}
+
+// Footer
+include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+?>

web/bulk/service/index.php

@@ -0,0 +1,28 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+$service = $_POST['service'];
+$action = $_POST['action'];
+
+if ($_SESSION['user'] == 'admin') {
+    switch ($action) {
+        case 'stop': $cmd='v-stop-service';
+            break;
+        case 'start': $cmd='v-start-service';
+            break;
+        case 'restart': $cmd='v-restart-service';
+            break;
+        default: header("Location: /list/services/"); exit;
+    }
+    foreach ($service as $value) {
+        $value = escapeshellarg($value);
+        exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+    }
+}
+
+header("Location: /list/services/");

web/inc/i18n/ru.php

@@ -17,6 +17,9 @@ $LANG = array(
     'minute'=>'минута',
     'hour'=>'час',
     'day'=>'день',
+    'days'=>'дня(ей)',
+    'hours'=>'часа(ов)',
+    'minutes'=>'минут(ы)',
     'month'=>'месяц',
     'day of week'=>'день недели',
     'cmd'=>'командная строка',

web/inc/main.php

@@ -1,159 +1,177 @@
-<?php
+<?php
-
+
-// need to be moved to user settings
+// need to be moved to user settings
-define('LANGUAGE','ru');
+define('LANGUAGE','ru');
-
+
-require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.LANGUAGE.'.php');
+require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.LANGUAGE.'.php');
-
+
-
+
-// works like sprintf if more than one arguments called
+// works like sprintf if more than one arguments called
-function _() {
+function _() {
-    global $LANG;
+    global $LANG;
-    $args = func_get_args();
+    $args = func_get_args();
-    $key = $args[0];
+    $key = $args[0];
-    if (!isset($LANG[$key])) $text=$key; else
+    if (!isset($LANG[$key])) $text=$key; else
-        $text=$LANG[$key];
+        $text=$LANG[$key];
-
+
-    if (count($args)>1) { $args[0] = $text;
+    if (count($args)>1) { $args[0] = $text;
-        return call_user_func_array("sprintf",$args);
+        return call_user_func_array("sprintf",$args);
-    }
+    }
-    else return $text;
+    else return $text;
-}
+}
-
+
-// Check user session
+// Check user session
-if ((!isset($_SESSION['user'])) && (!isset($api_mode))&&!defined('NO_AUTH_REQUIRED')) {
+if ((!isset($_SESSION['user'])) && (!isset($api_mode))&&!defined('NO_AUTH_REQUIRED')) {
-    $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
+    $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
-    header("Location: /login/");
+    header("Location: /login/");
-    exit;
+    exit;
-}
+}
-
+
-if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
+if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
-    $user = $_SESSION['look'];
+    $user = $_SESSION['look'];
-} else {
+} else {
-    $user = $_SESSION['user'];
+    $user = $_SESSION['user'];
-}
+}
-
+
-define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
+define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
-
+
-$i = 0;
+$i = 0;
-
+
-// Define functions
+// Define functions
-function check_error($return_var){
+function check_error($return_var){
-    if ( $return_var > 0 ) {
+    if ( $return_var > 0 ) {
-        header("Location: /error/");
+        header("Location: /error/");
-        exit;
+        exit;
-    }
+    }
-}
+}
-
+
-function top_panel($user, $TAB) {
+function top_panel($user, $TAB) {
-    global $panel;
+    global $panel;
-    $command = VESTA_CMD."v-list-user '".$user."' 'json'";
+    $command = VESTA_CMD."v-list-user '".$user."' 'json'";
-    exec ($command, $output, $return_var);
+    exec ($command, $output, $return_var);
-    if ( $return_var > 0 ) {
+    if ( $return_var > 0 ) {
-        header("Location: /error/");
+        header("Location: /error/");
-        exit;
+        exit;
-    }
+    }
-    $panel = json_decode(implode('', $output), true);
+    $panel = json_decode(implode('', $output), true);
-    unset($output);
+    unset($output);
-    if ( $user == 'admin' ) {
+    if ( $user == 'admin' ) {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/panel.html');
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/panel.html');
-    } else {
+    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/panel.html');
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/panel.html');
-    }
+    }
-}
+}
-
+
-function humanize_time($usage) {
+function humanize_time($usage) {
-    if ( $usage > 60 ) {
+    if ( $usage > 60 ) {
-        $usage = $usage / 60;
+        $usage = $usage / 60;
-        $usage = number_format($usage, 2);
+        if ( $usage > 24 ) {
-        $usage = $usage." Hour.";
+             $usage = $usage / 24;
-    } else {
+            $usage = number_format($usage, 0);
-        $usage = $usage." Min.";
+            if ( $usage == 1 ) {
-    }
+                $usage = $usage." "._('day');
-    return $usage;
+            } else {
-}
+                $usage = $usage." "._('days');
-
+            }
-function humanize_usage($usage) {
+        } else {
-    if ( $usage > 1000 ) {
+            $usage = number_format($usage, 0);
-        $usage = $usage / 1000;
+            if ( $usage == 1 ) {
-        if ( $usage > 1000 ) {
+                $usage = $usage." "._('hour');
-                $usage = $usage / 1000 ;
+            } else {
-                if ( $usage > 1000 ) {
+                $usage = $usage." "._('hours');
-                    $usage = $usage / 1000 ;
+            }
-                    $usage = number_format($usage, 2);
+        }
-                    $usage = $usage." pb";
+    } else {
-                } else {
+        if ( $usage == 1 ) {
-                    $usage = number_format($usage, 2);
+            $usage = $usage." "._('minute');
-                    $usage = $usage." tb";
+        } else {
-                }
+            $usage = $usage." "._('minutes');
-        } else {
+        }
-            $usage = number_format($usage, 2);
+    }
-            $usage = $usage." gb";
+    return $usage;
-        }
+}
-    } else {
+
-        $usage = $usage." mb";
+function humanize_usage($usage) {
-    }
+    if ( $usage > 1000 ) {
-    return $usage;
+        $usage = $usage / 1000;
-}
+        if ( $usage > 1000 ) {
-
+                $usage = $usage / 1000 ;
-function get_percentage($used,$total) {
+                if ( $usage > 1000 ) {
-    if (!isset($total)) $total =  0;
+                    $usage = $usage / 1000 ;
-    if (!isset($used)) $used =  0;
+                    $usage = number_format($usage, 2);
-    if ( $total == 0 ) {
+                    $usage = $usage." "._('pb');
-        $percent = 0;
+                } else {
-    } else {
+                    $usage = number_format($usage, 2);
-        $percent = $used / $total;
+                    $usage = $usage." "._('tb');
-        $percent = $percent * 100;
+                }
-        $percent = number_format($percent, 0, '', '');
+        } else {
-        if ( $percent > 100 ) {
+            $usage = number_format($usage, 2);
-            $percent = 100;
+            $usage = $usage." "._('gb');
-        }
+        }
-        if ( $percent < 0 ) {
+    } else {
-            $percent = 0;
+        $usage = $usage." "._('mb');
-        }
+    }
-
+    return $usage;
-    }
+}
-    return $percent;
+
-}
+function get_percentage($used,$total) {
-
+    if (!isset($total)) $total =  0;
-function send_email($to,$subject,$mailtext,$from) {
+    if (!isset($used)) $used =  0;
-    $charset = "utf-8";
+    if ( $total == 0 ) {
-    $to = '<'.$to.'>';
+        $percent = 0;
-    $boundary = '--' . md5( uniqid("myboundary") );
+    } else {
-    $priorities = array( '1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)' );
+        $percent = $used / $total;
-    $priority = $priorities[2];
+        $percent = $percent * 100;
-    $ctencoding = "8bit";
+        $percent = number_format($percent, 0, '', '');
-    $sep = chr(13) . chr(10);
+        if ( $percent > 100 ) {
-    $disposition = "inline";
+            $percent = 100;
-    $subject = "=?$charset?B?".base64_encode($subject)."?=";
+        }
-    $header = "From: $from \nX-Priority: $priority\nCC:\n";
+        if ( $percent < 0 ) {
-    $header .= "Mime-Version: 1.0\nContent-Type: text/plain; charset=$charset \n";
+            $percent = 0;
-    $header .= "Content-Transfer-Encoding: $ctencoding\nX-Mailer: Php/libMailv1.3\n";
+        }
-    $message = $mailtext;
+
-    mail($to, $subject, $message, $header);
+    }
-}
+    return $percent;
-
+}
-function display_error_block() {
+
-    if (!empty($_SESSION['error_msg'])) {
+function send_email($to,$subject,$mailtext,$from) {
-        echo '
+    $charset = "utf-8";
-                        <script type="text/javascript">
+    $to = '<'.$to.'>';
-                            $(function() {
+    $boundary = '--' . md5( uniqid("myboundary") );
-                                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+    $priorities = array( '1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)' );
-                                $( "#dialog-message" ).dialog({
+    $priority = $priorities[2];
-                                    modal: true,
+    $ctencoding = "8bit";
-                                    buttons: {
+    $sep = chr(13) . chr(10);
-                                        Ok: function() {
+    $disposition = "inline";
-                                            $( this ).dialog( "close" );
+    $subject = "=?$charset?B?".base64_encode($subject)."?=";
-                                        }
+    $header = "From: $from \nX-Priority: $priority\nCC:\n";
-                                    }
+    $header .= "Mime-Version: 1.0\nContent-Type: text/plain; charset=$charset \n";
-                                });
+    $header .= "Content-Transfer-Encoding: $ctencoding\nX-Mailer: Php/libMailv1.3\n";
-                            });
+    $message = $mailtext;
-                    </script>
+    mail($to, $subject, $message, $header);
-                    <div id="dialog-message" title="Error">
+}
-                        <p>';
+
-        echo $_SESSION['error_msg'];
+function display_error_block() {
-        echo "</p>\n                        </div>\n";
+    if (!empty($_SESSION['error_msg'])) {
-        unset($_SESSION['error_msg']);
+        echo '
-    }
+                        <script type="text/javascript">
-}
+                            $(function() {
+                                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                $( "#dialog-message" ).dialog({
+                                    modal: true,
+                                    buttons: {
+                                        Ok: function() {
+                                            $( this ).dialog( "close" );
+                                        }
+                                    }
+                                });
+                            });
+                    </script>
+                    <div id="dialog-message" title="Error">
+                        <p>';
+        echo $_SESSION['error_msg'];
+        echo "</p>\n                        </div>\n";
+        unset($_SESSION['error_msg']);
+    }
+}
 ?>

web/js/events.js

@@ -1,124 +1,124 @@
-// Init kinda namespace object
+// Init kinda namespace object
-var VE = { // Vesta Events object
+var VE = { // Vesta Events object
-    core: {}, // core functions
+    core: {}, // core functions
-    callbacks: { // events callback functions
+    callbacks: { // events callback functions
-        click: {},
+        click: {},
-        mouseover: {},
+        mouseover: {},
-        mouseout: {},
+        mouseout: {},
-        keypress: {}
+        keypress: {}
-    },
+    },
-    helpers: {}, // simple handy methods
+    helpers: {}, // simple handy methods
-    tmp: {}
+    tmp: {}
-};
+};
-
+
-/*
+/*
- * Main method that invokes further event processing
+ * Main method that invokes further event processing
- * @param root is root HTML DOM element that. Pass HTML DOM Element or css selector
+ * @param root is root HTML DOM element that. Pass HTML DOM Element or css selector
- * @param event_type (eg: click, mouseover etc..)
+ * @param event_type (eg: click, mouseover etc..)
- */
+ */
-VE.core.register = function(root, event_type) {
+VE.core.register = function(root, event_type) {
-    var root = !root ? 'body' : root; // if elm is not passed just bind events to body DOM Element
+    var root = !root ? 'body' : root; // if elm is not passed just bind events to body DOM Element
-    var event_type = !event_type ? 'click' : event_type; // set event type to "click" by default
+    var event_type = !event_type ? 'click' : event_type; // set event type to "click" by default
-    $(root).bind(event_type, function(evt) {
+    $(root).bind(event_type, function(evt) {
-        var elm = $(evt.target);
+        var elm = $(evt.target);
-        VE.core.dispatch(evt, elm, event_type); // dispatch captured event
+        VE.core.dispatch(evt, elm, event_type); // dispatch captured event
-    });
+    });
-}
+}
-
+
-/*
+/*
- * Dispatch event that was previously registered
+ * Dispatch event that was previously registered
- * @param evt related event object
+ * @param evt related event object
- * @param elm that was catched
+ * @param elm that was catched
- * @param event_type (eg: click, mouseover etc..)
+ * @param event_type (eg: click, mouseover etc..)
- */
+ */
-VE.core.dispatch = function(evt, elm, event_type) {
+VE.core.dispatch = function(evt, elm, event_type) {
-    if ('undefined' == typeof VE.callbacks[event_type]) {
+    if ('undefined' == typeof VE.callbacks[event_type]) {
-        return VE.helpers.warn('There is no corresponding object that should contain event callbacks for "'+event_type+'" event type');
+        return VE.helpers.warn('There is no corresponding object that should contain event callbacks for "'+event_type+'" event type');
-    }
+    }
-    // get class of element
+    // get class of element
-    var classes = $(elm).attr('class');
+    var classes = $(elm).attr('class');
-    // if no classes are attached, then just stop any further processings
+    // if no classes are attached, then just stop any further processings
-    if (!classes) {
+    if (!classes) {
-        return; // no classes assigned
+        return; // no classes assigned
-    }
+    }
-    // split the classes and check if it related to function
+    // split the classes and check if it related to function
-    $(classes.split(/\s/)).each(function(i, key) {
+    $(classes.split(/\s/)).each(function(i, key) {
-        VE.callbacks[event_type][key] && VE.callbacks[event_type][key](evt, elm);
+        VE.callbacks[event_type][key] && VE.callbacks[event_type][key](evt, elm);
-    });
+    });
-}
+}
-
+
-//
+//
-//  CALLBACKS
+//  CALLBACKS
-//
+//
-
+
-
+
-
+
-/*
+/*
- * Suspend action
+ * Suspend action
- */
+ */
-VE.callbacks.click.do_suspend = function(evt, elm) {
+VE.callbacks.click.do_suspend = function(evt, elm) {
-     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
+     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
-     var url = $('input[name="suspend_url"]', ref).val();
+     var url = $('input[name="suspend_url"]', ref).val();
-     var dialog_elm = ref.find('.confirmation-text-suspention');
+     var dialog_elm = ref.find('.confirmation-text-suspention');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm SUSPEND', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
-}
+}
-
+
-/*
+/*
- * Unsuspend action
+ * Unsuspend action
- */
+ */
-VE.callbacks.click.do_unsuspend = function(evt, elm) {
+VE.callbacks.click.do_unsuspend = function(evt, elm) {
-     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
+     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
-     var url = $('input[name="unsuspend_url"]', ref).val();
+     var url = $('input[name="unsuspend_url"]', ref).val();
-     var dialog_elm = ref.find('.confirmation-text-suspention');
+     var dialog_elm = ref.find('.confirmation-text-suspention');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm UNSUSPEND', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
-}
+}
-
+
-/*
+/*
- * Delete action
+ * Delete action
- */
+ */
-VE.callbacks.click.do_delete = function(evt, elm) {
+VE.callbacks.click.do_delete = function(evt, elm) {
-     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
+     var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
-     var url = $('input[name="delete_url"]', ref).val();
+     var url = $('input[name="delete_url"]', ref).val();
-     var dialog_elm = ref.find('.confirmation-text-delete');
+     var dialog_elm = ref.find('.confirmation-text-delete');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm DELETE', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
-}
+}
-
+
-
+
-/*
+/*
- * Create dialog box on the fly
+ * Create dialog box on the fly
- * @param elm Element which contains the dialog contents
+ * @param elm Element which contains the dialog contents
- * @param dialog_title 
+ * @param dialog_title 
- * @param confirmed_location_url URL that will be redirected to if user hit "OK"
+ * @param confirmed_location_url URL that will be redirected to if user hit "OK"
- * @param custom_config Custom configuration parameters passed to dialog initialization (optional)
+ * @param custom_config Custom configuration parameters passed to dialog initialization (optional)
- */
+ */
-VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_location_url, custom_config) {
+VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_location_url, custom_config) {
-    var custom_config = !custom_config ? {} : custom_config;
+    var custom_config = !custom_config ? {} : custom_config;
-    var config = {
+    var config = {
-        modal: true,
+        modal: true,
-        autoOpen: true,
+        autoOpen: true,
-        width: 360,
+        width: 360,
-        title: dialog_title,
+        title: dialog_title,
-        close: function() {
+        close: function() {
-            $(this).dialog("destroy");
+            $(this).dialog("destroy");
-        },
+        },
-        buttons: {
+        buttons: {
-            "Ok": function(event, ui) {
+            "Ok": function(event, ui) {
-                 location.href = confirmed_location_url;
+                 location.href = confirmed_location_url;
-            },
+            },
-            "Cancel": function() {
+            "Cancel": function() {
-                $(this).dialog("close");
+                $(this).dialog("close");
-                $(this).dialog("destroy");
+                $(this).dialog("destroy");
-            }
+            }
-        }
+        }
-    }
+    }
-    config = $.extend(config, custom_config);
+    config = $.extend(config, custom_config);
-    var reference_copied = $(elm).clone();
+    var reference_copied = $(elm).clone();
-    $(reference_copied).dialog(config);
+    $(reference_copied).dialog(config);
-}
+}
-
+
-/*
+/*
- * Simple debug output
+ * Simple debug output
- */
+ */
-VE.helpers.warn = function(msg) {
+VE.helpers.warn = function(msg) {
-    alert('WARNING: ' + msg);
+    alert('WARNING: ' + msg);
-}
+}

web/list/log/index.php

@@ -1,25 +1,24 @@
-<?php
+<?php
-// Init
+// Init
-error_reporting(NULL);
+error_reporting(NULL);
-session_start();
+session_start();
-$TAB = 'LOG';
+$TAB = 'LOG';
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
-
+
-// Header
+// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
+include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
+
-// Panel
+// Panel
-top_panel($user,$TAB);
+top_panel($user,$TAB);
-
+
-// Data
+// Data
-exec (VESTA_CMD."v-list-user-log $user json", $output, $return_var);
+exec (VESTA_CMD."v-list-user-log $user json", $output, $return_var);
-check_error($return_var);
+check_error($return_var);
-$data = json_decode(implode('', $output), true);
+$data = json_decode(implode('', $output), true);
-$data = array_reverse($data);
+$data = array_reverse($data);
-unset($output);
+unset($output);
-
+
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_log.html');
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_log.html');
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_log.html');
+
-
+// Footer
-// Footer
+include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/list/services/index.php

@@ -0,0 +1,23 @@
+<?php
+// Init
+error_reporting(NULL);
+session_start();
+$TAB = 'SERVICES';
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+// Header
+include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
+
+// Panel
+top_panel($user,$TAB);
+
+// Data
+if ($_SESSION['user'] == 'admin') {
+    exec (VESTA_CMD."v-list-sys-services json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    unset($output);
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_services.html');
+}
+
+// Footer
+include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/restart/service/index.php

@@ -0,0 +1,22 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    if (!empty($_GET['srv'])) {
+        $v_service = escapeshellarg($_GET['srv']);
+        exec (VESTA_CMD."v-restart-service ".$v_service, $output, $return_var);
+    }
+    if ($return_var != 0) {
+        $error = implode('<br>', $output);
+        if (empty($error)) $error = 'Error: service '.$v_service.' restart failed';
+            $_SESSION['error_srv'] = $error;
+    }
+    unset($output);
+}
+
+header("Location: /list/services/");
+exit;

web/start/service/index.php

@@ -0,0 +1,22 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    if (!empty($_GET['srv'])) {
+        $v_service = escapeshellarg($_GET['srv']);
+        exec (VESTA_CMD."v-start-service ".$v_service, $output, $return_var);
+    }
+    if ($return_var != 0) {
+        $error = implode('<br>', $output);
+        if (empty($error)) $error = 'Error: service '.$v_service.' start failed';
+            $_SESSION['error_srv'] = $error;
+    }
+    unset($output);
+}
+
+header("Location: /list/services/");
+exit;

web/stop/service/index.php

@@ -0,0 +1,22 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    if (!empty($_GET['srv'])) {
+        $v_service = escapeshellarg($_GET['srv']);
+        exec (VESTA_CMD."v-stop-service ".$v_service, $output, $return_var);
+    }
+    if ($return_var != 0) {
+        $error = implode('<br>', $output);
+        if (empty($error)) $error = 'Error: service '.$v_service.' stop failed';
+            $_SESSION['error_srv'] = $error;
+    }
+    unset($output);
+}
+
+header("Location: /list/services/");
+exit;

web/templates/admin/add_db.html

@@ -1,184 +1,184 @@
-<?php
+<?php
-                                    $back = $_SESSION['back'];
+                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
+                                    if (empty($back)) {
-                                        $back = "location.href='/list/db/'";
+                                        $back = "location.href='/list/db/'";
-                                    } else {
+                                    } else {
-                                        $back = "location.href='".$back."'";
+                                        $back = "location.href='".$back."'";
-                                    }
+                                    }
-                                ?>
+                                ?>
-
+
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-    <tr>
+    <tr>
-        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding database');?></b></a>
+        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding database');?></b></a>
-            <?php
+            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
+                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-            } else {
+            } else {
-            if (!empty($_SESSION['ok_msg'])) {
+            if (!empty($_SESSION['ok_msg'])) {
-            echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+            echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-            }
+            }
-            }
+            }
-            ?>
+            ?>
-        </td>
+        </td>
-    </tr>
+    </tr>
-</table>
+</table>
-</td>
+</td>
-</tr>
+</tr>
-</table>
+</table>
-
+
-<form id="vstobjects" name="v_add_db" method="post">
+<form id="vstobjects" name="v_add_db" method="post">
-    <script type="text/javascript">
+    <script type="text/javascript">
-        function elementHideShow(elementToHideOrShow) {
+        function elementHideShow(elementToHideOrShow) {
-            var el = document.getElementById(elementToHideOrShow);
+            var el = document.getElementById(elementToHideOrShow);
-            if (el.style.display == "block") {
+            if (el.style.display == "block") {
-                el.style.display = "none";
+                el.style.display = "none";
-            } else {
+            } else {
-                el.style.display = "block";
+                el.style.display = "block";
-            }
+            }
-        }
+        }
-        function randomString() {
+        function randomString() {
-            var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+            var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-            var string_length = 10;
+            var string_length = 10;
-            var randomstring = '';
+            var randomstring = '';
-            for (var i=0; i<string_length; i++) {
+            for (var i=0; i<string_length; i++) {
-                var rnum = Math.floor(Math.random() * chars.length);
+                var rnum = Math.floor(Math.random() * chars.length);
-                randomstring += chars.substring(rnum,rnum+1);
+                randomstring += chars.substring(rnum,rnum+1);
-            }
+            }
-            document.v_add_db.v_password.value = randomstring;
+            document.v_add_db.v_password.value = randomstring;
-        }
+        }
-    </script>
+    </script>
-
+
-    <table class='data'>
+    <table class='data'>
-        <tr class="data-add">
+        <tr class="data-add">
-            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                <table class="data-col1">
+                <table class="data-col1">
-                    <tr><td style="padding: 18 0 4 18;"></td></tr>
+                    <tr><td style="padding: 18 0 4 18;"></td></tr>
-                </table>
+                </table>
-            </td>
+            </td>
-            <td class="data-dotted" width="830px" style="vertical-align:top;">
+            <td class="data-dotted" width="830px" style="vertical-align:top;">
-                <table width="830px">
+                <table width="830px">
-                    <tr>
+                    <tr>
-                        <td></td>
+                        <td></td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-                <table class="data-col2" width="600px">
+                <table class="data-col2" width="600px">
-                    <tr>
+                    <tr>
-                        <td style="padding: 10 0 0 2px; color:99a7af;" >
+                        <td style="padding: 10 0 0 2px; color:99a7af;" >
-                            <?php print _('DB_PREFIX_WILL_BE_ADDED',$user."_");?>
+                            <?php print _('DB_PREFIX_WILL_BE_ADDED',$user."_");?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
+                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Database');?>
+                            <?php print _('Database');?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
+                            <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Username');?>
+                            <?php print _('Username');?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
+                            <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                            <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_password">
+                            <input type="text" size="20" class="vst-input" name="v_password">
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
+                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Type');?>
+                            <?php print _('Type');?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <select class="vst-list" name="v_type">
+                            <select class="vst-list" name="v_type">
-                                <?php
+                                <?php
-                                                        foreach ($db_types as $key => $value) {
+                                                        foreach ($db_types as $key => $value) {
-                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                echo "\t\t\t\t<option value=\"".$value."\"";
-                                if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
+                                if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
-                                echo ">".$value."</option>\n";
+                                echo ">".$value."</option>\n";
-                                }
+                                }
-                                ?>
+                                ?>
-                            </select>
+                            </select>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
+                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Charset');?>
+                            <?php print _('Charset');?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <select class="vst-list" name="v_charset">
+                            <select class="vst-list" name="v_charset">
-                                <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
+                                <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
-                                <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
+                                <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
-                                <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
+                                <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
-                                <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
+                                <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
-                                <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
+                                <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
-                                <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
+                                <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
-                                <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
+                                <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
-                                <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
+                                <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
-                                <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
+                                <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
-                                <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
+                                <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
-                                <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
+                                <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
-                                <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
+                                <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
-                                <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
+                                <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
-                                <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
+                                <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
-                                <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
+                                <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
-                                <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
+                                <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
-                                <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
+                                <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
-                                <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
+                                <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
-                                <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
+                                <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
-                                <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
+                                <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
-                                <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
+                                <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
-                                <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
+                                <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
-                                <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
+                                <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
-                                <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
+                                <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
-                                <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
+                                <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
-                                <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
+                                <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
-                                <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
+                                <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
-                                <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
+                                <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
-                                <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
+                                <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
-                                <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
+                                <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
-                                <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
+                                <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
-                                <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
+                                <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
-                                <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
+                                <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
-                                <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
+                                <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
-                                <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
+                                <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
-                                <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
+                                <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
-                            </select>
+                            </select>
-                        </td>
+                        </td>
-                    <tr>
+                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Send credentials to'); echo $panel[$user]['CONTACT'] ?>
+                            <?php print _('Send credentials to'); echo $panel[$user]['CONTACT'] ?>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <input type="checkbox" size="20" class="vst-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>>
+                            <input type="checkbox" size="20" class="vst-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td style="padding: 24px 0 0 0;">
+                        <td style="padding: 24px 0 0 0;">
-                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
-                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-            </td>
+            </td>
-        </tr>
+        </tr>
-    </table>
+    </table>
-</form>
+</form>

web/templates/admin/list_dns.html

@@ -1,146 +1,146 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-    <tr>
+    <tr>
-        <td style="padding: 12px 0 8px 6px">
+        <td style="padding: 12px 0 8px 6px">
-            <div style="float:left">
+            <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
+                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
-            </div>
+            </div>
-            <div style="text-align: right; float: right;">
+            <div style="text-align: right; float: right;">
-                <form action="/search/" method="get">
+                <form action="/search/" method="get">
-                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                </form>
+                </form>
-            </div>
+            </div>
-            <div style="float:left; padding-left: 26px;">
+            <div style="float:left; padding-left: 26px;">
-                <form action="/bulk/dns/" method="post" id="objects">
+                <form action="/bulk/dns/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                    <select style="margin:0 2px 0 0px;" name="action">
+                    <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
+                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('suspend');?></option>
+                        <option><?php print _('suspend');?></option>
-                        <option><?php print _('unsuspend');?></option>
+                        <option><?php print _('unsuspend');?></option>
-                        <option><?php print _('delete');?></option>
+                        <option><?php print _('delete');?></option>
-                    </select>
+                    </select>
-                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-            </div>
+            </div>
-        </td>
+        </td>
-    </tr>
+    </tr>
-</table>
+</table>
-</td>
+</td>
-</tr>
+</tr>
-</table>
+</table>
-
+
-<div id="vstobjects">
+<div id="vstobjects">
-    <table class="data">
+    <table class="data">
-        <?php
+        <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-        ++$i;
+        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
+        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
+        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
+        $spnd_action = 'unsuspend' ;
-        } else {
+        } else {
-        $status = 'active';
+        $status = 'active';
-        $spnd_action = 'suspend' ;
+        $spnd_action = 'suspend' ;
-        }
+        }
-        ?>
+        ?>
-
+
-        <tr class="data-row">
+        <tr class="data-row">
-            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                <table class="data-col1">
+                <table class="data-col1">
-                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status) ?></b></td></tr>
+                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status) ?></b></td></tr>
-                </table>
+                </table>
-            </td>
+            </td>
-            <td class="data-dotted" width="830px" style="vertical-align:top;">
+            <td class="data-dotted" width="830px" style="vertical-align:top;">
-                <table width="830px">
+                <table width="830px">
-                    <tr>
+                    <tr>
-                        <td></td>
+                        <td></td>
-                        <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> </a></td>
+                        <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> </a></td>
-                        <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add record');?></a></td>
+                        <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add record');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
+                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
+                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
+                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
+                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
+                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
-                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                        <td class="data-controls do_delete" width="70px">
+                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
+                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
+                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-                <table class="data-col2" width="830px">
+                <table class="data-col2" width="830px">
-                    <tr>
+                    <tr>
-                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                            <b><?php echo $key ?></b>
+                            <b><?php echo $key ?></b>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td style="vertical-align:top;" >
+                        <td style="vertical-align:top;" >
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name" style="padding: 2px 0 0 2px;">
+                                    <td class="counter-name" style="padding: 2px 0 0 2px;">
-                                        <?php echo $data[$key]['IP'] ?>
+                                        <?php echo $data[$key]['IP'] ?>
-                                    </td>
+                                    </td>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name" style="padding: 0 0 20px 2px">
+                                    <td class="counter-name" style="padding: 0 0 20px 2px">
-                                        [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?>
+                                        [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                        <td style="vertical-align:top;" width="250">
+                        <td style="vertical-align:top;" width="250">
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">SOA:</td>
+                                    <td class="counter-name">SOA:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                    <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">TTL:</td>
+                                    <td class="counter-name">TTL:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
+                                    <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                        <td rowspan=4 style="vertical-align:top;" width="300">
+                        <td rowspan=4 style="vertical-align:top;" width="300">
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name"><?php print _('Expire');?>:</td>
+                                    <td class="counter-name"><?php print _('Expire');?>:</td>
-                                    <td class="counter-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></td>
+                                    <td class="counter-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name"><?php print _('Records');?>:</td>
+                                    <td class="counter-name"><?php print _('Records');?>:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
+                                    <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-            </td>
+            </td>
-        </tr>
+        </tr>
-        <?php
+        <?php
-                                }
+                                }
-                            ?>
+                            ?>
-    </table>
+    </table>
-    </form>
+    </form>
-
+
-    <table class="data-count">
+    <table class="data-count">
-        <tr>
+        <tr>
-            <td width="160px"></td>
+            <td width="160px"></td>
-            <td>
+            <td>
-                <?php
+                <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo _('one domain');
+                                            echo _('one domain');
-                                        } else {
+                                        } else {
-                                            echo _('%s domains',$i);
+                                            echo _('%s domains',$i);
-                                        }
+                                        }
-                                    ?>
+                                    ?>
-            </td>
+            </td>
-        </tr>
+        </tr>
-    </table>
+    </table>
-</div>
+</div>

web/templates/admin/list_dns_rec.html

@@ -1,115 +1,115 @@
-<table class="sub-menu" style="background: white;">
+                               <table class="sub-menu" style="background: white;">
-    <tr>
+                                    <tr>
-        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-            <div style="float:left">
+                                            <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add DNS Record');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add DNS Record');?> </button>
-            </div>
+                                            </div>
-            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                <form action="/search/" method="get">
+                                                <form action="/search/" method="get">
-                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                </form>
+                                                </form>
-            </div>
+                                            </div>
-            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                <form action="/bulk/dns/" method="post" id="objects">
+                                                <form action="/bulk/dns/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                    <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
+                                                    <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('suspend');?></option>
+                                                    <option><?php print _('suspend');?></option>
-                        <option><?php print _('unsuspend');?></option>
+                                                    <option><?php print _('unsuspend');?></option>
-                        <option><?php print _('delete');?></option>
+                                                    <option><?php print _('delete');?></option>
-                    </select>
+                                                </select>
-                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-            </div>
+                                            </div>
-        </td>
+                                        </td>
-    </tr>
+                                    </tr>
-</table>
+                                </table>
-</td>
+                            </td>
-</tr>
+                        </tr>
-</table>
+                    </table>
-
+<div id="vstobjects">
-<div id="vstobjects">
+    <div style="height:10px; font-size:0;"></div>
-    <div style="height:10px; font-size:0;"></div>
+    <table class="data" style="background: #ebe9dc;">
-    <table class="data" style="background: #ebe9dc;">
+        <tr>
-        <tr>
+            <td style="padding: 8px 2px 8px 0;">
-            <td style="padding: 8px 2px 8px 0;">
+                <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+            </td>
-            </td>
+        </tr>
-        </tr>
+    </table>
-    </table>
+    <div style="height:10px; font-size:0;"></div>
-    <div style="height:10px; font-size:0;"></div>
+    <table class="data">
-    <table class="data">
+        <?php
-        <?php
+
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-        ++$i;
+        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
+        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
+        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
+        $spnd_action = 'unsuspend' ;
-        } else {
+        } else {
-        $status = 'active';
+        $status = 'active';
-        $spnd_action = 'suspend' ;
+        $spnd_action = 'suspend' ;
-        }
+        }
-        ?>
+        ?>
-
+
-        <tr class="data-row">
+        <tr class="data-row">
-            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                <table class="data-col1">
+                <table class="data-col1">
-                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
-                </table>
+                </table>
-            </td>
+            </td>
-            <td class="data-dotted" width="830px" style="vertical-align:top;">
+            <td class="data-dotted" width="830px" style="vertical-align:top;">
-                <table width="830px">
+                <table width="830px">
-                    <tr>
+                    <tr>
-                        <td></td>
+                        <td></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
+                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
+                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
+                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
+                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_($spnd_action),$data[$key]['RECORD']);?></p>
+                                <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_($spnd_action),$data[$key]['RECORD']);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                        <td class="data-controls do_delete" width="70px">
+                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
+                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
+                                <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-                <table class="data-col5" width="780px">
+                <table class="data-col5" width="780px">
-                    <tr>
+                    <tr>
-                        <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                        <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                        <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                        <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                        <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                        <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                        <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
+                        <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-            </td>
+            </td>
-        </tr>
+        </tr>
-        <?php
+        <?php
-                            }
+                            }
-                        ?>
+                        ?>
-    </table>
+    </table>
-    </form>
+    </form>
-
+
-    <table class="data-count">
+    <table class="data-count">
-        <tr>
+        <tr>
-            <td width="160px">
+            <td width="160px">
-            <td>
+            <td>
-                <?php
+                <?php
-                                    if ( $i == 1) {
+                                    if ( $i == 1) {
-                                        echo _('one DNS record');
+                                        echo _('one DNS record');
-                                    } else {
+                                    } else {
-                                        echo _('%s DNS records',$i);
+                                        echo _('%s DNS records',$i);
-                                    }
+                                    }
-                                ?>
+                                ?>
-            </td>
+            </td>
-        </tr>
+        </tr>
-    </table>
+    </table>
-</div>
+</div>

web/templates/admin/list_mail.html

@@ -1,173 +1,173 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-    <tr>
+    <tr>
-        <td style="padding: 12px 0 8px 6px">
+        <td style="padding: 12px 0 8px 6px">
-            <div style="float:left">
+            <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
+                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
-            </div>
+            </div>
-            <div style="text-align: right; float: right;">
+            <div style="text-align: right; float: right;">
-                <form action="/search/" method="get" >
+                <form action="/search/" method="get" >
-                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                </form>
+                </form>
-            </div>
+            </div>
-            <div style="float:left; padding-left: 26px;">
+            <div style="float:left; padding-left: 26px;">
-                <form action="/bulk/mail/" method="post" id="objects">
+                <form action="/bulk/mail/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                    <select style="margin:0 2px 0 0px;" name="action">
+                    <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
+                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('suspend');?></option>
+                        <option><?php print _('suspend');?></option>
-                        <option><?php print _('unsuspend');?></option>
+                        <option><?php print _('unsuspend');?></option>
-                        <option><?php print _('delete');?></option>
+                        <option><?php print _('delete');?></option>
-                    </select>
+                    </select>
-                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-            </div>
+            </div>
-        </td>
+        </td>
-    </tr>
+    </tr>
-</table>
+</table>
-</td>
+</td>
-</tr>
+</tr>
-</table>
+</table>
-
+
-<div id="vstobjects">
+<div id="vstobjects">
-    <table class="data">
+    <table class="data">
-        <?php
+        <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
+                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-        ++$i;
+        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
+        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
+        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
+        $spnd_action = 'unsuspend' ;
-        } else {
+        } else {
-        $status = 'active';
+        $status = 'active';
-        $spnd_action = 'suspend' ;
+        $spnd_action = 'suspend' ;
-        }
+        }
-        if (empty($data[$key]['CATCHALL'])) {
+        if (empty($data[$key]['CATCHALL'])) {
-        $data[$key]['CATCHALL'] = '/dev/null';
+        $data[$key]['CATCHALL'] = '/dev/null';
-        }
+        }
-        ?>
+        ?>
-
+
-        <tr class="data-row">
+        <tr class="data-row">
-            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                <table class="data-col1">
+                <table class="data-col1">
-                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                    <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
-                </table>
+                </table>
-            </td>
+            </td>
-            <td class="data-dotted" width="830px" style="vertical-align:top;">
+            <td class="data-dotted" width="830px" style="vertical-align:top;">
-                <table width="830px">
+                <table width="830px">
-                    <tr>
+                    <tr>
-                        <td></td>
+                        <td></td>
-                        <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('list');?> <?php echo $data[$key]['ACCOUNTS'] ?> <?php print _('accounts');?></a></td>
+                        <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('list');?> <?php echo $data[$key]['ACCOUNTS'] ?> <?php print _('accounts');?></a></td>
-                        <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add account');?></a></td>
+                        <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add account');?></a></td>
-                        <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open webmail');?></a></td>
+                        <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open webmail');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
+                        <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
+                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
+                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
+                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
+                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
-                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('MAIL_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                <p class="counter-value"><?php print _('MAIL_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                        <td class="data-controls do_delete" width="70px">
+                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
+                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
+                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                <p class="counter-value"><?php print _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                <p class="counter-value"><?php print _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                            </div>
+                            </div>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-
+
-                <table class="data-col2" width="830px">
+                <table class="data-col2" width="830px">
-                    <tr>
+                    <tr>
-                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                            <b><?php echo $key ?></b>
+                            <b><?php echo $key ?></b>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                    <tr>
+                    <tr>
-                        <td style="vertical-align:top;" >
+                        <td style="vertical-align:top;" >
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name" style="padding: 2px 0 2px 0">
+                                    <td class="counter-name" style="padding: 2px 0 2px 0">
-                                        <?php print _('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?>
+                                        <?php print _('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td class="chart1">
+                                    <td class="chart1">
-                                        <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                        <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
-                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                        </div>
+                                        </div>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                        <td style="vertical-align:top;" width="250">
+                        <td style="vertical-align:top;" width="250">
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">
+                                    <td class="counter-name">
-                                        <?php print _('AntiVirus Support');?>:
+                                        <?php print _('AntiVirus Support');?>:
-                                    </td>
+                                    </td>
-                                    <td class="counter-value">
+                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ANTIVIRUS'] ?>
+                                        <?php echo $data[$key]['ANTIVIRUS'] ?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">
+                                    <td class="counter-name">
-                                        <?php print _('AntiSpam Support');?>:
+                                        <?php print _('AntiSpam Support');?>:
-                                    </td>
+                                    </td>
-                                    <td class="counter-value">
+                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ANTISPAM'] ?>
+                                        <?php echo $data[$key]['ANTISPAM'] ?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                        <td rowspan=4 style="vertical-align:top;" width="300">
+                        <td rowspan=4 style="vertical-align:top;" width="300">
-                            <table>
+                            <table>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">
+                                    <td class="counter-name">
-                                        <?php print _('DKIM Support');?>:
+                                        <?php print _('DKIM Support');?>:
-                                    </td>
+                                    </td>
-                                    <td class="counter-value">
+                                    <td class="counter-value">
-                                        <?php echo $data[$key]['DKIM'] ?>
+                                        <?php echo $data[$key]['DKIM'] ?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td class="counter-name">
+                                    <td class="counter-name">
-                                        <?php print _('Accounts');?>:
+                                        <?php print _('Accounts');?>:
-                                    </td>
+                                    </td>
-                                    <td class="counter-value">
+                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ACCOUNTS'] ?>
+                                        <?php echo $data[$key]['ACCOUNTS'] ?>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>
-                        </td>
+                        </td>
-                    </tr>
+                    </tr>
-                </table>
+                </table>
-            </td>
+            </td>
-        </tr>
+        </tr>
-
+
-        <?php
+        <?php
-                                }
+                                }
-                            ?>
+                            ?>
-    </table>
+    </table>
-    </form>
+    </form>
-
+
-    <table class="data-count">
+    <table class="data-count">
-        <tr>
+        <tr>
-            <td width="160px"></td>
+            <td width="160px"></td>
-            <td>
+            <td>
-                <?php
+                <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo _('one domain with email');
+                                            echo _('one domain with email');
-                                        } else {
+                                        } else {
-                                            echo _('%s domains with email',$i);
+                                            echo _('%s domains with email',$i);
-                                        }
+                                        }
-                                    ?>
+                                    ?>
-            </td>
+            </td>
-        </tr>
+        </tr>
-    </table>
+    </table>
-</div>
+</div>

web/templates/admin/list_mail_acc.html

@@ -1,162 +1,162 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add Mail Account');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add Mail Account');?> </button>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get">
+                                                <form action="/search/" method="get">
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                                                <form action="/bulk/mail/" method="post" id="objects">
+                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                                                    <option><?php print _('apply to selected');?></option>
+                                                    <option><?php print _('apply to selected');?></option>
-                                                    <option><?php print _('suspend');?></option>
+                                                    <option><?php print _('suspend');?></option>
-                                                    <option><?php print _('unsuspend');?></option>
+                                                    <option><?php print _('unsuspend');?></option>
-                                                    <option><?php print _('delete');?></option>
+                                                    <option><?php print _('delete');?></option>
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
+                        <table class="data" style="background: #ebe9dc;">
-                            <tr>
+                            <tr>
-                                <td style="padding: 8px 2px 8px 0;">
+                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
+                        <table class="data">
-                            <?php
+                            <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
+                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend' ;
-                                    } else {
+                                    } else {
-                                        $status = 'active';
+                                        $status = 'active';
-                                        $spnd_action = 'suspend';
+                                        $spnd_action = 'suspend';
-                                    }
+                                    }
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                                    <table class="data-col1">
+                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
+                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
+                                            <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                                                <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
+                                                <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                                                <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
+                                                <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                    <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                            <td class="data-controls do_delete" width="70px">
+                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
+                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                    <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                </table>
+                                </table>
-
+
-                                <table class="data-col2" width="830px">
+                                <table class="data-col2" width="830px">
-                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-                                    <tr>
+                                    <tr>
-                                        <td style="vertical-align:top;" >
+                                        <td style="vertical-align:top;" >
-                                            <table>
+                                            <table>
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
+                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                        <?php echo $data[$key]['IP'] ?>
+                                                        <?php echo $data[$key]['IP'] ?>
-                                                    </td>
+                                                    </td>
-                                                <tr>
+                                                <tr>
-                                                    <td class="chart1" style="padding: 0 0 2px 0">
+                                                    <td class="chart1" style="padding: 0 0 2px 0">
-                                                        <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                        <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
-                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                        </div>
+                                                        </div>
-                                                    </td>
+                                                    </td>
-                                                </tr>
+                                                </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                        <td style="vertical-align:top;" width="200">
+                                        <td style="vertical-align:top;" width="200">
-                                            <table>
+                                            <table>
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name">
+                                                    <td class="counter-name">
-                                                        <?php print _('Quota');?>:
+                                                        <?php print _('Quota');?>:
-                                                    </td>
+                                                    </td>
-                                                    <td class="counter-value">
+                                                    <td class="counter-value">
-                                                        <?php echo $data[$key]['QUOTA'] ?>
+                                                        <?php echo $data[$key]['QUOTA'] ?>
-                                                    </td>
+                                                    </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Autoreply');?>:
+                                                            <?php print _('Autoreply');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
+                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                        <td rowspan=4 style="vertical-align:top;" width="350">
+                                        <td rowspan=4 style="vertical-align:top;" width="350">
-                                            <table width="350">
+                                            <table width="350">
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name">
+                                                    <td class="counter-name">
-                                                        <?php print _('Forward to');?>:
+                                                        <?php print _('Forward to');?>:
-                                                    </td>
+                                                    </td>
-                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
+                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
-                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
+                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                    </td>
+                                                    </td>
-                                                </tr>
+                                                </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-
+
-                        <?php
+                        <?php
-                            }
+                            }
-                        ?>
+                        ?>
-                    </table>
+                    </table>
-                    </form>
+                    </form>
-
+
-                    <table class="data-count">
+                    <table class="data-count">
-                        <tr>
+                        <tr>
-                            <td width="160px"></td>
+                            <td width="160px"></td>
-                            <td>
+                            <td>
-                                <?php
+                                <?php
-                                    if ( $i == 1) {
+                                    if ( $i == 1) {
-                                        echo _('one mail account');
+                                        echo _('one mail account');
-                                    } else {
+                                    } else {
-                                        echo _('%s mail accounts',$i);
+                                        echo _('%s mail accounts',$i);
-                                    }
+                                    }
-                                ?>
+                                ?>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-                </div>
+                </div>

web/templates/admin/list_rrd.html

@@ -1,72 +1,72 @@
-
+
-                                <table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 0 16px">
+                                        <td style="padding: 12px 0 0 16px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <a class="vst" <?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "style='color: #34536A'" ?> href="?period=daily"><?php print _('Daily');?></a>
+                                                <a class="vst" <?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "style='color: #174f82'" ?> href="?period=daily"><?php print _('Daily');?></a>
-                                                <a class="vst" <?php if ($_GET['period'] == 'weekly') echo "style='color: #34536A'" ?> href="?period=weekly"><?php print _('Weekly');?></a>
+                                                <a class="vst" <?php if ($_GET['period'] == 'weekly') echo "style='color: #174f82'" ?> href="?period=weekly"><?php print _('Weekly');?></a>
-                                                <a class="vst" <?php if ($_GET['period'] == 'monthly') echo "style='color: #34536A'" ?> href="?period=monthly"><?php print _('Monthly');?></a>
+                                                <a class="vst" <?php if ($_GET['period'] == 'monthly') echo "style='color: #174f82'" ?> href="?period=monthly"><?php print _('Monthly');?></a>
-                                                <a class="vst" <?php if ($_GET['period'] == 'yearly') echo "style='color: #34536A'" ?> href="?period=yearly"><?php print _('Yearly');?></a>
+                                                <a class="vst" <?php if ($_GET['period'] == 'yearly') echo "style='color: #174f82'" ?> href="?period=yearly"><?php print _('Yearly');?></a>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get" >
+                                                <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <table class='data'>
+                        <table class='data'>
-                            <?php
+                            <?php
-                                if (empty($_GET['period'])) {
+                                if (empty($_GET['period'])) {
-                                    $period='daily';
+                                    $period='daily';
-                                } else {
+                                } else {
-                                    $period=$_GET['period'];
+                                    $period=$_GET['period'];
-                                }
+                                }
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
-                                    <table class="data-col1" width="150">
+                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="80px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"><img src="/images/download.png" width="8px" height="8px"> <?php print _('download');?></a></td>
+                                            <td class="data-controls" width="80px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"><img src="/images/download.png" width="8px" height="8px"> <?php print _('download');?></a></td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                    <table class="data-col2" width="830px">
+                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo $data[$key]['TITLE'] ?></b></td></tr>
+                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo $data[$key]['TITLE'] ?></b></td></tr>
-                                        <tr>
+                                        <tr>
-                                            <td style="vertical-align:top;" width="630px">
+                                            <td style="vertical-align:top;" width="630px">
-                                                <table width="630px">
+                                                <table width="630px">
-                                                    </tr>
+                                                    </tr>
-                                                        <td style="background: #7a766d;" width="630px" height="250px">
+                                                        <td style="background: #7a766d;" width="630px" height="250px">
-                                                            <img style="padding: 0 0 0 30;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
+                                                            <img style="padding: 0 0 0 30;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td style="vertical-align:top;">
+                                            <td style="vertical-align:top;">
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-
+
-                        <?php
+                        <?php
-                            }
+                            }
-                        ?> 
+                        ?> 
-                    </table>
+                    </table>
-                </div>
+                </div>

web/templates/admin/list_services.html

@@ -0,0 +1,152 @@
+
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="text-align: right; float: right;">
+                                                <form action="/search/" method="get" >
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
+                                                </form>
+                                            </div>
+                                            <div style="float:left; padding-left: 0px;">
+                                                <form action="/bulk/service/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                    <option>apply to selected</option>
+                                                    <option>stop</option>
+                                                    <option>start</option>
+                                                    <option>restart</option>
+                                                </select>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                            </div>
+                                            <?php
+                                                if (!empty($_SESSION['error_srv'])) {
+                                            ?>
+                                            <div>
+                                                <script type="text/javascript">
+                                                    $(function() {
+                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                                        $( "#dialog-message" ).dialog({
+                                                            modal: true,
+                                                            buttons: {
+                                                                Ok: function() {
+                                                                    $( this ).dialog( "close" );
+                                                                }
+                                                            }
+                                                        });
+                                                    });
+                                                </script>
+                                                <div id="dialog-message" title="Error">
+                                                    <p><?php echo $_SESSION['error_srv'] ?></p>
+                                                </div>
+                                            </div>
+                                            <?php
+                                                    unset($_SESSION['error_srv']);
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <div id="vstobjects">
+                        <table class='data'>
+
+                           <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['STATE'] == 'running') {
+                                        $status = 'active';
+                                        $action = 'stop';
+                                    } else {
+                                        $status = 'suspended';
+                                        $action = 'start';
+                                    }
+
+                                    $cpu = $data[$key]['CPU'] / 10;
+                                    $cpu = number_format($cpu, 1);
+                                    if ($cpu == '0.0')  $cpu = 0;
+                                ?>
+
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="service[]" value="<?php echo $key ?>" ></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $data[$key]['STATE'] ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="68px"><a href="/restart/service/?srv=<?php echo $key ?>"><img src="/images/reload.png" width="6px" height="7px"> restart</a></td>
+                                            <td class="data-controls" width="48px"><a href="/<?php echo $action ?>/service/?srv=<?php echo $key ?>"><img src="/images/<?php echo $action ?>.png" width="7px" height="7px"> <?php echo $action ?></a></td>
+                                        </tr>
+                                    </table>
+
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" width="200px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 0 0">
+                                                            <?php echo $data[$key]['SYSTEM'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="150px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            CPU:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value"> <?php echo $cpu ?>%</a>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="180px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Memory:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value"><?php echo $data[$key]['MEM'] ?> mb</a>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Run Time:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value"><?php echo humanize_time($data[$key]['RTIME']) ?> </a>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <?php
+                                }
+                            ?> 
+                        </table>
+                        </form>
+
+                    </div>

web/templates/admin/list_stats.html

@@ -1,221 +1,221 @@
-
+
-                                <table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 0 16px">
+                                        <td style="padding: 12px 0 0 16px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <form action="/list/stats/" method="get" id="objects">
+                                                <form action="/list/stats/" method="get" id="objects">
-                                                <a class="vst" <?php if (empty($_GET['user'])) echo "style='color: #34536A'"; ?> href='/list/stats/'><?php print _('Overall Statistics');?></a>
+                                                <a class="vst" <?php if (empty($_GET['user'])) echo "style='color: #174f82'"; ?> href='/list/stats/'><?php print _('Overall Statistics');?></a>
-                                                <span style="padding: 0 8px;"></span>
+                                                <span style="padding: 0 8px;"></span>
-                                                <select style="margin:0 2px 0 0px;" name="user">
+                                                <select style="margin:0 2px 0 0px;" name="user">
-                                                    <option value=''><?php print _('show per user');?></option>
+                                                    <option value=''><?php print _('show per user');?></option>
-                                                <?php
+                                                <?php
-                                                    foreach ($users as $key => $value) {
+                                                    foreach ($users as $key => $value) {
-                                                        echo "\t\t\t\t<option value=\"".$value."\"";
+                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                        if ((!empty($v_user)) && ( $value == $_GET['user'])){
+                                                        if ((!empty($v_user)) && ( $value == $_GET['user'])){
-                                                            echo ' selected';
+                                                            echo ' selected';
-                                                        }
+                                                        }
-                                                        echo ">".$value."</option>\n";
+                                                        echo ">".$value."</option>\n";
-                                                    }
+                                                    }
-                                                ?> 
+                                                ?> 
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="list" value="›" class="button" style="width: 37px;font-size: 12px; height: 24px;">
+                                                <input type="submit" name="list" value="›" class="button" style="width: 37px;font-size: 12px; height: 24px;">
-                                            </form>
+                                            </form>
-
+
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get" >
+                                                <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <table class='data'>
+                        <table class='data'>
-
+
-                            <?php
+                            <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
-                                    <table class="data-col1" width="150">
+                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($key))?></a></td></tr>
+                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($key))?></a></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-
+
-                                    <table class="data-col2" width="830px">
+                                    <table class="data-col2" width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                            <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                                <b><?php echo date("M Y", strtotime($key))?></b>
+                                                <b><?php echo date("M Y", strtotime($key))?></b>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                        <tr>
+                                        <tr>
-                                            <td style="vertical-align:top;" >
+                                            <td style="vertical-align:top;" >
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">
+                                                        <td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">
-                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?>
+                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                            <?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
+                                                            </div>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                            <?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
+                                                            </div>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td colspan=2>
+                                                        <td colspan=2>
-                                                            <table class="chart2">
+                                                            <table class="chart2">
-                                                                <tr>
+                                                                <tr>
-                                                                    <td>
+                                                                    <td>
-                                                                        <?php print _('Hosting');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print _('Hosting');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
-                                                                    </td>
+                                                                    </td>
-                                                                    <td style="padding: 0px 10px 0px 8px">
+                                                                    <td style="padding: 0px 10px 0px 8px">
-                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
-                                                                    </td>
+                                                                    </td>
-                                                                </tr>
+                                                                </tr>
-                                                            </table>
+                                                            </table>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td style="vertical-align:top;" width="280">
+                                            <td style="vertical-align:top;" width="280">
-                                                <table width="280">
+                                                <table width="280">
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name" width="37%">
+                                                        <td class="counter-name" width="37%">
-                                                            <?php print _('Web Domains');?>:
+                                                            <?php print _('Web Domains');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
+                                                            <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Web SSL Domains');?>:
+                                                            <?php print _('Web SSL Domains');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_SSL'] ?> 
+                                                            <?php echo $data[$key]['U_WEB_SSL'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Web Aliases');?>:
+                                                            <?php print _('Web Aliases');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
+                                                            <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('DNS domains');?>:
+                                                            <?php print _('DNS domains');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
+                                                            <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('DNS records');?>:
+                                                            <?php print _('DNS records');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_RECORDS'] ?>
+                                                            <?php echo $data[$key]['U_DNS_RECORDS'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td style="vertical-align:top;" width="250">
+                                            <td style="vertical-align:top;" width="250">
-                                                <table class="data-col4" width="250">
+                                                <table class="data-col4" width="250">
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name" width="43%">
+                                                        <td class="counter-name" width="43%">
-                                                            <?php print _('Mail domains');?>:
+                                                            <?php print _('Mail domains');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
+                                                            <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Mail Accounts');?>:
+                                                            <?php print _('Mail Accounts');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
+                                                            <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Databases');?>:
+                                                            <?php print _('Databases');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DATABASES'] ?> 
+                                                            <?php echo $data[$key]['U_DATABASES'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('Cron Jobs');?>:
+                                                            <?php print _('Cron Jobs');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_CRON_JOBS'] ?>
+                                                            <?php echo $data[$key]['U_CRON_JOBS'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            <?php print _('IP Adresses');?>:
+                                                            <?php print _('IP Adresses');?>:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['IP_OWNED'] ?> 
+                                                            <?php echo $data[$key]['IP_OWNED'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-
+
-                            <?php
+                            <?php
-                                }
+                                }
-                            ?> 
+                            ?> 
-
+
-                        </table>
+                        </table>
-
+
-                        <table class="data-count">
+                        <table class="data-count">
-                            <tr>
+                            <tr>
-                                <td width="160px"></td>
+                                <td width="160px"></td>
-                                <td>
+                                <td>
-                                    <?php
+                                    <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo _('one month');
+                                            echo _('one month');
-                                        } else {
+                                        } else {
-                                            echo _('%s months',$i);
+                                            echo _('%s months',$i);
-                                        }
+                                        }
-                                    ?>
+                                    ?>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                    </div>
+                    </div>
-
+

web/templates/admin/panel.html

@@ -1,112 +1,112 @@
-<center>
+<center>
-    <table class="main">
+    <table class="main">
-        <tr>
+        <tr>
-            <td>
+            <td>
-                <table class="fixed" >
+                <table class="fixed" >
-                    <tr>
+                    <tr>
-                        <td>
+                        <td>
-                            <table class="top">
+                            <table class="top">
-                                <tr>
+                                <tr>
-                                    <td width="179px" style="border-bottom: 2px solid white; height: 24px;"></td>
+                                    <td width="179px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                    <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"><b><?php print _('Packages');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"><b><?php print _('Packages');?></a></b></td>
-                                    <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"><b><?php print _('IP Addresses');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"><b><?php print _('IP Addresses');?></a></b></td>
-                                    <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"><b><?php print _('RRD Graphics');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"><b><?php print _('RRD Graphics');?></a></b></td>
-                                    <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
-                                    <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
-                                    <td width="227px" style="border-bottom: 2px solid white; height: 24px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
+                                    <td width="227px" style="border-bottom: 1px solid #d6d6d6; height: 26px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
-                                </tr>
+                                </tr>
-                                <tr>
+                                <tr>
-                                    <td colspan="7" style="background: #ebe9dc; border-bottom: 8px solid #f7f6ed;">
+                                        <td colspan="7" style="background: #fff;">
-
+
-                                            <span class="nav-logo">
+                                            <span class="nav-logo">
-                                                <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
+                                                <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
-                                            </span>
+                                            </span>
-
+
-                                        <a class="nav-lnk" href="/list/user/">
+                                        <a class="nav-lnk" href="/list/user/">
-                                            <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                    <?php print _('USER');?>
+                                                    <?php print _('USER');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
+                                                    <?php print _('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_USERS']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_USERS']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/web/">
+                                        <a class="nav-lnk" href="/list/web/">
-                                            <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                    <?php print _('WEB');?>
+                                                    <?php print _('WEB');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                    <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                    <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/dns/">
+                                        <a class="nav-lnk" href="/list/dns/">
-                                            <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                    <?php print _('DNS');?>
+                                                    <?php print _('DNS');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                    <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                    <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/mail/">
+                                        <a class="nav-lnk" href="/list/mail/">
-                                            <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                    <?php print _('MAIL');?>
+                                                    <?php print _('MAIL');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                    <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                    <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/db/">
+                                        <a class="nav-lnk" href="/list/db/">
-                                            <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                    <?php print _('DB');?>
+                                                    <?php print _('DB');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                    <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/cron/">
+                                        <a class="nav-lnk" href="/list/cron/">
-                                            <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                    <?php print _('CRON');?>
+                                                    <?php print _('CRON');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                    <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-
+
-                                        <a class="nav-lnk" href="/list/backup/">
+                                        <a class="nav-lnk" href="/list/backup/">
-                                            <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
+                                            <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
-                                                <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
+                                                <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                    <?php print _('BACKUP');?>
+                                                    <?php print _('BACKUP');?>
-                                                </p>
+                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                                                    <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
-                                                </p>
+                                                </p>
-                                            </span>
+                                            </span>
-                                        </a>
+                                        </a>
-                                    </td>
+                                    </td>
-                                </tr>
+                                </tr>
-                            </table>
+                            </table>

web/templates/footer.html

@@ -1,12 +1,4 @@
 
-                    <table class="bottom">
-                        <tr>
-                            <td><?php print _('Powered by Vesta Control Panel');?></td>
-                        </tr>
-                        <tr>
-                            <td><a href="http://vestacp.com">vestacp.com</a> | <a href="http://chto.su"><?php print _('Translation by ZonD80');?></a></td>
-                        </tr>
-                    </table>
                 </td>
             </tr>
         </table>
@@ -16,7 +8,7 @@
                 VE.core.register($('.main'));
             });
         </script>
-
     </center>
+    <br>
     </body>
 </html>

web/templates/user/list_dns.html

@@ -1,136 +1,136 @@
-                                <table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> Add DNS Domain </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> Add DNS Domain </button>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get" >
+                                                <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                                                <form action="/bulk/dns/" method="post" id="objects">
+                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                                                    <option>apply to selected</option>
+                                                    <option>apply to selected</option>
-                                                    <option>delete</option>
+                                                    <option>delete</option>
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <table class="data">
+                        <table class="data">
-                            <?php
+                            <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
+                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend' ;
-                                    } else {
+                                    } else {
-                                        $status = 'active';
+                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
+                                        $spnd_action = 'suspend' ;
-                                    }
+                                    }
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                                    <table class="data-col1">
+                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> list <?php echo $data[$key]['RECORDS'] ?> records</a></td>
+                                            <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> list <?php echo $data[$key]['RECORDS'] ?> records</a></td>
-                                            <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> add record</a></td>
+                                            <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> add record</a></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
+                                            <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
-                                            <td class="data-controls do_delete" width="70px">
+                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
+                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
-                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
+                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                    <table class="data-col2" width="830px">
+                                    <table class="data-col2" width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
+                                                <b><?php echo $key ?></b>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                        <tr>
+                                        <tr>
-                                            <td style="vertical-align:top;" >
+                                            <td style="vertical-align:top;" >
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name" style="padding: 2px 0 0 2px;">
+                                                        <td class="counter-name" style="padding: 2px 0 0 2px;">
-                                                            <?php echo $data[$key]['IP'] ?>
+                                                            <?php echo $data[$key]['IP'] ?>
-                                                        </td>
+                                                        </td>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 20px 2px">
+                                                        <td class="counter-name" style="padding: 0 0 20px 2px">
-                                                            [<?php echo $data[$key]['TPL'] ?>] template
+                                                            [<?php echo $data[$key]['TPL'] ?>] template
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td style="vertical-align:top;" width="250">
+                                            <td style="vertical-align:top;" width="250">
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">SOA:</td>
+                                                        <td class="counter-name">SOA:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">TTL:</td>
+                                                        <td class="counter-name">TTL:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
+                                                        <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">Expire:</td>
+                                                        <td class="counter-name">Expire:</td>
-                                                        <td class="counter-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></td>
+                                                        <td class="counter-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">Records:</td>
+                                                        <td class="counter-name">Records:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
+                                                        <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                            <?php
+                            <?php
-                                }
+                                }
-                            ?>
+                            ?>
-                        </table>
+                        </table>
-                        </form>
+                        </form>
-
+
-                        <table class="data-count">
+                        <table class="data-count">
-                            <tr>
+                            <tr>
-                                <td width="160px"></td>
+                                <td width="160px"></td>
-                                <td>
+                                <td>
-                                    <?php
+                                    <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo "1 user dns domain ";
+                                            echo "1 user dns domain ";
-                                        } else {
+                                        } else {
-                                            echo "$i dns domains ";
+                                            echo "$i dns domains ";
-                                        }
+                                        }
-                                    ?> 
+                                    ?> 
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                    </div>
+                    </div>

web/templates/user/list_dns_rec.html

@@ -1,105 +1,105 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> Add DNS Record </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> Add DNS Record </button>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get">
+                                                <form action="/search/" method="get">
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                                                <form action="/bulk/dns/" method="post" id="objects">
+                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                                                    <option>apply to selected</option>
+                                                    <option>apply to selected</option>
-                                                    <option>delete</option>
+                                                    <option>delete</option>
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
+                        <table class="data" style="background: #ebe9dc;">
-                            <tr>
+                            <tr>
-                                <td style="padding: 8px 2px 8px 0;">
+                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b>Listing  <?php echo $_GET['domain'] ?></b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b>Listing  <?php echo $_GET['domain'] ?></b></a>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
+                        <table class="data">
-                            <?php
+                            <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
+                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend' ;
-                                    } else {
+                                    } else {
-                                        $status = 'active';
+                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
+                                        $spnd_action = 'suspend' ;
-                                    }
+                                    }
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                                    <table class="data-col1">
+                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="record[]" value="<?php echo $data[$key]['ID']?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="record[]" value="<?php echo $data[$key]['ID']?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
+                                            <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
-                                            <td class="data-controls do_delete" width="70px">
+                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
+                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
-                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo $data[$key]['RECORD'] ?></b></span> record?</p>
+                                                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo $data[$key]['RECORD'] ?></b></span> record?</p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                    <table class="data-col5" width="780px">
+                                    <table class="data-col5" width="780px">
-                                        <tr>
+                                        <tr>
-                                            <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                            <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                                            <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
+                                            <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                            <?php
+                            <?php
-                                }
+                                }
-                            ?>
+                            ?>
-                        </table>
+                        </table>
-                        </form>
+                        </form>
-
+
-                        <table class="data-count">
+                        <table class="data-count">
-                            <tr>
+                            <tr>
-                                <td width="160px">
+                                <td width="160px">
-                                <td>
+                                <td>
-                                    <?php
+                                    <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo "1 dns record ";
+                                            echo "1 dns record ";
-                                        } else {
+                                        } else {
-                                            echo "$i dns records ";
+                                            echo "$i dns records ";
-                                        }
+                                        }
-                                    ?> 
+                                    ?> 
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                    </div>
+                    </div>

web/templates/user/list_mail.html

@@ -1,163 +1,163 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> Add Mail Domain </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> Add Mail Domain </button>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get" >
+                                                <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                                                <form action="/bulk/mail/" method="post" id="objects">
+                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                                                    <option>apply to selected</option>
+                                                    <option>apply to selected</option>
-                                                    <option>delete</option>
+                                                    <option>delete</option>
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <table class="data">
+                        <table class="data">
-                            <?php
+                            <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
+                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
+                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend' ;
-                                    } else {
+                                    } else {
-                                        $status = 'active';
+                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
+                                        $spnd_action = 'suspend' ;
-                                    }
+                                    }
-                                    if (empty($data[$key]['CATCHALL'])) {
+                                    if (empty($data[$key]['CATCHALL'])) {
-                                        $data[$key]['CATCHALL'] = '/dev/null';
+                                        $data[$key]['CATCHALL'] = '/dev/null';
-                                    }
+                                    }
-                            ?> 
+                            ?> 
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                                    <table class="data-col1">
+                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> list <?php echo $data[$key]['ACCOUNTS'] ?> accounts</a></td>
+                                            <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> list <?php echo $data[$key]['ACCOUNTS'] ?> accounts</a></td>
-                                            <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> add account</a></td>
+                                            <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> add account</a></td>
-                                            <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> open webmail</a></td>
+                                            <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> open webmail</a></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
+                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
-                                            <td class="data-controls do_delete" width="70px">
+                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
+                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
-                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
+                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-
+
-                                    <table class="data-col2" width="830px">
+                                    <table class="data-col2" width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-        	                                <b><?php echo $key ?></b>
+        	                                <b><?php echo $key ?></b>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                        <tr>
+                                        <tr>
-                                            <td style="vertical-align:top;" >
+                                            <td style="vertical-align:top;" >
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name" style="padding: 2px 0 2px 0">
+                                                        <td class="counter-name" style="padding: 2px 0 2px 0">
-                                                            catchall > <?php echo $data[$key]['CATCHALL'] ?>
+                                                            catchall > <?php echo $data[$key]['CATCHALL'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="chart1">
+                                                        <td class="chart1">
-                                                            Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                            Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
+                                                            </div>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td style="vertical-align:top;" width="250">
+                                            <td style="vertical-align:top;" width="250">
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            Antivirus:
+                                                            Antivirus:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['ANTIVIRUS'] ?> 
+                                                            <?php echo $data[$key]['ANTIVIRUS'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            Antispam:
+                                                            Antispam:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['ANTISPAM'] ?> 
+                                                            <?php echo $data[$key]['ANTISPAM'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
+                                                <table>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            DKIM:
+                                                            DKIM:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['DKIM'] ?> 
+                                                            <?php echo $data[$key]['DKIM'] ?> 
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            Accounts:
+                                                            Accounts:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['ACCOUNTS'] ?>
+                                                            <?php echo $data[$key]['ACCOUNTS'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                                </table>
+                                                </table>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-
+
-                            <?php
+                            <?php
-                                }
+                                }
-                            ?>
+                            ?>
-                        </table>
+                        </table>
-                        </form>
+                        </form>
-
+
-                        <table class="data-count">
+                        <table class="data-count">
-                            <tr>
+                            <tr>
-                                <td width="160px"></td>
+                                <td width="160px"></td>
-                                <td>
+                                <td>
-                                    <?php
+                                    <?php
-                                        if ( $i == 1) {
+                                        if ( $i == 1) {
-                                            echo "1 mail domain ";
+                                            echo "1 mail domain ";
-                                        } else {
+                                        } else {
-                                            echo "$i mail domains ";
+                                            echo "$i mail domains ";
-                                        }
+                                        }
-                                    ?>
+                                    ?>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                    </div>
+                    </div>

web/templates/user/list_mail_acc.html

@@ -1,152 +1,152 @@
-<table class="sub-menu" style="background: white;">
+<table class="sub-menu" style="background: white;">
-                                    <tr>
+                                    <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 8px 6px">
-                                            <div style="float:left">
+                                            <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> Add Mail Account </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> Add Mail Account </button>
-                                            </div>
+                                            </div>
-                                            <div style="text-align: right; float: right;">
+                                            <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get">
+                                                <form action="/search/" method="get">
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
+                                                <input type="submit" value="Search" class="button" style="font-size: 12px; height: 24px;">
-                                                </form>
+                                                </form>
-                                            </div>
+                                            </div>
-                                            <div style="float:left; padding-left: 26px;">
+                                            <div style="float:left; padding-left: 26px;">
-                                                <form action="/bulk/mail/" method="post" id="objects">
+                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                <select style="margin:0 2px 0 0px;" name="action">
-                                                    <option>apply to selected</option>
+                                                    <option>apply to selected</option>
-                                                    <option>delete</option>
+                                                    <option>delete</option>
-                                                </select>
+                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-                                            </div>
+                                            </div>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-
+
-                    <div id="vstobjects">
+                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
+                        <table class="data" style="background: #ebe9dc;">
-                            <tr>
+                            <tr>
-                                <td style="padding: 8px 2px 8px 0;">
+                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b>Listing  <?php echo $_GET['domain'] ?></b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b>Listing  <?php echo $_GET['domain'] ?></b></a>
-                                </td>
+                                </td>
-                            </tr>
+                            </tr>
-                        </table>
+                        </table>
-                        <div style="height:10px; font-size:0;"></div>
+                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
+                        <table class="data">
-                            <?php
+                            <?php
-                                foreach ($data as $key => $value) {
+                                foreach ($data as $key => $value) {
-                                    ++$i;
+                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
+                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend' ;
-                                    } else {
+                                    } else {
-                                        $status = 'active';
+                                        $status = 'active';
-                                        $spnd_action = 'suspend';
+                                        $spnd_action = 'suspend';
-                                    }
+                                    }
-                            ?>
+                            ?>
-
+
-                            <tr class="data-row">
+                            <tr class="data-row">
-                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                                    <table class="data-col1">
+                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-                                    </table>
+                                    </table>
-                                </td>
+                                </td>
-                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <table width="830px">
-                                        <tr>
+                                        <tr>
-                                            <td></td>
+                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
+                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
-                                            <td class="data-controls do_delete" width="70px">
+                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
+                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
+                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
-                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo $key ?></b> account?</p>
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo $key ?></b> account?</p>
-                                                </div>
+                                                </div>
-                                            </td>
+                                            </td>
-                                        </tr>
+                                        </tr>
-                                </table>
+                                </table>
-
+
-                                <table class="data-col2" width="830px">
+                                <table class="data-col2" width="830px">
-                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-                                    <tr>
+                                    <tr>
-                                        <td style="vertical-align:top;" >
+                                        <td style="vertical-align:top;" >
-                                            <table>
+                                            <table>
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
+                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                        <?php echo $data[$key]['IP'] ?>
+                                                        <?php echo $data[$key]['IP'] ?>
-                                                    </td>
+                                                    </td>
-                                                <tr>
+                                                <tr>
-                                                    <td class="chart1" style="padding: 0 0 2px 0">
+                                                    <td class="chart1" style="padding: 0 0 2px 0">
-                                                        Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                        Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
-                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                        </div>
+                                                        </div>
-                                                    </td>
+                                                    </td>
-                                                </tr>
+                                                </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                        <td style="vertical-align:top;" width="200">
+                                        <td style="vertical-align:top;" width="200">
-                                            <table>
+                                            <table>
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name">
+                                                    <td class="counter-name">
-                                                        Quota:
+                                                        Quota:
-                                                    </td>
+                                                    </td>
-                                                    <td class="counter-value">
+                                                    <td class="counter-value">
-                                                        <?php echo $data[$key]['QUOTA'] ?>
+                                                        <?php echo $data[$key]['QUOTA'] ?>
-                                                    </td>
+                                                    </td>
-                                                    </tr>
+                                                    </tr>
-                                                    <tr>
+                                                    <tr>
-                                                        <td class="counter-name">
+                                                        <td class="counter-name">
-                                                            Autoreply:
+                                                            Autoreply:
-                                                        </td>
+                                                        </td>
-                                                        <td class="counter-value">
+                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
+                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
-                                                        </td>
+                                                        </td>
-                                                    </tr>
+                                                    </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                        <td rowspan=4 style="vertical-align:top;" width="350">
+                                        <td rowspan=4 style="vertical-align:top;" width="350">
-                                            <table width="350">
+                                            <table width="350">
-                                                <tr>
+                                                <tr>
-                                                    <td class="counter-name">
+                                                    <td class="counter-name">
-                                                        Forward:
+                                                        Forward:
-                                                    </td>
+                                                    </td>
-                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
+                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
-                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
+                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                    </td>
+                                                    </td>
-                                                </tr>
+                                                </tr>
-                                            </table>
+                                            </table>
-                                        </td>
+                                        </td>
-                                    </tr>
+                                    </tr>
-                                </table>
+                                </table>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-
+
-                        <?php
+                        <?php
-                            }
+                            }
-                        ?>
+                        ?>
-                    </table>
+                    </table>
-                    </form>
+                    </form>
-
+
-                    <table class="data-count">
+                    <table class="data-count">
-                        <tr>
+                        <tr>
-                            <td width="160px"></td>
+                            <td width="160px"></td>
-                            <td>
+                            <td>
-                                <?php
+                                <?php
-                                    if ( $i == 1) {
+                                    if ( $i == 1) {
-                                        echo "1 mail account ";
+                                        echo "1 mail account ";
-                                    } else {
+                                    } else {
-                                        echo "$i mail accounts ";
+                                        echo "$i mail accounts ";
-                                    }
+                                    }
-                                ?>
+                                ?>
-                            </td>
+                            </td>
-                        </tr>
+                        </tr>
-                    </table>
+                    </table>
-                </div>
+                </div>

web/templates/user/panel.html

@@ -1,113 +1,114 @@
-    <center>
+    <center>
-        <table class="main">
+        <table class="main">
-            <tr>
+            <tr>
-                <td>
+                <td>
-                    <table class="fixed" >
+                    <table class="fixed" >
-                        <tr>
+                        <tr>
-                            <td>
+                            <td>
-                                <table class="top">
+                                <table class="top">
-                                    <tr>
+                                    <tr>
-                                        <td width="174px" style="border-bottom: 2px solid white; height: 24px;"></td>
+<td width="174px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="118px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
+                                        <td width="118px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
-                                        <td width="120px" style="border-bottom: 2px solid white; height: 24px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
+                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
-                                        <td width="120px" style="border-bottom: 2px solid white; height: 24px;"></td>
+                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="120px" style="border-bottom: 2px solid white; height: 24px;"></td>
+                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="120px" style="border-bottom: 2px solid white; height: 24px;"></td>
+                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="228px" style="border-bottom: 2px solid white; height: 24px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
+                                        <td width="228px" style="border-bottom: 1px solid #d6d6d6; height: 26px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
-                                    </tr>
+                                   
-                                    <tr>
+                                    </tr>
-                                        <td colspan="7" style="background: #ebe9dc; border-bottom: 8px solid #f7f6ed;">
+                                    <tr>
-
+                                        <td colspan="7" style="background: #fff;">
-                                            <span class="nav-logo">
+
-                                                <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
+                                            <span class="nav-logo">
-                                            </span>
+                                                <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
-
+                                            </span>
-                                            <a class="nav-lnk" href="/list/user/">
+
-                                            <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/user/">
-                                                <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
-                                                    <?php print _('USER');?>
+                                                <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('USER');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
+                                                    <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED']?>
+                                                    <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/web/">
+
-                                            <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/web/">
-                                                <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
-                                                    <?php print _('WEB');?>
+                                                <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('WEB');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
+                                                    <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/dns/">
+
-                                            <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/dns/">
-                                                <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
-                                                    <?php print _('DNS');?>
+                                                <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('DNS');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
+                                                    <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/mail/">
+
-                                            <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/mail/">
-                                                <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
-                                                    <?php print _('MAIL');?>
+                                                <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('MAIL');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                    <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
+                                                    <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/db/">
+
-                                            <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/db/">
-                                                <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
-                                                    <?php print _('DB');?>
+                                                <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('DB');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
+                                                    <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/cron/">
+
-                                            <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/cron/">
-                                                <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
-                                                    <?php print _('CRON');?>
+                                                <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('CRON');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
+                                                    <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                </p>
+                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-
+                                            </a>
-                                            <a class="nav-lnk" href="/list/backup/">
+
-                                            <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
+                                            <a class="nav-lnk" href="/list/backup/">
-                                                <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
+                                            <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
-                                                    <?php print _('BACKUP');?>
+                                                <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                </p>
+                                                    <?php print _('BACKUP');?>
-                                                <p class="nav-counters" style="decoration: none;">
+                                                </p>
-                                                    <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                                                <p class="nav-counters" style="decoration: none;">
-                                                </p>
+                                                    <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
-                                            </span>
+                                                </p>
-                                            </a>
+                                            </span>
-                                        </td>
+                                            </a>
-                                    </tr>
+                                        </td>
-                                </table>
+                                    </tr>
+                                </table>