Merge branch 'dev'

# Conflicts: # readme.txt
CleanTalk · Mar 28, 2023 · 8e7418f · 8e7418f
2 parents 5fc5b43 + 3548b58
commit 8e7418f
Show file tree

Hide file tree

Showing 18 changed files with 168 additions and 43 deletions.
diff --git a/css/spbc-admin.min.css b/css/spbc-admin.min.css
diff --git a/css/spbc-settings.min.css b/css/spbc-settings.min.css
diff --git a/css/src/spbc-admin.css b/css/src/spbc-admin.css
@@ -126,4 +126,12 @@ span.red_dot{
 	border-radius: 50% !important;
 	display: inline-block !important;
 	margin-left: 5px !important;
+}
+
+#spbct-upload-checker-details {
+	overflow-y: scroll;
+	height: 150px;
+}
+#spbct-upload-checker-details li:nth-child(2n+1) {
+	background: #d3d3d3;
 }
diff --git a/inc/spbc-scanner.php b/inc/spbc-scanner.php
@@ -1247,7 +1247,7 @@ function spbc_scanner_file_quarantine($direct_call = false, $file_id = null)
                                     'status' => $file_info['status'],
                                 )),
                             ),
-                            array('path' => $file_info['path']),
+                            array('full_hash' => $file_info['full_hash']),
                             array('%s', '%s', '%d', '%s'),
                             array('%s')
                         );
@@ -1439,6 +1439,8 @@ function spbc_scanner_analysis_log_delete_from_log()
 
     $file_id = Post::get('file_id', 'hash');
 
+    $output = array('error' => false);
+
     if ($file_id) {
         $updated_rows = $wpdb->update(
             SPBC_TBL_SCAN_FILES,

diff --git a/inc/spbc-settings.php b/inc/spbc-settings.php
@@ -483,10 +483,12 @@ function spbc_settings__register()
                                 'input_type' => 'select',
                                 'options'    => array(
                                     array('val' => 60, 'label' => __('1 minute', 'security-malware-firewall'),),
-                                    array('val' => 180, 'label' => __('3 minutes', 'security-malware-firewall'),),
                                     array('val' => 300, 'label' => __('5 minutes', 'security-malware-firewall'),),
-                                    array('val' => 600, 'label' => __('10 minutes', 'security-malware-firewall'),),
                                     array('val' => 900, 'label' => __('15 minutes', 'security-malware-firewall'),),
+                                    array('val' => 3600, 'label' => __('1 hour', 'security-malware-firewall'),),
+                                    array('val' => 43200, 'label' => __('12 hours', 'security-malware-firewall'),),
+                                    array('val' => 86400, 'label' => __('24 hours', 'security-malware-firewall'),),
+                                    array('val' => 259200, 'label' => __('3 days', 'security-malware-firewall'),),
                                 ),
                                 'title'      => __('Block a visitor if they exceeded the limit of opened pages for', 'security-malware-firewall'),
                                 'parent'     => 'traffic_control__enabled',
@@ -3086,7 +3088,13 @@ function spbc_list_table__get_args_by_type($table_type)
                     ),
                     'sql'               => array(
                         // 'where' => ' WHERE severity IN("CRITICAL", "DANGER", "SUSPICIOUS") AND status <> "QUARANTINED"',
-                        'where' => ' WHERE severity IN("CRITICAL") AND (status <> "QUARANTINED" AND status <> "APROVED" AND status <> "APPROVED_BY_CT") AND (last_sent IS NULL OR analysis_status="DANGEROUS")',
+                        'where' => ' WHERE severity IN("CRITICAL") AND 
+                        (status <> "QUARANTINED" AND 
+                            status <> "APROVED" AND 
+                            status <> "APPROVED_BY_CT")
+                        AND 
+                        (last_sent IS NULL OR 
+                            analysis_status="DANGEROUS")',
                     ),
                     'order_by'          => array('path' => 'asc'),
                 )
@@ -3133,7 +3141,8 @@ function spbc_list_table__get_args_by_type($table_type)
                     ),
                     'sql'               => array(
                         'where' => ' WHERE severity <> "CRITICAL" AND
-                        (STATUS = "MODIFIED" OR severity IS NOT NULL)',
+                        last_sent IS NULL AND
+                        (status = "MODIFIED" AND severity IS NOT NULL)',
                     ),
                     'order_by'          => array('path' => 'asc'),
                 )