Changeset 3370692

Timestamp:

09/30/2025 07:45:50 PM (5 months ago)

Author:

flexmls

Message:

Flexmls WordPress plugin 3.15.4

Location:

flexmls-idx/trunk

Files:

• Admin/NginxCompatibility.php (modified) (1 diff)
• README.txt (modified) (2 diffs)
• flexmls_connect.php (modified) (3 diffs)
• lib/flexmlsAPI/Core.php (modified) (1 diff)
• views/admin-settings-behavior.php (modified) (8 diffs)

flexmls-idx/trunk/Admin/NginxCompatibility.php

@@ -391 +391 @@
 
     /**
+     * AJAX handler to get nginx configuration rules with custom parameters
+     */
+    public static function ajax_get_nginx_rules() {
+        // Verify nonce for security
+        if ( ! wp_verify_nonce( $_POST['nonce'], 'fmc_nginx_rules_nonce' ) ) {
+            wp_die( 'Security check failed' );
+        }
+
+        // Get parameters from AJAX request
+        $permabase = sanitize_text_field( $_POST['permabase'] );
+        $destlink = sanitize_text_field( $_POST['destlink'] );
+        
+        // Temporarily update settings for rule generation
+        $fmc_settings = get_option( 'fmc_settings' );
+        $original_permabase = $fmc_settings['permabase'];
+        $original_destlink = $fmc_settings['destlink'];
+        
+        $fmc_settings['permabase'] = $permabase;
+        $fmc_settings['destlink'] = $destlink;
+        
+        // Generate rules with temporary settings
+        $rules = self::get_nginx_rewrite_rules_with_params( $permabase, $destlink );
+        $rules_text = implode( "\n", $rules );
+        
+        // Restore original settings
+        $fmc_settings['permabase'] = $original_permabase;
+        $fmc_settings['destlink'] = $original_destlink;
+        
+        wp_send_json_success( array(
+            'rules' => $rules_text,
+            'permabase' => $permabase,
+            'destlink' => $destlink
+        ) );
+    }
+
+    /**
+     * Generate nginx rewrite rules with specific parameters
+     * 
+     * @param string $permabase The permalink base
+     * @param string $destlink The destination page ID
+     * @return array Array of nginx rewrite rules
+     */
+    public static function get_nginx_rewrite_rules_with_params( $permabase, $destlink ) {
+        // Detect if WordPress is in a subdirectory
+        $wp_path = '';
+        $site_url = site_url();
+        
+        // Extract the path from the site URL
+        $parsed_url = parse_url( $site_url );
+        if ( isset( $parsed_url['path'] ) && $parsed_url['path'] !== '/' ) {
+            $wp_path = rtrim( $parsed_url['path'], '/' );
+        }
+        
+        $rules = array(
+            '# Flexmls IDX Plugin Rewrite Rules for nginx',
+            '# Add these rules to your nginx server block configuration',
+            '# Place these rules BEFORE the main WordPress location block',
+            '',
+            '# OAuth callback rules',
+            'location ~ ^' . $wp_path . '/oauth/callback/?$ {',
+            '    try_files $uri $uri/ ' . $wp_path . '/index.php?plugin=flexmls-idx&oauth_tag=oauth-login;',
+            '}',
+            '',
+            'location ~ ^' . $wp_path . '/oauth/spark-logout/?$ {',
+            '    try_files $uri $uri/ ' . $wp_path . '/index.php?plugin=flexmls-idx&oauth_tag=oauth-logout;',
+            '}',
+            '',
+            '# IDX permalink rules (matches WordPress: permabase/([^/]+)?)',
+            'location ~ ^' . $wp_path . '/' . $permabase . '/([^/]+)/?$ {',
+            '    try_files $uri $uri/ ' . $wp_path . '/index.php?plugin=flexmls-idx&fmc_tag=$1' . ( $destlink ? '&page_id=' . $destlink : '' ) . ';',
+            '}',
+            '',
+            '# Portal rules (matches WordPress: portal/([^/]+)?)',
+            'location ~ ^' . $wp_path . '/portal/([^/]+)/?$ {',
+            '    try_files $uri $uri/ ' . $wp_path . '/index.php?plugin=flexmls-idx&fmc_vow_tag=$1' . ( $destlink ? '&page_id=' . $destlink : '' ) . ';',
+            '}',
+            '',
+            '# End Flexmls IDX Plugin Rewrite Rules'
+        );
+
+        return $rules;
+    }
+
+    /**
      * Get server information for debugging
      * 

flexmls-idx/trunk/README.txt

@@ -5 +5 @@
 Tested up to: 6.8.2
 Requires PHP: 7.4
-Stable tag: 3.15.3
+Stable tag: 3.15.4
 
 Add Flexmls® IDX listings, market statistics, IDX searches, and a contact form on your web site.
@@ -86 +86 @@
 
 == Changelog ==
+= 3.15.4 =
+Efficiency Update
+* Ajax improvements to the nginx configuration block under Behavior settings
+
+
 = 3.15.3 =
 New Feature

flexmls-idx/trunk/flexmls_connect.php

@@ -6 +6 @@
 Description: Provides Flexmls&reg; Customers with Flexmls&reg; IDX features on their WordPress websites. <strong>Tips:</strong> <a href="admin.php?page=fmc_admin_settings">Activate your Flexmls&reg; IDX plugin</a> on the settings page; <a href="widgets.php">add widgets to your sidebar</a> using the Widgets Admin under Appearance; and include widgets on your posts or pages using the Flexmls&reg; IDX Widget Short-Code Generator on the Visual page editor.
 Author: FBS
-Version: 3.15.3
+Version: 3.15.4
 Author URI:  https://www.flexmls.com
 Requires at least: 5.0
@@ -17 +17 @@
 const FMC_API_BASE = 'sparkapi.com';
 const FMC_API_VERSION = 'v1';
-const FMC_PLUGIN_VERSION = '3.15.3';
+const FMC_PLUGIN_VERSION = '3.15.4';
 
 define( 'FMC_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -91 +91 @@
         add_action( 'wp_ajax_flexmls_connect_save_search', array( 'flexmlsConnectPageSearchResults', 'save_user_search' ) );
         add_action( 'wp_ajax_nopriv_flexmls_connect_save_search', array( 'flexmlsConnectPageSearchResults', 'save_user_search' ) );
+        
+        // AJAX handler for nginx configuration rules
+        add_action( 'wp_ajax_fmc_get_nginx_rules', array( '\FlexMLS\Admin\NginxCompatibility', 'ajax_get_nginx_rules' ) );
 
         add_shortcode( 'idx_frame', array( 'flexmlsConnect', 'shortcode' ) );

flexmls-idx/trunk/lib/flexmlsAPI/Core.php

@@ -44 +44 @@
         'Accept-Encoding' => "gzip,deflate",
         'Content-Type' => "application/json",
-        'User-Agent' => "Flexmls WordPress Plugin/3.15.3",
-        'X-SparkApi-User-Agent' => "flexmls-WordPress-Plugin/3.15.3"
+        'User-Agent' => "Flexmls WordPress Plugin/3.15.4",
+        'X-SparkApi-User-Agent' => "flexmls-WordPress-Plugin/3.15.4"
     );
 

flexmls-idx/trunk/views/admin-settings-behavior.php

@@ -319 +319 @@
     </table>
     <?php endif; ?>
+    
+    <?php
+    // Display red warning message for nginx users about copying config and saving changes
+    if ( \FlexMLS\Admin\NginxCompatibility::is_nginx() ) {
+        ?>
+        <div style="background: #f8d7da; padding: 15px; margin: 20px 0; border: 1px solid #f5c6cb; border-radius: 4px;">
+            <p style="margin: 0; color: #721c24; font-size: 14px; font-weight: bold;">
+                ⚠️ <strong>Important:</strong> If you see nginx configuration blocks above, you must:
+            </p>
+            <ol style="margin: 10px 0 0 0; padding-left: 20px; color: #721c24; font-size: 13px;">
+                <li><strong>Copy the nginx configuration block</strong> and add it to your nginx server configuration file</li>
+                <li><strong>Click "Save Settings" button below</strong> to save your changes to this page</li>
+            </ol>
+        </div>
+        <?php
+    }
+    ?>
+    
     <p><?php wp_nonce_field( 'update_fmc_behavior_action', 'update_fmc_behavior_nonce' ); ?><button type="submit" class="button-primary">Save Settings</button></p>
 </form>
@@ -324 +342 @@
 <script>
 jQuery(document).ready(function($) {
+    var originalPermabase = '<?php echo esc_js( $fmc_settings[ 'permabase' ] ); ?>';
+    var originalDestlink = '<?php echo esc_js( $fmc_settings[ 'destlink' ] ); ?>';
+    var nginxConfigTextarea = null;
+    var currentValuesContainer = null;
+    
+    // Function to update nginx configuration and current values via AJAX
+    function updateNginxConfig(permabase, destlink) {
+        // Only make AJAX call if nginx warning exists
+        var nginxWarning = $('.nginx-permabase-warning');
+        if (nginxWarning.length === 0) {
+            return;
+        }
+        
+        // Find the nginx config textarea
+        if (!nginxConfigTextarea) {
+            nginxConfigTextarea = nginxWarning.find('textarea[id="nginx-permabase-config"]');
+        }
+        
+        // Find current values container - there might be multiple instances
+        if (!currentValuesContainer) {
+            currentValuesContainer = nginxWarning.find('p:contains("Current permalink base")');
+        }
+        
+        // Make AJAX request to get updated nginx rules
+        $.ajax({
+            url: ajaxurl,
+            type: 'POST',
+            data: {
+                action: 'fmc_get_nginx_rules',
+                permabase: permabase,
+                destlink: destlink,
+                nonce: '<?php echo wp_create_nonce( 'fmc_nginx_rules_nonce' ); ?>'
+            },
+            success: function(response) {
+                if (response.success) {
+                    // Update nginx configuration textarea
+                    if (nginxConfigTextarea.length > 0) {
+                        nginxConfigTextarea.val(response.data.rules);
+                    }
+                    
+                    // Update current values display - handle multiple instances
+                    if (currentValuesContainer.length > 0) {
+                        var newContent = 'Current permalink base: <code>' + response.data.permabase + '</code>';
+                        if (response.data.destlink && response.data.destlink !== '0') {
+                            newContent += '<br>Current destination page ID: <code>' + response.data.destlink + '</code>';
+                        }
+                        // Update all instances of current values
+                        currentValuesContainer.each(function() {
+                            $(this).html(newContent);
+                        });
+                    }
+                }
+            },
+            error: function() {
+                console.log('Failed to update nginx configuration');
+            }
+        });
+    }
+    
     // Show nginx warning when permalink base field is focused or changed
     $('#permabase').on('focus change input', function() {
@@ -330 +407 @@
         
         // If nginx warning exists and value has changed, show a note and expand the warning
-        if (nginxWarning.length > 0 && currentValue !== '<?php echo esc_js( $fmc_settings[ 'permabase' ] ); ?>') {
+        if (nginxWarning.length > 0 && currentValue !== originalPermabase) {
             // Expand the warning if it's collapsed
             var details = nginxWarning.find('details');
@@ -337 +414 @@
             }
             
-            // Add the change notice if it doesn't exist
-            if (!nginxWarning.find('.value-changed-notice').length) {
-                nginxWarning.find('details > div').prepend('<div class="value-changed-notice" style="background: #d4edda; padding: 8px; margin-bottom: 10px; border: 1px solid #c3e6cb; border-radius: 4px; color: #155724; font-size: 13px;"><strong>Note:</strong> You will need to update your nginx configuration after saving this change.</div>');
-            }
+            // Add the change notice only to the first nginx warning container if it doesn't exist
+            if (!$('.value-changed-notice').length) {
+                $('.nginx-permabase-warning').first().find('> details > div').prepend('<div class="value-changed-notice" style="background: #d4edda; padding: 8px; margin-bottom: 10px; border: 1px solid #c3e6cb; border-radius: 4px; color: #155724; font-size: 13px;"><strong>Note:</strong> You will need to update your nginx configuration after saving this change.</div>');
+            }
+            
+            // Update nginx configuration in real-time
+            var currentDestlink = $('select[name="fmc_settings[destlink]"]').val() || '0';
+            updateNginxConfig(currentValue, currentDestlink);
         }
     });
@@ -348 +429 @@
         var currentValue = $(this).val();
         var nginxWarning = $(this).closest('td').find('.nginx-permabase-warning');
-        var valueChangedNotice = nginxWarning.find('.value-changed-notice');
-        
-        if (currentValue === '<?php echo esc_js( $fmc_settings[ 'permabase' ] ); ?>' && valueChangedNotice.length > 0) {
-            valueChangedNotice.remove();
+        
+        if (currentValue === originalPermabase) {
+            $('.value-changed-notice').remove();
             // Optionally collapse the warning if it was auto-expanded
             var details = nginxWarning.find('details');
@@ -358 +438 @@
             }
         }
+        
+        // Update nginx configuration in real-time
+        var currentDestlink = $('select[name="fmc_settings[destlink]"]').val() || '0';
+        updateNginxConfig(currentValue, currentDestlink);
     });
     
@@ -363 +447 @@
     $('select[name="fmc_settings[destlink]"]').on('change', function() {
         var currentValue = $(this).val();
-        var originalValue = '<?php echo esc_js( $fmc_settings[ 'destlink' ] ); ?>';
         var nginxWarning = $('.nginx-permabase-warning');
         
         // If nginx warning exists and value has changed, show a note and expand the warning
-        if (nginxWarning.length > 0 && currentValue !== originalValue) {
+        if (nginxWarning.length > 0 && currentValue !== originalDestlink) {
             // Expand the warning if it's collapsed
             var details = nginxWarning.find('details');
@@ -374 +457 @@
             }
             
-            // Add the change notice if it doesn't exist
-            if (!nginxWarning.find('.value-changed-notice').length) {
-                nginxWarning.find('details > div').prepend('<div class="value-changed-notice" style="background: #d4edda; padding: 8px; margin-bottom: 10px; border: 1px solid #c3e6cb; border-radius: 4px; color: #155724; font-size: 13px;"><strong>Note:</strong> You will need to update your nginx configuration after saving this change.</div>');
-            }
+            // Add the change notice only to the first nginx warning container if it doesn't exist
+            if (!$('.value-changed-notice').length) {
+                $('.nginx-permabase-warning').first().find('> details > div').prepend('<div class="value-changed-notice" style="background: #d4edda; padding: 8px; margin-bottom: 10px; border: 1px solid #c3e6cb; border-radius: 4px; color: #155724; font-size: 13px;"><strong>Note:</strong> You will need to update your nginx configuration after saving this change.</div>');
+            }
+            
+            // Update nginx configuration in real-time
+            var currentPermabase = $('#permabase').val() || originalPermabase;
+            updateNginxConfig(currentPermabase, currentValue);
         }
         
         // Hide the note when value is reverted to original
-        if (currentValue === originalValue) {
-            var valueChangedNotice = nginxWarning.find('.value-changed-notice');
-            if (valueChangedNotice.length > 0) {
-                valueChangedNotice.remove();
-                // Optionally collapse the warning if it was auto-expanded
-                var details = nginxWarning.find('details');
-                if (details.length > 0 && details.attr('open') && !details.data('user-opened')) {
-                    details.removeAttr('open');
-                }
-            }
-        }
+        if (currentValue === originalDestlink) {
+            $('.value-changed-notice').remove();
+            // Optionally collapse the warning if it was auto-expanded
+            var details = nginxWarning.find('details');
+            if (details.length > 0 && details.attr('open') && !details.data('user-opened')) {
+                details.removeAttr('open');
+            }
+        }
+        
+        // Update nginx configuration in real-time
+        var currentPermabase = $('#permabase').val() || originalPermabase;
+        updateNginxConfig(currentPermabase, currentValue);
     });
 });