Changeset 3042938

Timestamp:

02/29/2024 08:19:07 AM (2 years ago)

Author:

contractorcommerce

Message:

Replace duplicated checks with a function

Location:

contractor-commerce-integration/tags/1.0.9

Files:

• README.txt (modified) (1 diff)
• contractor-commerce.php (modified) (6 diffs)
• includes/class-contractor-commerce.php (modified) (1 diff)

contractor-commerce-integration/tags/1.0.9/README.txt

@@ -1 +1 @@
 === Contractor Commerce Integration ===
-Contributors: pjhile
+Contributors: pjhile, kirilldakhnyuk
 Tags: ecommerce, hvac, contractor
 Requires at least: 3.0.1
 Tested up to: 6.3
-Stable tag: 1.0.9
+Stable tag: 1.1.0
 Requires PHP: 7.0
 License: GPLv2 or later

contractor-commerce-integration/tags/1.0.9/contractor-commerce.php

@@ -17 +17 @@
  * Plugin URI:        https://bitbucket.org/hvactechnologies/contractor-commerce-integration
  * Description:       Adds Contractor Commerce to your site.
- * Version:           1.0.9
+ * Version:           1.1.0
  * Author:            Contractor Commerce
  * Author URI:        https://www.contractorcommerce.com/
@@ -38 +38 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'CONTRACTOR_COMMERCE_VERSION', '1.0.9' );
+define( 'CONTRACTOR_COMMERCE_VERSION', '1.1.0' );
 
 /**
@@ -83 +83 @@
 }
 
-function contractor_commerce_exlude_query_vars( $query_vars ) {
-    if ( get_option( 'concom_settings' ) && ! isset(get_option( 'concom_settings' )['concom_select_field_1']) ) {
-        return $query_vars;
+function isPluginSetup ( $defaultReturn = null ) {
+    if ( get_option( 'concom_settings' ) && ! isset( get_option( 'concom_settings' )['concom_select_field_1'] ) ) {
+        return $defaultReturn;
     }
     
     if ( ! isset(get_option( 'concom_settings' )['concom_seo_checkbox']) ) {
-        return $query_vars;
+        return $defaultReturn;
     }
+}
+
+function contractor_commerce_exlude_query_vars( $query_vars ) {
+    isPluginSetup( $query_vars );
     
     $uri = get_page_uri( get_option( 'concom_settings' )['concom_select_field_1']);
@@ -104 +108 @@
 
 function contractor_commerce_rewrite_rules() {
-    if ( get_option( 'concom_settings' ) && ! isset(get_option( 'concom_settings' )['concom_select_field_1']) ) {
-        return;
-    }
-    
-    if ( ! isset(get_option( 'concom_settings' )['concom_seo_checkbox']) ) {
-        return;
-    }
+    isPluginSetup();
     
     $shop_page_name = get_post(get_option( 'concom_settings' )['concom_select_field_1'])->post_name;
@@ -120 +118 @@
 
 add_action ( 'init', function () {  
-    if ( get_option( 'concom_settings' ) && ! isset(get_option( 'concom_settings' )['concom_select_field_1']) ) {
-        return;
-    }
-    
-    if ( ! isset(get_option( 'concom_settings' )['concom_seo_checkbox']) ) {
-        return;
-    }
+    isPluginSetup();
     
     $shop_page_name = get_post(get_option( 'concom_settings' )['concom_select_field_1'])->post_name;
@@ -150 +142 @@
 
 add_action( 'wp_head', function () {
-    if ( get_option( 'concom_settings' ) && ! isset( get_option( 'concom_settings' )['concom_select_field_1'] ) ) {
-        return;
-    }
-    
-    if ( ! isset(get_option( 'concom_settings' )['concom_seo_checkbox']) ) {
-        return;
-    }
+    isPluginSetup();
     
     if ( get_the_ID() == get_option( 'concom_settings' )['concom_select_field_1'] ) {

contractor-commerce-integration/tags/1.0.9/includes/class-contractor-commerce.php

@@ -71 +71 @@
             $this->version = CONTRACTOR_COMMERCE_VERSION;
         } else {
-            $this->version = '1.0.0';
+            $this->version = '1.1.0';
         }
         $this->plugin_name = 'contractor-commerce';