From 06031ad89c90730117902666d628d9f4c4797c78 Mon Sep 17 00:00:00 2001 From: PhantomVl Date: Wed, 24 Apr 2019 20:31:38 +0300 Subject: [PATCH] - Installation procedure, detect chan_sccp --- install.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/install.php b/install.php index 5c7e94c..855fff9 100644 --- a/install.php +++ b/install.php @@ -805,12 +805,12 @@ function CreateBackUpConfig() { global $amp_conf; outn("
  • " . _("Create Config BackUp") . "
  • "); $cnf_int = \FreePBX::Config(); - $backup_files = array('extconfig','extconfig','res_mysql', 'res_config_mysql','sccp'); + $backup_files = array('extensions','extconfig','res_mysql', 'res_config_mysql','sccp'); $backup_ext = array('_custom.conf', '.conf'); $dir = $cnf_int->get('ASTETCDIR'); - $filename = $dir.'/sccp_backup_'.date("Ymd").'.sql'; - $result = exec('mysqldump '.$amp_conf['AMPDBNAME'].' --password='.$amp_conf['AMPDBPASS'].' --user='.$amp_conf['AMPDBUSER'].' --single-transaction >'.$filename ,$output); + $fsql = $dir.'/sccp_backup_'.date("Ymd").'.sql'; + $result = exec('mysqldump '.$amp_conf['AMPDBNAME'].' --password='.$amp_conf['AMPDBPASS'].' --user='.$amp_conf['AMPDBUSER'].' --single-transaction >'.$fsql ,$output); $zip = new \ZipArchive(); $filename = $dir . "/sccp_instal_backup" . date("Ymd"). ".zip"; @@ -822,10 +822,14 @@ function CreateBackUpConfig() { } } } + if (file_exists($fsql)) { + $zip->addFile($fsql); + } $zip->close(); } else { outn("
  • " . _("Error Create BackUp: ") . $filename ."
  • "); } + unlink($fsql); outn("
  • " . _("Create Config BackUp: ") . $filename ."
  • "); } @@ -919,9 +923,11 @@ $sccp_db_ver = CheckSCCPManagerDBVersion(); // BackUp Old config CreateBackUpConfig(); +if ($sccp_compatible > 431) { + InstallDB_sccpuser(); + InstallDB_Buttons(); +} -InstallDB_sccpuser(); -InstallDB_Buttons(); InstallDB_sccpsettings(); InstallDB_sccpdevmodel(); InstallDB_updateSchema($db_config);