From b97c332f830c3541f2143764862d44308b2c2505 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Fri, 28 Feb 2020 17:08:07 +0000
Subject: [PATCH] Set iceURLPath, use that and remove top.

---
 lib/headers.php         |  2 ++
 lib/plugins-display.php | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/headers.php b/lib/headers.php
index 52c3bbf..91274fd 100644
--- a/lib/headers.php
+++ b/lib/headers.php
@@ -4,6 +4,8 @@ if(strpos(str_replace("\\","/",dirname(__FILE__)),"tmp/oldVersion") !== false) {
 	die("This is an old version of ICEcoder. Won't run from tmp/oldVersion/ dir.");
 }
 
+$iceURLPath = rtrim(rtrim($_SERVER['REQUEST_URI'], "index.php"), "/");
+
 // Load common functions
 include_once(dirname(__FILE__)."/settings-common.php");
 if (isset($_SESSION['text'])) {
diff --git a/lib/plugins-display.php b/lib/plugins-display.php
index 1a6e432..48c816f 100644
--- a/lib/plugins-display.php
+++ b/lib/plugins-display.php
@@ -10,19 +10,19 @@ if ($_SESSION['loggedIn']) {
 	$pluginsDisplay = "";
 	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
 		$target = explode(":",$ICEcoder["plugins"][$i][4]);
-		$pluginsDisplay .= '<a href="'.$ICEcoder["plugins"][$i][3].'" title="'.$ICEcoder["plugins"][$i][0].'" target="'.$target[0].'"><img src="'.$ICEcoder["plugins"][$i][1].'" style="'.$ICEcoder["plugins"][$i][2].'" alt="'.$ICEcoder["plugins"][$i][0].'"></a><br><br>';
+		$pluginsDisplay .= '<a href="'.$ICEcoder["plugins"][$i][3].'" title="'.$ICEcoder["plugins"][$i][0].'" target="'.$target[0].'"><img src="'.$iceURLPath."/".$ICEcoder["plugins"][$i][1].'" style="'.$ICEcoder["plugins"][$i][2].'" alt="'.$ICEcoder["plugins"][$i][0].'"></a><br><br>';
 	};
 
 	// If we're updating plugins, update those shown
 	if (isset($_GET['updatedPlugins'])) {
-		echo "<script>top.document.getElementById('pluginsOptional').innerHTML = '".str_replace("'","\\'",$pluginsDisplay)."';</script>";
+		echo "<script>document.getElementById('pluginsOptional').innerHTML = '".str_replace("'","\\'",$pluginsDisplay)."';</script>";
 	}
 
 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
 	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
 		if ($ICEcoder["plugins"][$i][5]!="") {
-			$onLoadExtras .= ";top.ICEcoder.startPluginIntervals(".$i.",'".$ICEcoder["plugins"][$i][3]."','".$ICEcoder["plugins"][$i][4]."','".$ICEcoder["plugins"][$i][5]."')";
+			$onLoadExtras .= ";ICEcoder.startPluginIntervals(".$i.",'".$ICEcoder["plugins"][$i][3]."','".$ICEcoder["plugins"][$i][4]."','".$ICEcoder["plugins"][$i][5]."')";
 		};
 	};
 
@@ -30,10 +30,10 @@ if ($_SESSION['loggedIn']) {
 	if (isset($_GET['updatedPlugins'])) {
 		?>
 		<script>
-		for (i=0;i<=top.ICEcoder.pluginIntervalRefs.length-1;i++) {
-			clearInterval(top.ICEcoder['plugTimer'+top.ICEcoder.pluginIntervalRefs[i]]);
+		for (i=0;i<=ICEcoder.pluginIntervalRefs.length-1;i++) {
+			clearInterval(ICEcoder['plugTimer'+ICEcoder.pluginIntervalRefs[i]]);
 		}
-		top.ICEcoder.pluginIntervalRefs = [];
+		ICEcoder.pluginIntervalRefs = [];
 		<?php echo $onLoadExtras.PHP_EOL; ?>
 		</script>
 		<?php