Removes all old messaging system references
							parent
							
								
									378ecb8a14
								
							
						
					
					
						commit
						a5b2653ed4
					
				| 
						 | 
				
			
			@ -52,7 +52,7 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
 | 
			
		|||
        // unknown database
 | 
			
		||||
        } else {
 | 
			
		||||
            $error = "Error: unknow database type \"{$config['db']['db_type']}\"";
 | 
			
		||||
            include '../app/templates/block-message.php';
 | 
			
		||||
            Messages::flash('ERROR', 'DEFAULT', $error);
 | 
			
		||||
            exit();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
 | 
			
		|||
 | 
			
		||||
// if DB connection has error, display it and stop here
 | 
			
		||||
if ($response['db'] === null) {
 | 
			
		||||
    $error = $response['error'];
 | 
			
		||||
    include '../app/templates/block-message.php';
 | 
			
		||||
    Messages::flash('ERROR', 'DEFAULT', $response['error']);
 | 
			
		||||
 | 
			
		||||
// otherwise if DB connection is OK, go on
 | 
			
		||||
} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
 | 
			
		|||
 | 
			
		||||
// if DB connection has error, display it and stop here
 | 
			
		||||
if ($response['db'] === null) {
 | 
			
		||||
    $error = $response['error'];
 | 
			
		||||
    include '../app/templates/block-message.php';
 | 
			
		||||
    Messages::flash('ERROR', 'DEFAULT', $response['error']);
 | 
			
		||||
 | 
			
		||||
// otherwise if DB connection is OK, go on
 | 
			
		||||
} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,8 +21,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
 | 
			
		|||
 | 
			
		||||
// if DB connection has error, display it and stop here
 | 
			
		||||
if ($response['db'] === null) {
 | 
			
		||||
    $error = $response['error'];
 | 
			
		||||
    include '../app/templates/block-message.php';
 | 
			
		||||
    Messages::flash('ERROR', 'DEFAULT', $response['error']);
 | 
			
		||||
 | 
			
		||||
// otherwise if DB connection is OK, go on
 | 
			
		||||
} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
 | 
			
		|||
 | 
			
		||||
// if DB connection has error, display it and stop here
 | 
			
		||||
if ($response['db'] === null) {
 | 
			
		||||
    $error = $response['error'];
 | 
			
		||||
    include '../app/templates/block-message.php';
 | 
			
		||||
    Messages::flash('ERROR', 'DEFAULT', $response['error']);
 | 
			
		||||
 | 
			
		||||
// otherwise if DB connection is OK, go on
 | 
			
		||||
} else {
 | 
			
		||||
| 
						 | 
				
			
			@ -34,8 +33,7 @@ if ($response['db'] === null) {
 | 
			
		|||
            // Connect to Jilo database for log data
 | 
			
		||||
            $jilo_response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
 | 
			
		||||
            if ($jilo_response['db'] === null) {
 | 
			
		||||
                $error = $jilo_response['error'];
 | 
			
		||||
                include '../app/templates/block-message.php';
 | 
			
		||||
                Messages::flash('ERROR', 'DEFAULT', $jilo_response['error']);
 | 
			
		||||
                break;
 | 
			
		||||
            }
 | 
			
		||||
            $jilo_db = $jilo_response['db'];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,7 @@ $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $pl
 | 
			
		|||
 | 
			
		||||
// if DB connection has error, display it and stop here
 | 
			
		||||
if ($response['db'] === null) {
 | 
			
		||||
    $error = $response['error'];
 | 
			
		||||
    include '../app/templates/block-message.php';
 | 
			
		||||
    Messages::flash('ERROR', 'DEFAULT', $response['error']);
 | 
			
		||||
 | 
			
		||||
// otherwise if DB connection is OK, go on
 | 
			
		||||
} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
 | 
			
		||||
INSERT INTO users VALUES(1,'demo1','$2y$10$LtV9m.rMCJ.K/g45e6tzDexZ8C/9xxu3qFCkvz92pUYa7Jg06np0i');
 | 
			
		||||
INSERT INTO users VALUES(2,'demo','$2y$10$tLCLvgYu91gf/zBoc58Am.iVls/SOMcIXO3ykGfgFFei9yneZTrb2');
 | 
			
		||||
INSERT INTO users VALUES(1,'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 platforms VALUES(1,'meet.lindeas.com','https://meet.lindeas.com','../jilo-meet.lindeas.db');
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue