From efe12a9d00bd68af4370bd652c4f6f1a17f5d3e6 Mon Sep 17 00:00:00 2001
From: Derek Macias <derekmacias@live.com>
Date: Thu, 7 Jan 2016 10:30:18 -0700
Subject: [PATCH] fix cert link

---
 plugins/shellinabox-plugin.plg                        |  4 +++-
 plugins/shellinabox-plugin.xml                        |  2 ++
 .../plugins/shellinabox-plugin/Shellinabox.page       | 11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/shellinabox-plugin.plg b/plugins/shellinabox-plugin.plg
index 4b27d3f9..efcd9a0e 100755
--- a/plugins/shellinabox-plugin.plg
+++ b/plugins/shellinabox-plugin.plg
@@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "shellinabox-plugin">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2016.01.07">
+<!ENTITY version   "2016.01.07a">
 <!ENTITY launch    "Settings/Shellinabox">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@@ -20,6 +20,8 @@ This Plugin installs and controls shellinabox for unRaid 6.1  All dependencies a
 -->
 
 <CHANGES>
+###2016.01.07a
+- fix cert link
 ###2016.01.07
 - add ip address connection option
 - add install certificate button
diff --git a/plugins/shellinabox-plugin.xml b/plugins/shellinabox-plugin.xml
index 8fed1e04..fc505d5d 100644
--- a/plugins/shellinabox-plugin.xml
+++ b/plugins/shellinabox-plugin.xml
@@ -13,6 +13,8 @@ Shell In A Box implements a web server that can export arbitrary command line to
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/shellinabox-plugin.png</Icon>
 <Date>2016-01-07</Date>
 <Changes>
+###2016.01.07a
+- fix cert link
 ###2016.01.07
 - add ip address connection option
 - add install certificate button
diff --git a/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/Shellinabox.page b/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/Shellinabox.page
index 01ade5e7..b818d1ba 100644
--- a/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/Shellinabox.page
+++ b/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/Shellinabox.page
@@ -6,10 +6,11 @@ Title="Command Line"
 $sName = "shellinaboxd";
 $shellinabox_cfg = parse_plugin_cfg("shellinabox-plugin");
 $shellinabox_service = isset($shellinabox_cfg['SERVICE']) ? $shellinabox_cfg['SERVICE'] 	: "disable";
-$shellinabox_runas = isset($shellinabox_cfg['RUNAS']) 		? $shellinabox_cfg['RUNAS'] 		: "nobody";
-$shellinabox_ipaddr = isset($shellinabox_cfg['IPADDR']) ? $shellinabox_cfg['IPADDR'] 	: "disable";
-$shellinabox_host = ($shellinabox_ipaddr == "disable") ? $var['NAME'] : $var['IPADDR'];
+$shellinabox_runas = isset($shellinabox_cfg['RUNAS']) 	 ? $shellinabox_cfg['RUNAS'] 		: "nobody";
+$shellinabox_ipaddr = isset($shellinabox_cfg['IPADDR'])   ? $shellinabox_cfg['IPADDR'] 	: "disable";
+$shellinabox_host = ($shellinabox_ipaddr == "disable")    ? $var['NAME'] 						: $var['IPADDR'];
 $shellinabox_port = (isset($shellinabox_cfg['PORT']) && is_numeric($shellinabox_cfg['PORT']) && $shellinabox_cfg['PORT'] > 0 && $shellinabox_cfg['PORT'] < 65535 ) ? $shellinabox_cfg['PORT'] : "4200";
+$shellinabox_cert = isset($shellinabox_cfg['CERT']) 		 ? $shellinabox_cfg['CERT'] 		:  "certificate.pem";
 $shellinabox_running = trim(shell_exec( "[ -f /proc/`cat /var/run/shellinaboxd.pid 2> /dev/null`/exe ] && echo 'yes' || echo 'no' 2> /dev/null" ));
 $shellinabox_version = shell_exec( "/usr/sbin/shellinaboxd --version 2>&1 | grep ShellInABox | sed -e 's/^ShellInABox version //'" );
 $shellinabox_version = ($shellinabox_running == "yes") ? 
@@ -34,7 +35,7 @@ Connect by IP Address:
   </select>
 
 Port:
-: <input id="PORT" type="text" class="stopped" name="PORT" maxlength="40" value="<?=$shellinabox_port;?>" title="port must be 0-65535" placeholder="Default Port is 8000" >
+: <input style="width:135px" id="PORT" type="text" class="stopped" name="PORT" maxlength="40" value="<?=$shellinabox_port;?>" title="port must be 0-65535" placeholder="Default Port is 8000" >
 
 Run as User:
 : <select id="USERS" class="stopped" title="select user, cannot be root" size="1" onChange="checkUSER(this.form, '<?=$shellinabox_runas;?>');">
@@ -44,7 +45,7 @@ Run as User:
   <input type="hidden" name="RUNAS" style="width:222px" maxlength="40" value=<?=$shellinabox_runas;?> >
 
 <input id="DEFAULT" class="stopped" type="submit" value="Default" onClick="resetDATA(this.form)">
-: <input id="btnApply" type="submit" value="Apply" onClick="verifyDATA(this.form)"><input type="button" value="Done" onClick="done()"><button id="btnCert" type="button" onclick="window.location.href='http://<?=$shellinabox_host;?>/boot/config/plugins/shellinabox-plugin/certificate-server.pem'"> Install Cert </button>
+: <input id="btnApply" type="submit" value="Apply" onClick="verifyDATA(this.form)"><input type="button" value="Done" onClick="done()"><button id="btnCert" type="button" onclick="window.location.href='http://<?=$shellinabox_host;?>/boot/config/plugins/shellinabox-plugin/<?=$shellinabox_cert;?>'"> Install Cert </button>
 </form>
 
 <script type="text/javascript">