Shortcodes: Remove name requirement for [camptix_private] login.

An attendee's name is easier for a malicious person to find than their e-mail, so this doesn't add any extra protection against non-attendees viewing the content, and it adds unnecessary obstacles (e.g., if their name doesn't match exactly).
alvarogois · Mar 26, 2015 · 1ea9e8f · 1ea9e8f
1 parent fc263b7
commit 1ea9e8f
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/addons/shortcodes.php b/addons/shortcodes.php
@@ -256,8 +256,6 @@ function shortcode_private_template_redirect() {
 		$this->did_shortcode_private_template_redirect = 1;
 
 		if ( isset( $_POST['tix_private_shortcode_submit'] ) ) {
-			$first_name = isset( $_POST['tix_first_name'] ) ? trim( stripslashes( $_POST['tix_first_name'] ) ) : '';
-			$last_name  = isset( $_POST['tix_last_name'] )  ? trim( stripslashes( $_POST['tix_last_name'] ) )  : '';
 			$email      = isset( $_POST['tix_email'] )      ? trim( stripslashes( $_POST['tix_email'] ) )      : '';
 
 			// Remove cookies if a previous one was set.
@@ -266,8 +264,9 @@ function shortcode_private_template_redirect() {
 				unset( $_COOKIE['tix_view_token'] );
 			}
 
-			if ( empty( $first_name ) || empty( $last_name ) || empty( $email ) )
-				return $camptix->error( __( 'Please fill in all fields.', 'camptix' ) );
+			if ( empty( $email ) ) {
+				return $camptix->error( __( 'Please enter the e-mail address that was used to register for your ticket.', 'camptix' ) );
+			}
 
 			if ( ! is_email( $email ) )
 				return $camptix->error( __( 'The e-mail address you have entered does not seem to be valid.', 'camptix' ) );
@@ -277,14 +276,6 @@ function shortcode_private_template_redirect() {
 				'post_type' => 'tix_attendee',
 				'post_status' => 'publish',
 				'meta_query' => array(
-					array(
-						'key' => 'tix_first_name',
-						'value' => $first_name,
-					),
-					array(
-						'key' => 'tix_last_name',
-						'value' => $last_name,
-					),
 					array(
 						'key' => 'tix_email',
 						'value' => $email,
@@ -417,8 +408,6 @@ function shortcode_private( $atts, $content ) {
 	 * [camptix_private] shortcode, displays the login form.
 	 */
 	function shortcode_private_login_form( $atts, $content ) {
-		$first_name = isset( $_POST['tix_first_name'] ) ? $_POST['tix_first_name'] : '';
-		$last_name = isset( $_POST['tix_last_name'] ) ? $_POST['tix_last_name'] : '';
 		$email = isset( $_POST['tix_email'] ) ? $_POST['tix_email'] : '';
 		ob_start();
 
@@ -434,14 +423,6 @@ function shortcode_private_login_form( $atts, $content ) {
 					<tr>
 						<th class="tix-left" colspan="2"><?php _e( 'Have a ticket? Sign in', 'camptix' ); ?></th>
 					</tr>
-					<tr>
-						<td class="tix-left"><?php _e( 'First Name', 'camptix' ); ?></td>
-						<td class="tix-right"><input name="tix_first_name" value="<?php echo esc_attr( $first_name ); ?>" type="text" /></td>
-					</tr>
-					<tr>
-						<td class="tix-left"><?php _e( 'Last Name', 'camptix' ); ?></td>
-						<td class="tix-right"><input name="tix_last_name" value="<?php echo esc_attr( $last_name ); ?>" type="text" /></td>
-					</tr>
 					<tr>
 						<td class="tix-left"><?php _e( 'E-mail', 'camptix' ); ?></td>
 						<td class="tix-right"><input name="tix_email" value="<?php echo esc_attr( $email ); ?>" type="text" /></td>
@@ -487,12 +468,10 @@ function shortcode_private_display_content( $atts, $content ) {
 	}
 
 	function generate_view_token_for_attendee( $attendee_id ) {
-		$first_name = get_post_meta( $attendee_id, 'tix_first_name', true );
-		$last_name = get_post_meta( $attendee_id, 'tix_last_name', true );
 		$email = get_post_meta( $attendee_id, 'tix_email', true );
 		$ip = isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : '';
 
-		$view_token = md5( 'tix-view-token-' . strtolower( $first_name . $last_name . $email . $ip ) );
+		$view_token = md5( 'tix-view-token-' . strtolower( $email . $ip ) );
 		return $view_token;
 	}
 }