ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tidy up installer

Browse source 
Clean SQL statements
Solidify dbsettings management
This commit is contained in:
steve-lad 2021-06-27 12:48:24 +02:00
parent b1a7fe3510
commit 7721e7a8a0
No known key found for this signature in database
GPG key ID: 4D1D760BACDAFF81
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
install.php
View file

@ -468,13 +468,13 @@ function InstallDB_updateSchema($db_config)
try { try {
$check = $db->query($sql_create); $check = $db->query($sql_create);
} catch (\Exception $e) { } catch (\Exception $e) {
die_freepbx("Can not modify {$tabl_name}. SQL: {$sql_create} \n"); die_freepbx("Can add column to {$tabl_name}. SQL: {$sql_create} \n");
} }
} }
if (!empty($sql_modify)) { if (!empty($sql_modify)) {
outn("<li>" . _("Modifying table ") . $tabl_name ."</li>"); outn("<li>" . _("Modifying table ") . $tabl_name ."</li>");
$sql_modify = "ALTER TABLE `" . $tabl_name . "` " . substr($sql_modify, 0, -2) . ';'; $sql_modify = "ALTER TABLE {$tabl_name} " . substr($sql_modify, 0, -2);
try { try {
$check = $db->query($sql_modify); $check = $db->query($sql_modify);
} catch (\Exception $e) { } catch (\Exception $e) {
@ -851,16 +851,16 @@ function Setup_RealTime()
$cnf_wr->writeConfig('res_mysql.conf', $res_conf); $cnf_wr->writeConfig('res_mysql.conf', $res_conf);
outn("<li>" . _("Updating res_mysql.conf file ...") . "</li>"); outn("<li>" . _("Updating res_mysql.conf file ...") . "</li>");
} }
} } elseif (file_exists($dir . '/res_config_mysql.conf')) {
if (file_exists($dir . '/res_config_mysql.conf')) {
$res_conf = $cnf_read->getConfig('res_config_mysql.conf'); $res_conf = $cnf_read->getConfig('res_config_mysql.conf');
if (empty($res_conf[$def_bd_section])) { if (empty($res_conf[$def_bd_section])) {
$res_conf[$def_bd_section] = $def_bd_config; $res_conf[$def_bd_section] = $def_bd_config;
$cnf_wr->writeConfig('res_config_mysql.conf', $res_conf); $cnf_wr->writeConfig('res_config_mysql.conf', $res_conf);
outn("<li>" . _("Updating res_config_mysql.conf file ...") . "</li>"); outn("<li>" . _("Updating res_config_mysql.conf file ...") . "</li>");
} }
} } else {
if (empty($res_conf)) { // Have not found either res_mysql.conf or res_config_mysql.config
// So create the latter
$res_conf[$def_bd_section] = $def_bd_config; $res_conf[$def_bd_section] = $def_bd_config;
$cnf_wr->writeConfig('res_config_mysql.conf', $res_conf, false); $cnf_wr->writeConfig('res_config_mysql.conf', $res_conf, false);
} }
@ -868,7 +868,7 @@ function Setup_RealTime()
function addDriver($sccp_compatible) { function addDriver($sccp_compatible) {
outn("<li>" . _("Adding driver ...") . "</li>"); outn("<li>" . _("Adding driver ...") . "</li>");
$file = "/var/www/html/admin/modules/core/functions.inc/drivers/Sccp.class.php"; $file = "{$_SERVER['DOCUMENT_ROOT']}/admin/modules/core/functions.inc/drivers/Sccp.class.php";
$contents = "<?php include '/var/www/html/admin/modules/sccp_manager/sccpManClasses/Sccp.class.php.v{$sccp_compatible}'; ?>"; $contents = "<?php include '/var/www/html/admin/modules/sccp_manager/sccpManClasses/Sccp.class.php.v{$sccp_compatible}'; ?>";
file_put_contents($file, $contents); file_put_contents($file, $contents);
@ -876,7 +876,7 @@ function addDriver($sccp_compatible) {
$dir = $cnf_int->get('ASTETCDIR'); $dir = $cnf_int->get('ASTETCDIR');
if (!file_exists("{$dir}/sccp.conf")) { // System re Config if (!file_exists("{$dir}/sccp.conf")) { // System re Config
outn("<li>" . _("Adding default configuration file ...") . "</li>"); outn("<li>" . _("Adding default configuration file ...") . "</li>");
$sccpfile = file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/sccp.conf'); $sccpfile = file_get_contents("{$_SERVER['DOCUMENT_ROOT']}/admin/modules/sccp_manager/conf/sccp.conf");
file_put_contents("{$dir}/sccp.conf", $sccpfile); file_put_contents("{$dir}/sccp.conf", $sccpfile);
} }
} }