Changeset 3333340

Timestamp:

07/24/2025 07:51:56 AM (7 months ago)

Author:

ircf

Message:

1.46 : Fixed sanitize url bug. Added filters to get_single, get_single_user.

Location:

feed2post-ircf/trunk

Files:

• README.txt (modified) (2 diffs)
• feed2post.php (modified) (2 diffs)
• includes/feed2post-feed.php (modified) (12 diffs)

feed2post-ircf/trunk/README.txt

@@ -30 +30 @@
 - LinkedIn : LinkedIn Client ID, LinkedIn Client key
 - Google Reviews (experimental) : Google Place ID, Google Place API key
+- Infolocale / Ouest-France : Client ID, Client secret
 
 = FREE VERSION : =
@@ -120 +121 @@
 == Changelog ==
 
+= 1.46 =
+Fixed sanitize url bug.
+Added filters to get_single, get_single_user.
+
 = 1.45 =
 Added filters to http methods.

feed2post-ircf/trunk/feed2post.php

@@ -3 +3 @@
  * Plugin Name: Feed2Post IRCF
  * Plugin URI: https://ircf.fr
- * Description: Import CSV, XLS, XML, RSS, JSON, SQL, Open AI Chat GPT, Google Reviews, Facebook, LinkedIn, AC3, SIRTAQUI and many more feed types
- * Version: 1.45
+ * Description: Import CSV, XLS, XML, RSS, JSON, SQL, Open AI Chat GPT, Google Reviews, Facebook, LinkedIn, AC3, Sirtaqui/Tourinsoft, Infolocale/Ouest-France and many more feed types
+ * Version: 1.46
  * Author: IRCF
  * Author URI: https://ircf.fr/
@@ -662 +662 @@
   if (isset($_POST['feed_options']) && is_array($_POST['feed_options'])){
     foreach ( $feed->get_options_fields() as $name => $field ) {
-      if (strpos($field['template'], 'textarea') !== false){
+      if (strpos($name, 'url') !== false){
+        $value = sanitize_url($_POST['feed_options'][$name] ?? '');
+      }elseif (strpos($field['template'], 'textarea') !== false){
         $value = sanitize_textarea_field($_POST['feed_options'][$name] ?? '');
       }else{

feed2post-ircf/trunk/includes/feed2post-feed.php

@@ -1 +1 @@
 <?php
 abstract class Feed2Post_Feed{
+
+  const DEFAULT_POST_ID_META = 'post_id';
 
   static private $instances = array();
@@ -78 +80 @@
     $this->posts_updated_at_end = $this->get_meta('posts_updated_at_end');
     $this->post_id_field = $this->get_option('post_id_field');
-    // TODO $this->post_date_field = $this->get_option('post_date_field');
+    $this->post_id_meta = $this->get_option('post_id_meta');
     $this->multiple_values_separator = $this->get_option('multiple_values_separator');
     $this->style = $this->get_meta('style');
@@ -106 +108 @@
     $result = array_merge(array(
       'post_id_match' => true,
+      'post_id_meta' => self::DEFAULT_POST_ID_META,
     ), feed2post_default_options());
     return $result;
@@ -116 +119 @@
       'post_id_match' => array('label' => __('Match and update posts', 'feed2post'), 'description' => __('If enabled, will make a query to find and update each post. You can disable this for faster initial or unique import. It will always be enabled for automatic imports.', 'feed2post'), 'template' => '<input type="checkbox" name="%s" value="1" %s>'),
       'post_id_field' => array('label' => __('ID Field', 'feed2post'), 'description' => __('Required, name of the identifier field in feed (for updates)', 'feed2post'), 'template' => '<input type="text" name="%s" value="%s"  size="30" required>'),
-      // TODO 'post_id_meta' => array('label' => __('ID Meta', 'feed2post'), 'description' => __('Required, name of the identifier field in meta table (for updates)', 'feed2post'), 'template' => '<input type="text" name="%s" value="%s"  size="30" required>'),
+      // TODO ? 'post_id_meta' => array('label' => __('ID Meta', 'feed2post'), 'description' => __('Required, name of the identifier field in meta table (for updates)', 'feed2post'), 'template' => '<input type="text" name="%s" value="%s"  size="30" required>'),
       'lines_start' => array('label' => __('Start at line', 'feed2post'), 'description' => __('Optional, skip N lines before importing (0 or empty to start from first line)', 'feed2post'), 'template' => '<input type="number" name="%s" value="%s"  size="30">'),
       'lines_length' => array('label' => __('Number of lines to import', 'feed2post'), 'description' => __('Optional, import N lines (0 or empty to import all lines)', 'feed2post'), 'template' => '<input type="number" name="%s" value="%s"  size="30">'),
@@ -306 +309 @@
     if ($this->post_type == 'user') return $this->update_single_user($result);
     //feed2post_logger()->debug('Feed2Post_Feed::update_single : data = ' . print_r($result, true));
-    $posts = null;
+    $post = null;
     if ($this->get_option('post_id_match') || $this->get_option('crontab_enabled') > 0){
-      // Find post by post_id_field for updates
-      if (!isset($result[$this->post_id_field])){
-        $error_msg = sprintf(__('Missing ID field : %s', 'feed2post'), esc_html($this->post_id_field));
-        throw new Exception($error_msg);
-      }
-      $posts = get_posts(array(
-        'post_type' => $this->post_type,
-        'meta_key' => 'post_id',
-        'meta_value' => (string) $result[$this->post_id_field],
-        'numberposts' => 1,
-      ));
+      $post = $this->get_single($result);
+      if ($post) $post = get_object_vars($post);
     }
     // Initialize post data
-    if ($posts){
-      $post = get_object_vars($posts[0]);
+    if (isset($post)){
       $is_new = false;
     }else{
@@ -337 +330 @@
     // Set default post fields
     $post['meta_input'] = array(
-      'post_id' => (string) $result[$this->post_id_field],
+      $this->post_id_meta => (string) $result[$this->post_id_field],
       'feed_id' => $this->post_id,
       'feed_updated_at' => current_time('timestamp'),
@@ -360 +353 @@
     }
     // Insert or update post
-    $post = apply_filters('feed2post_before_post_update', $post, $result);
+    $post = apply_filters('feed2post_before_post_update', $post, $result, $this);
     feed2post_logger()->debug('Feed2Post_Feed::update_single : post = ' . print_r($post, true));
     $post_id = wp_insert_post($post, true, false);
@@ -370 +363 @@
     $this->update_single_taxonomies($post_id, $result, $is_new);
     $this->update_single_medias($post_id, $result);
-    do_action('feed2post_after_post_update', $post_id, $post, $result);
+    do_action('feed2post_after_post_update', $post_id, $post, $result, $this);
     return 1;
+  }
+
+  /**
+   * Find post by ID field ID Meta for update
+   */
+  function get_single($result){
+    if (!isset($result[$this->post_id_field])){
+      $error_msg = sprintf(__('Missing ID field : %s', 'feed2post'), esc_html($this->post_id_field));
+      throw new Exception($error_msg);
+    }
+    if (!isset($this->post_id_meta) || empty($this->post_id_meta)){
+      $error_msg = sprintf(__('Missing ID meta : %s', 'feed2post'));
+      throw new Exception($error_msg);
+    }
+    $opts = array(
+      'post_type' => $this->post_type,
+      'meta_key' => $this->post_id_meta,
+      'meta_value' => (string) $result[$this->post_id_field],
+      'numberposts' => 1,
+    );
+    $opts = apply_filters('feed2post_pre_get_single', $opts, $result, $this);
+    $posts = get_posts($opts);
+    $post = $posts ? $posts[0] : null;
+    $post = apply_filters('feed2post_post_get_single', $post, $result, $this);
+    return $post;
   }
 
@@ -434 +452 @@
         }
         // Create or update media
-        $media = apply_filters('feed2post_before_media_update', $media, $post_id);
+        $media = apply_filters('feed2post_before_media_update', $media, $post_id, $this);
         if (empty($media)) continue; // Skip empty urls
         feed2post_logger()->debug('Feed2Post_Feed::update_single_medias : media = ' . $media);
@@ -471 +489 @@
 
   function update_single_user($result){
-    $user_id_field = null;
-    foreach($this->fields as $name => $field){
-      if ($field['mapping'] == 'user_login'){
-        $user_id_field = $name;
-        break;
-      }
-    }
-    if (!isset($user_id_field)){
-      $error_msg = sprintf(__('Missing ID field : %s', 'feed2post'), $user_id_field);
-      feed2post_logger()->error('Feed2Post_Feed::update_single_user : ' . $error_msg);
-      throw new Exception($error_msg);
-    }
-    $wp_user = get_user_by('login', sanitize_user($result[$user_id_field], true));
+    $wp_user = $this->get_single_user($result);
     $is_new = ($wp_user == false);
     $user = array();
@@ -509 +515 @@
     if ($is_new && !isset($user['user_pass'])) $user['user_pass'] = wp_generate_password(32, true, true);
     if (!$is_new) $user['user_pass'] = wp_hash_password( $user['user_pass'] );
-    $user = apply_filters('feed2post_before_user_update', $user, $result);
+    $user = apply_filters('feed2post_before_user_update', $user, $result, $this);
     feed2post_logger()->debug('Feed2Post_Feed::update_single_user : user = '.print_r($user, true));
     $user_id = wp_insert_user($user);
@@ -518 +524 @@
     }
     return 1;
+  }
+
+  /**
+   * Find single user for update
+   */
+  function get_single_user($result){
+    $user_id_field = null;
+    foreach($this->fields as $name => $field){
+      if ($field['mapping'] == 'user_login'){
+        $user_id_field = $name;
+        break;
+      }
+    }
+    if (!isset($user_id_field)){
+      $error_msg = sprintf(__('Missing ID field : %s', 'feed2post'), $user_id_field);
+      feed2post_logger()->error('Feed2Post_Feed::update_single_user : ' . $error_msg);
+      throw new Exception($error_msg);
+    }
+    // TODO $opts = apply_filters('feed2post_pre_get_single_user', $opts, $result, $this);
+    $wp_user = get_user_by('login', sanitize_user($result[$user_id_field], true));
+    $wp_user = apply_filters('feed2post_post_get_single_user', $post, $result, $this);
+    return $wp_user;
   }