Version 4.0.1

README.md

@@ -3,9 +3,10 @@
 **Contributors:** [needle](https://profiles.wordpress.org/needle/), [commentpress](https://profiles.wordpress.org/commentpress/)<br/>
 **Donate link:** https://www.paypal.me/interactivist<br/>
 **Tags:** commentpress, buddypress, groups, blogs, groupblogs, comments, commenting, debate, collaboration<br/>
+**Requires PHP:** 7.4<br/>
 **Requires at least:** 4.9<br/>
-**Tested up to:** 6.5<br/>
-**Stable tag:** 4.0.0<br/>
+**Tested up to:** 6.6<br/>
+**Stable tag:** 4.0.1<br/>
 **License:** GPLv2 or later<br/>
 **License URI:** https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
@@ -16,7 +17,7 @@ CommentPress Core allows fine-grained commenting in the margins of a text. Use i
 
 ## Description
 
-**Please note:** this is the development repository for *CommentPress Core*. It can be found in [the WordPress Plugin Directory](http://wordpress.org/plugins/commentpress-core/), which is the best place to get it from if you're not a developer.
+**Please note:** this is the development repository for *CommentPress Core*. It can be found in [the WordPress Plugin Directory](https://wordpress.org/plugins/commentpress-core/), which is the best place to get it from if you're not a developer.
 
 *CommentPress Core* is an open source theme and plugin for WordPress that allows readers to comment in the margins of a text. Readers may comment paragraph-by-paragraph, line-by-line, block-by-block or by selecting text.
 
@@ -28,12 +29,12 @@ Annotate, gloss, workshop, debate: with *CommentPress Core* you can do all of th
 
 **For sites hosted in the European Union, please note:** the *CommentPress Default Theme* makes use of cookies, but for presentational purposes only. If you intend to use the *CommentPress Default Theme* on a public site, you may need to inform visitors of this.
 
-For further information and instructions please see the [CommentPress site](http://www.futureofthebook.org/commentpress/) or contact the developers by email at [cpdev@futureofthebook.org](mailto:cpdev@futureofthebook.org)
+For further information and instructions please see the [CommentPress site](https://www.futureofthebook.org/commentpress/) or contact the developers by email at [cpdev@futureofthebook.org](mailto:cpdev@futureofthebook.org)
 
 Many thanks to the following for translations:
 
-* French - [Pouhiou](http://wordpress.org/support/profile/pouhiou)
-* Spanish - Andrew Kurtis from [WebHostingHub](http://www.webhostinghub.com/)
+* French - [Pouhiou](https://wordpress.org/support/profile/pouhiou)
+* Spanish - Andrew Kurtis from [WebHostingHub](https://www.webhostinghub.com/)
 * Dutch - Gerrit Jan Dijkgraaf
 * German - Chris Witte
 

commentpress-core.php

@@ -6,25 +6,41 @@
  * Description:       CommentPress allows readers to comment in the margins of a text. You can use it to annotate, gloss, workshop, debate and more!
  * Plugin URI:        https://github.com/IFBook/commentpress-core
  * GitHub Plugin URI: https://github.com/IFBook/commentpress-core
- * Version:           4.0.0
+ * Version:           4.0.1
  * Author:            Institute for the Future of the Book
  * Author URI:        https://futureofthebook.org/commentpress/
+ * License:           GPLv2 or later
+ * License URI:       https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * Requires at least: 5.7
+ * Requires PHP:      7.4
  * Text Domain:       commentpress-core
  * Domain Path:       /languages
  *
  * Special thanks to:
  *
  * Eddie Tejeda for CommentPress 2.0: https://www.visudo.com
- * Mark James for the icons: http://www.famfamfam.com/lab/icons/silk/
+ * Mark James for the icons: https://www.famfamfam.com/lab/icons/silk/
  *
  * @package CommentPress_Core
+ * @link    https://github.com/IFBook/commentpress-core
+ * @license GPL v2 or later
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
 
 // Set version.
-define( 'COMMENTPRESS_VERSION', '4.0.0' );
+define( 'COMMENTPRESS_VERSION', '4.0.1' );
 
 // Store reference to this file.
 if ( ! defined( 'COMMENTPRESS_PLUGIN_FILE' ) ) {

deploy.sh

@@ -12,7 +12,7 @@ GITPATH="$CURRENTDIR/" # this file should be in the base of your git repository
 
 # svn config
 SVNPATH="/tmp/$PLUGINSLUG" # path to a temp SVN repo. No trailing slash required and don't add trunk.
-SVNURL="http://plugins.svn.wordpress.org/commentpress-core/" # Remote SVN repo on wordpress.org, with trailing slash
+SVNURL="https://plugins.svn.wordpress.org/commentpress-core/" # Remote SVN repo on wordpress.org, with trailing slash
 SVNUSER="needle" # your SVN username
 
 

includes/core/assets/css/jquery.ui.css

@@ -1,6 +1,6 @@
 /*
 * jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Copyright (c) 2009 AUTHORS.txt (https://jqueryui.com/about)
 * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
 */
 

includes/core/assets/includes/theme/theme-comments.php

@@ -517,7 +517,7 @@ function commentpress_get_comment_activity_item( $comment ) {
 		}
 
 		// Approved comment?
-		if ( 1 === (int) $comment->comment_approved ) {
+		if ( 0 === (int) $comment->comment_approved ) {
 			$comment_text = '<p><em>' . __( 'Comment awaiting moderation', 'commentpress-core' ) . '</em></p>';
 		} else {
 			$comment_text = get_comment_text( $comment->comment_ID );

includes/core/assets/includes/theme/theme-customizer.php

@@ -292,7 +292,7 @@ function commentpress_customize_header_bg_color( $wp_customize ) {
 		$wp_customize->add_setting(
 			'commentpress_header_bg_color',
 			[
-				'default' => '#' . $core->theme->header_bg_color,
+				'default' => commentpress_header_bg_color(),
 			]
 		);
 

includes/core/assets/includes/theme/theme-filters.php

@@ -226,7 +226,7 @@ function commentpress_post_classes( $classes, $class, $post_id ) {
 	/**
 	 * Disable more link jump.
 	 *
-	 * @see http://codex.wordpress.org/Customizing_the_Read_More
+	 * @see https://codex.wordpress.org/Customizing_the_Read_More
 	 *
 	 * @since 3.0
 	 *

includes/core/assets/js/jquery.commentpress.js

@@ -2645,8 +2645,8 @@ CommentPress.common.viewport = new function() {
 	 */
 	$.in_array = function( needle, haystack, argStrict ) {
 
-		// @see http://kevin.vanzonneveld.net
-		// +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+		// @see https://kevin.vanzonneveld.net
+		// +   original by: Kevin van Zonneveld (https://kevin.vanzonneveld.net)
 		// *     example 1: in_array('van', ['Kevin', 'van', 'Zonneveld']);
 		// *     returns 1: true
 
@@ -2777,7 +2777,7 @@ CommentPress.common.viewport = new function() {
 	 */
 	$.css_to_num = function( strNum ) {
 
-		// @see http://mattstark.blogspot.com/2009/05/javascript-jquery-plugin-to-fade.html
+		// @see https://mattstark.blogspot.com/2009/05/javascript-jquery-plugin-to-fade.html
 		if ( strNum && strNum != "" ) {
 
 			var i = parseFloat(strNum);

includes/core/assets/js/jquery.fitvids.js

@@ -2,9 +2,9 @@
 /*!
 * FitVids 1.1
 *
-* Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
-* Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
-* Released under the WTFPL license - http://sam.zoy.org/wtfpl/
+* Copyright 2013, Chris Coyier - https://css-tricks.com + Dave Rupert - https://daverupert.com
+* Credit to Thierry Koblentz - https://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
+* Released under the WTFPL license - https://sam.zoy.org/wtfpl/
 *
 */
 
@@ -84,4 +84,4 @@
   $.fn.fitVids._count = 0;
 
 // Works with either jQuery or Zepto
-})( window.jQuery || window.Zepto );
+})( window.jQuery || window.Zepto );

includes/core/assets/js/jquery.highlighter.js

@@ -11,7 +11,7 @@
  * This program is free software. It comes without any warranty, to
  * the extent permitted by applicable law. You can redistribute it
  * and/or modify it under the terms of the WTFPL, Version 2, as
- * published by Sam Hocevar. See http://sam.zoy.org/wtfpl/
+ * published by Sam Hocevar. See https://sam.zoy.org/wtfpl/
  * for more details.
  *
  * @see https://github.com/huffpostlabs/highlighter.js/blob/master/jQuery.highlighter.js
@@ -20,7 +20,7 @@
 (function ($) {
 	/*
 	 * Code for triple click from
-	 * http://css-tricks.com/snippets/jquery/triple-click-event/
+	 * https://css-tricks.com/snippets/jquery/triple-click-event/
 	 */
 	$.event.special.tripleclick = {
 
@@ -59,7 +59,7 @@
 	 * of a container in the event of a triple
 	 * click.
 	 *
-	 * Adapted from http://stackoverflow.com/a/574922
+	 * Adapted from https://stackoverflow.com/a/574922
 	 */
 	function get_previoussibling(n) {
 		var y = n, x;
@@ -109,7 +109,7 @@
 				 * Insert an html <span> after a user selects text.
 				 * We then use the X-Y coordinates of that span
 				 * to place our tooltip.
-				 * Thanks to http://stackoverflow.com/a/3599599 for
+				 * Thanks to https://stackoverflow.com/a/3599599 for
 				 * some inspiration.
 				 */
 				function insertSpanAfterSelection(clicks) {
@@ -259,7 +259,7 @@
 	 * jQuery article on best practices for
 	 * plugins.
 	 *
-	 * http://docs.jquery.com/Plugins/Authoring
+	 * https://docs.jquery.com/Plugins/Authoring
 	 */
 	$.fn.highlighter = function (method) {
 		if (methods[method]) {

includes/core/assets/js/jquery.texthighlighter.js

@@ -1140,7 +1140,7 @@ CommentPress.texthighlighter.textblocks = new function() {
 	 * array of selection objects.
 	 *
 	 * This code is based loosely on:
-	 * http://stackoverflow.com/questions/13949059/persisting-the-changes-of-range-objects-after-selection-in-html/13950376#13950376
+	 * https://stackoverflow.com/questions/13949059/persisting-the-changes-of-range-objects-after-selection-in-html/13950376#13950376
 	 *
 	 * @since 3.8
 	 */

includes/core/assets/js/jquery.waypoints.js

@@ -10,7 +10,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   var keyCounter = 0
   var allWaypoints = {}
 
-  /* http://imakewebthings.com/waypoints/api/waypoint */
+  /* https://imakewebthings.com/waypoints/api/waypoint */
   function Waypoint(options) {
     if (!options) {
       throw new Error('No options passed to Waypoint constructor')
@@ -61,36 +61,36 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/destroy */
+  /* https://imakewebthings.com/waypoints/api/destroy */
   Waypoint.prototype.destroy = function() {
     this.context.remove(this)
     this.group.remove(this)
     delete allWaypoints[this.key]
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/disable */
+  /* https://imakewebthings.com/waypoints/api/disable */
   Waypoint.prototype.disable = function() {
     this.enabled = false
     return this
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/enable */
+  /* https://imakewebthings.com/waypoints/api/enable */
   Waypoint.prototype.enable = function() {
     this.context.refresh()
     this.enabled = true
     return this
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/next */
+  /* https://imakewebthings.com/waypoints/api/next */
   Waypoint.prototype.next = function() {
     return this.group.next(this)
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/previous */
+  /* https://imakewebthings.com/waypoints/api/previous */
   Waypoint.prototype.previous = function() {
     return this.group.previous(this)
   }
@@ -107,19 +107,19 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/destroy-all */
+  /* https://imakewebthings.com/waypoints/api/destroy-all */
   Waypoint.destroyAll = function() {
     Waypoint.invokeAll('destroy')
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/disable-all */
+  /* https://imakewebthings.com/waypoints/api/disable-all */
   Waypoint.disableAll = function() {
     Waypoint.invokeAll('disable')
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/enable-all */
+  /* https://imakewebthings.com/waypoints/api/enable-all */
   Waypoint.enableAll = function() {
     Waypoint.Context.refreshAll()
     for (var waypointKey in allWaypoints) {
@@ -129,19 +129,19 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/refresh-all */
+  /* https://imakewebthings.com/waypoints/api/refresh-all */
   Waypoint.refreshAll = function() {
     Waypoint.Context.refreshAll()
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/viewport-height */
+  /* https://imakewebthings.com/waypoints/api/viewport-height */
   Waypoint.viewportHeight = function() {
     return window.innerHeight || document.documentElement.clientHeight
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/viewport-width */
+  /* https://imakewebthings.com/waypoints/api/viewport-width */
   Waypoint.viewportWidth = function() {
     return document.documentElement.clientWidth
   }
@@ -180,7 +180,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   var Waypoint = window.Waypoint
   var oldWindowLoad = window.onload
 
-  /* http://imakewebthings.com/waypoints/api/context */
+  /* https://imakewebthings.com/waypoints/api/context */
   function Context(element) {
     this.element = element
     this.Adapter = Waypoint.Adapter
@@ -341,7 +341,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/context-destroy */
+  /* https://imakewebthings.com/waypoints/api/context-destroy */
   Context.prototype.destroy = function() {
     var allWaypoints = []
     for (var axis in this.waypoints) {
@@ -355,7 +355,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/context-refresh */
+  /* https://imakewebthings.com/waypoints/api/context-refresh */
   Context.prototype.refresh = function() {
     /*eslint-disable eqeqeq */
     var isWindow = this.element == this.element.window
@@ -455,7 +455,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/context-find-by-element */
+  /* https://imakewebthings.com/waypoints/api/context-find-by-element */
   Context.findByElement = function(element) {
     return contexts[element.waypointContextKey]
   }
@@ -494,7 +494,7 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
   var Waypoint = window.Waypoint
 
-  /* http://imakewebthings.com/waypoints/api/group */
+  /* https://imakewebthings.com/waypoints/api/group */
   function Group(options) {
     this.name = options.name
     this.axis = options.axis
@@ -564,13 +564,13 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/first */
+  /* https://imakewebthings.com/waypoints/api/first */
   Group.prototype.first = function() {
     return this.waypoints[0]
   }
 
   /* Public */
-  /* http://imakewebthings.com/waypoints/api/last */
+  /* https://imakewebthings.com/waypoints/api/last */
   Group.prototype.last = function() {
     return this.waypoints[this.waypoints.length - 1]
   }
@@ -659,4 +659,4 @@ https://github.com/imakewebthings/waypoints/blob/master/licenses.txt
     window.Zepto.fn.waypoint = createExtension(window.Zepto)
   }
 }())
-;
+;