From 21d75e4ff91199d0df798cdff454ca96ce5ec107 Mon Sep 17 00:00:00 2001
From: jakani24 <janis.st44@gmail.com>
Date: Mon, 1 Apr 2024 11:39:30 +0200
Subject: [PATCH] u

---
 .../system/secure_zone/php/database_settings.php              | 4 ++--
 .../system/secure_zone/php/database_settings_functions.php    | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/server/cyberhex-code/system/secure_zone/php/database_settings.php b/src/server/cyberhex-code/system/secure_zone/php/database_settings.php
index 1e4e1ed..31b8785 100644
--- a/src/server/cyberhex-code/system/secure_zone/php/database_settings.php
+++ b/src/server/cyberhex-code/system/secure_zone/php/database_settings.php
@@ -258,8 +258,8 @@ async function add_item(db,element_id1,field1,element_id2,field2){ //we have two
 									echo '<tr>';
 									echo '<td>' . $i . '</td>';
 									echo '<td>' . basename($yara_files[$i]) . '</td>';
-									echo '<td><a href="view_log.php?delete_yar='.$yara_files[$i].'&page=' . $current_page . '">delete</a></td>';
 									echo '<td><a href="'.str_replace("/var/www/html","",$yara_files[$i]).'" download>Download</a></td>';
+									echo '<td><a href="view_log.php?delete_yar='.$yara_files[$i].'&page=' . $current_page . '">delete</a></td>';
 									echo '</tr>';
 									$i++;
 								}
@@ -274,7 +274,7 @@ async function add_item(db,element_id1,field1,element_id2,field2){ //we have two
 							echo '<nav aria-label="Page navigation">';
 							echo '<ul class="pagination justify-content-center">';
 							for ($i = 1; $i <= $total_pages; $i++) {
-								echo '<li class="page-item ' . ($i == $current_page ? 'active' : '') . '"><a class="page-link" href="view_log.php?page='.$i.'">' . $i . '</a></li>';
+								echo '<li class="page-item ' . ($i == $current_page ? 'active' : '') . '"><a class="page-link" href="database_settings.php?show=yara&page='.$i.'">' . $i . '</a></li>';
 							}
 							echo '</ul>';
 							echo '</nav>';
diff --git a/src/server/cyberhex-code/system/secure_zone/php/database_settings_functions.php b/src/server/cyberhex-code/system/secure_zone/php/database_settings_functions.php
index f6b6e2e..833c773 100644
--- a/src/server/cyberhex-code/system/secure_zone/php/database_settings_functions.php
+++ b/src/server/cyberhex-code/system/secure_zone/php/database_settings_functions.php
@@ -71,11 +71,10 @@ function list_yara_files($dir) {
                 $path = $dir . '/' . $entry;
                 // If the entry is a directory, call the function recursively
                 if (is_dir($path)) {
-					$buf=list_yara_files($path);
+					$buf[]=list_yara_files($path);
 					foreach($buf as $newpath){
 						$yar_files[]=$newpath;
 					}
-                    //$yar_files = array_merge($yar_files, list_yara_files($path));
                 }
                 // If the entry is a file and ends with .yar extension, add it to the array
                 elseif (is_file($path) && pathinfo($path, PATHINFO_EXTENSION) === 'yar') {