cleanup more

attogram · attogram · commit 82f0d78f7978 · 2020-03-09T10:11:18.000+01:00
diff --git a/public/test.php b/public/test.php
@@ -12,40 +12,44 @@
 
 require('../src/Weatherbit.php');
 
-$call    = isset($_GET['call']) ? $_GET['call'] : '';
-$key     = isset($_GET['key']) ? $_GET['key'] : '';
-$city    = isset($_GET['city']) ? $_GET['city'] : '';
-$country = isset($_GET['country']) ? $_GET['country'] : '';
-$days    = isset($_GET['days']) ? intval($_GET['days']) : 1;
-$ip      = isset($_GET['ip']) ? $_GET['ip'] : $_SERVER['REMOTE_ADDR'];
+$call      = isset($_GET['call']) ? $_GET['call'] : '';
+$key       = isset($_GET['key']) ? $_GET['key'] : '';
+$city      = isset($_GET['city']) ? $_GET['city'] : '';
+$country   = isset($_GET['country']) ? $_GET['country'] : '';
+$days      = isset($_GET['days']) ? intval($_GET['days']) : 1;
+$ipAddress = isset($_GET['ip']) ? $_GET['ip'] : $_SERVER['REMOTE_ADDR'];
+
+$selected = ' selected="selected"';
+$callSelected = [];
+$callSelected['forecast'] = ($call == 'forecast') ? $selected : '';
+$callSelected['current'] = ($call == 'current') ? $selected : '';
+$callSelected['usage'] = ($call == 'usage') ? $selected : '';
 
 $pageTitle= 'Weatherbit v' . Weatherbit::VERSION . ' web test';
 
-?>
-<html>
+print '<html>
   <head>
-    <title><?= $pageTitle ?></title>
+    <title>' . $pageTitle . '</title>
   </head>
   <body>
-    <h1><?= $pageTitle ?></h1>
+    <h1>' . $pageTitle  . '</h1>
     <form>
         Call: <select name="call">
-            <option value="forecast"<?= $call == 'forecast' ? ' selected="selected"' : '' ?>>Daily Weather Forecast</option>
-            <option value="current"<?= $call == 'current' ? ' selected="selected"' : '' ?>>Current Weather</option>
-            <option value="usage"<?= $call == 'usage' ? ' selected="selected"' : '' ?>>API Usage</option>
+            <option value="forecast"' . $callSelected['forecast'] . '>Daily Weather Forecast</option>
+            <option value="current"' . $callSelected['current']  . '>Current Weather</option>
+            <option value="usage"' . $callSelected['usage']  . '>API Usage</option>
         </select><br /><br />
-        API Key: <input name="key" type="text" value="<?= htmlentities($key) ?>" size="35" /><br /><br />
-        City: <input name="city" type="text" value="<?= htmlentities($city) ?>" size="20" /><br /><br />
-        Country: <input name="country" type="text" value="<?= htmlentities($country) ?>" size="2" maxlength="2" />
+        API Key: <input name="key" type="text" value="' . htmlentities($key) . '" size="35" /><br /><br />
+        City: <input name="city" type="text" value="' . htmlentities($city) . '" size="20" /><br /><br />
+        Country: <input name="country" type="text" value="' . htmlentities($country) . '" size="2" maxlength="2" />
             (2 Letter Country Code)<br /><br />
-        Forecast Days (1-16): <input name="days" type="text" value="<?= $days ?>" size="2" maxlength="2" /><br /><br />
-        IP: <input name="ip" type="text" value="<?= $ip ?>" size="20" />
+        Forecast Days (1-16): <input name="days" type="text" value="' . $days . '" size="2" maxlength="2" /><br /><br />
+        IP Address: <input name="ip" type="text" value="' . $ipAddress . '" size="20" />
         <br /><br />
         <input type="hidden" name="run" value="test" />
         <input type="submit" value="  Get Weatherbit API Response  " />
-        &nbsp; &nbsp; <a href="<?= $_SERVER['PHP_SELF'] ?>">reset</a>
-    </form>
-<?php
+        &nbsp; &nbsp; <a href="' . $_SERVER['PHP_SELF'] . '">reset</a>
+    </form>';
 
 if (!isset($_GET['run']) || $_GET['run'] != 'test') {
     testFooter();
@@ -73,7 +77,8 @@
             $data = $weatherbit->getUsage();
             break;
         default:
-            throw new Exception('Invalid Call type');
+            $error = 'Invalid Call type';
+            break;
     }
 } catch (Exception $error) {
     $error = $error->getMessage();
diff --git a/src/Weatherbit.php b/src/Weatherbit.php
@@ -18,7 +18,7 @@
 
 class Weatherbit
 {
-    const VERSION = '1.1.2';
+    const VERSION = '1.1.3';
 
     /**
      * @var string - user agent for API requests

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`class Weatherbit`
`20`	`20`	`{`
`21`		`- const VERSION = '1.1.2';`
	`21`	`+ const VERSION = '1.1.3';`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @var string - user agent for API requests`