From 55cd33286191d5adb884ada002856aa0d6178fcc Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 3 Apr 2023 18:47:58 +0200 Subject: [PATCH 01/10] Add js-system-reset-confirm handler --- app/js/custom.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/js/custom.js b/app/js/custom.js index 3bae9432..77d87dd7 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -322,6 +322,17 @@ $('#ovpn-userpw,#ovpn-certs').on('click', function (e) { } }); +$('#js-system-reset-confirm').on('click', function (e) { + var resetHtml = $('#js-system-reset-confirm').attr('data-message'); + resetHtml += ''; + $('#system-reset-message').html(resetHtml); + $.post('ajax/networking/do_systemreset.php?',function(data){ + var responseText = JSON.parse(data); + $('#system-reset-message').text(responseText); + }); + +}); + $(document).ready(function(){ $("#PanelManual").hide(); }); From bfcb42052480c6a5202c1c2005aab940d30afb65 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 3 Apr 2023 18:48:45 +0200 Subject: [PATCH 02/10] Update w/ reset tab + modal dialog --- templates/system.php | 21 +++++++++++++++++++++ templates/system/reset.php | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 templates/system/reset.php diff --git a/templates/system.php b/templates/system.php index b939930d..409bd2f3 100755 --- a/templates/system.php +++ b/templates/system.php @@ -17,6 +17,7 @@ +
@@ -24,6 +25,7 @@ +
@@ -31,3 +33,22 @@ + + + + diff --git a/templates/system/reset.php b/templates/system/reset.php new file mode 100644 index 00000000..a600ff51 --- /dev/null +++ b/templates/system/reset.php @@ -0,0 +1,19 @@ + +
+

+ + +
+
+ + +
+ +
+
+
+ + +
+ + From 0d0aee916eeb9b500ff9a2c331c1039c7372f8f5 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 4 Apr 2023 22:04:17 +0200 Subject: [PATCH 03/10] Initial commit --- ajax/networking/do_sys_reset.php | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 ajax/networking/do_sys_reset.php diff --git a/ajax/networking/do_sys_reset.php b/ajax/networking/do_sys_reset.php new file mode 100644 index 00000000..b5c65481 --- /dev/null +++ b/ajax/networking/do_sys_reset.php @@ -0,0 +1,34 @@ + $path .'/hostapd.conf', "tmp" => "/tmp/hostapddata", "dest" => RASPI_HOSTAPD_CONFIG), + array("src" => $path .'/dhcpcd.conf', "tmp" => "/tmp/dhcpddata", "dest" => RASPI_DHCPCD_CONFIG), + array("src" => $path .'/090_wlan0.conf', "tmp" => "/tmp/dnsmasqdata", "dest" => RASPI_DNSMASQ_PREFIX.'wlan0.conf'), + array("src" => $path .'/090_raspap.conf', "tmp" => "/tmp/dnsmasqdata", "dest" => RASPI_DNSMASQ_PREFIX.'raspap.conf'), + ); + + foreach ($configs as $config) { + try { + $tmp = file_get_contents($config["src"]); + file_put_contents($config["tmp"], $tmp); + system("sudo cp ".$config["tmp"]. " ".$config["dest"]); + } catch (Exception $e) { + $return = $e->getCode(); + } + } + echo json_encode($return); + +} else { + handleInvalidCSRFToken(); +} + From bde68d8e30648f7a167a60a2362776af994aea45 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 4 Apr 2023 22:05:25 +0200 Subject: [PATCH 04/10] Add system-reset ajax handler --- app/js/custom.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/js/custom.js b/app/js/custom.js index 77d87dd7..d109f080 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -324,13 +324,18 @@ $('#ovpn-userpw,#ovpn-certs').on('click', function (e) { $('#js-system-reset-confirm').on('click', function (e) { var resetHtml = $('#js-system-reset-confirm').attr('data-message'); + var successHtml = $('#js-system-reset-message').attr('data-message'); + var csrfToken = $('meta[name=csrf_token]').attr('content'); resetHtml += ''; $('#system-reset-message').html(resetHtml); - $.post('ajax/networking/do_systemreset.php?',function(data){ - var responseText = JSON.parse(data); - $('#system-reset-message').text(responseText); + $.post('ajax/networking/do_sys_reset.php?',{'csrf_token':csrfToken},function(data){ + setTimeout(function(){ + $('#system-reset-message').text('Reset complete. Restart the hotspot for the changes to take effect.'); + var response = JSON.parse(data); + console.log(response); + //$('#system-reset-message').text(responseText); + },1000); }); - }); $(document).ready(function(){ From 2499c7a71223b2cba122cffa2d5a08553b945791 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 4 Apr 2023 22:06:00 +0200 Subject: [PATCH 05/10] Update modal dialog --- templates/system.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/system.php b/templates/system.php index 409bd2f3..3bc29058 100755 --- a/templates/system.php +++ b/templates/system.php @@ -42,10 +42,10 @@
-
+
- +
From 13a113f7175886587a8a1dd1c4d36847c87e6032 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 4 Apr 2023 22:30:03 +0200 Subject: [PATCH 06/10] Add gettext strings to model data-message fields, error handling --- ajax/networking/do_sys_reset.php | 5 +++-- app/js/custom.js | 25 ++++++++++++++----------- templates/system.php | 4 ++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ajax/networking/do_sys_reset.php b/ajax/networking/do_sys_reset.php index b5c65481..05f36615 100644 --- a/ajax/networking/do_sys_reset.php +++ b/ajax/networking/do_sys_reset.php @@ -25,8 +25,9 @@ if (isset($_POST['csrf_token'])) { } catch (Exception $e) { $return = $e->getCode(); } - } - echo json_encode($return); + } + $jsonData = ['return'=>$return]; + echo json_encode($jsonData); } else { handleInvalidCSRFToken(); diff --git a/app/js/custom.js b/app/js/custom.js index d109f080..6c239840 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -20,7 +20,6 @@ function createNetmaskAddr(bitCount) { function loadSummary(strInterface) { $.post('ajax/networking/get_ip_summary.php',{interface:strInterface},function(data){ jsonData = JSON.parse(data); - console.log(jsonData); if(jsonData['return'] == 0) { $('#'+strInterface+'-summary').html(jsonData['output'].join('
')); } else if(jsonData['return'] == 2) { @@ -323,18 +322,23 @@ $('#ovpn-userpw,#ovpn-certs').on('click', function (e) { }); $('#js-system-reset-confirm').on('click', function (e) { - var resetHtml = $('#js-system-reset-confirm').attr('data-message'); - var successHtml = $('#js-system-reset-message').attr('data-message'); + var progressHtml = $('#js-system-reset-confirm').attr('data-message'); + var successHtml = $('#system-reset-message').attr('data-message'); + var closeHtml = $('#js-system-reset-cancel').attr('data-message'); var csrfToken = $('meta[name=csrf_token]').attr('content'); - resetHtml += ''; - $('#system-reset-message').html(resetHtml); + progressHtml += ''; + $('#system-reset-message').html(progressHtml); $.post('ajax/networking/do_sys_reset.php?',{'csrf_token':csrfToken},function(data){ setTimeout(function(){ - $('#system-reset-message').text('Reset complete. Restart the hotspot for the changes to take effect.'); - var response = JSON.parse(data); - console.log(response); - //$('#system-reset-message').text(responseText); - },1000); + jsonData = JSON.parse(data); + if(jsonData['return'] == 0) { + $('#system-reset-message').text(successHtml); + } else { + $('#system-reset-message').text('Error occured: '+ jsonData['return']); + } + $("#js-system-reset-confirm").hide(); + $("#js-system-reset-cancel").text(closeHtml); + },750); }); }); @@ -480,7 +484,6 @@ window.addEventListener('load', function() { // Loop over them and prevent submission var validation = Array.prototype.filter.call(forms, function(form) { form.addEventListener('submit', function(event) { - //console.log(event.submitter); if (form.checkValidity() === false) { event.preventDefault(); event.stopPropagation(); diff --git a/templates/system.php b/templates/system.php index 3bc29058..65a3834e 100755 --- a/templates/system.php +++ b/templates/system.php @@ -42,10 +42,10 @@
-
+
" id="system-reset-message">
- +
From 8f3ae2b37639e01ae9dd236e93a7ad3eea336511 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 4 Apr 2023 22:36:51 +0200 Subject: [PATCH 07/10] Update en_US locale messages + compile .mo --- locale/en_US/LC_MESSAGES/messages.mo | Bin 32033 -> 33297 bytes locale/en_US/LC_MESSAGES/messages.po | 30 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index c1a7c5c714ab4d28411fff52fcf1861ade31a281..f09cac63b515dc159f77d031e26292d4ceae62aa 100644 GIT binary patch literal 33297 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 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index fd1ff0c1..69cc7fd8 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -758,6 +758,36 @@ msgstr "OS" msgid "Kernel" msgstr "Kernel" +msgid "System reset" +msgstr "System reset" + +msgid "Reset RaspAP to its initial configuration? This action cannot be undone." +msgstr "Reset RaspAP to its initial configuration? This action cannot be undone." + +msgid "Reset complete. Restart the hotspot for the changes to take effect." +msgstr "Reset complete. Restart the hotspot for the changes to take effect." + +msgid "System reset in progress..." +msgstr "System reset in progress..." + +msgid "Reset" +msgstr "Reset" + +msgid "Restore settings" +msgstr "Restore settings" + +msgid "To reset RaspAP to its initial configuration, click or tap the button below." +msgstr "To reset RaspAP to its initial configuration, click or tap the button below." + +msgid "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." +msgstr "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." + +msgid "Perform reset" +msgstr "Perform reset" + +msgid "Restores all access point (AP) service settings to their default values. This applies to hostapd, dhcpcd and dnsmasq." +msgstr "Restores all access point (AP) service settings to their default values. This applies to hostapd, dhcpcd and dnsmasq." + #: includes/themes.php msgid "Theme settings" msgstr "Theme settings" From 4bf83d4411b73382fcd9306d50a97da3dc1cd402 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 5 Apr 2023 08:59:51 +0200 Subject: [PATCH 08/10] Update label w/ relevant doc link --- locale/en_US/LC_MESSAGES/messages.mo | Bin 33297 -> 33293 bytes locale/en_US/LC_MESSAGES/messages.po | 4 ++-- templates/system/reset.php | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index f09cac63b515dc159f77d031e26292d4ceae62aa..29a59abf3d6e8ee57586b59e3544f188df7489ea 100644 GIT binary patch delta 3824 zcmZ|Rc~F-{9LMnmMdcC&1W}Bih@gU_m}MAVqoSyQ;(-SqXow_`ig~5}#Gu3}(^98H z^O#Y*@&F>!8BOx23?nnm@yMoW#?aKJ$uUUn{o&bv`|Gv4&px}~?|1k4!G>bbw~IXw zXZpHF7-Mor8Pggot!FWa{!iEv?_w}EU;wsCF~%2N*bd_`3WuTA$-`#25`C})!*D(7 zy?vTZ--tC5Aw z4b(b!txYpnlYThrc_iv6<57tW!a(*n$@W1ert%;UmDzFYY1AdGL6!It>Jt89$6HKv z#sg3bhocgR!VnyYI`a%1hFPe~ycYx5-(0s7?xOC(LtKm=lbjMRMMYkMT5uEU79YSV z_#GZD*Xsl1*W6+D?kNwPko);BO1!ght;%EC@PZ})OZh!!$j2C=A!16 zVhnzOt?(2k;YHL@g=I1qpGVz=?WlkbpzheIOyW_-XBbchwRXZ~RD^d>&;Q0YXr?+F zhhQxv3EZ5s8^SUT#MjzU!=A63y67>e(pN?(QwqzW6q0!*i0>!xA&zB|n@=2etQHi?`(opF> zLuFipVR#F*Ks{<>zicPtY*Z%2s0`PmDz*nB@Fc1-KVuL+K~*MjwsVw`sDQg;Gu_8+ zG<4Rxu_+!#E%>P&|JL>|qXPT`6}icAO7D%zyc;&dUZ{i;P~oz&S)trgHqJ@`9A8bw^;X}?nWj0-~~H=6&2ubwtp9ORF6=V@SW=%kqZ@Y z7u5U#bE&^JPGZ0ZC!iwE!gg4I%Cr=f(Yx3jKSy1zQ>YDowAP_Ec#54cB+r<(*cX-9 zSk&h?6FqTW9`*O5QOJNkk5w3lTTmN)jau+~R7ST^rE5S1?w9XWDjb!73l(rI>N596 z%}YRkOhyHqfxejMrlE;T@HJe49q=F2LZJoDEq9>;7=+0<4pqXBQ5)~VmUtKy;7KgR zT2vxKUU3o~g<5|S>Mpq#)6k16Pz%0=D(!p7r)$dWxc@xogmwpI4`!vuJofZ7DuC= zFGnS^4wdm%48&ci3LQlS_$7|VAJC=mzbkdp5sW~6*J-GY=c6AkLoNI!YJttT3U{Lx zj#=mg&5cI}$)cj04o@ZT#I{P))`2BCBp%?a`GATzbbQ-n6MN}X+P=VE<0{Y92 zds1gT55PbSN4?hrwNYQ}hDjKX^R4U9ty1l$p|h_*EpQCmU=8Yf{}r{tW7JpTv&fkj zjS3_ImB4VEg6Wum2Qd|IV-oh^znY=A64UYYV(LGVM(7fLm2ehn!9zFzPvAg&g2^~w zDZdR^iYa&phhf4pXW=3&rhg8{;wV0;X}BE~$W!FhOzLuu8>^Rd{wlfu3daZxq92b6 zWGDvXIMi9@qDs0H^#fIcQMeto&KXoCub__LCWhhfsP~$zbk++%&5Lr=(3!@fO5Pi_ z@CZ908+*~u!)V-w`m=i$70^x85#B>x;)ke>8c>NeC&BjE9`!e+52oQ{+jsAy5ywD{ zwI20C%qnMt!KlkP7PV0p>Ul2q#1gE+DpUaZMNWVVtZPx@J5hI}4Ex~`q(be?eHvQ0 z-s-v9`EB;8xEglIi(l!AwGjm#p1B?s^{zK!gA%h`a~5RJ?ibm)FtUH=!o(g~{VN_U O@90%gHKz0bKm89Y=KOg8 delta 3792 zcmYM$c~F-{9LMnoU3y{ zlY(c0WTrEkWNDd7W}4%XP1B5nWI9a_dG!9UJJUbDcK3On-S79iyFYxV)O};A`=N=x zt`UyoyyA5chsH5iVYP~YuC z&3AO9<7#^GJOj-cxQwBA12yqO)I3UB-bF(t+J>6A+`1Rt=~rPNHzvn8`t@0q7ehyzttrJ0^f#j)R--C&3RTf- zwtolNJ*N@L!AZ?#8_~6uhDue5%D4ubVI68KuAnBYM+N9HhV0M}wLm8f!UTK?2VoSh zLd{!_t?(eKg0o9=zokujZfcIF(X^&B;Kn7ZKF^v8KY=>{7&PIi`7MaMog_@_q z>NU=BJn2WGp2wiJvKK0mAsEd1&T#u657T*2h|27Q^$h9|UO<)j3hEI4X2*SU%y}c)^~2&7aCA!;SnyvX1S(>%TST8K~1<7b&3z*1iXaG zwA*-NFVx=lN0ojAssd9`>lL8_y05F$FK9wyNz!ep|2~>MZO;1#|#)#!gQp9%cLu1InPzzHk*4;XTyze=ro?Cz*xY zU@84L)Yj}rJ+H=Ic+QSLMJ?=^XMTW!P=_xb6>w%A_0V2VWuPk-ph~<2Rl@zKj80-C zdQUd*$D;a4*a6c~6`6yos0&-;MpWr5P=Or9rdxnn^y~DZ!~O333MZUq>=eg2j2|NB z%gLC^&noUlj)n6V_QPS*jH_@i{o|-DOPp>3>5B>^1(j(Iw#9r@qHm!RcO9ak(tUx- z_yUIG9n=JmQ40smFd5H8WwIKT;U-kYDlrOAp(^t$hM@DR38)onD`QXrC!v?l<0mw< z*L%ZZX`&Ur`{)vj*eWoeBFDml{^upe#gpyGUW}*)9L~B0A(qD*Cx(^>U zHMsBA8`y&vp4fiUYo>G=sLTqmBd$XQz7Mrv4Qj8yN1gKPs6_6gD(RhXDiMwv?}8z$ z@4P^xIc8%VPD0)9)z|_nP?=SsCmut+e-bs(S=0izQ5io#W%vY@dCco3fgY&mBeCgB zVAK82r=iok43$9{>VCeD+UxDsO4Qk?K_9$m$FHLT{KNJeP+QfAs)T=m*`jDvz+F-A z4=$koS~!gXAIw2TJPjkT2$g9WDx-JN8^1&yuG6Rmezw-57I2%zA0}*rZEyf8u`#IY zHyzz^-Yn|xM`Hm4x*jVr0k@+T`VKYWkEo39qDuD!6?njGQ>jQ)0@0{|yP*zqU(|ca z=#Rru0q3GG7P@HY#ih6m)o+jgq9zJ2G^aco6~GW2iephF{1~rrc+5gQUx7+w z11jSk7>v776*`6r@M|1{KVb*m|9I-8Ef|5i*O{n==c6AMqb6R9nqV82;2zY(UEVMO z^hRZtf-Nu`^?sfmFSHh;_I@2U-Ty5#^g$&mlWNpNXHW}VMg?*U6<9qgpug?72X)r- zAPmMx)OS5l3k|@on1=0ezI6k-RI2?nwD(6)6CB4-ynwpzzoQm-hPoww3(b3Rs6diY z2@Jytn2r7M5T@f@Ou_#AujXYe!7Mzpi24tw5x$tKfiqAOeumHENqhmFCFax*M*c85 zWjGS=VJapsH50GGQu=3cG^TT<@^B|A5VvA;D@Nf6`nAREze*mo+}H_2==VVdG89{3 z4r(uFqe{9Q^#ipQV{jL0p0lV*UPo=g9Sp~NsPDX2nE66b@5Q-jXit++CGUrtINiRG zk3H!ZVJw!T{_LJZ1#}0sg%41NxDmC`GgKnJB&aQmLj6ri#thVdeAIUxppii1lJzO- zgZL7&Kq~4mjzcXp1ND41cE`0?gU3(-%ze`YxX`*DHU25;jO@jMcm%0Xg!7PwCVp!5 uT4{cp1FEitAM|w3cdJ?#Rp{oPxLDQ diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 69cc7fd8..a010cdde 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -776,8 +776,8 @@ msgstr "Reset" msgid "Restore settings" msgstr "Restore settings" -msgid "To reset RaspAP to its initial configuration, click or tap the button below." -msgstr "To reset RaspAP to its initial configuration, click or tap the button below." +msgid "To reset RaspAP to its %s, click or tap the button below." +msgstr "To reset RaspAP to its %s, click or tap the button below." msgid "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." msgstr "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." diff --git a/templates/system/reset.php b/templates/system/reset.php index a600ff51..d0869435 100644 --- a/templates/system/reset.php +++ b/templates/system/reset.php @@ -5,7 +5,9 @@
- +
From 7b43f64e87b242df29111d431c2aa4da0176671b Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 5 Apr 2023 17:03:12 +0200 Subject: [PATCH 09/10] Code scan fix: escape text before interpreting as html --- app/js/custom.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/custom.js b/app/js/custom.js index 6c239840..40e181bc 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -322,11 +322,11 @@ $('#ovpn-userpw,#ovpn-certs').on('click', function (e) { }); $('#js-system-reset-confirm').on('click', function (e) { - var progressHtml = $('#js-system-reset-confirm').attr('data-message'); + var progressText = $('#js-system-reset-confirm').attr('data-message'); var successHtml = $('#system-reset-message').attr('data-message'); var closeHtml = $('#js-system-reset-cancel').attr('data-message'); var csrfToken = $('meta[name=csrf_token]').attr('content'); - progressHtml += ''; + var progressHtml = $('
').text(progressText).html() + ''; $('#system-reset-message').html(progressHtml); $.post('ajax/networking/do_sys_reset.php?',{'csrf_token':csrfToken},function(data){ setTimeout(function(){ From 11278542d1cdfac5909b3e038d06d308bf8e9a90 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 5 Apr 2023 20:11:37 +0200 Subject: [PATCH 10/10] Update label + en_US locale message --- locale/en_US/LC_MESSAGES/messages.mo | Bin 33293 -> 33331 bytes locale/en_US/LC_MESSAGES/messages.po | 5 ++--- templates/system/reset.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 29a59abf3d6e8ee57586b59e3544f188df7489ea..a534b42432dd25fa3bcd2b8f6a5b8ec7a562fe82 100644 GIT binary patch delta 3822 zcmZ|Rdvwor9LMpGnK84?Zf-OCxeYVNvX;m#xkQ^~XfAUZMn9KL%x$f{Q#+i(K@=zJ zI8x!L$mB4$#9R_5B9TN(62~Q->g0@`uYErM_SfU{`Fua$&*%Mqe?H&ewzMRmtR!Gt zc8E9H7~@YfCIXK-FJKh?n;3?VFdDxCsMs8)~D^QHdPH zSUiU<@E&GhbcSaKCelk{V3BhN>V>Nqj#U_nq0ifmVo}dqVlwu`oj3y(K%2ofz$9lM z)Oa=qV-9x5sU8iLXfrB<9nQTNK>skN*5GKcE&ZxYWAZRzh&`IO(MSIStcMk-%A7$} z^mo_4kDQ_j8EP{hj*;}eO*B-hJ*bS1Voj_>9mRFjf>o#hV}=>i0OL>_JdP3A9s6Jg z#^Wl~x;ro$zd%*+9Jai;Dv_ZW$^ItWJ;=vFJn&GNopPQ>-R3K(5?@DM!av=3>~K5Y z0<~~QR05r`0S-Z(`4sGr1*prs7sJ`#+;I~gq3%NP2xI1AG^&J4P?4`eEw~AFix1!^ z{27&LkCE0ssIwi2D*b3w1!ki5TYw6v1}}R$yAT@6EDp6%A}W)vZoD@p(a%7gZ4qi- zDYn6nu|A%~es~RaR7u(Vw%`C%B4wz64xsMX*=*ub#@{ob3@Y7(8>k2$qMp~`S1Jah zP#d?y66}IHn*Hv11*Xvd!HtKHu^TtQ#*DW>UA}IpfX9!a9y;q;3?yO^s>B;nCESn7 z=rlINMq};#&ZvGb^x;@kV8y74F2{!WKC1NPs0tj%>aPGZ=~sF*4Bz(?DKs$wFo7$5<>xCHf93aql1v zmG&!C##d0Kx{q2QG}mq%kIHx+DwEZy3^$-Ewg=v)+w?cnG!NF*p8`>)${HXeQgpqtHjUDJt{s7=(RM38kSn9FMx()18HwKz|X& z>wEaLy21DEyp4}BA?!t)Q7=^K#-TDR!sfUZ75F~XhDT9n{Uhp@-$Er)!*46u2&=y? z)Oc5nVt+H3Mjgz>wwQxd(MOj$&QB>c(%O0{qAIAEAyaWU8%1GptQN z1r_j9sQH;wslPTJ!9ZQ~qarTACb$5VX({T=K140_HR^JmMV0zDXBBFL$Z7m(#&*~U z(@}{{LVbR-F#unmM*Zv2Sjd1%v=WnWD{7-ls0DvPW%K}5y0GcCV)3X-bwnkQf(p0? z>N597C76bxn2ic}3WlKP(a^-j_%bfXIINdv7fM7Q{S;IHLva93MwRe0)W*9o3=g3K zJcF~a5|v0+zD;y2YW-=byX3t|LoY5zEw~O<+K-S=*p$0*-wgXg8+?}W4)_etLCr76 za6EWI9)Qj!09d^O? zIKe$%hDu~TD&uV!iMvo0I)MuCI~<0;qEFv{H|nG#7>)X_$D=kb!Fsq9weY*B1vXzZR>%|BW>C!XAvk3e-a9Q5#%C1#%Y^SQRRu zAnL2}7-tKNq~8(sUT@S!>6nNkuql=}*Q2LW?Wdu$KZ07|B*x$s)c5`uYNPsd>{k+p zn%4ytNE#}EQ8)^7u?rr=LHGds;XwYY>5D5c6VK13{?E}!oM)st zw>}ed=$B$TKE(c*R%jPqg(dVa;t(9mCp8AkP=Q1i*{>o8`4_>QE8_fB@|0KH8DbRu zEL0#Iec~wG|9Uz1I%4UMgzdK#zvbbTF#q zBT);_a1$0|C;D$;0#=~@?A}5J6i5O(!f4bbZi?EdIVzD37>iG%{-%t^3@mni?;9FP z4BU76itP*Os15w6%Qzpk(IV7>%P<+Y;7+`R3Si{|8{it}Hq`hr)EzmA-SIq9p(ZBg zHM_9S*%kwski7Cj|fu?_A&lEe}O+|nr}jW-X#Cz*)wwr{P}rh O%hIxv|MyYrTK@sT&H~i{ delta 3789 zcmX}uc~F-{9LMqXr=W5R2yz&R2q-uTS%z8ah$t$cc;JBtnh}ZQl~>|V3?^~PERX5X zJZ2O;G6f>j8BO!3Od~VR@yMoW#*nn8$qZ6^e|UEK>$SVjKD*!VclY^0O_}SBGS`7T zZ})IxOyNjlI$*8!GzQWC0sXKMgRvR?F(A_zZ;ZxpOu|?kidv@#J#htkVL683I@Ei6 zQ0vuY8h6XYvkbIj-~x8UtEh$lKrQ5xWlRbNVH~DoD9%9zRE}+NBeuaUsEu}@64{Rt zcmiYa24-WcY_~HonqCqE3$5ExFPukzY(QUZLT%J;l=D0Qd(%(CI-G(EAb7MBV3;)- zHJ*X(F$&qYq2%fqmJStYQY9nfUa@IgrFB{gD%(sdte&& z$0#gCt-BqA@k3MvPhdB!M?dyA_h@JXkMYKI#?Gifp0?&<2>k^ZiEB`Iqtbc;S;$;R zt&|P)C`JN@NfQvcJi&5AraJ2SupNj#y8kF5x*;i7%oq;ZJtF-2`Xc zAGL5KDuGxG!GWkV&&8pbkGjme(VzXzH9MgZbr)+rFsM4@XsC8fw2{R6uvs*V)~tq0GEkO&f)xGKoix_rfIXk2>2z)VvCe z$9FLRk7GJsKpjePmIQqsEW)%RkQ>{@l90eD^Y>eVar#5IrQt@Gz{N&*XhQ*Ofxp0Ebu+# zewoY}Tu|JJTnlp-pTc1?9ZPW@{llmuOM1=;qz@{PG*qVJF#-!viN1H&F{Tp*HrJ0?PtyeLb3C*_O^984LnW)SPu?wz71-=KhVJ+&cze3&eE2u>7pepH6=u{#UH6D*a z>~Ef>(GGJk0Vkur?=ozUm8i@Pq6Z#A%|D7-=nQIu8>ozbM`hTI$~@*pCxKq5=OeJ? zPGHOTUqC}=v=o&=1?u~J2X)q)tyQSIQHx%9-i}{E1^A2YH=>T}KB^Mlvz;S~Mg^RJ znm=GR_1DJf40z#qRK)ohj>V`GE} zeSS00g>#FjzYmQC4CwP%iAlH_wb7TT1;0gQbPH9wW>nxlbDT;=q7sNk1)PYw%zaSv zQqdPPPyy$nHx{{RXyOul1xv6q{)1X5wAi`j(Wn3hVFr#xmGA@9#yimu51;}(h6}JB zl}Or4PNE}G>rX`8CHG<)da(qx;OnT;u17vyQ)$P2=Q=M0<1og8)Bg-rfd|+DJ?A?wcEaxT<1i6Np`I^C zC9)Qk@fHlkou~>OLIwCaj>GRTTHk+n>ZBtWj{2^%Q5(-gA6$l7_%+l5n{XxWLM z& zl8Q=T7*566Sd$+H~^30KzxW9IAAHi z4OoGhcpHae>N02HQY@o?2FKt?KB=j=4Hd{Eoa*i8MEa&`Ha^DiiC=8;Xj0$83 z2IE-NSr(#7x)k*TRgST^4YkfGR3$H?j^GA{;jgIoTCZ@{^GD5#b<@z9CZbB-2et5U zJ7E^4&@aL`+=}|Mdm0tc4b&0dL0#f|sEwLYiL@ob2#i4eP3eo-ILY?iduSvvaL(F< zdLe$Lv%z50WgLUrC?EB_5PM@e)?pngfH|d3fb*?uP~$sLccc=Z!GlPJ!p&V8TDZyT tTIKvUd#%3`_BTJ$H5bC;JY9vYYMP?gC%U>VsPQZ5=23HIbjtso{{VDu@rM8a diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index a010cdde..2a4672c8 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -776,8 +776,8 @@ msgstr "Reset" msgid "Restore settings" msgstr "Restore settings" -msgid "To reset RaspAP to its %s, click or tap the button below." -msgstr "To reset RaspAP to its %s, click or tap the button below." +msgid "To reset RaspAP to its initial configuration, click or tap the button below." +msgstr "To reset RaspAP to its initial configuration, click or tap the button below." msgid "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." msgstr "Custom files for optional components such as Ad Blocking, WireGuard or OpenVPN will remain on the system." @@ -788,7 +788,6 @@ msgstr "Perform reset" msgid "Restores all access point (AP) service settings to their default values. This applies to hostapd, dhcpcd and dnsmasq." msgstr "Restores all access point (AP) service settings to their default values. This applies to hostapd, dhcpcd and dnsmasq." -#: includes/themes.php msgid "Theme settings" msgstr "Theme settings" diff --git a/templates/system/reset.php b/templates/system/reset.php index d0869435..bb598059 100644 --- a/templates/system/reset.php +++ b/templates/system/reset.php @@ -6,7 +6,7 @@
@@ -14,7 +14,7 @@
- +