From 4dd2c08e8bcf56a45047ae282bd94266800bcbfd Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 19 May 2011 17:37:05 -0400
Subject: [PATCH] Allow config settings for country on client, reseller pages from the $conf

---
 interface/lib/config.inc.php                 |    3 +++
 interface/web/client/form/client.tform.php   |    2 +-
 interface/web/client/form/reseller.tform.php |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index b584146..813c2c6 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -133,6 +133,9 @@
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
 
+//** Default Country
+$conf['country'] = 'DE';
+
 
 //** Misc.
 $conf['interface_logout_url'] = ''; // example: http://www.domain.tld/
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index be3c631..43d824b 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -220,7 +220,7 @@
 			'datatype'	=> 'VARCHAR',
 
 			'formtype'	=> 'SELECT',
-			'default'	=> '$conf["country"]',
+			'default'	=> $conf["country"],
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
 										'keyfield'=> 'iso',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index b53717a..86ccd4a 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -209,7 +209,7 @@
 			'datatype'	=> 'VARCHAR',
 
 			'formtype'	=> 'SELECT',
-			'default'	=> 'DE',
+			'default'	=> $conf["country"],
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
 										'keyfield'=> 'iso',

--
Gitblit v1.9.1