Merge pull request #144 from RRZE-Webteam/dev

2.1.7

Author: thenickless

README.md

@@ -5,7 +5,7 @@ Tags: shorturl, url shortener, redirect, link management
 Requires at least: 6.4
 Tested up to: 6.6
 Requires PHP: 8.2
-Stable tag: 2.1.5
+Stable tag: 2.1.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Author: RRZE Webteam

includes/Settings.php

@@ -27,45 +27,51 @@ public function add_options_page()
         );
     }
 
+
     public function update_idm_callback()
     {
         // Check if AJAX request to update allow_uri or allow_get
         check_ajax_referer('update_shorturl_idm_nonce', '_ajax_nonce');
 
-        global $wpdb;
-
         // Validate and sanitize input
         if (!isset($_POST['id']) || !isset($_POST['field'])) {
             wp_send_json_error('Invalid request');
             return;
         }
 
         $id = intval($_POST['id']);
-        $allowed_fields = ['allow_uri', 'allow_get'];  // List of valid fields
+        $allowed_fields = ['allow_uri', 'allow_get', 'allow_utm'];  // List of valid fields
         $field = sanitize_text_field(wp_unslash($_POST['field']));
 
         if (!in_array($field, $allowed_fields)) {
             wp_send_json_error('Invalid field');
             return;
         }
 
+        // Convert the value to an integer 1 or 0 based on the input
         $value = isset($_POST['value']) && $_POST['value'] === 'true' ? 1 : 0;
 
-        // Update the allow_uri or allow_get field
-        $wpdb->update(
-            $wpdb->prefix . 'shorturl_idms',
-            array($field => $value),
-            array('id' => $id),
-            array('%d'),
-            array('%d')
-        );
+        // Check if the post with the given ID exists and is of the correct type
+        if (get_post_type($id) !== 'shorturl_idm') {
+            wp_send_json_error('Invalid post ID or post type');
+            return;
+        }
 
-        // Return success response
-        wp_send_json_success();
+        // Update the corresponding meta field for the Custom Post Type
+        $result = update_post_meta($id, $field, $value);
+
+        // Check if the update was successful and return the appropriate response
+        if (false === $result) {
+            wp_send_json_error('Meta update failed');
+        } else {
+            wp_send_json_success(array(
+                'message' => 'Field updated successfully',
+                'updated_field' => $field,
+                'new_value' => $value,
+            ));
+        }
     }
 
-
-
     // Register settings sections and fields
     public function register_settings()
     {
@@ -841,28 +847,29 @@ class="button button-primary"><?php echo esc_html__('Save Changes', 'rrze-shortu
         }
     }
 
-    public function render_statistic_section() {
+    public function render_statistic_section()
+    {
         // Determine the current sorting order and column
         $orderby = isset($_GET['orderby']) ? sanitize_text_field(wp_unslash($_GET['orderby'])) : 'hostname';
         $order = isset($_GET['order']) && in_array(sanitize_text_field(wp_unslash($_GET['order'])), ['asc', 'desc']) ? sanitize_text_field(wp_unslash($_GET['order'])) : 'asc';
-    
+
         // Get all domains to count associated links
         $args = [
             'post_type' => 'shorturl_domain',
             'posts_per_page' => -1, // Fetch all domains
             'orderby' => 'title', // Sort by hostname (title)
             'order' => $order
         ];
-    
+
         $domain_query = new \WP_Query($args);
         $link_counts = [];
-    
+
         if ($domain_query->have_posts()) {
             while ($domain_query->have_posts()) {
                 $domain_query->the_post();
                 $domain_id = get_the_ID();
                 $hostname = get_the_title();
-    
+
                 // Query to count links associated with the current domain
                 $link_args = [
                     'post_type' => 'shorturl_link',
@@ -876,19 +883,19 @@ public function render_statistic_section() {
                     'posts_per_page' => -1, // Count all links
                     'fields' => 'ids' // Only retrieve post IDs for counting
                 ];
-    
+
                 $link_query = new \WP_Query($link_args);
                 $link_count = $link_query->post_count; // Get the count of associated links
-    
+
                 $link_counts[] = (object) [
                     'hostname' => $hostname,
                     'link_count' => $link_count
                 ];
             }
         }
-    
+
         wp_reset_postdata(); // Reset post data after query
-    
+
         // Sort the results by link count if necessary
         if ($orderby === 'link_count') {
             usort($link_counts, function ($a, $b) use ($order) {
@@ -899,7 +906,7 @@ public function render_statistic_section() {
                 }
             });
         }
-    
+
         // Output the statistics table
         ?>
         <div class="wrap">

package-lock.json

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE ShortURL
 Plugin URI:      https://gitlab.rrze.fau.de/rrze-webteam/rrze-shorturl
 Description:     Plugin, um URLs zu verkürzen. 
-Version:         2.1.5
+Version:         2.1.7
 Requires at least: 6.4
 Requires PHP:      8.2
 Author:          RRZE Webteam