v0.3.2

N: configuration - add checkbox to enable the installation of extensions even if they are already installed N: Swedish translation C: update Greek translation C: update German translation
crestAT · Aug 25, 2016 · 6cebc0d · 6cebc0d
1 parent 4f8c238
commit 6cebc0d
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 27 deletions.
diff --git a/onebuttoninstaller/ext/onebuttoninstaller-config.php b/onebuttoninstaller/ext/onebuttoninstaller-config.php
@@ -90,6 +90,7 @@ function change_perms($dir) {
                 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']['re_install'] = isset($_POST['re_install']) ? 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())." ";
@@ -103,6 +104,7 @@ function change_perms($dir) {
 $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['re_install'] = isset($config['onebuttoninstaller']['re_install']) ? true : false;
 $pconfig['auto_update'] = isset($config['onebuttoninstaller']['auto_update']) ? true : false;
 $pconfig['show_beta'] = isset($config['onebuttoninstaller']['show_beta']) ? true : false;
 
@@ -122,6 +124,7 @@ function enable_change(enable_change) {
 	document.iform.storage_path.disabled = endis;
 	document.iform.storage_pathbrowsebtn.disabled = endis;
 	document.iform.path_check.disabled = endis;
+	document.iform.re_install.disabled = endis;
 	document.iform.auto_update.disabled = endis;
 	document.iform.show_beta.disabled = endis;
 }
@@ -149,6 +152,7 @@ function enable_change(enable_change) {
             <?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("re_install", gettext("Re-install"), $pconfig['re_install'], gettext("If enabled it is possible to install extensions even if they are already installed."), "<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>

diff --git a/onebuttoninstaller/ext/onebuttoninstaller.php b/onebuttoninstaller/ext/onebuttoninstaller.php
@@ -135,34 +135,33 @@ function log_display($loginfo) {
             if (!isset($config['onebuttoninstaller']['show_beta'])  && (strpos($result[1], "RELEASE") === false)) continue;     //check for beta state
             else {
                 if ($i == count($loginfo['columns']) - 1) {
-
-
+                    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";
+                                break;
+                            }
+                        }
+                    }
                     // check if extension is already installed (existing config.xml or postinit cmd entry)
+                    $already_installed = false;
+echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}' "; 
                     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";
+//                        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";
+                        echo "><img src='{$image_path}status_enabled.png' border='0' alt='' title='".gettext('Enabled')."' /";
+                        $already_installed = true;
                     }
-                    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
+                    if (($already_installed === false) || isset($config['onebuttoninstaller']['re_install']) ) {
+                    // data for installation
+//                        echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}' title='".gettext('Select to install')."' >
+                        echo "><input title='".gettext('Select to install')."' 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";
+                    }
+echo "</td>\n";
                 }   // EOcount
                 else echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'>" . $result[$loginfo['columns'][$i]['pmid']] . "</td>\n";
             }   //EObeta-check
@@ -215,6 +214,7 @@ function log_display($loginfo) {
 }   //EOversion-check
 
 if (!is_file("{$config['onebuttoninstaller']['rootfolder']}extensions.txt")) $errormsg .= sprintf(gettext("File %s not found!"), "{$config['onebuttoninstaller']['rootfolder']}extensions.txt")."<br />";
+if (isset($config['onebuttoninstaller']['re_install'])) $savemsg .= sprintf(gettext("Option '%s' in '%s' is enabled!"), gettext("Re-install"), gettext("Configuration"));
 
 bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
 include("fbegin.inc");

diff --git a/onebuttoninstaller/extensions.txt b/onebuttoninstaller/extensions.txt
@@ -7,3 +7,4 @@ DNSMasq DHCP Server###<font color="green">RELEASE<br>0.3</font>###dnsmasq###mkdi
 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###
+Extended GUI###<font color="red">BETA<br>0.6-b1</font>###extended-gui-devel###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/development/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###<font color="red"><b><h2>This is a development version, use it only for testing!</h2></b></font><h3>Resolved issues in v0.6-b1:</h3><b>Pools duplication:</b><br>=> <a href='http://forums.nas4free.org/viewtopic.php?p=66903#p66903' target='_blank'>http://forums.nas4free.org/viewtopic.php?p=66903#p66903</a><br>=> <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p67189' target='_blank'>http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p67189</a><br><br><b>Dataset names:</b><br>=> <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p68026' target='_blank'>http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p68026</a><br>=> <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=420#p70077' target='_blank'>http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=420#p70077</a><br><br><font color="red"><b>Note 1:</b> THIS BETA VERSION SHOWS NEVER TO BE INSTALLED THUS IT IS POSSIBLE TO INSTALL NEWER BETA VERSIONS !</font><br><font color="blue"><b>Note 2:</b> One can revert to the most recent release of eGUI at any time via the WebGUI | Extensions | Extended GUI | Extension Maintenance => Update extension.</font><br><br><hr><br>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>Read more ... <a href='http://forums.nas4free.org/viewtopic.php?f=71&t=6405' target='_blank'>NAS4Free Forum</a>###10.3032853###
diff --git a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/locale-obi/sv/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/sv/LC_MESSAGES/nas4free.mo
diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php
@@ -29,7 +29,7 @@
     of the authors and should not be interpreted as representing official policies,
     either expressed or implied, of the FreeBSD Project.
 */
-$v = "v0.3.1";      // extension version
+$v = "v0.3.2";      // extension version
 $appname = "OneButtonInstaller";
 
 require_once("config.inc");

diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt
@@ -1,4 +1,8 @@
 Version Date        Description
+0.3.2   2016.08.25  N: configuration - add checkbox to enable the installation of extensions even if they are already installed
+                    N: Swedish translation
+                    C: update Greek translation
+                    C: update German translation
 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/)

diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt
@@ -1 +1 @@
-0.3.1
+0.3.2