From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 25 Nov 2015 22:19:48 +0000 (+0100)
Subject: fix login
X-Git-Tag: v0.1.0~5
X-Git-Url: https://git.cweiske.de/noxon-gateway.git/commitdiff_plain/4233101d0f4a9ce02d399e98ea97ceade9ce42a5

fix login
---

diff --git a/data/initial-login.xml b/data/initial-login.xml
deleted file mode 100644
index 2206537..0000000
--- a/data/initial-login.xml
+++ /dev/null
@@ -1 +0,0 @@
-<encryptedtoken>a6703ded78821be5</encryptedtoken>
diff --git a/data/login-camelcase.xml b/data/login-camelcase.xml
new file mode 100644
index 0000000..b460d64
--- /dev/null
+++ b/data/login-camelcase.xml
@@ -0,0 +1 @@
+<EncryptedToken>a6703ded78821be5</EncryptedToken>
\ No newline at end of file
diff --git a/data/login-mynoxon.xml b/data/login-mynoxon.xml
deleted file mode 100644
index e88d339..0000000
--- a/data/login-mynoxon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<EncryptedToken>a6703ded78821be5</EncryptedToken>
diff --git a/www/index.php b/www/index.php
index d7d758f..8b803db 100644
--- a/www/index.php
+++ b/www/index.php
@@ -19,17 +19,12 @@ if (file_exists($cfgFile)) {
     include $cfgFile;
 }
 
-if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token=0') {
-    //initial login for "internet radio" and podcasts
-    //lowercase tags
+if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token=0'
+    || $fullUri == '/RadioNativeLogin.php'
+) {
+    //initial login for "internet radio", podcasts and "my noxon"
     header('Content-type: text/html');
-    readfile($dataDir . 'initial-login.xml');
-    exit();
-} else if ($fullUri == '/RadioNativeLogin.php') {
-    //initial login for "My noxon"
-    //this one wants CamelCased tags
-    header('Content-type: text/html');
-    readfile($dataDir . 'login-mynoxon.xml');
+    readfile($dataDir . 'login-camelcase.xml');
     exit();
 } else if ($path == '/setupapp/radio567/asp/BrowseXPA/LoginXML.asp') {
     //"Internet Radio"
@@ -40,7 +35,6 @@ if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token
 } else if ($path == '/RadioNative.php') {
     //"My Noxon"
     $path = '/mynoxon/';
-    $path = '/internetradio/';
 } else if ($path == '/setupapp/radio567/asp/BrowseXML/FavXML.asp') {
     //Internet Radio Station favorites favorited on device
     sendMessage('Unsupported');