Merge branch 'dev' into psc_on_plugins_list.ag

Author: alexandergull

css/spbc-timeline-widget.min.css

@@ -46,7 +46,7 @@ line.spbc-timelime-highlight-on-tooltip {
 .spbc-timeline-svg {
     display: block;
     width: 100%;
-    height: 100%;
+    height: auto;
     min-width: 800px;
 }
 

css/src/spbc-timeline-widget.css

@@ -442,16 +442,18 @@ function spbc_security_firewall_update__process_files()
  * @return array|bool|int|mixed|string
  * @throws Exception
  */
-function spbc_security_firewall_update__process_file($path)
+function spbc_security_firewall_update__process_file($path, $is_direct_mode = false)
 {
     global $spbc;
 
-    if ( !file_exists($path) ) {
-        return array('error' => 'PROCESS FILE: file does not exist: ' . $path);
-    }
+    if ( !$is_direct_mode ) { // in direct mode we don't need to check if file exists and is readable
+        if ( !file_exists($path) ) {
+            return array('error' => 'PROCESS FILE: file does not exist: ' . $path);
+        }
 
-    if ( !is_readable($path) ) {
-        return array('error' => 'PROCESS FILE: file is not readable: ' . $path);
+        if ( !is_readable($path) ) {
+            return array('error' => 'PROCESS FILE: file is not readable: ' . $path);
+        }
     }
 
     $current_file_content = @file_get_contents($path);
@@ -706,7 +708,7 @@ function spbc_security_firewall_update_direct()
     // process_file
     foreach ( $urls as $url ) {
         spbc_security_firewall_update_log('process ' . $url);
-        $result_process_file = spbc_security_firewall_update__process_file($url);
+        $result_process_file = spbc_security_firewall_update__process_file($url, true);
         if ( ! empty($result_process_file['error']) ) {
             return $result_process_file;
         }

inc/fw-update.php

@@ -137,7 +137,13 @@ function spbc_authenticate($user, $username)
     global $spbc;
 
     if ( is_wp_error($user) ) {
-        spbc_authenticate__check_brute_force();
+        /**
+         * @todo Migrate BFP disable from constant to settings option
+         * @psalm-suppress RedundantCondition
+         */
+        if (!SPBC_BFP_DISABLE) {
+            spbc_authenticate__check_brute_force();
+        }
 
         $spbc->login_error = true;
 

inc/spbc-auth.php

@@ -4944,7 +4944,7 @@ function spbc_settings__get_description()
         ),
         'ms__hoster_api_key'          => array(
             'title' => __('Hoster access key', 'security-malware-firewall'),
-            'desc'  => __('You could find it here:<br><a href ="https://cleantalk-screenshots.s3.amazonaws.com/help/hosting-antispam/hapi-ru.png"><img src="https://cleantalk-screenshots.s3.amazonaws.com/help/hosting-antispam/hapi-ru.png"></a><br>Press on the screenshot to zoom.', 'security-malware-firewall')
+            'desc'  => __('You could find it here:<br><a href ="https://cleantalk-screenshots.s3.amazonaws.com/help/hosting-antispam/hapi-en.png"><img src="https://cleantalk-screenshots.s3.amazonaws.com/help/hosting-antispam/hapi-en.png"></a><br>Press on the screenshot to zoom.', 'security-malware-firewall')
         ),
         'listing'                     => array(
             'title' => __('Directory can be listed from the Internet', 'security-malware-firewall'),