From ebf12f327fb7128d381b8ed2b94cec2d8e6e5396 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Wed, 12 Nov 2014 17:40:27 +0000 Subject: [PATCH] Only set top.docRoot and top.iceRoot from index.php Avoids having something output to the browser in places where we don't want it, such as the new file-control-xhr.php file. Temporary console.log for now as reminder to finish checking this out. --- lib/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/settings.php b/lib/settings.php index bcd1abd..444e700 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -98,8 +98,8 @@ $_SESSION['username'] = $_SESSION['username']; $serverType = stristr($_SERVER['SERVER_SOFTWARE'], "win") ? "Windows" : "Linux"; $docRoot = rtrim(str_replace("\\","/",$ICEcoder['docRoot'])); $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"])); -if ($_SESSION['loggedIn']) { - echo ""; +if ($_SESSION['loggedIn'] && basename($_SERVER['SCRIPT_NAME']) == "index.php") { + echo ""; } // Establish the dir ICEcoders running from