Changeset 2509913

Timestamp:

04/06/2021 09:23:32 AM (5 years ago)

Author:

2fas

Message:

Release v3.1.1

Location:

2fas-light/trunk

Files:

• assets/view/includes/backup_codes_tutorial.html.twig (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• check.php (modified) (5 diffs)
• constants.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• twofas_light.php (modified) (1 diff)
• vendor/composer/InstalledVersions.php (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

2fas-light/trunk/assets/view/includes/backup_codes_tutorial.html.twig

@@ -14 +14 @@
             <div class="twofas-backup-codes-box-tutorial-content-step-content">
                 <img src="{{ twofas_light_plugin_path ~ 'assets/img/mobile-phone.svg' }}" alt="{{ esc_attr__('Type a backup code', '2fas-light') }}" />
-                <p>{{ esc_html__("Type the code during logging in when you're asked to use the 2FAS application token.", '2fas-light') }}</p>
+                <p>{{ esc_html__("Type the code during logging in when you're asked to use the 2FAS application token.", '2fas-light')|raw }}</p>
             </div>
         </div>

2fas-light/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 3.1.1 (Apr. 6, 2021) =
+* Fixed path in checking conflicted plugins
+* Fixed typo in text
 
 = 3.1 (Mar. 30, 2021) =

2fas-light/trunk/check.php

@@ -44 +44 @@
 }
 
-if( $conflicted_plugins = twofas_light_get_conflicted_plugins()) {
+if( TWOFAS_LIGHT_CHECK_CONFLICTED_PLUGINS && $conflicted_plugins = twofas_light_get_conflicted_plugins()) {
     $issues[] = sprintf(
         __("2FAS Prime plugin doesn't work properly with the following plugins: <strong>%s</strong>.", '2fas-light' ),
@@ -54 +54 @@
     if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
         if ( ! ini_get( 'display_errors' ) ) {
-            fwrite(STDERR, '2FAS Light detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+            fwrite(STDERR, '2FAS Prime detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
         }
     } else {
@@ -101 +101 @@
 
     return array_reduce($paths, function ($result, $path) {
-        if (preg_match ('~[a-zA-Z0-9_-]+(?=/vendor)~', $path, $matches) && !in_array($matches[0], $result))
+        if (preg_match ('~[a-zA-Z0-9_-]+(?=/includes/vendor|/vendor)~', $path, $matches) && !in_array($matches[0], $result))
             $result[] = $matches[0];
         
@@ -121 +121 @@
     return '
         <div class="error notice twofas-light-error-message">
-            <p><strong>2FAS Light plugin requirements error</strong></p>
+            <p><strong>2FAS Prime plugin requirements error</strong></p>
             <ul class="twofas-light-error-list">
                 ' . $messages . '
@@ -127 +127 @@
             <p>
                 Plugin functionality cannot be enabled until this problem is solved.
-                Please ask your hosting provider to support 2FAS Light plugin\'s requirements.
+                Please ask your hosting provider to support 2FAS Prime plugin\'s requirements.
             </p>
         </div>

2fas-light/trunk/constants.php

@@ -15 +15 @@
 define( 'TWOFAS_LIGHT_TEMPLATES_PATH', $templates_path );
 define( 'TWOFAS_LIGHT_WP_ADMIN_PATH', $admin_url );
-define( 'TWOFAS_LIGHT_PLUGIN_VERSION', '3.1' );
+define( 'TWOFAS_LIGHT_PLUGIN_VERSION', '3.1.1' );
 define( 'TWOFAS_LIGHT_WP_MINIMUM_VERSION', '5.0' );
+if ( ! defined( 'TWOFAS_LIGHT_CHECK_CONFLICTED_PLUGINS' ) ) {
+    define( 'TWOFAS_LIGHT_CHECK_CONFLICTED_PLUGINS', true );
+}

2fas-light/trunk/readme.txt

@@ -100 +100 @@
 == Changelog ==
 
+= 3.1.1 (Apr. 6, 2021) =
+* Fixed path in checking conflicted plugins
+* Fixed typo in text
+
 = 3.1 (Mar. 30, 2021) =
 * Minor frontend changes

2fas-light/trunk/twofas_light.php

@@ -4 +4 @@
  * Plugin URI:        https://wordpress.org/plugins/2fas-light/
  * Description:       Free, simple and secure token-based authentication for your WordPress. No registration required.
- * Version:           3.1
+ * Version:           3.1.1
  * Requires PHP:      7.0
  * Requires at least: 5.0

2fas-light/trunk/vendor/composer/InstalledVersions.php

@@ -20 +20 @@
     array (
     ),
-    'reference' => 'fadd3ee7d03d16d731cc929b22c9db908e74c07d',
+    'reference' => 'cf8383f667d3c80d9a0f3eb27eb80110cd1e550e',
     'name' => 'twofas/wp-plugin-secure',
   ),
@@ -201 +201 @@
       array (
       ),
-      'reference' => 'fadd3ee7d03d16d731cc929b22c9db908e74c07d',
+      'reference' => 'cf8383f667d3c80d9a0f3eb27eb80110cd1e550e',
     ),
     'whichbrowser/parser' => 

2fas-light/trunk/vendor/composer/installed.php

@@ -7 +7 @@
     array (
     ),
-    'reference' => 'fadd3ee7d03d16d731cc929b22c9db908e74c07d',
+    'reference' => 'cf8383f667d3c80d9a0f3eb27eb80110cd1e550e',
     'name' => 'twofas/wp-plugin-secure',
   ),
@@ -188 +188 @@
       array (
       ),
-      'reference' => 'fadd3ee7d03d16d731cc929b22c9db908e74c07d',
+      'reference' => 'cf8383f667d3c80d9a0f3eb27eb80110cd1e550e',
     ),
     'whichbrowser/parser' =>