Merge pull request #1666 from akrherz/260625-2

Address lint

Author: akrherz

htdocs/COOP/current.phtml

@@ -173,7 +173,7 @@ $cols = array(
     "phour" => "Rainfall One Hour", "snoww" => "Snow Water Equivalent"
 );
 if (!array_key_exists($sortcol, $cols)) {
-    xssafe("</script>");
+    die405();
 }
 $t->current_network = "COOP";
 

htdocs/DCP/current.phtml

@@ -8,17 +8,17 @@ require_once "../../include/forms.php";
 require_once "../../include/mlib.php";
 $pgconn = iemdb('iem');
 
-$sortcol = isset($_GET['sortcol']) ? xssafe($_GET['sortcol']) : "valid";
+$sortcol = get_str404("sortcol", "valid");
 $network = get_str404("network", 'IA_DCP', 9);
-$shef = isset($_REQUEST['shef']) && $_REQUEST['shef'] == 'yes';
+$shef = get_str404("shef", "no") === 'yes';
 
 $t->title = "DCP/GOES Current Conditions";
 $t->refresh = 600;
 
 $t->breadcrumbs = <<<EOM
-<ol class="breadcrumb">
-<li><a href="/DCP/">DCP Network</a></li>
-<li class="active">Sortable Currents</li>
+<ol class="breadcrumb mb-0">
+<li class="breadcrumb-item"><a href="/DCP/">DCP Network</a></li>
+<li class="breadcrumb-item active" aria-current="page">Sortable Currents</li>
 </ol>
 EOM;
 $cols = array(
@@ -33,7 +33,7 @@ $cols = array(
     'TWIZ' => 'Water Temperature',
 );
 if (!array_key_exists($sortcol, $cols)) {
-    xssafe("</script>");
+    die405();
 }
 
 $stname = iem_pg_prepare(
@@ -67,26 +67,55 @@ while ($row = pg_fetch_assoc($rs)) {
 $final = aSortBySecondIndex($obs, $sortcol, "desc");
 
 $nselect = selectNetworkType("DCP", $network);
+$nselect = str_replace('class="iemselect2"', 'class="iemselect2 form-select"', $nselect);
+$nselect = str_replace('<select ', '<select id="network-select" ', $nselect);
 
 $ar = array("no" => "No", "yes" => "Yes");
-$sselect = make_select("shef", $shef, $ar);
+$sselect = make_select(
+    "shef",
+    $shef ? "yes" : "no",
+    $ar,
+    "",
+    "form-select",
+    FALSE,
+    FALSE,
+    TRUE,
+    array("id" => "shef-select")
+);
 
 $t->current_network = "DCP";
-$baseurl2 = "current.phtml?network=$network&sortcol=";
+$shefqs = $shef ? "&shef=yes" : "";
+$baseurl2 = "current.phtml?network=$network{$shefqs}&sortcol=";
 
 $content = <<<EOM
-<form method="GET" action="current.phtml" name="myselector">
-<input type="hidden" name="sortcol" value="{$sortcol}">
-<strong>Select Network:</strong> {$nselect}
-
-<strong>Show SHEF Codes:</strong> {$sselect}
-
-<input type="submit" value="Go!">
-</form>
-
-<p>Sorted by: {$cols[$sortcol]}
-<table class="table table-sm table-striped table-bordered">
-<thead>
+<div class="card shadow-sm mb-3">
+    <div class="card-body">
+        <form method="GET" action="current.phtml" name="myselector" class="row g-3 align-items-end">
+            <input type="hidden" name="sortcol" value="{$sortcol}">
+            <div class="col-12 col-lg-6">
+                <label for="network-select" class="form-label mb-1">Select Network</label>
+                {$nselect}
+            </div>
+            <div class="col-12 col-md-4 col-lg-3">
+                <label for="shef-select" class="form-label mb-1">Show SHEF Codes</label>
+                {$sselect}
+            </div>
+            <div class="col-12 col-md-4 col-lg-3">
+                <button type="submit" class="btn btn-primary w-100">Update View</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-2 mb-2">
+    <p class="mb-0">Sorted by: <span class="badge text-bg-light">{$cols[$sortcol]}</span></p>
+    <p class="text-body-secondary small mb-0">Rows with stale observations are highlighted.</p>
+</div>
+
+<div class="table-responsive">
+<table class="table table-sm table-striped table-bordered table-hover align-middle mb-0">
+<caption class="caption-top">Latest DCP/GOES observations for selected state.</caption>
+<thead class="table-light">
 <tr>
   <th><a href="{$baseurl2}station">SiteID:</a></th>
   <th><a href="{$baseurl2}name">Station Name:</a></th>
@@ -104,15 +133,15 @@ $now = time();
 foreach ($final as $site => $value) {
     $url = sprintf("/sites/site.php?station=%s&network=%s", $site, $network);
     $content .= "<tr><td><a href=\"$url\">$site</a></td>
-    <td>" . $value["name"] . "</font></td>";
-    $content .= "<td ";
+    <td>" . $value["name"] . "</td>";
+    $content .= "<td class=\"text-nowrap";
     $tdiff = $now - $value["valid"];
     $dtfmt = "d M h:i A";
     if ($tdiff > (6 * 3600)) {
         $dtfmt = "d M Y h:i A";
-        $content .= 'bgcolor="red"';
+        $content .= ' table-danger fw-semibold';
     }
-    $content .= ">" . date($dtfmt, $value["valid"]) . "</td>";
+    $content .= "\">" . date($dtfmt, $value["valid"]) . "</td>";
 
     if (array_key_exists('HGIZ', $value)) {
         $content .= sprintf("<td>%s</td>", $value["HGIZ"]);
@@ -153,7 +182,7 @@ foreach ($final as $site => $value) {
 
     $content .= "</tr>";
     if ($shef) {
-        $content .= "<tr><td colspan=\"9\">";
+        $content .= "<tr class=\"table-secondary\"><td colspan=\"9\" class=\"small font-monospace\">";
         foreach ($value as $k => $v) {
             if ($k == 'name' || $k == 'valid') continue;
             $content .= sprintf("/%s %s ", $k, $v);
@@ -165,6 +194,7 @@ $content .= <<<EOM
 </tbody><tfoot>
 <tr><td colspan="9">&nbsp;</td></tr>
 </tfoot></table>
+</div>
 EOM;
 $t->content = $content;
 $t->render('sortables.phtml');

htdocs/DCP/index.phtml

@@ -44,15 +44,15 @@ about this dataset.</p>
 <li><a href='/request/dcp/fe.phtml'><i class="bi bi-download" aria-hidden="true"></i> Download from the archive</a>
   <br />Download the observations from the archive.</li>
 </ul>
-<p>
-
 
-<b>References:</b><br>
-<b>1</b> <a
+<p>
+<strong>References:</strong>
+<br />
+<strong>1</strong> <a
 href="https://hads.ncep.noaa.gov/dcp_operators.shtml">https://hads.ncep.noaa.gov/dcp_operators.shtml</a>
-, viewed 12 Jul 2017
-<br><a href="https://water.usgs.gov/pubs/circ/circ1123/">https://water.usgs.gov/pubs/circ/circ1123/</a>
- , viewed: 21 May 2025
+, viewed 26 June 2026.
+</p>
+
 
 EOM;
 $t->render('single.phtml');

htdocs/DCP/site.css

@@ -2,4 +2,4 @@
     width: 100%;
     height: 400px;
     border: 2px solid black;
-}
+}

htdocs/DCP/site.phtml

@@ -1,5 +1,5 @@
 <?php
-$OL = "10.6.1";
+$OL = "10.9.0";
 require_once "../../config/settings.inc.php";
 define("IEM_APPID", 110);
 require_once "../../include/mlib.php";
@@ -12,8 +12,8 @@ require_once "../../include/forms.php";
 $day = get_int404("day", date("d"));
 $month = get_int404("month", date("m"));
 $year = get_int404("year", date("Y"));
-$station = isset($_GET['station']) ? xssafe($_GET['station']) : null;
-$shefvar = isset($_GET['shefvar']) ? xssafe($_GET['shefvar']) : null;
+$station = get_str404("station", null);
+$shefvar = get_str404("shefvar", null);
 $network = get_str404("network", 'IA_DCP', 9);
 
 $ts = mktime(1, 0, 0, $month, $day, $year);
@@ -120,9 +120,10 @@ EOM;
 } else {
     if (!$alone) {
         $extra = <<<EOM
-<div class="warning">This site is listed within the IEM database as both a 
-    "COOP" and "DCP" site. This printout below will only include a days 
-    worth of data.</div>
+<div class="warning">
+    Since this station identifier is dual listed as both a "COOP" and "DCP"
+    type station, the page will only list one day worth of data.
+</div>
 EOM;
     }
     $extra .= "<br /><br />

htdocs/GIS/apps/coop/gsplot.php

@@ -7,24 +7,49 @@
 
 $coopdb = iemdb("coop");
 
-$var = isset($_GET["var"]) ? xssafe($_GET["var"]) : "gdd50";
+$var = get_str404("var", "gdd50");
 $year = get_int404("year", date("Y"));
 $smonth = get_int404("smonth", 5);
 $sday = get_int404("sday", 1);
 $emonth = get_int404("emonth", date("m"));
 $eday = get_int404("eday", date("d"));
-$network = isset($_REQUEST["network"]) ? xssafe($_REQUEST["network"]) : "IACLIMATE";
-if (strlen($network) > 9){
-    xssafe("<tag>");
+$network = get_str404("network", "IACLIMATE", 9);
+
+$varDef = array(
+    "gdd32" => "Growing Degree Days (base=32)",
+    "gdd41" => "Growing Degree Days (base=41)",
+    "gdd46" => "Growing Degree Days (base=46)",
+    "gdd48" => "Growing Degree Days (base=48)",
+    "gdd50" => "Growing Degree Days (base=50)",
+    "gdd51" => "Growing Degree Days (base=51)",
+    "gdd52" => "Growing Degree Days (base=52)",
+    "cdd65" => "Cooling Degree Days (base=65)",
+    "hdd65" => "Heating Degree Days (base=65)",
+    "et" => "Potential Evapotranspiration",
+    "prec" => "Precipitation",
+    "sgdd50" => "Soil Growing Degree Days (base=50)",
+    "sdd86" => "Stress Degree Days (base=86)",
+    "mintemp" => "Minimum Temperature [F]",
+    "maxtemp" => "Maximum Temperature [F]",
+);
+if (!array_key_exists($var, $varDef)) {
+    die405();
 }
 
+
 $nt = new NetworkTable($network);
 $cities = $nt->table;
 
 $sts = new DateTime("{$year}-{$smonth}-{$sday}");
 $ets = new DateTime("{$year}-{$emonth}-{$eday}");
 
 
+/**
+ * Generate the page title
+ * @param MapObj $map
+ * @param imageObj $imgObj
+ * @param string $titlet
+ */
 function mktitlelocal($map, $imgObj, $titlet)
 {
 
@@ -36,6 +61,11 @@ function mktitlelocal($map, $imgObj, $titlet)
     $point->draw($map, $layer, $imgObj, 0, $titlet);
 }
 
+/**
+ * Generate a "No Data" message on the map
+ * @param MapObj $map
+ * @param imageObj $img
+ */
 function plotNoData($map, $img)
 {
     $layer = $map->getLayerByName("credits");
@@ -51,23 +81,6 @@ function plotNoData($map, $img)
     );
 }
 
-$varDef = array(
-    "gdd32" => "Growing Degree Days (base=32)",
-    "gdd41" => "Growing Degree Days (base=41)",
-    "gdd46" => "Growing Degree Days (base=46)",
-    "gdd48" => "Growing Degree Days (base=48)",
-    "gdd50" => "Growing Degree Days (base=50)",
-    "gdd51" => "Growing Degree Days (base=51)",
-    "gdd52" => "Growing Degree Days (base=52)",
-    "cdd65" => "Cooling Degree Days (base=65)",
-    "hdd65" => "Heating Degree Days (base=65)",
-    "et" => "Potential Evapotranspiration",
-    "prec" => "Precipitation",
-    "sgdd50" => "Soil Growing Degree Days (base=50)",
-    "sdd86" => "Stress Degree Days (base=86)",
-    "mintemp" => "Minimum Temperature [F]",
-    "maxtemp" => "Maximum Temperature [F]",
-);
 
 $rnd = array(
     "gdd32" => 0,

htdocs/GIS/apps/coop/gsplot.phtml

@@ -10,16 +10,13 @@ $coopdb = iemdb("coop");
 
 $t = new MyView();
 
-$var = isset($_GET["var"]) ? xssafe($_GET["var"]) : "gdd50";
+$var = get_str404("var", "gdd50");
 $year = get_int404("year", date("Y", time() - 86400));
 $smonth = get_int404("smonth", 5);
 $sday = get_int404("sday", 1);
 $emonth = get_int404("emonth", date("m", time() - 86400));
 $eday = get_int404("eday", date("d", time() - 86400));
-$network = isset($_REQUEST["network"]) ? xssafe($_REQUEST["network"]) : "IACLIMATE";
-if (strlen($network) > 9){
-    xssafe("<tag>");
-}
+$network = get_str404("network", "IACLIMATE", 9);
 
 $nt = new NetworkTable($network);
 $cities = $nt->table;

htdocs/GIS/apps/coop/index.php

@@ -17,8 +17,8 @@
 $nt = new NetworkTable("IACLIMATE");
 $cities = $nt->table;
 
-$plot = isset($_GET["plot"]) ? xssafe($_GET["plot"]) : "high";
-$area = isset($_GET["area"]) ? xssafe($_GET["area"]) : "all";
+$plot = get_str404("plot", "high");
+$area = get_str404("area", "all");
 $month = get_int404("month", date("m"));
 $day = get_int404("day", date("d"));
 
@@ -43,7 +43,7 @@
     "nw" => array($lx,           $ly + ($dy / 2), $ux - ($dx / 2), $uy)
 );
 if (!array_key_exists($area, $ex)) {
-    xssafe("<tag>");
+    die405();
 }
 
 $map->setextent($ex[$area][0], $ex[$area][1], $ex[$area][2], $ex[$area][3]);
@@ -100,7 +100,7 @@
     "high" => "Average High Temp [F]"
 );
 if (!array_key_exists($plot, $var)) {
-    xssafe("<tag>");
+    die405();
 }
 
 $dbdate = new DateTime("2000-{$month}-{$day}");
@@ -199,11 +199,11 @@
 
 <img src="{$url}" class="img img-fluid" />
    <br><i>You can right-click on the image to save it.</i>
-  <br><li>Only one year with the record value is shown, there may have been 
+  <br><li>Only one year with the record value is shown, there may have been
     more.</li>
 
    </div><div class="col-md-5">
-    
+
     <form name="f" method="GET" action="index.php">
 
 <table width="100%">
@@ -213,7 +213,7 @@
 
 <tr><td colspan=2>
   {$aselect}
-   <br><i>If you select a sub-region, the year of a record event will appear 
+   <br><i>If you select a sub-region, the year of a record event will appear
    as well.</i><br><br>
 
 </td></tr>
@@ -265,7 +265,7 @@
 
 <tr>
   <td colspan="2">
-  The black and red dots signify the climate record for the station.  Sites in 
+  The black and red dots signify the climate record for the station.  Sites in
   black date back till 1893 and sites in red to 1951.
 
 </td></tr>