From 885d180da5105d75399f22a2ca463e146e1aa95e Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 14 Jan 2017 12:51:34 +0100 Subject: [PATCH] Added option to select default source. --- html/changeconf.php | 17 +++++++++++++++++ html/config.php | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/html/changeconf.php b/html/changeconf.php index 4778646..047f035 100755 --- a/html/changeconf.php +++ b/html/changeconf.php @@ -217,6 +217,7 @@ if (isset($msg)) { $login = $_POST["user"]; $password = $_POST["password"]; $media_link = $_POST["media_link"]; + $media_link = str_replace('\\', '/', $media_link); if ($media_link == "") { $share_string = ''; } else { @@ -295,11 +296,14 @@ if (isset($msg)) { $bright = (isset($_POST['bright'])) ? "bright=yes" : "bright=no"; $media_update = (isset($_POST['media_update'])) ? "media_update=yes" : "media_update=no"; $pandora_available = (isset($_POST['pandora_available'])) ? "pandora_available=yes" : "pandora_available=no"; + $startup = $_POST['startup']; + $startup_string = "startup=".$startup; $piradio = file_get_contents( "/etc/radiod.conf" ); $piradio_new = preg_replace("/\nrss *= *.*/", "\n".$rss, $piradio); $piradio_new = preg_replace("/\nbright *= *.*/", "\n".$bright, $piradio_new); $piradio_new = preg_replace("/\nmedia_update *= *.*/", "\n".$media_update, $piradio_new); $piradio_new = preg_replace("/\npandora_available *= *.*/", "\n".$pandora_available, $piradio_new); + $piradio_new = preg_replace("/\nstartup *= *.*/", "\n".$startup_string, $piradio_new); $piradio_array = parse_ini_string($piradio_new); $rss = ($piradio_array['rss']) ? "yes" : "no"; $bright = ($piradio_array['bright']) ? "yes" : "no"; @@ -311,6 +315,19 @@ if (isset($msg)) { echo "LCD high brightness: ".$bright."
"; echo "Always update library: ".$media_update."
"; echo "Pandora available: ".$pandora_available."
"; + echo "Startup source: "; + switch ($startup) { + case 'RADIO': + echo "Southcast radio"; + break; + case 'MEDIA': + echo "Media player"; + break; + case 'PANDORA': + echo "Pandora radio"; + break; + } + echo "
"; file_put_contents('/etc/radiod.conf', $piradio_new); chmod("/etc/radiod.conf", 0755); } elseif ($msg == "pandora") { diff --git a/html/config.php b/html/config.php index 4e17965..e85b1e5 100755 --- a/html/config.php +++ b/html/config.php @@ -16,6 +16,10 @@ Global PiRadio config
$piradio = file_get_contents( "/etc/radiod.conf" ); $piradio_array = parse_ini_string($piradio); $write_conf = false; +if (!isset($piradio_array['startup'])) { + $piradio = $piradio."\r\n# Startup option either RADIO, MEDIA (USB stick) or PANDORA\r\nstartup=RADIO\r\n"; + $write_conf = true; +} if (!isset($piradio_array['rss'])) { $piradio = $piradio."\r\n# RSS in standby (Pecus)\r\nrss=no\r\n"; $write_conf = true; @@ -73,6 +77,29 @@ if ( $piradio_array['pandora_available'] ) { } echo ' Pandora available.'; echo '
'; +echo "Startup source: \r\n"; ?>