Merge pull request 'onebuttoninstaller/onebuttoninstaller-update_extension.php aktualisiert' (#2) from matthiasberner-patch-1 into master

Reviewed-on: #2

onebuttoninstaller/extensions.txt

@@ -16,7 +16,7 @@ Telegraf###<font color="green">RELEASE<br>0.3.x</font>###telegraf-init###mkdir -
 PyTivo###<font color="green">RELEASE<br>0.1.x</font>###pytivoinit###mkdir -p pytivo && cd pytivo && fetch https://raw.githubusercontent.com/JRGTH/xigmanas-pytivo-extension/master/pytivoinit && chmod +x pytivoinit && ./pytivoinit -o###pytivo/postinit###XigmaNAS PyTivo Extension<br><br>pyTivo is both an HMO and GoBack server. Similar to TiVo Desktop, pyTivo loads many standard video compression codecs and outputs mpeg2 (or in some cases, h.264) video to the TiVo. However, pyTivo is able to load many more file types than TiVo Desktop.<br><br>pyTivo is in no way affiliated with TiVo, Inc.<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=71&t=14566' target='_blank'>XigmaNAS Forum</a>###11.0, x86, rpi, rpi2, rpi3, bananapi###
 BE Manager###<font color="green">RELEASE<br>0.2.x</font>###beminit###mkdir -p bemanager && cd bemanager && fetch https://raw.githubusercontent.com/JRGTH/xigmanas-bem-extension/master/beminit && chmod +x beminit && ./beminit -o###bemanager/postinit###Boot Environments Manager extension for XigmaNAS.<br><br>Utility to manage	Boot Environments with ZFS compliant platforms.<br><br><font color="red"><b>Note:</b> This extension is compatible with RootOnZFS platforms only.</font><br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=71&t=14585#p90458' target='_blank'>XigmaNAS Forum</a>###11.0, x86, rpi, rpi2, rpi3, bananapi###
 Themes###<font color="green">RELEASE<br>1.x</font>###themes-start###mkdir -p themes && cd themes && fetch https://raw.github.com/crestAT/nas4free-themes/master/themes/themes-install.php && chmod +x themes* ###themes/themes-install.php###XigmaNAS themes extension.<br><br>The extension consists of a theme manager to choose from different as well as a simple theme designer. The themes are based on the original XigmaNAS WebGUI - the theme designer provide the means to change colors in an easy-to-use way and also to choose different device size bar types for Status > System and swap devices.<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=71&t=14778#p91734' target='_blank'>XigmaNAS Forum</a>###11.2, x86, rpi, rpi2, rpi3, bananapi###
-Bastille Manager###<font color="green">RELEASE<br>1.x</font>###bastille-init###mkdir -p -m 0750 bastille && cd bastille && fetch --no-verify-peer https://raw.githubusercontent.com/JRGTH/xigmanas-bastille-extension/master/bastille-init && chmod +x bastille-init && ./bastille-init -o###bastille/postinit###XigmaNAS Bastille Extension<br><br>A ZERO dependency Bastille Jail/Container Manager Extension for XigmaNAS. Containers creation and management made easy!<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=71&t=14848&p=92140#p92140' target='_blank'>XigmaNAS Forum</a>###11.2, x86, rpi, rpi2, rpi3, bananapi###
-NCurses Disk Usage###<font color="green">RELEASE<br>1.x</font>###ncdu-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/ncdu.postinit###NCurses Disk Usage CLI extension<br><br>Ncdu is a disk usage analyzer with an ncurses interface. It is designed to find space hogs on a remote server where you don't have an entire graphical setup available, but it is a useful tool even on regular desktop systems.<br><br>After successful installation you can use NCDU in the system console shell or if you connect via ssh. To start NCDU just enter the command <b>ncdu</b> in the CLI.<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=70&t=13704&hilit=ncdu' target='_blank'>XigmaNAS Forum</a>###rpi, rpi2, rpi3, bananapi###
-Midnight Commander###<font color="green">RELEASE<br>4.x</font>###mc-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/mcommander.postinit###Midnight Commander CLI extension<br><br>GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included.<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='https://www.xigmanas.com/forums/viewtopic.php?f=70&t=187' target='_blank'>XigmaNAS Forum</a>###rpi, rpi2, rpi3, bananapi###
-Htop###<font color="green">RELEASE<br>2.x</font>###htop-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/htop.postinit###htop CLI extension<br><br>htop is an interactive text-mode process viewer for Unix systems. It aims to be a better 'top'.<br><br>After successful installation you can use htop in the system console shell or if you connect via ssh. To start htop just enter the command <b>htop</b> in the CLI.<br><br>Read more ... <a href='https://github.com/hishamhm/htop' target='_blank'>Github</a>###rpi, rpi2, rpi3, bananapi###
+Bastille Manager###<font color="green">RELEASE<br>1.x</font>###bastille-init###mkdir -p -m 0750 bastille && cd bastille && fetch --no-verify-peer https://git.familie-berner.de/Xigmanas/xigmanas-bastille-extension/raw/branch/master/bastille-init && chmod +x bastille-init && ./bastille-init -o###bastille/postinit###XigmaNAS Bastille Extension<br><br>A ZERO dependency Bastille Jail/Container Manager Extension for XigmaNAS. Containers creation and management made easy!<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=71&t=14848&p=92140#p92140' target='_blank'>XigmaNAS Forum</a>###11.2, x86, rpi, rpi2, rpi3, bananapi###
+NCurses Disk Usage###<font color="green">RELEASE<br>1.x</font>###ncdu-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/ncdu.postinit###NCurses Disk Usage CLI extension<br><br>Ncdu is a disk usage analyzer with an ncurses interface. It is designed to find space hogs on a remote server where you don't have an entire graphical setup available, but it is a useful tool even on regular desktop systems.<br><br>After successful installation you can use NCDU in the system console shell or if you connect via ssh. To start NCDU just enter the command <b>ncdu</b> in the CLI.<br><br>Read more ... <a href='https://www.xigmanas.com/forums/viewtopic.php?f=70&t=13704&hilit=ncdu' target='_blank'>XigmaNAS Forum</a>###12.1, rpi, rpi2, rpi3, bananapi###
+Midnight Commander###<font color="green">RELEASE<br>4.x</font>###mc-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/mcommander.postinit###Midnight Commander CLI extension<br><br>GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included.<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='https://www.xigmanas.com/forums/viewtopic.php?f=70&t=187' target='_blank'>XigmaNAS Forum</a>###12.1, rpi, rpi2, rpi3, bananapi###
+Htop###<font color="green">RELEASE<br>2.x</font>###htop-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/htop.postinit###htop CLI extension<br><br>htop is an interactive text-mode process viewer for Unix systems. It aims to be a better 'top'.<br><br>After successful installation you can use htop in the system console shell or if you connect via ssh. To start htop just enter the command <b>htop</b> in the CLI.<br><br>Read more ... <a href='https://github.com/hishamhm/htop' target='_blank'>Github</a>###12.1, rpi, rpi2, rpi3, bananapi###

onebuttoninstaller/onebuttoninstaller-update_extension.php

@@ -44,11 +44,11 @@ $pgtitle = array(gettext("Extensions"), gettext($configuration['appname'])." ".$
 
 if (is_file("{$configuration['rootfolder']}/oneload")) { require_once("{$configuration['rootfolder']}/oneload"); }
 
-$return_val = mwexec("fetch -o {$configuration['rootfolder']}/version_server.txt https://raw.github.com/crestAT/nas4free-{$configName}/master/{$configName}/version.txt", false);
+$return_val = mwexec("fetch -o {§configuration['rootfolder']}/version_server.txt https://git.familie-berner.de/Xigmanas/{$configName}/raw/branch/master/{$configName}/version.txt", false);
 if ($return_val == 0) { 
     $server_version = exec("cat {$configuration['rootfolder']}/version_server.txt"); 
     if ($server_version != $configuration['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 {$configuration['rootfolder']}/release_notes.txt https://raw.github.com/crestAT/nas4free-{$configName}/master/{$configName}/release_notes.txt", false);
+    mwexec("fetch -o {$configuration['rootfolder']}/release_notes.txt https://git.familie-berner.de/Xigmanas/{$configName}/raw/branch/master/{$configName}/release_notes.txt
 }
 else { $server_version = gettext("Unable to retrieve version from server!"); }
 
@@ -62,7 +62,7 @@ if (isset($_POST['ext_remove']) && $_POST['ext_remove']) {
 
 if (isset($_POST['ext_update']) && $_POST['ext_update']) {
 // download installer & install
-    $return_val = mwexec("fetch -vo {$configuration['rootfolder']}/{$configName}-install.php 'https://raw.github.com/crestAT/nas4free-{$configName}/master/{$configName}/{$configName}-install.php'", false);
+    $return_val = mwexec("fetch -vo {$configuration}['rootfolder']}/{configName}-install.php 'https://git.familie-berner.de/Xigmanas/{$configName}/raw/branch/master/{$configName}/{$configName}-install.php'", false);
     if ($return_val == 0) {
         require_once("{$configuration['rootfolder']}/{$configName}-install.php"); 
         header("Refresh:8");;