dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed set_country_vars() duplicate declaration issue during domain creation

Browse Source
This commit is contained in:
Riccardo Granchi
2014-11-07 15:21:34 +00:00
parent 1ac8d1c7fc
commit 48d08f4685
1 changed files with 153 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/vars/app_defaults.php
+7 -5
View File
@@ -73,9 +73,10 @@ $vars = <<<EOD
EOD; EOD;
// Set country depend variables as country code and international direct dialing code (exit code) // Set country depend variables as country code and international direct dialing code (exit code)
if (!function_exists('set_country_vars')) {
function set_country_vars($db, $x) { function set_country_vars($db, $x) {
$country_list = <<<EOD $country_list = <<<EOD
[ [
{"country":"Afghanistan","countrycode":"93","exitcode":"00","isocode":"AF"} {"country":"Afghanistan","countrycode":"93","exitcode":"00","isocode":"AF"}
,{"country":"Albania","countrycode":"355","exitcode":"00","isocode":"AL"} ,{"country":"Albania","countrycode":"355","exitcode":"00","isocode":"AL"}
@@ -308,7 +309,7 @@ $country_list = <<<EOD
] ]
EOD; EOD;
// $country_iso=$_SESSION['domain']['country']['iso_code']; // $country_iso=$_SESSION['domain']['country']['iso_code'];
$sql = "select default_setting_value as value from v_default_settings "; $sql = "select default_setting_value as value from v_default_settings ";
$sql .= "where default_setting_name = 'iso_code' "; $sql .= "where default_setting_name = 'iso_code' ";
@@ -345,7 +346,7 @@ EOD;
return; return;
} }
// Set default Country ISO code // Set default Country ISO code
$sql = "select count(*) as num_rows from v_vars "; $sql = "select count(*) as num_rows from v_vars ";
$sql .= "where var_name = 'default_country' "; $sql .= "where var_name = 'default_country' ";
$sql .= "and var_cat = 'Defaults' "; $sql .= "and var_cat = 'Defaults' ";
@@ -382,7 +383,7 @@ EOD;
} }
unset($prep_statement, $sql); unset($prep_statement, $sql);
// Set default Country code // Set default Country code
$sql = "select count(*) as num_rows from v_vars "; $sql = "select count(*) as num_rows from v_vars ";
$sql .= "where var_name = 'default_countrycode' "; $sql .= "where var_name = 'default_countrycode' ";
$sql .= "and var_cat = 'Defaults' "; $sql .= "and var_cat = 'Defaults' ";
@@ -419,7 +420,7 @@ EOD;
} }
unset($prep_statement, $sql); unset($prep_statement, $sql);
// Set default International Direct Dialing code // Set default International Direct Dialing code
$sql = "select count(*) as num_rows from v_vars "; $sql = "select count(*) as num_rows from v_vars ";
$sql .= "where var_name = 'default_exitcode' "; $sql .= "where var_name = 'default_exitcode' ";
$sql .= "and var_cat = 'Defaults' "; $sql .= "and var_cat = 'Defaults' ";
@@ -458,6 +459,7 @@ EOD;
unset($countries); unset($countries);
} }
}
$x = 1; $x = 1;