Merge branch 'mike' into mike_test

This commit is contained in:
Michael Erdely 2024-10-09 16:06:58 -04:00
commit c2a5638412

View file

@ -15,11 +15,12 @@
function getGlobalOptions() {
// Read information
$conf_file = '/var/www/conf/phpgiftreg.conf';
$mysql_conn_string = "mysql:host=localhost;dbname=giftreg";
$mysql_username = "giftreg";
$mysql_password = "cn3Malk";
if (file_exists('/var/www/conf/phpgiftreg.conf')) {
$ini_file = parse_ini_file('/var/www/conf/phpgiftreg.conf');
if (file_exists($conf_file)) {
$ini_file = parse_ini_file($conf_file);
if (isset($ini_file['mysql_conn_string'])) {
$mysql_conn_string = $ini_file['mysql_conn_string'];
}