diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php index c7be6fa..29e62ff 100644 --- a/Sccp_manager.inc/extconfigs.class.php +++ b/Sccp_manager.inc/extconfigs.class.php @@ -268,7 +268,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/!Readme.txt/ATA.txt b/Technical.notes/ATA.txt similarity index 100% rename from !Readme.txt/ATA.txt rename to Technical.notes/ATA.txt diff --git a/!Readme.txt/Conferencing.txt b/Technical.notes/Conferencing.txt similarity index 100% rename from !Readme.txt/Conferencing.txt rename to Technical.notes/Conferencing.txt diff --git a/!Readme.txt/RedialMenu.txt b/Technical.notes/RedialMenu.txt similarity index 100% rename from !Readme.txt/RedialMenu.txt rename to Technical.notes/RedialMenu.txt diff --git a/!Readme.txt/SEP0000000000.cnf.xml_annotated b/Technical.notes/SEP0000000000.cnf.xml_annotated similarity index 100% rename from !Readme.txt/SEP0000000000.cnf.xml_annotated rename to Technical.notes/SEP0000000000.cnf.xml_annotated diff --git a/!Readme.txt/SEPXML.txt b/Technical.notes/SEPXML.txt similarity index 100% rename from !Readme.txt/SEPXML.txt rename to Technical.notes/SEPXML.txt diff --git a/!Readme.txt/backgroundImage.txt b/Technical.notes/backgroundImage.txt similarity index 100% rename from !Readme.txt/backgroundImage.txt rename to Technical.notes/backgroundImage.txt diff --git a/!Readme.txt/dialplan.txt b/Technical.notes/dialplan.txt similarity index 100% rename from !Readme.txt/dialplan.txt rename to Technical.notes/dialplan.txt diff --git a/!Readme.txt/help.tftprewrite b/Technical.notes/help.tftprewrite similarity index 100% rename from !Readme.txt/help.tftprewrite rename to Technical.notes/help.tftprewrite diff --git a/!Readme.txt/make_sccp.txt b/Technical.notes/make_sccp.txt similarity index 100% rename from !Readme.txt/make_sccp.txt rename to Technical.notes/make_sccp.txt diff --git a/!Readme.txt/sccp.conf.annotated b/Technical.notes/sccp.conf.annotated similarity index 100% rename from !Readme.txt/sccp.conf.annotated rename to Technical.notes/sccp.conf.annotated diff --git a/contrib/index.cnf b/contrib/index.cnf new file mode 100644 index 0000000..82238ab --- /dev/null +++ b/contrib/index.cnf @@ -0,0 +1,15 @@ +; Ini File to Provision Sccp +; https://github.com/dkgroot/provision_sccp +; +[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 a46504c..f3da366 100644 --- a/install.php +++ b/install.php @@ -662,7 +662,7 @@ function Setup_RealTime() { $def_config = array('sccpdevice' => 'mysql,sccp,sccpdeviceconfig', 'sccpline' => ' mysql,sccp,sccpline'); $def_bd_config = array('dbhost' => $amp_conf['AMPDBHOST'], 'dbname' => $amp_conf['AMPDBNAME'], 'dbuser' => $amp_conf['AMPDBUSER'], 'dbpass' => $amp_conf['AMPDBPASS'], - 'dbport' => '3306', 'dbsock' => '/var/lib/mysql/mysql.sock'); + 'dbport' => '3306', 'dbsock' => '/var/lib/mysql/mysql.sock', 'dbcharset'=>'utf8'); $def_bd_sec = 'sccp'; $dir = $cnf_int->get('ASTETCDIR');