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.

This commit is contained in:
markjcrane 2016-06-01 15:31:33 -06:00
parent ac0d1f3f48
commit d91369b8f7
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/vars/app_defaults.php
View File

@ -166,7 +166,7 @@ EOD;
}
unset($prep_statement, $sql);
// Set default Country code
//Set default Country code
$sql = "select count(*) as num_rows from v_vars ";
$sql .= "where var_name = 'default_countrycode' ";
$sql .= "and var_cat = 'Defaults' ";
@ -283,11 +283,9 @@ EOD;
$db->exec($sql);
unset($sql);
$x++;
}
}
unset($prep_statement, $row2);
}
unset($result, $row);
}

15
resources/switch.php
View File

@ -410,17 +410,12 @@ function save_var_xml() {
$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) {
$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) {
$xml .= "<X-PRE-PROCESS cmd=\"set\" 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";
$xml .= "<X-PRE-PROCESS cmd=\"".$var_cmd."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
}
}
$prev_var_cat = $row['var_cat'];
@ -1484,7 +1479,7 @@ if(!function_exists('path_join')) {
}
if(!function_exists('find_php_by_extension')) {
/*Tesetd on WAMP and OpenServer*/
// Tested on WAMP and OpenServer
function find_php_by_extension(){
$bin_dir = get_cfg_var('extension_dir');