Added Settings Page

Author: dcflachs

source/compose.manager/compose.manager.settings.page

@@ -0,0 +1,23 @@
+Icon="cubes"
+Author="dcflachs"
+Title="Compose"
+Type="xmenu"
+Menu="Utilities"
+---
+<?php 
+require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+$cfg = parse_plugin_cfg($sName);
+?>
+
+<form markdown="1" name="compose_manager_settings" method="POST" action="/update.php" target="progressFrame">
+<input type="hidden" name="#file" value="<?=$sName?>/<?=$sName?>.cfg">
+
+_(Compose Command Progress Display)_:
+: <select name="OUTPUTSTYLE">
+  <?=mk_option($cfg['OUTPUTSTYLE'], "basic", _("Basic"))?>
+  <?=mk_option($cfg['OUTPUTSTYLE'], "ttyd", _("Experimental"))?>
+  </select>
+
+<input type="submit" name="#default" value="_(Default)_">
+: <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+</form>

source/compose.manager/default.cfg

@@ -0,0 +1 @@
+OUTPUTSTYLE="basic"

source/compose.manager/php/compose_util.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+require_once("/usr/local/emhttp/plugins/dynamix/include/Wrappers.php");
 
 function logger($string) {
 	$string = escapeshellarg($string);
@@ -26,29 +27,10 @@ function execComposeCommandInTTY($cmd)
 }
 
 function echoComposeCommand($action)
-// {
-// 	global $plugin_root;
-// 	$path = isset($_POST['path']) ? urldecode(($_POST['path'])) : "";
-// 	$unRaidVars = parse_ini_file("/var/local/emhttp/var.ini");
-// 	if ($unRaidVars['mdState'] != "STARTED" ) {
-// 		echo $plugin_root."/scripts/arrayNotStarted.sh";
-// 		logger("Array not Started!");
-// 	}
-// 	else
-// 	{
-// 		$projectName = basename($path);
-// 		if ( is_file("$path/name") ) {
-// 			$projectName = trim(file_get_contents("$path/name"));
-// 		}
-// 		$projectName = sanitizeStr($projectName);
-// 		$path .= "/compose.yml";
-// 		// exec("chmod +x ".escapeshellarg($plugin_root."/scripts/compose.sh"));
-// 		$composeCommand = $plugin_root."/scripts/compose.sh"."&arg1=".$action."&arg2=".$path."&arg3=".$projectName;
-// 		echo $composeCommand;
-// 	}
-// }
 {
 	global $plugin_root;
+	global $sName;
+	$cfg = parse_plugin_cfg($sName);
 	$path = isset($_POST['path']) ? urldecode(($_POST['path'])) : "";
 	$unRaidVars = parse_ini_file("/var/local/emhttp/var.ini");
 	if ($unRaidVars['mdState'] != "STARTED" ) {
@@ -63,12 +45,19 @@ function echoComposeCommand($action)
 		}
 		$projectName = sanitizeStr($projectName);
 		$path .= "/compose.yml";
-		$compose_command = join(" ", array(escapeshellarg($plugin_root."scripts/compose.sh"),escapeshellarg($action),escapeshellarg($path),escapeshellarg($projectName)));
-		logger($compose_command);
+
+		if ($cfg['OUTPUTSTYLE'] == "ttyd") {
+			$composeCommand = join(" ", array(escapeshellarg($plugin_root."scripts/compose.sh"),escapeshellarg($action),escapeshellarg($path),escapeshellarg($projectName)));
+			execComposeCommandInTTY($composeCommand);
+			logger($composeCommand);
+			$composeCommand = "/plugins/compose.manager/php/show_ttyd.php";
+		}
+		else {
+			$composeCommand = $plugin_root."/scripts/compose.sh"."&arg1=".$action."&arg2=".$path."&arg3=".$projectName;
+		}
 
-		execComposeCommandInTTY($compose_command);
-		echo "/plugins/compose.manager/php/show_ttyd.php";
-		logger("/plugins/compose.manager/php/show_ttyd.php");
+		echo $composeCommand;
+		logger($composeCommand);
 	}	
 }
 

source/compose.manager/php/defines.php

@@ -2,4 +2,5 @@
 $compose_root = "/boot/config/plugins/compose.manager/projects";
 $plugin_root = "/usr/local/emhttp/plugins/compose.manager/";
 $socket_name = "compose_manager_action";
+$sName = "compose.manager";
 ?>