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

Prevent duplicate values from being saved in the vars.xml file and remove some trailing spaces and fix some of the indentation.

Browse Source
This commit is contained in:
markjcrane
2016-06-01 15:31:33 -06:00
parent 9ef93aede1
commit 102120d55e
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/vars/app_defaults.php
+14 -16
View File
@@ -121,15 +121,15 @@ EOD;
} }
} }
unset($prep_statement, $sql, $result); unset($prep_statement, $sql, $result);
if ( $country_iso===NULL ) { if ( $country_iso===NULL ) {
return; return;
} }
if(isset($countries[$country_iso])){ if(isset($countries[$country_iso])){
$country = $countries[$country_iso]; $country = $countries[$country_iso];
// 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' ";
@@ -165,8 +165,8 @@ 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' ";
@@ -201,8 +201,8 @@ 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' ";
@@ -242,15 +242,15 @@ EOD;
} }
} }
} }
$x = 1; $x = 1;
//if there are no variables in the vars table then add them //if there are no variables in the vars table then add them
if ($domains_processed == 1) { if ($domains_processed == 1) {
$result = json_decode($vars, true); $result = json_decode($vars, true);
foreach($result as $row) { foreach($result as $row) {
$sql = "select count(*) as num_rows from v_vars "; $sql = "select count(*) as num_rows from v_vars ";
$sql .= "where var_name = '".$row['var_name']."' "; $sql .= "where var_name = '".$row['var_name']."' ";
$sql .= "and var_cat = '".$row['var_cat']."' "; $sql .= "and var_cat = '".$row['var_cat']."' ";
@@ -259,7 +259,7 @@ EOD;
$prep_statement->execute(); $prep_statement->execute();
$row2 = $prep_statement->fetch(PDO::FETCH_ASSOC); $row2 = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row2['num_rows'] == 0) { if ($row2['num_rows'] == 0) {
$sql = "insert into v_vars "; $sql = "insert into v_vars ";
$sql .= "("; $sql .= "(";
$sql .= "var_uuid, "; $sql .= "var_uuid, ";
@@ -283,11 +283,9 @@ EOD;
$db->exec($sql); $db->exec($sql);
unset($sql); unset($sql);
$x++; $x++;
} }
} }
unset($prep_statement, $row2); unset($prep_statement, $row2);
} }
unset($result, $row); unset($result, $row);
} }
@@ -344,4 +342,4 @@ EOD;
//save the vars.xml file //save the vars.xml file
save_var_xml(); save_var_xml();
} }
?> ?>
resources/switch.php
+6 -11
View File
@@ -410,17 +410,12 @@ function save_var_xml() {
$xml .= "<!-- ".base64_decode($row['var_description'])." -->\n"; $xml .= "<!-- ".base64_decode($row['var_description'])." -->\n";
} }
} }
if ($row['var_cat'] == 'Exec-Set') { $var_cmd = 'exec-set'; } else { $var_cmd = 'set'; }
if (strlen($row['var_hostname']) == 0) { if (strlen($row['var_hostname']) == 0) {
$xml .= "<X-PRE-PROCESS cmd=\"set\" data=\"".$row['var_name']."=".$row['var_value']."\"/>\n"; $xml .= "<X-PRE-PROCESS cmd=\"".$var_cmd."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
} elseif ($row['var_hostname'] == $hostname) { } elseif ($row['var_hostname'] == $hostname) {
$xml .= "<X-PRE-PROCESS cmd=\"set\" data=\"".$row['var_name']."=".$row['var_value']."\"/>\n"; $xml .= "<X-PRE-PROCESS cmd=\"".$var_cmd."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
}
$var_cmd = 'set';
if ($row['var_cat'] == 'Exec-Set') { $var_cmd = 'exec-set'; }
if (strlen($row['var_hostname']) == 0) {
$xml .= "<X-PRE-PROCESS cmd=\"".$var_cmd."\" data=\"".$row['var_name']."=".$row['var_value']."\"/>\n";
} elseif ($row['var_hostname'] == $hostname) {
$xml .= "<X-PRE-PROCESS cmd=\"".$var_cmd."\" data=\"".$row['var_name']."=".$row['var_value']."\"/>\n";
} }
} }
$prev_var_cat = $row['var_cat']; $prev_var_cat = $row['var_cat'];
@@ -1484,7 +1479,7 @@ if(!function_exists('path_join')) {
} }
if(!function_exists('find_php_by_extension')) { if(!function_exists('find_php_by_extension')) {
/*Tesetd on WAMP and OpenServer*/ // Tested on WAMP and OpenServer
function find_php_by_extension(){ function find_php_by_extension(){
$bin_dir = get_cfg_var('extension_dir'); $bin_dir = get_cfg_var('extension_dir');
@@ -1502,4 +1497,4 @@ if(!function_exists('find_php_by_extension')) {
} }
} }
?> ?>