From 1780233778522667dcc0b9fb09624ee696dff0fb Mon Sep 17 00:00:00 2001 From: Yasen Pramatarov Date: Tue, 27 Aug 2024 21:18:27 +0300 Subject: [PATCH] Adds Jitsi URL for loading the config.js and doing checks --- app/config/jilo-web.conf.php | 15 +++++++++++++-- app/pages/config.php | 11 +++++++---- app/templates/config-add-platform.php | 13 ++++++++++++- app/templates/config-edit-platform.php | 2 ++ 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/app/config/jilo-web.conf.php b/app/config/jilo-web.conf.php index f84fb5e..804337d 100644 --- a/app/config/jilo-web.conf.php +++ b/app/config/jilo-web.conf.php @@ -29,7 +29,7 @@ return [ // system info 'version' => '0.1.1', // development has verbose error messages, production has not - 'environment' => 'production', + 'environment' => 'development', // ************************************* // Maintained by the app, edit with care @@ -37,9 +37,20 @@ return [ 'platforms' => [ '0' => [ - 'name' => 'meet.example.com', + 'name' => 'meet1', + 'jitsi_url' => 'https://meet.example.com', 'jilo_database' => '../../jilo/jilo.db', ], + '1' => [ + 'name' => 'meet2.example.com', + 'jitsi_url' => 'https://test2.example.com', + 'jilo_database' => '../../jilo/jilo2.db', + ], + '2' => [ + 'name' => 'test3', + 'jitsi_url' => 'https://test3.example.com', + 'jilo_database' => '../../jilo/jilo2.db', + ], ], ]; diff --git a/app/pages/config.php b/app/pages/config.php index 59b0b5d..292be4b 100644 --- a/app/pages/config.php +++ b/app/pages/config.php @@ -14,8 +14,9 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { // new platform adding if (isset($_POST['new']) && $_POST['new'] === 'true') { $newPlatform = [ - 'name' => $_POST['name'], - 'jilo_database' => $_POST['jilo_database'], + 'name' => $_POST['name'], + 'jitsi_url' => $_POST['jitsi_url'], + 'jilo_database' => $_POST['jilo_database'], ]; // Determine the next available index for the new platform @@ -40,12 +41,13 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { $platform = $_POST['platform']; $config['platforms'][$platform]['name'] = $_POST['name']; + $config['platforms'][$platform]['jitsi_url'] = $_POST['jitsi_url']; $config['platforms'][$platform]['jilo_database'] = $_POST['jilo_database']; $platformsArray = formatArray($config['platforms'][$platform], 3); $updatedContent = preg_replace( - "/\s*'$platform'\s*=>\s*\[\s*'name'\s*=>\s*'[^']*',\s*'jilo_database'\s*=>\s*'[^']*',\s*\],/s", + "/\s*'$platform'\s*=>\s*\[\s*'name'\s*=>\s*'[^']*',\s*'jitsi_url'\s*=>\s*'[^']*,\s*'jilo_database'\s*=>\s*'[^']*',\s*\],/s", "", $content ); @@ -57,12 +59,13 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { $platform = $_POST['platform']; $config['platforms'][$platform]['name'] = $_POST['name']; + $config['platforms'][$platform]['jitsi_url'] = $_POST['jitsi_url']; $config['platforms'][$platform]['jilo_database'] = $_POST['jilo_database']; $platformsArray = formatArray($config['platforms'][$platform], 3); $updatedContent = preg_replace( - "/\s*'$platform'\s*=>\s*\[\s*'name'\s*=>\s*'[^']*',\s*'jilo_database'\s*=>\s*'[^']*',\s*\],/s", + "/\s*'$platform'\s*=>\s*\[\s*'name'\s*=>\s*'[^']*',\s*'jitsi_url'\s*=>\s*'[^']*',\s*'jilo_database'\s*=>\s*'[^']*',\s*\],/s", "\n '{$platform}' => {$platformsArray},", $content ); diff --git a/app/templates/config-add-platform.php b/app/templates/config-add-platform.php index b8e66c5..9897dd0 100644 --- a/app/templates/config-add-platform.php +++ b/app/templates/config-add-platform.php @@ -19,7 +19,18 @@
- + + * +
+
+ +

URL of the Jitsi Meet (used for checks and for loading config.js)

+
+
+ +
+
+ *
diff --git a/app/templates/config-edit-platform.php b/app/templates/config-edit-platform.php index 7db13ed..7330b15 100644 --- a/app/templates/config-edit-platform.php +++ b/app/templates/config-edit-platform.php @@ -15,6 +15,8 @@

descriptive name for the platform

+ +

URL of the Jitsi Meet (used for checks and for loading config.js)

path to the database file (relative to the app root)