← All changes | easy-footnotes.php +86 -32 1.0.4 → 1.0.12 View file →

		@@ -2,18 +2,18 @@
2	2	/**
3	3	* Plugin Name: Easy Footnotes
4	4	* Plugin URI: http://jasonyingling.me/easy-footnotes-wordpress/
5	5	* Description: Easily add footnotes to your posts with a simple shortcode.
6		- * Version: 1.0.4
	6	+ * Version: 1.0.12
7	7	* Author: Jason Yingling
8	8	* Author URI: http://jasonyingling.me
9	9	* License: GPL2
10	10	*/
11		-
12		- /* Copyright 2014 Jason Yingling (email : yingling017@gmail.com)
13	11
	12	+ /* Copyright 2017 Jason Yingling (email : yingling017@gmail.com)
	13	+
14	14	This program is free software; you can redistribute it and/or modify
15		- it under the terms of the GNU General Public License, version 2, as
	15	+ it under the terms of the GNU General Public License, version 2, as
16	16	published by the Free Software Foundation.
17	17
18	18	This program is distributed in the hope that it will be useful,
19	19	but WITHOUT ANY WARRANTY; without even the implied warranty of
		@@ -25,19 +25,27 @@
25	25	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26	26	*/
27	27
28	28	class easyFootnotes {
29		-
	29	+
30	30	// Add label option using add_option if it does not already exist
31	31	public $footnotes = array();
32	32	public $footnoteCount = 0;
33		-
	33	+ public $prevPost;
	34	+
34	35	public function __construct() {
	36	+ $footnoteSettings = array(
	37	+ 'footnoteLabel' => 'Footnotes',
	38	+ 'useLabel' => false,
	39	+ );
	40	+
	41	+ add_option('easy_footnotes_options', $footnoteSettings);
35	42	add_shortcode( 'note', array($this, 'easy_footnote_shortcode') );
36		- add_filter('the_content', array($this, 'easy_footnote_after_content'), 999);
	43	+ add_filter('the_content', array($this, 'easy_footnote_after_content'), 20);
37	44	add_action('wp_enqueue_scripts', array($this, 'register_qtip_scripts'));
	45	+ add_action('admin_menu', array($this, 'easy_footnotes_admin_actions'));
38	46	}
39		-
	47	+
40	48	public function register_qtip_scripts() {
41	49	wp_register_script( 'imagesloaded', plugins_url( '/assets/qtip/imagesloaded.pkgd.min.js' , __FILE__ ), null, false, true );
42	50	wp_register_script( 'qtip', plugins_url( '/assets/qtip/jquery.qtip.min.js' , __FILE__ ), array('jquery', 'imagesloaded'), false, true );
43	51	wp_register_script( 'qtipcall', plugins_url( '/assets/qtip/jquery.qtipcall.js' , __FILE__ ), array('jquery', 'qtip'), false, true );
		@@ -43,9 +51,9 @@
43	51	wp_register_script( 'qtipcall', plugins_url( '/assets/qtip/jquery.qtipcall.js' , __FILE__ ), array('jquery', 'qtip'), false, true );
44	52	wp_register_style( 'qtipstyles', plugins_url( '/assets/qtip/jquery.qtip.min.css' , __FILE__ ), null, false, false );
45	53	wp_register_style( 'easyfootnotescss', plugins_url( '/assets/easy-footnotes.css' , __FILE__ ), null, false, false );
46	54	}
47		-
	55	+
48	56	public function easy_footnote_shortcode($atts, $content = null) {
49	57	wp_enqueue_style( 'qtipstyles' );
50	58	wp_enqueue_style( 'easyfootnotescss' );
51	59	wp_enqueue_script( 'imagesloaded' );
		@@ -51,51 +59,97 @@
51	59	wp_enqueue_script( 'imagesloaded' );
52	60	wp_enqueue_script( 'qtip' );
53	61	wp_enqueue_script( 'qtipcall' );
54	62	wp_enqueue_style( 'dashicons' );
55		-
	63	+
56	64	extract (shortcode_atts(array(
57	65	), $atts));
58		-
59		- $this->easy_footnote_count($this->footnoteCount);
	66	+
	67	+ // Get an array of all of the footnotes
	68	+ $pattern = '/\[note\](.*?)\[\/note\]/';
	69	+ preg_match_all( $pattern, get_the_content(get_the_ID()), $shortcodes );
	70	+
	71	+ // If the current content matches the first [note] set the count to 0. This prevents extra counting by themes using the_content
	72	+ if ( $content === $shortcodes[1][0] ) {
	73	+ $count = 0;
	74	+ } else {
	75	+ $count = $this->footnoteCount;
	76	+ }
	77	+
	78	+ // Increment the counter
	79	+ $count++;
	80	+
	81	+ // Set the footnoteCount (This whole process needs reworked)
	82	+ $this->footnoteCount = $count;
	83	+
	84	+ //$this->easy_footnote_count($this->footnoteCount, get_the_ID());
60	85	$this->easy_footnote_content($content);
61		-
62		- $footnoteContent = "<span id='easy-footnote-".$this->footnoteCount."' class='easy-footnote-margin-adjust'></span><span class='easy-footnote'><a href='#easy-footnote-bottom-".$this->footnoteCount."' title='$content'><sup>$this->footnoteCount</sup></a></span>";
63		-
64		-
	86	+
	87	+ if (is_singular() && is_main_query()) {
	88	+ $footnoteLink = '#easy-footnote-bottom-'.$this->footnoteCount;
	89	+ } else {
	90	+ $footnoteLink = get_permalink(get_the_ID()).'#easy-footnote-bottom-'.$this->footnoteCount;
	91	+ }
	92	+
	93	+ $footnoteContent = "<span id='easy-footnote-".esc_attr($this->footnoteCount)."' class='easy-footnote-margin-adjust'></span><span class='easy-footnote'><a href='".esc_url($footnoteLink)."' title='".htmlspecialchars($content, ENT_QUOTES)."'><sup>".esc_html($this->footnoteCount)."</sup></a></span>";
	94	+
65	95	return $footnoteContent;
66	96	}
67		-
	97	+
68	98	public function easy_footnote_content($content) {
69	99	$this->footnotes[$this->footnoteCount] = $content;
70	100
71	101	return $this->footnotes;
72	102	}
73		-
74		- public function easy_footnote_count($count) {
	103	+
	104	+ public function easy_footnote_count($count, $currentPost) {
	105	+ if ($this->prevPost != $currentPost) {
	106	+ $count = 0;
	107	+ }
	108	+
	109	+ $this->prevPost = $currentPost;
	110	+
75	111	$count++;
76		-
	112	+
77	113	$this->footnoteCount = $count;
78		-
	114	+
79	115	return $this->footnoteCount;
80	116	}
81		-
82		- // Calculate reading time by running it through the_content
	117	+
83	118	public function easy_footnote_after_content($content) {
84		- if (is_single()) {
	119	+ if (is_singular() && is_main_query()) {
85	120	$footnotesInsert = $this->footnotes;
86		- global $footnoteCopy;
87		-
	121	+
	122	+ $footnoteCopy = '';
	123	+
	124	+ $footnoteOptions = get_option('easy_footnotes_options');
	125	+ $useLabel = $footnoteOptions['useLabel'];
	126	+ $efLabel = $footnoteOptions['footnoteLabel'];
	127	+
88	128	foreach ($footnotesInsert as $count => $footnote) {
89		- $footnoteCopy .= '<li class="easy-footnote-single"><span id="easy-footnote-bottom-'.$count.'" class="easy-footnote-margin-adjust"></span>'.$footnote.'<a class="easy-footnote-to-top" href="#easy-footnote-'.$count.'"></a></li>';
	129	+ $footnoteCopy .= '<li class="easy-footnote-single"><span id="easy-footnote-bottom-'.esc_attr($count).'" class="easy-footnote-margin-adjust"></span>'.wp_kses_post($footnote).'<a class="easy-footnote-to-top" href="'.esc_url('#easy-footnote-'.$count).'"></a></li>';
90	130	}
91		-
92		- $content .= '<ol class="easy-footnotes-wrapper">'.$footnoteCopy.'</ol>';
	131	+ if (!empty($footnotesInsert)) {
	132	+ if ($useLabel === true) {
	133	+ $content .= '<div class="easy-footnote-title"><h4>'.esc_html($efLabel).'</h4></div><ol class="easy-footnotes-wrapper">'.$footnoteCopy.'</ol>';
	134	+ } else {
	135	+ $content .= '<ol class="easy-footnotes-wrapper">'.$footnoteCopy.'</ol>';
	136	+ }
	137	+ }
	138	+
	139	+
93	140	}
94	141	return $content;
95	142	}
96		-
	143	+
	144	+ // Functions to create Reading Time admin pages
	145	+ public function easy_footnotes_admin() {
	146	+ include('easy-footnotes-admin.php');
	147	+ }
	148	+
	149	+ public function easy_footnotes_admin_actions() {
	150	+ add_options_page("Easy Footnotes Settings", "Easy Footnotes", "manage_options", "easy-footnotes-settings", array($this, "easy_footnotes_admin"));
	151	+ }
	152	+
97	153	}
98	154
99	155	$easyFootnotes = new easyFootnotes();
100		-
101		-?>