Changeset 2419639
- Timestamp:
- 11/16/2020 10:08:44 PM (5 years ago)
- Location:
- dd-lastviewed
- Files:
-
- 6 edited
- 1 copied
-
tags/6.2 (copied) (copied from dd-lastviewed/trunk)
-
tags/6.2/dd_templates/form.php (modified) (3 diffs)
-
tags/6.2/last-viewed.php (modified) (3 diffs)
-
tags/6.2/readme.txt (modified) (2 diffs)
-
trunk/dd_templates/form.php (modified) (3 diffs)
-
trunk/last-viewed.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dd-lastviewed/tags/6.2/dd_templates/form.php
r2419101 r2419639 31 31 $lastViewed_showTruncate = isset($instance['lastViewed_showTruncate']) ? (bool)$instance['lastViewed_showTruncate'] : false; 32 32 $lastViewed_showMore = isset($instance['lastViewed_showMore']) ? (bool)$instance['lastViewed_showMore'] : false; 33 $lastviewed_excl_ids = isset($instance['lastviewed_excl_ids']) ? $instance['lastviewed_excl_ids'] : array();33 $lastviewed_excl_ids = !empty($instance['lastviewed_excl_ids']) ? $instance['lastviewed_excl_ids'] : array(); 34 34 $lastViewed_lv_link_title = isset($instance['lastViewed_lv_link_title']) ? (bool)$instance['lastViewed_lv_link_title'] : false; 35 35 $lastViewed_lv_link_thumb = isset($instance['lastViewed_lv_link_thumb']) ? (bool)$instance['lastViewed_lv_link_thumb'] : false; … … 41 41 $cookie_samesite = isset($instance['cookie_samesite']) ? $instance['cookie_samesite'] : "None"; 42 42 $cookie_secure = isset($instance['cookie_secure']) ? $instance['cookie_secure'] : false; 43 $selection = isset($instance['selection']) ? $instance['selection'] : array('post', 'page'); 43 44 ?> 44 45 <p> … … 53 54 <hr> 54 55 55 <?php56 $selection = isset($instance['selection']) ? $instance['selection'] : array();57 58 ?>59 56 <p class="selectholder"><label for="id_label_multiple_<?php echo $widgetID; ?>"><?php _e('Filter on Posttypes/Terms:','dd-lastviewed'); ?></label><br/> 60 <select class="js-types-and-terms types-and-terms" id=" id_label_multiple_<?php echo $widgetID;?>" multiple="multiple" tabindex="-1" aria-hidden="true" name="<?php echo $this->get_field_name('selection') . '[]'; ?>">57 <select class="js-types-and-terms types-and-terms" id="<?php echo $this->get_field_id('selection') ?>" multiple="multiple" tabindex="-1" aria-hidden="true" name="<?php echo $this->get_field_name('selection') . '[]'; ?>"> 61 58 <optgroup label="Post Types"> 62 59 <?php foreach ($post_types as $post_type) : -
dd-lastviewed/tags/6.2/last-viewed.php
r2419101 r2419639 2 2 /* 3 3 Plugin Name: DD Last Viewed 4 Version: 6. 14 Version: 6.2 5 5 Plugin URI: http://wouterdijkstra.com 6 6 Description: Shows the users recently viewed/visited posts, filtered on types or terms, in a widget. … … 365 365 { 366 366 $instance = $old_instance; 367 $instance['lastviewedTitle'] = strip_tags($new_instance['lastviewedTitle']); 368 $instance['selected_posttypes'] = $new_instance['selected_posttypes']; 369 $instance['selection'] = $new_instance['selection']; 370 $instance['lastViewed_thumb'] = strip_tags($new_instance['lastViewed_thumb']); 371 $instance['lastViewed_total'] = strip_tags($new_instance['lastViewed_total']); 372 $instance['lastViewed_truncate'] = strip_tags($new_instance['lastViewed_truncate']); 373 $instance['lastViewed_linkname'] = strip_tags($new_instance['lastViewed_linkname']); 374 $instance['lastViewed_showPostTitle'] = (bool)$new_instance['lastViewed_showPostTitle']; 375 $instance['lastViewed_showThumb'] = (bool)$new_instance['lastViewed_showThumb']; 376 $instance['lastViewed_thumbSize'] = strip_tags($new_instance['lastViewed_thumbSize']); 377 $instance['lastViewed_showExcerpt'] = (bool)$new_instance['lastViewed_showExcerpt']; 378 $instance['lastViewed_content_type'] = strip_tags($new_instance['lastViewed_content_type']); 379 $instance['lastViewed_showTruncate'] = (bool)$new_instance['lastViewed_showTruncate']; 380 $instance['lastViewed_showMore'] = (bool)$new_instance['lastViewed_showMore']; 381 $instance['lastViewed_lv_link_thumb'] = (bool)$new_instance['lastViewed_lv_link_thumb']; 382 $instance['lastViewed_lv_link_title'] = (bool)$new_instance['lastViewed_lv_link_title']; 383 $instance['lastViewed_lv_link_excerpt'] = (bool)$new_instance['lastViewed_lv_link_excerpt']; 384 385 $lastviewed_excl_ids =$new_instance['lastviewed_excl_ids']; 386 asort($lastviewed_excl_ids); 387 $lastviewed_excl_ids = array_values($lastviewed_excl_ids); 367 368 // $widgetFields = array('lastviewedTitle','selection','lastViewed_total','lastViewed_truncate','lastViewed_linkname', 369 // 'lastViewed_showPostTitle', 'lastViewed_showThumb', 'lastViewed_thumbSize', 'lastViewed_showExcerpt', 370 // 'lastViewed_content_type','lastViewed_showTruncate','lastViewed_showMore','lastViewed_lv_link_thumb','lastViewed_lv_link_title', 371 // 'lastViewed_lv_link_excerpt','advanced_cookie_settings_checked','avoid_widget_caching_checked'); 372 // 373 // foreach ($widgetFields as $widgetField) { 374 // $instance[$widgetField] = !empty( $new_instance[$widgetField] ) ? strip_tags($new_instance[$widgetField]) : ''; 375 // } 376 377 378 $instance['lastviewedTitle'] = !empty( $new_instance['lastviewedTitle'] ) ? strip_tags($new_instance['lastviewedTitle']) : ''; 379 $instance['selection'] = !empty( $new_instance['selection'] ) ? $new_instance['selection'] : ''; 380 $instance['lastViewed_total'] = !empty( $new_instance['lastViewed_total'] ) ? strip_tags($new_instance['lastViewed_total']) : ''; 381 $instance['lastViewed_truncate'] = !empty( $new_instance['lastViewed_truncate'] ) ? strip_tags($new_instance['lastViewed_truncate']) : ''; 382 $instance['lastViewed_linkname'] = !empty( $new_instance['lastViewed_linkname'] ) ? strip_tags($new_instance['lastViewed_linkname']) : ''; 383 $instance['lastViewed_showPostTitle'] = !empty( $new_instance['lastViewed_showPostTitle'] ) ? strip_tags( $new_instance['lastViewed_showPostTitle'] ) : ''; 384 $instance['lastViewed_showThumb'] = !empty( $new_instance['lastViewed_showThumb'] ) ? strip_tags($new_instance['lastViewed_showThumb']) : ''; 385 $instance['lastViewed_thumbSize'] = !empty( $new_instance['lastViewed_thumbSize'] ) ? strip_tags($new_instance['lastViewed_thumbSize']) : ''; 386 $instance['lastViewed_showExcerpt'] = !empty( $new_instance['lastViewed_showExcerpt'] ) ? strip_tags($new_instance['lastViewed_showExcerpt']) : ''; 387 $instance['lastViewed_content_type'] = !empty( $new_instance['lastViewed_content_type'] ) ? strip_tags($new_instance['lastViewed_content_type']) : ''; 388 $instance['lastViewed_showTruncate'] = !empty( $new_instance['lastViewed_showTruncate'] ) ? strip_tags($new_instance['lastViewed_showTruncate']) : ''; 389 $instance['lastViewed_showMore'] = !empty( $new_instance['lastViewed_showMore'] ) ? strip_tags($new_instance['lastViewed_showMore']) : ''; 390 $instance['lastViewed_lv_link_thumb'] = !empty( $new_instance['lastViewed_lv_link_thumb'] ) ? strip_tags($new_instance['lastViewed_lv_link_thumb']) : ''; 391 $instance['lastViewed_lv_link_title'] = !empty( $new_instance['lastViewed_lv_link_title'] ) ? strip_tags($new_instance['lastViewed_lv_link_title']) : ''; 392 $instance['lastViewed_lv_link_excerpt'] = !empty( $new_instance['lastViewed_lv_link_excerpt'] ) ? strip_tags($new_instance['lastViewed_lv_link_excerpt']) : ''; 393 394 $lastviewed_excl_ids = ''; 395 if ( !empty( $new_instance['lastviewed_excl_ids'] ) ) { 396 $lastviewed_excl_ids =$new_instance['lastviewed_excl_ids']; 397 asort($lastviewed_excl_ids); 398 $lastviewed_excl_ids = array_values($lastviewed_excl_ids); 399 } 388 400 $instance['lastviewed_excl_ids'] = $lastviewed_excl_ids; 389 390 $instance['advanced_cookie_settings_checked'] = (bool)$new_instance['advanced_cookie_settings_checked']; 391 392 if ($instance['advanced_cookie_settings_checked']) { 401 $instance['advanced_cookie_settings_checked'] = !empty( $new_instance['advanced_cookie_settings_checked'] ) ? strip_tags($new_instance['advanced_cookie_settings_checked']) : ''; 402 403 if (!empty($instance['advanced_cookie_settings_checked'])) { 393 404 $instance['cookie_lifetime'] = strip_tags(isset($new_instance['cookie_lifetime']) ? $new_instance['cookie_lifetime'] : $this->cookieLifetime); 394 $instance['cookie_timeformat'] = strip_tags($new_instance['cookie_timeformat']);395 $instance['cookie_samesite'] = strip_tags($new_instance['cookie_samesite']);396 $instance['cookie_secure'] = strip_tags($new_instance['cookie_secure']);405 $instance['cookie_timeformat'] = !empty( $new_instance['cookie_timeformat'] ) ? strip_tags($new_instance['cookie_timeformat']) : ''; 406 $instance['cookie_samesite'] = !empty( $new_instance['cookie_samesite'] ) ? strip_tags($new_instance['cookie_samesite']) : ''; 407 $instance['cookie_secure'] = !empty( $new_instance['cookie_secure'] ) ? strip_tags($new_instance['cookie_secure']) : ''; 397 408 } else { 398 409 $instance['cookie_lifetime'] = $this->cookieLifetime; … … 402 413 } 403 414 404 $instance['avoid_widget_caching_checked'] = (bool)$new_instance['avoid_widget_caching_checked']; 405 406 if ($instance['avoid_widget_caching_checked']) { 407 $instance['lastViewed_ajaxLoad'] = (bool)$new_instance['lastViewed_ajaxLoad']; 408 $instance['lastViewed_cookieByJs'] = (bool)$new_instance['lastViewed_cookieByJs']; 409 } else { 410 $instance['lastViewed_ajaxLoad'] = false; 411 $instance['lastViewed_cookieByJs'] = false; 412 } 415 $instance['avoid_widget_caching_checked'] = !empty( $new_instance['avoid_widget_caching_checked'] ) ? strip_tags($new_instance['avoid_widget_caching_checked']) : ''; 416 $instance['lastViewed_ajaxLoad'] = !empty($instance['avoid_widget_caching_checked']) && !empty( $new_instance['lastViewed_ajaxLoad'] ) ? strip_tags($new_instance['lastViewed_ajaxLoad']) : ''; 417 $instance['lastViewed_cookieByJs'] = !empty($instance['avoid_widget_caching_checked']) && !empty( $new_instance['lastViewed_cookieByJs'] ) ? strip_tags($new_instance['lastViewed_cookieByJs']) : ''; 418 413 419 return $instance; 414 420 } -
dd-lastviewed/tags/6.2/readme.txt
r2419101 r2419639 5 5 Requires at least: 3.3 6 6 Tested up to: 5.5.3 7 Stable tag: 6. 17 Stable tag: 6.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 56 56 == Changelog == 57 57 58 = 6.2 = 59 * pre-fill post types with 'post and pages' if emtpy 60 * Fix logged errors 61 * Fix saving posttypes 62 58 63 = 6.1 = 59 64 * Fix cookie secure option -
dd-lastviewed/trunk/dd_templates/form.php
r2419101 r2419639 31 31 $lastViewed_showTruncate = isset($instance['lastViewed_showTruncate']) ? (bool)$instance['lastViewed_showTruncate'] : false; 32 32 $lastViewed_showMore = isset($instance['lastViewed_showMore']) ? (bool)$instance['lastViewed_showMore'] : false; 33 $lastviewed_excl_ids = isset($instance['lastviewed_excl_ids']) ? $instance['lastviewed_excl_ids'] : array();33 $lastviewed_excl_ids = !empty($instance['lastviewed_excl_ids']) ? $instance['lastviewed_excl_ids'] : array(); 34 34 $lastViewed_lv_link_title = isset($instance['lastViewed_lv_link_title']) ? (bool)$instance['lastViewed_lv_link_title'] : false; 35 35 $lastViewed_lv_link_thumb = isset($instance['lastViewed_lv_link_thumb']) ? (bool)$instance['lastViewed_lv_link_thumb'] : false; … … 41 41 $cookie_samesite = isset($instance['cookie_samesite']) ? $instance['cookie_samesite'] : "None"; 42 42 $cookie_secure = isset($instance['cookie_secure']) ? $instance['cookie_secure'] : false; 43 $selection = isset($instance['selection']) ? $instance['selection'] : array('post', 'page'); 43 44 ?> 44 45 <p> … … 53 54 <hr> 54 55 55 <?php56 $selection = isset($instance['selection']) ? $instance['selection'] : array();57 58 ?>59 56 <p class="selectholder"><label for="id_label_multiple_<?php echo $widgetID; ?>"><?php _e('Filter on Posttypes/Terms:','dd-lastviewed'); ?></label><br/> 60 <select class="js-types-and-terms types-and-terms" id=" id_label_multiple_<?php echo $widgetID;?>" multiple="multiple" tabindex="-1" aria-hidden="true" name="<?php echo $this->get_field_name('selection') . '[]'; ?>">57 <select class="js-types-and-terms types-and-terms" id="<?php echo $this->get_field_id('selection') ?>" multiple="multiple" tabindex="-1" aria-hidden="true" name="<?php echo $this->get_field_name('selection') . '[]'; ?>"> 61 58 <optgroup label="Post Types"> 62 59 <?php foreach ($post_types as $post_type) : -
dd-lastviewed/trunk/last-viewed.php
r2419101 r2419639 2 2 /* 3 3 Plugin Name: DD Last Viewed 4 Version: 6. 14 Version: 6.2 5 5 Plugin URI: http://wouterdijkstra.com 6 6 Description: Shows the users recently viewed/visited posts, filtered on types or terms, in a widget. … … 365 365 { 366 366 $instance = $old_instance; 367 $instance['lastviewedTitle'] = strip_tags($new_instance['lastviewedTitle']); 368 $instance['selected_posttypes'] = $new_instance['selected_posttypes']; 369 $instance['selection'] = $new_instance['selection']; 370 $instance['lastViewed_thumb'] = strip_tags($new_instance['lastViewed_thumb']); 371 $instance['lastViewed_total'] = strip_tags($new_instance['lastViewed_total']); 372 $instance['lastViewed_truncate'] = strip_tags($new_instance['lastViewed_truncate']); 373 $instance['lastViewed_linkname'] = strip_tags($new_instance['lastViewed_linkname']); 374 $instance['lastViewed_showPostTitle'] = (bool)$new_instance['lastViewed_showPostTitle']; 375 $instance['lastViewed_showThumb'] = (bool)$new_instance['lastViewed_showThumb']; 376 $instance['lastViewed_thumbSize'] = strip_tags($new_instance['lastViewed_thumbSize']); 377 $instance['lastViewed_showExcerpt'] = (bool)$new_instance['lastViewed_showExcerpt']; 378 $instance['lastViewed_content_type'] = strip_tags($new_instance['lastViewed_content_type']); 379 $instance['lastViewed_showTruncate'] = (bool)$new_instance['lastViewed_showTruncate']; 380 $instance['lastViewed_showMore'] = (bool)$new_instance['lastViewed_showMore']; 381 $instance['lastViewed_lv_link_thumb'] = (bool)$new_instance['lastViewed_lv_link_thumb']; 382 $instance['lastViewed_lv_link_title'] = (bool)$new_instance['lastViewed_lv_link_title']; 383 $instance['lastViewed_lv_link_excerpt'] = (bool)$new_instance['lastViewed_lv_link_excerpt']; 384 385 $lastviewed_excl_ids =$new_instance['lastviewed_excl_ids']; 386 asort($lastviewed_excl_ids); 387 $lastviewed_excl_ids = array_values($lastviewed_excl_ids); 367 368 // $widgetFields = array('lastviewedTitle','selection','lastViewed_total','lastViewed_truncate','lastViewed_linkname', 369 // 'lastViewed_showPostTitle', 'lastViewed_showThumb', 'lastViewed_thumbSize', 'lastViewed_showExcerpt', 370 // 'lastViewed_content_type','lastViewed_showTruncate','lastViewed_showMore','lastViewed_lv_link_thumb','lastViewed_lv_link_title', 371 // 'lastViewed_lv_link_excerpt','advanced_cookie_settings_checked','avoid_widget_caching_checked'); 372 // 373 // foreach ($widgetFields as $widgetField) { 374 // $instance[$widgetField] = !empty( $new_instance[$widgetField] ) ? strip_tags($new_instance[$widgetField]) : ''; 375 // } 376 377 378 $instance['lastviewedTitle'] = !empty( $new_instance['lastviewedTitle'] ) ? strip_tags($new_instance['lastviewedTitle']) : ''; 379 $instance['selection'] = !empty( $new_instance['selection'] ) ? $new_instance['selection'] : ''; 380 $instance['lastViewed_total'] = !empty( $new_instance['lastViewed_total'] ) ? strip_tags($new_instance['lastViewed_total']) : ''; 381 $instance['lastViewed_truncate'] = !empty( $new_instance['lastViewed_truncate'] ) ? strip_tags($new_instance['lastViewed_truncate']) : ''; 382 $instance['lastViewed_linkname'] = !empty( $new_instance['lastViewed_linkname'] ) ? strip_tags($new_instance['lastViewed_linkname']) : ''; 383 $instance['lastViewed_showPostTitle'] = !empty( $new_instance['lastViewed_showPostTitle'] ) ? strip_tags( $new_instance['lastViewed_showPostTitle'] ) : ''; 384 $instance['lastViewed_showThumb'] = !empty( $new_instance['lastViewed_showThumb'] ) ? strip_tags($new_instance['lastViewed_showThumb']) : ''; 385 $instance['lastViewed_thumbSize'] = !empty( $new_instance['lastViewed_thumbSize'] ) ? strip_tags($new_instance['lastViewed_thumbSize']) : ''; 386 $instance['lastViewed_showExcerpt'] = !empty( $new_instance['lastViewed_showExcerpt'] ) ? strip_tags($new_instance['lastViewed_showExcerpt']) : ''; 387 $instance['lastViewed_content_type'] = !empty( $new_instance['lastViewed_content_type'] ) ? strip_tags($new_instance['lastViewed_content_type']) : ''; 388 $instance['lastViewed_showTruncate'] = !empty( $new_instance['lastViewed_showTruncate'] ) ? strip_tags($new_instance['lastViewed_showTruncate']) : ''; 389 $instance['lastViewed_showMore'] = !empty( $new_instance['lastViewed_showMore'] ) ? strip_tags($new_instance['lastViewed_showMore']) : ''; 390 $instance['lastViewed_lv_link_thumb'] = !empty( $new_instance['lastViewed_lv_link_thumb'] ) ? strip_tags($new_instance['lastViewed_lv_link_thumb']) : ''; 391 $instance['lastViewed_lv_link_title'] = !empty( $new_instance['lastViewed_lv_link_title'] ) ? strip_tags($new_instance['lastViewed_lv_link_title']) : ''; 392 $instance['lastViewed_lv_link_excerpt'] = !empty( $new_instance['lastViewed_lv_link_excerpt'] ) ? strip_tags($new_instance['lastViewed_lv_link_excerpt']) : ''; 393 394 $lastviewed_excl_ids = ''; 395 if ( !empty( $new_instance['lastviewed_excl_ids'] ) ) { 396 $lastviewed_excl_ids =$new_instance['lastviewed_excl_ids']; 397 asort($lastviewed_excl_ids); 398 $lastviewed_excl_ids = array_values($lastviewed_excl_ids); 399 } 388 400 $instance['lastviewed_excl_ids'] = $lastviewed_excl_ids; 389 390 $instance['advanced_cookie_settings_checked'] = (bool)$new_instance['advanced_cookie_settings_checked']; 391 392 if ($instance['advanced_cookie_settings_checked']) { 401 $instance['advanced_cookie_settings_checked'] = !empty( $new_instance['advanced_cookie_settings_checked'] ) ? strip_tags($new_instance['advanced_cookie_settings_checked']) : ''; 402 403 if (!empty($instance['advanced_cookie_settings_checked'])) { 393 404 $instance['cookie_lifetime'] = strip_tags(isset($new_instance['cookie_lifetime']) ? $new_instance['cookie_lifetime'] : $this->cookieLifetime); 394 $instance['cookie_timeformat'] = strip_tags($new_instance['cookie_timeformat']);395 $instance['cookie_samesite'] = strip_tags($new_instance['cookie_samesite']);396 $instance['cookie_secure'] = strip_tags($new_instance['cookie_secure']);405 $instance['cookie_timeformat'] = !empty( $new_instance['cookie_timeformat'] ) ? strip_tags($new_instance['cookie_timeformat']) : ''; 406 $instance['cookie_samesite'] = !empty( $new_instance['cookie_samesite'] ) ? strip_tags($new_instance['cookie_samesite']) : ''; 407 $instance['cookie_secure'] = !empty( $new_instance['cookie_secure'] ) ? strip_tags($new_instance['cookie_secure']) : ''; 397 408 } else { 398 409 $instance['cookie_lifetime'] = $this->cookieLifetime; … … 402 413 } 403 414 404 $instance['avoid_widget_caching_checked'] = (bool)$new_instance['avoid_widget_caching_checked']; 405 406 if ($instance['avoid_widget_caching_checked']) { 407 $instance['lastViewed_ajaxLoad'] = (bool)$new_instance['lastViewed_ajaxLoad']; 408 $instance['lastViewed_cookieByJs'] = (bool)$new_instance['lastViewed_cookieByJs']; 409 } else { 410 $instance['lastViewed_ajaxLoad'] = false; 411 $instance['lastViewed_cookieByJs'] = false; 412 } 415 $instance['avoid_widget_caching_checked'] = !empty( $new_instance['avoid_widget_caching_checked'] ) ? strip_tags($new_instance['avoid_widget_caching_checked']) : ''; 416 $instance['lastViewed_ajaxLoad'] = !empty($instance['avoid_widget_caching_checked']) && !empty( $new_instance['lastViewed_ajaxLoad'] ) ? strip_tags($new_instance['lastViewed_ajaxLoad']) : ''; 417 $instance['lastViewed_cookieByJs'] = !empty($instance['avoid_widget_caching_checked']) && !empty( $new_instance['lastViewed_cookieByJs'] ) ? strip_tags($new_instance['lastViewed_cookieByJs']) : ''; 418 413 419 return $instance; 414 420 } -
dd-lastviewed/trunk/readme.txt
r2419101 r2419639 5 5 Requires at least: 3.3 6 6 Tested up to: 5.5.3 7 Stable tag: 6. 17 Stable tag: 6.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 56 56 == Changelog == 57 57 58 = 6.2 = 59 * pre-fill post types with 'post and pages' if emtpy 60 * Fix logged errors 61 * Fix saving posttypes 62 58 63 = 6.1 = 59 64 * Fix cookie secure option
Note: See TracChangeset
for help on using the changeset viewer.