From bba74f4cf10407bf0639400bc776fa1957b27371 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 24 Oct 2016 09:42:23 +0200
Subject: [PATCH] Replace fixed path with docroot variable

---
 .../dynamix.docker.manager/AddContainer.page   |  2 +-
 .../DockerContainers.page                      |  5 ++---
 .../DockerRepositories.page                    |  2 +-
 .../dynamix.docker.manager/DockerSettings.page |  5 +++--
 .../UpdateContainer.page                       |  2 +-
 .../include/DockerClient.php                   | 18 +++++++++---------
 .../dynamix.docker.manager/include/Events.php  |  9 ++++++---
 .../dynamix.docker.manager/include/Exec.php    |  6 ++++--
 8 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/plugins/dynamix.docker.manager/AddContainer.page b/plugins/dynamix.docker.manager/AddContainer.page
index 3b27af837..77b4040f3 100644
--- a/plugins/dynamix.docker.manager/AddContainer.page
+++ b/plugins/dynamix.docker.manager/AddContainer.page
@@ -18,5 +18,5 @@ Markdown="false"
 	<span class="toggleMode" onclick="toggleMode();"><i id="toggleMode" class="fa fa-lg"></i> Advanced View</span>
 </div>
 <?PHP
-require_once('/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php');
+require_once "$docroot/plugins/dynamix.docker.manager/include/CreateDocker.php";
 ?>
\ No newline at end of file
diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index 85ea6a07d..149e02419 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -17,14 +17,14 @@ Markdown="false"
 ?>
 <?
 // Add the Docker JSON client
-require_once '/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php';
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
 $DockerClient    = new DockerClient();
 $DockerUpdate    = new DockerUpdate();
 $DockerTemplates = new DockerTemplates();
 ?>
 <link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.ui.css">
 <link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
-<link type="text/css" rel="stylesheet" href="/webGui/styles/context.standalone.css">
 <style>
 body {-webkit-overflow-scrolling: touch;}
 img.started{opacity:1.0;}
@@ -207,7 +207,6 @@ img.stopped{opacity:0.3;}
 <input type="button" onclick="reloadUpdate()" value="Check for Updates"/>
 
 <script src="/webGui/javascript/jquery.switchbutton.js"></script>
-<script src="/webGui/javascript/context.js"></script>
 <script src="/plugins/dynamix.docker.manager/javascript/docker.js"></script>
 <script>
 <?if ($display['resize']):?>
diff --git a/plugins/dynamix.docker.manager/DockerRepositories.page b/plugins/dynamix.docker.manager/DockerRepositories.page
index b754f8c23..896a69f9a 100644
--- a/plugins/dynamix.docker.manager/DockerRepositories.page
+++ b/plugins/dynamix.docker.manager/DockerRepositories.page
@@ -16,7 +16,7 @@ Cond="(pgrep('docker')!==false)"
 ?>
 <?
 // Add the Docker JSON client
-require_once '/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php';
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 // Repos file
 $template_repos = $dockerManPaths['template-repos'];
diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index b02ffbf8b..42d0b7ca3 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -17,7 +17,8 @@ Markdown="false"
 ?>
 <?
 // Add the Docker JSON client
-require_once('/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php');
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
 $docker          = new DockerClient();
 $DockerUpdate    = new DockerUpdate();
 $DockerTemplates = new DockerTemplates();
@@ -163,7 +164,7 @@ if (file_exists($realfile)) {
   </dl>
 
   <form method="POST" action="/update.php" target="progressFrame">
-  <?exec("/usr/local/emhttp/webGui/scripts/btrfs_scrub status /var/lib/docker", $scrub_status, $retval);?>
+  <?exec("$docroot/webGui/scripts/btrfs_scrub status /var/lib/docker", $scrub_status, $retval);?>
 
   <dl>
     <dt>btrfs scrub status:</dt>
diff --git a/plugins/dynamix.docker.manager/UpdateContainer.page b/plugins/dynamix.docker.manager/UpdateContainer.page
index 901de7946..4487ad453 100644
--- a/plugins/dynamix.docker.manager/UpdateContainer.page
+++ b/plugins/dynamix.docker.manager/UpdateContainer.page
@@ -18,5 +18,5 @@ Markdown="false"
 	<span class="toggleMode" onclick="toggleMode();"><i id="toggleMode" class="fa fa-lg"></i> Advanced View</span>
 </div>
 <?PHP
-require_once('/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php');
+require_once "$docroot/plugins/dynamix.docker.manager/include/CreateDocker.php";
 ?>
\ No newline at end of file
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index f68e4d86c..49a4e0575 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 $dockerManPaths = [
 	'plugin'            => '/usr/local/emhttp/plugins/dynamix.docker.manager',
@@ -26,11 +27,11 @@ $dockerManPaths = [
 
 #load emhttp variables if needed.
 if (!isset($var)) {
-	if (!is_file("/usr/local/emhttp/state/var.ini")) shell_exec("wget -qO /dev/null localhost:$(lsof -nPc emhttp | grep -Po 'TCP[^\d]*\K\d+')");
-	$var = @parse_ini_file("/usr/local/emhttp/state/var.ini");
+	if (!is_file("$docroot/state/var.ini")) shell_exec("wget -qO /dev/null localhost:$(lsof -nPc emhttp | grep -Po 'TCP[^\d]*\K\d+')");
+	$var = @parse_ini_file("$docroot/state/var.ini");
 }
-if (!isset($eth0) && is_file("/usr/local/emhttp/state/network.ini")) {
-	extract(parse_ini_file('/usr/local/emhttp/state/network.ini',true));
+if (!isset($eth0) && is_file("$docroot/state/network.ini")) {
+	extract(parse_ini_file("$docroot/state/network.ini",true));
 }
 
 // Docker configuration file - guaranteed to exist
@@ -354,7 +355,7 @@ class DockerTemplates {
 
 
 	public function getIcon($Repository) {
-		global $dockerManPaths;
+		global $docroot, $dockerManPaths;
 
 		$imgUrl = $this->getTemplateValue($Repository, "Icon");
 
@@ -369,8 +370,7 @@ class DockerTemplates {
 			}
 			@copy($storagePath, $tempPath);
 		}
-
-		return (is_file($tempPath)) ? str_replace('/usr/local/emhttp', '', $tempPath) : "";
+		return (is_file($tempPath)) ? str_replace($docroot, '', $tempPath) : "";
 	}
 }
 
@@ -776,12 +776,12 @@ class DockerClient {
 
 
 	public function removeContainer($id) {
-		global $dockerManPaths;
+		global $docroot, $dockerManPaths;
 		// Purge cached container information
 		$info = DockerUtil::loadJSON($dockerManPaths['webui-info']);
 		if (isset($info[$id])) {
 			if (isset($info[$id]['icon'])) {
-				$iconRam = '/usr/local/emhttp'.$info[$id]['icon'];
+				$iconRam = $docroot.$info[$id]['icon'];
 				$iconFlash = str_replace($dockerManPaths['images-ram'], $dockerManPaths['images-storage'], $iconRam);
 				if (is_file($iconRam)) {
 					unlink($iconRam);
diff --git a/plugins/dynamix.docker.manager/include/Events.php b/plugins/dynamix.docker.manager/include/Events.php
index 26301cc57..a5e51f774 100644
--- a/plugins/dynamix.docker.manager/include/Events.php
+++ b/plugins/dynamix.docker.manager/include/Events.php
@@ -11,7 +11,10 @@
  */
 ?>
 <?
-require_once '/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php';
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
 $DockerClient = new DockerClient();
 
 $_REQUEST = array_merge($_GET, $_POST);
@@ -62,9 +65,9 @@ switch ($action) {
 		if ($container) {
 			$since = array_key_exists('since', $_REQUEST) ? $_REQUEST['since'] : '';
 			$title = array_key_exists('title', $_REQUEST) ? $_REQUEST['title'] : '';
-			require_once '/usr/local/emhttp/webGui/include/ColorCoding.php';
+			require_once "$docroot/webGui/include/ColorCoding.php";
 			if (!$since) {
-				readfile("/usr/local/emhttp/plugins/dynamix.docker.manager/log.htm");
+				readfile("$docroot/plugins/dynamix.docker.manager/log.htm");
 				echo "<script>document.title = '$title';</script>";
 				echo "<script>addLog('".addslashes("<p style='text-align:center'><span class='error label'>Error</span><span class='warn label'>Warning</span><span class='system label'>System</span><span class='array label'>Array</span><span class='login label'>Login</span></p>")."');</script>";
 				$tail = 350;
diff --git a/plugins/dynamix.docker.manager/include/Exec.php b/plugins/dynamix.docker.manager/include/Exec.php
index 524274581..24b22292d 100644
--- a/plugins/dynamix.docker.manager/include/Exec.php
+++ b/plugins/dynamix.docker.manager/include/Exec.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+
 if ( isset( $_GET['cmd'] )) {
   $command = urldecode(($_GET['cmd']));
   $descriptorspec = [
@@ -20,7 +22,7 @@ if ( isset( $_GET['cmd'] )) {
   ];
 
   $parts = explode(" ", $command);
-  $command = escapeshellcmd(realpath($_SERVER['DOCUMENT_ROOT'].array_shift($parts)));
+  $command = escapeshellcmd(realpath($docroot.array_shift($parts)));
   if (!$command) return;
   $command .= " ".implode(" ", $parts); // should add 'escapeshellarg' here, but this requires changes in all the original arguments
   $id = mt_rand();
@@ -31,7 +33,7 @@ if ( isset( $_GET['cmd'] )) {
   echo "<p class=\"logLine\" id=\"logBody\"></p></fieldset>');</script>";
   echo "<script>show_Wait({$id});</script>";
   @flush();
-  $proc = proc_open($command." 2>&1", $descriptorspec, $pipes, '/', array());
+  $proc = proc_open($command." 2>&1", $descriptorspec, $pipes, '/', []);
   while ($out = fgets( $pipes[1] )) {
     $out = preg_replace("%[\t\n\x0B\f\r]+%", '', $out );
     @flush();