Commit 56780b1c authored by Eric - kg6wxc's avatar Eric - kg6wxc
Browse files

Merge branch 'wxc_functions-sqlServerPort' into 'master'

Wxc functions sql server port

See merge request !31
parents 881e1ac8 3b0e4a87
......@@ -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"
......
......@@ -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'];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment