Changeset 3400600

Timestamp:

11/21/2025 04:46:28 PM (7 weeks ago)

Author:

arothman

Message:

Refined canonical tag removal code.

Location:

pcrecruiter-extensions/trunk

Files:

• PCRecruiter-Extensions.php (modified) (15 diffs)
• readme.txt (modified) (1 diff)

pcrecruiter-extensions/trunk/PCRecruiter-Extensions.php

@@ -4 +4 @@
 Plugin URI: https://www.pcrecruiter.net
 Description: Embeds PCRecruiter forms and iframe content via shortcodes, and facilitiates RSS/XML Job Feeds.
-Version: 1.4.33
+Version: 1.4.37
 Author: Main Sequence Technology, Inc.
 Author URI: https://www.pcrecruiter.net
@@ -18 +18 @@
     wp_register_script( 'pcr-iframe', 'https://www2.pcrecruiter.net/pcrimg/inc/pcrframehost.js', false, false, false);
     wp_enqueue_script( 'pcr-iframe' );
+    wp_enqueue_style( 'pcr-styles', 'https://www2.pcrecruiter.net/pcrimg/inc/pcrframehost.css', array(), null );
 }
 add_action( 'wp_enqueue_scripts', 'pcr_assets' );
@@ -44 +45 @@
     $initialheight = intval($a['initialheight']);
     $background = preg_match('/^#[a-fA-F0-9]{3,6}$|^transparent$/', $a['background']) ? $a['background'] : 'transparent';
-    $pcrframecss = '<link rel="stylesheet" href="https://www2.pcrecruiter.net/pcrimg/inc/pcrframehost.css">';
-
 
     // Modify the URL when needed
@@ -95 +94 @@
     $doc->appendChild($iframe);
 
-    return "<!-- Start PCRecruiter WP 1.4.33-->"
-        . $pcrframecss
+    return "<!-- Start PCRecruiter WP 1.4.36-->"
         . $doc->saveHTML()
         . "<!-- End PCRecruiter WP -->";
@@ -104 +102 @@
 
 
-/* Remove Canonical Link */
-remove_action('wp_head', 'rel_canonical');
-add_filter( 'wpseo_canonical', '__return_false' );
+/**
+ * Remove canonical links for iframe job board pages only
+ * Prevents search engines from consolidating ?recordid= variations into one page
+ */
+function pcrecruiter_remove_canonical_for_iframe() {
+    global $post;
+    
+    if (!is_a($post, 'WP_Post')) {
+        return;
+    }
+    
+    // Only proceed if this page has the PCRecruiter shortcode
+    if (!has_shortcode($post->post_content, 'PCRecruiter')) {
+        return;
+    }
+    
+    // Check if it's an iframe installation (not jobmanager)
+    $pattern = get_shortcode_regex(['PCRecruiter']);
+    if (preg_match_all('/' . $pattern . '/s', $post->post_content, $matches)) {
+        foreach ($matches[3] as $attrs) {
+            // If this is jobmanager (Full Sync), keep canonicals
+            if (stripos($attrs, 'jobmanager') !== false || stripos($attrs, 'internaljobmanager') !== false) {
+                return;
+            }
+        }
+    }
+    
+    // This is an iframe page - remove canonical to allow search engines
+    // to index individual ?recordid= URLs as separate pages
+    remove_action('wp_head', 'rel_canonical');
+    add_filter('wpseo_canonical', '__return_false');
+}
+add_action('wp', 'pcrecruiter_remove_canonical_for_iframe');
 
 /*
@@ -139 +167 @@
 add_action('pcr_feed', 'pcr_feed_activation');
 
-function pcr_feed_func(){
+// Register hook for admin notices
+add_action('admin_notices', 'pcr_admin_notices');
+
+/**
+ * Display admin notices for PCRecruiter feed status
+ */
+function pcr_admin_notices() {
+    // Only show on the PCRecruiter settings page
+    $screen = get_current_screen();
+    if ($screen->id !== 'settings_page_pcr-ext-setting-admin') {
+        return;
+    }
+    
+    // Check if we have a feed status to display
+    $feed_status = get_option('pcr_feed_status');
+    if (!$feed_status) {
+        return;
+    }
+    
+    // Format the time for display
+    $status_time = !empty($feed_status['time']) ? 
+        ' (' . human_time_diff(strtotime($feed_status['time']), current_time('timestamp')) . ' ago)' : '';
+        
+    // Display success or error message
+    if ($feed_status['success']) {
+        echo '<div class="notice notice-success is-dismissible">';
+        echo '<p><strong>Feed:</strong> ' . esc_html($feed_status['message']) . esc_html($status_time) . '</p>';
+        echo '</div>';
+    } else {
+        echo '<div class="notice notice-error is-dismissible">';
+        echo '<p><strong>Feed Error:</strong> ' . esc_html($feed_status['message']) . esc_html($status_time) . '</p>';
+        echo '</div>';
+    }
+}
+
+
+function pcr_feed_func() {
     // do this via cron
     $pcr_feed_options = get_option('pcr_feed_options', array());
-    $pcr_customfields = str_replace(' ', '%20', $pcr_feed_options['custom_fields']  ?? '');
-    $pcr_standardfields = str_replace(' ', '%20', $pcr_feed_options['standard_fields']  ?? '');
-    $pcr_id_number = $pcr_feed_options['id_number'] ?? '';
-    $pcr_activation = $pcr_feed_options['activation'] ?? '';
+    $pcr_customfields = str_replace(' ', '%20', $pcr_feed_options['custom_fields'] ?? '');
+    $pcr_standardfields = str_replace(' ', '%20', $pcr_feed_options['standard_fields'] ?? '');
+    $pcr_id_number = $pcr_feed_options['id_number'] ?? '';
+    $pcr_activation = $pcr_feed_options['activation'] ?? '';
     $url = "https://host.pcrecruiter.net/pcrbin/feeds.aspx?action=customfeed&query=". $pcr_feed_options['query'] ."&xtransform=RSS2&SessionId=" . $pcr_id_number . "&FieldsPlus=" . $pcr_standardfields . "&custom=" . $pcr_customfields . "&mode=" . $pcr_feed_options['mode'];
 
-
-    if($pcr_activation){
-
-        // JSON
-        //$xml = simplexml_load_string($url, null, LIBXML_NOCDATA, "http://www.pcrecruiter.net");
-        $buffer = file_get_contents($url);
+    if($pcr_activation) {
+        // First, try to safely get the content from the URL
+        $buffer = @file_get_contents($url);
+        
+        // Check if we actually got content
+        if ($buffer === false) {
+            // Log the error and store the status message
+            $error_message = 'Failed to fetch XML feed. Please check your PCRecruiter SessionID and internet connection.';
+            error_log('PCRecruiter Extensions: ' . $error_message);
+            update_option('pcr_feed_status', array(
+                'success' => false,
+                'message' => $error_message,
+                'time' => current_time('mysql')
+            ));
+            return false;
+        }
+        
+        // Clean the buffer
         $buffer = str_replace(array("\n", "\r", "\t"), '', $buffer);
-        $xml = simplexml_load_string($buffer, null, LIBXML_NOCDATA);
-        $namespaces = $xml->getDocNamespaces(true);
-
-       //var_dump($namespaces);
-
-        $array = [];
-        foreach ($namespaces as $namespace) {
-            if (is_object($namespace) && property_exists($namespace, 'key')) {
-                $xml = simplexml_load_string($buffer, null, LIBXML_NOCDATA, $namespace->key);
-                $array = array_merge_recursive($array, (array) $xml);
-            } else {
-                // Handle the case where $namespace is not a valid object with a 'key' property
-                // For example: log an error or skip this iteration
-            }
-        }
-
-        $json = json_encode($array, JSON_PRETTY_PRINT);
-
-        //$xml = file_get_contents($url);
-        //$xml = str_replace('<pcr:', '<', $xml);
-        //$xml = simplexml_load_string($xml, null, LIBXML_NOCDATA);
-        //
-        //$xml->channel->item->children('pcr', true);
-        //$xml->registerXPathNamespace('pcr', 'http://www.pcrecruiter.net');
-        // use XPath to get all pcr:* nodes
-        /*
-        $items = $xml->xpath('//pcr:*');
-        foreach($items as $item) {
-            $pcrItems = $pcrItems . $item;
-        }
-        */
-        //
-        //$xml->createElementNS('//pcr:*', '//*'); // no prefix
-        //$json = json_encode($xml, JSON_PRETTY_PRINT);
-        //$array = json_decode($json,TRUE);
-        //$fileContents = str_replace(array("\n", "\r", "\t"), '', $fileContents);
-        //$fileContents = trim(str_replace('"', "'", $fileContents));
-        //$simpleXml = simplexml_load_string($fileContents);
-        //$json_data = json_encode($fileContents);
-        file_put_contents(WP_CONTENT_DIR . '/uploads/pcrjobfeed.json', $json);
-
-        if (!copy($url, WP_CONTENT_DIR . "/uploads/pcrjobfeed.xml")) {
-
-        } else {
-
-        }
-    }
+        
+        // Try to load the XML with error suppression
+        libxml_use_internal_errors(true); // Suppress XML errors
+        $xml = @simplexml_load_string($buffer, null, LIBXML_NOCDATA);
+        
+        // Check if XML loading was successful
+        if ($xml === false) {
+            $errors = libxml_get_errors();
+            libxml_clear_errors();
+            
+            $error_message = 'XML load from '.$xml.' failed. Please verify your PCR SessionID and that the feed data is valid.';
+            if (count($errors) > 0) {
+                $error_message .= ' Error: ' . $errors[0]->message;
+            }
+            
+            // Log the error and store the status message
+            error_log('PCRecruiter Extensions: ' . $error_message);
+            update_option('pcr_feed_status', array(
+                'success' => false,
+                'message' => $error_message,
+                'time' => current_time('mysql')
+            ));
+            return false;
+        }
+        
+        // Try to get namespaces safely
+        try {
+            $namespaces = $xml->getDocNamespaces(true);
+            
+            $array = [];
+            if (!empty($namespaces)) {
+                foreach ($namespaces as $prefix => $namespace) {
+                    if (is_string($namespace)) {
+                        $nsXml = @simplexml_load_string($buffer, null, LIBXML_NOCDATA, $prefix);
+                        if ($nsXml !== false) {
+                            $array = array_merge_recursive($array, (array) $nsXml);
+                        }
+                    }
+                }
+            } else {
+                // If no namespaces, just use the base XML
+                $array = (array) $xml;
+            }
+            
+            // Encode to JSON
+            $json = json_encode($array, JSON_PRETTY_PRINT);
+            if ($json === false) {
+                $error_message = 'JSON encoding failed: ' . json_last_error_msg();
+                error_log('PCRecruiter Extensions: ' . $error_message);
+                update_option('pcr_feed_status', array(
+                    'success' => false,
+                    'message' => $error_message,
+                    'time' => current_time('mysql')
+                ));
+                return false;
+            }
+            
+            // Save the files
+            $json_result = @file_put_contents(WP_CONTENT_DIR . '/uploads/pcrjobfeed.json', $json);
+            $xml_result = @copy($url, WP_CONTENT_DIR . "/uploads/pcrjobfeed.xml");
+            
+            if ($json_result === false || $xml_result === false) {
+                $error_message = 'Failed to save feed file. Please check folder permissions.';
+                error_log('PCRecruiter Extensions: ' . $error_message);
+                update_option('pcr_feed_status', array(
+                    'success' => false,
+                    'message' => $error_message,
+                    'time' => current_time('mysql')
+                ));
+                return false;
+            }
+            
+            // Update status with success message
+            update_option('pcr_feed_status', array(
+                'success' => true,
+                'message' => 'Feed successfully updated.',
+                'time' => current_time('mysql')
+            ));
+            
+            return true;
+            
+        } catch (Exception $e) {
+            $error_message = 'Exception occurred: ' . $e->getMessage();
+            error_log('PCRecruiter Extensions: ' . $error_message);
+            update_option('pcr_feed_status', array(
+                'success' => false,
+                'message' => $error_message,
+                'time' => current_time('mysql')
+            ));
+            return false;
+        }
+    }
+    
+    return true;
 }
 
@@ -281 +404 @@
         if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
             /* translators: 1: The name of the PHP constant that is set. */
-            return new WP_Error( 'cron_info', sprintf( __( 'The %s constant is set to true. WP-Cron spawning is disabled.', 'wp-cron' ), 'DISABLE_WP_CRON' ) );
+            return new WP_Error( 'cron_info', sprintf( __( 'The %s constant is set to true. WP-Cron spawning is disabled.', 'pcrecruiter-extensions' ), 'DISABLE_WP_CRON' ) );
         }
 
         if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
             /* translators: 1: The name of the PHP constant that is set. */
-            return new WP_Error( 'cron_info', sprintf( __( 'The %s constant is set to true.', 'wp-cron' ), 'ALTERNATE_WP_CRON' ) );
+            return new WP_Error( 'cron_info', sprintf( __( 'The %s constant is set to true.', 'pcrecruiter-extensions' ), 'ALTERNATE_WP_CRON' ) );
         }
 
@@ -317 +440 @@
             return new WP_Error( 'unexpected_http_response_code', sprintf(
                 /* translators: 1: The HTTP response code. */
-                __( 'Unexpected HTTP response code: %s', 'wp-cron' ),
+                __( 'Unexpected HTTP response code: %s', 'pcrecruiter-extensions' ),
                 intval( wp_remote_retrieve_response_code( $result ) )
             ) );
@@ -347 +470 @@
                         printf(
                             /* translators: 1: Error message text. */
-                            esc_html__( 'There was a problem with your cron configuration. The cron events on your site may not work. The problem was: %s', 'wp-cron' ),
+                            esc_html__( 'There was a problem with your cron configuration. The cron events on your site may not work. The problem was: %s', 'pcrecruiter-extensions' ),
                             '<br><strong>' . esc_html( $status->get_error_message() ) . '</strong>'
                         );
@@ -361 +484 @@
      * Register and add settings
      */
+
+
+    /**
+     * Sanitize each setting field as needed
+     *
+     * @param array $input Contains all settings fields as array keys
+     */
+    public function sanitize($input)
+{
+    $new_input = array();
+
+    // Activation should be a boolean
+    if (isset($input['activation'])) {
+        $new_input['activation'] = (bool)($input['activation']);
+    }
+
+    // Frequency should be one of the predefined options
+    if (isset($input['frequency'])) {
+        $allowed_frequencies = array('daily', 'hourly', 'twicedaily');
+        $new_input['frequency'] = in_array($input['frequency'], $allowed_frequencies) 
+            ? $input['frequency'] 
+            : 'daily'; // Default to daily if invalid
+    }
+
+    // ID number should be sanitized as text field
+    if (isset($input['id_number'])) {
+        $new_input['id_number'] = sanitize_text_field($input['id_number']);
+    }
+
+    // Standard fields should be sanitized as text
+    if (isset($input['standard_fields'])) {
+        $new_input['standard_fields'] = sanitize_text_field($input['standard_fields']);
+    }
+
+    // Custom fields should be sanitized as text
+    if (isset($input['custom_fields'])) {
+        $new_input['custom_fields'] = sanitize_text_field($input['custom_fields']);
+    }
+
+    if (isset($input['query'])) {
+        // Expanded character set to handle all PCRecruiter query parameters safely
+        $new_input['query'] = preg_replace('/[^\w\s%\(\)\=\-\'\"\.\_\+\!\*\,\;\:\[\]\{\}\<\>\?\/\&\|]+/', '', $input['query']);
+    }
+
+    // Mode should be either 'job' or 'apply'
+    if (isset($input['mode'])) {
+        $new_input['mode'] = in_array($input['mode'], array('job', 'apply')) 
+            ? $input['mode'] 
+            : 'job'; // Default to job if invalid
+    }
+    
+    // If activation is enabled, check the feed immediately
+    if (isset($new_input['activation']) && $new_input['activation']) {
+        // Schedule a one-time event to check the feed after settings are saved
+        wp_schedule_single_event(time() + 2, 'pcr_check_feed_once');
+    }
+
+    return $new_input;
+}
+
     public function page_init()
     {
@@ -434 +617 @@
     }
 
-    /**
-     * Sanitize each setting field as needed
-     *
-     * @param array $input Contains all settings fields as array keys
-     */
-    public function sanitize( $input )
-    {
-        $new_input = array();
-
-
-        if( isset( $input['activation'] ) )
-            $new_input['activation'] = sanitize_text_field( $input['activation'] );
-
-        if( isset( $input['frequency'] ) )
-            $new_input['frequency'] = sanitize_text_field( $input['frequency'] );
-
-        if( isset( $input['id_number'] ) )
-            $new_input['id_number'] = $input['id_number'];
-
-        if( isset( $input['standard_fields'] ) )
-            $new_input['standard_fields'] = sanitize_text_field( $input['standard_fields'] );
-
-        if( isset( $input['custom_fields'] ) )
-            $new_input['custom_fields'] = sanitize_text_field( $input['custom_fields'] );
-
-        if( isset( $input['query'] ) )
-            $new_input['query'] = $input['query'];
-
-        if( isset( $input['mode'] ) )
-            $new_input['mode'] = $input['mode'];
-
-        return $new_input;
-    }
 
     /**
@@ -473 +623 @@
     public function print_section_info()
     {
-        echo '<p>When enabled, this feature will duplicate PCRecruiter\'s dynamic RSS feed as a static file at <a target="_blank" href="'. esc_url( site_url() ) .'/wp-content/uploads/pcrjobfeed.xml">'. esc_url( site_url() ) .'/wp-content/uploads/pcrjobfeed.xml</a>. You may use this data as a source for plugins and other third-party feed utilities.</p>';
+        echo '<p style="font-size:1.25em;"><strong style="text-transform:uppercase">NOTE: These settings are NOT involved in typical PCR Job Board implementations.</strong></p><p style="font-size:1em;">When this optional function is enabled, the plugin will duplicate PCR\'s dynamic RSS feed as a static file at <a target="_blank" href="'. esc_url( site_url() ) .'/wp-content/uploads/pcrjobfeed.xml">'. esc_url( site_url() ) .'/wp-content/uploads/pcrjobfeed.xml</a>. You may use this data as a source for plugins and other third-party feed utilities.</p>';
          // Check to see if "Store Local Feed" is active. If it is, show the manual save button
                 if($this->options['activation'] ?? false){
@@ -479 +629 @@
                     $fname = WP_CONTENT_DIR . "/uploads/".$filename;
                     if (file_exists($fname)) {
-                        $d = date ("F d Y H:i:s", filectime($fname));
+                        $d = gmdate("F d Y H:i:s", filectime($fname));
                         echo "<em style=\"font-weight:bold\">" . esc_html( $filename ) . " last updated: " . esc_html( $d ) . " (UTC).</em>";
                     } else {
@@ -515 +665 @@
     {
         printf(
-            '<input type="text" id="id_number" name="pcr_feed_options[id_number]" value="%s" size="60" />',
+            '<input type="text" id="id_number" name="pcr_feed_options[id_number]" value="%s" size="60" placeholder="Please contact PCR support for your unique session-id value." />',
             isset( $this->options['id_number'] ) ? esc_attr( $this->options['id_number']) : ''
         );
@@ -573 +723 @@
 
 /* Begin update cron schedule if frequency changes */
-function update_cron() {
-     register_setting('pcr_ext_option_group', 'pcr_feed_options');
-}
-add_action('admin_init', 'update_cron');
 
 function do_after_update($old, $new) {

pcrecruiter-extensions/trunk/readme.txt

@@ -3 +3 @@
 Tags: Recruiting, Staffing, Applicant Tracking
 Requires at least: 3.0
-Tested up to: 6.7.1
-Stable tag: trunk
+Tested up to: 6.8
+Stable tag: 1.4.37
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
+Text Domain: pcrecruiter-extensions
 
 PCR Job Board iframe embed, PCR Custom Form scripts, and PCR RSS download handler. Note: This plugin does not interact with the WordPress database.