Ticket #441: require-login.diff

addons/require-login.php

@@ -11 +11 @@
         public function camptix_init() {
                 add_action( 'template_redirect', array( $this, 'block_unauthenticated_actions' ), 8 );    // before CampTix_Plugin->template_redirect()
                 add_filter( 'tix_action_login',  array( $this, 'login' ) );
+                add_action( 'camptix_notices', array( $this, 'ticket_form_message' ), 8 );
+                add_action( 'camptix_attendee_form_additional_info', array( $this, 'get_attendee_form_username_field' ), 10, 3 );
+                add_filter( 'camptix_form_register_complete_attendee_object', array( $this, 'add_username_to_attendee_object' ), 10, 2 );
+                add_action( 'camptix_checkout_update_post_meta', array( $this, 'save_checkout_unsername_meta' ), 10, 2 );
+                add_filter( 'camptix_save_attendee_post_add_search_meta', array( $this, 'get_attendee_search_meta' ) );
+                add_filter( 'camptix_attendee_report_extra_columns', array( $this, 'get_attendee_report_extra_columns' ) );
+                add_filter( 'camptix_attendee_report_column_value_username', array( $this, 'get_attendee_username_meta' ), 10, 2 );
+                add_filter( 'camptix_metabox_attendee_info_additional_rows', array( $this, 'get_attendee_metabox_rows' ), 10, 2 );
+                add_action( 'camptix_form_edit_attendee_update_post_meta', array( $this, 'update_attendee_post_meta' ), 10, 2 );
+                add_action( 'camptix_form_edit_attendee_additional_info', array( $this, 'get_edit_attendee_username_field' ) );
         }
 
         /**
@@ -36 +46 @@
          * it will be overriden with the 'login' action so that they first have to login.
          */
         public function block_unauthenticated_actions() {
+
                 if ( ! is_user_logged_in() && isset( $_REQUEST['tix_action'] ) && 'login' != $_REQUEST['tix_action'] ) {
+
                         //$_GET['tix_action'] = $_POST['tix_action'] = $_REQUEST['tix_action'] = 'login';
 
-                        wp_safe_redirect( wp_login_url( site_url( $_SERVER['REQUEST_URI'] ) ) );
+                        // merge the _post and _get for passing after successful login.
+                        // new array should contain tix_action, tix_tickets_selected, and tix_coupon
+                        // the 3 need to be passed to continue the purchase process after login
+                        $urlData = array_merge( $_POST, $_GET );
+
+                        // had an issue with site_url( $_SERVER['REQUEST_URI'] ) when WP is in a subdirectory
+                        // switched to $GLOBALS['camptix']->get_tickets_url() and appending the query vars to pass on after login
+                        wp_safe_redirect( wp_login_url( $GLOBALS['camptix']->get_tickets_url() . '?' . http_build_query( $urlData ) ) );
                         exit();
 
                         // need to make default login message for standalone camptix installs, but filter it so wordcamp.org can override with special instructions
@@ -49 +68 @@
 
                         // what about edit token and access token, etc. should those be allowed without login?
                         // should you save the previous action and post/get, then restore it once then login? v2 maybe
+                } else if ( is_user_logged_in() && isset( $_REQUEST['tix_action'] ) && isset( $_GET['tix_tickets_selected'] ) ) {
+                        
+                        // if the ticket(s) requested are in the url, put them in _post so camptix can pick up and run after login
+                        $_POST['tix_tickets_selected'] = $_GET['tix_tickets_selected'];
+                }
+        }
+        
+        public function ticket_form_message() {
+                // add message to top of tickets initial form to alert them that they will have to login
+                if ( ! is_user_logged_in() ) {
+                        $GLOBALS['camptix']->notice( __( 'You will be prompted to login after clicking register.', 'camptix' ) );
+                }
+        }
+        
+        public function get_attendee_form_username_field( $form_data, $currentIteration, $totalCount ) {
+                ?>
+                <tr class="tix-row-username">
+                        <td class="tix-required tix-left"><?php _e( 'Username', 'camptix' ); ?> <span class="tix-required-star">*</span></td>
+                        <?php
+                                $value = '';
+                                if ( isset( $form_data['tix_attendee_info'][$currentIteration]['username'] ) ) {
+                                        $value = $form_data['tix_attendee_info'][$currentIteration]['username'];
+                                } else if ( $currentIteration == 1 ) {
+                                        $current_user = wp_get_current_user();
+                                        $value = $current_user->user_login;
+                                }
+                        ?>
+                        <td class="tix-right"><input name="tix_attendee_info[<?php echo $currentIteration; ?>][username]" type="text" value="<?php echo esc_attr( $value ); ?>" /></td>
+                </tr>
+                <?php
+        }
+        
+        public function add_username_to_attendee_object( $attendee, $attendee_info ) {
+                $attendee->username = sanitize_text_field( $attendee_info['username'] );
+                if ( empty( $attendee->username ) ) {
+                        $GLOBALS['camptix']->error_flag( 'required_fields' );
                 }
+                /* Need a way to send a better error message for when the provided username doesn't exist */
+                $testUsername = username_exists( $attendee->username );
+                if ( empty( $testUsername ) ) {
+                        $GLOBALS['camptix']->error_flag( 'required_fields' );
+                }
+                return $attendee;
+        }
+        
+        public function save_checkout_unsername_meta( $post_id, $attendee ) {
+                update_post_meta( $post_id, 'tix_username', $attendee->username );
+        }
+        
+        public function get_attendee_search_meta( $attendee_search_meta ) {
+                $attendee_search_meta[] = 'tix_username';
+                return $attendee_search_meta;
+        }
+        
+        public function get_attendee_report_extra_columns( $extra_columns ) {
+                $extra_columns['username'] = __( 'User Name', 'camptix' );
+        }
+        
+        public function get_attendee_username_meta( $data, $attendee ) {
+                return get_post_meta( $attendee->ID, 'tix_username', true );
+        }
+        
+        public function get_attendee_metabox_rows( $rows, $post ) {
+                $rows[] = array( __( 'User Name', 'camptix' ), esc_html( get_post_meta( $post->ID, 'tix_username', true ) ) );
+                return $rows;
+        }
+        
+        public function update_attendee_post_meta( $new_ticket_info, $attendee ) {
+                update_post_meta( $attendee->ID, 'tix_username', sanitize_text_field( $new_ticket_info['username'] ) );
+        }
+        
+        public function get_edit_attendee_username_field( $attendee ) {
+                ?>
+                <tr>
+                        <td class="tix-required tix-left"><?php _e( 'Username', 'camptix' ); ?> <span class="tix-required-star">*</span></td>
+                        <td class="tix-right"><input name="tix_ticket_info[username]" type="text" value="<?php echo esc_attr( get_post_meta( $attendee->ID, 'tix_username', true ) ); ?>" /></td>
+                </tr>
+                <?php
         }
+        
 }
 
 camptix_register_addon( 'CampTix_Require_Login' );