Merge branch 'wxc_functions-sqlServerPort' into 'master'

Wxc functions sql server port

See merge request !31

scripts/user-settings.ini-default

@@ -17,6 +17,7 @@
 sql_user = "mesh-map"
 sql_passwd = "mesh-map_sql_user_password"
 sql_server = "localhost"
+sql_port = "3306"
 sql_db = "node_map"
 sql_db_tbl = "node_info"
 sql_db_tbl_node = "node_info"

scripts/wxc_functions.inc

@@ -330,7 +330,7 @@ function wxc_scriptUpdateDateTime ($id, $name) {
 ***********/
 //main sql connection
 function wxc_connectToMySQL() {
-	$GLOBALS['sql_connection'] = mysqli_connect($GLOBALS['USER_SETTINGS']['sql_server'],$GLOBALS['USER_SETTINGS']['sql_user'],$GLOBALS['USER_SETTINGS']['sql_passwd'],$GLOBALS['USER_SETTINGS']['sql_db']) or die('Could not connect to mySQL database: ' . mysqli_error($GLOBALS['connection']) . "\n");
+	$GLOBALS['sql_connection'] = mysqli_connect($GLOBALS['USER_SETTINGS']['sql_server'],$GLOBALS['USER_SETTINGS']['sql_user'],$GLOBALS['USER_SETTINGS']['sql_passwd'],$GLOBALS['USER_SETTINGS']['sql_db'],$GLOBALS['USER_SETTINGS']['sql_port']) or die('Could not connect to mySQL database: ' . mysqli_error($GLOBALS['connection']) . "\n");
 	return $GLOBALS['sql_connection'];
 }