Refactor remote feeds use

src/pineapple/api/Module.php

@@ -12,6 +12,8 @@ abstract class Module
     protected $moduleClass;
     protected $error;
     protected $streamFunction;
+    const REMOTE_NAME = "WiFiPineapple.com";
+    const REMOTE_URL = "https://www.wifipineapple.com";
 
     abstract public function route();
 

src/pineapple/modules/Advanced/api/module.php

@@ -152,7 +152,7 @@ class Advanced extends SystemModule
     private function checkForUpgrade()
     {
         $device = $this->getDevice();
-        $upgradeData = @file_get_contents("https://www.wifipineapple.com/{$device}/upgrades");
+        $upgradeData = @file_get_contents(self::REMOTE_URL . "/{$device}/upgrades");
 
         if ($upgradeData !== false) {
             $upgradeData = json_decode($upgradeData);
@@ -168,7 +168,7 @@ class Advanced extends SystemModule
                 }
             }
         } else {
-            $this->error = "Error connecting to WiFiPineapple.com. Please check your connection.";
+            $this->error = "Error connecting to " . self::REMOTE_NAME . ". Please check your connection.";
         }
 
     }
@@ -183,7 +183,7 @@ class Advanced extends SystemModule
         $device = $this->getDevice();
         @unlink("/tmp/upgrade.bin");
         @unlink("/tmp/upgradeDownloaded");
-        $this->execBackground("wget 'https://www.wifipineapple.com/{$device}/upgrades/{$version}' -O /tmp/upgrade.bin && touch /tmp/upgradeDownloaded");
+        $this->execBackground("wget '" . self::REMOTE_URL . "/{$device}/upgrades/{$version}' -O /tmp/upgrade.bin && touch /tmp/upgradeDownloaded");
         $this->response = array("success" => true);
     }
 

src/pineapple/modules/Dashboard/api/module.php

@@ -91,7 +91,7 @@ class Dashboard extends SystemModule
     {
 
         $device = $this->getDevice();
-        $bulletinData = @file_get_contents("https://www.wifipineapple.com/{$device}/bulletin");
+        $bulletinData = @file_get_contents(self::REMOTE_URL . "/{$device}/bulletin");
 
         if ($bulletinData !== false) {
             $this->response = json_decode($bulletinData);
@@ -100,6 +100,6 @@ class Dashboard extends SystemModule
             }
         }
         
-        $this->error = "Error connecting to WiFiPineapple.com. Please check your connection.";
+        $this->error = "Error connecting to " . self::REMOTE_NAME . ". Please check your connection.";
     }
 }

src/pineapple/modules/ModuleManager/api/module.php

@@ -48,7 +48,7 @@ class ModuleManager extends SystemModule
     private function getAvailableModules()
     {
         $device = $this->getDevice();
-        $moduleData = @file_get_contents("https://www.wifipineapple.com/{$device}/modules");
+        $moduleData = @file_get_contents(self::REMOTE_URL . "/{$device}/modules");
 
         if ($moduleData !== false) {
             $moduleData = json_decode($moduleData);
@@ -56,7 +56,7 @@ class ModuleManager extends SystemModule
                 $this->response = array('availableModules' => $moduleData);
             }
         } else {
-            $this->error = 'Error connecting to WiFiPineapple.com. Please check your connection.';
+            $this->error = 'Error connecting to ' . self::REMOTE_NAME . '. Please check your connection.';
         }
     }
 
@@ -109,7 +109,7 @@ class ModuleManager extends SystemModule
         }
 
         $device = $this->getDevice();
-        $this->execBackground("wget 'https://www.wifipineapple.com/{$device}/modules/{$this->request->moduleName}' -O {$dest}{$this->request->moduleName}.tar.gz && touch /tmp/moduleDownloaded");
+        $this->execBackground("wget '" . self::REMOTE_URL . "/{$device}/modules/{$this->request->moduleName}' -O {$dest}{$this->request->moduleName}.tar.gz && touch /tmp/moduleDownloaded");
         $this->response = array('success' => true);
     }
 

src/pineapple/modules/Networking/api/module.php

@@ -241,11 +241,11 @@ class Networking extends SystemModule
 
     private function getOUI()
     {
-        $data = file_get_contents("https://www.wifipineapple.com/oui.txt");
+        $data = file_get_contents(self::REMOTE_URL . "/oui.txt");
         if ($data !== null) {
             $this->response = array("ouiText" => implode("\n", $data));
         } else {
-            $this->error = "Failed to download OUI file from WiFiPineapple.com";
+            $this->error = "Failed to download OUI file from " . self::REMOTE_NAME;
         }
     }