From bd0d44b9c9e69ff4b6200a9ecae96032c1cd6766 Mon Sep 17 00:00:00 2001
From: smashery <smashery@gmail.com>
Date: Tue, 21 Mar 2023 16:47:12 +1100
Subject: [PATCH 01/17] Fix de-sync between models and labels

---
 scripts/config.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/scripts/config.php b/scripts/config.php
index 6912af4..fc76879 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -107,20 +107,8 @@ if(isset($_GET["latitude"])){
   } elseif (file_exists('./scripts/firstrun.ini')) {
     $lang_config = parse_ini_file('./scripts/firstrun.ini');
   }
-  if ($language != $lang_config['DATABASE_LANG']){
-    $user = trim(shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"));
-    $home = trim(shell_exec("awk -F: '/1000/{print $6}' /etc/passwd"));
 
-    // Archive old language file
-    syslog_shell_exec("cp -f $home/BirdNET-Pi/model/labels.txt $home/BirdNET-Pi/model/labels.txt.old", $user);
-
-    // Install new language label file
-    syslog_shell_exec("$home/BirdNET-Pi/scripts/install_language_label.sh -l $language", $user);
-
-    syslog(LOG_INFO, "Successfully changed language to '$language'");
-  }
-
-  if ($model != $lang_config['MODEL']){
+  if ($model != $lang_config['MODEL'] || $language != $lang_config['DATABASE_LANG']){
     $user = trim(shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"));
     $home = trim(shell_exec("awk -F: '/1000/{print $6}' /etc/passwd"));
 
@@ -134,7 +122,7 @@ if(isset($_GET["latitude"])){
       syslog_shell_exec("$home/BirdNET-Pi/scripts/install_language_label.sh -l $language", $user);
     }
 
-    syslog(LOG_INFO, "Successfully changed language to '$language'");
+    syslog(LOG_INFO, "Successfully changed language to '$language' and model to '$model'");
   }
 
 

From 1a0bf359b32e588d34e7efd23b142d3ff9eadfc2 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Tue, 21 Mar 2023 17:41:36 -0400
Subject: [PATCH 02/17] Fix permissions issues, pt. 2

---
 scripts/play.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/play.php b/scripts/play.php
index 6dc91b0..943a93f 100644
--- a/scripts/play.php
+++ b/scripts/play.php
@@ -120,16 +120,16 @@ if(isset($_GET['shiftfile'])) {
     $soxopt = "-q";
     $soxpitch = $config['FREQSHIFT_PITCH'];
           $cmd = "/usr/bin/nohup /usr/bin/sox \"".$pi.$filename."\" \"".$shifted_path.$filename."\" pitch ".$soxopt." ".$soxpitch;
-    shell_exec("mkdir -p ".$shifted_path.$dir." && echo \"".$cmd."\" > /tmp/shift.sh && chmod +x /tmp/shift.sh");
+    shell_exec("sudo mkdir -p ".$shifted_path.$dir." && sudo echo \"".$cmd."\" > /tmp/shift.sh && sudo chmod +x /tmp/shift.sh");
   }
 
-  shell_exec("/tmp/shift.sh");
-  shell_exec("rm -f /tmp/shift.sh");
+  shell_exec("sudo /tmp/shift.sh");
+  shell_exec("sudo rm -f /tmp/shift.sh");
     } else {
   $cmd = "rm -f " . $shifted_path.$filename;
-  shell_exec("echo \"".$cmd."\" > /tmp/unshift.sh && chmod +x /tmp/unshift.sh");
-  shell_exec("/tmp/unshift.sh");
-  shell_exec("rm -f /tmp/unshift.sh");
+  shell_exec("sudo echo \"".$cmd."\" > /tmp/unshift.sh && sudo chmod +x /tmp/unshift.sh");
+  shell_exec("sudo /tmp/unshift.sh");
+  shell_exec("sudo rm -f /tmp/unshift.sh");
     }
 
     echo "OK";

From 31cc358243065b6c876e023288f1117697d95b23 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:02:45 -0400
Subject: [PATCH 03/17] Removing /tmp/ file creation for pitch shifting

Co-Authored-By: croisez <1774281+croisez@users.noreply.github.com>
---
 scripts/play.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/scripts/play.php b/scripts/play.php
index 943a93f..49e1072 100644
--- a/scripts/play.php
+++ b/scripts/play.php
@@ -112,24 +112,19 @@ if(isset($_GET['shiftfile'])) {
   $freqshift_tool = $config['FREQSHIFT_TOOL'];
 
   if ($freqshift_tool == "ffmpeg") {
-          $cmd = "/usr/bin/nohup /usr/bin/ffmpeg -y -i \"".$pi.$filename."\" -af \"rubberband=pitch=".$config['FREQSHIFT_LO']."/".$config['FREQSHIFT_HI']."\" \"".$shifted_path.$filename."\"";
-    shell_exec("mkdir -p ".$shifted_path.$dir." && echo \"".$cmd."\" > /tmp/shift.sh && chmod +x /tmp/shift.sh");
+    $cmd = "sudo /usr/bin/nohup /usr/bin/ffmpeg -y -i \"".$pi.$filename."\" -af \"rubberband=pitch=".$config['FREQSHIFT_LO']."/".$config['FREQSHIFT_HI']."\" \"".$shifted_path.$filename."\"";
+    shell_exec("sudo mkdir -p ".$shifted_path.$dir." && ".$cmd);
 
   } else if ($freqshift_tool == "sox") {
     //linux.die.net/man/1/sox
     $soxopt = "-q";
     $soxpitch = $config['FREQSHIFT_PITCH'];
-          $cmd = "/usr/bin/nohup /usr/bin/sox \"".$pi.$filename."\" \"".$shifted_path.$filename."\" pitch ".$soxopt." ".$soxpitch;
-    shell_exec("sudo mkdir -p ".$shifted_path.$dir." && sudo echo \"".$cmd."\" > /tmp/shift.sh && sudo chmod +x /tmp/shift.sh");
+    $cmd = "sudo /usr/bin/nohup /usr/bin/sox \"".$pi.$filename."\" \"".$shifted_path.$filename."\" pitch ".$soxopt." ".$soxpitch;
+   shell_exec("sudo mkdir -p ".$shifted_path.$dir." && ".$cmd);
   }
-
-  shell_exec("sudo /tmp/shift.sh");
-  shell_exec("sudo rm -f /tmp/shift.sh");
     } else {
-  $cmd = "rm -f " . $shifted_path.$filename;
-  shell_exec("sudo echo \"".$cmd."\" > /tmp/unshift.sh && sudo chmod +x /tmp/unshift.sh");
-  shell_exec("sudo /tmp/unshift.sh");
-  shell_exec("sudo rm -f /tmp/unshift.sh");
+     $cmd = "sudo rm -f " . $shifted_path.$filename;
+     shell_exec($cmd);
     }
 
     echo "OK";

From a65d07083778ae6f67690c627494058dc1d5b98a Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Tue, 21 Mar 2023 22:04:16 -0400
Subject: [PATCH 04/17] Apprise exclude these species instead of include

---
 scripts/config.php             | 2 +-
 scripts/utils/notifications.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/config.php b/scripts/config.php
index fc76879..d320313 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -542,7 +542,7 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken}
       <hr>
       <label for="minimum_time_limit">Minimum time between notifications of the same species (sec):</label>
       <input type="number" id="minimum_time_limit" name="minimum_time_limit" value="<?php echo $config['APPRISE_MINIMUM_SECONDS_BETWEEN_NOTIFICATIONS_PER_SPECIES'];?>" min="0"><br>
-      <label for="only_notify_species_names">ONLY notify for these species (comma separated common names):</label>
+      <label for="only_notify_species_names">Exclude these species (comma separated common names):</label>
       <input type="text" id="only_notify_species_names" placeholder="Northern Cardinal,American Crow,Carolina Chickadee" name="only_notify_species_names" value="<?php echo $config['APPRISE_ONLY_NOTIFY_SPECIES_NAMES'];?>" size=96><br>
 
       <br>
diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py
index 7db08d4..2ef9251 100644
--- a/scripts/utils/notifications.py
+++ b/scripts/utils/notifications.py
@@ -49,7 +49,7 @@ def sendAppriseNotifications(species, confidence, path, date, time, week, latitu
 
         APPRISE_ONLY_NOTIFY_SPECIES_NAMES = settings_dict.get('APPRISE_ONLY_NOTIFY_SPECIES_NAMES')
         if APPRISE_ONLY_NOTIFY_SPECIES_NAMES is not None and APPRISE_ONLY_NOTIFY_SPECIES_NAMES.strip() != "":
-            if not any(bird.lower().replace(" ", "") in comName.lower().replace(" ", "") for bird in APPRISE_ONLY_NOTIFY_SPECIES_NAMES.split(",")):
+            if any(bird.lower().replace(" ", "") in comName.lower().replace(" ", "") for bird in APPRISE_ONLY_NOTIFY_SPECIES_NAMES.split(",")):
                 return
 
         APPRISE_MINIMUM_SECONDS_BETWEEN_NOTIFICATIONS_PER_SPECIES = settings_dict.get('APPRISE_MINIMUM_SECONDS_BETWEEN_NOTIFICATIONS_PER_SPECIES')

From 9309e23c3f31dd53089e6b7840156aec3fba9350 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 22 Mar 2023 13:14:54 -0400
Subject: [PATCH 05/17] Change how perms are given for txt files

---
 scripts/update_birdnet_snippets.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index e04c080..d31d91a 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -11,11 +11,7 @@ my_dir=$HOME/BirdNET-Pi/scripts
 #sudo chmod -R g+wr $HOME/*
 find $HOME/* -not -user $USER -execdir sudo -E chown $USER:$USER {} \+
 find $HOME/* -not -user $USER -execdir sudo chmod g+wr {} \+
-files=("$HOME/BirdNET-Pi/apprise.txt" "$HOME/BirdNET-Pi/exclude_species_list.txt" "$HOME/BirdNET-Pi/include_species_list.txt" "$HOME/BirdNET-Pi/scripts/disk_check_exclude.txt" "$HOME/BirdNET-Pi/scripts/blacklisted_images.txt")
-for file in "${files[@]}"
-do
-    sudo chown caddy:caddy "$file"
-done
+chmod 666 ~/BirdNET-Pi/scripts/*.txt
 chmod -R a+w $HOME/BirdNET-Pi/scripts/*.php
 
 # Create blank sitename as it's optional. First time install will use $HOSTNAME.

From 5dec3cb76afc460a8b800f448617927086d843e2 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 22 Mar 2023 13:22:14 -0400
Subject: [PATCH 06/17] Flickr new policy compliance, user agents are now
 required

---
 scripts/overview.php           | 1 +
 scripts/stats.php              | 1 +
 scripts/todays_detections.php  | 1 +
 scripts/utils/notifications.py | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index c2f62bd..56cf40b 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -2,6 +2,7 @@
 error_reporting(E_ERROR);
 ini_set('display_errors',1);
 ini_set('session.gc_maxlifetime', 7200);
+ini_set('user_agent', 'PHP_Flickr/1.0');
 session_set_cookie_params(7200);
 session_start();
 $myDate = date('Y-m-d');
diff --git a/scripts/stats.php b/scripts/stats.php
index 8a47cba..9b6da18 100644
--- a/scripts/stats.php
+++ b/scripts/stats.php
@@ -1,4 +1,5 @@
 <?php
+ini_set('user_agent', 'PHP_Flickr/1.0');
 error_reporting(0);
 ini_set('display_errors', 0);
 
diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index 2a91ba2..c08ba5c 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -1,5 +1,6 @@
 <?php
 ini_set('session.gc_maxlifetime', 7200);
+ini_set('user_agent', 'PHP_Flickr/1.0');
 session_set_cookie_params(7200);
 session_start();
 error_reporting(E_ERROR);
diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py
index 2ef9251..efa1f44 100644
--- a/scripts/utils/notifications.py
+++ b/scripts/utils/notifications.py
@@ -77,8 +77,9 @@ def sendAppriseNotifications(species, confidence, path, date, time, week, latitu
             if not comName in flickr_images:
                 try:
                     # TODO: Make this work with non-english comnames. Implement the "// convert sci name to English name" logic from overview.php here
+                    headers = {'User-Agent': 'Python_Flickr/1.0'}
                     url = 'https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key='+str(settings_dict.get('FLICKR_API_KEY'))+'&text='+str(comName)+' bird&sort=relevance&per_page=5&media=photos&format=json&license=2%2C3%2C4%2C5%2C6%2C9&nojsoncallback=1'
-                    resp = requests.get(url=url)
+                    resp = requests.get(url=url, headers=headers)
                     resp.encoding = "utf-8"
                     data = resp.json()["photos"]["photo"][0]
 

From 44edeab688d5d7bfa3825222cb9889aaba630cf1 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 23 Mar 2023 11:43:18 -0400
Subject: [PATCH 07/17] hopefully these perms work

---
 scripts/update_birdnet_snippets.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index d31d91a..8114da5 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -12,6 +12,7 @@ my_dir=$HOME/BirdNET-Pi/scripts
 find $HOME/* -not -user $USER -execdir sudo -E chown $USER:$USER {} \+
 find $HOME/* -not -user $USER -execdir sudo chmod g+wr {} \+
 chmod 666 ~/BirdNET-Pi/scripts/*.txt
+chmod 666 ~/BirdNET-Pi/*.txt
 chmod -R a+w $HOME/BirdNET-Pi/scripts/*.php
 
 # Create blank sitename as it's optional. First time install will use $HOSTNAME.

From cff6e9ae17b34b1d46f4385bbde49aaffd861cfd Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 23 Mar 2023 11:51:10 -0400
Subject: [PATCH 08/17] Fix custom image displaying when its not set

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
---
 scripts/overview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 56cf40b..3246012 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -461,7 +461,7 @@ window.setInterval(function(){
   document.getElementById("spectrogramimage").src = "/spectrogram.png?nocache="+Date.now();
 }, <?php echo $refresh; ?>*1000);
 
-<?php if(isset($config["CUSTOM_IMAGE"])){?>
+<?php if(isset($config["CUSTOM_IMAGE"]) && strlen($config["CUSTOM_IMAGE"]) > 2){?>
 // every 1 second, this loop will run and refresh the custom image
 window.setInterval(function(){
   // Find the customimage element

From 1b2f3e16b36e20edd2e6555574cad19eecd025d6 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:41:34 -0400
Subject: [PATCH 09/17] Backlog clarification

---
 scripts/overview.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 3246012..6c324a3 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -24,6 +24,14 @@ $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
 $home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
 $home = trim($home);
 
+$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == DATE(\'now\', \'localtime\')');
+if($statement2 == False) {
+  echo "Database is busy";
+  header("refresh: 0;");
+}
+$result2 = $statement2->execute();
+$todaycount = $result2->fetchArray(SQLITE3_ASSOC);
+
 if(isset($_GET['custom_image'])){
   if(isset($config["CUSTOM_IMAGE"])) {
   ?>
@@ -216,7 +224,11 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
       }
   }
   if($iterations == 0) {
-    echo "<h3>No Detections For Today.</h3>";
+    if($todaycount > 0) {
+      echo "<h3>Your system is currently processing a backlog of audio. This can take several hours before normal functionality of your BirdNET-Pi resumes.</h3>";
+    } else {
+      echo "<h3>No Detections For Today.</h3>";
+    }
   }
   die();
 }
@@ -231,14 +243,6 @@ if($statement == False) {
 $result = $statement->execute();
 $totalcount = $result->fetchArray(SQLITE3_ASSOC);
 
-$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == DATE(\'now\', \'localtime\')');
-if($statement2 == False) {
-  echo "Database is busy";
-  header("refresh: 0;");
-}
-$result2 = $statement2->execute();
-$todaycount = $result2->fetchArray(SQLITE3_ASSOC);
-
 $statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == Date(\'now\', \'localtime\') AND TIME >= TIME(\'now\', \'localtime\', \'-1 hour\')');
 if($statement3 == False) {
   echo "Database is busy";

From af8e7d433f82b350a3061d139956c76aa5be5776 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Fri, 24 Mar 2023 14:46:48 -0400
Subject: [PATCH 10/17] clarifying some language

---
 scripts/overview.php          | 2 +-
 scripts/todays_detections.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 6c324a3..d6f8567 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -314,7 +314,7 @@ body::-webkit-scrollbar {
     <h1 id="modalHeading"></h1>
     <p id="modalText"></p>
     <button onclick="hideDialog()">Close</button>
-    <button style="font-weight:bold;color:blue" onclick="if(confirm('Are you sure you want to blacklist this image?')) { blacklistImage(); }">Never show this image again</button>
+    <button style="font-weight:bold;color:blue" onclick="if(confirm('Are you sure you want to blacklist this image?')) { blacklistImage(); }">Blacklist this image</button>
   </dialog>
   <script src="static/dialog-polyfill.js"></script>
   <script src="static/Chart.bundle.js"></script>
diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index c08ba5c..d81653a 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -406,7 +406,7 @@ die();
     <h1 id="modalHeading"></h1>
     <p id="modalText"></p>
     <button style="font-weight:bold;color:blue" onclick="hideDialog()">Close</button>
-    <button style="font-weight:bold;color:blue" onclick="if(confirm('Are you sure you want to blacklist this image?')) { blacklistImage(); }">Never show this image again</button>
+    <button style="font-weight:bold;color:blue" onclick="if(confirm('Are you sure you want to blacklist this image?')) { blacklistImage(); }">Blacklist this image</button>
   </dialog>
   <script src="static/dialog-polyfill.js"></script>
   <script src="static/Chart.bundle.js"></script>

From 2a1d1693fe752da5618ff1a3d24971a8802e10b3 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 27 Mar 2023 16:03:25 -0400
Subject: [PATCH 11/17] Fixing time display issues

---
 scripts/config.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/config.php b/scripts/config.php
index d320313..ee92207 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -639,8 +639,11 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken}
       <h2>Time and Date</h2>
       <span>If connected to the internet, retrieve time automatically?</span>
       <input type="checkbox" onchange='handleChange(this)' <?php echo $checkedvalue; ?> ><br>
-      <input onclick="this.showPicker()" type="date" id="date" name="date" value="<?php echo date('Y-m-d') ?>" <?php echo $disabledvalue; ?>>
-      <input onclick="this.showPicker()" type="time" id="time" name="time" value="<?php echo date('H:i') ?>" <?php echo $disabledvalue; ?>><br>
+      <?php
+      $date = new DateTime('now');
+      ?>
+      <input onclick="this.showPicker()" type="date" id="date" name="date" value="<?php echo $date->format('Y-m-d') ?>" <?php echo $disabledvalue; ?>>
+      <input onclick="this.showPicker()" type="time" id="time" name="time" value="<?php echo $date->format('H:i'); ?>" <?php echo $disabledvalue; ?>><br>
       <label for="timezone">Select a Timezone: </label>
       <select name="timezone">
       <option disabled selected>

From f1fed278e881c5fee2b3a030ba356e3073e9dab6 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 27 Mar 2023 16:04:59 -0400
Subject: [PATCH 12/17] Limit 5 => Limit 15, more time for spectrograms to be
 created

---
 scripts/overview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index d6f8567..8381d5a 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -82,7 +82,7 @@ if(isset($_GET['fetch_chart_string']) && $_GET['fetch_chart_string'] == "true")
 
 if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isset($_GET['previous_detection_identifier'])) {
 
-  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 5');
+  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 15');
   if($statement4 == False) {
     echo "Database is busy";
     header("refresh: 0;");

From 6c40e00d87c85aadad599d79243884863187b4d9 Mon Sep 17 00:00:00 2001
From: Jurriaan Pruis <email@jurriaanpruis.nl>
Date: Wed, 29 Mar 2023 19:14:03 +0200
Subject: [PATCH 13/17] Fix nocache param in history.php

---
 scripts/history.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/history.php b/scripts/history.php
index deb240c..a37cbe0 100644
--- a/scripts/history.php
+++ b/scripts/history.php
@@ -148,14 +148,16 @@ function submitID() {
 		</table>
     	<?php // <br><button type="button" onclick="showDialog()">Export as CSV for eBird</button><br><br> ?>
 <?php
+$time = time();
+
 if (file_exists('./Charts/'.$chart)) {
-  echo "<img src=\"/Charts/$chart?nocache=time()\" >";
+  echo "<img src=\"/Charts/$chart?nocache=$time\" >";
 } else {
   echo "<p>No Charts for $theDate</p>";
 }
 echo "<hr>";
 if (file_exists('./Charts/'.$chart2)) {
-  echo "<img src=\"/Charts/$chart2?nocache=time()\">";
+  echo "<img src=\"/Charts/$chart2?nocache=$time\">";
 } else {
   echo "<p>No Charts For $theDate</p>";
 }?>

From 90e82c948fe151ba8e4ba23237c267ba1bd47e8e Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:17:44 -0400
Subject: [PATCH 14/17] perms

---
 scripts/update_birdnet_snippets.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index 8114da5..813bf4d 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -13,7 +13,7 @@ find $HOME/* -not -user $USER -execdir sudo -E chown $USER:$USER {} \+
 find $HOME/* -not -user $USER -execdir sudo chmod g+wr {} \+
 chmod 666 ~/BirdNET-Pi/scripts/*.txt
 chmod 666 ~/BirdNET-Pi/*.txt
-chmod -R a+w $HOME/BirdNET-Pi/scripts/*.php
+find $HOME/BirdNET-Pi -path "$HOME/BirdNET-Pi/birdnet" -prune -o -type f ! -perm /o=w -exec chmod a+w {} \;
 
 # Create blank sitename as it's optional. First time install will use $HOSTNAME.
 if ! grep SITE_NAME /etc/birdnet/birdnet.conf &>/dev/null;then

From 11b6c11e4994bdfb079f101551b1ee1060638b8e Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 29 Mar 2023 20:44:30 -0400
Subject: [PATCH 15/17] Revert "perms"

This reverts commit 90e82c948fe151ba8e4ba23237c267ba1bd47e8e.
---
 scripts/update_birdnet_snippets.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index 813bf4d..8114da5 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -13,7 +13,7 @@ find $HOME/* -not -user $USER -execdir sudo -E chown $USER:$USER {} \+
 find $HOME/* -not -user $USER -execdir sudo chmod g+wr {} \+
 chmod 666 ~/BirdNET-Pi/scripts/*.txt
 chmod 666 ~/BirdNET-Pi/*.txt
-find $HOME/BirdNET-Pi -path "$HOME/BirdNET-Pi/birdnet" -prune -o -type f ! -perm /o=w -exec chmod a+w {} \;
+chmod -R a+w $HOME/BirdNET-Pi/scripts/*.php
 
 # Create blank sitename as it's optional. First time install will use $HOSTNAME.
 if ! grep SITE_NAME /etc/birdnet/birdnet.conf &>/dev/null;then

From 5f4fd668358171d3b20286bd5c286637536cac79 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 29 Mar 2023 20:51:05 -0400
Subject: [PATCH 16/17] Revert "Revert "perms""

This reverts commit 11b6c11e4994bdfb079f101551b1ee1060638b8e.
---
 scripts/update_birdnet_snippets.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index 8114da5..813bf4d 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -13,7 +13,7 @@ find $HOME/* -not -user $USER -execdir sudo -E chown $USER:$USER {} \+
 find $HOME/* -not -user $USER -execdir sudo chmod g+wr {} \+
 chmod 666 ~/BirdNET-Pi/scripts/*.txt
 chmod 666 ~/BirdNET-Pi/*.txt
-chmod -R a+w $HOME/BirdNET-Pi/scripts/*.php
+find $HOME/BirdNET-Pi -path "$HOME/BirdNET-Pi/birdnet" -prune -o -type f ! -perm /o=w -exec chmod a+w {} \;
 
 # Create blank sitename as it's optional. First time install will use $HOSTNAME.
 if ! grep SITE_NAME /etc/birdnet/birdnet.conf &>/dev/null;then

From a45018b473f16643bf64834f4b070c5f6652dba0 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 29 Mar 2023 21:10:36 -0400
Subject: [PATCH 17/17] making things more secure

---
 scripts/advanced.php |  6 +++---
 scripts/config.php   | 34 ++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index e225442..c7081f7 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -101,7 +101,7 @@ if(isset($_GET['submit'])) {
     }
   }
 
-  if(isset($_GET["freqshift_hi"])) {
+  if(isset($_GET["freqshift_hi"]) && is_numeric($_GET['freqshift_hi'])) {
     $freqshift_hi = $_GET["freqshift_hi"];
     if(strcmp($freqshift_hi,$config['FREQSHIFT_HI']) !== 0) {
       $contents = preg_replace("/FREQSHIFT_HI=.*/", "FREQSHIFT_HI=$freqshift_hi", $contents);
@@ -109,7 +109,7 @@ if(isset($_GET['submit'])) {
     }
   }
 
-  if(isset($_GET["freqshift_lo"])) {
+  if(isset($_GET["freqshift_lo"]) && is_numeric($_GET['freqshift_lo'])) {
     $freqshift_lo = $_GET["freqshift_lo"];
     if(strcmp($freqshift_lo,$config['FREQSHIFT_LO']) !== 0) {
       $contents = preg_replace("/FREQSHIFT_LO=.*/", "FREQSHIFT_LO=$freqshift_lo", $contents);
@@ -117,7 +117,7 @@ if(isset($_GET['submit'])) {
     }
   }
 
-  if(isset($_GET["freqshift_pitch"])) {
+  if(isset($_GET["freqshift_pitch"]) && is_numeric($_GET['freqshift_pitch'])) {
     $freqshift_pitch = $_GET["freqshift_pitch"];
     if(strcmp($freqshift_pitch,$config['FREQSHIFT_PITCH']) !== 0) {
       $contents = preg_replace("/FREQSHIFT_PITCH=.*/", "FREQSHIFT_PITCH=$freqshift_pitch", $contents);
diff --git a/scripts/config.php b/scripts/config.php
index ee92207..f758dbd 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -76,7 +76,7 @@ if(isset($_GET["latitude"])){
     $apprise_weekly_report = 0;
   }
 
-  if(isset($timezone)) {
+  if(isset($timezone) && in_array($timezone, DateTimeZone::listIdentifiers())) {
     shell_exec("sudo timedatectl set-timezone ".$timezone);
     date_default_timezone_set($timezone);
     echo "<script>setTimeout(
@@ -92,7 +92,11 @@ if(isset($_GET["latitude"])){
     // can't set the date manually if it's getting it from the internet, disable ntp
     exec("sudo timedatectl set-ntp false");
 
-    exec("sudo date -s '".$_GET['date']." ".$_GET['time']."'");
+    // check if valid date and time
+    $datetime = DateTime::createFromFormat('Y-m-d H:i', $_GET['date'] . ' ' . $_GET['time']);
+    if ($datetime && $datetime->format('Y-m-d H:i') === $_GET['date'] . ' ' . $_GET['time']) {
+      exec("sudo date -s '".$_GET['date']." ".$_GET['time']."'");
+    }
   } else {
     // user checked 'use time from internet if available,' so make sure that's on
     if(strlen(trim(exec("sudo timedatectl | grep \"NTP service: active\""))) == 0){
@@ -109,20 +113,22 @@ if(isset($_GET["latitude"])){
   }
 
   if ($model != $lang_config['MODEL'] || $language != $lang_config['DATABASE_LANG']){
-    $user = trim(shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"));
-    $home = trim(shell_exec("awk -F: '/1000/{print $6}' /etc/passwd"));
+    if(strlen($language) == 2){
+      $user = trim(shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"));
+      $home = trim(shell_exec("awk -F: '/1000/{print $6}' /etc/passwd"));
 
-    // Archive old language file
-    syslog_shell_exec("cp -f $home/BirdNET-Pi/model/labels.txt $home/BirdNET-Pi/model/labels.txt.old", $user);
+      // Archive old language file
+      syslog_shell_exec("cp -f $home/BirdNET-Pi/model/labels.txt $home/BirdNET-Pi/model/labels.txt.old", $user);
 
-    if($model == "BirdNET_GLOBAL_3K_V2.2_Model_FP16"){
-    // Install new language label file
-      syslog_shell_exec("sudo chmod +x $home/BirdNET-Pi/scripts/install_language_label_nm.sh && $home/BirdNET-Pi/scripts/install_language_label_nm.sh -l $language", $user);
-    } else {
-      syslog_shell_exec("$home/BirdNET-Pi/scripts/install_language_label.sh -l $language", $user);
+      if($model == "BirdNET_GLOBAL_3K_V2.2_Model_FP16"){
+      // Install new language label file
+        syslog_shell_exec("sudo chmod +x $home/BirdNET-Pi/scripts/install_language_label_nm.sh && $home/BirdNET-Pi/scripts/install_language_label_nm.sh -l $language", $user);
+      } else {
+        syslog_shell_exec("$home/BirdNET-Pi/scripts/install_language_label.sh -l $language", $user);
+      }
+
+      syslog(LOG_INFO, "Successfully changed language to '$language' and model to '$model'");
     }
-
-    syslog(LOG_INFO, "Successfully changed language to '$language' and model to '$model'");
   }
 
 
@@ -271,7 +277,7 @@ if(isset($_GET['sendtest']) && $_GET['sendtest'] == "true") {
   $body = str_replace("\$overlap", $overlap, $body);
   $body = str_replace("\$flickrimage", $exampleimage, $body);
 
-  echo "<pre class=\"bash\">".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv --plugin-path ".$home."/.apprise/plugins "." -t '".$title."' -b '".$body."' ".$attach." ".$cf." ")."</pre>";
+  echo "<pre class=\"bash\">".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv --plugin-path ".$home."/.apprise/plugins "." -t '".escapeshellcmd($title)."' -b '".escapeshellcmd($body)."' ".$attach." ".$cf." ")."</pre>";
 
   die();
 }