mahm17 / ramverk1-module

view/weather/weather_data.php

Spacing +14 added lines, -14 removed lines

@@ -4,27 +4,27 @@
 
 ?>
 <h1> Weather data based on IP-address</h1>
-<?php if ($resTwo["type"] == null) : ?>
+<?php if ($resTwo[ "type" ] == null) : ?>
     <p>This isn't a valid IP-address</p>
 <?php else : ?>
-    <p>IP-address: <?= $resTwo["ip"] ?></p>
-    <p>Continent: <?= $resTwo["continent_name"] ?></p>
-    <p>Country: <?= $resTwo["country_name"] ?></p>
-    <p>Region: <?= $resTwo["region_name"] ?></p>
-    <p>City: <?= $resTwo["city"] ?></p>
-    <p>Latitude: <?= $resTwo["latitude"] ?></p>
-    <p>Longitude: <?= $resTwo["longitude"] ?></p>
+    <p>IP-address: <?= $resTwo[ "ip" ] ?></p>
+    <p>Continent: <?= $resTwo[ "continent_name" ] ?></p>
+    <p>Country: <?= $resTwo[ "country_name" ] ?></p>
+    <p>Region: <?= $resTwo[ "region_name" ] ?></p>
+    <p>City: <?= $resTwo[ "city" ] ?></p>
+    <p>Latitude: <?= $resTwo[ "latitude" ] ?></p>
+    <p>Longitude: <?= $resTwo[ "longitude" ] ?></p>
 <?php endif; ?>
 <?php if (sizeOf($resOne) == 2) : ?>
-    <p><?= $resOne["error"] ?></p>
+    <p><?= $resOne[ "error" ] ?></p>
 <?php else : ?>
     <h2>Weather for day/time</h2>
-    <?php foreach ($resOne["daily"]["data"] as $value) : ?>
-        <h3><?= gmdate("Y-m-d/H:i:s", $value["time"]) ?></h3>
-        <p>Weather: <?= $value["summary"] ?></p>
+    <?php foreach ($resOne[ "daily" ][ "data" ] as $value) : ?>
+        <h3><?= gmdate("Y-m-d/H:i:s", $value[ "time" ]) ?></h3>
+        <p>Weather: <?= $value[ "summary" ] ?></p>
     <?php endforeach ?>
 <?php endif ?>
-<?php if (!$resTwo["type"] == null) : ?>
+<?php if (!$resTwo[ "type" ] == null) : ?>
     <h2>Karta över platsen</h2>
-    <iframe width="75%" height="550" src="http://www.openstreetmap.org/export/embed.html?bbox=<?= $resTwo["longitude"] ?>%2C<?= $resTwo["latitude"] ?>%2C<?= $resTwo["longitude"] ?>%2C<?= $resTwo["latitude"] ?>&marker=<?= $resTwo["latitude"] ?>%2C<?= $resTwo["longitude"] ?>&layers=ND"></iframe>
+    <iframe width="75%" height="550" src="http://www.openstreetmap.org/export/embed.html?bbox=<?= $resTwo[ "longitude" ] ?>%2C<?= $resTwo[ "latitude" ] ?>%2C<?= $resTwo[ "longitude" ] ?>%2C<?= $resTwo[ "latitude" ] ?>&marker=<?= $resTwo[ "latitude" ] ?>%2C<?= $resTwo[ "longitude" ] ?>&layers=ND"></iframe>
 <?php endif; ?>

Braces +10 added lines, -4 removed lines

@@ -6,7 +6,8 @@ 
 <h1> Weather data based on IP-address</h1>
 <?php if ($resTwo["type"] == null) : ?>
     <p>This isn't a valid IP-address</p>
-<?php else : ?>
+<?php else {
+    : ?>
     <p>IP-address: <?= $resTwo["ip"] ?></p>
     <p>Continent: <?= $resTwo["continent_name"] ?></p>
     <p>Country: <?= $resTwo["country_name"] ?></p>
@@ -14,10 +15,13 @@ 
     <p>City: <?= $resTwo["city"] ?></p>
     <p>Latitude: <?= $resTwo["latitude"] ?></p>
     <p>Longitude: <?= $resTwo["longitude"] ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 <?php if (sizeOf($resOne) == 2) : ?>
     <p><?= $resOne["error"] ?></p>
-<?php else : ?>
+<?php else {
+    : ?>
     <h2>Weather for day/time</h2>
     <?php foreach ($resOne["daily"]["data"] as $value) : ?>
         <h3><?= gmdate("Y-m-d/H:i:s", $value["time"]) ?></h3>
@@ -27,4 +31,6 @@ 
 <?php if (!$resTwo["type"] == null) : ?>
     <h2>Karta över platsen</h2>
     <iframe width="75%" height="550" src="http://www.openstreetmap.org/export/embed.html?bbox=<?= $resTwo["longitude"] ?>%2C<?= $resTwo["latitude"] ?>%2C<?= $resTwo["longitude"] ?>%2C<?= $resTwo["latitude"] ?>&marker=<?= $resTwo["latitude"] ?>%2C<?= $resTwo["longitude"] ?>&layers=ND"></iframe>
-<?php endif; ?>
+<?php endif;
+}
+?>

src/Weather/WeatherController.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
         $page = $this->di->get("page");
         $curl = $this->di->get("curl");
 
-        $curl->getIpData($this->address, $this->api["ip_key"]);
-        $curl->getWeatherData($this->api["weather_key"]);
+        $curl->getIpData($this->address, $this->api[ "ip_key" ]);
+        $curl->getWeatherData($this->api[ "weather_key" ]);
 
         $resOne = $curl->weatherData;
         $resTwo = $curl->ipData;

src/Weather/WeatherJsonController.php

Spacing +6 added lines, -6 removed lines

@@ -14,24 +14,24 @@
         $this->api = require ANAX_INSTALL_PATH . "/config/keys.php";
         $address = $this->di->get("request")->getGet("address");
         $curl = $this->di->get("curl");
-        $curl->getIpData($address, $this->api["ip_key"]);
-        $curl->getWeatherData($this->api["weather_key"]);
+        $curl->getIpData($address, $this->api[ "ip_key" ]);
+        $curl->getWeatherData($this->api[ "weather_key" ]);
         $resOne = $curl->weatherData;
         $resTwo = $curl->ipData;
 
         if (sizeOf($resOne) == 2) {
             $json = [
-                "error" => $resOne["error"],
+                "error" => $resOne[ "error" ],
             ];
 
-            return [$json];
+            return [ $json ];
         } else {
             $json = [
                 "ip_data" => $resTwo,
-                "daily_weather" => $resOne["daily"]["data"],
+                "daily_weather" => $resOne[ "daily" ][ "data" ],
             ];
 
-            return [$json];
+            return [ $json ];
         }
     }
 }

src/Model/CurlWrapModel.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 class CurlWrapModel implements ContainerInjectableInterface
 {
     use ContainerInjectableTrait;
-    public $ipData = [];
-    public $weatherData = [];
-    public $map = [];
+    public $ipData = [ ];
+    public $weatherData = [ ];
+    public $map = [ ];
 
     public function getIpData($address, $key)
     {
@@ -29,7 +29,7 @@ 
 
     public function getWeatherData($weatherKey)
     {
-        $curl = curl_init('https://api.darksky.net/forecast/' . $weatherKey . '/' . $this->ipData["latitude"] . "," . $this->ipData["longitude"]);
+        $curl = curl_init('https://api.darksky.net/forecast/' . $weatherKey . '/' . $this->ipData[ "latitude" ] . "," . $this->ipData[ "longitude" ]);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
         // Store the data:

config/database_sample.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  *  "dsn" => "sqlite:memory::",
  *
  */
-if ($_SERVER["SERVER_NAME"] === "www.student.bth.se") {
+if ($_SERVER[ "SERVER_NAME" ] === "www.student.bth.se") {
     return [
         "dsn"             => "mysql:host=blu-ray.student.bth.se;dbname=mos;",
         "username"        => "mos",

config/commons.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@ 
 error_reporting(-1); // Report all type of errors
 //error_reporting(E_ALL ^ E_DEPRECATED);  // Report no deprecated errors
 if (constant("ANAX_DEVELOPMENT")) {
-    ini_set("display_errors", 1);  // Display all errors
+    ini_set("display_errors", 1); // Display all errors
 } elseif (constant("ANAX_PRODUCTION")) {
-    ini_set("display_errors", 0);  // Display no errors
-    ini_set("log_errors", 1);      // Log errors to file error_log
+    ini_set("display_errors", 0); // Display no errors
+    ini_set("log_errors", 1); // Log errors to file error_log
     ini_set("error_log", ANAX_INSTALL_PATH . "/log/error_log");
 }
 
@@ -36,7 +36,7 @@ 
 /**
  * Default exception handler.
  */
-set_exception_handler(function ($e) {
+set_exception_handler(function($e) {
     echo "<p>Anax: Uncaught exception:</p><p>Line "
         . $e->getLine()
         . " in file "

config/di/textfilter.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     "services" => [
         "textfilter" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 $filter = new \Anax\TextFilter\TextFilter();
                 if (is_dir(ANAX_INSTALL_PATH . "/content")) {
                     $filter->setFilterConfig("frontmatter", [

config/di/configuration.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     "services" => [
         "configuration" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 $config = new \Anax\Configure\Configuration();
                 $dirs = require ANAX_INSTALL_PATH . "/config/configuration.php";
                 $config->setBaseDirectories($dirs);

config/di/curl.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     "services" => [
         "curl" => [
             "shared" => true,
-            "callback" => function () {
+            "callback" => function() {
                 $curlWrap = new \Anax\Models\CurlWrapModel();
                 return $curlWrap;
             }