app/pages/components.php

@@ -8,6 +8,12 @@
  * Supports pagination.
  */
 
+// Get any new messages
+include '../app/includes/messages.php';
+include '../app/includes/messages-show.php';
+
+require '../app/classes/component.php';
+
 // connect to database
 $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
 
@@ -60,7 +66,8 @@ if ($response['db'] === null) {
     // Component events listings
     //
 
-    require '../app/classes/component.php';
+
+    // list of all component events (default)
     $componentObject = new Component($db);
 
 
@@ -92,17 +99,26 @@ if ($response['db'] === null) {
         }
     }
 
-    // filter message
+//    // prepare the widget
-    $filterMessage = array();
+//    $widget['full'] = false;
-    if (isset($_REQUEST['name']) && $_REQUEST['name'] != '') {
+//    $widget['name'] = 'AllComponents';
-        array_push($filterMessage, 'Jitsi events for component&nbsp;"<strong>' . $_REQUEST['name'] . '</strong>"');
+//    $widget['filter'] = true;
-    } elseif (isset($_REQUEST['id']) && $_REQUEST['id'] != '') {
+//    $widget['pagination'] = true;
-        array_push($filterMessage, 'Jitsi events for component ID&nbsp;"<strong>' . $_REQUEST['id'] . '</strong>"');
-    }
 
-    // Get any new messages
+    // widget title
-    include '../app/includes/messages.php';
+    if (isset($_REQUEST['name']) && $_REQUEST['name'] != '') {
-    include '../app/includes/messages-show.php';
+        $widget['title'] = 'Jitsi events for component&nbsp;<strong>' . $_REQUEST['name'] . '</strong>';
+    } elseif (isset($_REQUEST['id']) && $_REQUEST['id'] != '') {
+        $widget['title'] = 'Jitsi events for component ID&nbsp;<strong>' . $_REQUEST['id'] . '</strong>';
+    } else {
+        $widget['title'] = 'Jitsi events for&nbsp;<strong>all components</strong>';
+    }
+//    // widget records
+//    if (!empty($components['records'])) {
+//        $widget['full'] = true;
+//        $widget['table_headers'] = array_keys($components['records'][0]);
+//        $widget['table_records'] = $components['records'];
+//    }
 
     // display the widget
     include '../app/templates/components.php';

app/pages/participants.php

@@ -8,6 +8,12 @@
  * Supports pagination.
  */
 
+// Get any new messages
+include '../app/includes/messages.php';
+include '../app/includes/messages-show.php';
+
+require '../app/classes/participant.php';
+
 // connect to database
 $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
 
@@ -68,7 +74,6 @@ if ($response['db'] === null) {
     // Participant listings
     //
 
-    require '../app/classes/participant.php';
     $participantObject = new Participant($db);
 
     // pagination variables
@@ -162,17 +167,13 @@ if ($response['db'] === null) {
     // filter message
     $filterMessage = array();
     if (isset($_REQUEST['name']) && $_REQUEST['name'] != '') {
-        array_push($filterMessage, 'Conferences with participant name (stats_id) matching "<strong>' . $_REQUEST['name'] . '</strong>"');
+        array_push($filterMessage, 'Conferences with participant name (stats_id) matching "<strong>' . $_REQUEST['name'] . '"</strong>');
     } elseif (isset($_REQUEST['id']) && $_REQUEST['id'] != '') {
-        array_push($filterMessage, 'Conferences with participant ID matching "<strong>' . $_REQUEST['id'] . '</strong>"');
+        array_push($filterMessage, 'Conferences with participant ID matching "<strong>' . $_REQUEST['id'] . '"</strong>');
     } elseif (isset($participantIp)) {
-        array_push($filterMessage, 'Conferences with participant IP matching "<strong>' . $participantIp . '</strong>"');
+        array_push($filterMessage, 'Conferences with participant IP matching "<strong>' . $participantIp . '"</strong>');
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
-
     // display the widget
     include '../app/templates/participants.php';
 

app/templates/components.php

@@ -43,20 +43,11 @@
                             <!-- /component events filter -->
 
                             <!-- component events -->
-<?php if ($time_range_specified || count($filterMessage)) { ?>
+<?php if ($time_range_specified) { ?>
                             <div class="alert alert-info m-0 mb-3 small">
-<?php   if ($time_range_specified) { ?>
+                                <i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong>
-                                <p class="mb-0"><i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong></p>
-<?php   } ?>
-<?php   if (count($filterMessage)) {
-          foreach ($filterMessage as $message) { ?>
-                                <p class="mb-0"><i class="fas fa-users me-2"></i><?= $message ?></strong></p>
-<?php     } ?>
-<?php   } ?>
                             </div>
 <?php } ?>
-
-
                             <div class="mb-5">
 <?php if (!empty($components['records'])) { ?>
                                 <div class="table-responsive border">