diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b8bf22..52cb601 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file. - Added front page widgets - Added demo installation on https://work.lindeas.com/jilo-web-demo/ - Added participant search page +- Added component events search page ### Changed diff --git a/public_html/classes/component.php b/public_html/classes/component.php new file mode 100644 index 0000000..2805963 --- /dev/null +++ b/public_html/classes/component.php @@ -0,0 +1,40 @@ +db = $database->getConnection(); + $this->queries = include('queries.php'); + } + + + // list of component events + public function jitsiComponents($jitsi_component, $component_id, $from_time, $until_time) { + + // time period drill-down + // FIXME make it similar to the bash version + if (empty($from_time)) { + $from_time = '0000-01-01'; + } + if (empty($until_time)) { + $until_time = '9999-12-31'; + } + + // this is needed for compatibility with the bash version, so we use '%s' placeholders + $from_time = htmlspecialchars(strip_tags($from_time)); + $until_time = htmlspecialchars(strip_tags($until_time)); + $sql = $this->queries['jitsi_components']; + $sql = sprintf($sql, $jitsi_component, $component_id, $from_time, $until_time); + + $query = $this->db->prepare($sql); + $query->execute(); + + return $query->fetchAll(PDO::FETCH_ASSOC); + } + + +} + +?> diff --git a/public_html/classes/conference.php b/public_html/classes/conference.php index bf447c8..2e67df4 100644 --- a/public_html/classes/conference.php +++ b/public_html/classes/conference.php @@ -4,14 +4,14 @@ class Conference { private $db; private $queries; - public $jitsi_component; - public $start; - public $end; - public $conference_id; - public $conference_name; - public $participants; - public $name_count; - public $conference_host; +// public $jitsi_component; +// public $start; +// public $end; +// public $conference_id; +// public $conference_name; +// public $participants; +// public $name_count; +// public $conference_host; public function __construct($database) { $this->db = $database->getConnection(); diff --git a/public_html/classes/participant.php b/public_html/classes/participant.php index 38476d3..3ae884f 100644 --- a/public_html/classes/participant.php +++ b/public_html/classes/participant.php @@ -4,14 +4,14 @@ class Participant { private $db; private $queries; - public $jitsi_component; - public $start; - public $end; - public $participant_id; - public $conference_name; - public $participants; - public $name_count; - public $conference_host; +// public $jitsi_component; +// public $start; +// public $end; +// public $participant_id; +// public $conference_name; +// public $participants; +// public $name_count; +// public $conference_host; public function __construct($database) { $this->db = $database->getConnection(); diff --git a/public_html/classes/queries.php b/public_html/classes/queries.php index 9c25ef9..fba5bef 100644 --- a/public_html/classes/queries.php +++ b/public_html/classes/queries.php @@ -294,6 +294,21 @@ ORDER BY pe.time;", + // list of jitsi component events + 'jitsi_components' => " +SELECT jitsi_component, loglevel, time, component_id, event_type, event_param +FROM + jitsi_components +WHERE + jitsi_component = %s +AND + component_id = %s +AND + (time >= '%s 00:00:00' AND time <= '%s 23:59:59') +ORDER BY + time;", + + ]; ?> diff --git a/public_html/index.php b/public_html/index.php index 1582908..916269c 100644 --- a/public_html/index.php +++ b/public_html/index.php @@ -27,6 +27,7 @@ $allowed_urls = [ 'config', 'conferences', 'participants', + 'components', ]; // cnfig file diff --git a/public_html/pages/components.php b/public_html/pages/components.php new file mode 100644 index 0000000..08c26c7 --- /dev/null +++ b/public_html/pages/components.php @@ -0,0 +1,144 @@ +getMessage(); + include 'templates/message.php'; + exit(); +} + + +// +// Component events listings +// + + +// list of all component events (default) +//if ($jitsi_component) { + try { + $component = new Component($db); + + // prepare the result + $search = $component->jitsiComponents($jitsi_component, $component_id, $from_time, $until_time); + + if (!empty($search)) { + $components = array(); + $components['records'] = array(); + + foreach ($search as $item) { + extract($item); + $component_record = array( + // assign title to the field in the array record + 'component' => $jitsi_component, + 'loglevel' => $loglevel, + 'time' => $time, + 'component ID' => $component_id, + 'event' => $event_type, + 'param' => $event_param, + ); + // populate the result array + array_push($components['records'], $component_record); + } + } + + } catch (Exception $e) { + $error = 'Error: ' . $e->getMessage(); + include 'templates/message.php'; + exit(); + } + + // display the result + + // format the header message + echo "
\n"; + if (isset($_REQUEST['name']) && $_REQUEST['name'] != '') { + echo "
Jitsi events for component " . $_REQUEST['name'] . ""; + } elseif (isset($_REQUEST['id']) && $_REQUEST['id'] != '') { + echo "
Jitsi events for component ID
" . $_REQUEST['id'] . ""; + } else { + echo "
Jitsi events for all components"; + } + if ($time_range_specified) { + echo "
for the time period $from_time - $until_time"; + } + echo "
\n\n"; + + // filters - time selection and sorting dropdowns + include 'templates/results-filter.php'; + + echo "
\n\n"; + + // results table + echo "
\n"; + + if (!empty($components['records'])) { + + echo "\t\n"; + echo "\t\t\n"; + + // table headers + foreach (array_keys($components['records'][0]) as $header) { + echo "\t\t\t\n"; + } + echo "\t\t\n"; + + //table rows + foreach ($components['records'] as $row) { + echo "\t\t\n"; + // sometimes $column is empty, we make it '' then + foreach ($row as $key => $column) { + if ($key === 'component ID') { + echo "\t\t\t\n"; + } elseif ($key === 'component') { + echo "\t\t\t\n"; + } else { + echo "\t\t\t\n"; + } + } + echo "\t\t\n"; + } + + echo "\t
" . htmlspecialchars($header) . "
" . htmlspecialchars($column ?? '') . "" . htmlspecialchars($column ?? '') . "" . htmlspecialchars($column ?? '') . "
\n"; + + } else { + echo '

No matching Jitsi component events found.

'; + } + echo "\n
\n"; + +//} + +?> diff --git a/public_html/templates/menu.php b/public_html/templates/menu.php index 14d9eab..b4a107e 100644 --- a/public_html/templates/menu.php +++ b/public_html/templates/menu.php @@ -6,6 +6,7 @@
  • config
  • conferences
  • participants
    • +
  • components