diff --git a/api.php b/api.php index b45877d..870c44f 100644 --- a/api.php +++ b/api.php @@ -4,4 +4,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -require __DIR__ . "/api/index.php"; \ No newline at end of file + +// Load in new API from legacy location (a.k.a. here) +require __DIR__ . "/api/index.php"; diff --git a/api/actions/listapps.php b/api/actions/listapps.php index 2947fb3..094713b 100644 --- a/api/actions/listapps.php +++ b/api/actions/listapps.php @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -$apps = EXTERNAL_APPS; +$apps = $SETTINGS['apps']; // Format paths as absolute URLs foreach ($apps as $k => $v) { if (strpos($apps[$k]['url'], "http") === FALSE) { diff --git a/api/actions/mobileenabled.php b/api/actions/mobileenabled.php index ffae16b..a530d86 100644 --- a/api/actions/mobileenabled.php +++ b/api/actions/mobileenabled.php @@ -6,4 +6,4 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -exitWithJson(["status" => "OK", "mobile" => MOBILE_ENABLED]); \ No newline at end of file +exitWithJson(["status" => "OK", "mobile" => $SETTINGS['mobile_enabled']]); \ No newline at end of file diff --git a/app.php b/app.php index 55a8421..15b740c 100644 --- a/app.php +++ b/app.php @@ -1,5 +1,4 @@ ; rel=preload; as=script", fals -