diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php index 3432c3b..2b1d79d 100644 --- a/Sccp_manager.inc/extconfigs.class.php +++ b/Sccp_manager.inc/extconfigs.class.php @@ -280,7 +280,7 @@ class extconfigs { if ($db_vars["tftp_rewrite"]["data"] == 'pro') { $adv_tree_mode = 'pro'; if (!empty($adv_ini)) { // something found in external conflicts - $adv_ini .= 'index.cnf'; + $adv_ini .= '/index.cnf'; if (file_exists($adv_ini)) { $adv_ini_array = parse_ini_file($adv_ini); $adv_config = array_merge($adv_config, $adv_ini_array); diff --git a/contrib/index.cnf b/contrib/index.cnf new file mode 100644 index 0000000..7bec03f --- /dev/null +++ b/contrib/index.cnf @@ -0,0 +1,12 @@ +[main] +debug = on ; The output in the browser window for more information +tftproot = /tftpboot +;default_language = English_United_States + +firmware = firmware +settings = /tftpboot +wallpapers = /tftpboot/Desktops +ringtones = ringtones +locales = locales +countries = countries +languages = /tftpboot/languages diff --git a/install.php b/install.php index a9c3c71..fbcfc27 100644 --- a/install.php +++ b/install.php @@ -805,6 +805,10 @@ function CreateBackUpConfig() { $backup_files = array('extconfig','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); + $zip = new \ZipArchive(); $filename = $dir . "/sccp_instal_backup" . date("Ymd"). ".zip"; if ($zip->open($filename, \ZIPARCHIVE::CREATE)) {