version 2.0.9 released

Author: manchumahara

.github/workflows/deploy.yml

@@ -23,18 +23,12 @@ jobs:
       - name: Find Readme File
         id: find_readme
         run: |
-          for file in readme.txt Readme.txt README.txt README.md Readme.md readme.md; do
-            if [ -f "$file" ]; then
-              echo "Readme file found: $file"
-              echo "readme_file=$file" >> $GITHUB_ENV
-              break
-            fi
-          done
-
-          # Ensure the variable is available within the current step
-          source $GITHUB_ENV
-
-          if [ -z "$readme_file" ]; then
+          #readme_file=$(find . -type f -iname "readme.*" | head -n 1)
+          readme_file=$(find . -maxdepth 1 -type f -iname "readme.txt" | head -n 1)
+          if [ -n "$readme_file" ]; then
+            echo "Readme file found: $readme_file"
+            echo "readme_file=$readme_file" >> $GITHUB_ENV
+          else
             echo "::error::Readme file not found."
             exit 1
           fi
@@ -43,78 +37,58 @@ jobs:
         id: release_notes
         run: |
           changelog_section_start="== Changelog =="
-          readme_file="$readme_file"
+          current_tag="${{ github.ref_name }}"
+          readme_file="${{ env.readme_file }}"
 
-          # Extract the tag name from GITHUB_REF (plugin_version)
-          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
-            plugin_version="${GITHUB_REF#refs/tags/}"
-            echo "DEBUG: Plugin latest version found: $plugin_version."
-          else
-            echo "::error::This workflow must be triggered by a tag push."
-            exit 1
-          fi
+          # Extract the version (strip 'refs/tags/' if it exists)
+          version=${current_tag#refs/tags/}
 
+          # Read lines from the changelog section
           in_changelog=0
-          found_version=0
           release_notes=""
-
-          echo "DEBUG: Starting to extract release notes from $readme_file for version $plugin_version."
-
+          capturing_version=0
           while IFS= read -r line; do
-            echo "DEBUG: Processing line: $line"
-
-            # Start processing after the changelog header
+            # Start capturing after finding the changelog section
             if [[ "$line" == "$changelog_section_start" ]]; then
               in_changelog=1
-              echo "DEBUG: Found changelog section header."
               continue
             fi
 
-            # Skip if not in changelog section
-            if [[ $in_changelog -eq 0 ]]; then
-              echo "DEBUG: Skipping line (not in changelog section)."
-              continue
+            # Stop capturing if we encounter a new version or the end of the file
+            if [[ $in_changelog -eq 1 && "$line" =~ ^= ]]; then
+              # Check if this is the current version
+              if [[ "$line" == "= $version =" ]]; then
+                capturing_version=1
+              elif [[ $capturing_version -eq 1 ]]; then
+                # Stop if we see the next version
+                break
+              fi
             fi
 
-            # Check for the current version header
-            if [[ "$line" == "= ${plugin_version} =" ]]; then
-              found_version=1
-              echo "DEBUG: Found version header for $plugin_version."
-              continue
-            fi
-
-            # Break if a new version header is found after the current version
-            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^= [0-9]+\.[0-9]+\.[0-9]+ =$'; then
-              echo "DEBUG: Found a new version header. Stopping collection."
-              break
-            fi
-
-            # Collect lines starting with '*' if we are in the current version section
-            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^\*'; then
-              echo "DEBUG: Found changelog entry: $line"
-              release_notes+="${line}\n"
-              continue
-            fi
-
-            # Log skipped lines in the current version section
-            if [[ $found_version -eq 1 ]]; then
-              echo "DEBUG: Skipping line (not a changelog entry): $line"
+            # Capture lines only for the current version
+            if [[ $capturing_version -eq 1 && -n "$line" ]]; then
+              release_notes+="$line\n"
             fi
           done < "$readme_file"
 
           if [[ -z "$release_notes" ]]; then
-            echo "::error::Failed to extract release notes for version ${plugin_version}."
+            echo "::error::Failed to extract release notes for version $version."
             exit 1
           fi
 
-          echo "DEBUG: Successfully extracted release notes."
-          echo "DEBUG: Release notes content:"
-          echo -e "$release_notes"
+          # Debug: Print extracted release notes
+          echo "Extracted release notes for version $version:"
+          printf "%b" "$release_notes"
 
-          # Write the release notes with actual line breaks
-          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-          echo -e "$release_notes" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV           
+          # Set output (fixed, now using Environment File)
+          echo "notes<<EOF" >> $GITHUB_OUTPUT
+          printf "%b\n" "$release_notes" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Debug Release Notes
+        run: |
+          echo "Debugging Release Notes:"
+          echo "${{ steps.release_notes.outputs.notes }}"
 
       - name: WordPress Plugin Deploy
         id: deploy
@@ -126,10 +100,10 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
-          body: ${{ env.RELEASE_NOTES }}
+          body: ${{ steps.release_notes.outputs.notes }}
           files: ${{github.workspace}}/${{ github.event.repository.name }}.zip
 
 env:
   SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
   SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

assets/css/cbxpetition-admin.css

@@ -16,7 +16,7 @@
  * Plugin Name:       CBX Petition
  * Plugin URI:        https://codeboxr.com/product/cbx-petition-for-wordpress/
  * Description:       A plugin to create, manage petition and collect signatures for petition
- * Version:           2.0.8
+ * Version:           2.0.9
  * Author:            Codeboxr
  * Author URI:        http://codeboxr.com
  * License:           GPL-2.0+
@@ -33,13 +33,14 @@
 }
 
 defined( 'CBXPETITION_PLUGIN_NAME' ) or define( 'CBXPETITION_PLUGIN_NAME', 'cbxpetition' );
-defined( 'CBXPETITION_PLUGIN_VERSION' ) or define( 'CBXPETITION_PLUGIN_VERSION', '2.0.8' );
+defined( 'CBXPETITION_PLUGIN_VERSION' ) or define( 'CBXPETITION_PLUGIN_VERSION', '2.0.9' );
 defined( 'CBXPETITION_BASE_NAME' ) or define( 'CBXPETITION_BASE_NAME', plugin_basename( __FILE__ ) );
 defined( 'CBXPETITION_ROOT_PATH' ) or define( 'CBXPETITION_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBXPETITION_ROOT_URL' ) or define( 'CBXPETITION_ROOT_URL', plugin_dir_url( __FILE__ ) );
 
 defined( 'CBXPETITION_WP_MIN_VERSION' ) or define( 'CBXPETITION_WP_MIN_VERSION', '5.3' );
 defined( 'CBXPETITION_PHP_MIN_VERSION' ) or define( 'CBXPETITION_PHP_MIN_VERSION', '7.4' );
+defined( 'CBXPETITION_PRO_VERSION' ) or define( 'CBXPETITION_PRO_VERSION', '2.0.6' );
 
 // Include the main class
 if ( ! class_exists( 'CBXPetition', false ) ) {
@@ -83,14 +84,14 @@ function cbxpetition_compatible_php_version( $version = '' ) {
 }//end method cbxpetition_compatible_php_version
 
 
-register_activation_hook( __FILE__, 'activate_cbxpetition' );
-register_deactivation_hook( __FILE__, 'deactivate_cbxpetition' );
+register_activation_hook( __FILE__, 'cbxpetition_activate' );
+register_deactivation_hook( __FILE__, 'cbxpetition_deactivate' );
 
 /**
  * The code that runs during plugin activation.
  * This action is documented in includes/class-cbxpetition-activator.php
  */
-function activate_cbxpetition() {
+function cbxpetition_activate() {
 	$wp_version  = CBXPETITION_WP_MIN_VERSION;
 	$php_version = CBXPETITION_PHP_MIN_VERSION;
 
@@ -128,17 +129,15 @@ function activate_cbxpetition() {
 
 		//deactivate pro addon if version than 2.0.0
 		cbxpetition_check_and_deactivate_plugin( 'cbxpetitionproaddon/cbxpetitionproaddon.php', '2.0.0', 'cbxpetition_proaddon_deactivated' );
-		/*if($action){
-			set_transient('cbxpetition_proaddon_deactivated', 1);
-		}*/
+		
 	}//end $activate_ok
-}//end method activate_cbxpetition
+}//end method cbxpetition_activate
 
 /**
  * The code that runs during plugin deactivation.
  * This action is documented in includes/class-cbxpetition-deactivator.php
  */
-function deactivate_cbxpetition() {
+function cbxpetition_deactivate() {
 	/*require_once plugin_dir_path( __FILE__ ) . 'includes/class-cbxpetition-deactivator.php';
 	CBXPetition_Deactivator::deactivate();*/
 }
@@ -152,7 +151,7 @@ function cbxpetition_core() { // phpcs:ignore WordPress.NamingConventions.ValidF
 	global $cbxpetition_core;
 
 	if ( ! isset( $cbxpetition_core ) ) {
-		$cbxpetition_core = run_cbxpetition();
+		$cbxpetition_core = cbxpetition_run();
 	}
 
 	return $cbxpetition_core;
@@ -164,10 +163,10 @@ function cbxpetition_core() { // phpcs:ignore WordPress.NamingConventions.ValidF
  *
  * @since    2.0.0
  */
-function run_cbxpetition() {
+function cbxpetition_run() {
 	return CBXPetition::instance();
-}//end function run_cbxpetition
+}//end function cbxpetition_run
 
 
 //load the plugin
-$GLOBALS['cbxpetition_core'] = run_cbxpetition();
+$GLOBALS['cbxpetition_core'] = cbxpetition_run();

assets/css/cbxpetition-email-manager.css

@@ -23,5 +23,8 @@
     "symfony/console": "*",
     "symfony/translation": "*",
     "symfony/translation-contracts": "*"
+  },
+  "config": {
+    "platform-check": false
   }
 }

assets/css/cbxpetition-public.css

@@ -150,7 +150,6 @@ public function mailer() {
 	private function common_hooks() {
 		$helper = new PetitionHelper();
 
-		//add_action( 'init', [ $helper, 'load_plugin_textdomain' ] );
 		add_action( 'init', [ $helper, 'load_mailer' ] );
 	}//end method common_hooks
 

assets/css/cbxpetition-setting.css

@@ -142,7 +142,7 @@ public function display_signatures() {
 			$sign_info = null;
 			if ( $log_id > 0 ) {
 				global $wpdb;
-				$petition_signature_table = $wpdb->prefix . 'cbxpetition_signs';
+				$petition_signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 
 				//$sign_info = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $petition_signature_table WHERE id = %d", $log_id ), ARRAY_A );
 				$sign_info = PetitionHelper::petitionSignInfo( $log_id );
@@ -268,7 +268,7 @@ public function signature_delete_after_delete_post( $post_id ) {
 		$signatures = PetitionHelper::getSignListingData( '', $post_id, 0, 'all', 'DESC', 'id', - 1 );
 
 		if ( is_array( $signatures ) && count( $signatures ) > 0 ) {
-			$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+			$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 
 
 			foreach ( $signatures as $signature ) {
@@ -348,7 +348,7 @@ public function petition_sign_delete() {
 		//now delete the signature
 
 		global $wpdb;
-		$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+		$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 
 		do_action( 'cbxpetition_sign_delete_before', $signature, $signature_id, $petition_id );
 		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
@@ -386,7 +386,7 @@ public function petition_sign_edit() {
 		$current_user    = wp_get_current_user();
 		$current_user_id = absint( $current_user->ID );
 
-		$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+		$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 		$state_arr       = array_keys( PetitionHelper::getPetitionSignStates() );
 		$post_data       = wp_unslash( $_POST ); //all needed fields of $_POST is sanitized below
 
@@ -740,7 +740,7 @@ public function on_user_delete_sign_delete( $user_id ) {
 		do_action( 'cbxpetition_sign_delete_on_user_delete_before', $user_id );
 
 		global $wpdb;
-		$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+		$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 
 		//get all signature by this user
 		$signatures = PetitionHelper::getSignListingData( '', 0, $user_id, 'all', 'DESC', 'id', - 1 );
@@ -1517,7 +1517,7 @@ public function custom_plugin_row_meta( $links_array, $plugin_file_name, $plugin
 			$links_array[] = '<a target="_blank" style="color:#f44336 !important; font-weight: bold;" href="https://wordpress.org/plugins/cbxpetition/#reviews" aria-label="' . esc_attr__( 'Reviews', 'cbxpetition' ) . '">' . esc_html__( 'Reviews', 'cbxpetition' ) . '</a>';
 			$links_array[] = '<a target="_blank" style="color:#f44336 !important; font-weight: bold;" href="https://codeboxr.com/doc/cbxpetition-doc/" aria-label="' . esc_attr__( 'Documentation', 'cbxpetition' ) . '">' . esc_html__( 'Documentation', 'cbxpetition' ) . '</a>';
 
-
+			//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 			if ( in_array( 'cbxpetitionproaddon/cbxpetitionproaddon.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXPETITIONPROADDON_PLUGIN_NAME' ) ) {
 				//nothing here
 			} else {
@@ -1651,7 +1651,7 @@ public function plugin_activate_upgrade_notices() {
 		}
 
 		if ( get_transient( 'cbxpetition_proaddon_deactivated' ) ) {
-			echo '<div class="notice notice-success is-dismissible" style="border-color: #6648fe !important;">';
+			echo '<div class="notice notice-info is-dismissible" style="border-color: #6648fe !important;">';
 
 			echo '<p>';
 
@@ -1676,10 +1676,11 @@ public function pro_addon_compatibility_campaign() {
 		}
 
 		//if the pro addon is active or installed
+		//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 		if ( in_array( 'cbxpetitionproaddon/cbxpetitionproaddon.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXPETITIONPROADDON_PLUGIN_NAME' ) ) {
 			//plugin is activated
 
-			$plugin_version  = CBXPETITIONPROADDON_PLUGIN_NAME;
+			$plugin_version  = CBXPETITIONPROADDON_PLUGIN_VERSION;
 			$pro_min_version = '2.0.0';
 
 
@@ -1701,7 +1702,7 @@ public function pro_addon_compatibility_campaign() {
 	 * @since 2.0.0
 	 */
 	public function check_pro_addon() {
-		cbxpetition_check_and_deactivate_plugin( 'cbxpetitionproaddon/cbxpetitionproaddon.php', '2.0.0', 'cbxpetition_proaddon_deactivated' );
+		cbxpetition_check_and_deactivate_plugin( 'cbxpetitionproaddon/cbxpetitionproaddon.php', '2.0.6', 'cbxpetition_proaddon_deactivated' );
 	}//end method check_pro_addon
 
 	/**
@@ -2340,7 +2341,7 @@ public function custom_message_after_plugin_row_proaddon($plugin_file, $plugin_d
 		if(defined('CBXPETITIONPROADDON_PLUGIN_NAME')) return;
 
 		$pro_addon_version = PetitionHelper::get_any_plugin_version('cbxpetitionproaddon/cbxpetitionproaddon.php');
-		$pro_latest_version  = '2.0.4';
+		$pro_latest_version  = CBXPETITION_PRO_VERSION;
 
 		if($pro_addon_version != '' && version_compare( $pro_addon_version, $pro_latest_version, '<' ) ){
 			// Custom message to display

cbxpetition.php

@@ -145,7 +145,7 @@ public function guest_email_validation() {
 
 			$settings = $this->settings;
 			global $wpdb;
-			$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+			$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 
 			$activation_code = sanitize_text_field( wp_unslash( get_query_var( 'cbxpetitionsign_verification' ) ) );
 
@@ -276,7 +276,7 @@ public function petition_sign_submit() {
 
 			global $wpdb;
 
-			$signature_table = $wpdb->prefix . 'cbxpetition_signs';
+			$signature_table = esc_sql($wpdb->prefix . 'cbxpetition_signs');
 			$post_data       = wp_unslash( $_POST ); //data is sanitized later below using $post_data
 
 			$user_id = 0;