Merge pull request #106 from wp-blocks/update/version

Update/version
wp-blocks · Jan 26, 2024 · b9e30de · b9e30de
2 parents f3ec0dd + 0b958c2
commit b9e30de
Show file tree

Hide file tree

Showing 7 changed files with 446 additions and 441 deletions.
diff --git a/cf7-antispam.php b/cf7-antispam.php
@@ -18,7 +18,7 @@
 /* CONSTANTS */
 define( 'CF7ANTISPAM_NAME', 'cf7-antispam' );
 
-define( 'CF7ANTISPAM_VERSION', '0.6.0' );
+define( 'CF7ANTISPAM_VERSION', '0.6.1' );
 
 define( 'CF7ANTISPAM_PLUGIN', __FILE__ );
 

diff --git a/composer.json b/composer.json
@@ -28,7 +28,9 @@
   },
   "require": {
 	"geoip2/geoip2": "~2.0",
-	"l3u/b8": "*"
+	"l3u/b8": "*",
+    "ext-json": "*",
+	  "ext-openssl": "*"
   },
   "scripts": {
 	"PHPCS": "vendor/bin/phpcs --standard=phpcs.xml.dist -s --report=full,summary,source",

diff --git a/engine/CF7_AntiSpam_Uninstaller.php b/engine/CF7_AntiSpam_Uninstaller.php
@@ -36,6 +36,10 @@ public static function cf7a_full_reset() {
 		self::uninstall( false );
 		CF7_AntiSpam_Activator::install();
 
+		// reset options
+		update_option( 'cf7a_db_version', '1' );
+		CF7_AntiSpam_Activator::update_options( true );
+
 		return true;
 	}
 
@@ -81,7 +85,7 @@ protected static function cf7a_plugin_drop_options() {
 	 * @param bool $force If set to true, the cf7-antispam database and options tables delete will be forced otherwise it will be skipped.
 	 */
 	public static function uninstall( $force = true ) {
-		if ( ( defined( CF7ANTISPAM_DEBUG_EXTENDED ) && CF7ANTISPAM_DEBUG_EXTENDED === true ) || ! $force ) {
+		if ( ( defined( CF7ANTISPAM_DEBUG_EXTENDED ) && CF7ANTISPAM_DEBUG_EXTENDED === true ) || $force === false ) {
 			cf7a_log( 'CONTACT FORM 7 ANTISPAM - constant "CF7ANTISPAM_DEBUG_EXTENDED" is set so options and database will NOT be deleted.' );
 			return false;
 		} else {