Merge branch 'main' into fix-sql

Helioviewer-Project · Jun 20, 2024 · 07367b8 · 07367b8
2 parents 98f97a3 + bc7bca8
commit 07367b8
Show file tree

Hide file tree

Showing 91 changed files with 7,535 additions and 327 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,4 +71,4 @@ docroot/docs/v2
 docroot/status.xml
 py_env
 py_venv_local_sunpy
-vendor
+vendor
diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
     },
     "require": {
         "helioviewer/event-interface": "v0.2.1",
-        "matomo/device-detector": "dev-master"
+        "matomo/device-detector": "dev-master",
+        "opis/json-schema": "^2.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6"

diff --git a/composer.lock b/composer.lock
diff --git a/docroot/docs/index.php b/docroot/docs/index.php
@@ -16,16 +16,15 @@
     // Script was called directly.  Redirect to an API-version specific URL.
     if (realpath(__FILE__) == $_SERVER['SCRIPT_FILENAME']) {
         require_once dirname(realpath(__FILE__)).'/../../src/Config.php';
-        $config = new Config(dirname(realpath(__FILE__))
-                . '/../../settings/Config.ini');
+        $config = new Config(dirname(realpath(__FILE__)) . '/../../settings/Config.ini');
         header('Location: '.HV_WEB_ROOT_URL.'/docs/'.$api_version);
     }
 
 
     function import_xml($api_version, &$api_xml_path, &$xml) {
-        $api_xml_path = dirname(realpath(__FILE__)) . '/' . $api_version
-                           . '/api_definitions.xml';
-        $xml = simplexml_load_file($api_xml_path);
+        $api_xml_url = sprintf("%s/docs/%s/api_definitions.xml", "https://api.helioviewer.org", $api_version);
+        $xml = simplexml_load_file($api_xml_url);
+        $api_xml_path = dirname(realpath(__FILE__)) . '/' . $api_version. '/api_definitions.xml';
     }
 
     function output_html($api_version) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,4 +71,4 @@ docroot/docs/v2 @@
     docroot/status.xml
     py_env
     py_venv_local_sunpy
-    vendor
+    vendor