Merge pull request #50 from JiveDig/vanillajs

lesterchan · web-flow · commit 3cd09cd65402 · 2022-04-08T10:39:46.000+08:00
Remove jQuery and use fetch
diff --git a/postviews-cache.js b/postviews-cache.js
@@ -1 +1,25 @@
-jQuery.ajax({type:"GET",url:viewsCacheL10n.admin_ajax_url,data:"postviews_id="+viewsCacheL10n.post_id+"&action=postviews",cache:!1});
+fetch( viewsCacheL10n.admin_ajax_url, {
+	method: "POST",
+	credentials: 'same-origin',
+	headers: {
+		'Content-Type': 'application/x-www-form-urlencoded',
+		'Cache-Control': 'no-cache',
+	},
+	body: new URLSearchParams(
+		{
+			action: 'postviews',
+			nonce: viewsCacheL10n.nonce,
+			postviews_id: viewsCacheL10n.post_id,
+			cache: !1,
+		}
+	),
+})
+.then(function(response) {
+	return response.json();
+})
+.then(function(data) {
+})
+.catch(function(error) {
+	console.log('WP-PostViews');
+	console.log(error);
+});
diff --git a/wp-postviews.php b/wp-postviews.php
@@ -129,7 +129,6 @@ function process_postviews() {
 	}
 }
 
-
 ### Function: Calculate Post Views With WP_CACHE Enabled
 add_action('wp_enqueue_scripts', 'wp_postview_cache_count_enqueue');
 function wp_postview_cache_count_enqueue() {
@@ -165,8 +164,8 @@ function wp_postview_cache_count_enqueue() {
 
 		$should_count = apply_filters( 'postviews_should_count', $should_count, (int) $post->ID );
 		if ( $should_count ) {
-			wp_enqueue_script( 'wp-postviews-cache', plugins_url( 'postviews-cache.js', __FILE__ ), array( 'jquery' ), '1.68', true );
-			wp_localize_script( 'wp-postviews-cache', 'viewsCacheL10n', array( 'admin_ajax_url' => admin_url( 'admin-ajax.php' ), 'post_id' => (int) $post->ID ) );
+			wp_enqueue_script( 'wp-postviews-cache', plugins_url( 'postviews-cache.js', __FILE__ ), array(), '1.68', true );
+			wp_localize_script( 'wp-postviews-cache', 'viewsCacheL10n', array( 'admin_ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce( 'wp_postviews_nonce' ), 'post_id' => (int) $post->ID ) );
 		}
 	}
 }
@@ -791,7 +790,14 @@ function postviews_page_most_stats($content) {
 add_action( 'wp_ajax_postviews', 'increment_views' );
 add_action( 'wp_ajax_nopriv_postviews', 'increment_views' );
 function increment_views() {
-	if ( empty( $_GET['postviews_id'] ) ) {
+	$security = check_ajax_referer( 'wp_postviews_nonce', 'nonce' );
+
+	if ( false === $security ) {
+		wp_send_json_error();
+		wp_die();
+	}
+
+	if ( ! isset( $_POST['postviews_id'] ) || empty( $_POST['postviews_id'] ) ) {
 		return;
 	}
 
@@ -805,13 +811,13 @@ function increment_views() {
 		return;
 	}
 
-	$post_id = (int) sanitize_key( $_GET['postviews_id'] );
+	$post_id = (int) sanitize_key( $_POST['postviews_id'] );
 	if( $post_id > 0 ) {
-		$post_views = get_post_custom( $post_id );
-		$post_views = (int) $post_views['views'][0];
-		update_post_meta( $post_id, 'views', ( $post_views + 1 ) );
-		do_action( 'postviews_increment_views_ajax', ( $post_views + 1 ) );
-		echo ( $post_views + 1 );
+		$post_views = (int) get_post_meta( $post_id, 'views', true );
+		$post_views = $post_views + 1;
+		update_post_meta( $post_id, 'views', $post_views );
+		do_action( 'postviews_increment_views_ajax', $post_views );
+		wp_send_json_success( [ 'views' => $post_views ] );
 		exit();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ function process_postviews() {`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`-`
`133`	`132`	`### Function: Calculate Post Views With WP_CACHE Enabled`
`134`	`133`	`add_action('wp_enqueue_scripts', 'wp_postview_cache_count_enqueue');`
`135`	`134`	`function wp_postview_cache_count_enqueue() {`
`@@ -165,8 +164,8 @@ function wp_postview_cache_count_enqueue() {`
`165`	`164`
`166`	`165`	`$should_count = apply_filters( 'postviews_should_count', $should_count, (int) $post->ID );`
`167`	`166`	`if ( $should_count ) {`
`168`		`- wp_enqueue_script( 'wp-postviews-cache', plugins_url( 'postviews-cache.js', __FILE__ ), array( 'jquery' ), '1.68', true );`
`169`		`- wp_localize_script( 'wp-postviews-cache', 'viewsCacheL10n', array( 'admin_ajax_url' => admin_url( 'admin-ajax.php' ), 'post_id' => (int) $post->ID ) );`
	`167`	`+ wp_enqueue_script( 'wp-postviews-cache', plugins_url( 'postviews-cache.js', __FILE__ ), array(), '1.68', true );`
	`168`	`+ wp_localize_script( 'wp-postviews-cache', 'viewsCacheL10n', array( 'admin_ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce( 'wp_postviews_nonce' ), 'post_id' => (int) $post->ID ) );`
`170`	`169`	`}`
`171`	`170`	`}`
`172`	`171`	`}`
`@@ -791,7 +790,14 @@ function postviews_page_most_stats($content) {`
`791`	`790`	`add_action( 'wp_ajax_postviews', 'increment_views' );`
`792`	`791`	`add_action( 'wp_ajax_nopriv_postviews', 'increment_views' );`
`793`	`792`	`function increment_views() {`
`794`		`- if ( empty( $_GET['postviews_id'] ) ) {`
	`793`	`+ $security = check_ajax_referer( 'wp_postviews_nonce', 'nonce' );`
	`794`	`+`
	`795`	`+ if ( false === $security ) {`
	`796`	`+ wp_send_json_error();`
	`797`	`+ wp_die();`
	`798`	`+ }`
	`799`	`+`
	`800`	`+ if ( ! isset( $_POST['postviews_id'] ) \|\| empty( $_POST['postviews_id'] ) ) {`
`795`	`801`	`return;`
`796`	`802`	`}`
`797`	`803`
`@@ -805,13 +811,13 @@ function increment_views() {`
`805`	`811`	`return;`
`806`	`812`	`}`
`807`	`813`
`808`		`- $post_id = (int) sanitize_key( $_GET['postviews_id'] );`
	`814`	`+ $post_id = (int) sanitize_key( $_POST['postviews_id'] );`
`809`	`815`	`if( $post_id > 0 ) {`
`810`		`- $post_views = get_post_custom( $post_id );`
`811`		`- $post_views = (int) $post_views['views'][0];`
`812`		`- update_post_meta( $post_id, 'views', ( $post_views + 1 ) );`
`813`		`- do_action( 'postviews_increment_views_ajax', ( $post_views + 1 ) );`
`814`		`- echo ( $post_views + 1 );`
	`816`	`+ $post_views = (int) get_post_meta( $post_id, 'views', true );`
	`817`	`+ $post_views = $post_views + 1;`
	`818`	`+ update_post_meta( $post_id, 'views', $post_views );`
	`819`	`+ do_action( 'postviews_increment_views_ajax', $post_views );`
	`820`	`+ wp_send_json_success( [ 'views' => $post_views ] );`
`815`	`821`	`exit();`
`816`	`822`	`}`
`817`	`823`	`}`