2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Added an example config.inc.local.php

Changed config.inc.php to include config.inc.local.php and config.default.php so config.inc.local.php will never be overwritten by an update
This commit is contained in:
azammitdcarf
2010-01-15 01:58:47 +00:00
parent ca48199dd4
commit fcc22f33c9
2 changed files with 88 additions and 45 deletions

View File

@@ -0,0 +1,80 @@
<?
/**
* Configuration file
*
*
* This file is part of queXS
*
* queXS is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* queXS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with queXS; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* @author Adam Zammit <adam.zammit@deakin.edu.au>
* @copyright Deakin University 2007,2008
* @package queXS
* @subpackage configuration
* @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility
* @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2
*
*/
/**
*
* Only some of the configuration directives are here. See the file: config.default.php for them all
*
* Make your configuration changes in this file only - they will "overwrite" the default configuration
*
*/
/**
* The default time zone
*/
define('DEFAULT_TIME_ZONE', 'Australia/Victoria');
/**
* Flag for VoIP with Asterisk to be enabled or not
*/
define('VOIP_ENABLED',false);
/**
* The Asterisk server address
*/
define('VOIP_SERVER','asterisk.dcarf');
/**
* Whether to automatically pop up a coding window when the respondent hangs up
*/
define('AUTO_POPUP',false);
/**
* The path to queXS from the server root
*/
define('QUEXS_PATH', '/quexs/');
/**
* Path to ADODB
*/
define('ADODB_PATH',dirname(__FILE__).'/../adodb/');
/**
* Database configuration for queXS
*/
define('DB_USER', 'quexs');
define('DB_PASS', 'quexs');
define('DB_HOST', 'databasedev.dcarf');
define('DB_NAME', 'quexs');
?>

View File

@@ -20,11 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* *
* *
* @author Adam Zammit <adam.zammit@deakin.edu.au> * @author Adam Zammit <adam.zammit@acspri.org.au>
* @copyright Deakin University 2007,2008 * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2009
* @package queXS * @package queXS
* @subpackage configuration * @subpackage configuration
* @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility * @link http://www.acspri.org.au/ queXS was writen for ACSPRI
* @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2
* *
*/ */
@@ -32,51 +32,14 @@
/** /**
* *
* Only some of the configuration directives are here. See the file: config.default.php for them all * Make your configuration changes in a file called: config.inc.local.php
*
* Make your configuration changes in this file only - they will "overwrite" the default configuration
* *
*/ */
/** if (file_exists(dirname(__FILE__).'/config.inc.local.php'))
* The default time zone {
*/ include(dirname(__FILE__).'/config.inc.local.php');
define('DEFAULT_TIME_ZONE', 'Australia/Victoria'); }
/**
* Flag for VoIP with Asterisk to be enabled or not
*/
define('VOIP_ENABLED',false);
/**
* The Asterisk server address
*/
define('VOIP_SERVER','asterisk.dcarf');
/**
* Whether to automatically pop up a coding window when the respondent hangs up
*/
define('AUTO_POPUP',false);
/**
* The path to queXS from the server root
*/
define('QUEXS_PATH', '/quexs/');
/**
* Path to ADODB
*/
define('ADODB_PATH',dirname(__FILE__).'/../adodb/');
/**
* Database configuration for queXS
*/
define('DB_USER', 'quexs');
define('DB_PASS', 'quexs');
define('DB_HOST', 'databasedev.dcarf');
define('DB_NAME', 'quexs');
//Do not modify the following line:
include(dirname(__FILE__).'/config.default.php'); include(dirname(__FILE__).'/config.default.php');
?> ?>