Sfoglia il codice sorgente

Fix Networking wifi detection

DSR! 2 anni fa
parent
commit
b211039ef0

+ 1 - 1
src/pineapple/modules/Networking/api/AccessPoint.php

@@ -2,7 +2,7 @@
 
 class AccessPoint
 {
-    public function saveAPConfig($apConfig, $restartService = true)
+    public function saveAPConfig($apConfig)
     {
         if (is_array($apConfig)) {
             $apConfig = (object)$apConfig;

+ 2 - 0
src/pineapple/modules/Networking/api/ClientMode.php

@@ -61,6 +61,8 @@ class ClientMode
 
     public function connectToAP($uciID, $ap, $key, $radioID)
     {
+        exec('[ ! -z "$(wifi config)" ] && wifi config >> /etc/config/wireless');
+
         switch ($ap->security) {
             case 'Open':
                 $encryption = "none";

+ 0 - 8
src/pineapple/modules/Networking/api/module.php

@@ -217,18 +217,10 @@ class Networking extends SystemModule
     {
         $interfaceHelper = new \helper\Interfaces();
         $clientModeHelper = new \helper\ClientMode();
-        $accessPointHelper = new \helper\AccessPoint();
 
         $interface = $this->request->interface;
         $uciID = $interfaceHelper->getUciID($interface);
         $radioID = $interfaceHelper->getRadioID($interface);
-        $apConfig = $accessPointHelper->getAPConfig(false);
-
-        if ($radioID === false) {
-            exec('wifi config > /etc/config/wireless && wifi');
-            $accessPointHelper->saveAPConfig($apConfig);
-            $radioID = $interfaceHelper->getRadioID($interface);
-        }
 
         $this->response = $clientModeHelper->connectToAP($uciID, $this->request->ap, $this->request->key, $radioID);
     }