v0.3.1 (#1)

* v0.3.1

update for path_check

* v0.3.1

update strings

* v0.3.1

remove test code

* v0.3.1

update release strings

OBI.php

@@ -76,21 +76,27 @@ if (isset($_POST['save']) && $_POST['save']) {
 	if (empty($input_errors)) {
         $config['onebuttoninstaller']['storage_path'] = !empty($_POST['storage_path']) ? $_POST['storage_path'] : $g['media_path'];
         $config['onebuttoninstaller']['storage_path'] = rtrim($config['onebuttoninstaller']['storage_path'],'/');         // ensure to have NO trailing slash
-        if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true);
-        change_perms($config['onebuttoninstaller']['storage_path']);
-        $install_dir = $config['onebuttoninstaller']['storage_path']."/";   // get directory where the installer script resides
-        if (!is_dir("{$install_dir}onebuttoninstaller/log")) { mkdir("{$install_dir}onebuttoninstaller/log", 0775, true); }
-        $return_val = mwexec("fetch {$verify_hostname} -vo {$install_dir}onebuttoninstaller/onebuttoninstaller-install.php 'https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/onebuttoninstaller-install.php'", true);
-        if ($return_val == 0) {
-            chmod("{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php", 0775);
-            require_once("{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php");
+        if (!isset($_POST['path_check']) && (strpos($config['onebuttoninstaller']['storage_path'], "/mnt/") === false)) {
+            $input_errors[] = gettext("The common directory for all extensions MUST be set to a directory below <b>'/mnt/'</b> to prevent to loose the extensions after a reboot on embedded systems!");
         }
-        else { 
-            $input_errors[] = sprintf(gettext("Installation file %s not found, installation aborted!"), "{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php");
-            exit; 
+        else {
+            if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true);
+            change_perms($config['onebuttoninstaller']['storage_path']);
+            $config['onebuttoninstaller']['path_check'] = isset($_POST['path_check']) ? true : false;
+            $install_dir = $config['onebuttoninstaller']['storage_path']."/";   // get directory where the installer script resides
+            if (!is_dir("{$install_dir}onebuttoninstaller/log")) { mkdir("{$install_dir}onebuttoninstaller/log", 0775, true); }
+            $return_val = mwexec("fetch {$verify_hostname} -vo {$install_dir}onebuttoninstaller/onebuttoninstaller-install.php 'https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/onebuttoninstaller-install.php'", true);
+            if ($return_val == 0) {
+                chmod("{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php", 0775);
+                require_once("{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php");
+            }
+            else {
+                $input_errors[] = sprintf(gettext("Installation file %s not found, installation aborted!"), "{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php");
+                return;
+            }
+            mwexec("rm -Rf ext/OBI; rm -f OBI.php", true);
+            header("Location:onebuttoninstaller-config.php");
         }
-        mwexec("rm -Rf ext/OBI; rm -f OBI.php", true);
-        header("Location:onebuttoninstaller-config.php");
     }
 }
 
@@ -102,6 +108,7 @@ if (isset($_POST['cancel']) && $_POST['cancel']) {
 }
 
 $pconfig['storage_path'] = !empty($config['onebuttoninstaller']['storage_path']) ? $config['onebuttoninstaller']['storage_path'] : $g['media_path'];
+$pconfig['path_check'] = isset($config['onebuttoninstaller']['path_check']) ? true : false;
 
 include("fbegin.inc"); ?>
 <form action="OBI.php" method="post" name="iform" id="iform">
@@ -111,8 +118,8 @@ include("fbegin.inc"); ?>
         <?php if (!empty($savemsg)) print_info_box($savemsg);?>
         <table width="100%" border="0" cellpadding="6" cellspacing="0">
             <?php html_titleline($application);?>
-			<?php html_filechooser("storage_path", gettext("Common directory"), $pconfig['storage_path'], gettext("Common root directory for all extensions (a persistant place where all extensions are/should be - a directory below <b>/mnt/</b>)."), $pconfig['storage_path'], true, 60);?>
-        </table>
+			<?php html_filechooser("storage_path", gettext("Common directory"), $pconfig['storage_path'], gettext("Common directory for all extensions (a persistant place where all extensions are/should be - a directory below <b>/mnt/</b>)."), $pconfig['storage_path'], true, 60);?>
+            <?php html_checkbox("path_check", gettext("Path check"), $pconfig['path_check'], gettext("If this option is selected no examination of the common directory path will be carried out (whether it was set to a directory below /mnt/)."), "<b><font color='red'>".gettext("Please use this option only if you know what you are doing!")."</font></b>", false);?>        </table>
         <div id="submit">
 			<input id="save" name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>"/>
 			<input id="cancel" name="cancel" type="submit" class="formbtn" value="<?=gettext("Cancel");?>"/>

README.md

@@ -1,5 +1,5 @@
 OneButtonInstaller
 ------------------
 
-Description in the NAS4Free forum -> <a href="http://forums.nas4free.org">OneButtonInstaller</a>
+Description in the NAS4Free forum -> <a href="http://forums.nas4free.org/viewtopic.php?f=71&t=11189">OneButtonInstaller</a>
 

onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit

@@ -0,0 +1,12 @@
+<?php
+$command = "fail2ban_start.sh";
+$cmd = dirname(__FILE__)."/".$command;
+require_once("config.inc");
+require_once("functions.inc");
+		if ( is_array($config['rc']['postinit'] ) && is_array( $config['rc']['postinit']['cmd'] ) ) {
+            for ($i = 0; $i < count($config['rc']['postinit']['cmd']); $i++) {
+                if (preg_match("/$command/", $config['rc']['postinit']['cmd'][$i])) break; }
+        }
+        $config['rc']['postinit']['cmd'][$i] = $config['cmd']."$cmd";
+		write_config();
+?>

onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.postinit

@@ -3,10 +3,9 @@ $command = "mcommander.sh";
 $cmd = dirname(__FILE__)."/".$command;
 require_once("config.inc");
 require_once("functions.inc");
-        $i =0;
 		if ( is_array($config['rc']['postinit'] ) && is_array( $config['rc']['postinit']['cmd'] ) ) {
-            for ($i; $i < count($config['rc']['postinit']['cmd']);) {
-                if (preg_match("/$command/", $config['rc']['postinit']['cmd'][$i])) break; ++$i; }
+            for ($i = 0; $i < count($config['rc']['postinit']['cmd']); $i++) {
+                if (preg_match("/$command/", $config['rc']['postinit']['cmd'][$i])) break; }
         }
         $config['rc']['postinit']['cmd'][$i] = $config['cmd']."$cmd";
 		write_config();

onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh

@@ -10,12 +10,14 @@
 # date:         2013-08-23 ; Fetch files from packages-9.2-release ; add libssh2
 # date:         2014-12-18 ; Update for v9.3; Clean up
 # date:         2015-02-21 ; Update mc package to mc-4.8.11.tbz
+# date:         2016-08-04 ; check hardware platform to use it on i386 too - author: crest <info@a3s.at>
 # purpose:      Install Midnight Commander on NAS4Free (embedded version).
 # Note:         Check the end of the page.
 #
 #----------------------- Set variables ------------------------------------------------------------------
 DIR=`dirname $0`;
-URL="ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/amd64/packages-9.2-release/Latest"
+HWPLATFORM=`uname -m`;
+URL="ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/${HWPLATFORM}/packages-9.2-release/Latest"
 MCLIGHTFILE="mc.tbz"
 LIBSLANGFILE="libslang2.tbz"
 LIBSSH2FILE="libssh2.tbz"

onebuttoninstaller/ext/onebuttoninstaller-config.php

@@ -80,18 +80,37 @@ if (isset($_POST['save']) && $_POST['save']) {
     unset($input_errors);
 	if (empty($input_errors)) {
         $config['onebuttoninstaller']['enable'] = isset($_POST['enable']) ? true : false;
-        $config['onebuttoninstaller']['storage_path'] = !empty($_POST['storage_path']) ? $_POST['storage_path'] : $g['media_path'];
-        $config['onebuttoninstaller']['storage_path'] = rtrim($config['onebuttoninstaller']['storage_path'],'/');         // ensure to have NO trailing slash
-        if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true);
-        change_perms($_POST['storage_path']);
-        $config['onebuttoninstaller']['auto_update'] = isset($_POST['auto_update']) ? true : false;
-        $savemsg .= get_std_save_message(write_config());
+        if (isset($_POST['enable'])) {
+            $config['onebuttoninstaller']['storage_path'] = !empty($_POST['storage_path']) ? $_POST['storage_path'] : $g['media_path'];
+            $config['onebuttoninstaller']['storage_path'] = rtrim($config['onebuttoninstaller']['storage_path'],'/');         // ensure to have NO trailing slash
+            if (!isset($_POST['path_check']) && (strpos($config['onebuttoninstaller']['storage_path'], "/mnt/") === false)) {
+                $input_errors[] = gettext("The common directory for all extensions MUST be set to a directory below <b>'/mnt/'</b> to prevent to loose the extensions after a reboot on embedded systems!");
+            }
+            else {
+                if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true);
+                change_perms($_POST['storage_path']);
+                $config['onebuttoninstaller']['path_check'] = isset($_POST['path_check']) ? true : false;
+                $config['onebuttoninstaller']['auto_update'] = isset($_POST['auto_update']) ? true : false;
+                $config['onebuttoninstaller']['show_beta'] = isset($_POST['show_beta']) ? true : false;
+                $savemsg .= get_std_save_message(write_config())." ";
+                require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-start.php");
+            }
+        }
+        else $savemsg .= get_std_save_message(write_config())." ";
     }   // end of empty input_errors
 }
 
 $pconfig['enable'] = isset($config['onebuttoninstaller']['enable']) ? true : false;
 $pconfig['storage_path'] = !empty($config['onebuttoninstaller']['storage_path']) ? $config['onebuttoninstaller']['storage_path'] : $g['media_path'];
+$pconfig['path_check'] = isset($config['onebuttoninstaller']['path_check']) ? true : false;
 $pconfig['auto_update'] = isset($config['onebuttoninstaller']['auto_update']) ? true : false;
+$pconfig['show_beta'] = isset($config['onebuttoninstaller']['show_beta']) ? true : false;
+
+$return_val = mwexec("fetch -o {$config['onebuttoninstaller']['rootfolder']}log/version.txt https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/version.txt", false);
+if ($return_val == 0) {
+    $server_version = exec("cat {$config['onebuttoninstaller']['rootfolder']}log/version.txt");
+    if ($server_version != $config['onebuttoninstaller']['version']) { $savemsg .= sprintf(gettext("New extension version %s available, push '%s' button to install the new version!"), $server_version, gettext("Maintenance")); }
+}   //EOversion-check
 
 bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
 include("fbegin.inc");
@@ -102,7 +121,9 @@ function enable_change(enable_change) {
     var endis = !(document.iform.enable.checked || enable_change);
 	document.iform.storage_path.disabled = endis;
 	document.iform.storage_pathbrowsebtn.disabled = endis;
+	document.iform.path_check.disabled = endis;
 	document.iform.auto_update.disabled = endis;
+	document.iform.show_beta.disabled = endis;
 }
 //-->
 </script>
@@ -125,9 +146,11 @@ function enable_change(enable_change) {
         <?php if (!empty($savemsg)) print_info_box($savemsg);?>
         <table width="100%" border="0" cellpadding="6" cellspacing="0">
             <?php html_titleline_checkbox("enable", gettext("OneButtonInstaller"), $pconfig['enable'], gettext("Enable"), "enable_change(false)");?>
-            <?php html_text("installation_directory", gettext("Installation directory"), sprintf(gettext("The extension is installed in %s."), $config['onebuttoninstaller']['rootfolder']));?>
-			<?php html_filechooser("storage_path", gettext("Common directory"), $pconfig['storage_path'], gettext("Common root directory for all extensions (a persistant place where all extensions are/should be - a directory below <b>/mnt/</b>)."), $pconfig['storage_path'], true, 60);?>
+            <?php html_text("installation_directory", gettext("Installation directory"), sprintf(gettext("The extension is installed in %s"), $config['onebuttoninstaller']['rootfolder']));?>
+			<?php html_filechooser("storage_path", gettext("Common directory"), $pconfig['storage_path'], gettext("Common directory for all extensions (a persistant place where all extensions are/should be - a directory below <b>/mnt/</b>)."), $pconfig['storage_path'], true, 60);?>
+            <?php html_checkbox("path_check", gettext("Path check"), $pconfig['path_check'], gettext("If this option is selected no examination of the common directory path will be carried out (whether it was set to a directory below /mnt/)."), "<b><font color='red'>".gettext("Please use this option only if you know what you are doing!")."</font></b>", false);?>
             <?php html_checkbox("auto_update", gettext("Update"), $pconfig['auto_update'], gettext("Update extensions list automatically."), "", false);?>
+            <?php html_checkbox("show_beta", gettext("Beta releases"), $pconfig['show_beta'], gettext("If enabled, extensions in beta state will be shown in the extensions list."), "", false);?>
         </table>
         <div id="submit">
 			<input id="save" name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>"/>

onebuttoninstaller/ext/onebuttoninstaller-update_extension.php

@@ -40,7 +40,7 @@ if (is_file("{$config['onebuttoninstaller']['rootfolder']}log/oneload")) { requi
 $return_val = mwexec("fetch -o {$config['onebuttoninstaller']['rootfolder']}log/version.txt https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/version.txt", true);
 if ($return_val == 0) { 
     $server_version = exec("cat {$config['onebuttoninstaller']['rootfolder']}log/version.txt"); 
-    if ($server_version != $config['onebuttoninstaller']['version']) { $savemsg = sprintf(gettext("New extension version %s available, push '%s' button to install the new version!"), $server_version, gettext("Update Extension")); }
+    if ($server_version != $config['onebuttoninstaller']['version']) { $savemsg .= sprintf(gettext("New extension version %s available, push '%s' button to install the new version!"), $server_version, gettext("Update Extension")); }
     mwexec("fetch -o {$config['onebuttoninstaller']['rootfolder']}release_notes.txt https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/release_notes.txt", false);
 }
 else { $server_version = gettext("Unable to retrieve version from server!"); }
@@ -48,20 +48,19 @@ else { $server_version = gettext("Unable to retrieve version from server!"); }
 if (isset($_POST['ext_remove']) && $_POST['ext_remove']) {
 // remove start/stop commands
     if ( is_array($config['rc']['postinit'] ) && is_array( $config['rc']['postinit']['cmd'] ) ) {
-		for ($i = 0; $i < count($config['rc']['postinit']['cmd']);) {
+		for ($i = 0; $i < count($config['rc']['postinit']['cmd']); $i++) {
     		if (preg_match('/onebuttoninstaller/', $config['rc']['postinit']['cmd'][$i])) { unset($config['rc']['postinit']['cmd'][$i]);} else{}
-		++$i;
 		}
 	}
 	if ( is_array($config['rc']['shutdown'] ) && is_array( $config['rc']['shutdown']['cmd'] ) ) {
-		for ($i = 0; $i < count($config['rc']['shutdown']['cmd']); ) {
+		for ($i = 0; $i < count($config['rc']['shutdown']['cmd']); $i++) {
             if (preg_match('/onebuttoninstaller/', $config['rc']['shutdown']['cmd'][$i])) { unset($config['rc']['shutdown']['cmd'][$i]); } else {}
-		++$i;
 		}
 	}
 // remove extension pages
-	mwexec ("rm -rf /usr/local/www/ext/onebuttoninstaller");
-	mwexec ("rm -rf /usr/local/www/onebuttoninstaller*");
+	mwexec("rm -rf /usr/local/www/ext/onebuttoninstaller");
+	mwexec("rmdir -p /usr/local/www/ext");    // to prevent empty extensions menu entry in top GUI menu if there are no other extensions installed
+	mwexec("rm -rf /usr/local/www/onebuttoninstaller*");
 // unlink created links
     if (is_link("/usr/local/share/locale-obi")) unlink("/usr/local/share/locale-obi");
 // remove application section from config.xml

onebuttoninstaller/ext/onebuttoninstaller.php

@@ -115,7 +115,7 @@ function log_display($loginfo) {
  * EXTENSIONS.TXT format description: PARAMETER DELIMITER -> ###
  *                      PMID    COMMENT
  * name:                0       extension name
- * version:             1       extension version (base for config entry - could change for newer versions)
+ * version:             1       extension version (base for config entry - could change for newer versions), check for beta releases
  * xmlstring:           2       config.xml or installation directory
  * command(list)1:      3       execution of SHELL commands / scripts (e.g. download installer, untar, chmod, ...)
  * command(list)2:      4       empty ("-") or PHP script name (file MUST exist)
@@ -132,35 +132,40 @@ function log_display($loginfo) {
 		if ((FALSE === $result) || (0 == $result)) continue;
 		echo "<tr valign=\"top\">\n";
 		for ($i = 0; $i < count($loginfo['columns']); $i++) {           // handle pmids (columns)
-            if ($i == count($loginfo['columns']) - 1) {
-                // check if extension is already installed (existing config.xml or postinit cmd entry)
-                if ((isset($config[$result[2]])) || (log_get_status($result[2]) == 1)) {
-                    echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='{$image_path}status_enabled.png' border='0' alt='' title='".gettext('Enabled')."' /></td>\n";
-                }
-                else {                                                  // not installed
-                    $supported_app = true;
-                    if (!empty($result[6])) {                           // something unsupported exist
-                        $unsupported = explode(",", str_replace(" ", "", $result[6]));
-                        for ($k = 0; $k < count($unsupported); $k++) {  // check for unsupported release / architecture / platforms
-                            if (!check_min_release($unsupported[$k]) || ($unsupported[$k] == $g['arch']) || ($unsupported[$k] == $g['platform'])) {
-                                echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='{$image_path}status_disabled.png' border='0' alt='' title='".gettext('Unsupported architecture/platform/release').': '.$unsupported[$k]."' /></td>\n";
-                                $supported_app = false;
-                                break;
+            if (!isset($config['onebuttoninstaller']['show_beta'])  && (strpos($result[1], "RELEASE") === false)) continue;     //check for beta state
+            else {
+                if ($i == count($loginfo['columns']) - 1) {
+                
+                
+                    // check if extension is already installed (existing config.xml or postinit cmd entry)
+                    if ((isset($config[$result[2]])) || (log_get_status($result[2]) == 1)) {
+                        echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='{$image_path}status_enabled.png' border='0' alt='' title='".gettext('Enabled')."' /></td>\n";
+                    }
+                    else {                                                  // not installed
+                        $supported_app = true;
+                        if (!empty($result[6])) {                           // something unsupported exist
+                            $unsupported = explode(",", str_replace(" ", "", $result[6]));
+                            for ($k = 0; $k < count($unsupported); $k++) {  // check for unsupported release / architecture / platforms
+                                if (!check_min_release($unsupported[$k]) || ($unsupported[$k] == $g['arch']) || ($unsupported[$k] == $g['platform'])) {
+                                    echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='{$image_path}status_disabled.png' border='0' alt='' title='".gettext('Unsupported architecture/platform/release').': '.$unsupported[$k]."' /></td>\n";
+                                    $supported_app = false;
+                                    break;
+                                }
                             }
-                        }
-                    } 
-                    if ($supported_app === true) {
-                    // data for installation
-                        echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}' title='".gettext('Select to install')."' >
-                            <input type='checkbox' name='name[".$j."][extension]' value='".$result[2]."' />
-                            <input type='hidden' name='name[".$j."][truename]' value='".$result[0]."' />
-                            <input type='hidden' name='name[".$j."][command1]' value='".$result[3]."' />
-                            <input type='hidden' name='name[".$j."][command2]' value='".$result[4]."' />
-                        </td>\n";
-                    }                
-                }   // EOnot-installed
-            }   // EOcount
-            else echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'>" . $result[$loginfo['columns'][$i]['pmid']] . "</td>\n";
+                        } 
+                        if ($supported_app === true) {
+                        // data for installation
+                            echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}' title='".gettext('Select to install')."' >
+                                <input type='checkbox' name='name[".$j."][extension]' value='".$result[2]."' />
+                                <input type='hidden' name='name[".$j."][truename]' value='".$result[0]."' />
+                                <input type='hidden' name='name[".$j."][command1]' value='".$result[3]."' />
+                                <input type='hidden' name='name[".$j."][command2]' value='".$result[4]."' />
+                            </td>\n";
+                        }                
+                    }   // EOnot-installed
+                }   // EOcount
+                else echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'>" . $result[$loginfo['columns'][$i]['pmid']] . "</td>\n";
+            }   //EObeta-check
         }   // EOcolumns
 		echo "</tr>\n";
 		$j++;
@@ -203,6 +208,12 @@ if (isset($_POST['update']) || (isset($config['onebuttoninstaller']['auto_update
     else $errormsg .= gettext("Unable to retrieve extensions list from server!")."<br />";
 }   // EOupdate
 
+$return_val = mwexec("fetch -o {$config['onebuttoninstaller']['rootfolder']}log/version.txt https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/version.txt", false);
+if ($return_val == 0) {
+    $server_version = exec("cat {$config['onebuttoninstaller']['rootfolder']}log/version.txt");
+    if ($server_version != $config['onebuttoninstaller']['version']) { $savemsg .= sprintf(gettext("New extension version %s available, push '%s' button to install the new version!"), $server_version, gettext("Maintenance")); }
+}   //EOversion-check
+
 if (!is_file("{$config['onebuttoninstaller']['rootfolder']}extensions.txt")) $errormsg .= sprintf(gettext("File %s not found!"), "{$config['onebuttoninstaller']['rootfolder']}extensions.txt")."<br />";
 
 bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
@@ -232,9 +243,9 @@ bindtextdomain("nas4free", "/usr/local/share/locale-obi"); ?>
     		</table>
             <div id="remarks">
                 <?php html_remark("note", gettext("Note"), gettext("After successful installation extensions can be found under the 'Extensions' entry in the navigation bar.")."<br /><b>".gettext("Some extensions need to finish their installation procedures on their own extension page before they will be shown as installed!")."</b><br /><br />");?>
-                <?php html_remark("legend", sprintf(gettext("Icons in the %s column"), gettext("Install")), "");?>
-                <img src='images/status_disabled.png' border='0' alt='' title='' />&nbsp;&nbsp;&nbsp;<?php echo "... ".gettext("The extension can not be installed because of an unsupported architecture/platform/release of the system. Hover with the mouse over the icon to see what is unsupported.");?><br />
-                <img src='images/status_enabled.png' border='0' alt='' title='' />&nbsp;&nbsp;&nbsp;<?php echo "... ".gettext("The extension is already installed."); ?><br /><br />
+                <?php html_remark("legend", sprintf(gettext("Icons in the %s column"), "'".gettext("Install")."'"), "");?>
+                <img src='<?=$image_path?>status_disabled.png' border='0' alt='' title='' />&nbsp;&nbsp;&nbsp;<?php echo "... ".gettext("The extension can not be installed because of an unsupported architecture/platform/release of the system. Hover with the mouse over the icon to see what is unsupported.");?><br />
+                <img src='<?=$image_path?>status_enabled.png' border='0' alt='' title='' />&nbsp;&nbsp;&nbsp;<?php echo "... ".gettext("The extension is already installed."); ?><br /><br />
             </div>
             <div id="submit">                                                                               
                 <input name="install" type="submit" class="formbtn" title="<?=gettext("Install extensions");?>" value="<?=gettext("Install");?>" onclick="return confirm('<?=gettext("Ready to install the selected extensions?");?>')" />

onebuttoninstaller/extensions.txt

@@ -1,9 +1,9 @@
-Extended GUI###<font color="green">RELEASE<br>0.5.3</font>###extended-gui###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/master/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###Extension for NAS4Free with several improvements for the WebGUI and additional functions. Most of the extension affects STATUS | SYSTEM view but also STATUS | GRAPH and DIAGNOSTICS | LOG which got a new entry NOTIFICATIONS.<br><br>The extension works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the NAS4Free WebGUI, features configuration and extension maintenance (update & removal inside the WebGUI), let you switch between STANDARD (original) and EXTENDED WebGUI view and let you easily configure/enable/disable views and additional functions.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405' target='_blank'>NAS4Free Forum</a>###10.3032853
-RRDGraphs###<font color="green">RELEASE<br>0.3.2</font>###rrdgraphs###mkdir -p rrdgraphs && cd rrdgraphs && fetch https://raw.github.com/crestAT/nas4free-rrdtool/master/rrdgraphs/rrd-install.php && chmod 770 rrd*install.php###rrdgraphs/rrd-install.php###Extension to install / configure / update and remove RRDTool based graphs for NAS4Free servers.<br><br>The extension is based on RRDtool and provides graphs for CPU frequency, CPU temperature, CPU usage, Disk usage (recognition of all mountpoints/shares automatically at RRDG startup), Load averages, Memory usage, Network latency, Network traffic, Processes, UPS, Uptime and ZFS ARC.<br><br>The extension is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes and works on all plattforms (x86 & x64, embedded & full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration and extension maintenance (update & removal inside the WebGUI) and is able to work on RAM drives to take care of your HDDs/USB pen drives.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=8299' target='_blank'>NAS4Free Forum</a>
-BitTorrent Sync###<font color="green">RELEASE<br>0.7</font>###btsync###fetch https://raw.github.com/crestAT/nas4free-bittorrent-sync/master/bts-install.php && chmod 770 bts*install.php###bts-install.php###Extension to install / configure / backup / update / manage and remove BitTorrent Sync application on NAS4Free servers.<br><br>The extension can be used with BitTorrent Sync 1.4.x (last version was 1.4.111) as well as 2.x, is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes, works on all plattforms (embedded, full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration, application update & backup management, extension mantenance (update & removal) and log view with filter and search capability.<br><br><font color="blue"><b>Note:</b> Standard BitTorrent Sync version is based on 2.x releases, to use the latest 1.x release open Extensions | BitTorrent Sync | Maintenance and change the Download URL for version <b>1.4.111:</b><br><b>64 bit: </b>http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_x64-1.4.111.tar.gz<br><b>32 bit: </b>http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_i386-1.4.111.tar.gz<br>and hit Save URL, Fetch and Install.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=5704' target='_blank'>NAS4Free Forum</a>###rpi, rpi2
-Syncthing###<font color="green">RELEASE<br>0.1.5</font>###syncthing###fetch https://raw.github.com/crestAT/nas4free-syncthing/master/stg-install.php && chmod 770 stg*install.php###stg-install.php###Extension to install / configure / backup / update / manage and remove Syncthing (STG) application on NAS4Free (N4F) servers.<br><br>The extension works on all plattforms, does not need jail or pkg_add, add pages to NAS4Free WebGUI extensions, features configuration, application update & backup management, scheduling and log view with filter / search capabilities.<br><br><font color="blue"><b>Note:</b> The current 10.3 and 10.2 series of NAS4Free contain Syncthing already out of the box so this extensions is mainly for older releases OR if one need older Syncthing versions (e.g. before 0.14.x for compatibility reasons with other devices.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=11110#p69469' target='_blank'>NAS4Free Forum</a>###
-TheBrig###<font color="green">RELEASE<br>0.94</font>###thebrig###mkdir -p thebrig && cd thebrig && fetch https://raw.githubusercontent.com/fsbruva/thebrig/alcatraz/thebrig_install.sh && chmod a+x thebrig_install.sh && sh thebrig_install.sh###-###Jail manager extension for NAS4Free.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=79&t=3894' target='_blank'>NAS4Free Forum</a>
-DNSMasq DHCP Server###<font color="green">RELEASE<br>0.3</font>###dnsmasq###mkdir -p dnsmasq && cd dnsmasq && fetch https://raw.github.com/alexey1234/nas4free-dnsmasq/master/dnsmasq_install.sh && chmod a+x dnsmasq_install.sh && sh dnsmasq_install.sh `pwd`###-###DNSMasq DHCP Server extension for NAS4Free.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=3002' target='_blank'>NAS4Free Forum</a>###rpi, rpi2
-Midnight Commander###<font color="green">RELEASE<br>4.8.8</font>###mcommander.sh###mkdir -p midnightcommander && cd midnightcommander && cp /usr/local/www/ext/onebuttoninstaller/mcommander.* . && chmod u+x mcommander.sh && `pwd`/mcommander.sh###midnightcommander/mcommander.postinit###Midnight Commander for NAS4Free.<br><br>After successful installation you can use Midnight Commander in the system console shell or if you connect via ssh. To start the Midnight Commander just enter the command <b>mc</b> in the CLI.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=70&t=187' target='_blank'>NAS4Free Forum</a>###rpi, rpi2
-Virtual Machine BHYVE###<font color="red">BETA<br>0.x</font>###bhyve###mkdir -p bhyve && cd bhyve && fetch https://raw.githubusercontent.com/alexey1234/vmbhyve_nas4free/master/bhyve_install.sh && chmod a+x bhyve_install.sh && sh bhyve_install.sh `pwd`###-###Webgui to bhyve for NAS4Free. Based on vm-bhyve.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=10433#p65157' target='_blank'>NAS4Free Forum</a>###10.2, rpi, rpi2, bananapi
-Plex Media Server###<font color="green">RELEASE<br>4.1</font>###plexinit###mkdir -p plex && cd plex && fetch https://raw.githubusercontent.com/JRGTH/nas4free-plex-extension/master/plex/plexinit && chmod 0755 plexinit && plexinit -o###plex/postinit###Plex Media Server Add-On for NAS4Free 10.x.<br><br>The extension works on NAS4Free Plex Media Server Add-On for NAS4Free 10.x or compatible FreeBSD based NAS solutions, don't need jail, fstab or unionfs configs, self contained and portable package, single script for management and startup, easy to upgrade/rollback while maintaining actual Plex config, Plex IP address will be locally visible by any devices.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=11049#p69002' target='_blank'>NAS4Free Forum</a>###x86, 10.0, rpi, rpi2
+Extended GUI###<font color="green">RELEASE<br>0.5.3</font>###extended-gui###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/master/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###Extension for NAS4Free with several improvements for the WebGUI and additional functions. Most of the extension affects STATUS | SYSTEM view but also STATUS | GRAPH and DIAGNOSTICS | LOG which got a new entry NOTIFICATIONS.<br><br>The extension works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the NAS4Free WebGUI, features configuration and extension maintenance (update & removal inside the WebGUI), let you switch between STANDARD (original) and EXTENDED WebGUI view and let you easily configure/enable/disable views and additional functions.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405' target='_blank'>NAS4Free Forum</a>###10.3032853###
+RRDGraphs###<font color="green">RELEASE<br>0.3.2</font>###rrdgraphs###mkdir -p rrdgraphs && cd rrdgraphs && fetch https://raw.github.com/crestAT/nas4free-rrdtool/master/rrdgraphs/rrd-install.php && chmod 770 rrd*install.php###rrdgraphs/rrd-install.php###Extension to install / configure / update and remove RRDTool based graphs for NAS4Free servers.<br><br>The extension is based on RRDtool and provides graphs for CPU frequency, CPU temperature, CPU usage, Disk usage (recognition of all mountpoints/shares automatically at RRDG startup), Load averages, Memory usage, Network latency, Network traffic, Processes, UPS, Uptime and ZFS ARC.<br><br>The extension is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes and works on all plattforms (x86 & x64, embedded & full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration and extension maintenance (update & removal inside the WebGUI) and is able to work on RAM drives to take care of your HDDs/USB pen drives.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=8299' target='_blank'>NAS4Free Forum</a>###-###
+BitTorrent Sync###<font color="green">RELEASE<br>0.7</font>###btsync###fetch https://raw.github.com/crestAT/nas4free-bittorrent-sync/master/bts-install.php && chmod 770 bts*install.php###bts-install.php###Extension to install / configure / backup / update / manage and remove BitTorrent Sync application on NAS4Free servers.<br><br>The extension can be used with BitTorrent Sync 1.4.x (last version was 1.4.111) as well as 2.x, is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes, works on all plattforms (embedded, full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration, application update & backup management, extension mantenance (update & removal) and log view with filter and search capability.<br><br><font color="blue"><b>Note:</b> Standard BitTorrent Sync version is based on 2.x releases, to use the latest 1.x release open Extensions | BitTorrent Sync | Maintenance and change the Download URL for version <b>1.4.111:</b><br><b>64 bit: </b>http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_x64-1.4.111.tar.gz<br><b>32 bit: </b>http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_i386-1.4.111.tar.gz<br>and hit Save URL, Fetch and Install.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=5704' target='_blank'>NAS4Free Forum</a>###rpi, rpi2, rpi3, bananapi###
+Syncthing###<font color="green">RELEASE<br>0.1.5</font>###syncthing_start.php###fetch https://raw.github.com/crestAT/nas4free-syncthing/master/stg-install.php && chmod 770 stg*install.php###stg-install.php###Extension to install / configure / backup / update / manage and remove Syncthing (STG) application on NAS4Free (N4F) servers.<br><br>The extension works on all plattforms, does not need jail or pkg_add, add pages to NAS4Free WebGUI extensions, features configuration, application update & backup management, scheduling and log view with filter / search capabilities.<br><br><font color="blue"><b>Note:</b> The current 10.3 and 10.2 series of NAS4Free contain Syncthing already out of the box so this extensions is mainly for older releases OR if one need older Syncthing versions (e.g. before 0.14.x for compatibility reasons with other devices.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=11110#p69469' target='_blank'>NAS4Free Forum</a>###-###
+TheBrig###<font color="green">RELEASE<br>0.94</font>###thebrig###mkdir -p thebrig && cd thebrig && fetch https://raw.githubusercontent.com/fsbruva/thebrig/alcatraz/thebrig_install.sh && chmod a+x thebrig_install.sh && sh thebrig_install.sh###-###Jail manager extension for NAS4Free.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=79&t=3894' target='_blank'>NAS4Free Forum</a>###-###
+DNSMasq DHCP Server###<font color="green">RELEASE<br>0.3</font>###dnsmasq###mkdir -p dnsmasq && cd dnsmasq && fetch https://raw.github.com/alexey1234/nas4free-dnsmasq/master/dnsmasq_install.sh && chmod a+x dnsmasq_install.sh && sh dnsmasq_install.sh `pwd`###-###DNSMasq DHCP Server extension for NAS4Free.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=3002' target='_blank'>NAS4Free Forum</a>###rpi, rpi2, rpi3, bananapi###
+Midnight Commander###<font color="green">RELEASE<br>4.8.8</font>###mcommander.sh###mkdir -p midnightcommander && cd midnightcommander && cp /usr/local/www/ext/onebuttoninstaller/mcommander.* . && chmod u+x mcommander.sh && `pwd`/mcommander.sh###midnightcommander/mcommander.postinit###Midnight Commander for NAS4Free.<br><br>After successful installation you can use Midnight Commander in the system console shell or if you connect via ssh. To start the Midnight Commander just enter the command <b>mc</b> in the CLI.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=70&t=187' target='_blank'>NAS4Free Forum</a>###rpi, rpi2, rpi3, bananapi###
+Virtual Machine BHYVE###<font color="red">BETA<br>0.x</font>###bhyve###mkdir -p bhyve && cd bhyve && fetch https://raw.githubusercontent.com/alexey1234/vmbhyve_nas4free/master/bhyve_install.sh && chmod a+x bhyve_install.sh && sh bhyve_install.sh `pwd`###-###Webgui to bhyve for NAS4Free. Based on vm-bhyve.<br><br><font color="red"><b>Note:</b> After the installation navigate to rudimentary config tab and push Save to finish the installation.</font><br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=10433#p65157' target='_blank'>NAS4Free Forum</a>###x86, 10.2, rpi, rpi2, rpi3, bananapi###
+Plex Media Server###<font color="green">RELEASE<br>4.1</font>###plexinit###mkdir -p plex && cd plex && fetch https://raw.githubusercontent.com/JRGTH/nas4free-plex-extension/master/plex/plexinit && chmod 755 plexinit && ./plexinit -o###plex/postinit###Plex Media Server Add-On for NAS4Free 10.x.<br><br>The extension works on NAS4Free Plex Media Server Add-On for NAS4Free 10.x or compatible FreeBSD based NAS solutions, don't need jail, fstab or unionfs configs, self contained and portable package, single script for management and startup, easy to upgrade/rollback while maintaining actual Plex config, Plex IP address will be locally visible by any devices.<br><br>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=11184#p69861' target='_blank'>NAS4Free Forum</a>###x86, 10.0, rpi, rpi2, rpi3, bananapi###

onebuttoninstaller/onebuttoninstaller-install.php

@@ -29,13 +29,14 @@
     of the authors and should not be interpreted as representing official policies,
     either expressed or implied, of the FreeBSD Project.
 */
-$v = "v0.1";      // extension version
+$v = "v0.3.1";      // extension version
 $appname = "OneButtonInstaller";
 
 require_once("config.inc");
 
 $arch = $g['arch'];
 $platform = $g['platform'];
+// no check necessary since the extension is for all archictectures/platforms/releases
 //if (($arch != "i386" && $arch != "amd64") && ($arch != "x86" && $arch != "x64" && $arch != "rpi" && $arch != "rpi2")) { echo "\f{$arch} is an unsupported architecture!\n"; exit(1);  }
 //if ($platform != "embedded" && $platform != "full" && $platform != "livecd" && $platform != "liveusb") { echo "\funsupported platform!\n";  exit(1); }
 
@@ -94,8 +95,6 @@ if ( !isset($config['onebuttoninstaller']) || !is_array($config['onebuttoninstal
     $config['rc']['shutdown']['cmd'][$i] = $config['onebuttoninstaller']['rootfolder']."onebuttoninstaller_stop.php";
     write_config();
     require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-start.php");
-//    echo "\n".$appname." Version ".$config['onebuttoninstaller']['version']." installed";
-//    echo "\n\nInstallation completed, use WebGUI | Extensions | ".$appname." to configure \nthe application (don't forget to refresh the WebGUI before use)!\n";
 }
 else {
 // update release
@@ -116,4 +115,6 @@ else {
     write_config();
     require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-start.php");
 }
+// finally fetch the most recent extensions list to get the latest changes if not already in the master release
+$return_val = mwexec("fetch -o {$config['onebuttoninstaller']['rootfolder']}extensions.txt https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/extensions.txt", true);
 ?>

onebuttoninstaller/onebuttoninstaller-start.php

@@ -31,8 +31,8 @@
 */
 $extension_dir = "/usr/local/www"; 
 
-if ( !is_link ( "/usr/local/share/locale-obi")) { mwexec("ln -s {$config['onebuttoninstaller']['rootfolder']}locale-obi /usr/local/share/", true); }     // create link to languages
+mwexec("ln -sf {$config['onebuttoninstaller']['rootfolder']}locale-obi /usr/local/share/", true);           // create link to languages
 $return_val = mwexec("cp -R {$config['onebuttoninstaller']['rootfolder']}ext/* {$extension_dir}/", true);
 if ($return_val == 0) exec("logger onebuttoninstaller: started");
-else exec("logger onebuttoninstaller: error during startup, not started"); 
+else exec("logger onebuttoninstaller: error during startup, file copy to {$extension_dir} failed"); 
 ?>

onebuttoninstaller/onebuttoninstaller-stop.php

@@ -32,5 +32,5 @@
 $extension_dir = "/usr/local/www";
 mwexec("rm -Rf {$extension_dir}/onebuttoninstaller*", true);
 mwexec("rm -Rf {$extension_dir}/ext/onebuttoninstaller", true);
-exec("logger onebuttoninstaller: stopped");
+exec("logger onebuttoninstaller: stopped"); 
 ?>

onebuttoninstaller/onebuttoninstaller_start.php

@@ -1,5 +1,5 @@
 #!/usr/local/bin/php-cgi -f
 <?php
 require_once("config.inc");
-require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-start.php");
+require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-start.php"); 
 ?>

onebuttoninstaller/onebuttoninstaller_stop.php

@@ -1,5 +1,5 @@
 #!/usr/local/bin/php-cgi -f
 <?php
 require_once("config.inc");
-require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-stop.php");
+require_once("{$config['onebuttoninstaller']['rootfolder']}onebuttoninstaller-stop.php"); 
 ?>

onebuttoninstaller/release_notes.txt

@@ -1,4 +1,10 @@
 Version Date        Description
+0.3.1   2016.08.15  F: OBI installer - add checkbox to override restriction for extensions installation path 
+0.3     2016.08.14  N: configuration - checkbox to override restriction for extensions installation path 
+                       (limited to a directory under /mnt/)
+0.2     2016.08.09  N: configuration - enable/disable beta releases in extensions list
+                    N: check hardware platform to use midnightcommander on i386 too
+                    F: disabling extension not possible, leads to an error message
 0.1     2016.08.01  initial release
 
 N: ...  new feature

onebuttoninstaller/version.txt

@@ -1 +1 @@
-0.1
+0.3.1