Browse Source

Implement new helper fileGetContentsSSL()

DSR! 2 years ago
parent
commit
cadbd51e53

+ 5 - 0
src/pineapple/api/Module.php

@@ -126,4 +126,9 @@ abstract class Module
     {
         return \helper\checkDependency($dependencyName);
     }
+
+    protected function fileGetContentsSSL($url)
+    {
+        return \helper\fileGetContentsSSL($url);
+    }
 }

+ 6 - 0
src/pineapple/api/pineapple.php

@@ -140,3 +140,9 @@ function getBoard()
 
     return false;
 }
+
+function fileGetContentsSSL($url)
+{
+    $url = escapeshellarg($url);
+    return exec("uclient-fetch -q -O - {$url}");
+}

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

@@ -149,7 +149,7 @@ class Advanced extends SystemModule
 
     private function checkForUpgrade()
     {
-        $upgradeData = @file_get_contents(self::REMOTE_URL . "/json/upgrades.json");
+        $upgradeData = @$this->fileGetContentsSSL(self::REMOTE_URL . "/json/upgrades.json");
         if ($upgradeData !== false) {
             $upgradeData = json_decode($upgradeData, true);
             if (json_last_error() === JSON_ERROR_NONE) {

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

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

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

@@ -47,7 +47,7 @@ class ModuleManager extends SystemModule
 
     private function getAvailableModules()
     {
-        $moduleData = @file_get_contents(self::REMOTE_URL . "/modules/build/modules.json");
+        $moduleData = @$this->fileGetContentsSSL(self::REMOTE_URL . "/modules/build/modules.json");
         if ($moduleData !== false) {
             $moduleData = json_decode($moduleData);
             if (json_last_error() === JSON_ERROR_NONE) {

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

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