WordPress.org
Get WordPress

Plugin Directory

Changeset 2419101


Ignore:
Timestamp:
11/15/2020 10:41:51 PM (5 years ago)
Author:
Mosterd3d
Message:

tagging version 6.1

Location:
dd-lastviewed
Files:
4 added
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • dd-lastviewed/tags/6.1/dd_templates/form.php

    r2397279 r2419101  
    318318        <?php
    319319
    320         $secureOptions = array('True' => true, 'False' => false);
     320        $secureOptions = array('True' => '1', 'False' => '0');
    321321
    322322        ?>

  • dd-lastviewed/tags/6.1/last-viewed.php

    r2397279 r2419101  
    22/*
    33Plugin Name: DD Last Viewed
    4 Version: 6.0
     4Version: 6.1
    55Plugin URI: http://wouterdijkstra.com
    66Description: Shows the users recently viewed/visited posts, filtered on types or terms, in a widget.
    … …  
    5656    private  $cookieFormat = 'days';
    5757    private  $cookieSameSite_default = 'Lax';
    58     private  $cookieSecure_default = false;
     58    private  $cookieSecure_default = '0';
    5959    private  $post_type;
    6060    private  $selectedTypesTerms;
    … …  
    150150        $cookieListPhp = ($this->generateCookiesDataObject('php'));
    151151        foreach ($cookieListPhp as $cookie) {
    152             $sameSite = $cookie['sameSite'] ? $cookie['sameSite'] : $this->cookieSameSite_default;
    153             $secure = $cookie['secure'] === 'True';
     152            $sameSite = isset($cookie['sameSite']) ? $cookie['sameSite'] : $this->cookieSameSite_default;
     153            $secure = isset($cookie['secure']) && $cookie['secure'] === '1';
     154
     155            $cookieOptions2 = array(
     156                'expires' => $cookie['expire'],
     157                'path' => $cookie['path']
     158            );
     159
     160            if ($this->isHttps() && !$cookie['advanced_checked']) {
     161                $cookieOptions2['samesite'] =  $this->cookieSameSite_default;
     162            }
    154163
    155164            if ($cookie['advanced_checked']) {
    156                 $cookieOptions = array(
    157                     'expires' => $cookie['expire'],
    158                     'path' => $cookie['path'],
    159                     'samesite' => $sameSite,
    160                     'secure' => $secure
    161                 );
    162             } else {
    163                 $cookieOptions = array(
    164                     'expires' => $cookie['expire'],
    165                     'path' => $cookie['path'],
    166                 );
     165                $cookieOptions2['expires'] = $cookie['expire'];
     166                $cookieOptions2['path'] = $cookie['path'];
     167                $cookieOptions2['samesite'] = $sameSite;
     168                $cookieOptions2['secure'] = $secure;
    167169            }
    168 
    169             setcookie( $cookie['name'], $cookie['list'], $cookieOptions );
     170            setcookie( $cookie['name'], $cookie['list'], $cookieOptions2 );
    170171        }
    171172    }
    … …  
    393394            $instance['cookie_timeformat'] = strip_tags($new_instance['cookie_timeformat']);
    394395            $instance['cookie_samesite'] = strip_tags($new_instance['cookie_samesite']);
    395             $instance['cookie_secure'] = (bool)$new_instance['cookie_secure'];
     396            $instance['cookie_secure'] = strip_tags($new_instance['cookie_secure']);
    396397        } else {
    397398            $instance['cookie_lifetime'] = $this->cookieLifetime;
    … …  
    411412        }
    412413        return $instance;
     414    }
     415
     416    function isHttps() {
     417        return
     418            (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
     419            || $_SERVER['SERVER_PORT'] == 443;
    413420    }
    414421
    … …  
    521528        $this->post_content_settings = $post_content_settings;
    522529        $this->settings_are_set =  isset($thisWidget['selection']) && ($post_title_settings['is_active'] || $post_thumb_settings['is_active'] || $post_content_settings['is_active']);
    523         $this->post_list = new WP_Query($list_args);
     530        $this->post_list = !empty($idList) ? new WP_Query($list_args) : new WP_Query();
    524531    }
    525532

  • dd-lastviewed/tags/6.1/readme.txt

    r2397279 r2419101  
    44Tags: history, lastviewed, recently, visited, posts viewed recently, customisable, seo, woo-commerce, posts, custom, posttypes, thumbnail, cookie, widget, recent, visit terms, taxonomies, taxonomy, term, category, template, customise, woocommerce
    55Requires at least: 3.3
    6 Tested up to: 5.5.1
    7 Stable tag: 6.0
     6Tested up to: 5.5.3
     7Stable tag: 6.1
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5656== Changelog ==
    5757
     58= 6.1 =
     59* Fix cookie secure option
     60* Fix missing style.css.map
     61* Set 'lax'(samesite) by default if https
     62* Fix bug visiting same page as the only one set in the cookie
     63
    5864= 6.0 =
    5965* Created advanced cookie settings

  • dd-lastviewed/trunk/dd_templates/form.php

    r2397279 r2419101  
    318318        <?php
    319319
    320         $secureOptions = array('True' => true, 'False' => false);
     320        $secureOptions = array('True' => '1', 'False' => '0');
    321321
    322322        ?>

  • dd-lastviewed/trunk/last-viewed.php

    r2397279 r2419101  
    22/*
    33Plugin Name: DD Last Viewed
    4 Version: 6.0
     4Version: 6.1
    55Plugin URI: http://wouterdijkstra.com
    66Description: Shows the users recently viewed/visited posts, filtered on types or terms, in a widget.
    … …  
    5656    private  $cookieFormat = 'days';
    5757    private  $cookieSameSite_default = 'Lax';
    58     private  $cookieSecure_default = false;
     58    private  $cookieSecure_default = '0';
    5959    private  $post_type;
    6060    private  $selectedTypesTerms;
    … …  
    150150        $cookieListPhp = ($this->generateCookiesDataObject('php'));
    151151        foreach ($cookieListPhp as $cookie) {
    152             $sameSite = $cookie['sameSite'] ? $cookie['sameSite'] : $this->cookieSameSite_default;
    153             $secure = $cookie['secure'] === 'True';
     152            $sameSite = isset($cookie['sameSite']) ? $cookie['sameSite'] : $this->cookieSameSite_default;
     153            $secure = isset($cookie['secure']) && $cookie['secure'] === '1';
     154
     155            $cookieOptions2 = array(
     156                'expires' => $cookie['expire'],
     157                'path' => $cookie['path']
     158            );
     159
     160            if ($this->isHttps() && !$cookie['advanced_checked']) {
     161                $cookieOptions2['samesite'] =  $this->cookieSameSite_default;
     162            }
    154163
    155164            if ($cookie['advanced_checked']) {
    156                 $cookieOptions = array(
    157                     'expires' => $cookie['expire'],
    158                     'path' => $cookie['path'],
    159                     'samesite' => $sameSite,
    160                     'secure' => $secure
    161                 );
    162             } else {
    163                 $cookieOptions = array(
    164                     'expires' => $cookie['expire'],
    165                     'path' => $cookie['path'],
    166                 );
     165                $cookieOptions2['expires'] = $cookie['expire'];
     166                $cookieOptions2['path'] = $cookie['path'];
     167                $cookieOptions2['samesite'] = $sameSite;
     168                $cookieOptions2['secure'] = $secure;
    167169            }
    168 
    169             setcookie( $cookie['name'], $cookie['list'], $cookieOptions );
     170            setcookie( $cookie['name'], $cookie['list'], $cookieOptions2 );
    170171        }
    171172    }
    … …  
    393394            $instance['cookie_timeformat'] = strip_tags($new_instance['cookie_timeformat']);
    394395            $instance['cookie_samesite'] = strip_tags($new_instance['cookie_samesite']);
    395             $instance['cookie_secure'] = (bool)$new_instance['cookie_secure'];
     396            $instance['cookie_secure'] = strip_tags($new_instance['cookie_secure']);
    396397        } else {
    397398            $instance['cookie_lifetime'] = $this->cookieLifetime;
    … …  
    411412        }
    412413        return $instance;
     414    }
     415
     416    function isHttps() {
     417        return
     418            (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
     419            || $_SERVER['SERVER_PORT'] == 443;
    413420    }
    414421
    … …  
    521528        $this->post_content_settings = $post_content_settings;
    522529        $this->settings_are_set =  isset($thisWidget['selection']) && ($post_title_settings['is_active'] || $post_thumb_settings['is_active'] || $post_content_settings['is_active']);
    523         $this->post_list = new WP_Query($list_args);
     530        $this->post_list = !empty($idList) ? new WP_Query($list_args) : new WP_Query();
    524531    }
    525532

  • dd-lastviewed/trunk/readme.txt

    r2397279 r2419101  
    44Tags: history, lastviewed, recently, visited, posts viewed recently, customisable, seo, woo-commerce, posts, custom, posttypes, thumbnail, cookie, widget, recent, visit terms, taxonomies, taxonomy, term, category, template, customise, woocommerce
    55Requires at least: 3.3
    6 Tested up to: 5.5.1
    7 Stable tag: 6.0
     6Tested up to: 5.5.3
     7Stable tag: 6.1
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5656== Changelog ==
    5757
     58= 6.1 =
     59* Fix cookie secure option
     60* Fix missing style.css.map
     61* Set 'lax'(samesite) by default if https
     62* Fix bug visiting same page as the only one set in the cookie
     63
    5864= 6.0 =
    5965* Created advanced cookie settings
Note: See TracChangeset for help on using the changeset viewer.