Changed apikeyhandler

christoffer-bolin · Dec 4, 2020 · fa12a2f · fa12a2f
1 parent e85e4ea
commit fa12a2f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Models/WeatherForecast.php b/src/Models/WeatherForecast.php
@@ -7,17 +7,15 @@ class WeatherForecast
 
     public function __construct()
     {
-        global $di;
         $this->oneWeek = [];
         $this->weather = [];
     }
 
 
     public function fetchApiKey()
     {
-        $config = $di->get("configuration")->load("weatherapi.php");
-        $access_key = $this->config["config"]["weatherKeyHolder"]["weatherKey"];
-
+        $access_key = require ANAX_INSTALL_PATH . "/config/weatherapi.php";
+        $access_key = $access_key["weatherKeyHolder"]["weatherKey"];
         return $access_key;
     }
 
@@ -29,7 +27,7 @@ public function checkWeather($lat, $lon)
 
             $access_key = $this->fetchApiKey();
 
-            $ch = curl_init('https://api.openweathermap.org/data/2.5/onecall?lat='.$lat.'&lon='.$lon.'&exclude='.$exclude.'&units=metric&lang=sv&appid='.$this->access_key.'');
+            $ch = curl_init('https://api.openweathermap.org/data/2.5/onecall?lat='.$lat.'&lon='.$lon.'&exclude='.$exclude.'&units=metric&lang=sv&appid='.$access_key.'');
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
             // Store the data: