From 4f8c2385f09615ea7d9290928611def99d927192 Mon Sep 17 00:00:00 2001 From: crestAT Date: Mon, 15 Aug 2016 07:47:46 +0200 Subject: [PATCH] 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 | 8 +++++--- .../ext/onebuttoninstaller-config.php | 2 +- .../locale-obi/de/LC_MESSAGES/nas4free.mo | Bin 7896 -> 9474 bytes .../locale-obi/el/LC_MESSAGES/nas4free.mo | Bin 5434 -> 5434 bytes .../locale-obi/es/LC_MESSAGES/nas4free.mo | Bin 2459 -> 2459 bytes .../locale-obi/fr/LC_MESSAGES/nas4free.mo | Bin 2703 -> 2703 bytes .../locale-obi/it/LC_MESSAGES/nas4free.mo | Bin 2322 -> 2322 bytes .../locale-obi/nl/LC_MESSAGES/nas4free.mo | Bin 2291 -> 2291 bytes .../locale-obi/ro/LC_MESSAGES/nas4free.mo | Bin 2513 -> 2513 bytes .../locale-obi/ru/LC_MESSAGES/nas4free.mo | Bin 3272 -> 3272 bytes .../onebuttoninstaller-install.php | 2 +- .../onebuttoninstaller-stop.php | 2 +- .../onebuttoninstaller_start.php | 2 +- .../onebuttoninstaller_stop.php | 2 +- onebuttoninstaller/release_notes.txt | 1 + onebuttoninstaller/version.txt | 2 +- 16 files changed, 12 insertions(+), 9 deletions(-) diff --git a/OBI.php b/OBI.php index f0a51e5..c4182a4 100644 --- a/OBI.php +++ b/OBI.php @@ -76,12 +76,13 @@ 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 (strpos($config['onebuttoninstaller']['storage_path'], "/mnt/") === false) { + 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 '/mnt/' 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($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); @@ -91,7 +92,7 @@ if (isset($_POST['save']) && $_POST['save']) { } else { $input_errors[] = sprintf(gettext("Installation file %s not found, installation aborted!"), "{$install_dir}onebuttoninstaller/onebuttoninstaller-install.php"); - exit; + return; } mwexec("rm -Rf ext/OBI; rm -f OBI.php", true); header("Location:onebuttoninstaller-config.php"); @@ -107,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"); ?>
@@ -117,7 +119,7 @@ include("fbegin.inc"); ?> /mnt/)."), $pconfig['storage_path'], true, 60);?> -
+ ".gettext("Please use this option only if you know what you are doing!")."", false);?>
"/> "/> diff --git a/onebuttoninstaller/ext/onebuttoninstaller-config.php b/onebuttoninstaller/ext/onebuttoninstaller-config.php index b9f3ddd..625fdeb 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller-config.php +++ b/onebuttoninstaller/ext/onebuttoninstaller-config.php @@ -148,7 +148,7 @@ function enable_change(enable_change) { /mnt/)."), $pconfig['storage_path'], true, 60);?> - + ".gettext("Please use this option only if you know what you are doing!")."", false);?> diff --git a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo index b62fda1424d7ed809033a99e564bee8b1f3543e4..67b08897ccfdf6ad7db8d4e2a969c118b7c1e96d 100644 GIT binary patch delta 2050 zcmYk6U2IfE6vwAazximpwotbP1{K;uwT03aT0x)?8Xlx6f{`lbc6Zvn>F&Md?p?O6 z=%NM_gOcdR2Ng6?gG5dI*auA|FLe9$@HJ$Ox(F-aWhf4>!AkfK48stEOJN<{ z16$z0h49kLbwR7fHHsGZ2u0}Nqax6A-+06WeFXpp=A0V9Dtv|R#-u&h|vYb zaW5Q0k^5mi?P;PgRb7Cxvn#L#MvzAo+Q~;YG6)Z_E(*opG(l^KuRf!441NpO!NDrz zgHJ#Mm$UjTd>Y;fTWgfkZ~!*L!%z}_1-8N8VH0d1TS=r3io!`KiTF?yIS#X{shpy+ z5`FQ5+f zZotj3p&tE*sO(2aj!%6EQB{39%k%Jd+83ZWx(-*s8<3xhFn9=dz_;LwPy%&F7=t_c zNc&MJ^AnKR>NwmBPe;(7O{wd2ptcHeMMZ%yd;~_INIEgwe-eu3O0 z^%o>zwH}kBk=-EHts?4>QxHV%LOCYu=89ZsNpLgPg~>}1C8TVV_di!83CT=KM*%^G zQkC}_!tTX3VyLRvaPWsE$3c$4Ig26-Fe#$KToHwPG1;ILxl6LiAii9PlAuv|7E-+r z+cMiH_e09vm`IAE!Clc%%54P%UpX3ia&pw2`#uZRaB3U~omqD#g z<=-qnSd{y<_?;5ViJCpOLOS5Ie0Zg;f~8r?k` zy7O*zq$q?`jZ4oI<({p%T(Nz4n4QLrlRFx&&mRpBhO!SDM+7kBvbP|cHRjt#Y~v9l z#b#|UrpJu!7(L+4oEu3yqdI0%dSJv7h>e;g<0&g?9DTreQ^t*HdMmqa!gqy!PC+)Rr1`9(O$N6P2lc TI{(wMze~do{%=VvQmFp{YnfK$ delta 1365 zcmX}sOGs346vy%7+osG?b8ONavxl1IXzHZ)P=Y8Ci-IwWijWB;q{mcXWRvA4h(Ir8 zn_5(hqILtdFe;=~kVvbdkczM}LI}yA2Yr9zOb7q>bN_d)_nve9|C#eGuQr6ovy!hE zQP0R{d`vLgj`x!|5TBFHy6_A7a94_12KM6u9K>F{6}w)PYBra7B`(26Y{Yilhz{~+ zFFB-{h3z#bbGYyx^}w&_!rz#MY21~I9&EuXA<(C7U)4~J0q-Hu%!#)ZsBaX!97 zB{qdS@E4ZzerruPqd4n9J@70ZrV9g@$NUf3m0~Vgsq!XNqHP%9z5}TLf56lA!eKmz zFK{)sk=+eEjX_+@L+)T0i+R75ke(M?u>`wO8D7Oo{DiB}ojIGxCZsvmg-YZos`5Tu zf!DAQA0tKDINl`D3B17kB3W+545|(DYzuJW#vm%wUR0&|*|V)JLp{)s+9&O}7Y9&F z_YEo5W@0AgP$lzB)N@L4Df&?z4d8w}l0*NscB5SI;2YHZN9@L=MYD~cn~Y`N$mO*QiILlLn?RCo?_-BRJjf(P@OBxqyOAvKGN#p#x1Cdo|3+H?{mC_ z6Q~D-$Z`aSFob)!=^2iqmd@cTq$PNS<@f=QVP=6@1NNa`pQ93)4s)Up|+Lalodqn@GAH$joe(B`EM6;A&NemkP;ADwVe zC$tQTWeoi=#Y62|!_cznH)<_|Cfag_TB>DIrxg0yY8kcG|D*ZPiQsW>=wxSSFcfko zQ?ExZr%fg}$*$dzL05BP#FH_W;{43&NcYuyeg1~pYNsRH8=urg`m#L<&gR^=PP5w` WX>#vObo`#~$h7BPV&reZ_tbx^J%-x= diff --git a/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo index b554b3f30e500ef72ae25017e8cccc1f7c4e9079..ac3044b928a6e3fac38c9b5cf72b75b0d8b59a23 100644 GIT binary patch delta 33 mcmdm`wM%QmQ4S76Qw0MvD^ugiXE_wuK^$`{gUw$!+;{-8LkYtG delta 33 jcmdm`wM%QmQ4S6RO9caSD^sJ%XE_wup`6WMINW#uvdan1 diff --git a/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo index 35200313cbdef7c669c6fec4d69f176092e8f8b4..5bed3969b7f2d6112fd590301f6bccb38308d2a1 100644 GIT binary patch delta 33 mcmbO&JX?5!1uKW4se*x-m8tP$2UZ1k5XaogaC17V2@3#;)CZ0L delta 33 mcmbO&JX?5!1uKVvrGkOEm8sEW2UZ1k5XZvGU~@XF2@3#;CF$K1-$V6zeH17-k)b_cZp delta 34 mcmbOvG)ZU!6Dx;-rGkOEm8sEWE>;CF$HL0MaI+EX17-k)?gzX8 diff --git a/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo index a391b6fe2b292cd951b9bcd545fa9317b457ed40..6c9d8d9043cd67896fb86e92ef0651bbc5819f8e 100644 GIT binary patch delta 34 mcmew?_*rnnKNb!{Qw0MvD^ugiY^(}kj=7bg!Dchc|vl-dR7iYQw0MvD^ugi+gTOB9CIr}!_D_uU$OxJw+9MC delta 34 ncmX>hc|vl-dR7htO9caSD^sJ%+gTOB91AN0 diff --git a/onebuttoninstaller/onebuttoninstaller_start.php b/onebuttoninstaller/onebuttoninstaller_start.php index f437d93..9729bcc 100644 --- a/onebuttoninstaller/onebuttoninstaller_start.php +++ b/onebuttoninstaller/onebuttoninstaller_start.php @@ -1,5 +1,5 @@ #!/usr/local/bin/php-cgi -f diff --git a/onebuttoninstaller/onebuttoninstaller_stop.php b/onebuttoninstaller/onebuttoninstaller_stop.php index de4509a..819378e 100644 --- a/onebuttoninstaller/onebuttoninstaller_stop.php +++ b/onebuttoninstaller/onebuttoninstaller_stop.php @@ -1,5 +1,5 @@ #!/usr/local/bin/php-cgi -f diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt index b3688d7..8bdef1b 100644 --- a/onebuttoninstaller/release_notes.txt +++ b/onebuttoninstaller/release_notes.txt @@ -1,4 +1,5 @@ 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 diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt index be58634..9e11b32 100644 --- a/onebuttoninstaller/version.txt +++ b/onebuttoninstaller/version.txt @@ -1 +1 @@ -0.3 +0.3.1