From c8a9c05d3e66c1c92b8995054e463d335f41ef6c Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Thu, 29 Apr 2021 23:56:40 +0200 Subject: [PATCH 01/11] Add handler for wpa_reinit --- includes/configure_client.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/configure_client.php b/includes/configure_client.php index 1bfc1576..ae25eb98 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -19,6 +19,10 @@ function DisplayWPAConfig() $result = 0; exec('sudo wpa_cli -i ' . $_SESSION['wifi_client_interface'] . ' select_network '.strval($_POST['connect'])); $status->addMessage('New network selected', 'success'); + } elseif (isset($_POST['wpa_reinit'])) { + $force_remove=true; + $result = reinitializeWPA($force_remove); + $status->addMessage($result, 'info'); } elseif (isset($_POST['client_settings'])) { $tmp_networks = $networks; if ($wpa_file = fopen('/tmp/wifidata', 'w')) { From 3451efe132d76bde6fa56c5b4bddf7c536ef5c29 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Thu, 29 Apr 2021 23:58:46 +0200 Subject: [PATCH 02/11] Create reinitializeWPA() --- includes/wifi_functions.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index 8296c57c..a241fa02 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -157,3 +157,18 @@ function getWifiInterface() } } +/* + * Reinitializes wpa_supplicant for the wifi client interface + * + * @param boolean $force + */ +function reinitializeWPA($force) +{ + if ($force == true) { + $cmd = escapeshellcmd("/bin/rm /var/run/wpa_supplicant/".$_SESSION['wifi_client_interface']); + $result = exec($cmd); + } + $cmd = escapeshellcmd("sudo /sbin/wpa_supplicant -B -Dnl80211 -Dwext c/etc/wpa_supplicant/wpa_supplicant.conf -i". $_SESSION['wifi_client_interface']); + $result = shell_exec($cmd); + return $result; +} From 0bb9d6c1965668b5fc2ce113130a06fa1cb263af Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Fri, 30 Apr 2021 00:00:25 +0200 Subject: [PATCH 03/11] Update with /sbin/wpa_supplicant --- installers/raspap.sudoers | 1 + 1 file changed, 1 insertion(+) diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 00e1d1c7..8821f595 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -4,6 +4,7 @@ www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wpa_supplicant/wpa_supplicant.conf www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wpa_supplicant/wpa_supplicant-wlan[0-9].conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant-wlan[0-9].conf +www-data ALL=(ALL) NOPASSWD:/sbin/wpa_supplicant -B -Dnl80211 -Dwext -c/etc/wpa_supplicant/wpa_supplicant.conf -iwlan[0-9] www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan_results www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] reconfigure From 79393c48d0471ac804677d40a169c670d1405eb7 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Fri, 30 Apr 2021 00:05:19 +0200 Subject: [PATCH 04/11] Add reinitialize message on scan failure --- templates/wifi_stations.php | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index 2a6872cc..9f10ccdd 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -2,6 +2,7 @@

+

wpa_supplicant.') ?>

Date: Fri, 30 Apr 2021 08:37:41 +0100 Subject: [PATCH 05/11] Add status msg, update shell cmds --- includes/configure_client.php | 1 + includes/wifi_functions.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/configure_client.php b/includes/configure_client.php index ae25eb98..b9677aa6 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -20,6 +20,7 @@ function DisplayWPAConfig() exec('sudo wpa_cli -i ' . $_SESSION['wifi_client_interface'] . ' select_network '.strval($_POST['connect'])); $status->addMessage('New network selected', 'success'); } elseif (isset($_POST['wpa_reinit'])) { + $status->addMessage('Re-initializing wpa_supplicant', 'info', false); $force_remove=true; $result = reinitializeWPA($force_remove); $status->addMessage($result, 'info'); diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index a241fa02..8cea0541 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -165,10 +165,11 @@ function getWifiInterface() function reinitializeWPA($force) { if ($force == true) { - $cmd = escapeshellcmd("/bin/rm /var/run/wpa_supplicant/".$_SESSION['wifi_client_interface']); - $result = exec($cmd); + $cmd = escapeshellcmd("sudo /bin/rm /var/run/wpa_supplicant/".$_SESSION['wifi_client_interface']); + $result = exec($cmd); } - $cmd = escapeshellcmd("sudo /sbin/wpa_supplicant -B -Dnl80211 -Dwext c/etc/wpa_supplicant/wpa_supplicant.conf -i". $_SESSION['wifi_client_interface']); + $cmd = escapeshellcmd("sudo /sbin/wpa_supplicant -B -Dnl80211 -c/etc/wpa_supplicant/wpa_supplicant.conf -i". $_SESSION['wifi_client_interface']); $result = shell_exec($cmd); return $result; } + From 56abf95c5b521ff862d43331959a4210d6774ff7 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 30 Apr 2021 08:38:16 +0100 Subject: [PATCH 06/11] Fixup sudoers for wpa_supplicant --- installers/raspap.sudoers | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 8821f595..60759f3d 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -4,7 +4,8 @@ www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wpa_supplicant/wpa_supplicant.conf www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wpa_supplicant/wpa_supplicant-wlan[0-9].conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant-wlan[0-9].conf -www-data ALL=(ALL) NOPASSWD:/sbin/wpa_supplicant -B -Dnl80211 -Dwext -c/etc/wpa_supplicant/wpa_supplicant.conf -iwlan[0-9] +www-data ALL=(ALL) NOPASSWD:/sbin/wpa_supplicant -B -Dnl80211 -c/etc/wpa_supplicant/wpa_supplicant.conf -iwlan[0-9] +www-data ALL=(ALL) NOPASSWD:/bin/rm /var/run/wpa_supplicant/wlan[0-9] www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan_results www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] reconfigure From d1fdbd9f2589b0c17dafe3eff0ab1ad9ba4013c6 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 30 Apr 2021 08:38:49 +0100 Subject: [PATCH 07/11] Add wpa_reinit button to template --- templates/wifi_stations.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index 9f10ccdd..7acfc7b5 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -2,7 +2,15 @@

-

wpa_supplicant.') ?>

+

wpa_supplicant.') ?>

+
+ + +
+ " /> +
+ +
Date: Fri, 30 Apr 2021 14:40:13 +0100 Subject: [PATCH 08/11] Update en_US messages --- locale/en_US/LC_MESSAGES/messages.mo | Bin 17365 -> 18097 bytes locale/en_US/LC_MESSAGES/messages.po | 15 +++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 34d53bd3567d76aca246ffff641444300801299f..8cc789ef03e367f7633c868a0299a5a53e73ad8f 100644 GIT binary patch literal 18097 zcmeI2d7K_ana3MQ2t-f_qKJSMgdCWeOcKr^M3R|=jAkao%!Ei(V$b{b%(UsZ`{nI^ zXEH=Y6xZcYTm@0rI{5 zl^@l6gX8T`_x}hU4*%jf=P-L;8zjqH4rjt4m%j-o0>EpAwW_ zlkg&VG29nElgd%eI}{!Z7em=)13V6%1J(bFq3n1qTmx@{N5Q{3KJQ4+Go(+3>fhN= z6h21!a%@jn(&HsQTtYwYLn)4g*m2p97`e zIOJCE%~0h&3e~@FK-uFva0Yx3s{F%H`H#EwK67pV4u|T08|0FAB9uNGq3YWVWzP|) z@q3Nq#c&?!cR=ZJo8yCyPeS$o$fND`^^hU(5-5Eyh0^CkQ1#yoWw)GcUe*AT~4}1tppNFCP^&2((9o4c6<+o>h}sLJ=Z~v=LVNQ3Kx>DyZmdQ+WiEa1-}T@pSz&+ z{~=U+KZ9!L&k&dO{svY5kqc};=0UZy466OrQ2sUO(yw&f0%gxhsQ$eXs@%Jv?!O-D z{#&5h-wtJ`Z^HfH4_$hPvTcPy% z8kGL`LizIpF8}v%Khlpu&4ayg+NJOasP%0<)VPeoXTS-l_TB*H=T||^^PAv$_3a{9J6DSq^3I)lhcZ2xaF8 z>b`AI^}gNlV^H^h9m<{$J3a|@-(gGaee>XvsQx|*b>EXv`pjeyrN>-&20R(^-+LWDvhPh${%{+VeeQy4|GQ9n?Qr}htdV{c z9t=y%YVF33z)Rs8cs11e`BTRkC))M(g;4$L zh8owipvEPJnAAHTDsK1~{3NFzKgq@oC4vUU4WHvj_V^Q&zE42acfcvOy`!M)a2izo zJ@7fuhuW{VLh1ERsQ!H#${t^UnlE=jmA~8N?{MkgLiKNEr|th?(2$-BrOzs;`d$JL zg=a$f%cx@p=aIe;N{<^H?{fSFRR8xo)n4y}@~=%$`i?{Cc_mc+*Ff3r7WiyYpvG+;TmTnCttT&os&|{a{zj;J-U3z6`=I>f(@_2SGJHO~$6fyw zR69>X>2u&|*8WF0E`ZM?|9Gf+`dt3mQ1%L->=!|`n?aSk6so;#I=u+zsVd z_d)r|4k&#dfd>8o>b^r>Y{zRJRR2~(-MGe0L@%2u({ay&A=SfiGc{-Fm2H-;YDyaNRpxS*8lwKc( z>d#G3`riT7-n~%m{20!KKZB}&zm>Kh2Se3&6jVDMQ2w>TrPn&11!d1NRR5|_+e z=JGFtvd1-0dfn*Kw?d!voltSZ!Y&&(Brqkt9ZLU`x-EO4`uB3E`Vx2yd@WSD>!I|y z1xo+VL;3TaF8=|j{{94N9{d_Eg|lc}>su$(xC}t`dl;&{7|PFI508dd!}ah>E`9JC zd*AU;cJ79<&j6eOH$m0E*>S??f8DUH|ZPUUQp-Kvkl3|0bYRo7I`hA zx*4MU7;uz*HX~J+rYi5hk-ez!!|;d5RmjcA=aD}mI%LN?klU1S#|Zp|JO3H{E;7%h z?}o2LSSq|XxV+Cf?g{si`5WX_2-7PchYY?BIR+U2-}Z7%&&_+DfKvJ9Dt==fLU5BZt(ga2{or^5?0>dlC85*~kzwifCTwco%XV@+k5JjQ_cG;qGKPVj$ESz#|Myo zkt>mxBN6gRL_VbBEyxW>A955j7wJTPggky>Hu4?hPNW~v@m1v2$UBta zSZ9&%t&eklo=Xe+VBc-+S#qp#&`2_roJO3R#)t$HE<0Otn<{;h3Pml|d2M`^4-}i5@ z2N^?tk35Fx_=bh|LAV`xr%P{yJCOOv$B^TZ{SX}n(K_;FM8`{zc4S}LN#TviQ^*UE z6Ord5FF+1LV&uoj_mMM^>yfV@*CG?h0m!!y9f^ha7dQjC6gdpJ3%Lh*De`GVi^&^7 zP3P`-J3JqG0{HdEdJK5jyGWb?x z1@cjs_j<=u9Je^0>)0zUA70VZKYqLkw)&N76m%|MJiNkmwCDfKuwNca(yYCdRJ`SB zR!id16@5vjQZ8jSuI@K}sT8ECsU~5ZrN*yT1HWec)XZOB4dVIjX24IYEBj432~ra$ znJLw4wII%-Nt4#A)ucvF630O)3*%9fC92b-e6L?JE6e2?b$cs^lX~VV@>WuEJTTpB zyZTKO_-VlPvRM@+r7hIJxnIqKn(65;Za0HLrpi^WEHP>3XJM(OiafVorCWhtG2MNG zCJk!iK~4EqgK{N|P1R4+iKJFG^=jGA0#!Ed$EB7N?kn1g&?2T(UfrOpu3A;U8)dRA zs8oxNqZP&&T0h{e+(Z6YlBLxo+vBwaOOIFM-L56oJyu8dRJC!bQCU43W1PYgwo0gb zr)0AatNb)9dHHWkX5cfZ29KcMe&nqRvl^!G@==PyG;1kZ3(KQH*)Zglq)d^W(Lbb~b-w0m9s8_c@IFXtyi zSljCw^W)LL42=bqAWy_W1d}ACPBSb&$~COklJT&N4>Yc6HlV387)qwdvV@yw62KWd0k1A(48b62}kR=wPAow#oxL) zu2(kWeGI*Z+9V_R2k9y%$4sUijQI5^%Pmgvuu`vRSeABloYZc5MvQ!T(x7d}qP)sR zdG$4rzIK9RyY65-WVvX`8A_B$lSum2iuTi0o@#?8R8nm3^&NxO=)1uVvEO-W!V8W-qToabUTuT|7!ANWm@jnd3 zpfj+6?#AvoI;%AOh9~0R`J#k_L{Tzf3;Xe;nHUSRAg%hi-+~-zZYqB`U6_xZhFfhJ z&7XFZhyvzhcSxrKvo?sL3N2MJYK45P+8w5vc+P#xq|!7gZKlo5erbzy;Gz^(h|`Ln zo~z|Ncd&fjD3(eV`+T1msYkM>D~cCsU~2U^&dt=!Ze%5SiK6jP3u?Z6<1_3~DZR&I zgRRU@Q<8-k`?Hil;T>NSEjJ$HGH zA4S9TTthWzw~+Puj428|OB)&qH&dgqr@CMt7B8)ohq2@2HAcv#Eo zeq=^jbMR#a1MPNW)uO_>S_`F%C=M14p%Bsw`MlIZ{-YBSn+0`;(33&jm7mlqO7eDhshmGiXpeV(VoK%6BN& z%0Hnp6D%CnY%k_Gt>DL2<%k#wMH_Cp$9n0Ye8=uMZWVVk)s9h%6P2-LsWxdB{h`UK z9K9@;XvR+7>a9Vko<}II`|1=+xF%sO<8n2`E3%NibPc0~erS+iGi5uQcgiQe*gf0M z!p633W2~0j-1Uik6D(q@9hWA(wQSb;j~N{7>BdZExW>j`VxD_zi&ZZ_ zTiMU$omUu!;+;6*r@FXN3w%%s%ZV5D8p zk+1)Y)5&ykiFGPn90!@#Get4CmQH!yFXzj^l-He;OnE)5=2J49$dONb6eDn*@{S^c zoJwOh#VPL{kF~mUnH?x!dmCq_rMl*I)2AV77RuMQ!3;lQ$kr2!Hby6w3C*{D$RX?`}?2mex9}4TBi5`k7q|%FMeKd1(+-S4ONh-a2B^ zy5fi8qzFb#>W>q$?3$f=>-6YjhBWckg#<-svT`%GJq5d(!`nK}XMc>#6Ja?U%VVXC zYi?I5wga2fTpyJlVHO)g>1sXmdRKOt!cBWy9>{uK6iDDW%*H{$Sjq#@)awl@2_f7D z!p-Jsne(j1V?u8dXJbqe$6e=0UqD<}%OB(Vf{DiCme-olnB^e>Gp01=^$~>Uv$QWU z3d20uT)uc>U`&+P(vxQ9V0~D_-0P=XnwdMr+IGaKAa@2EH>p$N6tD0aUV*FhvFe-YgKiwmQZ@pobB?ev>Mjt6z*wLdTC+Lirw9&3gg?<1pVr;<#vfOxULs6J^i|B&oG#FMD(&b`FiJ4 zc6}erh$fnPkg#gB#29&zrV?CnIy5J~H`wxEVj~xVm_|2tzL@ZKtMy`~;@9v1yB%7X z)@{mV+1a5!_azf^U3nve=aE%6+mgLP2X>w4E~}X2N)jY&o%Dv}5>2NY(j$v|Am9Np zbs?bKtxaCm2m)~-8y!+AZqv4u7S~*K>^k3wj`Ovlod);VLY%ZQk&|fr|5*#qoKxvj zCbqP1`<{ko8IM$vLVV(TTOrRXdfIk+Ew-6)vU7G}v)v#26hf*py&~x9-pv|$a|HV1 zAr)$o9nz!cNWk08V$o~ODb~F_uM%dapGWtax4}MnDrna7lE=8tVVh&SA>I|^1=~=KHPH?*0+sl;9JThlD=2avMNO5Ab2zS{jRq$Tobwgq4m7+$}iuD*4iMt(P*xlF# z{rLmEeZ)X-`&dw>O1&H_inv@e%o}6&hWzz{+a4CUbdW#O1ZKWAF#;E!j*C?}n7?p} z`gVGMu@T3_*HUBOzj2F8_v+PE5pnAsu~$r{A_grc@~-*33DV-?>w4JDmsRTxEPQ&_14JY_K1 zhDo1SBu^jZfj!bY{uQ(P*S8fBLmRPF(8(*lr5$Y@%i5NnVmdlHJ5G2}2gmGnewwxA zejNG4^8Z8&MHt&Q#C!HmLrr$0>tq+&ykT&5Z%^;))=qWICO*m7q1yC#+G(<2Yqq!= z`C)u&?ud-~X&Z*tw4K~6=O$qrkG6>d;ZAe%aG1@W{?y^Vmgtj4%UcU#e>;VhpU>Wv z)1Nw~KXoW9V4-!c!74ZXsbl(6$MmNT`$1&-Q-{99x$mUYpE{;Lbu>Px?D3Pto(CB?i#N4dTIyunMTSTv0%AT~|CHco6YG;sUawh@$NG_tsn8oq>FI-GBC< zDf0BU-lN|4d7t-r&*7(syyj|;XTk)}I~q>g*Yno#-gJ;+J#XvlJ#PlQ2A1Gd?gQ_H{PVW+LzUhRcrbhd9txj_s%J7E z>ANHNQMs*-D;pd?Am~cd@|7586qhS|p zg3@b~oB|(*vd1o{a{mCO$D|`uz7|#p9|G0xcSDu` zQK<4i>B66bO@zM!)g`}z>Zcc=%0HCG%U%Ym-g!{b%Kl%e!`54;?1 zfs^1-G>W3V~Yv}slLZTmDd7Q&tfP$tcNOp2ui=pApg8; z`BA<*q1v|t${su6Yv3-Z{Li}hNhS>+1l7LjQ0-p;`RBFsBYpBv%8zzHwdWU5dOhdT_kUwr&v8)t z%!0E2BF8sD`OkS!<&<6gCMbKo7s`HDLDjnjD&Nge^?e!Qir)QD`t5|u{}fcao`Y)t z#Azwt0IeQyf8rNGm9r8`?>ECHScNKQ8&thFLG|x_aBuj1C_Ns9YR}K%Yv8j`dOQye z{0r1~$1*t7p4m{}&4<#X9crAehN>?IC&D49^oyXrdnZ(T-s{5Gx$riqae0ReKLDl2 zV^ID0I8;0L#kr){VNm^c98~;lI1`@b;zOua{eXF4SEeG{|5i0+sQ1xF4RsL3}`fhaL z&pUnRN^U&38be!dpY zffcCv>qe;lxC^Si--fDh2b4cQ4H=5weu_B%74i5 z2^aq-IGOmDq4G~=u!sl4z2K2>-UMt8F^#vnIo$_rf@=RR_*(cPl-(z_q2(&o9Ik>IN8g7UH$Q?Wz~4jJ;iyy6eZVxR z_O615z<$^PN1@iQdmSH#hVWnE!SJ}bX@AUy>Yo)5)x7heho5}_eu38y&P(?Ji%w1V z0b8K#@f|3AAAu_GNvQf>gtEgCr={gjgNG4b2(`ZUK;?^}+P4|X9@jvPj~k%!f5ye% zGvkA&SmN>40ClY=ulpdEk-r)E(sP_NdgQD2a^gS0!&oWf`8=>s>A$Taf9!l@qpzQH2DEs^bz79SOrT2sd>G+)jHD8;@^=RoOw0aSebt;&2OJZqeD8uP_X>D4-0FBcRJ$IAvg>0| z?fV(jxOpBP38yShb=gf2-U7jq00FPoCdeK z^ar8z*a4;YPAGr8icDM@u z(uL=>r{A3qW#2(4y9`71>m^X-U*>q7i~k~&9li{ef4k#Da4*6S!wK*nB!}p^7x}SX zc+`eFkf#y({T0Zy$Sg$q^&xtmM1F+)8Bu@VjQk@a-Snuh-j2M4%s})kM~*`V72x@V z{Y`%=;6&s?ei7t!-Jbg&|2q7Id(ZGqUiLzM=OW$=yAk<#_MFGdn_S=+cr_y5KGVg01s0LA3s)T{!M`GN zk%cbq%P>SXA(y(i4e(FyUHBRDugF6R@M!+mGmM;ud;$3hG7mWe(SzH2f3a`eNx;p> z{>ZzKQRHz%&wS(&_^{yywN7P#<#z#EXq5QEG{-is_n^vq1*Jp=Q|TaneshY>x`A#b#A>7MWN zynhHe2YD3vH{|!ouMj;`kc*IaBH0u3veE^-240B>F)hTN8z84`;b!=a8HNh zk&gcY{|@Ovo<*i3dWMirWU>N0pG;xr<o$Ha7sRnCM`0<6jbAPYe#Q8)nZBwVl%}_s)qY%V>o)l)h)pR)!-4d+b?)a!lZ&JJlji!Fisk>R>J&1kT-OBG0Kx=_pk|L6O{bE zLXdAU9Z|(B$0bXCF))59PbW7~QeZ}-YQm~DvZjTDHZ zg7mAFlFF!QS7&5_9060T(r@|qxO8CGySAMVqGE$dHT=;l zEHPs2_;tg=zNcobf2~oNrTbxF)LW`wgCq6#GkE=?6eThq?2G&g1^O7T8v6r5!z(^j z3X`a!nPI83;MsWMh);P|6XqkUrHoByL}?3g0u0qRito`j%}jm?Z)2*Y-SAYL%+3s^ zKPnWWkuVG_h;KNpx87O^#z-xtrceW&hLT}Dpaf)a&*fw45CQGr<=6beOZ zDr3|l@mO_f7|Z+3LiNF-JfS#_a_gycy`LLeILk(7xv)YhF8c9Bnp3TV*}cR;X27rX;mcZ)Thi4{ zlM0htB_K^%v3h@n@l|A62wAB^eP{uc&_0}507X?=yMNIj=fkXkjaxhfU) z1^BfbsZf<86-Hh2M{CocGp%2UBL+K#h1jINa%)qNmdiR|mkC$P-=H!BEF92i&&D{l z;K!-Tg>(w7x#g>tO9SOQ>5z4^xErZyA2m2p9$V%rqv@pIJ6e{b=j9Uh4UD&JLy)W5 zZGvmQ8pRZ@L0CyhE{AwU60)Fm&`TH+4Q!gpr=xkdcoz9rMyI2&wsxi)orcd``bgLx z*5_yzWcPGvCUiLV9EO+~(<@h_3TZ*x(g`L5(J)ND#Yk?AjQe%Ujb}PS~|7XRc@vI#4R6MH` zB;JZWWOH-r9@G82od))p?wn+g>0#Lp$#BHN4to@1_qfL|vTfX+G-grU zCs&mC4fEOBT_37UtyN|lIB^$%4_7B-h=IAE&huN}> zjgGyQI)9j64ZM{ho1$}>xf$D@cAOf+n_4eseJtfi!hAAl_eu$AZdJ*agEXc-KPueM zC^qb8%hkl|Y-=}}n>L<`I^8aijbk4R2OGwm-IB&$XHbmT!mVMuS%1y*o>bVYcSfaT zkRjqYc8qid?CUD_EY%f^)XqF!V?cdow*-us+@RML=7#Jj?TU=HVIHhcUu@gy6U8;O zq#oH*?Nc{*`teXL()N0~LDq*gC!iBn74mhR8UytcW~$Vx5^G$*AKpwd3)+In;XHl_-gFQNeRl_F7Gx z*|tBOXOs_TZp@HH1$_}`z12Z3(0;0ON%qP?ca-gAJ=o0#B1ja`&mLs8giTFT&y#K z_BG_FCU!3CVgJAuZYADV@R$ra);Ah9jmcat4e8jQzGX{u8p@2HhDK;tYnpG&7J+nK zX{_j0YWjx3w49+=8e=Cb7fL7Ro`kJHT@M1O8Vwr+o29MFaZ#)7fKZ#eqLHaCzmdW1wrDA9N}56g#tvQ=l?_}4 zS>ZQ~dcAUqy3_UQyy159obF<`f0Mg4%gbszI9w>*+L5c&tTiRh(%jb8HNLjBwd1{o z3SYH`Qq;`YjS9p6$5J>j?n$3K8^iRz?0?XVqYx`j$sZ0mTxb&O)fuio;I1y4a~fl^ zX~)JD!^CuR2CjH((j%O9pBn0Rv*?_sZs#?np_2M5tZgsW*y}Ve1?$QPudld^i;1*b zT$VL1))>s$OFH-H49o3=y$A8ucDLD8BAuOIF*(h*lhdiEG)_)ygFbZBt)J-&>0&yU zUWvVic->ZdYr~Gvt+b8rwF@je(JxPTqqRo69fVEGrWJcKPWS5Qo$jym6xp!B&SFg; z_n*wu_MGmf>KQH^*uz0!rjL~U_3QvRW@a;FFn#78%G>QCU@cBk&>e1ik;Nx2+^IXD zZ0o8UPcL)qY%`Y)szgbe26!W}nA8`F32ic}2eYJnlPiy#;1=%bb?k zQ&_IBcXMYv5ayegR0rbb-e`eY5*7;PEn%@3uwBRT`v`B$f{O<@`4)6zy=Y4Js^)A( zZe~*wEa0wePHS`PDa~_EH?6G;TIZeI$}?r9A1BS$j|)DV;=iGWY(LoC%dPPOLrLkP zvw#(0{hFRBohv$*H8!es3hRHuYSFB7-U5>Z8NOdePJ?X{Nmo-{p*6h;rP!cIvv7_x1+ah{NjH6;$BNM6RmR%cU{lM)xB}v z%3jAW?)7)F@r!%i-;ZD1k6+vm*=vLBre^%&e*EIT_Sc{Bi~HJL*mBm_@r(Oc{rkcA z#l0>Q#xL&2FYX)f>UX=vAHTRCzqqem({sT+esMp3ac}=mr16V;{qb-7;$HvHq5G@i S_{Dw0pVR6W_5U9i_x}x#pMUQF diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 8ce1cf38..5191f9be 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -150,6 +150,21 @@ msgstr "Not configured" msgid "Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP" msgstr "Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP" +msgid "No Wifi stations found" +msgstr "No Wifi stations found" + +msgid "Re-initializing wpa_supplicant" +msgstr "Re-initializing wpa_supplicant" + +msgid "Click 'Rescan' to search for nearby Wifi stations." +msgstr "Click 'Rescan' to search for nearby Wifi stations." + +msgid "Click 'Reinitialize' to force reinitialize wpa_supplicant." +msgstr "Click 'Reinitialize' to force reinitialize wpa_supplicant." + +msgid "Reinitialize" +msgstr "Reinitialize" + #: includes/dashboard.php msgid "Interface Information" msgstr "Interface Information" From 3207ac75cd32589cd9ee485d294b13c927c7b6c7 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 30 Apr 2021 14:40:47 +0100 Subject: [PATCH 09/11] Minor: standardize labels --- templates/wifi_stations.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index 7acfc7b5..01d66a07 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -1,8 +1,8 @@

-

-

wpa_supplicant.') ?>

+

+

wpa_supplicant.") ?>

From e5024c4c198619a561b2fc3a66267a2d967492c7 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 30 Apr 2021 17:24:45 +0100 Subject: [PATCH 10/11] Minor: fix labels + update en_US locale --- includes/configure_client.php | 4 ++-- includes/wifi_functions.php | 3 ++- locale/en_US/LC_MESSAGES/messages.mo | Bin 18097 -> 18095 bytes locale/en_US/LC_MESSAGES/messages.po | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/includes/configure_client.php b/includes/configure_client.php index b9677aa6..30e048ac 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -20,8 +20,8 @@ function DisplayWPAConfig() exec('sudo wpa_cli -i ' . $_SESSION['wifi_client_interface'] . ' select_network '.strval($_POST['connect'])); $status->addMessage('New network selected', 'success'); } elseif (isset($_POST['wpa_reinit'])) { - $status->addMessage('Re-initializing wpa_supplicant', 'info', false); - $force_remove=true; + $status->addMessage('Reinitializing wpa_supplicant', 'info', false); + $force_remove = true; $result = reinitializeWPA($force_remove); $status->addMessage($result, 'info'); } elseif (isset($_POST['client_settings'])) { diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index 8cea0541..066a19ca 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -158,7 +158,8 @@ function getWifiInterface() } /* - * Reinitializes wpa_supplicant for the wifi client interface + * Reinitializes wpa_supplicant for the wireless client interface + * The 'force' parameter deletes the socket in /var/run/wpa_supplicant/ * * @param boolean $force */ diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 8cc789ef03e367f7633c868a0299a5a53e73ad8f..f8c8410d8573853f422a16c742d3983656a0d5bc 100644 GIT binary patch delta 2982 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 F@-OlLPM81y diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 5191f9be..fac66b24 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -153,8 +153,8 @@ msgstr "Note: WEP access points appear as 'Open'. RaspAP does n msgid "No Wifi stations found" msgstr "No Wifi stations found" -msgid "Re-initializing wpa_supplicant" -msgstr "Re-initializing wpa_supplicant" +msgid "Reinitializing wpa_supplicant" +msgstr "Reinitializing wpa_supplicant" msgid "Click 'Rescan' to search for nearby Wifi stations." msgstr "Click 'Rescan' to search for nearby Wifi stations." From a3814cdf71a412f3979a25025e9f79147d2407cb Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 8 May 2021 19:40:19 +0100 Subject: [PATCH 11/11] Wrap reinitialize w/ monitor mode condition --- templates/wifi_stations.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index 01d66a07..f12c9f54 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -2,15 +2,15 @@

+

wpa_supplicant.") ?>

- - +
" />
- +