Fix Array so it actually works...

d8ahazard · Jan 25, 2019 · 8206ced · 8206ced
1 parent 8dda2a6
commit 8206ced
Showing 1 changed file with 95 additions and 97 deletions.
diff --git a/php/webApp.php b/php/webApp.php
@@ -499,103 +499,101 @@ function upgradeDbTable($config) {
 
 		write_log("DB Connected, columns: ".json_encode($columns));
 
-		$dbData = '
-		[
-		    "alertPlugin":"tinyint(1)",
-		    "apiToken":"varchar(42)",
-		    "appArray":"json",
-		    "appLanguage":"tinytext(2)",
-		    "autoUpdate":"bool",
-		    "commands":"json",
-		    "couchEnabled":"bool",
-		    "couchList":"longtext",
-		    "couchProfile":"tinytext",
-		    "couchToken":"tinytext",
-		    "couchUri":"tinytext",
-		    "created":"timestamp",
-		    "darkTheme":"bool",
-		    "fcArray":"json",
-		    "flexConnectEnable":"bool",
-		    "flexConnectUri":"text",
-		    "hasPlugin":"bool",
-		    "headphonesEnabled":"bool",
-		    "headphonesToken":"tinytext",
-		    "headphonesUri":"tinytext",
-		    "hookCustomEnabled":"bool",
-		    "hookCustomUrl":"text",
-		    "hookEnabled":"bool",
-		    "hookFetchEnabled":"bool",
-		    "hookFetchUrl":"text",
-		    "hookPausedEnabled":"bool",
-		    "hookPausedUrl":"text",
-		    "hookPlayEnabled":"bool",
-		    "hookPlayUrl":"text",
-		    "hookSplitEnabled":"bool",
-		    "hookStopEnabled":"bool",
-		    "hookUrl":"text",
-		    "jsonAppArray":"json",
-		    "jsonDeviceArray":"json",
-		    "jsonWidgetArray":"json",
-		    "lastScan":"int",
-		    "lidarrEnabled":"bool",
-		    "lidarrList":"longtext",
-		    "lidarrProfile":"tinytext",
-		    "lidarrRoot":"tinytext",
-		    "lidarrToken":"tinytext",
-		    "lidarrUri":"text",
-		    "masterUser":"bool",
-		    "notifyUpdate":"bool",
-		    "ombiEnabled":"bool",
-		    "ombiToken":"tinytext",
-		    "ombiUri":"tinytext",
-		    "plexAvatar":"text",
-		    "plexClientId":"tinytext",
-		    "plexClientId":"text",
-		    "plexClientName":"text",
-		    "plexDvrComskipEnabled":"bool",
-		    "plexDvrEndOffsetMinutes":"tinyint(2)",
-		    "plexDvrId":"tinytext",
-		    "plexDvrKey":"tinytext",
-		    "plexDvrNewAirings":"bool",
-		    "plexDvrReplaceLower":"tinytext",
-		    "plexDvrResolution":"tinytext",
-		    "plexDvrStartOffsetMinutes":"tinyint(2)",
-		    "plexEmail":"tinytext",
-		    "plexPassUser":"bool",
-		    "plexServerId":"tinytext",
-		    "plexToken":"tinytext",
-		    "plexUserName":"tinytext",
-		    "publicAddress":"text",
-		    "quietStart":"time",
-		    "quietStop":"time",
-		    "radarrEnabled":"bool",
-		    "radarrList":"longtext",
-		    "radarrProfile":"tinytext",
-		    "radarrRoot":"tinytext",
-		    "radarrToken":"tinytext",
-		    "radarrUri":"text",
-		    "rescanTime":"tinyint(2)",
-		    "returnItems":"tinyint(2)",
-		    "searchAccuracy":"tinyint(3)",
-		    "shortAnswers":"bool",
-		    "sickEnabled":"bool",
-		    "sickList":"longtext",
-		    "sickProfile":"tinytext",
-		    "sickToken":"tinytext",
-		    "sickUri":"text",
-		    "sonarrEnabled":"tinyint(1)",
-		    "sonarrList":"longtext",
-		    "sonarrProfile":"tinytext",
-		    "sonarrRoot":"tinytext",
-		    "sonarrToken":"tinytext",
-		    "sonarrUri":"text",
-		    "watcherEnabled":"tinyint(1)",
-		    "watcherList":"tinytext",
-		    "watcherProfile":"tinyint(4)",
-		    "watcherToken":"tinytext",
-		    "widgetArray":"longtext"
-	    ]
-		';
+		$dbData = '{ 
+    "alertPlugin":"tinyint(1)",
+    "apiToken":"varchar(42)",
+    "appArray":"json",
+    "appLanguage":"tinytext(2)",
+    "autoUpdate":"bool",
+    "commands":"json",
+    "couchEnabled":"bool",
+    "couchList":"longtext",
+    "couchProfile":"tinytext",
+    "couchToken":"tinytext",
+    "couchUri":"tinytext",
+    "created":"timestamp",
+    "darkTheme":"bool",
+    "fcArray":"json",
+    "flexConnectEnable":"bool",
+    "flexConnectUri":"text",
+    "hasPlugin":"bool",
+    "headphonesEnabled":"bool",
+    "headphonesToken":"tinytext",
+    "headphonesUri":"tinytext",
+    "hookCustomEnabled":"bool",
+    "hookCustomUrl":"text",
+    "hookEnabled":"bool",
+    "hookFetchEnabled":"bool",
+    "hookFetchUrl":"text",
+    "hookPausedEnabled":"bool",
+    "hookPausedUrl":"text",
+    "hookPlayEnabled":"bool",
+    "hookPlayUrl":"text",
+    "hookSplitEnabled":"bool",
+    "hookStopEnabled":"bool",
+    "hookUrl":"text",
+    "jsonAppArray":"json",
+    "jsonDeviceArray":"json",
+    "jsonWidgetArray":"json",
+    "lastScan":"int",
+    "lidarrEnabled":"bool",
+    "lidarrList":"longtext",
+    "lidarrProfile":"tinytext",
+    "lidarrRoot":"tinytext",
+    "lidarrToken":"tinytext",
+    "lidarrUri":"text",
+    "masterUser":"bool",
+    "notifyUpdate":"bool",
+    "ombiEnabled":"bool",
+    "ombiToken":"tinytext",
+    "ombiUri":"tinytext",
+    "plexAvatar":"text",
+    "plexClientId":"tinytext",
+    "plexClientId":"text",
+    "plexClientName":"text",
+    "plexDvrComskipEnabled":"bool",
+    "plexDvrEndOffsetMinutes":"tinyint(2)",
+    "plexDvrId":"tinytext",
+    "plexDvrKey":"tinytext",
+    "plexDvrNewAirings":"bool",
+    "plexDvrReplaceLower":"tinytext",
+    "plexDvrResolution":"tinytext",
+    "plexDvrStartOffsetMinutes":"tinyint(2)",
+    "plexEmail":"tinytext",
+    "plexPassUser":"bool",
+    "plexServerId":"tinytext",
+    "plexToken":"tinytext",
+    "plexUserName":"tinytext",
+    "publicAddress":"text",
+    "quietStart":"time",
+    "quietStop":"time",
+    "radarrEnabled":"bool",
+    "radarrList":"longtext",
+    "radarrProfile":"tinytext",
+    "radarrRoot":"tinytext",
+    "radarrToken":"tinytext",
+    "radarrUri":"text",
+    "rescanTime":"tinyint(2)",
+    "returnItems":"tinyint(2)",
+    "searchAccuracy":"tinyint(3)",
+    "shortAnswers":"bool",
+    "sickEnabled":"bool",
+    "sickList":"longtext",
+    "sickProfile":"tinytext",
+    "sickToken":"tinytext",
+    "sickUri":"text",
+    "sonarrEnabled":"tinyint(1)",
+    "sonarrList":"longtext",
+    "sonarrProfile":"tinytext",
+    "sonarrRoot":"tinytext",
+    "sonarrToken":"tinytext",
+    "sonarrUri":"text",
+    "watcherEnabled":"tinyint(1)",
+    "watcherList":"tinytext",
+    "watcherProfile":"tinyint(4)",
+    "watcherToken":"tinytext",
+    "widgetArray":"longtext"
+ }';
 		$addItems = [];
 		$updateItems = [];
 		$dbTypes = json_decode($dbData, true);