From b995895b9b323d000eb3aca33b016d5765867a12 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 5 Jul 2011 21:47:10 +0300
Subject: [PATCH] renamed key TEMPLATES to WEB_TPL

---
 bin/v_add_web_domain         | 2 +-
 bin/v_add_web_domain_ssl     | 2 +-
 bin/v_change_web_domain_tpl  | 2 +-
 bin/v_list_sys_user          | 2 +-
 bin/v_list_sys_user_packages | 2 +-
 bin/v_list_sys_users         | 2 +-
 bin/v_list_web_templates     | 2 +-
 data/packages/default.pkg    | 2 +-
 data/packages/palegreen.pkg  | 2 +-
 func/shared_func.sh          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain
index d17eab165..5075e0c45 100755
--- a/bin/v_add_web_domain
+++ b/bin/v_add_web_domain
@@ -57,7 +57,7 @@ is_ip_avalable
 is_package_full 'web_domain'
 
 # Checking template
-templates=$(get_user_value '$TEMPLATES')
+templates=$(get_user_value '$WEB_TPL')
 is_template_valid "web"
 
 
diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl
index 3f4160d8c..d4c22a342 100755
--- a/bin/v_add_web_domain_ssl
+++ b/bin/v_add_web_domain_ssl
@@ -58,7 +58,7 @@ is_web_domain_key_empty '$SSL_CERT'
 is_web_domain_cert_valid
 
 # Checking template
-templates=$(get_user_value '$TEMPLATES')
+templates=$(get_user_value '$WEB_TPL')
 template=$(get_web_domain_value '$TPL')
 is_template_valid 'web'
 
diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl
index 456f8c32d..3bd459572 100755
--- a/bin/v_change_web_domain_tpl
+++ b/bin/v_change_web_domain_tpl
@@ -43,7 +43,7 @@ is_web_domain_valid
 is_domain_suspended 'web_domains'
 
 # Checking template
-templates=$(get_user_value '$TEMPLATES')
+templates=$(get_user_value '$WEB_TPL')
 is_template_valid "web"
 
 
diff --git a/bin/v_list_sys_user b/bin/v_list_sys_user
index 7f92d3428..720e4d2bf 100755
--- a/bin/v_list_sys_user
+++ b/bin/v_list_sys_user
@@ -38,7 +38,7 @@ conf="$V_USERS/$user/user.conf"
 # Defining fileds to select
 fields='$USER $PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES $DATABASES
     $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS $DISK_QUOTA
-    $BANDWIDTH $NS1 $NS2 $SHELL $BACKUPS $TEMPLATES $MAX_CHILDS $SUSPENDED
+    $BANDWIDTH $NS1 $NS2 $SHELL $BACKUPS $WEB_TPL $MAX_CHILDS $SUSPENDED
     $OWNER $ROLE $IP_OWNED $U_CHILDS $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS
     $U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES $U_MAIL_DOMAINS $CONTACT $DATE'
 
diff --git a/bin/v_list_sys_user_packages b/bin/v_list_sys_user_packages
index ce532ea8c..2ef0580ce 100755
--- a/bin/v_list_sys_user_packages
+++ b/bin/v_list_sys_user_packages
@@ -30,7 +30,7 @@ format_validation 'limit' 'offset'
 # Defining fields
 fields='$PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES $DATABASES $MAIL_DOMAINS
     $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS $DISK_QUOTA $BANDWIDTH $NS1 $NS2
-    $SHELL $BACKUPS $TEMPLATES $MAX_CHILDS'
+    $SHELL $BACKUPS $WEB_TPL $MAX_CHILDS'
 
 # Listing domains
 case $format in
diff --git a/bin/v_list_sys_users b/bin/v_list_sys_users
index 6f6d18e10..f1db8a576 100755
--- a/bin/v_list_sys_users
+++ b/bin/v_list_sys_users
@@ -29,7 +29,7 @@ format_validation 'limit' 'offset'
 # Defining fileds to select
 fields='$USER $PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES $DATABASES
     $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS $DISK_QUOTA
-    $BANDWIDTH $NS1 $NS2 $SHELL $BACKUPS $TEMPLATES $MAX_CHILDS $SUSPENDED
+    $BANDWIDTH $NS1 $NS2 $SHELL $BACKUPS $WEB_TPL $MAX_CHILDS $SUSPENDED
     $OWNER $ROLE $IP_OWNED $U_CHILDS $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS
     $U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES $U_MAIL_DOMAINS $CONTACT $DATE'
 
diff --git a/bin/v_list_web_templates b/bin/v_list_web_templates
index 5dc303520..a5ff082a9 100755
--- a/bin/v_list_web_templates
+++ b/bin/v_list_web_templates
@@ -36,7 +36,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Get user package package
-templates=$(get_user_value '$TEMPLATES')
+templates=$(get_user_value '$WEB_TPL')
 
 # Listing domains
 case $format in
diff --git a/data/packages/default.pkg b/data/packages/default.pkg
index 24bb3763d..8ad1e91cc 100644
--- a/data/packages/default.pkg
+++ b/data/packages/default.pkg
@@ -1,6 +1,7 @@
 WEB_DOMAINS='10'
 WEB_SSL='10'
 WEB_ALIASES='10'
+WEB_TPL='default,phpcgi,unlim'
 DATABASES='10'
 MAIL_DOMAINS='10'
 MAIL_BOXES='30'
@@ -12,5 +13,4 @@ NS1='ns1.localhost'
 NS2='ns2.localhost'
 SHELL='nologin'
 BACKUPS='3'
-TEMPLATES='default,phpcgi,unlim'
 MAX_CHILDS='300'
diff --git a/data/packages/palegreen.pkg b/data/packages/palegreen.pkg
index e9e259846..0725776f7 100644
--- a/data/packages/palegreen.pkg
+++ b/data/packages/palegreen.pkg
@@ -1,6 +1,7 @@
 WEB_DOMAINS='30'
 WEB_SSL='30'
 WEB_ALIASES='50'
+WEB_TPL='default,phpcgi,unlim'
 DATABASES='30'
 MAIL_DOMAINS='30'
 MAIL_BOXES='50'
@@ -12,5 +13,4 @@ NS1='ns1.localhost'
 NS2='ns2.localhost'
 SHELL='nologin'
 BACKUPS='5'
-TEMPLATES='default,phpcgi,unlim'
 MAX_CHILDS='300'
diff --git a/func/shared_func.sh b/func/shared_func.sh
index b9e06896d..5b9c0b020 100644
--- a/func/shared_func.sh
+++ b/func/shared_func.sh
@@ -846,7 +846,7 @@ NS1='$NS1'
 NS2='$NS2'
 SHELL='$SHELL'
 BACKUPS='$BACKUPS'
-TEMPLATES='$TEMPLATES'
+WEB_TPL='$WEB_TPL'
 MAX_CHILDS='$MAX_CHILDS'
 SUSPENDED='$SUSPENDED'
 OWNER='$OWNER'