Merge branch 'master' of https://github.com/serghey-rodin/vesta into js-stuff

bin/v-add-cron-job

@@ -74,6 +74,9 @@ increase_user_value $user '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added cron job $job"

bin/v-add-cron-report

@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "enabled cron reporting"

bin/v-add-dns-domain

@@ -162,6 +162,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-dns-record

@@ -39,7 +39,7 @@ if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
 fi
 
 # Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-fqdn_type=$(echo $rtype | grep "[NS|CNAME|MX|PTR|SRV]")
+fqdn_type=$(echo $rtype |grep "NS\|CNAME\|MX\|PTR\|SRV")
 if [ ! -z "$fqdn_type" ]; then
     trailing_dot=$(echo $dvalue | grep "\.$")
     if [ -z $trailing_dot ]; then
@@ -107,6 +107,9 @@ increase_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-mail-domain

@@ -18,7 +18,7 @@ domain_idn=$(idn -t --quiet -a "$domain")
 antispam=${3-yes}
 antivirus=${4-yes}
 dkim=${5-yes}
-dkim_size=${6-512}
+dkim_size=${6-1024}
 
 # Includes
 source $VESTA/func/main.sh

bin/v-add-sys-ip

@@ -152,7 +152,13 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added system ip address $ip" '' 'admin'

bin/v-add-web-domain

@@ -176,6 +176,9 @@ chmod 660 $USER_DATA/web.conf
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-web-domain-alias

@@ -103,7 +103,14 @@ increase_user_value "$user" '$U_WEB_ALIASES'
 # Adding task to the vesta pipe
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "added $dom_alias as alias for $domain"

bin/v-add-web-domain-proxy

@@ -103,6 +103,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "enabled proxy support for $domain"

bin/v-add-web-domain-ssl

@@ -126,6 +126,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-cron-job

@@ -65,6 +65,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed cron job $job"

bin/v-change-dns-domain-ip

@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-soa

@@ -64,6 +64,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-tpl

@@ -88,6 +88,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-ttl

@@ -63,6 +63,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-record

@@ -98,6 +98,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-record-id

@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-sys-ip-nat

@@ -77,6 +77,9 @@ fi
 # Restart ftp server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-ftp
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-ip

@@ -87,7 +87,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-proxy-tpl

@@ -94,6 +94,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-sslcert

@@ -71,7 +71,14 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl certificate for $domain"

bin/v-change-web-domain-sslhome

@@ -71,7 +71,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl home for $domain to $ssl_home"

bin/v-change-web-domain-tpl

@@ -75,7 +75,7 @@ fi
 if [ "$SSL" = 'yes' ]; then
     conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
     tpl_file="$WEBTPL/$WEB_SYSTEM/$template.stpl"
-
+    del_web_config
     add_web_config
 
     # Running template trigger
@@ -96,6 +96,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-cron-job

@@ -54,6 +54,9 @@ decrease_user_value "$user" '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted cron job $job"

bin/v-delete-cron-reports

@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "disabled cron reporting"

bin/v-delete-dns-domain

@@ -75,6 +75,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-dns-domains

@@ -43,6 +43,9 @@ done
 
 # Restart named
 $BIN/v-restart-dns
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-delete-dns-domains-src

@@ -46,6 +46,9 @@ done
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-dns-record

@@ -69,6 +69,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-domain

@@ -39,7 +39,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_web" ]; then
         $BIN/v-delete-web-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -50,7 +50,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_dns" ]; then
         $BIN/v-delete-dns-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -61,7 +61,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_mail" ]; then
         $BIN/v-delete-mail-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi

bin/v-delete-sys-ip

@@ -121,7 +121,14 @@ fi
 
 # Adding task to the vesta pipe
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted system ip address $ip"

bin/v-delete-web-domain

@@ -154,7 +154,14 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-alias

@@ -101,7 +101,14 @@ decrease_user_value "$user" '$U_WEB_ALIASES'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-proxy

@@ -80,6 +80,9 @@ fi
 # Restart proxy server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-ssl

@@ -92,7 +92,14 @@ decrease_user_value "$user" '$U_WEB_SSL'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domains

@@ -45,7 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-domain

@@ -72,6 +72,9 @@ chmod 660 $USER_DATA/dns.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-record

@@ -47,6 +47,9 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-records

@@ -50,6 +50,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-cron-jobs

@@ -43,6 +43,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-dns-domain

@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns "$restart"
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-dns-domains

@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-web-domains

@@ -69,7 +69,7 @@ if [ "$domain_counter" -lt 1 ]; then
     # Deleting web configs
     rm -f $HOMEDIR/$user/conf/web/*
     sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf
-    if [ -e "$proxy_conf" ]; then
+    if [ ! -z "$PROXY_SYSTEM" ]; then
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
     fi
 
@@ -103,34 +103,35 @@ else
     fi
 
     # Checking proxy
-    if [ "$proxy_change" = 'yes' ]; then
+    if [ ! -z "$PROXY_SYSTEM" ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
+        if [ "$proxy_change" = 'yes' ]; then
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+            tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
-        mv $tmp_conf $conf
+            conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
-        proxy_include=$(grep "$conf" $proxy_conf )
+            mv $tmp_conf $conf
-        if [ -z "$proxy_include" ]; then
+            proxy_include=$(grep "$conf" $proxy_conf )
-            echo "include $conf;" >> $proxy_conf
+            if [ -z "$proxy_include" ]; then
+                echo "include $conf;" >> $proxy_conf
+            fi
+        else
+            conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+            sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
+            rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
         fi
-    else
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
-        sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
-    fi
 
-    # Checking SSL proxy
+        # Checking SSL proxy
-    if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
+        if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
+            tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+            conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
-        mv $tmp_conf $conf
+            mv $tmp_conf $conf
-        proxy_include=$(grep "$conf" $proxy_conf )
+            proxy_include=$(grep "$conf" $proxy_conf )
-        if [ -z "$proxy_include" ]; then
+            if [ -z "$proxy_include" ]; then
-            echo "include $conf;" >> $proxy_conf
+                echo "include $conf;" >> $proxy_conf
+            fi
+        else
+            conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+            sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
+            rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
         fi
-    else
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
-        sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
-
     fi
 fi
 
@@ -148,7 +149,14 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-restart-dns

@@ -56,6 +56,7 @@ if [ $? -ne 0 ]; then
     /etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
+        echo "Error: $DNS_SYSTEM restart failed"
         exit $E_RESTART
     fi
 fi

bin/v-restart-ftp

@@ -48,6 +48,7 @@ fi
 /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $FTP_SYSTEM restart failed"
     exit $E_RESTART
 fi
 

bin/v-restart-mail

@@ -49,6 +49,7 @@ fi
 /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $MAIL_SYSTEM restart failed"
     exit $E_RESTART
 fi
 

bin/v-restart-proxy

@@ -45,13 +45,11 @@ if [ -z "$PROXY_SYSTEM" ]; then
 fi
 
 # Restart system
-/etc/init.d/$PROXY_SYSTEM reload >/dev/null 2>&1
+/etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-    /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
+    send_email_report
-    if [ $? -ne 0 ]; then
+    echo "Error: $PROXY_SYSTEM restart failed"
-        send_email_report
+    exit $E_RESTART
-        exit $E_RESTART
-    fi
 fi
 
 # Update restart queue

bin/v-restart-web

@@ -53,6 +53,7 @@ if [ "$WEB_SYSTEM" == 'apache2' ]; then
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi
@@ -62,6 +63,7 @@ else
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi

bin/v-restore-user

@@ -372,7 +372,15 @@ if [ "$web" != 'no' ]; then
 
     # Restart WEB
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -482,6 +490,10 @@ if [ "$dns" != 'no' ]; then
 
     # Restart DNS
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -695,6 +707,10 @@ if [ "$cron" != 'no' ]; then
 
     # Restart cron
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi

bin/v-suspend-cron-job

@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-cron-jobs

@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-dns-domain

@@ -49,6 +49,9 @@ increase_user_value "$user" '$SUSPENDED_DNS'
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-dns-domains

@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-dns-record

@@ -63,6 +63,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-user

@@ -71,8 +71,19 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Changing suspend value

bin/v-suspend-web-domain

@@ -91,7 +91,14 @@ increase_user_value "$user" '$SUSPENDED_WEB'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-web-domains

@@ -45,6 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-cron-job

@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-cron-jobs

@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-dns-domain

@@ -51,6 +51,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-dns-domains

@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-dns-record

@@ -62,6 +62,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-user

@@ -73,8 +73,19 @@ decrease_user_value 'admin' '$SUSPENDED_USERS'
 
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-web-domain

@@ -88,7 +88,14 @@ decrease_user_value "$user" '$SUSPENDED_WEB'
 # Restart web erver
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-web-domains

@@ -46,6 +46,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-update-sys-ip

@@ -53,6 +53,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 /etc/$PROXY_SYSTEM/conf.d/$new.conf
             sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf
             $BIN/v-restart-proxy
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
         if [ ! -z "$WEB_SYSTEM" ]; then
             mv /etc/$WEB_SYSTEM/conf.d/$old.conf \
@@ -65,6 +68,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-web-domains $user no
             done
             $BIN/v-restart-web
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         if [ ! -z "$DNS_SYSTEM" ]; then
@@ -75,6 +81,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-dns-domains $user no
             done
             $BIN/v-restart-dns
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         # No further comparation is needed

bin/v-update-web-domain-stat

@@ -110,7 +110,7 @@ build_awstats() {
         grep -v icon | sort -r )
     for link in $months; do
         year=$(echo $link |cut -f 1 -d \-)
-        month=$(echo $link |cut -f 2 -d \-)
+        month=$(echo $link |cut -f 2 -d \-| sed -e "s/^0//")
         case "$month" in
             1) month='January';;
             2) month='February';;

bin/v-update-web-templates

@@ -64,7 +64,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Delete tmpdir

func/domain.sh

@@ -477,7 +477,7 @@ is_dns_record_critical() {
 is_dns_fqnd() {
     t=$1
     r=$2
-    fqdn_type=$(echo $t | grep "[NS|CNAME|MX|PTR|SRV]")
+    fqdn_type=$(echo $t | grep "NS\|CNAME\|MX\|PTR\|SRV")
     tree_length=3
     if [ $t = 'CNAME' ]; then
         tree_length=2

func/main.sh

@@ -616,10 +616,17 @@ validate_format_name_s() {
 
 # Username
 validate_format_username() {
-    if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]; then
+    if [ "${#1}" -eq 1 ]; then
-        echo "Error: $2 $1 is not valid"
+        if ! [[ "$1" =~ [a-z] ]]; then
-        log_event "$E_INVALID" "$EVENT"
+            echo "Error: $2 $1 is not valid"
-        exit $E_INVALID
+            exit 1
+        fi
+    else
+        if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]
+        then
+            echo "Error: $2 $1 is not valid"
+            exit 1
+        fi
     fi
 }
 

install/debian/templates/web/nginx/caching.stpl

@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/templates/web/nginx/caching.tpl

@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/rhel/templates/web/nginx/caching.stpl

@@ -4,7 +4,7 @@ server {
     ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
@@ -19,8 +19,8 @@ server {
         location ~* ^.+\.(%proxy_extentions%)$ {
             proxy_cache    off;
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
+            access_log     /var/log/%web_system%/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/rhel/templates/web/nginx/caching.tpl

@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
@@ -16,8 +16,8 @@ server {
         location ~* ^.+\.(%proxy_extentions%)$ {
             proxy_cache    off;
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
+            access_log     /var/log/%web_system%/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/ubuntu/templates/web/nginx/caching.stpl

@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/ubuntu/templates/web/nginx/caching.tpl

@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/web/conf/nginx.%domain%.conf*;
 }

web/add/dns/index.php

@@ -40,14 +40,14 @@ if (!empty($_POST['ok'])) {
         $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
     } else {
         // Add DNS
-        exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4, $output, $return_var);
+        exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." no", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
 
         // Change Expiriation date
         if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
             $v_exp = escapeshellarg($_POST['v_exp']);
-            exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var);
+            exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -55,7 +55,7 @@ if (!empty($_POST['ok'])) {
         // Change TTL
         if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) {
             $v_ttl = escapeshellarg($_POST['v_ttl']);
-            exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var);
+            exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -64,6 +64,13 @@ if (!empty($_POST['ok'])) {
             $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
             unset($v_domain);
         }
+
+        if (empty($_SESSION['error_msg'])) {
+            exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+            check_return_code($return_var,$output);
+            unset($output);
+        }
+
     }
 }
 
@@ -120,11 +127,7 @@ if ((empty($_GET['domain'])) && (empty($_POST['domain'])))  {
     }
     if (empty($v_ttl)) $v_ttl = 14400;
     if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
-    if ($_SESSION['user'] == 'admin') {
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
-    }
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
 } else {

web/add/web/index.php

@@ -272,12 +272,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
     $stats = json_decode(implode('', $output), true);
     unset($output);
 
-// Are you admin?
-if ($_SESSION['user'] == 'admin') {
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html');
-}
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
 //}

web/css/main.css

@@ -10,6 +10,16 @@ form {
     margin: 0;
 }
 
+
+table {
+    border-collapse: collapse;
+}
+
+td {
+    padding: 0;
+}
+
+
 .hidden {
     display: none;
 }
@@ -263,7 +273,7 @@ form {
 
 .submenu-select-block {
     float:left;
-    padding-left: 22px;
+    padding-left: 30px;
 }
 
 .submenu-select-link {
@@ -274,7 +284,7 @@ form {
     letter-spacing: 0.1em;
     margin: 7px 7px 0 0;
     text-decoration: none;
-    padding: 0 4px 0 14px
+    padding: 0 4px
 }
 
 .submenu-select-link:hover {
@@ -441,10 +451,9 @@ form {
 .data-dotted {
     text-align: left;
     vertical-align:top;
-    border-top:1px dotted #d3d3d3;
+    border-top: 1px dotted #d3d3d3;
     padding: 0 0 26px 0;
     margin: 0;
-    width: 166px;
 }
 
 .data-dotted td {
@@ -453,33 +462,33 @@ form {
 
 .data-col1 {
     text-align: left;
-    padding:0;
+    padding: 0;
+    width: 173px;
 }
 
 .data-col1 tr td {
-    padding:0 0 6px 24px;
+    padding:2px 0 6px 26px;
 }
 
 .data-col1 tr:first-child td {
-    padding:22px 0 0 24px;
+    padding:24px 0 0 26px;
 }
 
 .data-col2 {
     text-align: left;
-    padding: 0;
     overflow: hidden;
+    width: 827px;
 }
 
 .data-col5 {
-    table-layout: fixed;
     text-align: left;
-    padding: 0;
     overflow: hidden;
+    width: 817px;
+    table-layout: fixed;
     white-space: nowrap;
 }
 
 .data-date {
-    padding: 0 0 0 18;
     letter-spacing: 0.3em;
     font-size: 8pt;
     color: #6A6A6A
@@ -489,14 +498,12 @@ form {
     font-size: 8pt;
     letter-spacing: 0.1em;
     color: #81a64f;
-    padding: 0 0 13 18;
 }
 
 .data-suspended {
     font-size: 8pt;
     letter-spacing: 0.1em;
     color: #de5543;
-    padding: 0 0 13 18;
 }
 
 .data-controls {
@@ -504,7 +511,7 @@ form {
     height: 16px;
     border-left: 1px solid #d3d3d3;
     font-size: 8pt;
-    padding: 2px 12px 0 6px;
+    padding: 2px 12px 1px 6px;
     letter-spacing: 0.1em;
     color: #2361a1;
     text-decoration: none;
@@ -546,21 +553,25 @@ form {
 .username {
     color: #222;
     font-size: 14pt;
+    padding: 1px 0 2px 0;
 }
 
 .domain {
     color: #222;
     font-size: 14pt;
+    padding: 1px 0 2px 0;
 }
 
 .cron {
     color: #222;
     font-size: 18px;
+    padding: 1px 0 2px 0;
 }
 
 .log {
     color: #222;
     font-size: 12pt;
+    padding: 1px 0 2px 0;
 }
 
 .aliases {
@@ -587,14 +598,14 @@ form {
     line-height: 1.3em;
     font-size: 10pt;
     color: #222;
-    padding: 0 4px 0 0;
+    padding: 2px 4px 1px 0;
 }
 
 .cron-counter-name {
     vertical-align:top;
     line-height: 0.8em;
     font-size: 8pt;
-    padding: 4 0 0 0;
+    padding: 4px 0 0 0;
     color: #222;
 }
 
@@ -603,7 +614,7 @@ form {
     line-height: 1.3em;
     font-size: 10pt;
     color: #222;
-    padding: 0 0 0 2px;
+    padding: 2px 0 1px 2px;
 }
 
 .log-counter-value {
@@ -685,7 +696,7 @@ form {
     padding: 5px;
     width: 360px;
     height: 28px;
-    margin: 0 6px 0 0;
+    margin: 2px 6px 0 0;
 }
 
 .vst-input:hover {
@@ -706,6 +717,7 @@ form {
     color: #555;
     height: 30px;
     min-width: 138px;
+    margin: 2px 6px 0 0;
 }
 
 @-moz-document url-prefix() {
@@ -718,6 +730,7 @@ form {
     padding: 5px;
     font-size: 12pt;
     border: 1px solid #f7f6ed;
+    margin: 2px 6px 0 0;
 }
 
 .vst-checkbox:hover {
@@ -857,7 +870,6 @@ form {
     vertical-align:top;
     width: 500px;
     height: 50px;
-    padding: 0 8px 0 0;
     margin: 0;
 }
 
@@ -865,7 +877,7 @@ form {
     font-size: 8pt;
     color: #222;
     text-align: right;
-    padding: 20px 0 0 0;
+    padding: 0 8px 0 0;
 }
 
 .error {

web/edit/web/index.php

@@ -97,6 +97,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         $restart_web = 'yes';
+        $restart_proxy = 'yes';
         unset($output);
         exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var);
         if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) {
@@ -138,6 +139,7 @@ if (!empty($_POST['save'])) {
         foreach ($result as $alias) {
             if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
                 $restart_web = 'yes';
+                $restart_proxy = 'yes';
                 $v_template = escapeshellarg($_POST['v_template']);
                 exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                 check_return_code($return_var,$output);
@@ -160,6 +162,7 @@ if (!empty($_POST['save'])) {
         foreach ($result as $alias) {
             if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
                 $restart_web = 'yes';
+                $restart_proxy = 'yes';
                 $v_template = escapeshellarg($_POST['v_template']);
                 exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                 check_return_code($return_var,$output);
@@ -225,6 +228,7 @@ if (!empty($_POST['save'])) {
         unset($output);
         $v_ssl = 'no';
         $restart_web = 'yes';
+        $restart_proxy = 'yes';
     }
     if (($v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
         if (( $v_ssl_crt != str_replace("\r\n", "\n",  $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n",  $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n",  $_POST['v_ssl_ca']))) {
@@ -259,6 +263,7 @@ if (!empty($_POST['save'])) {
             check_return_code($return_var,$output);
             unset($output);
             $restart_web = 'yes';
+            $restart_proxy = 'yes';
             $v_ssl_crt = $_POST['v_ssl_crt'];
             $v_ssl_key = $_POST['v_ssl_key'];
             $v_ssl_ca = $_POST['v_ssl_ca'];
@@ -316,6 +321,7 @@ if (!empty($_POST['save'])) {
             unset($output);
             $v_ssl = 'yes';
             $restart_web = 'yes';
+            $restart_proxy = 'yes';
             $v_ssl_crt = $_POST['v_ssl_crt'];
             $v_ssl_key = $_POST['v_ssl_key'];
             $v_ssl_ca = $_POST['v_ssl_ca'];
@@ -474,6 +480,13 @@ if (!empty($_POST['save'])) {
         unset($output);
     }
 
+    // Restart proxy
+    if (!empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
+        exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
+        check_return_code($return_var,$output);
+        unset($output);
+    }
+
     // Restart dns
     if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
         exec (VESTA_CMD."v-restart-dns", $output, $return_var);

web/inc/i18n/id.php

@@ -128,10 +128,10 @@ $LANG['id'] = array(
     'minute'  => 'menit',
     'hour'  => 'jam',
     'day'  => 'hari',
-    'days'  => 'beberapa hari',
+    'days'  => ' hari',
-    'hours'  => 'beberapa jam',
+    'hours'  => ' jam',
-    'minutes'  => 'beberapa jam',
+    'minutes'  => ' jam',
-    'month'  => 'beberapa month',
+    'month'  => ' month',
     'package'  => 'paket',
     'Bandwidth'  => 'Bandwidth',
     'Disk'  => 'Cakram',
@@ -205,7 +205,7 @@ $LANG['id'] = array(
     'Bandwidth Usage eth0'  => 'Penggunaan Bandwidth eth0',
     'FTP Usage'  => 'Penggunaan FTP',
     'SSH Usage'  => 'Penggunaan SSH',
-    'reverse proxy'  => 'membalikkan proxy',
+    'reverse proxy'  => 'reverse proxy',
     'web server'  => 'server web',
     'dns server'  => 'server dns',
     'mail server'  => 'server mail',
@@ -363,7 +363,7 @@ $LANG['id'] = array(
     'IP_CREATED_OK'  => 'Alamat IP <a href="/edit/ip/?ip=%s"><b>%s</b></a> udah berhasil dibikin.',
     'PACKAGE_CREATED_OK'  => 'Paket <a href="/edit/package/?package=%s"><b>%s</b></a> udah berhasil dibikin.',
     'SSL_GENERATED_OK' => 'Sertifikat udah berhasil dihasilkan.',
-    'Changes has been saved.'  => 'PErubahan udah disimpan.',
+    'Changes has been saved.'  => 'Perubahan udah disimpan.',
     'Confirmation'  => 'Konfirmasi',
     'DELETE_USER_CONFIRMATION' => 'Yakin pengguna %s mau dihapus nih?',
     'SUSPEND_USER_CONFIRMATION' => 'Yakin pengguna %s mau ditangguhkan nih?',

web/templates/admin/add_cron.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_cron" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -59,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -69,7 +64,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -79,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -89,7 +84,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>

web/templates/admin/add_db.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -46,25 +46,20 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td style="padding: 20px 0 0 2px; color:#777;" >
+                                <td style="padding:24px 0 0 0; color:#777;" >
                                     <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Database');?> 
                                 </td>
                             </tr>
@@ -75,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('User');?> 
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?> 
                                 </td>
                             </tr>
@@ -114,7 +109,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Host');?> 
                                 </td>
                             </tr>
@@ -133,7 +128,7 @@
                             </tr>
 
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Charset');?> 
                                 </td>
                             </tr>
@@ -179,7 +174,7 @@
                                     </select>
                                 </td>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Send login credentials to email address') ?> 
                                 </td>
                             </tr>

web/templates/admin/add_dns.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,20 +37,15 @@
 
             <table class="data">
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -60,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP address');?>
                                 </td>
                             </tr>
@@ -70,7 +65,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                 </td>
                             </tr>
@@ -78,7 +73,7 @@
                                 <td class="vst-text" style="padding: 10px 0 0 0px;">
                                     <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
@@ -88,7 +83,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 TTL
                                             </td>
                                         </tr>
@@ -98,7 +93,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Name servers');?>
                                             </td>
                                         </tr>

web/templates/admin/add_dns_rec.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_dns_rec" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -60,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -83,7 +78,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -93,7 +88,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>

web/templates/admin/add_ip.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,20 +37,15 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('IP address') ?> 
                                 </td>
                             </tr>
@@ -60,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Netmask');?>
                                 </td>
                             </tr>
@@ -70,7 +65,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Interface');?>
                                 </td>
                             </tr>
@@ -88,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Shared');?>
                                 </td>
                             </tr>
@@ -122,7 +117,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -132,7 +127,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('NAT IP association');?> <span class="optional"">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>

web/templates/admin/add_mail.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_mail" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiSpam Support');?>
                                 </td>
                             </tr>
@@ -59,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiVirus Support');?>
                                 </td>
                             </tr>
@@ -69,7 +64,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DKIM Support');?>
                                 </td>
                             </tr>

web/templates/admin/add_mail_acc.html

@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -47,20 +47,15 @@
 
             <table class='data'>
             <tr class="data-add">
-                <td class="data-dotted" width="150">
+                <td class="data-dotted">
                     <table class="data-col1">
                         <tr><td></td></tr>
                     </table>
                 </td>
-                <td class="data-dotted" width="830px">
+                <td class="data-dotted">
-                    <table width="830px">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
                                 <?php print __('Domain');?>
                             </td>
                         </tr>
@@ -70,7 +65,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -80,7 +75,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
@@ -90,16 +85,16 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 9px 0 0 0px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0px;">
                                 <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 0 0 0 2px;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
-                                            <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
+                                            <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -108,8 +103,8 @@
                                         </td>
                                     </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <td class="vst-text" style="padding: 12px 0 0 0;">
-                                        <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
+                                        <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                     </td>
                                 </tr>
                                 <tr>
@@ -118,8 +113,8 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <td class="vst-text" style="padding: 12px 0 0 0">
-                                        <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                                        <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                                     </td>
                                 </tr>
                                 <tr>
@@ -128,7 +123,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <td class="vst-text" style="padding: 12px 0 0 0;">
                                         <?php print __('Do not store forwarded mail');?>
                                     </td>
                                 </tr>
@@ -154,5 +149,5 @@
                 </table>
             </td>
         </tr>
-</table>
+    </table>
-        </form>
+    </form>

web/templates/admin/add_package.html

@@ -9,7 +9,7 @@
 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -27,20 +27,15 @@
         <form id="vstobjects" name="v_add_package" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -50,7 +45,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -73,7 +68,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -119,7 +114,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -142,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -152,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -162,7 +157,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -172,7 +167,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -182,7 +177,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -192,7 +187,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -202,7 +197,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -212,7 +207,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -222,7 +217,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -232,7 +227,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -242,7 +237,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -252,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Name servers');?>
                                 </td>
                             </tr>

web/templates/admin/add_user.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding User');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding User');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -45,21 +45,15 @@
 
             <table class="data">
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -69,7 +63,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -79,7 +73,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -89,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" name="v_package">
+                                <td class="vst-text" style="padding: 12px 0 0 0;" name="v_package">
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -113,7 +107,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -139,7 +133,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -149,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -159,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Send login credentials to email address');?>
                                 </td>
                             </tr>

web/templates/admin/add_web.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -65,22 +65,17 @@
 
             <table class='data'>
                 <tr class="data-add">
-                <td class="data-dotted" width="150">
+                <td class="data-dotted">
                     <table class="data-col1">
                         <tr>
                             <td></td>
                         </tr>
                     </table>
                 </td>
-                <td class="data-dotted" width="830px">
+                <td class="data-dotted">
-                    <table width="830px">
+                    <table class="data-col2">
                         <tr>
-                            <td></td>
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
-                        </tr>
-                    </table>
-                    <table class="data-col2" width="600px">
-                        <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
                                 <?php print __('Domain');?>
                             </td>
                         </tr>
@@ -90,7 +85,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('IP address');?>
                             </td>
                         </tr>
@@ -112,7 +107,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('DNS Support');?>
                             </td>
                         </tr>
@@ -122,7 +117,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Mail Support');?>
                             </td>
                         </tr>
@@ -132,14 +127,14 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                             </td>
                         </tr>
                     </table>
                     <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Aliases');?>
                             </td>
                         </tr>
@@ -149,7 +144,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Proxy Support');?>
                             </td>
                         </tr>
@@ -162,7 +157,7 @@
                             <td>
                                 <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Proxy Extentions');?>
                                         </td>
                                     </tr>
@@ -175,7 +170,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('SSL Support');?> /
                                 <a class="generate" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
                             </td>
@@ -189,7 +184,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Home Directory');?>
                                         </td>
                                     </tr>
@@ -206,7 +201,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Certificate');?>
                                         </td>
                                     </tr>
@@ -216,7 +211,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Key');?>
                                         </td>
                                     </tr>
@@ -226,7 +221,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print __('optional');?>)</span>
                                         </td>
                                     </tr>
@@ -239,7 +234,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Web Statistics');?>
                             </td>
                         </tr>
@@ -261,7 +256,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Statistics Authorization');?>
                             </td>
                         </tr>
@@ -274,7 +269,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Username');?>
                                         </td>
                                     </tr>
@@ -284,7 +279,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
                                         </td>
                                     </tr>
@@ -297,7 +292,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Additional FTP Account');?>
                             </td>
                         </tr>
@@ -310,7 +305,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Username');?><br>
                                             <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
                                         </td>
@@ -322,7 +317,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate" ><?php print __('generate');?></a>
                                         </td>
                                     </tr>
@@ -332,7 +327,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                              <?php print __('Send FTP credentials to email');?>
                                         </td>
                                     </tr>

web/templates/admin/edit_cron.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_cron" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,16 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -56,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -66,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -76,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -86,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -96,7 +90,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>

web/templates/admin/edit_db.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -47,7 +47,7 @@
 
            <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -58,15 +58,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Database');?>
                                 </td>
                             </tr>
@@ -77,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('User');?>
                                 </td>
                             </tr>
@@ -88,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -98,7 +93,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -108,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Host');?>
                                 </td>
                             </tr>
@@ -118,7 +113,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Charset');?>
                                 </td>
                             </tr>

web/templates/admin/edit_dns.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_dns" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -55,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -65,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Template');?>
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     SOA
                                 </td>
                             </tr>
@@ -106,7 +101,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     TTL
                                 </td>
                             </tr>

web/templates/admin/edit_dns_rec.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_dns_rec" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -56,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -66,7 +61,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -76,7 +71,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record Number');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('internal');?>)</span>
                                 </td>
                             </tr>

web/templates/admin/edit_ip.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -38,7 +38,7 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -49,15 +49,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('IP address'); ?> 
                                 </td>
                             </tr>
@@ -67,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Netmask');?> 
                                 </td>
                             </tr>
@@ -77,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Interface'); ?> 
                                 </td>
                             </tr>
@@ -87,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Shared'); ?> 
                                 </td>
                             </tr>
@@ -97,7 +92,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned user'); ?> 
                                 </td>
                             </tr>
@@ -115,7 +110,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -125,7 +120,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('NAT IP association');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>

web/templates/admin/edit_mail.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_mail" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -55,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiSpam Support');?>
                                 </td>
                             </tr>
@@ -65,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiVirus Support');?>
                                 </td>
                             </tr>
@@ -75,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DKIM Support');?>
                                 </td>
                             </tr>
@@ -85,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Catchall email');?>
                                 </td>
                             </tr>

web/templates/admin/edit_mail_acc.html

@@ -9,7 +9,7 @@
 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -48,7 +48,7 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -59,15 +59,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                    </table>
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -79,7 +74,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
@@ -89,8 +84,8 @@
                             </td>
                          </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
-                                <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
+                                <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -99,8 +94,8 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
-                                <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
+                                <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -109,8 +104,8 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
-                                <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                                <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -119,7 +114,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Do not store forwarded mail');?>
                             </td>
                         </tr>
@@ -129,7 +124,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Autoreply');?>
                             </td>
                         </tr>
@@ -142,7 +137,7 @@
                             <td>
                                 <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Message');?>
                                         </td>
                                     </tr>

web/templates/admin/edit_package.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_package" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -56,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -79,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -102,7 +97,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -125,7 +120,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -148,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -158,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -168,7 +163,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -178,7 +173,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -188,7 +183,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -198,7 +193,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -208,7 +203,7 @@
                                 <td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -218,7 +213,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -228,7 +223,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -238,7 +233,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -248,7 +243,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -258,7 +253,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Name Servers');?>
                                 </td>
                             </tr>

web/templates/admin/edit_user.html

@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -38,7 +38,7 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -49,16 +49,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
-                        <table width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="vst-text" style="padding: 28px 0 0 0;">
-                            </tr>
-                        </table>
-
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -68,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -78,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -88,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -109,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -133,7 +127,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -143,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -153,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -174,7 +168,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>