Browse Source

Change remote feeds

DSR! 3 years ago
parent
commit
4c34543c0c

+ 2 - 2
src/pineapple/api/Module.php

@@ -12,8 +12,8 @@ abstract class Module
     protected $moduleClass;
     protected $error;
     protected $streamFunction;
-    const REMOTE_NAME = "WiFiPineapple.com";
-    const REMOTE_URL = "https://www.wifipineapple.com";
+    const REMOTE_NAME = "GitHub.com";
+    const REMOTE_URL = "https://raw.githubusercontent.com/xchwarze/wifi-pineapple-community/main";
 
     abstract public function route();
 

+ 1 - 1
src/pineapple/modules/Advanced/api/module.php

@@ -168,7 +168,7 @@ class Advanced extends SystemModule
                 }
             }
         } else {
-            $this->error = "Error connecting to " . self::REMOTE_NAME . ". Please check your connection.";
+            $this->error = "Error connecting to WiFiPineapple.com. Please check your connection.";
         }
 
     }

+ 1 - 4
src/pineapple/modules/Dashboard/api/module.php

@@ -89,10 +89,7 @@ class Dashboard extends SystemModule
 
     private function getBulletins()
     {
-
-        $device = $this->getDevice();
-        $bulletinData = @file_get_contents(self::REMOTE_URL . "/{$device}/bulletin");
-
+        $bulletinData = @file_get_contents(self::REMOTE_URL . "/json/bulletin.json");
         if ($bulletinData !== false) {
             $this->response = json_decode($bulletinData);
             if (json_last_error() === JSON_ERROR_NONE) {

+ 2 - 4
src/pineapple/modules/ModuleManager/api/module.php

@@ -47,8 +47,7 @@ class ModuleManager extends SystemModule
 
     private function getAvailableModules()
     {
-        $device = $this->getDevice();
-        $moduleData = @file_get_contents(self::REMOTE_URL . "/{$device}/modules");
+        $moduleData = @file_get_contents(self::REMOTE_URL . "/modules/build/modules.json");
 
         if ($moduleData !== false) {
             $moduleData = json_decode($moduleData);
@@ -108,8 +107,7 @@ class ModuleManager extends SystemModule
             $dest = '/tmp/';
         }
 
-        $device = $this->getDevice();
-        $this->execBackground("wget '" . self::REMOTE_URL . "/{$device}/modules/{$this->request->moduleName}' -O {$dest}{$this->request->moduleName}.tar.gz && touch /tmp/moduleDownloaded");
+        $this->execBackground("wget '" . self::REMOTE_URL . "/modules/{$this->request->moduleName}.tar.gz' -O {$dest}{$this->request->moduleName}.tar.gz && touch /tmp/moduleDownloaded");
         $this->response = array('success' => true);
     }
 

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

@@ -241,7 +241,7 @@ class Networking extends SystemModule
 
     private function getOUI()
     {
-        $data = file_get_contents(self::REMOTE_URL . "/oui.txt");
+        $data = file_get_contents(self::REMOTE_URL . "/oui/oui.txt");
         if ($data !== null) {
             $this->response = array("ouiText" => implode("\n", $data));
         } else {