Recent modifications for functionality

.gitignore

@@ -1,79 +1,79 @@
-#timelapse files
-cam.jpg
-camplus.jpg
-cam
-timelapse/weather*
-timelapse/pics/*
-timelapse/
-timelapse
-
-#Scripts
-scripts/
-scripts
-nanocharts/
-pbnotify.php
-pbnotify_test.php
-
-#Settings
-settings1.php
-
-#personal Weather Data
-mbcharts/*.csv
-mbcharts/*/*.csv
-jsondata/*.txt
-jsondata/*.json
-jsondata/*.html
-chartswudata/*
-#demodata/*
-mbridge/MBrealtimeupload.txt
-mbridge/lastupdated.php
-
-#Ignore all backup files
-*.bak
-*.orig
-*.old
-*.bak.*
-*.orig.*
-*.old.*
-**/*.bak
-**/*.orig
-**/*.old
-**/*.bak.*
-**/*.orig.*
-**/*.old.*
-
-#Ignore Log files
-*.log
-**/*.log
-
-#Ignore Mac files
-.DS_Store
-._.DS_Store
-**/.DS_Store
-**/._.DS_Store
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-#Editors
-.vscode/
-**/_notes
-
-#Extras
-highcharts
-*test.php
-**/*test.php
-**/test-data*
-alerts.json
-checkalert.*
-settings-pb.php
-lightningdownload.php
+#timelapse files
+cam.jpg
+camplus.jpg
+cam
+timelapse/weather*
+timelapse/pics/*
+timelapse/
+timelapse
+
+#Scripts
+scripts/
+scripts
+nanocharts/
+pbnotify.php
+pbnotify_test.php
+
+#Settings
+settings1.php
+
+#personal Weather Data
+mbcharts/*.csv
+mbcharts/*/*.csv
+jsondata/*.txt
+jsondata/*.json
+jsondata/*.html
+chartswudata/*
+#demodata/*
+mbridge/MBrealtimeupload.txt
+mbridge/lastupdated.php
+
+#Ignore all backup files
+*.bak
+*.orig
+*.old
+*.bak.*
+*.orig.*
+*.old.*
+**/*.bak
+**/*.orig
+**/*.old
+**/*.bak.*
+**/*.orig.*
+**/*.old.*
+
+#Ignore Log files
+*.log
+**/*.log
+
+#Ignore Mac files
+.DS_Store
+._.DS_Store
+**/.DS_Store
+**/._.DS_Store
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+#Editors
+.vscode/
+**/_notes
+
+#Extras
+highcharts
+*test.php
+**/*test.php
+**/test-data*
+alerts.json
+checkalert.*
+settings-pb.php
+lightningdownload.php

easyweathersetup.php

@@ -2212,13 +2212,23 @@ function showForm($error="LOGIN"){
     <input name="purpleair" type="text" id="purpleair" value="<?php echo $purpleairID ;?>" class="choose">
 
 
+    <br/> <svg id="i-info" viewBox="0 0 32 32" width="12" height="12" fill="none" stroke="#777" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+    <path d="M16 14 L16 23 M16 8 L16 10" />
+    <circle cx="16" cy="16" r="14" />
+</svg> <span style="color:#777;">enter your <strong>PurpleAir </strong> station id example <strong><span style="color:rgba(86, 95, 103, 1.000);"> 1200</strong></span></span>
 
+    <br/>
+    <div class="stationvalue"> Purple Air API Key</div>
+    <svg id="i-chevron-right" viewBox="0 0 32 32" width="14" height="14" fill="none" stroke="rgba(86, 95, 103, 1.000)" stroke-linecap="round" stroke-linejoin="round" stroke-width="6.25%">
+    <path d="M12 30 L24 16 12 2" />
+</svg>
 
+    <input name="purpleair" type="text" id="purpleair" value="<?php echo $purpleairapikey ;?>" class="chooseapi">
 
     <br/> <svg id="i-info" viewBox="0 0 32 32" width="12" height="12" fill="none" stroke="#777" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
     <path d="M16 14 L16 23 M16 8 L16 10" />
     <circle cx="16" cy="16" r="14" />
-</svg> <span style="color:#777;">enter your <strong>PurpleAir </strong> station id example <strong><span style="color:rgba(86, 95, 103, 1.000);"> 1200</strong></span></span>
+</svg> <span style="color:#777;">enter your <strong>PurpleAir </strong> API Key example <strong><span style="color:rgba(86, 95, 103, 1.000);"> XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX</strong></span></span>
 
     </div>
     <br/>

eq.php

@@ -5,14 +5,14 @@
 //$json_string=file_get_contents('http://earthquake-report.com/feeds/recent-eq?json');
 $json_string=file_get_contents('jsondata/eqnotification.txt');
 $parsed_json=json_decode($json_string,true);
-$magnitude1=$parsed_json{0}{'magnitude'};
-$magnitude=number_format($magnitude1,1);
-$title=$parsed_json{0}['title'];
-$eqtitle=$parsed_json{0}['location'];
-$depth=$parsed_json{0}['depth'];
-$time1=$parsed_json{0}['date_time'];
-$lati=$parsed_json{0}['latitude'];
-$longi=$parsed_json{0}['longitude'];
+$magnitude=number_format($parsed_json["features"][0]["properties"]["mag"],1);
+$eqtitle=$parsed_json["features"][0]["properties"]["title"];
+$title=$eqtitle;
+$depth=$parsed_json["features"][0]["geometry"]["coordinates"][2];
+$utime=round($parsed_json["features"][0]["properties"]["time"] / 1000, 0, PHP_ROUND_HALF_UP);
+$time1=gmdate("Y-m-d\TH:i:s\Z", $utime);
+$lati=$parsed_json["features"][0]["geometry"]["coordinates"][1];
+$longi=$parsed_json["features"][0]["geometry"]["coordinates"][0];
 $eventime=date( $dateFormat . " " . $timeFormatShort, strtotime("$time1") );
 $shorttime=date( $timeFormatShort, strtotime("$time1") );
 ?>
@@ -32,8 +32,8 @@
 <?php //chuck
 if($eqdista <= 200){echo "<div class=tempconvertercirclered>".$eqdista ;}
 else if($eqdista <= 500){echo "<div class=tempconvertercircleorange>".$eqdista ;}
-else if($magnitude <=1000){echo "<div class=tempconvertercircleyellow>".$eqdista;}
-else if($magnitude >= 1000){echo "<div class=tempconvertercirclegreen>".$eqdista ;}
+else if($eqdista <=1000){echo "<div class=tempconvertercircleyellow>".$eqdista;}
+else if($eqdista >= 1000){echo "<div class=tempconvertercirclegreen>".$eqdista ;}
 
 
 ?></smalltempunit2></div></div>