From ef004f26ec3cdeef37e86831e11060dffa95efef Mon Sep 17 00:00:00 2001
From: PromInc <PromInc@hotmail.com>
Date: Wed, 24 May 2017 04:59:25 -0500
Subject: [PATCH] Correct $GLOBALS directory structure variables

Revert code that was proposed in #31, ported to #38, and mistakenly deployed via 9d72b4d that attempts to work with an Apache alias environment.  The proposed code modified the $GLOBALS['basedirWebServer'] and $GLOBALS['appInstallDir'] variables, which resulted in unexpected values in $GLOBALS['scriptName'].  The final result of this code change is that under certain Apache configurations it was not possible to reliably use $GLOBALS['scriptName'] to detect what page was being rendered and thus conditional situations were failing.  The example brought up in #51 is that a javascript file was not being loaded on the reports.php page.
---
 organic-search-analytics/inc/code/globalIncludes.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/organic-search-analytics/inc/code/globalIncludes.php b/organic-search-analytics/inc/code/globalIncludes.php
index d5349b9..9c091b5 100755
--- a/organic-search-analytics/inc/code/globalIncludes.php
+++ b/organic-search-analytics/inc/code/globalIncludes.php
@@ -1,10 +1,9 @@
 <?php
 	$now = time();
 
-	$GLOBALS['basedirWebServer'] = ( isset( $_SERVER['CONTEXT_DOCUMENT_ROOT'] ) ? $_SERVER['CONTEXT_DOCUMENT_ROOT'] . "/" : $_SERVER['DOCUMENT_ROOT'] . "/" );
-	$GLOBALS['aliasdir'] = ( isset( $_SERVER['CONTEXT_PREFIX'] ) ? ltrim( $_SERVER['CONTEXT_PREFIX'], "/" ) . "/" : "" );
+	$GLOBALS['basedirWebServer'] = $_SERVER['DOCUMENT_ROOT']."/";
 	$GLOBALS['basedir'] = preg_replace( '/\\\/', '/', realpath(dirname(__FILE__).'/../../').'/' );
-	$GLOBALS['appInstallDir'] = str_replace( $GLOBALS['basedirWebServer'], "", $GLOBALS['basedir'] ) . $GLOBALS['aliasdir'];
+	$GLOBALS['appInstallDir'] = str_replace( $GLOBALS['basedirWebServer'], "", $GLOBALS['basedir'] );
 	$GLOBALS['file_name'] = basename( $_SERVER['SCRIPT_FILENAME'], ".php" );
 
 	$isConfigured = file_exists($GLOBALS['basedir'].'config/config.php');
@@ -42,4 +41,4 @@
 	} else {
 		$alert = array("type"=>"warning", "message"=>"Please set your configuration settings before procedding.  <a href=\"settings-configure.php\">Configure Now</a>");
 	}
-?>
\ No newline at end of file
+?>