Fixed 03930: Double include for config.php

Dev: includes changed to include_once and changed config.php to config-default.php, where needed followed by an include for common.php git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8093 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 7, 2009 · b21679a · b21679a
1 parent e7de733
commit b21679a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/admin/export_structure_lsrc.php b/admin/export_structure_lsrc.php
@@ -152,7 +152,9 @@
 //header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 //header("Pragma: cache");                          // HTTP/1.0
 
-include("../config.php");
+//include("../config.php");
+include_once("../config-defaults.php");
+include_once("../common.php");
 include("remotecontrol/lsrc.config.php");
 
 $lsrcString = $dumphead. $sdump. $gdump. $qdump. $adump. $cdump. $lsdump. $ldump. $qadump. $asdump. $slsdump. $quotadump. $quotamemdump."\n";

diff --git a/admin/html.php b/admin/html.php
@@ -1844,7 +1844,7 @@
 	    ."</label></li></ul>\n";
 
 	    // XXX
-	    include("../config.php");
+	    //include("../config.php");
 
 		//echo $export4lsrc;
 	    if($export4lsrc)
@@ -1886,7 +1886,7 @@
 //	    ."</label>\n";
 
 	    // XXX
-	    include("../config.php");
+	    //include("../config.php");
 
 		//echo $export4lsrc;
 	    if($export4lsrc)
@@ -1939,7 +1939,7 @@
 //	    ."</label>\n";
 
 	    // XXX
-	    include("../config.php");
+	    //include("../config.php");
 
 		//echo $export4lsrc;
 	    if($export4lsrc)

diff --git a/admin/login_check_cas.php b/admin/login_check_cas.php
@@ -198,8 +198,8 @@ function verifyToken($token) {
 
 function setUserRightsCas($user, $role="")
 {
-	include("../config-defaults.php");
-	include("../config.php");
+	include_once("../config-defaults.php");
+	//include("../config.php"); //Not needed since config-defaults includes config.php
 
 	$_SESSION['user'] = $user;
 		$_SESSION['loginID'] = 1;

diff --git a/admin/remotecontrol/lsrc.config.php b/admin/remotecontrol/lsrc.config.php
@@ -19,8 +19,7 @@
 // only include if this config is not used to save a survey.csv for the lsrc
 if(!isset($export4lsrc))
 {
-	include("../../config-defaults.php");
-	include("../../config.php");
+	include_once("../../config-defaults.php");
 	require_once(dirname(__FILE__).'/../../common.php');
 }
 ### Error Handling