From 3da998446b00d4c3cf694b95c7b3195832531503 Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Mon, 3 Aug 2015 13:58:41 +1000
Subject: [PATCH] Removed references to SITE_URL and OPERATOR_PANEL_NAME put
 other descriptions in config

---
 admin/new.php                |  2 +-
 admin/questionnairelist.php  |  2 +-
 config.default.php           |  5 +++++
 config.inc.local.php.example | 14 ++------------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/admin/new.php b/admin/new.php
index 1d96424e..91f79fca 100644
--- a/admin/new.php
+++ b/admin/new.php
@@ -269,7 +269,7 @@ $surveys = $db->GetAll($sql);
 	<div class="form-group">
 		<label class="col-sm-4 control-label text-danger" ><?php echo T_("URL to forward respondents on self completion (required)");?>: </label>
 		<div class="col-sm-4">
-			<input class="form-control"  name="lime_endurl" id="url" type="url" placeholder="<?php print SITE_URL ;?>" />
+			<input class="form-control"  name="lime_endurl" id="url" type="url" />
 		</div>
 	</div>
 </div>
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index 04629512..3d35487c 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -427,7 +427,7 @@ if (isset($_GET['modify']))
 	<div class="form-group">
 		<label class="col-sm-4 control-label text-danger" ><?php echo T_("URL to forward respondents on self completion (required)");?>: </label>
 		<div class="col-sm-4">
-			<input class="form-control" name="lime_endurl" id="url" type="url" placeholder="<?php print SITE_URL ;?>" value="<?php echo $rs['lime_endurl']; ?>"/>
+			<input class="form-control" name="lime_endurl" id="url" type="url" value="<?php echo $rs['lime_endurl']; ?>"/>
 		</div>
 	</div>
 </div>
diff --git a/config.default.php b/config.default.php
index 375d0fd7..85e84afc 100644
--- a/config.default.php
+++ b/config.default.php
@@ -302,6 +302,11 @@ if (!defined('LDB_HOST')) define('LDB_HOST', DB_HOST);
 if (!defined('LDB_NAME')) define('LDB_NAME', DB_NAME);
 if (!defined('LDB_TYPE')) define('LDB_TYPE', DB_TYPE);
 
+
+if (!defined('COMPANY_NAME')) define ('COMPANY_NAME', 'queXS ');
+if (!defined('ADMIN_PANEL_NAME')) define ('ADMIN_PANEL_NAME',' Administration Panel');
+
+
 /**
  * Debugging
  */
diff --git a/config.inc.local.php.example b/config.inc.local.php.example
index c1a2fc5a..e77296b6 100644
--- a/config.inc.local.php.example
+++ b/config.inc.local.php.example
@@ -29,16 +29,6 @@
  * 
  */
 
-
-// This Site name will appear as Limesurvey {ENDURL} 
-define ('SITE_URL', 'http://quexs.sourceforge.net/'); 
-
-//  Specify Your Local namings 
-define ('COMPANY_NAME', 'MY Company');
-define ('ADMIN_PANEL_NAME','Admin Panel');
-define ('OPERATOR_PANEL_NAME','Operator Panel');
- 
- 
 /**
  *
  * Only some of the configuration directives are here. See the file: config.default.php for them all
@@ -55,7 +45,7 @@ define('VOIP_ENABLED',false);
 /**
  * The Asterisk server address
  */
-define('VOIP_SERVER','asterisk.dcarf');
+define('VOIP_SERVER', 'localhost');
 
 /**
  * Whether to automatically pop up a coding window when the respondent hangs up
@@ -72,7 +62,7 @@ define('QUEXS_PATH', '/quexs/');
  */
 define('DB_USER', 'quexs');
 define('DB_PASS', 'quexs');
-define('DB_HOST', 'databasedev.dcarf');
+define('DB_HOST', 'localhost');
 define('DB_NAME', 'quexs');