WordPress.org
Get WordPress

Plugin Directory

Changeset 2171363


Ignore:
Timestamp:
10/10/2019 07:15:44 PM (6 years ago)
Author:
traveledmap
Message:

New version of traveledmap urls

Location:
traveledmap-trip-itinerary-embedded-map/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • traveledmap-trip-itinerary-embedded-map/trunk/plugin.php

    r2156545 r2171363  
    22/**
    33 * Plugin Name: TraveledMap Trip itinerary: Embedded map
    4  * Plugin URI: https://github.com/ahmadawais/create-guten-block/
     4 * Plugin URI: https://fr.wordpress.org/plugins/traveledmap-trip-itinerary-embedded-map/
    55 * Description: TraveledMap: Trip
    6  * Author: mrahmadawais, maedahbatool
    7  * Author URI: https://AhmadAwais.com/
     6 * Author: TraveledMap
     7 * Author URI: https://www.traveledmap.com
    88 * Version: 1.0.0
    99 * License: GPL2+

  • traveledmap-trip-itinerary-embedded-map/trunk/src/iframe/trip-block.js

    r2156545 r2171363  
    3939            meta: 'traveledmap_trip_id',
    4040        },
    41         nickname: {
    42             type: 'string',
    43             source: 'meta',
    44             meta: 'traveledmap_nickname',
    45         },
    4641        baseUrl: {
    4742            type: 'string',
    … …  
    109104        const {
    110105            attributes: {
    111                 baseUrl, userId, nickname, tripId, showPopup, showPictures, showPicturesAtStart, mapUrl,
     106                baseUrl, userId, tripId, showPopup, showPictures, showPicturesAtStart, mapUrl,
    112107                isSticky, showOnPhones, showOnTablets, showOnLargeScreens, mapHeight, standardMapHeight,
    113108                extendedMapHeight, marginTop,
    … …  
    127122        };
    128123
    129         const getUser = () => {
    130             if (!isEmpty(userId)) {
    131                 return userId;
    132             }
    133             if (!isEmpty(nickname)) {
    134                 return nickname;
    135             }
    136             return null;
    137         };
     124        const getUser = () => !isEmpty(userId) ? userId : null;
    138125
    139126        const getTripId = () => {

  • traveledmap-trip-itinerary-embedded-map/trunk/src/init.php

    r2156545 r2171363  
    7171                'mapUrl' => array('type' => 'string'),
    7272                'traveledmap_user_id' => array('type' => 'string'),
    73                 'traveledmap_nickname' => array('type' => 'string'),
    7473                'traveledmap_trip_id' => array('type' => 'string'),
    7574                'traveledmap_trip_base_url' => array('type' => 'string'),

  • traveledmap-trip-itinerary-embedded-map/trunk/src/metabox/metabox.php

    r2136499 r2171363  
    11<?php
    2 
    3 const NICKNAME_EXT = "--nickname";
    42
    53function traveledmap_register_meta_boxes()
    … …  
    6866              const userId = document.getElementById("traveledmap-user-id").value;
    6967              const tripId = document.getElementById("traveledmap-trip-id").value;
    70               const nickname = userId.indexOf("--nickname") > -1 && userId.replace(/--nickname/, "");
    71               const link = `https://www.traveledmap.com/embedded-trip${nickname && nickname.length > 0 ? `/${nickname}?trip=` : `?user=${userId}&trip=`}${tripId}`;
     68              const link = `https://www.traveledmap.com/embedded-trip/${userId}/${tripId}?isWPMetaboxTest=true`;
    7269              const iframeEl = document.getElementById("traveledmap-steps-wrapper").appendChild(document.createElement("iframe"));
    7370              iframeEl.setAttribute("src", link);
    … …  
    127124        }
    128125
    129         if (endsWith($userInput, NICKNAME_EXT)) {
    130             $nickname = sanitize_text_field(str_replace($userInput, NICKNAME_EXT, ''));
    131             update_post_meta($post_id, 'traveledmap_nickname', $nickname);
    132             $baseUrl .= "/$nickname?trip=";
    133         } else {
    134             $userId = sanitize_text_field($_POST['traveledmap-user-id']);
    135             update_post_meta($post_id, 'traveledmap_user_id', $userId);
    136             $baseUrl .= "?user=$userId&trip=";
    137         }
     126        $userId = sanitize_text_field($_POST['traveledmap-user-id']);
     127        update_post_meta($post_id, 'traveledmap_user_id', $userId);
     128        $baseUrl .= "/$userId";
    138129    }
    139130    if (isset($_POST['traveledmap-trip-id'])) {
    … …  
    144135
    145136        update_post_meta($post_id, 'traveledmap_trip_id', sanitize_text_field($tripId));
    146         $baseUrl .= $tripId;
     137        $baseUrl .= "/$tripId?isWP=true";
    147138        update_post_meta($post_id, 'traveledmap_trip_base_url', $baseUrl);
    148139    }
    … …  
    156147
    157148register_post_meta('post', 'traveledmap_user_id', array(
    158     'show_in_rest' => true,
    159     'type' => 'string'
    160 ));
    161 register_post_meta('post', 'traveledmap_nickname', array(
    162149    'show_in_rest' => true,
    163150    'type' => 'string'
Note: See TracChangeset for help on using the changeset viewer.