Edugolr / anax-chai17-weather

config/di/api.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
     "services" => [
         "darksky" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 // Load the configuration files
                 $cfg = $this->get("configuration");
                 $config = $cfg->load("darksky.php");
@@ -16,7 +16,7 @@ 
         ],
         "mapquest" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 // Load the configuration files
                 $cfg = $this->get("configuration");
                 $config = $cfg->load("mapquest.php");
@@ -26,7 +26,7 @@ 
         ],
         "ipstack" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 // Load the configuration files
                 $cfg = $this->get("configuration");
                 $config = $cfg->load("ipstack.php");

src/Controller/WeatherController.php

Spacing +9 added lines, -9 removed lines

@@ -18,8 +18,8 @@ 
         $api = $this->di->get("ipstack");
         $ipstack = $api["config"];
         $getipInfo = new Models\Curl;
-        $extra =  "&fields=ip";
-        $userIp =  $getipInfo->cUrl($ipstack["url"]. "check". '?access_key='. $ipstack["key"]. $extra);
+        $extra = "&fields=ip";
+        $userIp = $getipInfo->cUrl($ipstack["url"]."check".'?access_key='.$ipstack["key"].$extra);
         $apiResult = json_decode($userIp, true);
 
         $session->set("userIp", $apiResult["ip"]);
@@ -50,12 +50,12 @@ 
         $location = $locationHandler->getLocation($ipNumber, $ipstack["config"], $mapquest["config"]);
 
         $mapDiv = $map->getMap($location["latitude"], $location["longitude"]);
-        $weatherJson = $getJson->cUrl($darksky["config"]["url"]. $darksky["config"]["key"]. "/". $location["latitude"]. ",". $location["longitude"]. "?lang=sv&units=auto");
+        $weatherJson = $getJson->cUrl($darksky["config"]["url"].$darksky["config"]["key"]."/".$location["latitude"].",".$location["longitude"]."?lang=sv&units=auto");
 
         $weather = json_decode($weatherJson, true);
         $page->add("weather/weather", ["location" => $location, "mapDiv" => $mapDiv, "weather" => $weather]);
 
-        return $page->render(["title" => $title,]);
+        return $page->render(["title" => $title, ]);
     }
 
     public function weatherOldActionGet()
@@ -75,21 +75,21 @@ 
         $location = $locationHandler->getLocation($ipNumber, $ipstack["config"], $mapquest["config"]);
 
         $url = [];
-        for ($i=0; $i < 31; $i++) {
-            $time  = time() - ($i * 24 * 60 * 60);
-            array_push($url, $darksky["config"]["url"]. $darksky["config"]["key"]. "/". $location["latitude"]. ",". $location["longitude"]. ",". $time. "?lang=sv&units=auto");
+        for ($i = 0; $i < 31; $i++) {
+            $time = time() - ($i * 24 * 60 * 60);
+            array_push($url, $darksky["config"]["url"].$darksky["config"]["key"]."/".$location["latitude"].",".$location["longitude"].",".$time."?lang=sv&units=auto");
         }
 
         $mapDiv = $map->getMap($location["latitude"], $location["longitude"]);
         $weatherJson = $getJson->cUrlMulti($url);
         $weather = [];
         $count = count($weatherJson);
-        for ($i=0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             array_push($weather, json_decode($weatherJson[$i], true));
         }
 
         $page->add("weather/weatherOld", ["location" => $location, "mapDiv" => $mapDiv, "weather" => $weather]);
 
-        return $page->render(["title" => $title,]);
+        return $page->render(["title" => $title, ]);
     }
 }

src/Models/Curl.php

Spacing +4 added lines, -4 removed lines

@@ -16,10 +16,10 @@ 
 
     public function cUrlMulti(array $url)
     {
-        $chandle= [];
+        $chandle = [];
         $mhandle = curl_multi_init();
         $count = count($url);
-        for ($i=0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             array_push($chandle, curl_init($url[$i]));
             curl_setopt($chandle[$i], CURLOPT_RETURNTRANSFER, true);
             curl_multi_add_handle($mhandle, $chandle[$i]);
@@ -32,7 +32,7 @@ 
 
         //close the handles
         $count = count($chandle);
-        for ($i=0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             curl_multi_remove_handle($mhandle, $chandle[$i]);
         }
 
@@ -40,7 +40,7 @@ 
 
         $json = [];
         $count = count($chandle);
-        for ($i=0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             array_push($json, curl_multi_getcontent($chandle[$i]));
         }
         return $json;

view/weather/weatherOld.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     ?>
     <div class="container days">
     <?php
-    for ($i=0; $i < count($weather); $i++) {
+    for ($i = 0; $i < count($weather); $i++) {
         ?>
         <div class="container card day">
             <i class="<?=htmlentities($weather[$i]["daily"]["data"][0]["icon"])?>"></i>

src/Models/Location.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
         $test = $validateIP->validate($ipNumber);
         
         if ($test[0]) {
-            $location = $getJson->cUrl($ipstack["url"]. $ipNumber. '?access_key='. $ipstack["key"]);
+            $location = $getJson->cUrl($ipstack["url"].$ipNumber.'?access_key='.$ipstack["key"]);
             $location = json_decode($location, true);
             $latitude = $location["latitude"];
             $longitude = $location["longitude"];
@@ -20,10 +20,10 @@ 
             return $location;
         }
 
-        $search = array('å','ä','ö');
-        $replace = array('a','a','o');
+        $search = array('å', 'ä', 'ö');
+        $replace = array('a', 'a', 'o');
         $ipNumber = str_replace($search, $replace, $ipNumber);
-        $location = $getJson->cUrl($mapquest["url"]. $mapquest["key"]. $mapquest["extra"]. $ipNumber);
+        $location = $getJson->cUrl($mapquest["url"].$mapquest["key"].$mapquest["extra"].$ipNumber);
         $location = json_decode($location, true);
         $latitude = $location["results"][0]["locations"][0]["latLng"]["lat"];
         $longitude = $location["results"][0]["locations"][0]["latLng"]["lng"];