Merge branch 'master' into 0.1.8.2

itflow-org · Feb 8, 2024 · 3d3587a · 3d3587a
2 parents b3df9fc + 4dae89d
commit 3d3587a
Show file tree

Hide file tree

Showing 14 changed files with 240 additions and 116 deletions.
diff --git a/api_key_add_modal.php b/api_key_add_modal.php
@@ -52,13 +52,12 @@
                     </div>
 
                     <div class="form-group">
-                        <label>Client <strong class="text-danger">*</strong></label>
+                        <label>Client Access <strong class="text-danger">*</strong></label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
                             <select class="form-control select2" name="client" required>
-                                <option value="">- Client -</option>
                                 <option value="0"> ALL CLIENTS </option>
                                 <?php
                                 $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");

diff --git a/check_login.php b/check_login.php
@@ -55,7 +55,8 @@
 $session_timezone = $row['config_timezone'];
 
 // Set Timezone to the companies timezone
-date_default_timezone_set($session_timezone);
+// 2024-02-08 JQ - The option to set the timezone in PHP was disabled to prevent inconsistencies with MariaDB/MySQL, which utilize the system's timezone, It is now consdered best practice to set the timezone on system itself
+//date_default_timezone_set($session_timezone);
 
 //Set Currency Format
 $currency_format = numfmt_create($session_company_locale, NumberFormatter::CURRENCY);

diff --git a/client_certificates.php b/client_certificates.php
@@ -50,14 +50,14 @@
                 </div>
 
                 <div class="col-md-8">
-                    <div class="float-right">
-                        <div class="dropdown" id="multiActionButton" hidden>
-                            <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-                                <i class="fas fa-fw fa-list mr-2"></i>Selected (<span id="selectedCount">0</span>)
+                    <div class="btn-group float-right">
+                        <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
                                 <button class="dropdown-item text-danger text-bold"
-                                        type="submit" form="multi_actions" name="bulk_delete_certificates">
+                                        type="submit" form="bulkActions" name="bulk_delete_certificates">
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                             </div>
@@ -70,7 +70,7 @@
         <hr>
         <div class="table-responsive-sm">
 
-            <form id="multi_actions" action="post.php" method="post">
+            <form id="bulkActions" action="post.php" method="post">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                 <table class="table table-striped table-borderless table-hover">
@@ -103,7 +103,7 @@
                         <tr>
                             <td class="pr-0">
                                 <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" name="certificate_ids[]" value="<?php echo $certificate_id ?>">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="certificate_ids[]" value="<?php echo $certificate_id ?>">
                                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                                 </div>
                             </td>
@@ -127,11 +127,11 @@
                                         </a>
                                         <?php if ($session_user_role == 3) { ?>
                                             <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger" href="post.php?archive_certificate=<?php echo $certificate_id; ?>">
+                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_certificate=<?php echo $certificate_id; ?>">
                                                 <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                             </a>
                                             <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold" href="post.php?delete_certificate=<?php echo $certificate_id; ?>">
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_certificate=<?php echo $certificate_id; ?>">
                                                 <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                             </a>
                                         <?php } ?>
@@ -164,7 +164,7 @@
 ?>
 
 <script src="js/certificate_edit_modal.js"></script>
-<script src="js/multi_actions.js"></script>
+<script src="js/bulk_actions.js"></script>
 <script src="js/certificate_fetch_ssl.js"></script>
 
 <?php require_once "footer.php";

diff --git a/client_domains.php b/client_domains.php
@@ -51,14 +51,14 @@
                     </div>
 
                     <div class="col-md-8">
-                        <div class="float-right">
-                            <div class="dropdown" id="multiActionButton" hidden>
-                                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-list mr-2"></i>Selected (<span id="selectedCount">0</span>)
+                        <div class="btn-group float-right">
+                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
                                     <button class="dropdown-item text-danger text-bold"
-                                            type="submit" form="multi_actions" name="bulk_delete_domains">
+                                            type="submit" form="bulkActions" name="bulk_delete_domains">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </button>
                                 </div>
@@ -71,7 +71,7 @@
             <hr>
             <div class="table-responsive-sm">
 
-                <form id="multi_actions" action="post.php" method="post">
+                <form id="bulkActions" action="post.php" method="post">
                     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                     <table class="table table-striped table-borderless table-hover">
@@ -115,7 +115,7 @@
                             <tr>
                                 <td class="pr-0">
                                     <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="domain_ids[]" value="<?php echo $domain_id ?>">
+                                        <input class="form-check-input bulk-select" type="checkbox" name="domain_ids[]" value="<?php echo $domain_id ?>">
                                         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                                     </div>
                                 </td>
@@ -134,13 +134,13 @@
                                             </a>
                                             <?php if ($session_user_role == 2) { ?>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger" href="post.php?archive_domain=<?php echo $domain_id; ?>">
+                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_domain=<?php echo $domain_id; ?>">
                                                     <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                                 </a>
                                             <?php } ?>
                                             <?php if ($session_user_role == 3) { ?>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger text-bold" href="post.php?delete_domain=<?php echo $domain_id; ?>">
+                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_domain=<?php echo $domain_id; ?>">
                                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                                 </a>
                                             <?php } ?>
@@ -172,7 +172,7 @@
 ?>
 
 <script src="js/domain_edit_modal.js"></script>
-<script src="js/multi_actions.js"></script>
+<script src="js/bulk_actions.js"></script>
 
 <?php require_once "footer.php";
 
diff --git a/client_networks.php b/client_networks.php
@@ -55,14 +55,14 @@
                     </div>
 
                     <div class="col-md-8">
-                        <div class="float-right">
-                            <div class="dropdown" id="multiActionButton" hidden>
-                                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-list mr-2"></i>Selected (<span id="selectedCount">0</span>)
+                        <div class="btn-group float-right">
+                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
-                                    <button class="dropdown-item text-danger text-bold"
-                                            type="submit" form="multi_actions" name="bulk_delete_networks">
+                                    <button class="dropdown-item text-danger text-bold confirm-link"
+                                            type="submit" form="bulkActions" name="bulk_delete_networks">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </button>
                                 </div>
@@ -75,7 +75,7 @@
             <hr>
             <div class="table-responsive-sm">
 
-                <form id="multi_actions" action="post.php" method="post">
+                <form id="bulkActions" action="post.php" method="post">
                     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                     <table class="table table-striped table-borderless table-hover">
@@ -127,13 +127,12 @@
                             <tr>
                                 <td class="pr-0">
                                     <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="network_ids[]" value="<?php echo $network_id ?>">
+                                        <input class="form-check-input bulk-select" type="checkbox" name="network_ids[]" value="<?php echo $network_id ?>">
                                         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                                     </div>
                                 </td>
                                 <th>
-                                    <i class="fa fa-fw fa-network-wired text-secondary"></i>
-                                    <a class="text-dark" href="#" data-toggle="modal" onclick="populateNetworkEditModal(<?php echo $client_id, ",", $network_id ?>)"
+                                    <i class="fa fa-fw fa-network-wired text-secondary mr-2"></i><a class="text-dark" href="#" data-toggle="modal" onclick="populateNetworkEditModal(<?php echo $client_id, ",", $network_id ?>)"
                                        data-target="#editNetworkModal"><?php echo $network_name; ?>
                                     </a>
                                 </th>
@@ -153,11 +152,11 @@
                                             </a>
                                             <?php if ($session_user_role == 3) { ?>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger" href="post.php?archive_network=<?php echo $network_id; ?>">
+                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_network=<?php echo $network_id; ?>">
                                                     <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                                 </a>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger text-bold" href="post.php?delete_network=<?php echo $network_id; ?>">
+                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_network=<?php echo $network_id; ?>">
                                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                                 </a>
                                             <?php } ?>
@@ -190,8 +189,7 @@
 ?>
 
 <script src="js/network_edit_modal.js"></script>
-<script src="js/multi_actions.js"></script>
+<script src="js/bulk_actions.js"></script>
 
 <?php
 require_once "footer.php";
-
diff --git a/database_updates.php b/database_updates.php
@@ -1573,16 +1573,32 @@
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.3'");
     }
 
+    if (CURRENT_DATABASE_VERSION == '1.0.3') {
+        //Insert queries here required to update to DB version 1.0.4
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ai_enable` TINYINT(1) DEFAULT 0 AFTER `config_stripe_percentage_fee`");
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ai_provider` VARCHAR(250) DEFAULT NULL AFTER `config_ai_enable`");
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ai_url` VARCHAR(250) DEFAULT NULL AFTER `config_ai_provider`");
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ai_api_key` VARCHAR(250) DEFAULT NULL AFTER `config_ai_url`");
+
+        //Then, update the database to the next sequential version
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.4'");
+    }
+
     // Be sure to change database_version.php to reflect the version you are updating to here
     // Please add this same comment block to the bottom of this file, and update the version number.
     // Uncomment Below Lines, to add additional database updates
     //
 
-    if (CURRENT_DATABASE_VERSION == '1.0.3') {
-        //Insert queries here required to update to DB version 1.0.4
+    if (CURRENT_DATABASE_VERSION == '1.0.4') {
+        //Insert queries here required to update to DB version 1.0.5
         mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_schedule` DATETIME DEFAULT NULL AFTER `ticket_billable`");
     //     // Then, update the database to the next sequential version
-        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.4'");
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.5'");
+
+    // if (CURRENT_DATABASE_VERSION == '1.0.5') {
+    //     // Insert queries here required to update to DB version 1.0.6
+    //     // Then, update the database to the next sequential version
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.6'");
     // }
 
 } else {

diff --git a/database_version.php b/database_version.php
@@ -5,5 +5,5 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "1.0.3");
+DEFINE("LATEST_DATABASE_VERSION", "1.0.4");
 
diff --git a/db.sql b/db.sql
@@ -1274,6 +1274,10 @@ CREATE TABLE `settings` (
   `config_stripe_expense_vendor` int(11) NOT NULL DEFAULT 0,
   `config_stripe_expense_category` int(11) NOT NULL DEFAULT 0,
   `config_stripe_percentage_fee` decimal(4,4) NOT NULL DEFAULT 0.0290,
+  `config_ai_enable` tinyint(1) DEFAULT 0,
+  `config_ai_provider` varchar(250) DEFAULT NULL,
+  `config_ai_url` varchar(250) DEFAULT NULL,
+  `config_ai_api_key` varchar(250) DEFAULT NULL,
   `config_stripe_flat_fee` decimal(15,2) NOT NULL DEFAULT 0.30,
   `config_stripe_client_pays_fees` tinyint(1) NOT NULL DEFAULT 0,
   `config_azure_client_id` varchar(200) DEFAULT NULL,
@@ -1761,4 +1765,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-01-27 23:58:10
+-- Dump completed on 2024-02-05 21:00:37
diff --git a/get_settings.php b/get_settings.php
@@ -90,6 +90,12 @@
 $config_stripe_flat_fee = floatval($row['config_stripe_flat_fee']);
 $config_stripe_client_pays_fees = intval($row['config_stripe_client_pays_fees']);
 
+// AI Provider Details
+$config_ai_enable = intval($row['config_ai_enable']);
+$config_ai_provider = $row['config_ai_provider'];
+$config_ai_url = $row['config_ai_url'];
+$config_ai_api_key = $row['config_ai_api_key'];
+
 // Modules
 $config_module_enable_itdoc = intval($row['config_module_enable_itdoc']);
 $config_module_enable_ticketing = intval($row['config_module_enable_ticketing']);

diff --git a/post/setting.php b/post/setting.php
@@ -448,6 +448,33 @@
 
 }
 
+if (isset($_POST['edit_ai_settings'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    validateAdminRole();
+
+    $provider = sanitizeInput($_POST['provider']);
+    if($provider){
+        $ai_enable = 1;
+    } else {
+        $ai_enable = 0;
+    }
+
+    $url = sanitizeInput($_POST['url']);
+    $api_key = sanitizeInput($_POST['api_key']);
+
+    mysqli_query($mysqli,"UPDATE settings SET config_ai_enable = $ai_enable, config_ai_provider = '$provider', config_ai_url = '$url', config_ai_api_key = '$api_key' WHERE company_id = 1");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Edit', log_description = '$session_name edited AI settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "You updated the AI Settings";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['edit_module_settings'])) {
 
     validateAdminRole();
@@ -574,10 +601,11 @@
         $sqlScript .= "\n";
     }
 
-    if (!empty($sqlScript))
-    {
+    if (!empty($sqlScript)) {
+
+        $company_name = $session_company_name;
         // Save the SQL script to a backup file
-        $backup_file_name = date('Y-m-d') . '_' . $config_company_name . '_backup.sql';
+        $backup_file_name = date('Y-m-d') . '_ITFlow_backup.sql';
         $fileHandler = fopen($backup_file_name, 'w+');
         $number_of_lines = fwrite($fileHandler, $sqlScript);
         fclose($fileHandler);