Fix bug with numeric custom entry slugs

As per valid comment here: a8c6b12#commitcomment-23020287
GravityKit · Jul 11, 2017 · 72c5545 · 72c5545
1 parent e7f53b5
commit 72c5545
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/future/includes/class-gv-entry-gravityforms.php b/future/includes/class-gv-entry-gravityforms.php
@@ -106,6 +106,7 @@ public static function from_entry( $entry ) {
 		$self->entry = $entry;
 
 		$self->ID = $self->entry['id'];
+		$self->slug = \GravityView_API::get_entry_slug( $self->ID, $self->as_entry() );
 
 		return $self;
 	}

diff --git a/future/includes/class-gv-shortcode-gravityview.php b/future/includes/class-gv-shortcode-gravityview.php
@@ -82,14 +82,14 @@ public function callback( $atts, $content = null ) {
 		/**
 		 * Editing a single entry.
 		 */
-		} else if (  $entry = $request->is_edit_entry() ) {
+		} else if ( $entry = $request->is_edit_entry() ) {
 			if ( $entry['status'] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
-			if ( is_numeric( get_query_var( \GV\Entry::get_endpoint_name() ) ) && apply_filters( 'gravityview_custom_entry_slug', false ) ) {
-				gravityview()->log->error( 'Entry ID #{entry_id} can only be accessed via slug', array( 'entry_id' => $entry->ID ) );
+			if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+				gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
@@ -110,8 +110,8 @@ public function callback( $atts, $content = null ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
-			if ( is_numeric( get_query_var( \GV\Entry::get_endpoint_name() ) ) && apply_filters( 'gravityview_custom_entry_slug', false ) ) {
-				gravityview()->log->error( 'Entry ID #{entry_id} can only be accessed via slug', array( 'entry_id' => $entry->ID ) );
+			if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+				gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 

diff --git a/future/includes/class-gv-view.php b/future/includes/class-gv-view.php
@@ -267,8 +267,8 @@ public static function content( $content ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
-			if ( is_numeric( get_query_var( \GV\Entry::get_endpoint_name() ) ) && apply_filters( 'gravityview_custom_entry_slug', false ) ) {
-				gravityview()->log->error( 'Entry ID #{entry_id} can only be accessed via slug', array( 'entry_id' => $entry->ID ) );
+			if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+				gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
@@ -289,8 +289,8 @@ public static function content( $content ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 
-			if ( is_numeric( get_query_var( \GV\Entry::get_endpoint_name() ) ) && apply_filters( 'gravityview_custom_entry_slug', false ) ) {
-				gravityview()->log->error( 'Entry ID #{entry_id} can only be accessed via slug', array( 'entry_id' => $entry->ID ) );
+			if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+				gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 

diff --git a/tests/unit-tests/GravityView_Future_Test.php b/tests/unit-tests/GravityView_Future_Test.php
@@ -152,11 +152,12 @@ public function test_entry_by_slug() {
 		$this->assertNull( $entry );
 
 		$entry = \GV\GF_Entry::by_id( $entry_id );
+		$this->assertEquals( $entry->slug, $entry_id );
 		$this->assertEquals( $entry_id, $entry->ID );
 
 		add_filter( 'gravityview_custom_entry_slug', '__return_true' );
 
-		$random = wp_generate_password( 8, false );
+		$random = strtolower( wp_generate_password( 8, false ) );
 		add_filter( 'gravityview_entry_slug', function( $slug ) use ( $random ) {
 			return "sentinel-$random";
 		}, 10 );
@@ -168,9 +169,11 @@ public function test_entry_by_slug() {
 		$this->assertNull( $entry );
 
 		$entry = \GV\GF_Entry::by_id( "sentinel-$random" );
+		$this->assertEquals( $entry->slug, "sentinel-$random" );
 		$this->assertEquals( $entry_id, $entry->ID );
 
 		$entry = \GV\GF_Entry::by_slug( "sentinel-$random" );
+		$this->assertEquals( $entry->slug, "sentinel-$random" );
 		$this->assertEquals( $entry_id, $entry->ID );
 
 		$entry = \GV\GF_Entry::by_slug( $entry_id );