From 1f67e5369548226a11c924e3b2c3c06ad2b44eff Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 14 Aug 2006 18:56:21 +0000 Subject: [PATCH] changed dbconnect.php scripts to use /etc/astguiclient.conf file for settings if available git-svn-id: svn://192.168.202.10@168 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/agc/dbconnect.php | 40 +++++++++++-- agc_2-X/trunk/www/astguiclient/dbconnect.php | 62 +++++++++++++++----- agc_2-X/trunk/www/vicidial/dbconnect.php | 42 ++++++++++--- 3 files changed, 118 insertions(+), 26 deletions(-) diff --git a/agc_2-X/trunk/www/agc/dbconnect.php b/agc_2-X/trunk/www/agc/dbconnect.php index 16c021d5..7221b35e 100644 --- a/agc_2-X/trunk/www/agc/dbconnect.php +++ b/agc_2-X/trunk/www/agc/dbconnect.php @@ -2,17 +2,47 @@ # # Copyright (C) 2006 Matt Florell LICENSE: GPLv2 # -$link=mysql_connect("localhost", "cron", "1234"); -mysql_select_db("asterisk"); +if ( file_exists("/etc/astguiclient.conf") ) +{ +$DBCagc = file("/etc/astguiclient.conf"); +foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + +} +else +{ +#defaults for DB connection +$VARDB_server = 'localhost'; +$VARDB_user = 'cron'; +$VARDB_pass = '1234'; +$VARDB_database = '1234'; +$WeBServeRRooT = '/usr/local/apache2/htdocs'; +} + +$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; $local_AMP = '@'; $ext_context = 'demo'; $recording_exten = '8309'; - -#$WeBServeRRooT = '/home/www/htdocs'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; $WeBRooTWritablE = '1'; ?> diff --git a/agc_2-X/trunk/www/astguiclient/dbconnect.php b/agc_2-X/trunk/www/astguiclient/dbconnect.php index f1998407..d562e3dd 100644 --- a/agc_2-X/trunk/www/astguiclient/dbconnect.php +++ b/agc_2-X/trunk/www/astguiclient/dbconnect.php @@ -1,14 +1,48 @@ - LICENSE: GPLv2 -# - -$link=mysql_connect("localhost", "cron", "1234"); -mysql_select_db("asterisk"); - -#$WeBServeRRooT = '/home/www/htdocs'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -$WeBRooTWritablE = '1'; - -?> \ No newline at end of file + LICENSE: GPLv2 +# +if ( file_exists("/etc/astguiclient.conf") ) +{ +$DBCagc = file("/etc/astguiclient.conf"); +foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + +} +else +{ +#defaults for DB connection +$VARDB_server = 'localhost'; +$VARDB_user = 'cron'; +$VARDB_pass = '1234'; +$VARDB_database = '1234'; +$WeBServeRRooT = '/usr/local/apache2/htdocs'; +} + +$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); +mysql_select_db("$VARDB_database"); + +$local_DEF = 'Local/'; +$conf_silent_prefix = '7'; +$local_AMP = '@'; +$ext_context = 'demo'; +$recording_exten = '8309'; +$WeBRooTWritablE = '1'; + +?> diff --git a/agc_2-X/trunk/www/vicidial/dbconnect.php b/agc_2-X/trunk/www/vicidial/dbconnect.php index 88078fc7..7221b35e 100644 --- a/agc_2-X/trunk/www/vicidial/dbconnect.php +++ b/agc_2-X/trunk/www/vicidial/dbconnect.php @@ -1,20 +1,48 @@ LICENSE: GPLv2 # +if ( file_exists("/etc/astguiclient.conf") ) +{ +$DBCagc = file("/etc/astguiclient.conf"); +foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } -$link=mysql_connect("localhost", "cron", "1234"); -mysql_select_db("asterisk"); +} +else +{ +#defaults for DB connection +$VARDB_server = 'localhost'; +$VARDB_user = 'cron'; +$VARDB_pass = '1234'; +$VARDB_database = '1234'; +$WeBServeRRooT = '/usr/local/apache2/htdocs'; +} + +$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; $local_AMP = '@'; $ext_context = 'demo'; $recording_exten = '8309'; - -#$WeBServeRRooT = '/home/www/htdocs'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; $WeBRooTWritablE = '1'; -?> \ No newline at end of file +?>