WordPress.org
Get WordPress

Plugin Directory

Changeset 2201127


Ignore:
Timestamp:
11/26/2019 08:35:26 AM (6 years ago)
Author:
thmarx
Message:

v2.3.0

Location:
experience-manager/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • experience-manager/trunk/experience-manager.php

    r2200549 r2201127  
    55  Description: The integration for the experience platform.
    66  Author: Thorsten Marx
    7   Version: 2.2.0
     7  Version: 2.3.0
    88  Author URI: https://wp-digitalexperience.com/
    99  Text Domain: tma-webtools
    … …  
    1414}
    1515
    16 define("TMA_EXPERIENCE_MANAGER_VERSION", "2.2.0");
     16define("TMA_EXPERIENCE_MANAGER_VERSION", "2.3.0");
    1717define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ALL", "all");
    1818define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ANY", "any");
    … …  
    163163
    164164function tma_init_cookie() {
    165     \TMA\ExperienceManager\TMA_COOKIE_HELPER::getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_USER, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE, true);
    166     \TMA\ExperienceManager\TMA_COOKIE_HELPER::getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_REQUEST, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_REQUEST_EXPIRE, true);
    167     \TMA\ExperienceManager\TMA_COOKIE_HELPER::getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_VISIT, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_VISIT_EXPIRE, true);
     165    \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_USER, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE, true);
     166    \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_REQUEST, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_REQUEST_EXPIRE, true);
     167    \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(\TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_VISIT, \TMA\ExperienceManager\UUID::v4(), \TMA\ExperienceManager\TMA_COOKIE_HELPER::$COOKIE_VISIT_EXPIRE, true);
    168168}

  • experience-manager/trunk/includes/class.cookie.php

    r2096995 r2201127  
    1616class TMA_COOKIE_HELPER {
    1717
    18     public static $DAY = null;
    19     public static $HOUR = null;
    20     public static $MINUTE = null;
    21    
    22     public static $COOKIE_REQUEST = "_tma_rid";
    23     public static $COOKIE_REQUEST_EXPIRE = null;
    24     public static $COOKIE_VISIT = "_tma_vid";
    25     public static $COOKIE_VISIT_EXPIRE = null;
    26     public static $COOKIE_USER = "_tma_uid";
    27     public static $COOKIE_USER_EXPIRE = null;
    28     public static $COOKIE_FINGERPRINT = "_tma_fp";
    29     public static $COOKIE_FINGERPRINT_EXPIRE = null;
    30    
    31     public function __construct() {
    32         if (self::$COOKIE_REQUEST_ESPIRE == null) {
    33             self::$DAY = 24 * 60 * 60 * 1000;
    34             self::$HOUR = 60 * 60 * 1000;
    35             self::$MINUTE = 60 * 1000;
    36             self::$COOKIE_REQUEST_EXPIRE = 3 * self::$MINUTE;
    37             self::$COOKIE_VISIT_EXPIRE = 1 * TMA_COOKIE_HELPER::$HOUR;
    38             self::$COOKIE_USER_EXPIRE = 1 * TMA_COOKIE_HELPER::$YEAR;
    39             self::$COOKIE_FINGERPRINT= 1 * TMA_COOKIE_HELPER::$YEAR;
     18    protected static $_instance = null;
     19
     20    public static function getInstance() {
     21        if (null === self::$_instance) {
     22            self::$_instance = new self;
    4023        }
     24        return self::$_instance;
    4125    }
    4226
    43     public static function getCookie($name, $value, $expire, $setNew=false) {
     27    public static $MINUTE = 60;
     28    public static $HOUR;
     29    public static $DAY;
     30    public static $YEAR;
     31    public static $COOKIE_REQUEST = "_tma_rid";
     32    public static $COOKIE_REQUEST_EXPIRE;
     33    public static $COOKIE_VISIT = "_tma_vid";
     34    public static $COOKIE_VISIT_EXPIRE;
     35    public static $COOKIE_USER = "_tma_uid";
     36    public static $COOKIE_USER_EXPIRE;
     37
     38    protected function __construct() {
     39       
     40    }
     41
     42    public function getCookie($name, $value, $expire, $setNew = false) {
    4443        if (isset($_COOKIE[$name])) {
    4544            $value = $_COOKIE[$name];
    4645        }
    4746        if ($setNew) {
    48             setcookie($name, $value, $expire, '/');
     47
     48            $cookieDomain = null;
     49            if (isset(get_option('tma_webtools_option')['webtools_cookiedomain'])) {
     50                $cookieDomain = get_option('tma_webtools_option')['webtools_cookiedomain'];
     51
     52                $query = ".";
     53                if (substr($cookieDomain, 0, strlen($query)) !== $query) {
     54                    $cookieDomain = "." . $cookieDomain;
     55                }
     56            }
     57            setcookie($name, $value, time() + $expire, '/', $cookieDomain, true);
    4958        }
    50        
     59
    5160        return $value;
    5261    }
    5362
    5463}
     64
     65TMA_COOKIE_HELPER::$HOUR = 60 * TMA_COOKIE_HELPER::$MINUTE;
     66TMA_COOKIE_HELPER::$DAY = 24 * TMA_COOKIE_HELPER::$HOUR;
     67TMA_COOKIE_HELPER::$YEAR = 365 * TMA_COOKIE_HELPER::$DAY;
     68TMA_COOKIE_HELPER::$COOKIE_REQUEST_EXPIRE = 3 * TMA_COOKIE_HELPER::$MINUTE;
     69TMA_COOKIE_HELPER::$COOKIE_VISIT_EXPIRE = 1 * TMA_COOKIE_HELPER::$HOUR;
     70TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE = 1 + TMA_COOKIE_HELPER::$YEAR;
    5571
    5672class UUID {
    … …  
    6783
    6884        // Convert Namespace UUID to bits
    69         for ($i = 0; $i < strlen($nhex); $i+=2) {
     85        for ($i = 0; $i < strlen($nhex); $i += 2) {
    7086            $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
    7187        }
    … …  
    120136
    121137        // Convert Namespace UUID to bits
    122         for ($i = 0; $i < strlen($nhex); $i+=2) {
     138        for ($i = 0; $i < strlen($nhex); $i += 2) {
    123139            $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
    124140        }

  • experience-manager/trunk/includes/class.request.php

    r2200549 r2201127  
    3535
    3636    public static function getUserID() {
    37         return TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     37        return \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    3838    }
    3939
    … …  
    172172        }
    173173
    174         $uid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    175         $rid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_REQUEST, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_REQUEST_EXPIRE);
    176         $vid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_VISIT, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_VISIT_EXPIRE);
     174        $uid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     175        $rid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_REQUEST, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_REQUEST_EXPIRE);
     176        $vid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_VISIT, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_VISIT_EXPIRE);
    177177        $fp = $_COOKIE['_tma_fp'];
    178178        $apikey = $this->options["webtools_apikey"];

  • experience-manager/trunk/includes/frontend/class.shortcode_tma_content.php

    r2200549 r2201127  
    109109        }
    110110
    111         $uid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     111        $uid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    112112        $request = new TMA_Request();
    113113        $response = $request->getSegments($uid);

  • experience-manager/trunk/includes/modules/ads/advanced/class.advanced_ads.php

    r2200549 r2201127  
    5454        $settings_segments = $settings['segments'];
    5555
    56         $uid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     56        $uid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    5757        $request = new TMA_Request();
    5858        $response = $request->getSegments($uid);

  • experience-manager/trunk/includes/modules/editors/class.integration.php

    r2200549 r2201127  
    114114        $attr_segments = $this->getSegments($args);
    115115
    116         $uid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     116        $uid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    117117        $request = new TMA_Request();
    118118        $response = $request->getSegments($uid);

  • experience-manager/trunk/includes/modules/messages/popup-maker/class.popup-maker.php

    r2200549 r2201127  
    4646        $settings_segments = $settings['segments'];
    4747
    48         $uid = TMA_COOKIE_HELPER::getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
     48        $uid = \TMA\ExperienceManager\TMA_COOKIE_HELPER::getInstance()->getCookie(TMA_COOKIE_HELPER::$COOKIE_USER, UUID::v4(), TMA_COOKIE_HELPER::$COOKIE_USER_EXPIRE);
    4949        $request = new TMA_Request();
    5050        $response = $request->getSegments($uid);

  • experience-manager/trunk/readme.txt

    r2200549 r2201127  
    44Requires at least: 4.4.1
    55Tested up to: 5.3
    6 Stable tag: 2.2.0
     6Stable tag: 2.3.0
    77License: GPLv2 or later
    88
    … …  
    6363
    6464== Changelog ==
     65
     662.3.0
     67 * cookie handling fixed
    6568
    66692.2.0
Note: See TracChangeset for help on using the changeset viewer.