UnsinkableSam / anaxmodule

src/darkSkyApi/DarkSky.php

Indentation +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@ 
     {
         for ($j=0; $j < count($time); $j++) {
             ${"ch$j"}  = curl_init('https://api.darksky.net/forecast/'.$accessKey.'/'.$res[0]->latitude .
-                  ','. $res[0]->longitude . "," . $time[$j] . "?exclude=minutely?exclude=hourly");
+                    ','. $res[0]->longitude . "," . $time[$j] . "?exclude=minutely?exclude=hourly");
         }
-          $mhcurl = curl_multi_init();
+            $mhcurl = curl_multi_init();
         for ($i=0; $i < count($time); $i++) {
             curl_setopt(${"ch$i"}, CURLOPT_RETURNTRANSFER, true);
             curl_multi_add_handle($mhcurl, ${"ch$i"});
         }
-          $responseArray = [];
+            $responseArray = [];
         for ($k=0; $k < count($time); $k++) {
             $running = null;
             do {
@@ -50,7 +50,7 @@ 
     {
         for ($j=0; $j < count($res); $j++) {
             ${"ch$j"}  = curl_init('https://api.darksky.net/forecast/'.$accessKey.'/'.$res[$j]->latitude .
-              ','. $res[$j]->longitude . "?exclude=minutely?exclude=hourly");
+                ','. $res[$j]->longitude . "?exclude=minutely?exclude=hourly");
         }
 
 

Spacing +13 added lines, -13 removed lines

@@ -8,8 +8,8 @@ 
         $timeRefined = $time;
 
         $dates = [];
-        for ($i=0; $i < $days; $i++) {
-            $date = strtotime($timeRefined . "-" . $i ."day");
+        for ($i = 0; $i < $days; $i++) {
+            $date = strtotime($timeRefined . "-" . $i . "day");
             array_push($dates, date("Y-m-d", $date) . "T" . date("h:m:s", $date));
         }
 
@@ -19,17 +19,17 @@ 
 
     public static function wheatherThirtyActionGet($res = null, $time = null, $accessKey = null) : array
     {
-        for ($j=0; $j < count($time); $j++) {
-            ${"ch$j"}  = curl_init('https://api.darksky.net/forecast/'.$accessKey.'/'.$res[0]->latitude .
-                  ','. $res[0]->longitude . "," . $time[$j] . "?exclude=minutely?exclude=hourly");
+        for ($j = 0; $j < count($time); $j++) {
+            ${"ch$j"} = curl_init('https://api.darksky.net/forecast/' . $accessKey . '/' . $res[0]->latitude .
+                  ',' . $res[0]->longitude . "," . $time[$j] . "?exclude=minutely?exclude=hourly");
         }
           $mhcurl = curl_multi_init();
-        for ($i=0; $i < count($time); $i++) {
+        for ($i = 0; $i < count($time); $i++) {
             curl_setopt(${"ch$i"}, CURLOPT_RETURNTRANSFER, true);
             curl_multi_add_handle($mhcurl, ${"ch$i"});
         }
           $responseArray = [];
-        for ($k=0; $k < count($time); $k++) {
+        for ($k = 0; $k < count($time); $k++) {
             $running = null;
             do {
                 curl_multi_exec($mhcurl, $running);
@@ -48,20 +48,20 @@ 
 
     public static function wheatherActionGet($res = null, $accessKey = null) : array
     {
-        for ($j=0; $j < count($res); $j++) {
-            ${"ch$j"}  = curl_init('https://api.darksky.net/forecast/'.$accessKey.'/'.$res[$j]->latitude .
-              ','. $res[$j]->longitude . "?exclude=minutely?exclude=hourly");
+        for ($j = 0; $j < count($res); $j++) {
+            ${"ch$j"} = curl_init('https://api.darksky.net/forecast/' . $accessKey . '/' . $res[$j]->latitude .
+              ',' . $res[$j]->longitude . "?exclude=minutely?exclude=hourly");
         }
 
 
 
         $mhcurl = curl_multi_init();
-        for ($i=0; $i < count($res); $i++) {
+        for ($i = 0; $i < count($res); $i++) {
             curl_setopt(${"ch$i"}, CURLOPT_RETURNTRANSFER, true);
             curl_multi_add_handle($mhcurl, ${"ch$i"});
         }
         $responseArray = [];
-        for ($k=0; $k < count($res); $k++) {
+        for ($k = 0; $k < count($res); $k++) {
             $running = null;
             do {
                 curl_multi_exec($mhcurl, $running);
@@ -82,7 +82,7 @@ 
     public function streetActionGet($lat, $long) : string
     {
 
-        $curlh  = curl_init('https://nominatim.openstreetmap.org/reverse?email=maraphostv@gmail.com&format=jsonv2&lat=' .$long. "&lon=".$lat);
+        $curlh = curl_init('https://nominatim.openstreetmap.org/reverse?email=maraphostv@gmail.com&format=jsonv2&lat=' . $long . "&lon=" . $lat);
 
         curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
 

src/IpValidators/InternalValidator.php

Indentation +4 added lines, -4 removed lines

@@ -24,9 +24,9 @@
                 return [$ipInfoJson];
             }
         }
-          $ipInfo["Type"] = "Invalid IP";
-          $ipInfo["Domain"] = "None";
-          $ipInfoJson = json_encode($ipInfo, JSON_PRETTY_PRINT);
-          return [$ipInfoJson];
+            $ipInfo["Type"] = "Invalid IP";
+            $ipInfo["Domain"] = "None";
+            $ipInfoJson = json_encode($ipInfo, JSON_PRETTY_PRINT);
+            return [$ipInfoJson];
     }
 }

src/IpValidators/IpValidatorApi.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
         if (filter_var($ipAdress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
             $ipInfo["Type"] = "Valid IPv4";
-            $ipInfo["Domain"] = gethostbyaddr($ipAdress) ?? "" ;
+            $ipInfo["Domain"] = gethostbyaddr($ipAdress) ?? "";
             $ipInfoJson = json_encode($ipInfo, JSON_PRETTY_PRINT);
             return [$ipInfoJson];
         } else {

src/IpValidators/ExternalApi.php

Indentation +30 added lines, -30 removed lines

@@ -10,27 +10,27 @@ 
     public function validateipActionGet($ipAdress = null, $accessKey = null) : string
     {
 
-      // $url = "apikey.json";
-      // $data = file_get_contents("http://" . $_SERVER["HTTP_HOST"] . "/dbwebb/ramverk1/me/redovisa/src/IpValidators/apikey.json");
-      // $keytest = json_decode($data);
-      //
-      //
-      // $accessKey = $keytest->api_key;
-      // echo $accessKey;
+        // $url = "apikey.json";
+        // $data = file_get_contents("http://" . $_SERVER["HTTP_HOST"] . "/dbwebb/ramverk1/me/redovisa/src/IpValidators/apikey.json");
+        // $keytest = json_decode($data);
+        //
+        //
+        // $accessKey = $keytest->api_key;
+        // echo $accessKey;
 
 
-          // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
-          $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
-          curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
+            // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
+            $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
+            curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
 
 
-          $json = curl_exec($curlh);
-          curl_close($curlh);
+            $json = curl_exec($curlh);
+            curl_close($curlh);
 
 
 
 
-          return $json;
+            return $json;
     }
 
 
@@ -42,22 +42,22 @@ 
         // $json_a = json_decode($string, true);
         // echo $json_a;
         // $accessKey = $keytest->api_key;
-          // Initialize CURL:
-
-          // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
-          $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
-          curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-
-          // Store the data:
-          $json = curl_exec($curlh);
-          curl_close($curlh);
-          print_r($json);
-          // Decode JSON response:
-          // $api_result = json_decode($json, true);
-          $apiResult = json_decode($json, true);
-          // Output the "capital" object inside "location"
-          // print_r($api_result);
-
-          return $apiResult;
+            // Initialize CURL:
+
+            // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
+            $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
+            curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
+
+            // Store the data:
+            $json = curl_exec($curlh);
+            curl_close($curlh);
+            print_r($json);
+            // Decode JSON response:
+            // $api_result = json_decode($json, true);
+            $apiResult = json_decode($json, true);
+            // Output the "capital" object inside "location"
+            // print_r($api_result);
+
+            return $apiResult;
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
 
           // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
-          $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
+          $curlh = curl_init('http://api.ipstack.com/' . $ipAdress . '?access_key=' . $accessKey . '');
           curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
 
 
@@ -45,7 +45,7 @@ 
           // Initialize CURL:
 
           // http://api.ipstack.com/79.138.27.9?access_key=ae68fdd7e0843f6cbbaf81475db34e24
-          $curlh  = curl_init('http://api.ipstack.com/'.$ipAdress.'?access_key='.$accessKey.'');
+          $curlh = curl_init('http://api.ipstack.com/' . $ipAdress . '?access_key=' . $accessKey . '');
           curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
 
           // Store the data:

src/Controller/DarkSkyController.php

Indentation +59 added lines, -59 removed lines

@@ -1,48 +1,48 @@ 
 <?php
 namespace Anax\Controller;
 
-  use \Anax\darkSkyApi;
+    use \Anax\darkSkyApi;
 
-  use Anax\Commons\ContainerInjectableInterface;
+    use Anax\Commons\ContainerInjectableInterface;
 
-  use Anax\Commons\ContainerInjectableTrait;
+    use Anax\Commons\ContainerInjectableTrait;
 
 class DarkSkyController implements ContainerInjectableInterface
 {
-      use ContainerInjectableTrait;
+        use ContainerInjectableTrait;
 
     public function indexAction() : object
     {
-          $title = " | Ip Json API";
-          $page = $this->di->get("page");
-          $page->add(
-              "anax/v2/DarkskyApi/darkSkyApi",
-              [
-                  "header" => "hello",
-                  "text" => "text",
-              ]
-          );
-          return $page->render([
-              "title" => "$title"
-          ]);
+            $title = " | Ip Json API";
+            $page = $this->di->get("page");
+            $page->add(
+                "anax/v2/DarkskyApi/darkSkyApi",
+                [
+                    "header" => "hello",
+                    "text" => "text",
+                ]
+            );
+            return $page->render([
+                "title" => "$title"
+            ]);
     }
 
 
 
     public function indexJsonAction() : object
     {
-          $title = " | Ip Json API";
-          $page = $this->di->get("page");
-          $page->add(
-              "anax/v2/DarkskyApi/darkSkyApiJson",
-              [
-                  "header" => "hello",
-                  "text" => "text",
-              ]
-          );
-          return $page->render([
-              "title" => "$title"
-          ]);
+            $title = " | Ip Json API";
+            $page = $this->di->get("page");
+            $page->add(
+                "anax/v2/DarkskyApi/darkSkyApiJson",
+                [
+                    "header" => "hello",
+                    "text" => "text",
+                ]
+            );
+            return $page->render([
+                "title" => "$title"
+            ]);
     }
 
 
@@ -83,14 +83,14 @@ 
         $dates = $darkClass::wheatherSevenActionGet(30, $time);
         $resThirtyDaysRequest = $darkClass::wheatherThirtyActionGet($array, $dates, $darkSkyKey);
 
-          // try {
-          //   if (array_key_exists("code",$res)) {
-          //     throw new \Exception("Value must be 1 or below");
-          //   }
-          //
-          // } catch (\Exception $e) {
-          //   return $res[0];
-          // }
+            // try {
+            //   if (array_key_exists("code",$res)) {
+            //     throw new \Exception("Value must be 1 or below");
+            //   }
+            //
+            // } catch (\Exception $e) {
+            //   return $res[0];
+            // }
 
         $streetname = $darkClass->streetActionGet($coordinates->longitude, $coordinates->latitude);
         //
@@ -100,21 +100,21 @@ 
 
         // $datesJson = json_encode($dates);
         // print_r(strtotime("2010-05-17 + 1 day"));
-          $title = " | Ip Json API";
-          $page = $this->di->get("page");
-          $page->add(
-              "anax/v2/DarkskyApi/darkRes",
-              [
-                  "header" => "hello",
-                  "res" => $res,
-                  "ogDate" => $time,
-                  "resThirty" => $resThirtyDaysRequest,
-                  "streetname" => $streetname
-              ]
-          );
-          return $page->render([
-              "title" => "$title"
-          ]);
+            $title = " | Ip Json API";
+            $page = $this->di->get("page");
+            $page->add(
+                "anax/v2/DarkskyApi/darkRes",
+                [
+                    "header" => "hello",
+                    "res" => $res,
+                    "ogDate" => $time,
+                    "resThirty" => $resThirtyDaysRequest,
+                    "streetname" => $streetname
+                ]
+            );
+            return $page->render([
+                "title" => "$title"
+            ]);
     }
 
 
@@ -158,14 +158,14 @@ 
 
         $dates = $darkClass::wheatherSevenActionGet(30, $time);
         $resThirtyDaysRequest = $darkClass::wheatherThirtyActionGet($array, $dates, $darkSkyKey);
-          // try {
-          //   if (array_key_exists("code",$res)) {
-          //     throw new \Exception("must be ip or coordinates");
-          //   }
-          //
-          // } catch (\Exception $e) {
-          //   return $res;
-          // }
+            // try {
+            //   if (array_key_exists("code",$res)) {
+            //     throw new \Exception("must be ip or coordinates");
+            //   }
+            //
+            // } catch (\Exception $e) {
+            //   return $res;
+            // }
         array_push($resArray, json_decode($res[0], JSON_PRETTY_PRINT));
         array_push($resArray, $resThirtyDaysRequest);
 

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
         $time = $this->di->get("request")->getPost("date") ?? "";
         $ipInfo["IP"] = $this->di->get("request")->getPost("ip") ?? $ipAdress;
         $array = [];
-        $apiEx =  $this->di->get("ExternalApi");
+        $apiEx = $this->di->get("ExternalApi");
         $res = $apiEx->validateipActionGet($ipInfo["IP"], $keykey);
 
         $obj = json_decode($res);
@@ -131,7 +131,7 @@ 
         $darkSkyKey = $this->di->get("apikeyDarkSky");
 
         $array = [];
-        $apiEx =  $this->di->get("ExternalApi");
+        $apiEx = $this->di->get("ExternalApi");
         $res = $apiEx->validateipActionGet($ipInfo["IP"], $keykey);
 
 

src/Controller/ApiExternalController.php

Indentation +20 added lines, -20 removed lines

@@ -40,20 +40,20 @@ 
          */
     public function indexAction() : object
     {
-          $title = " | Ip Json API";
-          $page = $this->di->get("page");
-          $page->add(
-              "anax/v2/ip-validator/apiExternal",
-              [
-                  "header" => "hello",
-                  "text" => "text",
-              ]
-          );
-
-
-          return $page->render([
-              "title" => "$title"
-          ]);
+            $title = " | Ip Json API";
+            $page = $this->di->get("page");
+            $page->add(
+                "anax/v2/ip-validator/apiExternal",
+                [
+                    "header" => "hello",
+                    "text" => "text",
+                ]
+            );
+
+
+            return $page->render([
+                "title" => "$title"
+            ]);
     }
 
 
@@ -63,16 +63,16 @@ 
         $title = " | Ip info";
         $page = $this->di->get("page");
         $page->add("anax/v2/ip-validator/externalInfo", [
-          "ip" => $this->di->get("request")->getGet("ip"),
-          "type" => $this->di->get("request")->getGet("type"),
-          "country" => $this->di->get("request")->getGet("country"),
-          "latitude" => $this->di->get("request")->getGet("latitude"),
-          "longitude" => $this->di->get("request")->getGet("longitude")
+            "ip" => $this->di->get("request")->getGet("ip"),
+            "type" => $this->di->get("request")->getGet("type"),
+            "country" => $this->di->get("request")->getGet("country"),
+            "latitude" => $this->di->get("request")->getGet("latitude"),
+            "longitude" => $this->di->get("request")->getGet("longitude")
         ]);
 
 
         return $page->render([
-          "title" => "$title"
+            "title" => "$title"
         ]);
     }
 

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         //     $ipInfo["IP"] = $ipAdress;
         // }
         $ipInfo["IP"] = $this->di->get("request")->getGet("ip") ?? $ipAdress;
-        $apiEx =  $this->di->get("ExternalApi");
+        $apiEx = $this->di->get("ExternalApi");
         $res = $apiEx->validateipActionGet($ipInfo["IP"], $keykey);
         $obj = $res;
         $obj = json_decode($res);

view/anax/v2/ip-validator/externalInfo.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Anax\View;
 
-$cord = $longitude .  "%2C"  . $latitude  ."&amp;layer=mapnik&amp;marker=" . $latitude . "%2C" . $longitude  . "";
+$cord = $longitude . "%2C" . $latitude . "&amp;layer=mapnik&amp;marker=" . $latitude . "%2C" . $longitude . "";
 print_r($cord);
 ?>
 

view/anax/v2/ip-validator/ipValidator.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-namespace Anax\View ;
+namespace Anax\View;
 
 use Anax\Controller;
 

view/anax/v2/DarkskyApi/darkRes.php

Indentation +20 added lines, -20 removed lines

@@ -16,26 +16,26 @@
 
     $cord = $resObj->longitude  .  "%2C"  . $resObj->latitude  ."&layer=mapnik&marker=" . $resObj->latitude . "%2C" . $resObj->longitude   . "";
 
-  // $resDecoded = parse_str($res, $output);
-  // // print_r($output[0]);
-  // $myobj = json_decode($output[0]);
-  // $myobj = $output;
-  //
-  //
-  //
-  //
-  // print_r($god);
-  // // print_r($myobj->daily);
-  // $array =  (array) $myobj;
-  // // print_r($myobj[0]);
-  // $myobj2 = json_decode($myobj[0], true);
-  // // print_r(array_keys($myobj2));
-  // $array =  (array) $myobj2;
-  // print_r($array["latitude"]);
-  // print_r($array[0]);
-  //
-  // print_r($myobj2);
-  // print_r($array["daily"]);
+    // $resDecoded = parse_str($res, $output);
+    // // print_r($output[0]);
+    // $myobj = json_decode($output[0]);
+    // $myobj = $output;
+    //
+    //
+    //
+    //
+    // print_r($god);
+    // // print_r($myobj->daily);
+    // $array =  (array) $myobj;
+    // // print_r($myobj[0]);
+    // $myobj2 = json_decode($myobj[0], true);
+    // // print_r(array_keys($myobj2));
+    // $array =  (array) $myobj2;
+    // print_r($array["latitude"]);
+    // print_r($array[0]);
+    //
+    // print_r($myobj2);
+    // print_r($array["daily"]);
     ?>
 <br>
 <br>

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 namespace Anax\View;
 
-$res1  = (array) $res[0];
+$res1 = (array) $res[0];
 $resObj = json_decode($res1[0]);
 if (isset($resObj->latitude)) {
     $streetinfo = json_decode($streetname);
-    $streetinfoArray  = (array) $streetinfo;
+    $streetinfoArray = (array) $streetinfo;
 
-    $resThirty1  = (array) $resThirty;
+    $resThirty1 = (array) $resThirty;
     $data = $resObj->daily->data;
 
 
     $dataThirty = $resThirty1;
 
 
-    $cord = $resObj->longitude  .  "%2C"  . $resObj->latitude  ."&amp;layer=mapnik&amp;marker=" . $resObj->latitude . "%2C" . $resObj->longitude   . "";
+    $cord = $resObj->longitude . "%2C" . $resObj->latitude . "&amp;layer=mapnik&amp;marker=" . $resObj->latitude . "%2C" . $resObj->longitude . "";
 
   // $resDecoded = parse_str($res, $output);
   // // print_r($output[0]);
@@ -72,7 +72,7 @@ 
   <h3>Past week</h3>
   <br>
   <br>
-    <?php for ($i=0; $i < count($data); $i++) { ?>
+    <?php for ($i = 0; $i < count($data); $i++) { ?>
       <div style="border-style: solid; float:left; font-size: 0.8rem; width: 10rem; height:12rem;">
           <table>
           <tbody>
@@ -99,7 +99,7 @@ 
   <h3>Past thirty days</h3>
   <br>
   <br>
-    <?php for ($i=0; $i < count($dataThirty); $i++) { ?>
+    <?php for ($i = 0; $i < count($dataThirty); $i++) { ?>
       <div style="border-style: solid; float:left; font-size: 0.8rem; width: 10rem; height:12rem; background-color:grey;">
           <table>
           <tbody>