Changeset 3431406

Timestamp:

01/03/2026 03:40:50 AM (2 weeks ago)

Author:

arothman

Message:

2.0.5 functionality

Location:

pcrecruiter-extensions/trunk

Files:

• PCRecruiter-Extensions.php (modified) (13 diffs)
• assets/js/pcr-frontend.js (modified) (5 diffs)
• includes/class-deactivation-handler.php (modified) (28 diffs)
• includes/class-job-manager.php (modified) (44 diffs)
• includes/class-schema-mapper.php (modified) (7 diffs)
• includes/class-seo-enhancements.php (modified) (8 diffs)
• includes/class-sitemap-integration.php (modified) (17 diffs)
• readme.txt (modified) (4 diffs)

pcrecruiter-extensions/trunk/PCRecruiter-Extensions.php

@@ -5 +5 @@
  * Plugin URI: https://www.pcrecruiter.net
  * Description: Integrates PCRecruiter job boards with WordPress via iframe embed or full job sync with /job/ custom post type.
- * Version: 2.0.4
+ * Version: 2.0.5
  * Requires at least: 5.6
  * Requires PHP: 7.4
@@ -19 +19 @@
  * phpcs:set WordPress.WP.I18n text_domain[] pcrecruiter-extensions
  */
-
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 // Public endpoint for PCRecruiter custom forms & job sync.
 // Form is submitted from an external domain - WordPress nonce cannot be added.
@@ -306 +308 @@
     $pcrecruiter_has_shortcode = (strpos($job_board_page, $url) !== false);
 
-    if ($pcrecruiter_has_shortcode && $_SERVER['REQUEST_METHOD'] === 'POST') {
+    if ($pcrecruiter_has_shortcode && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST') {
         $rawData = file_get_contents('php://input');
         $data = json_decode($rawData, true);
@@ -445 +447 @@
     $is_jobmanager_page = false;
     $is_job_post = is_singular('job');
+    $is_apply_frame = $is_job_post && isset($_GET['apply']);
 
     if ($using_full_sync) {
@@ -495 +498 @@
     // Register all scripts/styles
     wp_register_script('pcr-iframe', 'https://www2.pcrecruiter.net/pcrimg/inc/pcrframehost.js', false, PCRECRUITER_EXTENSIONS_VERSION, false);
-    wp_register_script('pcr-jobboard-js', 'https://www2.pcrecruiter.net/pcrimg/js/wp_jobboard.js', false, PCRECRUITER_EXTENSIONS_VERSION, false);
-    wp_register_script('pcr-frontend', plugin_dir_url(__FILE__) . 'assets/js/pcr-frontend.js', array(), PCRECRUITER_EXTENSIONS_VERSION, true);
+    wp_register_script('pcr-frontend', plugin_dir_url(__FILE__) . 'assets/js/pcr-frontend.js', array(), PCRECRUITER_EXTENSIONS_VERSION, false);
     wp_register_style('pcr-job-board', plugin_dir_url(__FILE__) . 'assets/css/pcr-job-board.css', array(), PCRECRUITER_EXTENSIONS_VERSION);
 
@@ -505 +507 @@
 
         // Load jobmanager-specific assets on job board page(s) and single job posts
-        if ($is_jobmanager_page || $is_job_post) {
-            wp_enqueue_script('pcr-jobboard-js');
+        if ($is_jobmanager_page || $is_job_post || $is_apply_frame) {
             wp_enqueue_script('pcr-frontend');
             wp_enqueue_style('pcr-job-board');
@@ -516 +517 @@
             const ref = '$hostreferer'; 
             if(ref.length > 0 && document.location.host?.indexOf(ref) === -1) { 
-                localStorage['pcrecruiter_referer'] = ref; 
+                localStorage['pcr_referer'] = ref; 
             }
             
@@ -767 +768 @@
         }
 
-        // Enqueue jobboard script for appendSrcToFrame() function
-        wp_enqueue_script('pcr-jobboard-js');
+        // Note: appendSrcToFrame() is now provided by pcr-frontend.js when in Full Sync mode
+        // For iframe/passthrough mode, this function may not be available but is also not needed
 
         $version = pcrecruiter_get_plugin_version();
@@ -781 +782 @@
  */
 add_action('parse_request', 'pcrecruiter_handle_jobshare_redirect', 1);
-
 function pcrecruiter_handle_jobshare_redirect($wp)
 {
@@ -788 +788 @@
     }
 
-    $query_string = wp_unslash($_SERVER['QUERY_STRING']);
+    $query_string = sanitize_text_field( wp_unslash( $_SERVER['QUERY_STRING'] ) );
 
     // Check if starts with JOBSHARE
@@ -820 +820 @@
     if ($current_path && $job_board_path && rtrim($current_path, '/') === rtrim($job_board_path, '/')) {
         $redirect_url = 'https://host.pcrecruiter.net/pcrbin/jobboard.aspx?JOBSHARE' . $jobshare_token;
-        wp_redirect($redirect_url, 301);
+        $redirect_url = esc_url_raw($redirect_url);
+
+        // Whitelist PCRecruiter host for this redirect
+        add_filter('allowed_redirect_hosts', function ($hosts) {
+            $hosts[] = 'host.pcrecruiter.net';
+            return $hosts;
+        });
+
+        wp_safe_redirect($redirect_url, 301);
         exit;
     }
@@ -1647 +1655 @@
         }
         if (isset($_POST['pcrecruiter_job_default_og_image'])) {
-            update_option('pcrecruiter_job_default_og_image', esc_url_raw($_POST['pcrecruiter_job_default_og_image']));
+            update_option('pcrecruiter_job_default_og_image', esc_url_raw( wp_unslash( $_POST['pcrecruiter_job_default_og_image'] ) ));
         }
         // Handle pcrecruiter_seo_enable_overrides (separate option)
@@ -1811 +1819 @@
             $registered_by = get_post_type_object('job');
             if ($registered_by && !isset($registered_by->cap->edit_posts)) {
-                echo '<p class="description" style="color: #d63638;">⚠️ Warning: Another plugin has registered the "job" post type. Full sync may not work correctly.</p>';
+                echo '<p class="description" style="color: #d63638;">⚠️ Warning: Another plugin has registered the "job" post type. Full sync may not work correctly.</p>';
             }
         } ?>

pcrecruiter-extensions/trunk/assets/js/pcr-frontend.js

@@ -1 +1 @@
 /**
  * PCRecruiter Extensions - Frontend JavaScript
- * Handles pagination and apply button interactions
+ * Handles search form, pagination, sorting, radius search, and apply button interactions
  */
 
@@ -12 +12 @@
   document.addEventListener("DOMContentLoaded", function () {
     initSearchForm();
+    initClearButton();
+    initRadiusDropdown();
   });
 
@@ -58 +60 @@
 
   /**
+   * Initialize clear button handler
+   */
+  function initClearButton() {
+    const clearButton = document.getElementById("clearButton");
+    if (clearButton) {
+      clearButton.addEventListener("click", function (e) {
+        e.preventDefault();
+        const resultsPage = document.getElementById("resultspage");
+        if (resultsPage) {
+          resultsPage.value = 1;
+        }
+        // Redirect to clean URL (same page without query params)
+        window.location.href = window.location.pathname;
+      });
+    }
+  }
+
+  /**
+   * Initialize radius dropdown autocomplete UI
+   */
+  function initRadiusDropdown() {
+    const input = document.getElementById("Positions---Radius");
+    if (!input) return;
+
+    const panel = document.getElementById("radius-dropdown-panel");
+    const latLongInput = document.getElementById("Position---LatLong");
+    if (!panel || !latLongInput) return;
+
+    let language = input.getAttribute("data-language") || "US";
+
+    // Create spinner
+    const spinner = document.createElement("span");
+    spinner.className = "loading-spinner";
+    spinner.style.display = "none";
+    input.parentNode.insertBefore(spinner, input.nextSibling);
+
+    let debounceTimer;
+
+    // Input handler with debounce
+    input.addEventListener("input", function () {
+      clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(function () {
+        radiusDropdownSearch(input, panel, latLongInput, spinner, language);
+      }, 300);
+    });
+
+    // Down arrow to focus first result
+    input.addEventListener("keydown", function (e) {
+      if (e.key === "ArrowDown" || e.which === 40 || e.keyCode === 40) {
+        const firstButton = panel.querySelector(".radius-button");
+        if (firstButton) {
+          firstButton.focus();
+          e.stopPropagation();
+          e.preventDefault();
+        }
+      }
+    });
+
+    // Clear lat/long if input is cleared
+    input.addEventListener("blur", function () {
+      if (!input.value.trim()) {
+        latLongInput.value = "";
+      }
+    });
+
+    // Close panel when clicking outside
+    document.addEventListener("click", function (e) {
+      if (
+        panel.style.display === "block" &&
+        !panel.contains(e.target) &&
+        e.target !== input
+      ) {
+        panel.style.display = "none";
+      }
+    });
+  }
+
+  /**
+   * Perform radius dropdown search
+   */
+  function radiusDropdownSearch(input, panel, latLongInput, spinner, language) {
+    const query = input.value.trim();
+    if (!query) {
+      panel.style.display = "none";
+      return;
+    }
+
+    // Setup panel UI
+    panel.style.position = "absolute";
+    panel.style.display = "block";
+    panel.style.height = "160px";
+    panel.style.width = "100%";
+    panel.style.backgroundColor = "#fff";
+    panel.style.border = "1px solid #ccc";
+    panel.style.overflowY = "auto";
+    panel.innerHTML = "";
+    spinner.style.display = "inline-block";
+
+    const url =
+      "https://maps.pcrecruiter.net/rest/uiapi/geolocations/quicksearch?location=" +
+      encodeURIComponent(query) +
+      "&language=" +
+      encodeURIComponent(language) +
+      "&rows=50";
+
+    fetch(url)
+      .then(function (response) {
+        return response.json();
+      })
+      .then(function (data) {
+        spinner.style.display = "none";
+        panel.innerHTML = "";
+
+        if (data && data.length > 0) {
+          data.forEach(function (location) {
+            var name = location.name;
+            var region = location.region;
+            var country = location.country;
+            var latitude = location.latitude;
+            var longitude = location.longitude;
+            var zip = location.zip;
+
+            var displayText =
+              name +
+              ", " +
+              region.toUpperCase() +
+              ", " +
+              country +
+              (zip ? " " + zip : "");
+
+            var item = document.createElement("div");
+            item.innerHTML =
+              '<button class="radius-button" type="button">' +
+              displayText +
+              "</button>";
+            item.style.padding = "5px";
+            item.style.cursor = "pointer";
+
+            item.addEventListener("click", function () {
+              input.value = displayText;
+              latLongInput.value = latitude + "," + longitude;
+              panel.style.display = "none";
+            });
+
+            panel.appendChild(item);
+          });
+        } else {
+          panel.innerHTML = '<div style="padding:5px;">No results found</div>';
+        }
+      })
+      .catch(function (error) {
+        spinner.style.display = "none";
+        panel.innerHTML =
+          '<div style="padding:5px;color:red;">Error: ' +
+          error.message +
+          "</div>";
+      });
+  }
+
+  /**
    * Submit search form via GET redirect
    */
@@ -81 +243 @@
     const formData = new FormData(searchForm);
 
+    // Check if radius search criteria have changed - if so, reset sortorigin
+    // so the auto-Distance sort will be applied
+    const currentParams = new URL(window.location.href).searchParams;
+    const currentLatLong = currentParams.get("Position---LatLong") || "";
+    const newLatLong = formData.get("Position---LatLong") || "";
+    const currentRadius = currentParams.get("radius-distance") || "";
+    const newRadius = formData.get("radius-distance") || "";
+
+    let resetSortOrigin = false;
+    if (newLatLong && (newLatLong !== currentLatLong || newRadius !== currentRadius)) {
+      // Radius criteria changed - reset to allow auto-Distance sort
+      resetSortOrigin = true;
+    }
+
     url.search = "";
 
     for (let [key, value] of formData.entries()) {
       if (value !== "" && key !== "action") {
-        url.searchParams.append(key, value);
+        // Override sortorigin if radius criteria changed
+        if (key === "sortorigin" && resetSortOrigin) {
+          url.searchParams.append(key, "default");
+        } else {
+          url.searchParams.append(key, value);
+        }
       }
     }
@@ -100 +281 @@
   /**
    * Delegated click handler for dynamic elements
-   */
-  document.addEventListener("click", function (e) {
-    // Handle pagination button clicks
-    if (e.target.classList.contains("btn-pagination")) {
-      e.preventDefault();
-      const targetPage = e.target.getAttribute("data-page");
-      if (targetPage) {
+   * Using capture phase (true) to intercept before other handlers
+   */
+  document.addEventListener(
+    "click",
+    function (e) {
+      // Handle sort links
+      const sortLink = e.target.closest(".customsortfield");
+      if (sortLink) {
+        e.preventDefault();
+        e.stopPropagation();
+        e.stopImmediatePropagation();
+
+        const sortName = sortLink.getAttribute("data-sortname") || "";
+        const sortDirRaw = sortLink.getAttribute("data-sortdirection") || "";
+        const sortDirDefault = sortDirRaw ? sortDirRaw.toUpperCase() : "ASC";
+
+        if (!sortName) {
+          return;
+        }
+
+        const searchForm = document.getElementById("searchForm");
+        const sortfieldInput = searchForm
+          ? searchForm.querySelector('input[name="sortfield"]')
+          : document.querySelector('input[name="sortfield"]');
+        const sortoriginInput = searchForm
+          ? searchForm.querySelector('input[name="sortorigin"]')
+          : document.querySelector('input[name="sortorigin"]');
+
+        // Get current sort from hidden input
+        let currentSort = "";
+        if (sortfieldInput && sortfieldInput.value) {
+          currentSort = sortfieldInput.value;
+        }
+
+        // If still empty, check URL params
+        if (!currentSort) {
+          const urlParams = new URL(window.location.href).searchParams;
+          currentSort = urlParams.get("sortfield") || "";
+        }
+
+        // Determine next direction
+        let nextDir = sortDirDefault;
+        if (currentSort) {
+          const parts = currentSort.trim().split(/\s+/);
+          const currentField = parts[0] || "";
+          const currentDir = (parts[1] || "").toUpperCase();
+          if (
+            currentField === sortName &&
+            (currentDir === "ASC" || currentDir === "DESC")
+          ) {
+            nextDir = currentDir === "ASC" ? "DESC" : "ASC";
+          }
+        }
+
+        if (sortfieldInput) {
+          sortfieldInput.value = sortName + (nextDir ? " " + nextDir : "");
+        }
+
+        // Mark this as a user-initiated sort change
+        if (sortoriginInput) {
+          sortoriginInput.value = "user";
+        }
+
+        if (searchForm) {
+          submitSearchForm(searchForm);
+        } else {
+          const url = new URL(window.location.href);
+          url.searchParams.set(
+            "sortfield",
+            sortName + (nextDir ? " " + nextDir : "")
+          );
+          url.searchParams.set("sortorigin", "user");
+          url.searchParams.set("search", "1");
+          if (!url.searchParams.has("pg")) {
+            url.searchParams.set("pg", "1");
+          }
+          window.location.href = url.toString();
+        }
+        return;
+      }
+
+      // Handle pagination button clicks
+      if (e.target.classList.contains("btn-pagination")) {
+        e.preventDefault();
+        const targetPage = e.target.getAttribute("data-page");
+        if (targetPage) {
+          const url = new URL(window.location.href);
+          url.searchParams.set("pg", targetPage);
+
+          // Preserve sortfield if present in form
+          const sortfieldInput = document.querySelector(
+            'input[name="sortfield"]'
+          );
+          if (sortfieldInput && sortfieldInput.value) {
+            url.searchParams.set("sortfield", sortfieldInput.value);
+          }
+
+          // Preserve sortorigin if present in form
+          const sortoriginInput = document.querySelector(
+            'input[name="sortorigin"]'
+          );
+          if (sortoriginInput && sortoriginInput.value) {
+            url.searchParams.set("sortorigin", sortoriginInput.value);
+          }
+
+          window.location.href = url.toString();
+        }
+      }
+
+      // Handle Apply button click
+      if (e.target.id === "btnApply" || e.target.closest("#btnApply")) {
+        e.preventDefault();
         const url = new URL(window.location.href);
-        url.searchParams.set("pg", targetPage);
-
-        // Preserve sortfield if present in form
-        const sortfieldInput = document.querySelector(
-          'input[name="sortfield"]'
-        );
-        if (sortfieldInput && sortfieldInput.value) {
-          url.searchParams.set("sortfield", sortfieldInput.value);
-        }
-
+        url.searchParams.set("apply", "y");
         window.location.href = url.toString();
       }
-    }
-
-    // Handle Apply button click
-    if (e.target.id === "btnApply" || e.target.closest("#btnApply")) {
-      e.preventDefault();
-      const url = new URL(window.location.href);
-      url.searchParams.set("apply", "y");
-      window.location.href = url.toString();
-    }
-  });
+    },
+    true
+  ); // Use capture phase to intercept before other handlers
+
+  /**
+   * Append referrer source to iframe (used by job detail apply frame)
+   * Global function called from inline onload handler
+   */
+  window.appendSrcToFrame = function (frameobj) {
+    try {
+      var src = localStorage["pcr_referer"];
+      if (src) {
+        var host = frameobj.getAttribute("host");
+        if (host && host.indexOf("src=") < 0) {
+          frameobj.setAttribute(
+            "host",
+            host + "&src=" + encodeURIComponent(src)
+          );
+        }
+      }
+    } catch (e) {
+      // Silently ignore localStorage errors
+    }
+  };
 })();

pcrecruiter-extensions/trunk/includes/class-deactivation-handler.php

@@ -6 +6 @@
  * @since 2.0.0
  */
-
+if (! defined('ABSPATH')) {
+    exit;
+}
 class PCR_Deactivation_Handler
 {
-
     /**
      * Initialize the deactivation handler
@@ -19 +20 @@
         add_action('admin_footer', [__CLASS__, 'render_deactivation_modal']);
     }
-
     /**
      * Enqueue scripts and styles for deactivation modal
@@ -29 +29 @@
             return;
         }
-
         wp_enqueue_style(
             'pcr-deactivation-modal',
@@ -36 +35 @@
             '1.0.0'
         );
-
         wp_enqueue_script(
             'pcr-deactivation-handler',
@@ -44 +42 @@
             true
         );
-
         wp_localize_script('pcr-deactivation-handler', 'pcrDeactivation', [
             'ajaxurl' => admin_url('admin-ajax.php'),
@@ -51 +48 @@
         ]);
     }
-
     /**
      * Render the deactivation modal HTML
@@ -69 +65 @@
                     <button type="button" class="pcr-modal-close" aria-label="Close">&times;</button>
                 </div>
-
                 <div class="pcr-modal-body">
                     <p class="pcr-intro-text">Please select what data should be handled during deactivation:</p>
-
                     <form id="pcr-deactivation-form">
                         <div class="pcr-option-section">
@@ -81 +75 @@
                                 <span class="pcr-option-description">Preserve all plugin settings for future use (recommended for temporary deactivation)</span>
                             </label>
-
                             <label class="pcr-option-label pcr-warning-option">
                                 <input type="radio" name="settings_action" value="delete">
@@ -88 +81 @@
                             </label>
                         </div>
-
                         <div class="pcr-option-section">
                             <h3>Job Postings</h3>
@@ -96 +88 @@
                                 <span class="pcr-option-description">Preserve all synced job postings in WordPress (recommended)</span>
                             </label>
-
                             <label class="pcr-option-label pcr-danger-option">
                                 <input type="radio" name="jobs_action" value="delete">
@@ -103 +94 @@
                             </label>
                         </div>
-
                         <div class="pcr-option-section">
                             <h3>RSS Feed Files</h3>
@@ -111 +101 @@
                                 <span class="pcr-option-description">Preserve pcrjobfeed.xml and pcrjobfeed.json files (recommended)</span>
                             </label>
-
                             <label class="pcr-option-label pcr-warning-option">
                                 <input type="radio" name="rss_action" value="delete">
@@ -118 +107 @@
                             </label>
                         </div>
-
                         <div class="pcr-confirmation-section" id="pcr-confirmation-required" style="display:none;">
                             <div class="pcr-warning-box">
@@ -126 +114 @@
                             </div>
                         </div>
-
                         <div class="pcr-summary-section" id="pcr-summary">
                             <h4>Summary:</h4>
@@ -133 +120 @@
                     </form>
                 </div>
-
                 <div class="pcr-modal-footer">
                     <button type="button" class="button button-secondary pcr-cancel-deactivation">Cancel</button>
@@ -145 +131 @@
 <?php
     }
-
     /**
      * AJAX handler for cleanup actions
@@ -153 +138 @@
         // Verify nonce
         check_ajax_referer('pcr_deactivation_cleanup', 'nonce');
-
         // Check permissions
         if (!current_user_can('activate_plugins')) {
             wp_send_json_error(['message' => 'Insufficient permissions']);
         }
-
         $settings_action = isset($_POST['settings_action']) ? sanitize_text_field(wp_unslash($_POST['settings_action'])) : 'keep';
         $jobs_action = isset($_POST['jobs_action']) ? sanitize_text_field(wp_unslash($_POST['jobs_action'])) : 'keep';
         $rss_action = isset($_POST['rss_action']) ? sanitize_text_field(wp_unslash($_POST['rss_action'])) : 'keep';
         $confirmation = isset($_POST['confirmation']) ? sanitize_text_field(wp_unslash($_POST['confirmation'])) : '';
-
         // Validate confirmation for destructive actions
         if (($settings_action === 'delete' || $jobs_action === 'delete' || $rss_action === 'delete') && $confirmation !== 'DELETE') {
             wp_send_json_error(['message' => 'Invalid confirmation text']);
         }
-
         // Store cleanup actions for deactivation hook to execute
         update_option('pcrecruiter_deactivation_actions', [
@@ -176 +157 @@
             'timestamp' => current_datetime()->getTimestamp()
         ], false);
-
         wp_send_json_success([
             'message' => 'Deactivation preferences saved. Proceeding with plugin deactivation...'
@@ -188 +168 @@
         self::delete_plugin_settings();
     }
-
     public static function execute_jobs_cleanup()
     {
         self::delete_all_jobs();
     }
-
     public static function execute_rss_cleanup()
     {
@@ -204 +182 @@
     {
         global $wpdb;
-
         // List of all plugin options
         $options = [
@@ -228 +205 @@
             'pcrecruiter_full_sync_enabled'
         ];
-
         foreach ($options as $option) {
             delete_option($option);
         }
-
         // Clear any transients
         // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
@@ -241 +216 @@
         );
     }
-
     /**
      * Delete all job posts
@@ -249 +223 @@
     {
         global $wpdb;
-
         // Get all job post IDs
         // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
@@ -258 +231 @@
             )
         );
-
         $deleted_count = 0;
-
         if (!empty($job_ids)) {
             foreach ($job_ids as $job_id) {
@@ -268 +239 @@
                 }
             }
-
             // Clear job caches
             if (class_exists('PCR_Job_Manager')) {
@@ -274 +244 @@
             }
         }
-
         return $deleted_count;
     }
-
     /**
      * Delete RSS feed files
@@ -285 +253 @@
     {
         $deleted_files = [];
-
         $feed_files = [
             WP_CONTENT_DIR . '/uploads/pcrjobfeed.xml',
             WP_CONTENT_DIR . '/uploads/pcrjobfeed.json'
         ];
-
         foreach ($feed_files as $file) {
             if (file_exists($file)) {
@@ -299 +265 @@
             }
         }
-
         return $deleted_files;
     }
 }
-
 // Initialize the deactivation handler
 PCR_Deactivation_Handler::init();

pcrecruiter-extensions/trunk/includes/class-job-manager.php

@@ -8 +8 @@
  *
  * @package PCRecruiter_Extensions
- * @since 2.0.0
+ * @since 1.0.0
  */
 
@@ -168 +168 @@
         return '[[' . strtolower($key) . ']]';
     }
-
-
     public function update_wp_settings($data): string
     {
@@ -220 +218 @@
         try {
             // Lookup all post IDs with matching databaseid using WordPress built-in function
+            // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query -- Required for job lookup by databaseid
             $args = array(
                 'post_type' => 'job',
@@ -300 +299 @@
         if ($isDeleted) {
             //handle expired job based on settings
-            if (strlen($existingpostid) > 0) {
+            if (!empty($existingpostid)) {
                 $options = get_option('pcrecruiter_feed_options', array());
                 $handling = isset($options['expired_job_handling']) ? $options['expired_job_handling'] : 'delete';
@@ -362 +361 @@
             $allowed_html['br'] = array();
 
-            // Strip inline styles from content
+            // Strip inline styles from content (but preserve style on span.positionlogo and span.companylogo)
             $options = get_option('pcrecruiter_feed_options', array());
             $strip_styles = isset($options['strip_inline_styles']) ? $options['strip_inline_styles'] : '1';
@@ -369 +368 @@
 
             if ($strip_styles === '1') {
-                $content = preg_replace('/\s*style\s*=\s*["\'][^"\']*["\']/i', '', $content);
-            }
-
+                $pattern = '/<([a-z0-9]+)([^>]*?)\sstyle\s*=\s*(["\'])(.*?)\3([^>]*?)>/i';
+
+                $content = preg_replace_callback(
+                    $pattern,
+                    function ($m) {
+                        $tag = strtolower($m[1]);
+                        $before = $m[2];
+                        $after = $m[5];
+                        $full = $m[0];
+
+                        // Combine attributes around the style attr to inspect class
+                        $attrs = $before . ' ' . $after;
+
+                        // Keep style attribute only for span logos, but strip default-logo markers
+                        if ($tag === 'span') {
+                            $hasLogoClass = preg_match('/\bclass\s*=\s*["\'][^"\']*\b(positionlogo|companylogo)\b[^"\']*["\']/i', $attrs);
+                            $hasDefaultLogo = preg_match('/\bdata-default-logo\s*=\s*["\']\s*true\s*["\']/i', $attrs);
+
+                            if ($hasLogoClass) {
+                                if ($hasDefaultLogo) {
+                                    // Remove entirely when it's a default placeholder
+                                    return '';
+                                }
+                                // Preserve original tag (including style) for real logos
+                                return $full;
+                            }
+                        }
+
+                        // Otherwise remove the style attribute by rebuilding the tag without it
+                        // Trim to avoid duplicate spaces
+                        $reconstructed = '<' . $tag . preg_replace('/\s+/', ' ', trim($before . ' ' . $after)) . '>';
+                        return $reconstructed;
+                    },
+                    $content
+                );
+            }
+
+            // Sanitize content - allow form tags for apply buttons
             $job_data['post_content'] = wp_kses($content, $allowed_html);
-
-            // Force all <a> tags to open in new tab, except apply links
-            $job_data['post_content'] = preg_replace(
-                '/<a\s+(?![^>]*target=)(?![^>]*href=["\'][^"\']*[?&]apply=y)([^>]*)>/i',
-                '<a target="_blank" $1>',
-                $job_data['post_content']
-            );
-            $job_data['post_content'] = preg_replace(
-                '/<a\s+(?![^>]*href=["\'][^"\']*[?&]apply=y)([^>]*)target=["\'](?!_blank)[^"\']*["\']([^>]*)>/i',
-                '<a $1 target="_blank" $2>',
-                $job_data['post_content']
-            );
 
             if ($existingpostid) {
@@ -444 +466 @@
                 }
 
+                // Populate Yoast SEO meta after all job meta is saved
+                if (class_exists('PCR_SEO_Enhancements')) {
+                    PCR_SEO_Enhancements::populate_yoast_meta($post_id);
+                }
+
                 //return postid
                 return $post_id;
@@ -503 +530 @@
         $searchmetafields = get_option("global_search_metafields");
         $resulthmetafields = get_option("global_result_metafields");
-
-
         //result options
         $showjobs = get_option("global_result_showjobs");
@@ -526 +551 @@
 
         $search_template = PCR_Job_Manager::replace_search_fields($search_template, $searchmetafields);
-
-
         $output = [];
 
@@ -697 +720 @@
             }
         }
-
-
         // Get pagination style from settings
         $pcr_options = get_option('pcrecruiter_feed_options', []);
@@ -828 +849 @@
         return [$beforeTbody, $tableRow, $afterTbody];
     }
-
-
     public static function build_job_selection_query($showjobs, $resultsperpage, $page, $filter, $jobcategory = ''): string
     {
@@ -852 +871 @@
         $limitsql = esc_sql(($resultsperpage + 1));
         $iskeywordsearch = false;
-        $isradius = false;
 
         $pageoffset = (intval($page) - 1);
@@ -873 +891 @@
         $defaultsortfield = PCR_Job_Manager::parseOrderBy(get_option('global_sort_field'));
 
-        // Check POST first, then GET for sortfield
+        // Check POST first, then GET for sortfield and sortorigin
         $sortfield_raw = '';
+        $sortorigin = 'default';
         if (isset($_POST['sortfield']) && $_POST['sortfield'] !== '') {
             $sortfield_raw = sanitize_text_field(wp_unslash($_POST['sortfield']));
+            $sortorigin = isset($_POST['sortorigin']) ? sanitize_text_field(wp_unslash($_POST['sortorigin'])) : 'default';
         } elseif (isset($_GET['sortfield']) && $_GET['sortfield'] !== '') {
             $sortfield_raw = sanitize_text_field(wp_unslash($_GET['sortfield']));
+            $sortorigin = isset($_GET['sortorigin']) ? sanitize_text_field(wp_unslash($_GET['sortorigin'])) : 'default';
+        }
+
+        // Check if radius search is active (for Distance sort logic)
+        $isRadiusSearch = false;
+        if (isset($_POST['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_POST['Position---LatLong']))) > 0) {
+            $isRadiusSearch = true;
+        } elseif (isset($_GET['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_GET['Position---LatLong']))) > 0) {
+            $isRadiusSearch = true;
+        }
+
+        // Auto-apply Distance sort for radius searches ONLY if user hasn't explicitly chosen a sort
+        if ($isRadiusSearch && $sortorigin !== 'user') {
+            if (strpos($sortfield_raw, '[[Distance]]') === false) {
+                $sortfield_raw = '[[Distance]] ASC';
+                $sortforced = true;
+            }
         }
 
@@ -889 +926 @@
 
         $orderby = '';
+        $sort_is_distance = false;
         $sortdir = esc_sql($sortfield['ascdesc']);
 
@@ -1055 +1093 @@
                             FROM {$wpdb->postmeta} pm 
                             WHERE pm.post_id = wp.ID 
-                            AND pm.meta_key = '[[position.zip_code]]'
+                            AND pm.meta_key = '[[position.zip]]'
                             LIMIT 1
                             ) {$sortdir}, wp.post_title";
@@ -1095 +1133 @@
                             LIMIT 1
                             ) {$sortdir}, wp.post_title";
+                break;
+            case '[[Distance]]':
+                // Distance sort only works with radius search
+                if ($isRadiusSearch) {
+                    $orderby = "ORDER BY distance {$sortdir}";
+                    $sort_is_distance = true;
+                } else {
+                    // Fall back to default sort if no radius search active
+                    $orderby = "ORDER BY (
+                                    SELECT pm.meta_value 
+                                    FROM {$wpdb->postmeta} pm 
+                                    WHERE pm.post_id = wp.ID 
+                                    AND pm.meta_key = '[[position.date_posted]]'
+                                    LIMIT 1
+                                ) DESC";
+                }
                 break;
 
@@ -1134 +1188 @@
                 ) DESC";
         }
-
-
         ///////////////////////////////////////////////////////////////////////
         //BUILD WHERE CLAUSE
@@ -1173 +1225 @@
                 $whereclause[] = "EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.city]]' AND meta_value = '{$match}' AND wp.ID = pm.post_id)";
                 $whereclause[] = "OR EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.state]]' AND meta_value = '{$match}' AND wp.ID = pm.post_id)";
-                $whereclause[] = "OR EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.zip_code]]' AND meta_value = '{$match}' AND wp.ID = pm.post_id)";
+                $whereclause[] = "OR EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.zip]]' AND meta_value = '{$match}' AND wp.ID = pm.post_id)";
                 $whereclause[] = ")";
             }
@@ -1254 +1306 @@
                 $whereclause[] = "AND EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.department]]' AND meta_value = '{$match}' AND wp.ID = pm.post_id)";
             }
-
-            //Position---LatLong (Radius)
-            if (isset($_POST['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_POST['Position---LatLong']))) > 0) {
-                $isradius = true;
-            }
-
             //Positions---Salary
             if (isset($_POST['Positions---Salary']) && strlen(sanitize_text_field(wp_unslash($_POST['Positions---Salary']))) > 0) {
@@ -1322 +1368 @@
                 }
             }
-
-
             //jobcategory filter from shortcode parameter
             if (!empty($jobcategory)) {
@@ -1331 +1375 @@
 
             //radius search uses a different query
-            if ($isradius) {
+            if ($isRadiusSearch) {
                 global $wpdb;
 
@@ -1361 +1405 @@
                 $output[] = "HAVING distance <= {$radius}";
                 //sort by
-                if ($sortforced) {
+                $sort_is_date = ($sortfield['fieldname'] === '[[Date_Posted]]' || $sortfield['fieldname'] === '');
+                if ($sortforced || $sort_is_date) {
                     $output[] = $orderby;
                 } else {
@@ -1375 +1420 @@
                 //keyword search return in context order
                 if ($iskeywordsearch == false || $sortforced) {
+                    if ($sort_is_distance) {
+                        $orderby = "ORDER BY (
+                                SELECT pm.meta_value 
+                                FROM {$wpdb->postmeta} pm 
+                                WHERE pm.post_id = wp.ID 
+                                AND pm.meta_key = '[[position.date_posted]]'
+                                LIMIT 1
+                            ) DESC";
+                    }
                     $output[] = $orderby;
                 }
@@ -1407 +1461 @@
         return $sql;
     }
-
-
     public static function draw_search_form($searchtemplate, $page): string
     {
-        //get sort if sort was overridden
+        // Determine sortfield and sortorigin
+        // sortorigin values: 'user' (clicked sort link), 'radius' (auto-applied), 'default' (global setting)
         $sortfield = '';
-
+        $sortorigin = 'default';
+
+        // Check for user-provided sort (POST or GET)
         if (isset($_POST['sortfield']) && strlen(sanitize_text_field(wp_unslash($_POST['sortfield']))) > 0) {
             $sortfield = sanitize_text_field(wp_unslash($_POST['sortfield']));
+            // Check if this was a user click or auto-applied
+            $sortorigin = isset($_POST['sortorigin']) ? sanitize_text_field(wp_unslash($_POST['sortorigin'])) : 'default';
         } elseif (isset($_GET['sortfield']) && strlen(sanitize_text_field(wp_unslash($_GET['sortfield']))) > 0) {
             $sortfield = sanitize_text_field(wp_unslash($_GET['sortfield']));
-        }
+            $sortorigin = isset($_GET['sortorigin']) ? sanitize_text_field(wp_unslash($_GET['sortorigin'])) : 'default';
+        }
+
+        // If no sortfield provided, use default
+        if (empty($sortfield)) {
+            $sortfield = get_option('global_sort_field', '');
+            $sortorigin = 'default';
+        }
+
+        // Check if radius search is active
+        $isRadiusActive = false;
+        if (isset($_POST['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_POST['Position---LatLong']))) > 0) {
+            $isRadiusActive = true;
+        } elseif (isset($_GET['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_GET['Position---LatLong']))) > 0) {
+            $isRadiusActive = true;
+        }
+
+        // Auto-apply Distance sort for radius searches ONLY if user hasn't explicitly chosen a sort
+        if ($isRadiusActive && $sortorigin !== 'user') {
+            // Only override if not already Distance
+            if (strpos($sortfield, '[[Distance]]') === false) {
+                $sortfield = '[[Distance]] ASC';
+                $sortorigin = 'radius';
+            }
+        }
+
         // Build form action URL with current page parameter
         $request_uri = isset($_SERVER['REQUEST_URI']) ? sanitize_text_field(wp_unslash($_SERVER['REQUEST_URI'])) : '';
@@ -1433 +1515 @@
         $output[] = '  <form id="searchForm" name="searchForm" autocomplete="off" method="post" action="' . esc_url($form_action) . '" title="Search Form">';
         $output[] = $searchtemplate;
-        $output[] = '    <input name="action" id="action" type="hidden" value="SEARCHJOBS"></input>';
-        $output[] = '    <input name="resultspage" id="resultspage" type="hidden" value="' . esc_attr($page) . '"></input>';
-        $output[] = '    <input name="sortfield" id="sortfield" type="hidden" value="' . esc_attr($sortfield) . '"></input>';
+        $output[] = '    <input name="action" id="action" type="hidden" value="SEARCHJOBS">';
+        $output[] = '    <input name="resultspage" id="resultspage" type="hidden" value="' . esc_attr($page) . '">';
+        $output[] = '    <input name="sortfield" id="sortfield" type="hidden" value="' . esc_attr($sortfield) . '">';
+        $output[] = '    <input name="sortorigin" id="sortorigin" type="hidden" value="' . esc_attr($sortorigin) . '">';
         $output[] = '  </form>';
         $output[] = '</div>';
@@ -1456 +1539 @@
     public static function replace_search_fields($template, $metafields): string
     {
-
-
         // Handle null/empty metafields gracefully
         if (empty($metafields) || !is_string($metafields)) {
@@ -1484 +1565 @@
             $fielddic[$field['fieldname']] = $field;
         }
-
-
         $allfields = preg_split('/(\[\[[^\]]+\]\])/', $template, -1, PREG_SPLIT_DELIM_CAPTURE);
 
@@ -1501 +1580 @@
         return implode('', $allfields);
     }
-
-
     public static function replace_result_fields($post, $template, $metafields, $istable, $baseurl): string
     {
@@ -1538 +1615 @@
             $fieldvalue = str_replace(['http://', "https://"], ["", ""], esc_attr(get_permalink($post->ID)));
         }
-
         if (strtolower($fieldname) == "[[position.date_posted]]") {
             //reformat date from ISO to readable with timezone adjustment
-            $fieldvalue = PCR_Job_Manager::adjustTimezoneUsingCookie($fieldvalue, self::get_date_format());
+            $fieldvalue = PCR_Job_Manager::adjustTimezoneUsingCookie($fieldvalue, "Y-m-d");
         }
 
         if (strtolower($fieldname) == "[[position.last_modified]]") {
             //reformat date from ISO to readable with timezone adjustment
-            $fieldvalue = PCR_Job_Manager::adjustTimezoneUsingCookie($fieldvalue, self::get_date_format());
+            $fieldvalue = PCR_Job_Manager::adjustTimezoneUsingCookie($fieldvalue, "Y-m-d");
         }
 
@@ -1561 +1637 @@
         return $fieldvalue;
     }
-
-
     public static function replace_field($template, $field): string
     {
@@ -1599 +1673 @@
 
                 //radius city/state/zip
-
-
 
                 $radius[] = '<div style="position: relative;">';
@@ -1641 +1713 @@
                 $textbox = [];
 
-
-
                 $textbox[] = '<input autocomplete="on" class="form-control"
                     type="text" id="' . esc_attr(pcrecruiter_esc_form_var($fieldname)) . '" name="' . esc_attr(pcrecruiter_esc_form_var($fieldname)) . '" 
@@ -1685 +1755 @@
         $output = [];
 
-
-
         $fieldvalue = isset($_POST[pcrecruiter_esc_form_var($fieldname)]) ? sanitize_text_field(wp_unslash($_POST[pcrecruiter_esc_form_var($fieldname)])) : '';
-
-
         $whereclause = " AND EXISTS (SELECT 1 FROM {$wpdb->postmeta} pm WHERE meta_key = '[[position.status]]' AND meta_value = '{$intext}' AND  wp.post_id = pm.post_id)";
 
@@ -1750 +1816 @@
                 $query = "SELECT DISTINCT meta_value as dropdown  FROM {$wpdb->postmeta} wp WHERE meta_key = '[[position.department]]' {$whereclause} ORDER BY meta_value";
                 break;
-
-
             case 'Positions.Date_Posted':
                 $output[] = '<option value="">' . 'Posted Within...</option>';
@@ -1773 +1837 @@
                 $output[] = '<option ' . ($fieldvalue == '225000-300000' ? " selected " : "") . 'value="225000-300000">' . '225000 - 300000</option>';
                 $output[] = '<option ' . ($fieldvalue == '300000-10000000000' ? " selected " : "") . 'value="300000-10000000000">' . '300000+</option>';
-
-
                 return '<select id="' . esc_attr(pcrecruiter_esc_form_var($fieldname)) . '" name="' . esc_attr(pcrecruiter_esc_form_var($fieldname)) . '" size="1" class="form-control">' . implode("\r\n", $output) . '</select>';
         }
@@ -1817 +1879 @@
         // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching,PluginCheck.Security.DirectDB.UnescapedDBParameter -- $normalized from esc_sql(), $whereclause built with esc_sql()
         $results = $wpdb->get_results($query);
-
-
         $fieldvalues = isset($_POST[pcrecruiter_esc_form_var($fieldname)]) ? array_map('sanitize_text_field', wp_unslash($_POST[pcrecruiter_esc_form_var($fieldname)])) : [];
 
@@ -1845 +1905 @@
     {
         $output = [];
-
-
         $template_css_url = $baseurl . '/pcrbin/jobboard.aspx?action=templatecss&uid=' . $databaseid . '&ver=' . $hash;
         wp_enqueue_style('pcr-template-css', $template_css_url, array(), $hash);
@@ -1852 +1910 @@
         $template_js_url = $baseurl . '/pcrbin/jobboard.aspx?action=templatejs&uid=' . $databaseid . '&ver=' . $hash;
         wp_enqueue_script('pcr-template-js', $template_js_url, array(), $hash, true);
-
-
         // CSS and JS are now properly enqueued above, no inline tags needed
 
@@ -1863 +1919 @@
         $template = str_ireplace(["&#126;", "~"], ["|", "|"],  $template);
 
-        // Add sort direction arrows
-        // Check POST first, then GET, then fall back to default
+        // Check if radius search is active
+        $isradius = false;
+        if (isset($_POST['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_POST['Position---LatLong']))) > 0) {
+            $isradius = true;
+        } elseif (isset($_GET['Position---LatLong']) && strlen(sanitize_text_field(wp_unslash($_GET['Position---LatLong']))) > 0) {
+            $isradius = true;
+        }
+
+        // Convert bare [[field]] placeholders to clickable sort links
+        // Match [[FieldName]] patterns that are NOT already inside HTML tags
+        $template = preg_replace_callback(
+            '/(?<=>|^)([^<]*)(\[\[([^\]]+)\]\])([^<]*)(?=<|$)/i',
+            function ($matches) use ($isradius) {
+                $before = $matches[1];
+                $fieldPlaceholder = $matches[2];
+                $fieldName = $matches[3];
+                $after = $matches[4];
+                
+                // Check if this is Distance field and no radius search
+                $isDistance = stripos($fieldName, 'Distance') !== false;
+                if ($isDistance && !$isradius) {
+                    // Return as plain text (non-clickable) with disabled styling
+                    $displayName = str_replace(['Position.', 'Positions.', '_'], ['', '', ' '], $fieldName);
+                    return $before . '<span class="sort-disabled" style="opacity: 0.5; cursor: not-allowed;" title="Distance sort requires a location search">' . esc_html($displayName) . '</span>' . $after;
+                }
+                
+                // Check if this is a sortable field
+                $sortableFields = [
+                    'Distance', 'Job_Title', 'Position.Job_Title', 'Date_Posted', 
+                    'Position.Date_Posted', 'PCity', 'Position.City', 'PState', 
+                    'Position.State', 'PCountry', 'Position.Country', 'PCounty',
+                    'Department', 'Positions.Company_Name', 'Position Id'
+                ];
+                
+                $isSortable = false;
+                foreach ($sortableFields as $sortField) {
+                    if (stripos($fieldName, $sortField) !== false) {
+                        $isSortable = true;
+                        break;
+                    }
+                }
+                
+                if ($isSortable) {
+                    // Create clickable sort link
+                    $fullFieldName = '[[' . $fieldName . ']]';
+                    $displayName = str_replace(['Position.', 'Positions.', '_'], ['', '', ' '], $fieldName);
+                    $sortLink = '<a href="#" class="customsortfield" data-sortname="' . 
+                                esc_attr($fullFieldName) . '" data-sortdirection="ASC">' . 
+                                esc_html($displayName) . '</a>';
+                    return $before . $sortLink . $after;
+                }
+                
+                // Return unchanged if not sortable
+                return $matches[0];
+            },
+            $template
+        );
+
+        // Disable existing Distance sort links if no radius search
+        if (!$isradius) {
+            $template = preg_replace(
+                '/(<a[^>]*data-sortname[^>]*["\'].*?Distance.*?["\'][^>]*>)(.*?)<\/a>/i',
+                '<span class="sort-disabled" style="opacity: 0.5; cursor: not-allowed;" title="Distance sort requires a location search">$2</span>',
+                $template
+            );
+        }
+
+        // Determine current sort field (considering sortorigin for radius auto-sort)
         $currentSortField = '';
+        $sortorigin = 'default';
+        
         if (isset($_POST['sortfield']) && $_POST['sortfield'] !== '') {
             $currentSortField = sanitize_text_field(wp_unslash($_POST['sortfield']));
+            $sortorigin = isset($_POST['sortorigin']) ? sanitize_text_field(wp_unslash($_POST['sortorigin'])) : 'default';
         } elseif (isset($_GET['sortfield']) && $_GET['sortfield'] !== '') {
             $currentSortField = sanitize_text_field(wp_unslash($_GET['sortfield']));
-        } else {
+            $sortorigin = isset($_GET['sortorigin']) ? sanitize_text_field(wp_unslash($_GET['sortorigin'])) : 'default';
+        }
+
+        // If no sortfield provided, use default
+        if (empty($currentSortField)) {
             $currentSortField = get_option('global_sort_field', '');
+            $sortorigin = 'default';
+        }
+
+        // Auto-apply Distance sort for radius searches (same logic as draw_search_form)
+        if ($isradius && $sortorigin !== 'user') {
+            if (strpos($currentSortField, '[[Distance]]') === false) {
+                $currentSortField = '[[Distance]] ASC';
+            }
         }
 
@@ -1878 +2015 @@
         $currentDirection = strtoupper($sortInfo['ascdesc'] ?? '');
 
-        // Add sort direction arrows and toggle directions
+        // Add arrows to indicate sort direction
+        // Only show arrow if the field exists in the visible sort options
         if (!empty($currentField)) {
-            // Remove any existing arrows first
-            $template = preg_replace("/\s*[↓↑]\s*/u", "", $template);
-
-            // Determine next direction (toggle)
-            $nextDirection = ($currentDirection === "DESC") ? "ASC" : "DESC";
-            $arrow = ($currentDirection === "DESC") ? " ↓" : " ↑";
-
-            // Find sort links with data-sortname matching current field
-            $template = preg_replace_callback(
-                '/(<a[^>]*data-sortname=["\']' . preg_quote($currentField, '/') . '["\'][^>]*data-sortdirection=["\'])([^"\']*)/i',
-                function ($matches) use ($nextDirection, $arrow) {
-                    // Replace the direction attribute with the toggled direction
-                    return $matches[1] . $nextDirection;
-                },
-                $template
-            );
-
-            // Add arrow to the link text
-            $template = preg_replace(
-                '/(<a[^>]*data-sortname=["\']' . preg_quote($currentField, '/') . '["\'][^>]*>)([^<]*)/i',
-                '$1$2' . $arrow,
-                $template
-            );
+            // Remove any existing arrows first (HTML entities and Unicode)
+            $template = preg_replace('/\s*(&darr;|&uarr;|[\x{2193}\x{2191}])\s*/u', '', $template);
+
+            // Check if the current sort field exists as a clickable link in the template
+            $fieldExistsInTemplate = (strpos($template, 'data-sortname="' . $currentField . '"') !== false) ||
+                                     (strpos($template, "data-sortname='" . $currentField . "'") !== false);
+
+            if ($fieldExistsInTemplate) {
+                // Add appropriate arrow based on current sort direction
+                $arrow = ($currentDirection === 'DESC') ? ' &darr;' : ' &uarr;';
+
+                // Try to find the current field in the template and add arrow using data-sortname
+                $template = preg_replace(
+                    '/(<a[^>]*data-sortname\s*=\s*["\']' . preg_quote($currentField, '/') . '["\'][^>]*>)([^<]*)/i',
+                    '$1$2' . $arrow,
+                    $template
+                );
+            }
+            // If field doesn't exist in template (e.g., Distance sort with no Distance link), no arrow is shown
         }
 
@@ -2102 +2236 @@
     {
         $jobid = get_post_meta($post_id, '[[position.job_id]]', true);
-
-
         // Try both possible cases for databaseid
         $databaseid = get_post_meta($post_id, "[[databaseid]]", true);
-
-
         $baseurl = get_post_meta($post_id, "[[baseurl]]", true);
-
-
         $hash = get_option('global_template_hash', 'any_version');
 
@@ -2136 +2264 @@
 
         try {
-            // Try to parse the date - handle both ISO and US formats
-            $date = false;
-
-            // First try: ISO 8601 format (2025-12-18T15:34:39Z)
-            try {
-                $date = new DateTime($datetime_string, new DateTimeZone('UTC'));
-            } catch (Exception $e) {
-                // Second try: US format with AM/PM (12/18/2025 12:51:18 PM)
-                $date = DateTime::createFromFormat('m/d/Y h:i:s A', $datetime_string, new DateTimeZone('UTC'));
-            }
-
-            if ($date === false) {
-                throw new Exception('Unable to parse date');
-            }
+            // Create DateTime object from the input (assume UTC/GMT)
+            $date = new DateTime($datetime_string, new DateTimeZone('UTC'));
 
             // If no cookie, display as GMT with indicator
@@ -2174 +2290 @@
         }
     }
-    /**
-     * Get the configured date format
-     */
-    private static function get_date_format()
-    {
-        $options = get_option('pcrecruiter_feed_options', array());
-        $date_format = isset($options['date_format']) ? $options['date_format'] : 'wordpress';
-
-        if ($date_format === 'custom') {
-            return isset($options['date_format_custom']) && !empty($options['date_format_custom'])
-                ? $options['date_format_custom']
-                : 'Y-m-d';
-        }
-
-        if ($date_format === 'wordpress') {
-            return get_option('date_format');
-        }
-
-        return $date_format;
-    }
+
     private static function time_ago($datetime, $full = false)
     {
@@ -2513 +2610 @@
             return;
         }
-
-
         if (!empty($job_board_page)) {
             // Get the page ID from URL

pcrecruiter-extensions/trunk/includes/class-schema-mapper.php

@@ -327 +327 @@
             <h1>JobPosting Schema Mapper</h1>
 
-                        <!-- Validation Status -->
+            <!-- Validation Status -->
             <div id="pcr-schema-status" class="pcr-schema-status">
                 <div class="pcr-status-loading">
@@ -334 +334 @@
             </div>
 
-                 <!-- Preview Section -->
+            <!-- Preview Section -->
             <div class="pcr-schema-preview-section">
                 <h2>Schema Preview</h2>
@@ -367 +367 @@
 
             <div class="pcr-schema-intro">
-            <h2>Schema Mapping</h2>    
-            <p>Map your job post fields to <a href="https://schema.org/JobPosting" target="_blank" rel="noopener">schema.org JobPosting</a> properties. Jobs with incomplete required fields will not output schema.</p>
+                <h2>Schema Mapping</h2>
+                <p>Map your job post fields to <a href="https://schema.org/JobPosting" target="_blank" rel="noopener">schema.org JobPosting</a> properties. Jobs with incomplete required fields will not output schema.</p>
                 <p><strong>Source Types:</strong></p>
                 <ul>
@@ -406 +406 @@
             </form>
 
-       
+
         </div>
 <?php
@@ -760 +760 @@
                 $full_key = $prop_key . '.' . $sub_key;
                 $label_prefix = !empty($parent_label) ? $parent_label . ' - ' : '';
-                
+
                 // Recursively call for nested objects
                 if ($sub_property['type'] === 'object' && !empty($sub_property['properties'])) {
@@ -1067 +1067 @@
         // Check if it's HTML with background-image CSS
         if (strpos($logo_value, 'background-image') !== false) {
+            // If the element indicates it's a default logo, treat as empty
+            if (preg_match('/data-default-logo\s*=\s*(["\']?)true\1/i', $logo_value)) {
+                return '';
+            }
+
             // Extract URL from: background-image:url(/pcrbin/logo.exe?_=...)
             if (preg_match('/background-image\s*:\s*url\s*\(\s*([^)]+)\s*\)/i', $logo_value, $matches)) {
@@ -1202 +1207 @@
                 // For description field specifically, clean up HTML
                 if (isset($property['label']) && $property['label'] === 'Job Description') {
+                    // Look for pcr-description-start marker (same logic as build_meta_description)
+                    if (preg_match('/<!--\s*pcr-description-start\s*-->(.*)/is', $value, $matches)) {
+                        // Found comment marker - use everything after it
+                        $value = $matches[1];
+                    } elseif (preg_match("/<div[^>]*data-pcr-description=[\"']start[\"'][^>]*>(.*?)<\/div>/is", $value, $matches)) {
+                        // Found data attribute marker - use content inside the div
+                        $value = $matches[1];
+                    }
+
                     // Remove HTML comments
                     $value = preg_replace('/<!--(.|\s)*?-->/', '', $value);
 
-                    // Remove empty span/div tags
-                    $value = preg_replace('/<(span|div)[^>]*>\s*<\/\1>/', '', $value);
-
-                    // Remove standalone template fragments like "| Location"
-                    $value = preg_replace('/\|\s*Location\s*/', '', $value);
-
-                    // Sanitize HTML (keeps safe tags like p, h2, ul, li, strong, em)
-                    $value = wp_kses_post($value);
+                    // Remove script and style tags completely
+                    $value = preg_replace('/<(script|style)[^>]*>.*?<\/\1>/is', '', $value);
+
+                    // Sanitize HTML - Google Jobs recognizes <p>, <ul>, <li>, <br>
+                    // Also allows header and character tags like <h1>, <strong>, <em> (though not used in formatting)
+                    $allowed_html = array(
+                        'p' => array(),
+                        'br' => array(),
+                        'ul' => array(),
+                        'ol' => array(),
+                        'li' => array(),
+                        'strong' => array(),
+                        'em' => array(),
+                        'b' => array(),
+                        'i' => array(),
+                        'u' => array(),
+                        'h1' => array(),
+                        'h2' => array(),
+                        'h3' => array(),
+                        'h4' => array(),
+                        'h5' => array(),
+                        'h6' => array(),
+                        'a' => array('href' => array()),
+                        'div' => array(),
+                        'span' => array(),
+                    );
+                    $value = wp_kses($value, $allowed_html);
+
+                    // Remove extra whitespace but preserve line breaks
+                    $value = preg_replace('/[ \t]+/', ' ', $value);
+                    $value = preg_replace('/\n\s*\n/', "\n", $value);
                 }
 

pcrecruiter-extensions/trunk/includes/class-seo-enhancements.php

@@ -54 +54 @@
             $conflicts[] = array(
                 'name' => 'Yoast SEO',
-                'config' => 'SEO → Search Appearance → Content Types → Jobs'
+                'config' => 'SEO → Search Appearance → Content Types → Jobs'
             );
         }
@@ -61 +61 @@
             $conflicts[] = array(
                 'name' => 'Rank Math',
-                'config' => 'Rank Math → Titles & Meta → Job Posts'
+                'config' => 'Rank Math → Titles & Meta → Job Posts'
             );
         }
@@ -68 +68 @@
             $conflicts[] = array(
                 'name' => 'Divi',
-                'config' => 'Divi → Theme Options → SEO'
+                'config' => 'Divi → Theme Options → SEO'
             );
         }
@@ -82 +82 @@
             $conflicts[] = array(
                 'name' => 'Avada',
-                'config' => 'Avada → Theme Options → SEO'
+                'config' => 'Avada → Theme Options → SEO'
             );
         }
@@ -89 +89 @@
             $conflicts[] = array(
                 'name' => 'Astra',
-                'config' => 'Customizer → General → Blog / Archive'
+                'config' => 'Customizer → General → Blog / Archive'
             );
         }
@@ -134 +134 @@
     /**
      * Add comprehensive meta tags and Open Graph for job posts
+     * Only outputs when no SEO plugin is handling meta tags
      */
     public static function add_job_meta_tags()
     {
         if (!is_singular('job')) {
+            return;
+        }
+
+        // Skip if Yoast or Rank Math is active - they handle meta tags
+        // and we populate their fields via populate_yoast_meta()
+        if (defined('WPSEO_VERSION') || defined('RANK_MATH_VERSION')) {
             return;
         }
@@ -394 +401 @@
                 // Found comment marker - use everything after it
                 $content = $matches[1];
-            } elseif (preg_match('/<[^>]*data-pcr-description=["\']start["\'][^>]*>(.*?)(?=<\/div>|$)/is', $content, $matches)) {
+            } elseif (preg_match("/<div[^>]*data-pcr-description=[\"']start[\"'][^>]*>(.*?)<\/div>/is", $content, $matches)) {
                 // Found data attribute marker - use content inside the element
                 $content = $matches[1];
@@ -745 +752 @@
         return array();
     }
+
+    /**
+     * Populate Yoast SEO meta fields for job posts
+     * Called after job creation/update
+     * Only populates if fields are empty (preserves manual edits)
+     * 
+     * @param int $job_id The job post ID
+     */
+    /**
+     * Populate Yoast SEO meta fields for job posts
+     * Called after job creation/update
+     * Only populates if fields are empty (preserves manual edits)
+     * 
+     * @param int $job_id The job post ID
+     */
+    /**
+     * Populate Yoast SEO meta fields for job posts
+     * Called after job creation/update via save_post_job hook
+     * Only populates if fields are empty (preserves manual edits)
+     * 
+     * @param int $job_id The job post ID
+     */
+    public static function populate_yoast_meta($job_id)
+    {
+        // Only for job posts
+        if (get_post_type($job_id) !== 'job') {
+            return;
+        }
+
+        // Only if Yoast is active
+        if (!defined('WPSEO_VERSION')) {
+            return;
+        }
+
+        // Build optimized title and description
+        $job_title = get_the_title($job_id);
+        if (empty($job_title)) {
+            $job_title = get_post_meta($job_id, '[[position.job_title]]', true);
+        }
+        
+        $seo_title = self::build_seo_title($job_id, $job_title);
+        $meta_description = self::build_meta_description($job_id);
+
+        // Only populate if Yoast fields are empty (preserves manual edits)
+        $existing_title = get_post_meta($job_id, '_yoast_wpseo_title', true);
+        if (empty($existing_title) && !empty($seo_title)) {
+            update_post_meta($job_id, '_yoast_wpseo_title', $seo_title);
+        }
+
+        $existing_desc = get_post_meta($job_id, '_yoast_wpseo_metadesc', true);
+        if (empty($existing_desc) && !empty($meta_description)) {
+            update_post_meta($job_id, '_yoast_wpseo_metadesc', $meta_description);
+        }
+
+        // Populate OpenGraph fields (Facebook)
+        $existing_og_title = get_post_meta($job_id, '_yoast_wpseo_opengraph-title', true);
+        if (empty($existing_og_title) && !empty($seo_title)) {
+            update_post_meta($job_id, '_yoast_wpseo_opengraph-title', $seo_title);
+        }
+
+        $existing_og_desc = get_post_meta($job_id, '_yoast_wpseo_opengraph-description', true);
+        if (empty($existing_og_desc) && !empty($meta_description)) {
+            update_post_meta($job_id, '_yoast_wpseo_opengraph-description', $meta_description);
+        }
+
+        // Populate Twitter Card fields
+        $existing_twitter_title = get_post_meta($job_id, '_yoast_wpseo_twitter-title', true);
+        if (empty($existing_twitter_title) && !empty($seo_title)) {
+            update_post_meta($job_id, '_yoast_wpseo_twitter-title', $seo_title);
+        }
+
+        $existing_twitter_desc = get_post_meta($job_id, '_yoast_wpseo_twitter-description', true);
+        if (empty($existing_twitter_desc) && !empty($meta_description)) {
+            update_post_meta($job_id, '_yoast_wpseo_twitter-description', $meta_description);
+        }
+
+        // Set OpenGraph image if available
+        $job_image = self::get_job_image($job_id);
+        if (!empty($job_image)) {
+            $existing_og_image = get_post_meta($job_id, '_yoast_wpseo_opengraph-image', true);
+            if (empty($existing_og_image)) {
+                update_post_meta($job_id, '_yoast_wpseo_opengraph-image', $job_image);
+            }
+
+            $existing_twitter_image = get_post_meta($job_id, '_yoast_wpseo_twitter-image', true);
+            if (empty($existing_twitter_image)) {
+                update_post_meta($job_id, '_yoast_wpseo_twitter-image', $job_image);
+            }
+        }
+    }
 }

pcrecruiter-extensions/trunk/includes/class-sitemap-integration.php

@@ -1 +1 @@
 <?php
+
 /**
  * PCRecruiter Sitemap Integration
@@ -7 +8 @@
  * @since 2.0.0
  */
-
 if (!defined('ABSPATH')) {
     exit;
 }
-
 class PCR_Sitemap_Integration
 {
@@ -23 +22 @@
         add_filter('wp_sitemaps_posts_entry', array(__CLASS__, 'filter_wp_sitemap_entry'), 10, 3);
         add_filter('wp_sitemaps_posts_query_args', array(__CLASS__, 'filter_wp_sitemap_query'), 10, 2);
-        
         // Yoast SEO
         add_filter('wpseo_sitemap_entry', array(__CLASS__, 'filter_yoast_sitemap_entry'), 10, 3);
         add_filter('wpseo_exclude_from_sitemap_by_post_ids', array(__CLASS__, 'exclude_internal_jobs_yoast'));
-        
         // RankMath
         add_filter('rank_math/sitemap/entry', array(__CLASS__, 'filter_rankmath_sitemap_entry'), 10, 3);
         add_filter('rank_math/sitemap/exclude_post', array(__CLASS__, 'exclude_internal_jobs_rankmath'), 10, 2);
     }
-
     /**
      * Add job post type to native WordPress sitemap
@@ -46 +42 @@
             return $post_types;
         }
-
         // Check if job post type exists and is registered
         $job_post_type = get_post_type_object('job');
-        
         if (!$job_post_type) {
             return $post_types;
         }
-
         // Use the actual post type object to ensure all properties are correct
         $post_types['job'] = $job_post_type;
-
         return $post_types;
     }
-
     /**
      * Filter WordPress sitemap entries for jobs
@@ -73 +64 @@
             return $entry;
         }
-
         // Exclude internal jobs
         if (self::is_internal_job($post->ID)) {
             return false;
         }
-
         // Set priority, change frequency, and last modified date
         $entry['priority'] = apply_filters('pcrecruiter_sitemap_priority', 0.6, $post->ID);
         $entry['changefreq'] = apply_filters('pcrecruiter_sitemap_changefreq', 'weekly', $post->ID);
         $entry['lastmod'] = get_the_modified_date('c', $post);
-
         return $entry;
     }
-
     /**
      * Filter WordPress sitemap query to exclude internal jobs
@@ -99 +86 @@
             return $args;
         }
-
         // Exclude internal jobs via meta query
+        // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query -- Required for filtering by job status
         if (!isset($args['meta_query'])) {
             $args['meta_query'] = array();
         }
-
         $args['meta_query'][] = array(
             'key' => '[[position.status]]',
@@ -110 +96 @@
             'compare' => '!=',
         );
-
         return $args;
     }
-
     /**
      * Filter Yoast SEO sitemap entries for jobs
@@ -127 +111 @@
             return $url;
         }
-
         // Exclude internal jobs
         if (self::is_internal_job($object->ID)) {
             return false;
         }
-
         // Set priority and change frequency if not manually set
         if (!isset($url['pri']) || $url['pri'] == 0.5) { // Yoast default is 0.5
             $url['pri'] = apply_filters('pcrecruiter_sitemap_priority', 0.6, $object->ID);
         }
-
         if (!isset($url['chf']) || $url['chf'] == 'weekly') {
             $url['chf'] = apply_filters('pcrecruiter_sitemap_changefreq', 'weekly', $object->ID);
         }
-
         // Set last modified date
         $url['mod'] = get_the_modified_date('c', $object);
-
         return $url;
     }
-
     /**
      * Exclude internal jobs from Yoast sitemap by ID
@@ -157 +135 @@
     {
         $internal_jobs = self::get_internal_job_ids();
-        
         if (!empty($internal_jobs)) {
             $excluded_ids = array_merge($excluded_ids, $internal_jobs);
         }
-
         return $excluded_ids;
     }
-
     /**
      * Filter RankMath sitemap entries for jobs
@@ -178 +153 @@
             return $entry;
         }
-
         // Exclude internal jobs
         if (self::is_internal_job($object->ID)) {
             return false;
         }
-
         // Set priority, change frequency, and last modified date
         $entry['priority'] = apply_filters('pcrecruiter_sitemap_priority', 0.6, $object->ID);
         $entry['changefreq'] = apply_filters('pcrecruiter_sitemap_changefreq', 'weekly', $object->ID);
         $entry['lastmod'] = get_the_modified_date('c', $object);
-
         return $entry;
-
-    }
-
+    }
     /**
      * Exclude internal jobs from RankMath sitemap
@@ -205 +175 @@
             return $exclude;
         }
-
         // Exclude if internal job
         if (self::is_internal_job($post->ID)) {
             return true;
         }
-
         return $exclude;
     }
-
     /**
      * Check if a job is internal-only
@@ -225 +192 @@
         return strtolower($status) === 'internalonly';
     }
-
     /**
      * Get all internal job IDs
@@ -239 +205 @@
             return $cached;
         }
-
         // Query for internal jobs
+        // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query -- Required for filtering internal jobs
         $args = array(
             'post_type' => 'job',
@@ -253 +219 @@
             ),
         );
-
         $internal_ids = get_posts($args);
-
         // Cache for 1 hour
         set_transient('pcr_internal_job_ids', $internal_ids, HOUR_IN_SECONDS);
-
         return $internal_ids;
     }
-
     /**
      * Clear internal job IDs cache when jobs are updated
@@ -270 +232 @@
         delete_transient('pcr_internal_job_ids');
     }
-
     /**
      * Get debug information about sitemap configuration
@@ -280 +241 @@
     {
         $info = array();
-
         // Check if job post type is registered
         $job_post_type = get_post_type_object('job');
         $info['post_type_registered'] = !empty($job_post_type);
-        
         if ($job_post_type) {
             $info['post_type_public'] = $job_post_type->public;
@@ -290 +249 @@
             $info['post_type_has_archive'] = $job_post_type->has_archive;
         }
-
         // Check if job sync is configured
         $options = get_option('pcrecruiter_feed_options', array());
         $info['sync_configured'] = !empty($options['jobboard_security_key']);
-
         // Count jobs
         $info['total_jobs'] = wp_count_posts('job')->publish ?? 0;
         $info['internal_jobs'] = count(self::get_internal_job_ids());
-
         // Check which sitemap plugins are active
         $info['wp_core_sitemaps'] = function_exists('wp_sitemaps_get_server');
         $info['yoast_active'] = defined('WPSEO_VERSION');
         $info['rankmath_active'] = defined('RANK_MATH_VERSION');
-
         // Check if sitemaps are enabled
         if (function_exists('get_option')) {
             $info['wp_sitemaps_enabled'] = (bool) get_option('blog_public');
         }
-
         return $info;
     }

pcrecruiter-extensions/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 2.0.4
+Stable tag: 2.0.5
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -123 +123 @@
 
 == Changelog ==
+= 2.0.5 - 2026-01-02 =
+* Improved handling of company and position logos
+* Radius search sort by distance
+* Yoast fields generation
+* Exempt PCR frames/js from interference by cache and optimization defer/lazyload plugins
+* Performance optimizations
 
-= 2.0.4 - 2024-19-10 =
+= 2.0.4 - 2025-12-19 =
 * Improved handling of v1 URLs
 * Performance optimizations
@@ -130 +136 @@
 * Zipcode field handler
 
-= 2.0.3 - 2024-18-10 =
+= 2.0.3 - 2025-12-18 =
 * Additional checks and safeguards for pre-existing custom post type
 * Enhanced meta Description tagging
@@ -138 +144 @@
 * Multi-check search fields fix
 
-= 2.0.2 - 2024-16-10 =
+= 2.0.2 - 2025-12-16 =
 * Accomodate other /job/ plugins in iframe-only mode
 
-= 2.0.1 - 2024-16-10 =
+= 2.0.1 - 2025-12-16 =
 * Share widget width adjustment
 
-= 2.0.0 - 2024-12-10 =
+= 2.0.0 - 2025-12-10 =
 * Initial public release of full sync mode
 * Added block bindings support