Completed
Branch BUG-9098-fix-EEA-shortcode-eve... (cb2fed)
by
unknown
498:37 queued 482:41
created
registrations/templates/attendee_registrations_main_meta_box.template.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -5,42 +5,42 @@
 block discarded – undo
5 5
 		<table class="admin-primary-mbox-tbl">
6 6
 			<thead>
7 7
 				<tr>
8
-					<th class="jst-left"><?php _e( 'Event Name', 'event_espresso' );?></th>
9
-					<th class="jst-left"><?php _e( 'REG ID', 'event_espresso' );?></th>
10
-					<th class="jst-left"><?php _e( 'TXN ID', 'event_espresso' );?></th>
11
-					<th class="jst-left"><?php _e( 'Reg Code', 'event_espresso' );?></th>
12
-					<th class="jst-rght"><?php _e( 'Ticket Price', 'event_espresso' );?></th>
8
+					<th class="jst-left"><?php _e('Event Name', 'event_espresso'); ?></th>
9
+					<th class="jst-left"><?php _e('REG ID', 'event_espresso'); ?></th>
10
+					<th class="jst-left"><?php _e('TXN ID', 'event_espresso'); ?></th>
11
+					<th class="jst-left"><?php _e('Reg Code', 'event_espresso'); ?></th>
12
+					<th class="jst-rght"><?php _e('Ticket Price', 'event_espresso'); ?></th>
13 13
 				</tr>
14 14
 			</thead>
15 15
 			<tbody>
16
-			<?php foreach( $registrations as $registration ) : ?>
16
+			<?php foreach ($registrations as $registration) : ?>
17 17
 				<tr>
18 18
 					<td class="jst-left">
19 19
 					<?php
20
-						$event_url = add_query_arg( array( 'action' => 'edit', 'post' => $registration->event_ID() ), admin_url( 'admin.php?page=espresso_events' ));
21
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $registration->event_ID() ) ?  '<a href="'. $event_url .'"  title="'. esc_attr__( 'Edit Event', 'event_espresso' ) .'">' . $registration->event_name() . '</a>' : $registration->event_name();
20
+						$event_url = add_query_arg(array('action' => 'edit', 'post' => $registration->event_ID()), admin_url('admin.php?page=espresso_events'));
21
+						echo EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $registration->event_ID()) ? '<a href="'.$event_url.'"  title="'.esc_attr__('Edit Event', 'event_espresso').'">'.$registration->event_name().'</a>' : $registration->event_name();
22 22
 					?>
23 23
 					</td>
24 24
 					<td class="jst-left">
25 25
 					<?php
26
-							$reg_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
27
-							echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
28
-							<a href="'.$reg_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . 
29
-								__( 'View Registration', 'event_espresso' ) .
26
+							$reg_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
27
+							echo EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
28
+							<a href="'.$reg_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'. 
29
+								__('View Registration', 'event_espresso').
30 30
 							'</a>' : $registration->ID();
31 31
 					?>
32 32
 					</td>
33 33
 					<td class="jst-left">
34 34
 					<?php
35
-						$txn_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID() ), TXN_ADMIN_URL );
36
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ? '
37
-						<a href="'.$txn_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '">' .
38
-							sprintf( __('View Transaction %d', 'event_espresso'), $registration->transaction_ID() ) .
35
+						$txn_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID()), TXN_ADMIN_URL);
36
+						echo EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '
37
+						<a href="'.$txn_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'">'.
38
+							sprintf(__('View Transaction %d', 'event_espresso'), $registration->transaction_ID()).
39 39
 						'</a>' : $registration->transaction_ID();
40 40
 					?>
41 41
 					</td>
42
-					<td class="jst-left"><?php echo $registration->reg_code();?></td>
43
-					<td class="jst-rght"><?php echo EEH_Template::format_currency( $registration->final_price() );?></td>
42
+					<td class="jst-left"><?php echo $registration->reg_code(); ?></td>
43
+					<td class="jst-rght"><?php echo EEH_Template::format_currency($registration->final_price()); ?></td>
44 44
 				</tr>
45 45
 			<?php endforeach; ?>
46 46
 			</tbody>
Please login to merge, or discard this patch.
espresso_event_attendees/EES_Espresso_Event_Attendees.shortcode.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	 * @param       WP $WP
20 20
 	 * @return    void
21 21
 	 */
22
-	public function run( WP $WP ) {}
22
+	public function run(WP $WP) {}
23 23
 
24 24
 
25 25
 	/**
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
 	 *  @param 	    array 	$attributes
70 70
 	 *  @return 	string
71 71
 	 */
72
-	public function process_shortcode( $attributes = array() ) {
72
+	public function process_shortcode($attributes = array()) {
73 73
 
74 74
 		//load helpers
75
-		EE_Registry::instance()->load_helper( 'Event_View' );
76
-		EE_Registry::instance()->load_helper( 'Template' );
75
+		EE_Registry::instance()->load_helper('Event_View');
76
+		EE_Registry::instance()->load_helper('Template');
77 77
 
78 78
 		// merge in any attributes passed via fallback shortcode processor
79
-		$attributes = array_merge( (array) $attributes, (array) $this->_attributes );
79
+		$attributes = array_merge((array) $attributes, (array) $this->_attributes);
80 80
 
81 81
 		//set default attributes
82 82
 		$default_shortcode_attributes = array(
@@ -88,9 +88,9 @@  discard block
 block discarded – undo
88 88
 		);
89 89
 
90 90
 		// allow the defaults to be filtered
91
-		$default_shortcode_attributes = apply_filters( 'EES_Espresso_Event_Attendees__process_shortcode__default_shortcode_atts', $default_shortcode_attributes );
91
+		$default_shortcode_attributes = apply_filters('EES_Espresso_Event_Attendees__process_shortcode__default_shortcode_atts', $default_shortcode_attributes);
92 92
 		// grab attributes and merge with defaults, then extract
93
-		$attributes = array_merge( $default_shortcode_attributes, $attributes );
93
+		$attributes = array_merge($default_shortcode_attributes, $attributes);
94 94
 
95 95
 		$template_args = array(
96 96
 			'contacts'      => array(),
@@ -106,31 +106,31 @@  discard block
 block discarded – undo
106 106
 		$error = false;
107 107
 
108 108
 		//what event?
109
-		if ( empty( $attributes['event_id'] ) && empty( $attributes['datetime_id'] ) && empty( $attributes['ticket_id'] ) ) {
109
+		if (empty($attributes['event_id']) && empty($attributes['datetime_id']) && empty($attributes['ticket_id'])) {
110 110
 			//seems like is_espresso_event_single() isn't working as expected. So using alternate method.
111
-			if ( is_single() && is_espresso_event() ) {
111
+			if (is_single() && is_espresso_event()) {
112 112
 				$event = EEH_Event_View::get_event();
113
-				if ( $event instanceof EE_Event ) {
113
+				if ($event instanceof EE_Event) {
114 114
 					$template_args['event']          = $event;
115 115
 					$query[0]['Registration.EVT_ID'] = $event->ID();
116 116
 				}
117 117
 			} else {
118 118
 				//try getting the earliest active event if none then get the
119
-				$events = EEM_Event::instance()->get_active_events( array( 'limit'    => 1,
120
-				                                                          'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
121
-				) );
122
-				$events = empty( $events ) ? EEM_Event::instance()->get_upcoming_events( array( 'limit'    => 1,
123
-				                                                                              'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
124
-				) ) : $events;
125
-				$event = reset( $events );
126
-				if ( $event instanceof EE_Event ) {
119
+				$events = EEM_Event::instance()->get_active_events(array('limit'    => 1,
120
+				                                                          'order_by' => array('Datetime.DTT_EVT_start' => 'ASC')
121
+				));
122
+				$events = empty($events) ? EEM_Event::instance()->get_upcoming_events(array('limit'    => 1,
123
+				                                                                              'order_by' => array('Datetime.DTT_EVT_start' => 'ASC')
124
+				)) : $events;
125
+				$event = reset($events);
126
+				if ($event instanceof EE_Event) {
127 127
 					$query[0]['Registration.EVT_ID'] = $event->ID();
128 128
 					$template_args['event']          = $event;
129 129
 				}
130 130
 			}
131
-		} elseif ( ! empty( $attributes['event_id'] ) ) {
132
-			$event = EEM_Event::instance()->get_one_by_ID( $attributes['event_id'] );
133
-			if ( $event instanceof EE_Event ) {
131
+		} elseif ( ! empty($attributes['event_id'])) {
132
+			$event = EEM_Event::instance()->get_one_by_ID($attributes['event_id']);
133
+			if ($event instanceof EE_Event) {
134 134
 				$query[0]['Registration.EVT_ID'] = $attributes['event_id'];
135 135
 				$template_args['event']          = $event;
136 136
 			} else {
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
 		}
140 140
 
141 141
 		//datetime?
142
-		if ( ! empty( $attributes['datetime_id'] ) && empty( $attributes['event_id'] ) ) {
143
-			$datetime = EEM_Datetime::instance()->get_one_by_ID( $attributes['datetime_id'] );
144
-			if ( $datetime instanceof EE_Datetime ) {
142
+		if ( ! empty($attributes['datetime_id']) && empty($attributes['event_id'])) {
143
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($attributes['datetime_id']);
144
+			if ($datetime instanceof EE_Datetime) {
145 145
 				$query[0]['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetime_id'];
146 146
 				$query['default_where_conditions'] = 'this_model_only';
147 147
 				$template_args['datetime']                      = $datetime;
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 		}
153 153
 
154 154
 		//ticket?just
155
-		if ( ! empty( $attributes['ticket_id'] ) && empty( $attributes['event_id'] ) && empty( $attributes['datetime_id'] ) ) {
156
-			$ticket = EEM_Ticket::instance()->get_one_by_ID( $attributes['ticket_id'] );
157
-			if ( $ticket instanceof EE_Ticket ) {
155
+		if ( ! empty($attributes['ticket_id']) && empty($attributes['event_id']) && empty($attributes['datetime_id'])) {
156
+			$ticket = EEM_Ticket::instance()->get_one_by_ID($attributes['ticket_id']);
157
+			if ($ticket instanceof EE_Ticket) {
158 158
 				$query[0]['Registration.TKT_ID'] = $attributes['ticket_id'];
159 159
 				$template_args['ticket']         = $ticket;
160 160
 				$template_args['event']          = $ticket->first_datetime() instanceof EE_Datetime ? $ticket->first_datetime()->event() : null;
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 
166 166
 		//status
167 167
 		$reg_status_array = EEM_Registration::reg_status_array();
168
-		if ( $attributes['status'] != 'all' && isset( $reg_status_array[$attributes['status']] ) ) {
168
+		if ($attributes['status'] != 'all' && isset($reg_status_array[$attributes['status']])) {
169 169
 			$query[0]['Registration.STS_ID'] = $attributes['status'];
170 170
 		}
171
-		$query['group_by'] = array( 'ATT_ID' );
172
-		$query['order_by'] = apply_filters( 'FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by', array( 'ATT_lname' => 'ASC', 'ATT_fname' => 'ASC' ) );
171
+		$query['group_by'] = array('ATT_ID');
172
+		$query['order_by'] = apply_filters('FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by', array('ATT_lname' => 'ASC', 'ATT_fname' => 'ASC'));
173 173
 
174 174
 		//if we have NO query where conditions, then there was an invalid parameter or the shortcode was used incorrectly
175 175
 		//so when WP_DEBUG is set and true, we'll show a message, otherwise we'll just return an empty string.
176
-		if ( ( ! isset( $query[0] ) || ! is_array( $query[0] ) ) || $error ) {
177
-			if ( WP_DEBUG ) {
178
-				return '<div class="important-notice ee-attention">' . __( 'The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.', 'event_espresso' ) . '</div>';
176
+		if (( ! isset($query[0]) || ! is_array($query[0])) || $error) {
177
+			if (WP_DEBUG) {
178
+				return '<div class="important-notice ee-attention">'.__('The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.', 'event_espresso').'</div>';
179 179
 			} else {
180 180
 				return '';
181 181
 			}
@@ -183,11 +183,11 @@  discard block
 block discarded – undo
183 183
 
184 184
 
185 185
 		//get contacts!
186
-		$template_args['contacts'] = EEM_Attendee::instance()->get_all( $query );
186
+		$template_args['contacts'] = EEM_Attendee::instance()->get_all($query);
187 187
 
188 188
 
189 189
 		//all set let's load up the template and return.
190
-		return EEH_Template::locate_template( 'loop-espresso_event_attendees.php', $template_args, true, true );
190
+		return EEH_Template::locate_template('loop-espresso_event_attendees.php', $template_args, true, true);
191 191
 
192 192
 	}
193 193
 
Please login to merge, or discard this patch.