diff --git a/README.md b/README.md index 8f5cc6e..4e79c0f 100644 --- a/README.md +++ b/README.md @@ -18,17 +18,6 @@ BirdNET-Pi is built on the [BirdNET framework](https://github.com/kahst/BirdNET- Check out birds from around the world - [BirdWeather](https://app.birdweather.com)
-- [Johannesburg, South Africa](https://joburg.birdnetpi.com)
-- [Öringe, Tyresö, Sweden](https://tyreso.birdnetpi.com)
-- [Berowra, New South Wales, Australia](https://birds.lloydsplace.au/) -- [Dundas, Ontario, Canada](https://dundasontario.birdnetpi.com) -- [Bungendore, New South Wales, Australia](https://bungendorensw.birdnetpi.com) -- [Rivers Bend, Ohio, United States](https://riversbendoh.birdnetpi.com) -- [Vienna, Virginia, United States](https://viennava.birdnetpi.com) -- [Occoquan, Virginia, United States](https://occoquanva.birdnetpi.com) - -[Share your installation!!](https://github.com/mcguirepr89/BirdNET-Pi/wiki/Sharing-Your-BirdNET-Pi) -Have a public installation not in the list above? Let me know!! I'd be happy to add it. Currently listening in these countries . . . that I know of . . . - The United States @@ -60,6 +49,11 @@ Currently listening in these countries . . . that I know of . . . - South Sudan - Argentina - Brazil +- Thailand +- Colombia +- Estonia +- Tasmania +- Luxembourgh ## Features * **24/7 recording and automatic identification** of bird songs, chirps, and peeps using BirdNET machine learning diff --git a/homepage/views.php b/homepage/views.php index 987f522..e753700 100644 --- a/homepage/views.php +++ b/homepage/views.php @@ -7,14 +7,14 @@ if (file_exists('/etc/timezone')) { $sys_timezone = trim($tz_data); } } else { -// Else get timezone from the timedatectl command +// else get timezone from the timedatectl command $tz_data = shell_exec('timedatectl show'); $tz_data_array = parse_ini_string($tz_data); if (is_array($tz_data_array) && array_key_exists('Timezone', $tz_data_array)) { $sys_timezone = $tz_data_array['Timezone']; } } -//Finally if we have a valod timezone, set it as the one PHP uses +// finally if we have a valod timezone, set it as the one PHP uses if ($sys_timezone !== "") { date_default_timezone_set($sys_timezone); } diff --git a/scripts/config.php b/scripts/config.php index 5c56c05..ceb5e0a 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -2,6 +2,36 @@ error_reporting(E_ERROR); ini_set('display_errors',1); +if (file_exists('./scripts/thisrun.txt')) { + $config = parse_ini_file('./scripts/thisrun.txt'); +} elseif (file_exists('./scripts/firstrun.ini')) { + $config = parse_ini_file('./scripts/firstrun.ini'); +} +$user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"); +$home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd"); +$home = trim($home); +if (file_exists($home."/BirdNET-Pi/apprise.txt")) { + $apprise_config = file_get_contents($home."/BirdNET-Pi/apprise.txt"); +} else { + $apprise_config = ""; +} +$caddypwd = $config['CADDY_PWD']; +if (!isset($_SERVER['PHP_AUTH_USER'])) { + header('WWW-Authenticate: Basic realm="My Realm"'); + header('HTTP/1.0 401 Unauthorized'); + echo '
You cannot edit the settings for this installation
'; + exit; +} else { + $submittedpwd = $_SERVER['PHP_AUTH_PW']; + $submitteduser = $_SERVER['PHP_AUTH_USER']; + if($submittedpwd !== $caddypwd || $submitteduser !== 'birdnet'){ + header('WWW-Authenticate: Basic realm="My Realm"'); + header('HTTP/1.0 401 Unauthorized'); + echo '
You cannot edit the settings for this installation
'; + exit; + } +} + function syslog_shell_exec($cmd, $sudo_user = null) { if ($sudo_user) { $cmd = "sudo -u $sudo_user $cmd"; @@ -293,37 +323,7 @@ if(isset($_GET['sendtest']) && $_GET['sendtest'] == "true") {

Basic Settings


-You cannot edit the settings for this installation'; - exit; -} else { - $submittedpwd = $_SERVER['PHP_AUTH_PW']; - $submitteduser = $_SERVER['PHP_AUTH_USER']; - if($submittedpwd !== $caddypwd || $submitteduser !== 'birdnet'){ - header('WWW-Authenticate: Basic realm="My Realm"'); - header('HTTP/1.0 401 Unauthorized'); - echo '
You cannot edit the settings for this installation
'; - exit; - } -} -?> +