Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix' into fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandergull committed Sep 18, 2024
2 parents b71ece6 + aab497a commit f947f98
Show file tree
Hide file tree
Showing 39 changed files with 696 additions and 283 deletions.
20 changes: 20 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
== Changelog ==

= 2.142 Sep 16 2024
* Upd. Settings. Modal window common style updated.
* Mod. Settings. Scanner tab. Quarantine action text updated.
* Mod. Scanner. Accordion actions. Approve action is require active license now. No confirmation requested for restricted actions.
* Fix. Scanner. Accordion actions. Bulk action confirm fixed.
* Upd. Code. Security logs DTO classes implemented.
* Fix. CSS. Adaptive content. Nav wrapper flex direction.
* Fix. CSS. Adaptive content. Long description places.
* Fix. CSS. Adaptive content. Get more details clicks.
* Fix. CSS. Adaptive content. Scanner legend.
* Fix. CSS. Adaptive content. Path full description.
* Upd. SQL schema. The column "view" of spbc_auth_log table set to varchar(16).
* Fix. CSS. Adaptive content. Malware removal top settings banner adapted.
* Upd. Modal window. Support link removed from restricted actions notice.
* Upd. Auth. Open 2fa support link in new page.
* Fix. Code. Get admin email call moved.
* Fix. Security log. Parse URL. Fix for wptexturize.
* Fix. Settings. Unknown accordion description fixed.
* Fix. FSwatcher. Skip init on WP_Estimation_Form

= 2.140 Aug 19 2024
* Upd. WAR. Analysis php://input
* Fix. FSWatcher. Added exclusion for NotifierForPhone.
Expand Down
2 changes: 1 addition & 1 deletion css/spbc-settings.min.css

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion css/spbc-table.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions css/src/spbc-settings-media.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@media screen and (max-width: 782px) {
.spbc_page_header_info_left_column,
.spbc_page_header_info_right_column,
.spbc_page_header_info_right_column,
.spbc_page_header_info__state_block,
.spbc_manual_link {
width: 100%;
Expand All @@ -15,10 +15,6 @@
gap: 10px;
}

.spbc_tabs_nav_wrapper {

}

.spbc_page_mob_info__about_block {
display: block;
}
Expand All @@ -39,4 +35,4 @@
.wp-list-table tfoot {
display: none;
}
}
}
28 changes: 27 additions & 1 deletion css/src/spbc-settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,12 @@ div.pagination{
margin: 15px 15px 0px 0px;
overflow-x: auto;
}

@media screen and (max-width: 1200px) {
.spbc_tabs_nav_wrapper {
flex-direction: column;
}
}
.spbc_tab_nav{
display: inline-block;
margin: 10px 0 0 .5em;
Expand Down Expand Up @@ -654,6 +660,15 @@ p.spbc_hint { margin: 0px; }
color: white;
z-index: 10;
}

@media screen and (max-width: 900px) {
.spbc_long_desc {
left: inherit !important;
}
.spbc_long_desc__angle_top_left {
display: none;
}
}
.spbc_long_desc p{
color: white !important;
}
Expand Down Expand Up @@ -846,6 +861,17 @@ button.ct_support_link{
border: 1px solid #2ea2cc;
}

.spbc-modal-file_path {
color:#026E88;
}

.spbc-modal-file_path_wrapper {
margin: 4% 0 1% 0;
padding: 5px;
border: 1px solid #F5F5FD;
border-radius: 4px;
}

.spbc-popup-msg{
width: 98%;
height: 15px;
Expand Down Expand Up @@ -1010,4 +1036,4 @@ button#spbc_setting_get_key_auto:disabled {
.spbc_setting__textarea {
width: 400px;
height: 150px;
}
}
91 changes: 88 additions & 3 deletions css/src/spbc-table.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ tr:hover .row-actions span.tbl-row_action--approve{color: #0a0;}
padding: 2px;
line-height: 20px !important;
height: 25px !important;
min-height: 30px !important;
}
.tbl-preloader--small{display: none; width: 15px; height: 15px; margin: 0 5px; vertical-align: middle;}
.tbl-preloader--tiny {display: none; width: 10px; height: 10px; margin: 0 5px;}
Expand All @@ -67,7 +68,6 @@ tr:hover .row-actions span.tbl-row_action--approve{color: #0a0;}
.tbl-bulk_actions--wrapper{display: inline-block; margin: 5px 0 5px;}
.tbl-bulk_actions--apply{margin: 0 5px;}


.tbl-pagination--wrapper{display: inline-block; padding: 5px 0; vertical-align: middle;}
.tbl-pagination--total{vertical-align: baseline; margin: 0 5px;}
.tbl-pagination--curr_page{
Expand All @@ -83,8 +83,27 @@ tr:hover .row-actions span.tbl-row_action--approve{color: #0a0;}
position: relative;
}

#spbc_scan_accordion_tab_unsafe_permissions, #spbc_scan_accordion_tab_outbound_links {
@media screen and (max-width: 782px) {
.toggle-row {
top: 5px !important;
}
}
}
#spbc_scan_accordion_tab_files_listing, #spbc_tab-traffic_control, #spbc_tab-security_log {
@media screen and (max-width: 782px) {
.toggle-row {
top: 12px !important;
left: 30px !important;
}
.toggle-row::after {
content: "";
}
}
}

@media screen and (max-width: 782px) {
#spbc_settings_form .wp-list-table {
#spbc_settings_form .wp-list-table {
display: block;
}
#spbc_settings_form .wp-list-table thead, tbody, td, tr {
Expand All @@ -104,11 +123,13 @@ tr:hover .row-actions span.tbl-row_action--approve{color: #0a0;}
height: 100%;
padding: 10px 0 10px 35%;
}

#spbc_settings_form .wp-list-table tbody td:before {
content: attr(data-before) !important;
position: absolute;
left: 10px;
}

#spbc_settings_form .spbcShortTextBlock {
width: 100%;
}
Expand All @@ -125,4 +146,68 @@ tr:hover .row-actions span.tbl-row_action--approve{color: #0a0;}
height: auto;
padding: 0 10px;
}
}

#spbc_scan_accordion_tab_frontend_malware .wp-list-table tbody td:before {
content: attr(data-defore-no-code) !important;
}

.tbl-bulk_actions--apply {
width: 100px;
font-size: smaller !important;
line-height: normal;
}
/*.row-actions {*/
/* scale: 90%;*/
/*}*/
.path {
padding-left: 15% !important;
}
.toggle-row {
top: -20px !important;
}
.toggle-row::after {
content: "Details";
left: -34px;
position: relative;
top: -14px;
color: #50575e;
text-decoration: underline;
}

#spbcscan-scanner-caption {
flex-direction: column;
}
#spbcscan-scanner-caption .column:last-child {
width: 100%;
}
.spbc_hide_table_cell_desc {
max-width: 70%;
}

.spbct_notice-found_critical_files {
flex-direction: column;
}

.spbct_notice-found_critical_files div{
text-align: center;
width: -webkit-fill-available;
}

.spbct_notice-found_critical_files button::before{
position:relative;
}

.spbct_notice-found_critical_files button{
display:flex;
justify-content: center;
margin-top: -10px;
}

.spbct_notice-found_critical_files button .screen-reader-text{
clip: unset;
clip-path: unset;
position: unset;
display: contents;
font-size: small;
}
}
19 changes: 12 additions & 7 deletions inc/spbc-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,20 @@ function spbc_enqueue_scripts($hook)
));

wp_enqueue_script('spbc_cookie', SPBC_PATH . '/js/spbc-cookie.min.js', array('jquery'), SPBC_VERSION, false /*in header*/);
wp_localize_script('spbc_cookie', 'spbcPublic', array(
wp_localize_script(
'spbc_cookie',
'spbcPublic',
array (
'_ajax_nonce' => wp_create_nonce('ct_secret_stuff'),
'_rest_nonce' => wp_create_nonce('wp_rest'),
'_ajax_url' => admin_url('admin-ajax.php', 'relative'),
'_rest_url' => esc_url(get_rest_url()),
// '_apbct_ajax_url' => APBCT_URL_PATH . '/lib/Cleantalk/ApbctWP/Ajax.php',
'data__set_cookies' => $spbc->settings['data__set_cookies'],
'data__set_cookies__alt_sessions_type' => $spbc->settings['data__set_cookies__alt_sessions_type'],
));
'no_confirm_row_actions' => spbc_get_no_confirm_row_actions(),
)
);

if ($spbc->settings['upload_checker__file_check'] && in_array($hook, array('upload.php', 'media-new.php'))) {
wp_enqueue_script('spbc-upload-js', SPBC_PATH . '/js/spbc-upload.min.js', array('jquery'), SPBC_VERSION, false);
Expand Down Expand Up @@ -510,19 +515,19 @@ function spbc_enqueue_scripts($hook)
'warning_default' => __('Do you want to proceed?', 'security-malware-firewall'),

'warning_h_approve' => __('Do you want to approve this file?', 'security-malware-firewall'),
'warning_t_approve' => __('If you agree, the file {filePath} will be approved', 'security-malware-firewall'),
'warning_t_approve' => __('If you agree, this file will be approved.', 'security-malware-firewall'),

'warning_h_send' => __('Do you want to proceed?', 'security-malware-firewall'),
'warning_t_send' => __('The file {filePath} will be sent in the Cloud to analyze for a malware, usually processing takes up to 1 minute. The result will be shown in the Analysis log.', 'security-malware-firewall'),
'warning_t_send' => __('This file will be sent to the Cloud to analyze for a malware, usually processing takes up to 1 minute. The result will be shown in the Analysis log.', 'security-malware-firewall'),

'warning_h_delete' => __('This can\'t be undone and could damage your website. Are you sure?', 'security-malware-firewall'),
'warning_t_delete' => __('If you agree, the file {filePath} will be deleted', 'security-malware-firewall'),
'warning_t_delete' => __('If you agree, this file will be deleted.', 'security-malware-firewall'),

'warning_h_replace' => __('This can\'t be undone. Are you sure?', 'security-malware-firewall'),
'warning_t_replace' => __('If you agree, the file {filePath} will be replaced', 'security-malware-firewall'),
'warning_t_replace' => __('If you agree, this file will be replaced.', 'security-malware-firewall'),

'warning_h_quarantine' => __('This can\'t be undone and could damage your website. Are you sure?', 'security-malware-firewall'),
'warning_t_quarantine' => __('If you agree, the file {filePath} will be quarantined', 'security-malware-firewall'),
'warning_t_quarantine' => __('If you agree, this file will be quarantined.', 'security-malware-firewall'),
));

// Getting scanner settings
Expand Down
2 changes: 1 addition & 1 deletion inc/spbc-auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ function spbc_2fa__show_field()
}

if ( $tech_support_url ) {
$tech_support_url = '<a href="' . esc_url($tech_support_url) . '">tech support</a>';
$tech_support_url = '<a href="' . esc_url($tech_support_url) . '" target="_blank">tech support</a>';
} else {
$tech_support_url = 'tech support';
}
Expand Down
Loading

0 comments on commit f947f98

Please sign in to comment.