From d854473a065961ffc5906293e2d92b25a42c3158 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Wed, 21 Aug 2024 22:11:28 +0300
Subject: [PATCH] Moving SQL into classes

---
 app/classes/component.php | 24 +++++++++++++++++++-----
 app/classes/queries.php   | 16 ----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/classes/component.php b/app/classes/component.php
index 2805963..4c69119 100644
--- a/app/classes/component.php
+++ b/app/classes/component.php
@@ -21,15 +21,29 @@ class Component {
         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);
+
+        // list of jitsi component events
+        $sql = 'SELECT jitsi_component, loglevel, time, component_id, event_type, event_param
+                FROM
+                    jitsi_components
+                WHERE
+                    jitsi_component = :jitsi_component
+                AND
+                    component_id = :component_id
+                AND
+                    (time >= :from_time AND time <= :until_time)
+                ORDER BY
+                    time';
 
         $query = $this->db->prepare($sql);
-        $query->execute();
+        $query->execute([
+            ':jitsi_component'		=> $jitsi_component,
+            ':component_id'		=> $component_id,
+            ':from_time'		=> $from_time . ' 00:00:00',
+            ':until_time'		=> $until_time . ' 23:59:59',
+        ]);
 
         return $query->fetchAll(PDO::FETCH_ASSOC);
     }
diff --git a/app/classes/queries.php b/app/classes/queries.php
index a7f82b0..74c2af3 100644
--- a/app/classes/queries.php
+++ b/app/classes/queries.php
@@ -397,22 +397,6 @@ AND (event_time >= '%s 00:00:00' AND event_time <= '%s 23:59:59')
 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;",
-
-
 ];
 
 ?>