- Bug fix, provision sccp

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);

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

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');