diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index d7b1298d21..2b53b82814 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -72,11 +72,399 @@ $vars = <<prepare(check_sql($sql)); + if ($prep_statement) { + $prep_statement->execute(); + + $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); + + if ( count($result)> 0) { + $country_iso = $result[0]["value"]; + } + } + + unset($prep_statement, $sql, $result); + + if ( $country_iso===NULL ) + return; + + $countries = json_decode($country_list, true); + + $found = false; + foreach($countries as $country) { + if ( $country["isocode"]==$country_iso ) { + $found = true; + break; + } + } + + if ( !$found ) { + return; + } + +// Set default Country ISO code + $sql = "select count(*) as num_rows from v_vars "; + $sql .= "where var_name = 'default_country' "; + $sql .= "and var_cat = 'Defaults' "; + $prep_statement = $db->prepare(check_sql($sql)); + if ($prep_statement) { + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + + if ($row['num_rows'] == 0) { + $sql = "insert into v_vars "; + $sql .= "("; + $sql .= "var_uuid, "; + $sql .= "var_name, "; + $sql .= "var_value, "; + $sql .= "var_cat, "; + $sql .= "var_enabled, "; + $sql .= "var_order, "; + $sql .= "var_description "; + $sql .= ")"; + $sql .= "values "; + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'default_country', "; + $sql .= "'".$country["isocode"]."', "; + $sql .= "'Defaults', "; + $sql .= "'true', "; + $sql .= "'".$x."', "; + $sql .= "'' "; + $sql .= ");"; + $db->exec(check_sql($sql)); + unset($sql, $row); + $x++; + } + } + unset($prep_statement, $sql); + +// Set default Country code + $sql = "select count(*) as num_rows from v_vars "; + $sql .= "where var_name = 'default_countrycode' "; + $sql .= "and var_cat = 'Defaults' "; + $prep_statement = $db->prepare(check_sql($sql)); + if ($prep_statement) { + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + + if ($row['num_rows'] == 0) { + $sql = "insert into v_vars "; + $sql .= "("; + $sql .= "var_uuid, "; + $sql .= "var_name, "; + $sql .= "var_value, "; + $sql .= "var_cat, "; + $sql .= "var_enabled, "; + $sql .= "var_order, "; + $sql .= "var_description "; + $sql .= ")"; + $sql .= "values "; + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'default_countrycode', "; + $sql .= "'".$country["countrycode"]."', "; + $sql .= "'Defaults', "; + $sql .= "'true', "; + $sql .= "'".$x."', "; + $sql .= "'' "; + $sql .= ");"; + $db->exec(check_sql($sql)); + unset($sql, $row); + $x++; + } + } + unset($prep_statement, $sql); + +// Set default International Direct Dialing code + $sql = "select count(*) as num_rows from v_vars "; + $sql .= "where var_name = 'default_exitcode' "; + $sql .= "and var_cat = 'Defaults' "; + $prep_statement = $db->prepare(check_sql($sql)); + if ($prep_statement) { + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + + if ($row['num_rows'] == 0) { + $sql = "insert into v_vars "; + $sql .= "("; + $sql .= "var_uuid, "; + $sql .= "var_name, "; + $sql .= "var_value, "; + $sql .= "var_cat, "; + $sql .= "var_enabled, "; + $sql .= "var_order, "; + $sql .= "var_description "; + $sql .= ")"; + $sql .= "values "; + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'default_exitcode', "; + $sql .= "'".$country["exitcode"]."', "; + $sql .= "'Defaults', "; + $sql .= "'true', "; + $sql .= "'".$x."', "; + $sql .= "'' "; + $sql .= ");"; + $db->exec(check_sql($sql)); + unset($sql, $row); + $x++; + } + } + unset($prep_statement, $sql); + + unset($countries); + } + + $x = 1; + //if there are no variables in the vars table then add them if ($domains_processed == 1) { $result = json_decode($vars, true); - $x = 1; foreach($result as $row) { $sql = "select count(*) as num_rows from v_vars "; @@ -118,7 +506,6 @@ EOD; } unset($result, $row); - } //adjust the variables required variables @@ -168,6 +555,9 @@ EOD; } } +//set country code variables + set_country_vars($db, $x); + //save the vars.xml file save_var_xml(); } diff --git a/resources/install.php b/resources/install.php index 98a46634d9..a63c2618a7 100644 --- a/resources/install.php +++ b/resources/install.php @@ -92,6 +92,7 @@ require_once "resources/functions.php"; $install_tmp_dir = $_POST["install_tmp_dir"]; $install_backup_dir = $_POST["install_backup_dir"]; $install_switch_base_dir = $_POST["install_switch_base_dir"]; + $install_default_country = $_POST["install_default_country"]; $install_template_name = $_POST["install_template_name"]; //clean up the values @@ -885,6 +886,12 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist $tmp[$x]['subcategory'] = 'language'; $tmp[$x]['enabled'] = 'true'; $x++; + $tmp[$x]['name'] = 'iso_code'; + $tmp[$x]['value'] = $install_default_country; + $tmp[$x]['category'] = 'domain'; + $tmp[$x]['subcategory'] = 'country'; + $tmp[$x]['enabled'] = 'true'; + $x++; $tmp[$x]['name'] = 'name'; $tmp[$x]['value'] = $install_template_name; $tmp[$x]['category'] = 'domain'; @@ -1510,6 +1517,265 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " Country:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo " Select ISO country code used to initialize calling contry code variables.
\n"; + echo "\n"; + echo "\n"; + + echo " \n"; echo " \n"; echo " Theme: \n"; @@ -1599,6 +1865,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " "; @@ -1713,6 +1980,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " "; @@ -1825,6 +2093,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " ";