lindeas
/
jilo-web
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Removes all old messaging system references

main
Yasen Pramatarov 2025-01-15 18:52:15 +02:00
parent 378ecb8a14
commit a5b2653ed4
7 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/includes/database.php
View File

@ -52,7 +52,7 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
// unknown database // unknown database
} else { } else {
$error = "Error: unknow database type \"{$config['db']['db_type']}\""; $error = "Error: unknow database type \"{$config['db']['db_type']}\"";
include '../app/templates/block-message.php'; Messages::flash('ERROR', 'DEFAULT', $error);
exit(); exit();
} }

3
app/pages/components.php
View File

@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
// if DB connection has error, display it and stop here // if DB connection has error, display it and stop here
if ($response['db'] === null) { if ($response['db'] === null) {
$error = $response['error']; Messages::flash('ERROR', 'DEFAULT', $response['error']);
include '../app/templates/block-message.php';
// otherwise if DB connection is OK, go on // otherwise if DB connection is OK, go on
} else { } else {

3
app/pages/conferences.php
View File

@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
// if DB connection has error, display it and stop here // if DB connection has error, display it and stop here
if ($response['db'] === null) { if ($response['db'] === null) {
$error = $response['error']; Messages::flash('ERROR', 'DEFAULT', $response['error']);
include '../app/templates/block-message.php';
// otherwise if DB connection is OK, go on // otherwise if DB connection is OK, go on
} else { } else {

3
app/pages/dashboard.php
View File

@ -21,8 +21,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
// if DB connection has error, display it and stop here // if DB connection has error, display it and stop here
if ($response['db'] === null) { if ($response['db'] === null) {
$error = $response['error']; Messages::flash('ERROR', 'DEFAULT', $response['error']);
include '../app/templates/block-message.php';
// otherwise if DB connection is OK, go on // otherwise if DB connection is OK, go on
} else { } else {

6
app/pages/data.php
View File

@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
// if DB connection has error, display it and stop here // if DB connection has error, display it and stop here
if ($response['db'] === null) { if ($response['db'] === null) {
$error = $response['error']; Messages::flash('ERROR', 'DEFAULT', $response['error']);
include '../app/templates/block-message.php';
// otherwise if DB connection is OK, go on // otherwise if DB connection is OK, go on
} else { } else {
@ -34,8 +33,7 @@ if ($response['db'] === null) {
// Connect to Jilo database for log data // Connect to Jilo database for log data
$jilo_response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id); $jilo_response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
if ($jilo_response['db'] === null) { if ($jilo_response['db'] === null) {
$error = $jilo_response['error']; Messages::flash('ERROR', 'DEFAULT', $jilo_response['error']);
include '../app/templates/block-message.php';
break; break;
} }
$jilo_db = $jilo_response['db']; $jilo_db = $jilo_response['db'];

3
app/pages/participants.php
View File

@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
// if DB connection has error, display it and stop here // if DB connection has error, display it and stop here
if ($response['db'] === null) { if ($response['db'] === null) {
$error = $response['error']; Messages::flash('ERROR', 'DEFAULT', $response['error']);
include '../app/templates/block-message.php';
// otherwise if DB connection is OK, go on // otherwise if DB connection is OK, go on
} else { } else {

6
doc/jilo-web_demo-data.schema
View File

@ -1,8 +1,8 @@
INSERT INTO users VALUES(1,'demo1','$2y$10$LtV9m.rMCJ.K/g45e6tzDexZ8C/9xxu3qFCkvz92pUYa7Jg06np0i'); INSERT INTO users VALUES(1,'demo','$2y$10$tLCLvgYu91gf/zBoc58Am.iVls/SOMcIXO3ykGfgFFei9yneZTrb2');
INSERT INTO users VALUES(2,'demo','$2y$10$tLCLvgYu91gf/zBoc58Am.iVls/SOMcIXO3ykGfgFFei9yneZTrb2'); INSERT INTO users VALUES(2,'demo1','$2y$10$LtV9m.rMCJ.K/g45e6tzDexZ8C/9xxu3qFCkvz92pUYa7Jg06np0i');
INSERT INTO users_meta VALUES(1,1,'admin user','admin@example.com',NULL,NULL,'This is a demo user of the demo install of Jilo Web'); INSERT INTO users_meta VALUES(1,1,'demo admin user','admin@example.com',NULL,NULL,'This is a demo user of the demo install of Jilo Web');
INSERT INTO users_meta VALUES(2,2,'demo user','demo@example.com',NULL,NULL,'This is a demo user of the demo install of Jilo Web'); INSERT INTO users_meta VALUES(2,2,'demo user','demo@example.com',NULL,NULL,'This is a demo user of the demo install of Jilo Web');
INSERT INTO platforms VALUES(1,'meet.lindeas.com','https://meet.lindeas.com','../jilo-meet.lindeas.db'); INSERT INTO platforms VALUES(1,'meet.lindeas.com','https://meet.lindeas.com','../jilo-meet.lindeas.db');