Merge pull request #1468 from mafoo/WhitespaceClean-app/batch_1
WhitespaceClean-app/batch_1
This commit is contained in:
commit
6c8aa675a2
|
|
@ -314,7 +314,7 @@ fieldset {
|
||||||
/*** Others ***/
|
/*** Others ***/
|
||||||
#lang {
|
#lang {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
font-size: .9em;
|
font-size: .9em;
|
||||||
left: auto;
|
left: auto;
|
||||||
right: 90px;
|
right: 90px;
|
||||||
position:fixed;
|
position:fixed;
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cache class provides an abstracted cache
|
* cache class provides an abstracted cache
|
||||||
*
|
*
|
||||||
* @method string dialplan - builds the dialplan for call center
|
* @method string dialplan - builds the dialplan for call center
|
||||||
*/
|
*/
|
||||||
//define the call center class
|
//define the call center class
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
|
Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
|
||||||
Errol Samuels <voiptology@gmail.com>
|
Errol Samuels <voiptology@gmail.com>
|
||||||
|
|
||||||
*/
|
*/
|
||||||
include "root.php";
|
include "root.php";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@
|
||||||
$text['opt-itring']['es-cl'] = "it-ring";
|
$text['opt-itring']['es-cl'] = "it-ring";
|
||||||
$text['opt-itring']['pt-pt'] = "it-ring";
|
$text['opt-itring']['pt-pt'] = "it-ring";
|
||||||
$text['opt-itring']['fr-fr'] = "it-ring";
|
$text['opt-itring']['fr-fr'] = "it-ring";
|
||||||
|
|
||||||
$text['opt-moh']['en-us'] = "music";
|
$text['opt-moh']['en-us'] = "music";
|
||||||
$text['opt-moh']['es-cl'] = "musica";
|
$text['opt-moh']['es-cl'] = "musica";
|
||||||
$text['opt-moh']['pt-pt'] = "música";
|
$text['opt-moh']['pt-pt'] = "música";
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ else {
|
||||||
echo "<table>";
|
echo "<table>";
|
||||||
echo " <tr>";
|
echo " <tr>";
|
||||||
echo " <td>".$text['label-path']."</td>";
|
echo " <td>".$text['label-path']."</td>";
|
||||||
echo " </tr>";
|
echo " </tr>";
|
||||||
echo " <tr>";
|
echo " <tr>";
|
||||||
echo " <td>".$folder.$file."</td>";
|
echo " <td>".$folder.$file."</td>";
|
||||||
echo " </tr>";
|
echo " </tr>";
|
||||||
|
|
|
||||||
|
|
@ -491,7 +491,7 @@ include "root.php";
|
||||||
$database->where[1]['operator'] = '=';
|
$database->where[1]['operator'] = '=';
|
||||||
$database->update();
|
$database->update();
|
||||||
|
|
||||||
//delete the old dialplan details to prepare for new details
|
//delete the old dialplan details to prepare for new details
|
||||||
$database = new database;
|
$database = new database;
|
||||||
$database->table = "v_dialplan_details";
|
$database->table = "v_dialplan_details";
|
||||||
$database->where[0]['name'] = 'domain_uuid';
|
$database->where[0]['name'] = 'domain_uuid';
|
||||||
|
|
@ -828,7 +828,7 @@ include "root.php";
|
||||||
$sub_sql = "select * from v_ivr_menu_options ";
|
$sub_sql = "select * from v_ivr_menu_options ";
|
||||||
$sub_sql .= "where ivr_menu_uuid = '$ivr_menu_uuid' ";
|
$sub_sql .= "where ivr_menu_uuid = '$ivr_menu_uuid' ";
|
||||||
$sub_sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' ";
|
$sub_sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' ";
|
||||||
$sub_sql .= "order by ivr_menu_option_order asc ";
|
$sub_sql .= "order by ivr_menu_option_order asc ";
|
||||||
$sub_prep_statement = $db->prepare(check_sql($sub_sql));
|
$sub_prep_statement = $db->prepare(check_sql($sub_sql));
|
||||||
$sub_prep_statement->execute();
|
$sub_prep_statement->execute();
|
||||||
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_ASSOC);
|
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
|
||||||
|
|
@ -701,7 +701,7 @@ echo $mod->dir."\n";
|
||||||
//get the list of modules
|
//get the list of modules
|
||||||
public function get_modules() {
|
public function get_modules() {
|
||||||
$sql = " select * from v_modules ";
|
$sql = " select * from v_modules ";
|
||||||
$sql .= "order by module_category, module_label";
|
$sql .= "order by module_category, module_label";
|
||||||
$prep_statement = $this->db->prepare($sql);
|
$prep_statement = $this->db->prepare($sql);
|
||||||
$prep_statement->execute();
|
$prep_statement->execute();
|
||||||
$this->modules = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
|
$this->modules = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
|
||||||
|
|
@ -359,7 +359,7 @@ openlog("fusion-provisioning", LOG_PID | LOG_PERROR, LOG_LOCAL0);
|
||||||
//deliver the customized config over HTTP/HTTPS
|
//deliver the customized config over HTTP/HTTPS
|
||||||
//need to make sure content-type is correct
|
//need to make sure content-type is correct
|
||||||
if ($_REQUEST['content_type'] == 'application/octet-stream') {
|
if ($_REQUEST['content_type'] == 'application/octet-stream') {
|
||||||
//format the mac address and
|
//format the mac address and
|
||||||
$mac = $prov->format_mac($mac, $device_vendor);
|
$mac = $prov->format_mac($mac, $device_vendor);
|
||||||
|
|
||||||
//replace the variable name with the value
|
//replace the variable name with the value
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* scripts class provides methods for creating the config.lua and copying switch scripts
|
* scripts class provides methods for creating the config.lua and copying switch scripts
|
||||||
*
|
*
|
||||||
* @method string correct_path
|
* @method string correct_path
|
||||||
* @method string copy_files
|
* @method string copy_files
|
||||||
* @method string write_config
|
* @method string write_config
|
||||||
|
|
@ -110,7 +110,7 @@ class scripts {
|
||||||
global $db_path;
|
global $db_path;
|
||||||
global $db_username;
|
global $db_username;
|
||||||
global $db_password;
|
global $db_password;
|
||||||
|
|
||||||
//replace the backslash with a forward slash
|
//replace the backslash with a forward slash
|
||||||
$db_path = str_replace("\\", "/", $db_path);
|
$db_path = str_replace("\\", "/", $db_path);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,7 @@ if(function_exists('reg_open_key')){
|
||||||
HKEY_CLASSES_ROOT => "HKCR",
|
HKEY_CLASSES_ROOT => "HKCR",
|
||||||
HKEY_CURRENT_USER => "HKCU",
|
HKEY_CURRENT_USER => "HKCU",
|
||||||
HKEY_LOCAL_MACHINE => "HKLM",
|
HKEY_LOCAL_MACHINE => "HKLM",
|
||||||
HKEY_USERS => "HKU",
|
HKEY_USERS => "HKU",
|
||||||
HKEY_CURRENT_CONFIG => "HKCC",
|
HKEY_CURRENT_CONFIG => "HKCC",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ else {
|
||||||
$db_path = $db_file_path;
|
$db_path = $db_file_path;
|
||||||
$db_name = $dbfilename;
|
$db_name = $dbfilename;
|
||||||
}
|
}
|
||||||
|
|
||||||
//get the db connection information
|
//get the db connection information
|
||||||
if (strlen($_REQUEST['id']) > 0) {
|
if (strlen($_REQUEST['id']) > 0) {
|
||||||
$sql = "select * from v_databases ";
|
$sql = "select * from v_databases ";
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ if ($domains_processed == 1) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//add the missing default settings
|
//add the missing default settings
|
||||||
foreach ($missing as $row) {
|
foreach ($missing as $row) {
|
||||||
//add the default settings
|
//add the default settings
|
||||||
|
|
@ -84,7 +84,7 @@ if ($domains_processed == 1) {
|
||||||
$array[$x]['default_setting_enabled'] = 'true';
|
$array[$x]['default_setting_enabled'] = 'true';
|
||||||
$array[$x]['default_setting_description'] = 'What region to use by default when choosing Time Conditions';
|
$array[$x]['default_setting_description'] = 'What region to use by default when choosing Time Conditions';
|
||||||
$x++;
|
$x++;
|
||||||
|
|
||||||
//iterate and add each, if necessary
|
//iterate and add each, if necessary
|
||||||
foreach ($array as $index => $default_settings) {
|
foreach ($array as $index => $default_settings) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ if ($domains_processed == 1) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//add that the directory structure for voicemail each domain and voicemail id is
|
//add that the directory structure for voicemail each domain and voicemail id is
|
||||||
$sql = "select d.domain_name, v.voicemail_id ";
|
$sql = "select d.domain_name, v.voicemail_id ";
|
||||||
$sql .= "from v_domains as d, v_voicemails as v ";
|
$sql .= "from v_domains as d, v_voicemails as v ";
|
||||||
$sql .= "where v.domain_uuid = d.domain_uuid ";
|
$sql .= "where v.domain_uuid = d.domain_uuid ";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue