corgisout / ramverk1-module

config/di/weather.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         "weather" => [

             "active" => false,

             "shared" => true,

-            "callback" => function () {

+            "callback" => function() {

                 $weather = new \Anax\Model\Weather();

                 $cfg = $this->get("configuration");

                 $config = $cfg->load("apiKey.php");

src/Model/Weather.php

Indentation +35 added lines, -35 removed lines

@@ -72,47 +72,47 @@
     }
 
     public function getWeatherMultiCurl($when, $lat, $lon) : array
- {
-     $dates = [];
-     $now = time();
-     $url = "https://api.darksky.net/forecast/{$this->darkskyKey}/{$lon},{$lat}";
+    {
+        $dates = [];
+        $now = time();
+        $url = "https://api.darksky.net/forecast/{$this->darkskyKey}/{$lon},{$lat}";
 
-     if ($when == "past") {
-         for ($i = 0; $i < 30; $i++) {
-             $now -= 86400;
-             $dates[] = $now;
-         }
-     } elseif($when == "future") {
-         for ($i = 0; $i < 7; $i++) {
+        if ($when == "past") {
+            for ($i = 0; $i < 30; $i++) {
+                $now -= 86400;
+                $dates[] = $now;
+            }
+        } elseif($when == "future") {
+            for ($i = 0; $i < 7; $i++) {
             $now += 86400;
             $dates[] = $now;
         }
-     } else {
+        } else {
         return [
-             "error" => "select a time",
+                "error" => "select a time",
         ];
     }
 
-     $mh = curl_multi_init();
-     $chAll = [];
-     foreach ($dates as $days) {
-         $ch = curl_init("$url,{$days}?lang=sv&units=si");
-         curl_setopt_array($ch, [CURLOPT_RETURNTRANSFER => true]);
-         curl_multi_add_handle($mh, $ch);
-         $chAll[] = $ch;
-     }
-     $running = null;
-     do {
-         curl_multi_exec($mh, $running);
-     } while ($running);
-     foreach ($chAll as $ch) {
-         curl_multi_remove_handle($mh, $ch);
-     }
-     $response = [];
-     foreach ($chAll as $ch) {
-         $data = curl_multi_getcontent($ch);
-         $response[] = json_decode($data, true);
-     }
-     return $response;
- }
+        $mh = curl_multi_init();
+        $chAll = [];
+        foreach ($dates as $days) {
+            $ch = curl_init("$url,{$days}?lang=sv&units=si");
+            curl_setopt_array($ch, [CURLOPT_RETURNTRANSFER => true]);
+            curl_multi_add_handle($mh, $ch);
+            $chAll[] = $ch;
+        }
+        $running = null;
+        do {
+            curl_multi_exec($mh, $running);
+        } while ($running);
+        foreach ($chAll as $ch) {
+            curl_multi_remove_handle($mh, $ch);
+        }
+        $response = [];
+        foreach ($chAll as $ch) {
+            $data = curl_multi_getcontent($ch);
+            $response[] = json_decode($data, true);
+        }
+        return $response;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
     {
         $url = "https://eu1.locationiq.com/v1/search.php?key={$this->locationiqKey}&q={$search}&format=json&limit=1";
         $response = get_headers($url);
-        if($response[0] === 'HTTP/1.1 200 OK'){
+        if ($response[0] === 'HTTP/1.1 200 OK') {
                 $details = json_decode(file_get_contents($url));
                 return [
                     "lat" => $details[0]->lat,
@@ -47,7 +47,7 @@ 
                 $now -= 86400;
                 $dates[] = $now;
             }
-        } elseif($when == "future") {
+        } elseif ($when == "future") {
             for ($i = 0; $i < 7; $i++) {
                 $now += 86400;
                 $dates[] = $now;
@@ -82,7 +82,7 @@ 
              $now -= 86400;
              $dates[] = $now;
          }
-     } elseif($when == "future") {
+     } elseif ($when == "future") {
          for ($i = 0; $i < 7; $i++) {
             $now += 86400;
             $dates[] = $now;

src/Model/ipValidation.php

Indentation +9 added lines, -9 removed lines

@@ -33,15 +33,15 @@
             ];
             } else {
                 return [
-                 "valid" => "Not Valid IP",
-                 "ip" => null,
-                 "ipv" => null,
-                 "domain" => null,
-                 "lat" => null,
-                 "lon" => null,
-                 "country" => null,
-                 "city" => null
-             ];
+                    "valid" => "Not Valid IP",
+                    "ip" => null,
+                    "ipv" => null,
+                    "domain" => null,
+                    "lat" => null,
+                    "lon" => null,
+                    "country" => null,
+                    "city" => null
+                ];
             }
 
     }

Spacing +2 added lines, -2 removed lines

@@ -14,11 +14,11 @@
                 $ipv = "Ipv4";
             } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
                 $ipv = "Ipv6";
-            } else{
+            } else {
                 $ipv = null;
             }
 
-            if($ipv != null){
+            if ($ipv != null) {
                 $details = json_decode(file_get_contents("http://api.ipstack.com/{$ip}?access_key=9e9f05f2e74673444b90a999a579ab3f"));
                 $domain = gethostbyaddr($ip);
             return [

src/Controller/IpController.php

Indentation +24 added lines, -24 removed lines

@@ -31,29 +31,29 @@
      *
      * @return string
      */
-     public function indexAction() : object
-     {
-         $page = $this->di->get("page");
-
-         $ip = $this->di->request->getServer("REMOTE_ADDR");
-         if (isset($_GET['submit'])) {
-             $ip = $this->di->request->getGet("ip");
-         }
-         $validator = new \Anax\Model\ipValidation;
-         $res = $validator->toJson($ip);
-         $data = [
-             "valid" => $res["valid"],
-             "ip" => $ip,
-             "domain" => $res["domain"],
-             "ipv" => $res["ipv"],
-             "lat" => $res["lat"],
-             "lon" => $res["lon"],
-             "country" => $res["country"],
-             "city" => $res["city"]
-         ];
-         $page->add("ipVerification/ipJson", $data);
-
-         return $page->render();
-     }
+        public function indexAction() : object
+        {
+            $page = $this->di->get("page");
+
+            $ip = $this->di->request->getServer("REMOTE_ADDR");
+            if (isset($_GET['submit'])) {
+                $ip = $this->di->request->getGet("ip");
+            }
+            $validator = new \Anax\Model\ipValidation;
+            $res = $validator->toJson($ip);
+            $data = [
+                "valid" => $res["valid"],
+                "ip" => $ip,
+                "domain" => $res["domain"],
+                "ipv" => $res["ipv"],
+                "lat" => $res["lat"],
+                "lon" => $res["lon"],
+                "country" => $res["country"],
+                "city" => $res["city"]
+            ];
+            $page->add("ipVerification/ipJson", $data);
+
+            return $page->render();
+        }
 
 }

src/Controller/weatherController.php

Indentation +55 added lines, -55 removed lines

@@ -31,68 +31,68 @@
      *

      * @return string

      */

-     public function indexActionGet() : object

-     {

+        public function indexActionGet() : object

+        {

         $page = $this->di->get("page");

 

-         $data = [

-             "error" => $this->di->session->getOnce("error") ?? null,

-             "when" => $this->di->session->getOnce("when") ?? null,

-             "search" => $this->di->session->getOnce("search") ?? null,

-             "temp" => $this->di->session->getOnce("temp") ?? null,

-             "weather" => $this->di->session->getOnce("weather") ?? null,

-             "time" => $this->di->session->getOnce("time") ?? null,

-             "lon" => $this->di->session->getOnce("lon") ?? null,

-             "lat" => $this->di->session->getOnce("lat") ?? null,

-         ];

-         $page->add("weather/geoweather", $data);

-

-         return $page->render();

-     }

-     public function indexActionPost()

-     {

-         $response = $this->di->get("response");

-         $search = $this->di->get("request")->getPost("search");

-         $when = $this->di->get("request")->getPost("when");

-         $this->di->session->set("search", $search);

-         $weather = $this->di->get("weather");

-

-

-         $ip = $this->di->request->getGet("search");

-         $validator = new \Anax\Model\ipValidation;

-         $res = $validator->toJson($ip);

-

-         if ($res["valid"] == "valid IP"){

-             $locationInfo = $weather->getLocationData($res["city"]);

-         } else {

-             if (!isset($search)){

+            $data = [

+                "error" => $this->di->session->getOnce("error") ?? null,

+                "when" => $this->di->session->getOnce("when") ?? null,

+                "search" => $this->di->session->getOnce("search") ?? null,

+                "temp" => $this->di->session->getOnce("temp") ?? null,

+                "weather" => $this->di->session->getOnce("weather") ?? null,

+                "time" => $this->di->session->getOnce("time") ?? null,

+                "lon" => $this->di->session->getOnce("lon") ?? null,

+                "lat" => $this->di->session->getOnce("lat") ?? null,

+            ];

+            $page->add("weather/geoweather", $data);

+

+            return $page->render();

+        }

+        public function indexActionPost()

+        {

+            $response = $this->di->get("response");

+            $search = $this->di->get("request")->getPost("search");

+            $when = $this->di->get("request")->getPost("when");

+            $this->di->session->set("search", $search);

+            $weather = $this->di->get("weather");

+

+

+            $ip = $this->di->request->getGet("search");

+            $validator = new \Anax\Model\ipValidation;

+            $res = $validator->toJson($ip);

+

+            if ($res["valid"] == "valid IP"){

+                $locationInfo = $weather->getLocationData($res["city"]);

+            } else {

+                if (!isset($search)){

                 $locationInfo = $weather->getLocationData("");

             } else{

                 $locationInfo = $weather->getLocationData($search);

             }

         }

-         $lon = $locationInfo["lon"] ?? null;

-         $lat = $locationInfo["lat"] ?? null;

-         $this->di->session->set("lon", $lon);

-         $this->di->session->set("lat", $lat);

-         $error = $locationInfo["error"] ?? null;

-         $this->di->session->set("error", $error);

-

-         if ($locationInfo["error"] == null){

-             $weatherInfo = $weather->getWeather($when,$lon,$lat);

-             $time = $weatherInfo["time"] ?? null;

-             $this->di->session->set("time", $time);

-

-             $temp = $weatherInfo["temp"] ?? null;

-             $this->di->session->set("temp", $temp);

-

-             $weather = $weatherInfo["weather"] ?? null;

-             $this->di->session->set("weather", $weather);

-

-             $error = $weatherInfo["error"] ?? null;

-             $this->di->session->set("error", $error);

+            $lon = $locationInfo["lon"] ?? null;

+            $lat = $locationInfo["lat"] ?? null;

+            $this->di->session->set("lon", $lon);

+            $this->di->session->set("lat", $lat);

+            $error = $locationInfo["error"] ?? null;

+            $this->di->session->set("error", $error);

+

+            if ($locationInfo["error"] == null){

+                $weatherInfo = $weather->getWeather($when,$lon,$lat);

+                $time = $weatherInfo["time"] ?? null;

+                $this->di->session->set("time", $time);

+

+                $temp = $weatherInfo["temp"] ?? null;

+                $this->di->session->set("temp", $temp);

+

+                $weather = $weatherInfo["weather"] ?? null;

+                $this->di->session->set("weather", $weather);

+

+                $error = $weatherInfo["error"] ?? null;

+                $this->di->session->set("error", $error);

+        }

+            return $response->redirect("weather");

         }

-         return $response->redirect("weather");

-     }

 

 }

Spacing +5 added lines, -5 removed lines

@@ -62,12 +62,12 @@ 
          $validator = new \Anax\Model\ipValidation;

          $res = $validator->toJson($ip);

 

-         if ($res["valid"] == "valid IP"){

+         if ($res["valid"] == "valid IP") {

              $locationInfo = $weather->getLocationData($res["city"]);

          } else {

-             if (!isset($search)){

+             if (!isset($search)) {

                 $locationInfo = $weather->getLocationData("");

-            } else{

+            } else {

                 $locationInfo = $weather->getLocationData($search);

             }

         }

@@ -78,8 +78,8 @@ 
          $error = $locationInfo["error"] ?? null;

          $this->di->session->set("error", $error);

 

-         if ($locationInfo["error"] == null){

-             $weatherInfo = $weather->getWeather($when,$lon,$lat);

+         if ($locationInfo["error"] == null) {

+             $weatherInfo = $weather->getWeather($when, $lon, $lat);

              $time = $weatherInfo["time"] ?? null;

              $this->di->session->set("time", $time);

 

src/Controller/weatherApiController.php

Indentation +12 added lines, -12 removed lines

@@ -31,19 +31,19 @@
             $locationInfo = $weather->getLocationData($res["city"]);

         } else {

             if (!isset($search)){

-               $locationInfo = $weather->getLocationData("");

-           } else{

-               $locationInfo = $weather->getLocationData($search);

-           }

-       }

-       $lon = $locationInfo["lon"] ?? null;

-       $lat = $locationInfo["lat"] ?? null;

-       if (!isset($locationInfo["error"])){

+                $locationInfo = $weather->getLocationData("");

+            } else{

+                $locationInfo = $weather->getLocationData($search);

+            }

+        }

+        $lon = $locationInfo["lon"] ?? null;

+        $lat = $locationInfo["lat"] ?? null;

+        if (!isset($locationInfo["error"])){

 

-           $weatherInfo = $weather->getWeatherMultiCurl($when,$lon,$lat);

-       } else {

-           $weatherInfo = ["error" => "that is not a city"];

-       }

+            $weatherInfo = $weather->getWeatherMultiCurl($when,$lon,$lat);

+        } else {

+            $weatherInfo = ["error" => "that is not a city"];

+        }

         $data = [

             "location" => $search ?? null,

             "lon" => $lon ?? null,

Spacing +5 added lines, -5 removed lines

@@ -27,20 +27,20 @@
         $validator = new \Anax\Model\ipValidation;

         $res = $validator->toJson($ip);

 

-        if ($res["valid"] == "valid IP"){

+        if ($res["valid"] == "valid IP") {

             $locationInfo = $weather->getLocationData($res["city"]);

         } else {

-            if (!isset($search)){

+            if (!isset($search)) {

                $locationInfo = $weather->getLocationData("");

-           } else{

+           } else {

                $locationInfo = $weather->getLocationData($search);

            }

        }

        $lon = $locationInfo["lon"] ?? null;

        $lat = $locationInfo["lat"] ?? null;

-       if (!isset($locationInfo["error"])){

+       if (!isset($locationInfo["error"])) {

 

-           $weatherInfo = $weather->getWeatherMultiCurl($when,$lon,$lat);

+           $weatherInfo = $weather->getWeatherMultiCurl($when, $lon, $lat);

        } else {

            $weatherInfo = ["error" => "that is not a city"];

        }

view/weather/apidocs.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     } else {

         ?>  <p style= "color: red"> <?php echo $error;

     }

-         ?></p>

+            ?></p>

         </table>

         <?php if(isset($lon) && isset($lat)){ ?>

         <iframe width="75%"

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
             </tr>

 

             <?php

-            if(is_array($time)){

+            if (is_array($time)) {

                 for ($i = 0; $i < count($time); $i++) {

                 ?>

             <tr>

@@ -37,7 +37,7 @@ 
     }

          ?></p>

         </table>

-        <?php if(isset($lon) && isset($lat)){ ?>

+        <?php if (isset($lon) && isset($lat)) { ?>

         <iframe width="75%"

         height="550"

         frameborder="0"

view/weather/geoweather.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     } else {
         ?>  <p style= "color: red"> <?php echo $error;
     }
-         ?></p>
+            ?></p>
         </table>
         <?php if(isset($lon) && isset($lat)){ ?>
         <iframe width="75%"

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
             </tr>
 
             <?php
-            if(is_array($time)){
+            if (is_array($time)) {
                 for ($i = 0; $i < count($time); $i++) {
                 ?>
             <tr>
@@ -37,7 +37,7 @@ 
     }
          ?></p>
         </table>
-        <?php if(isset($lon) && isset($lat)){ ?>
+        <?php if (isset($lon) && isset($lat)) { ?>
         <iframe width="75%"
         height="550"
         frameborder="0"