eventespresso / event-espresso-core

admin_pages/messages/templates/shortcode_selector_skeleton.template.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file contains the template for the Messages Shortcode selector.
- *
- * Template args available are:
- * @type    array   $shortcodes An array indexed by shortcode and the values are the labels.
- * @type    string  $fieldname  The name of the field the chooser is associated with.
- * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
- */
+			 * This file contains the template for the Messages Shortcode selector.
+			 *
+			 * Template args available are:
+			 * @type    array   $shortcodes An array indexed by shortcode and the values are the labels.
+			 * @type    string  $fieldname  The name of the field the chooser is associated with.
+			 * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
+			 */
 if ( ! empty( $shortcodes ) ) : ?>
 <span class="ee-messages-shortcodes-chooser js-open-list-trigger dashicons dashicons-menu">
 	<ul id="ee_shortcode_chooser_<?php echo $fieldname; ?>" class="ee_shortcode_chooser_container hidden">

Spacing +4 added lines, -4 removed lines

@@ -7,14 +7,14 @@
  * @type    string  $fieldname  The name of the field the chooser is associated with.
  * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
  */
-if ( ! empty( $shortcodes ) ) : ?>
+if ( ! empty($shortcodes)) : ?>
 <span class="ee-messages-shortcodes-chooser js-open-list-trigger dashicons dashicons-menu">
 	<ul id="ee_shortcode_chooser_<?php echo $fieldname; ?>" class="ee_shortcode_chooser_container hidden">
-		<?php foreach( $shortcodes as $shortcode => $label ) : ?>
+		<?php foreach ($shortcodes as $shortcode => $label) : ?>
 			<li>
-				<span class="js-shortcode-selection" data-value="<?php echo esc_attr( $shortcode ); ?>" data-linked-input-id="<?php echo esc_attr( $linked_input_id ); ?>"><?php echo $shortcode; ?></span>
+				<span class="js-shortcode-selection" data-value="<?php echo esc_attr($shortcode); ?>" data-linked-input-id="<?php echo esc_attr($linked_input_id); ?>"><?php echo $shortcode; ?></span>
 			</li>
 		<?php endforeach; ?>
 	</ul>
 </span>
-<?php endif ; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file

admin_pages/transactions/templates/txn_admin_details_main_meta_box_txn_details.template.php

Spacing +115 added lines, -115 removed lines

@@ -1,7 +1,7 @@ 
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
 
 	<h4 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="dashicons dashicons-cart"></span><?php _e( 'Transaction Items', 'event_espresso' );?>
+		<span class="dashicons dashicons-cart"></span><?php _e('Transaction Items', 'event_espresso'); ?>
 	</h4>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -10,27 +10,27 @@ 
 	</div>
 
 	<a id="display-additional-transaction-session-info" class="display-the-hidden smaller-text" rel="additional-transaction-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional transaction session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional transaction session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-transaction-session-info-dv" class="hidden">
 
 		<a id="hide-additional-transaction-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-transaction-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional transaction session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional transaction session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h4 class="admin-primary-mbox-h4"><?php _e( 'Transaction Session Details', 'event_espresso' );?></h4>
+		<h4 class="admin-primary-mbox-h4"><?php _e('Transaction Session Details', 'event_espresso'); ?></h4>
 
 		<table id="admin-primary-mbox-txn-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
+			<?php foreach ($txn_details as $key => $txn_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $txn_detail['value'];?>
+						<?php echo $txn_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $txn_details?>
@@ -40,10 +40,10 @@ 
 	<br class="clear"/>
 
 
-	<?php if ( $attendee instanceof EE_Attendee && ( $grand_raw_total > 0 || $TXN_status != 'TCM' ) ) : ?>
+	<?php if ($attendee instanceof EE_Attendee && ($grand_raw_total > 0 || $TXN_status != 'TCM')) : ?>
 
 	<h4 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="ee-icon ee-icon-cash"></span><?php _e( 'Payment Details', 'event_espresso' );?>
+		<span class="ee-icon ee-icon-cash"></span><?php _e('Payment Details', 'event_espresso'); ?>
 	</h4>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -52,75 +52,75 @@ 
 				<tr>
 					<th></th>
 					<th class="jst-cntr"></th>
-					<th class="jst-cntr"><?php _e( 'ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Date', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Source', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Method', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Gateway Response', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'P.O. / S.O.&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Notes / Extra&nbsp;Accounting', 'event_espresso' );?></th>
-					<!--<th class="jst-left"><?php _e( 'Details', 'event_espresso' );?></th>-->
-					<th class="jst-cntr"><?php _e( 'Amount', 'event_espresso' );?></th>
+					<th class="jst-cntr"><?php _e('ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Date', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Source', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Method', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Gateway Response', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Notes / Extra&nbsp;Accounting', 'event_espresso'); ?></th>
+					<!--<th class="jst-left"><?php _e('Details', 'event_espresso'); ?></th>-->
+					<th class="jst-cntr"><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-		<?php if ( $payments ) : ?>
+		<?php if ($payments) : ?>
 			<?php $payment_total = 0; ?>
-			<?php foreach ( $payments as $PAY_ID => $payment ) : ?>
-				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID;?>">
+			<?php foreach ($payments as $PAY_ID => $payment) : ?>
+				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID; ?>">
 					<td>
 						<span id="payment-status-<?php echo $PAY_ID; ?>" class="ee-status-strip-td ee-status-strip pymt-status-<?php echo $payment->STS_ID(); ?>"></span>
-						<div id="payment-STS_ID-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->STS_ID();?></div>
-						<div id="reg-payments-<?php echo $PAY_ID;?>" class="hidden"><?php echo json_encode( $existing_reg_payments[ $PAY_ID ] );?></div>
+						<div id="payment-STS_ID-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->STS_ID(); ?></div>
+						<div id="reg-payments-<?php echo $PAY_ID; ?>" class="hidden"><?php echo json_encode($existing_reg_payments[$PAY_ID]); ?></div>
 					</td>
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
 						</ul>
 					</td>
 					<td class=" jst-rght">
-						<div id="payment-id-<?php echo $PAY_ID;?>"><?php echo $PAY_ID;?></div>
+						<div id="payment-id-<?php echo $PAY_ID; ?>"><?php echo $PAY_ID; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-date-<?php echo $PAY_ID;?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'h:i a');?></div>
+						<div id="payment-date-<?php echo $PAY_ID; ?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'h:i a'); ?></div>
 					</td>
 					<td class=" jst-cntr">
-						<div id="payment-method-<?php echo $PAY_ID;?>">
-							<?php echo $payment->source();?>
+						<div id="payment-method-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->source(); ?>
 						</div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-gateway-<?php echo $PAY_ID;?>">
-							<?php echo $payment->payment_method() ?  $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso');?>
+						<div id="payment-gateway-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'); ?>
 						</div>
-						<div id="payment-gateway-id-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0;?></div>
+						<div id="payment-gateway-id-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-response-<?php echo $PAY_ID;?>"><?php echo $payment->gateway_response();?></div>
+						<div id="payment-response-<?php echo $PAY_ID; ?>"><?php echo $payment->gateway_response(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->txn_id_chq_nmbr();?></div>
+						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->txn_id_chq_nmbr(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-po-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->po_number();?></div>
+						<div id="payment-po-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->po_number(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-accntng-<?php echo $PAY_ID;?>"><?php echo $payment->extra_accntng();?></div>
+						<div id="payment-accntng-<?php echo $PAY_ID; ?>"><?php echo $payment->extra_accntng(); ?></div>
 					</td>
 					<td class=" jst-rght">
-						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-' . $payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
-						<span class="<?php echo $payment_class;?>">
-							<div id="payment-amount-<?php echo $PAY_ID;?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE ); ?></div>
+						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-'.$payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
+						<span class="<?php echo $payment_class; ?>">
+							<div id="payment-amount-<?php echo $PAY_ID; ?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE); ?></div>
 						</span>
 					</td>
 				</tr>
@@ -130,25 +130,25 @@ 
 			<?php endforeach; // $payment?>
 			<?php
 				$pay_totals_class = $payment_total > $grand_raw_total ? ' important-notice' : '';
-				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">' . __( 'This transaction has been overpaid ! ', 'event_espresso' ) . '</span>' : '';
+				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">'.__('This transaction has been overpaid ! ', 'event_espresso').'</span>' : '';
 			?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
-				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class;?>">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid . sprintf( __( 'Payments Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );?></span></th>
-					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE);?></span></th>
+				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class; ?>">
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid.sprintf(__('Payments Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); ?></span></th>
+					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE); ?></span></th>
 				</tr>
 		<?php else : ?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
 				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __( 'Payments Total', 'event_espresso' );?></span></th>
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __('Payments Total', 'event_espresso'); ?></span></th>
 					<th class=" jst-rght"><span id="txn-admin-payment-total"></span></th>
 				</tr>
 		<?php endif; // $payments?>
@@ -161,12 +161,12 @@ 
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
@@ -213,12 +213,12 @@ 
 	<ul id="txn-admin-payment-options-ul">
 		<li>
 			<a id="display-txn-admin-apply-payment" class="button-primary no-icon no-hide" rel="txn-admin-apply-payment" > <!--display-the-hidden -->
-				<?php _e( 'Apply Payment', 'event_espresso' );?>
+				<?php _e('Apply Payment', 'event_espresso'); ?>
 			</a>
 		</li>
 		<li>
 			<a id="display-txn-admin-apply-refund" class="button-secondary no-icon no-hide" rel="txn-admin-apply-refund" >  <!--display-the-hidden -->
-				<?php _e( 'Apply Refund', 'event_espresso' );?>
+				<?php _e('Apply Refund', 'event_espresso'); ?>
 			</a>
 		</li>
 	</ul>
@@ -228,14 +228,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-add float-left"></div>
-			<?php echo __( 'Apply a Payment to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Payment to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Payment #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -246,7 +246,7 @@ 
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Refund #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -255,14 +255,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-remove float-left"></div>
-			<?php echo __( 'Apply a Refund to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Refund to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-apply-payment-frm" id="txn-admin-apply-payment-frm" action="<?php echo $apply_payment_form_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_apply_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce('espresso_apply_payment_nonce'); ?>"/>
 					<input  type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
 					<input  type="hidden" name="noheader" id="txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="txn_admin_payment[PAY_ID]" id="txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
@@ -270,108 +270,108 @@ 
 					<input  type="hidden" name="txn_admin_payment[type]" id="txn-admin-payment-type-inp" value="1"/>
 					<input  type="hidden" name="txn_admin_payment[details]" id="txn-admin-payment-details-inp" value=""/>
 					<input  type="hidden" name="txn_admin_delete_payment_form_url" id="txn-admin-delete-payment-form-url-inp" value="<?php echo $delete_payment_form_url; ?>"/>
-					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
+					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
 
 					<div class="txn-admin-apply-payment-date-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-date-inp" class=""><?php _e( 'Payment Date', 'event_espresso' );?></label>
-						<input name="txn_admin_payment[date]" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
-						<p class="description"><?php _e( 'The date the payment was actually made on', 'event_espresso' );?></p>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-date-inp" class=""><?php _e('Payment Date', 'event_espresso'); ?></label>
+						<input name="txn_admin_payment[date]" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
+						<p class="description"><?php _e('The date the payment was actually made on', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-amount-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-amount-inp" class=""><?php _e( 'Amount', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-amount-inp" class=""><?php _e('Amount', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[amount]" id="txn-admin-payment-amount-inp" class="txn-admin-apply-payment-inp required" type="text" value=""/>
-						<p class="description"><?php _e( 'The amount of the payment', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The amount of the payment', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-method-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-method-inp" class=""><?php _e( 'Method of Payment', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-method-inp" class=""><?php _e('Method of Payment', 'event_espresso'); ?></label>
 						<select name="txn_admin_payment[PMD_ID]" id="txn-admin-payment-method-slct" class="txn-admin-apply-payment-slct required" type="text" >
-						<?php foreach ( $payment_methods as $method ) : ?>
+						<?php foreach ($payment_methods as $method) : ?>
 							<?php $selected = $method->slug() == 'cash' ? ' selected="selected"' : ''; ?>
-							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key( $method->admin_desc() ) ? substr( $method->admin_desc(), 0, 128) : $method->admin_name() ; ?>&nbsp;&nbsp;</option>
+							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key($method->admin_desc()) ? substr($method->admin_desc(), 0, 128) : $method->admin_name(); ?>&nbsp;&nbsp;</option>
 						<?php endforeach; ?>
 						</select>
-						<p class="description"><?php _e( 'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso' );?></p>
+						<p class="description"><?php _e('Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="mop-PP mop-CC mop-CHQ mop">
 						<div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e( 'TXN ID / CHQ #', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e('TXN ID / CHQ #', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[txn_id_chq_nmbr]" id="txn-admin-payment-txn-id-chq-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-							<p class="description"><?php _e( 'The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-CC mop" style="display:none">
 						<div class="txn-admin-apply-payment-response-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e( 'Gateway Response', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e('Gateway Response', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[gateway_response]" id="txn-admin-payment-gateway-response-inp" class="txn-admin-apply-payment-inp" type="text"/>
-							<p class="description"><?php _e( 'The gateway response string (optional)', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The gateway response string (optional)', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-PP mop-CC mop">
 						<div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-status-inp" class=""><?php _e( 'Payment Status', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-status-inp" class=""><?php _e('Payment Status', 'event_espresso'); ?></label>
 							<select name="txn_admin_payment[status]" id="txn-admin-payment-status-slct" class="txn-admin-apply-payment-slct" type="text" >
-							<?php foreach ( $payment_status as $STS_ID => $STS_code ) : ?>
+							<?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
 								<?php $selected = $STS_ID == 'PAP' ? ' selected="selected"' : ''; ?>
 								<option id="payment-status-opt-<?php echo $STS_ID; ?>" value="<?php echo $STS_ID; ?>"<?php echo $selected; ?>><?php echo $STS_code; ?>&nbsp;&nbsp;</option>
 							<?php endforeach; ?>
 							</select>
-							<p class="description"><?php _e( 'Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso' );?></p>
+							<p class="description"><?php _e('Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="txn-admin-apply-payment-po-nmbr-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e( 'P.O. / S.O. #', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e('P.O. / S.O. #', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[po_number]" id="txn-admin-payment-po-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-						<p class="description"><?php _e( 'The Purchase or Sales Order Number if any (optional)', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The Purchase or Sales Order Number if any (optional)', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e( 'Notes / Extra Accounting', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e('Notes / Extra Accounting', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[accounting]" id="txn-admin-payment-accounting-inp" class="txn-admin-apply-payment-inp" type="text" value="<?php echo $REG_code; ?>" maxlength="100"/>		<input type="hidden" id="txn-admin-reg-code-inp" value="<?php echo $REG_code; ?>"/>
-						<p class="description"><?php _e( 'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-registrations-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e( 'Registrations to Apply Payment to:', 'event_espresso' ); ?></label>
+						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e('Registrations to Apply Payment to:', 'event_espresso'); ?></label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="1" id="txn-admin-apply-payment-to-all-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]"  checked="checked"/>
-							<?php _e( 'ALL Registrations', 'event_espresso' ); ?>
+							<?php _e('ALL Registrations', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="0" id="txn-admin-apply-payment-to-some-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]" />
-							<?php _e( 'Just the following Registrations', 'event_espresso' ); ?>
+							<?php _e('Just the following Registrations', 'event_espresso'); ?>
 						</label>
 						<?php echo $registrations_to_apply_payment_to; ?>
 					</div>
 
 					<div class="txn-admin-payment-reg-status-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $status_change_select; ?>
-						<p class="description"><?php _e( 'If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso' ); ?></p>
+						<p class="description"><?php _e('If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso'); ?></p>
 						<br/>
 					</div>
 
 					<div class="txn-admin-apply-payment-send-notifications-dv admin-modal-dialog-row">
 
-						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_payments[send_notifications]" checked="checked" aria-checked="true" style="vertical-align: middle;">
-							<?php _e( 'Payment Messages?', 'event_espresso' ); ?>
+							<?php _e('Payment Messages?', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_reg_status_change[send_notifications]" style="vertical-align: middle;">
-							<?php _e( 'Registration Messages?', 'event_espresso' ); ?>
+							<?php _e('Registration Messages?', 'event_espresso'); ?>
 						</label>
 						<br class="clear-float"/>
-						<p class="description"><?php printf( __('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />' ); ?></p>
+						<p class="description"><?php printf(__('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />'); ?></p>
 						<label></label>
 					</div>
 					<div class="clear"></div>
@@ -382,27 +382,27 @@ 
 			<ul id="admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-apply-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Payment', 'event_espresso' );?>
+						<?php _e('Apply Payment', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Payment Details', 'event_espresso' );?>
+						<?php _e('Save Payment Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Refund Details', 'event_espresso' );?>
+						<?php _e('Save Refund Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-apply-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Refund', 'event_espresso' );?>
+						<?php _e('Apply Refund', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -419,29 +419,29 @@ 
 
 		<h2 id="admin-modal-dialog-delete-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<span class="ee-icon ee-icon-cash-add"></span>
-			<?php echo __( 'Delete Payment/Refund for Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Delete Payment/Refund for Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-delete-payment-frm" id="txn-admin-delete-payment-frm" action="<?php echo $delete_payment_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_delete_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce('espresso_delete_payment_nonce'); ?>"/>
 					<input  type="hidden" name="delete_espresso_ajax" id="delete-espresso-ajax" value="0"/>
 					<input  type="hidden" name="delete_noheader" id="delete-txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[PAY_ID]" id="delete-txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[TXN_ID]" id="delete-txn-admin-payment-txn-id-inp" value="<?php echo $txn_nmbr['value']; ?>"/>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $delete_status_change_select; ?>
-						<p class="description"><?php printf( __('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
+						<p class="description"><?php printf(__('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 					</div>
 
 					<div class="ee-attention txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<input type="checkbox" value="1" name="delete_txn_reg_status_change[send_notifications]">
-						<p class="description"><?php _e( 'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso'); ?></p>
 					</div>
 					<div class="clear"></div>
 
@@ -451,12 +451,12 @@ 
 			<ul id="del-admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-delete-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Delete', 'event_espresso' );?>
+						<?php _e('Delete', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="del-txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -472,30 +472,30 @@ 
 	<?php endif; // $grand_raw_total > 0?>
 
 	<?php
-	if ( WP_DEBUG ) {
-		$delivered_messages = get_option( 'EED_Messages__payment', array() );
-		if ( isset( $delivered_messages[ $TXN_ID ] )) {
+	if (WP_DEBUG) {
+		$delivered_messages = get_option('EED_Messages__payment', array());
+		if (isset($delivered_messages[$TXN_ID])) {
 			?>
-			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Primary Registrant', 'event_espresso' );?></h4>
+			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Primary Registrant', 'event_espresso'); ?></h4>
 
 			<div class="admin-primary-mbox-tbl-wrap">
 				<table class="admin-primary-mbox-tbl">
 					<thead>
 						<tr>
-							<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Payment Status Upon Sending', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'TXN Status Upon Sending', 'event_espresso' );?></th>
+							<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Payment Status Upon Sending', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('TXN Status Upon Sending', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
-						<?php foreach ( $delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message ) :
+						<?php foreach ($delivered_messages[$TXN_ID] as $timestamp => $delivered_message) :
 							?>
 							<tr>
-								<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['pay_status'] ) ? $delivered_message['pay_status'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['txn_status'] ) ? $delivered_message['txn_status'] : '';?></td>
+								<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['pay_status']) ? $delivered_message['pay_status'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['txn_status']) ? $delivered_message['txn_status'] : ''; ?></td>
 							</tr>
 						<?php endforeach; // $delivered_messages?>
 					</tbody>

admin_pages/venues/Venues_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,13 +32,13 @@ 
 
 	public function __construct() {
 		//define some event categories related constants
-		define( 'EE_VENUES_PG_SLUG', 'espresso_venues' );
-		define( 'EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG ));
-		define( 'EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
-		define( 'EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/' );
+		define('EE_VENUES_PG_SLUG', 'espresso_venues');
+		define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page='.EE_VENUES_PG_SLUG));
+		define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL.'venues/assets/');
+		define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES.'venues/templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
+		$this->_folder_path = EE_ADMIN_PAGES.$this->_folder_name.DS;
 	}
 
 	protected function _set_init_properties() {
@@ -49,7 +49,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 40,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

admin_pages/venues/espresso_events_Venues_Hooks.class.php

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -33,8 +33,8 @@ 
 	protected $_event;
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
-		parent::__construct( $admin_page );
+	public function __construct(EE_Admin_Page $admin_page) {
+		parent::__construct($admin_page);
 	}
 
 
@@ -49,18 +49,18 @@ 
 				'priority' => 'high',
 				'context' => 'normal'
 				)
-		);/**/
+		); /**/
 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee_event_venues' => array(
 					'type' => 'js',
-					'url' => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+					'url' => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.js',
 					'depends' => array('jquery')
 					),
 				'ee_event_venues_css' => array(
 					'type' => 'css',
-					'url' => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+					'url' => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.css',
 					)
 				),
 			'enqueues' => array(
@@ -70,24 +70,24 @@ 
 			);
 
 		//hook into the handler for saving venue
-		add_filter( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'modify_callbacks' ), 10 );
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'modify_callbacks'), 10);
 
 		//remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
-		add_filter( 'FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false' );
+		add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
 
 	}
 
 
-	public function modify_callbacks( $callbacks ) {
+	public function modify_callbacks($callbacks) {
 		// first remove default venue callback
-		foreach ( $callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_venue_update' ) {
-				unset( $callbacks[$key] );
+		foreach ($callbacks as $key => $callback) {
+			if ($callback[1] == '_default_venue_update') {
+				unset($callbacks[$key]);
 			}
 		}
 
 		//now let's add the caf version
-		$callbacks[] = array( $this, 'caf_venue_update' );
+		$callbacks[] = array($this, 'caf_venue_update');
 		return $callbacks;
 	}
 
@@ -103,69 +103,69 @@ 
 		$evt_id = $evt_obj->ID();
 
 		//first let's see if we have a venue already
-		$evt_venues = !empty( $evt_id ) ? $evt_obj->venues() : array();
-		$evt_venue = $evt_venues && is_array( $evt_venues ) ? reset( $evt_venues ) : null;
+		$evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
+		$evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
 		$evt_venue_id = $evt_venue instanceof EE_Venue ? $evt_venue->ID() : null;
 
 		//possibly private venues.
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' ) ) {
-			$vnu_where['status']= array( 'IN' , array( 'publish', 'private' ) );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+			$vnu_where['status'] = array('IN', array('publish', 'private'));
 		} else {
 			$vnu_where['status'] = 'publish';
 		}
 
 		//cap checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_venues', 'get_venues' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
 			$vnu_where['VNU_wp_user'] = get_current_user_id();
 		}
 
-		$vnumdl = EE_Registry::instance()->load_model( 'Venue' );
-		$venues = $vnumdl->get_all( array( $vnu_where, 'order_by' => array( 'VNU_name' => 'ASC' ) ) );
+		$vnumdl = EE_Registry::instance()->load_model('Venue');
+		$venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
 
 		$ven_select = array();
 		$ven_select[0] = __('Select a Venue', 'event_espresso');
 		//setup venues for selector
-		foreach ( $venues as $venue ) {
+		foreach ($venues as $venue) {
 			$ven_select[$venue->ID()] = $venue->name();
 		}
 
 		//if $ven_select does not have the existing venue attached to event then let's add that because we'll always
 		//show existing attached venues even if it's trashed (or some other restricted status).
 
-		if ( $evt_venue_id && ! isset( $ven_select[$evt_venue_id] ) ) {
+		if ($evt_venue_id && ! isset($ven_select[$evt_venue_id])) {
 			$ven_select[$evt_venue_id] = $evt_venue->name();
-			$venues = array_merge( $venues, array( $evt_venue ) );
+			$venues = array_merge($venues, array($evt_venue));
 		}
 
 		$template_args['venues'] = $venues;
 		$template_args['evt_venue_id'] = $evt_venue_id;
-		$template_args['venue_selector'] = EEH_Form_Fields::select_input('venue_id', $ven_select, $evt_venue_id, 'id="venue_id"' );
-		$template_args['enable_for_gmap'] = EEH_Form_Fields::select_input('enable_for_gmap', $values, is_object( $evt_venue ) ? $evt_venue->enable_for_gmap() : NULL, 'id="enable_for_gmap"');
-		$template_path = empty( $venues ) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php' : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
-		EEH_Template::display_template( $template_path, $template_args );
+		$template_args['venue_selector'] = EEH_Form_Fields::select_input('venue_id', $ven_select, $evt_venue_id, 'id="venue_id"');
+		$template_args['enable_for_gmap'] = EEH_Form_Fields::select_input('enable_for_gmap', $values, is_object($evt_venue) ? $evt_venue->enable_for_gmap() : NULL, 'id="enable_for_gmap"');
+		$template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content.template.php' : EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content_from_manager.template.php';
+		EEH_Template::display_template($template_path, $template_args);
 	}
 
 
 
 
-	public function caf_venue_update( $evtobj, $data ) {
+	public function caf_venue_update($evtobj, $data) {
 		EE_Registry::instance()->load_model('Venue');
-		$venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL;
 
 
 		//first let's check if the selected venue matches any existing venue attached to the event
 		$evt_venue = $evtobj->venues();
-		$evt_venue = !empty( $evt_venue ) ? array_shift( $evt_venue ) : NULL;
+		$evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : NULL;
 
-		if ( !empty( $evt_venue ) && $evt_venue->ID() != $venue_id )
-			$evtobj->_remove_relation_to( $evt_venue->ID(), 'Venue' );
+		if ( ! empty($evt_venue) && $evt_venue->ID() != $venue_id)
+			$evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
 
-		if ( empty( $venue_id ) )
+		if (empty($venue_id))
 			return TRUE; //no venue to attach
 
 		// this should take care of adding to revisions as well as main post object
-		$success = $evtobj->_add_relation_to( $venue_id, 'Venue' );
-		return !empty($success) ? TRUE : FALSE;
+		$success = $evtobj->_add_relation_to($venue_id, 'Venue');
+		return ! empty($success) ? TRUE : FALSE;
 	}
 
 

caffeinated/admin/extend/messages/espresso_events_Messages_Hooks_Extend.class.php

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,15 +30,15 @@ 
 class espresso_events_Messages_Hooks_Extend extends espresso_events_Messages_Hooks {
 
 
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 		/**
 		 * Add cap restriction ... metaboxes should not show if user does not have the ability to edit_custom_messages
 		 */
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'messages_events_editor_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'messages_events_editor_metabox')) {
 			return;
 		}
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
-		parent::__construct( $adminpage );
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
+		parent::__construct($adminpage);
 	}
 
 	/**
@@ -49,13 +49,13 @@ 
 	 */
 	protected function _extend_properties() {
 
-		define( 'EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/' );
+		define('EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
 		$this->_ajax_func = array(
 			'ee_msgs_create_new_custom' => 'create_new_custom'
 			);
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'messages_metabox',
 				'label' => __('Notifications', 'event_espresso'),
 				'priority' => 'high'
@@ -66,11 +66,11 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'events_msg_admin' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'events_messages_admin.js',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'events_messages_admin.js',
 					'depends' => array('ee-dialog', 'ee-parse-uri', 'ee-serialize-full-array')
 					),
 				'events_msg_admin_css' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'ee_msg_events_admin.css',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'ee_msg_events_admin.css',
 					'type' => 'css'
 					)
 				),
@@ -82,8 +82,8 @@ 
 	}
 
 
-	public function caf_updates( $update_callbacks ) {
-		$update_callbacks[] = array( $this, 'attach_evt_message_templates' );
+	public function caf_updates($update_callbacks) {
+		$update_callbacks[] = array($this, 'attach_evt_message_templates');
 		return $update_callbacks;
 	}
 
@@ -96,13 +96,13 @@ 
 	 * @param  array       $data   The request data from the form
 	 * @return bool         success or fail
 	 */
-	public function attach_evt_message_templates( $evtobj, $data ) {
+	public function attach_evt_message_templates($evtobj, $data) {
 		//first we remove all existing relations on the Event for message types.
 		$evtobj->_remove_relations('Message_Template_Group');
 
 		//now let's just loop throught the selected templates and add relations!
-		foreach( $data['event_message_templates_relation'] as $grp_ID ) {
-			$evtobj->_add_relation_to( $grp_ID, 'Message_Template_Group' );
+		foreach ($data['event_message_templates_relation'] as $grp_ID) {
+			$evtobj->_add_relation_to($grp_ID, 'Message_Template_Group');
 		}
 
 		//now save
@@ -115,10 +115,10 @@ 
 
 		//let's get the active messengers (b/c messenger objects have the active message templates)
 		//convert 'evt_id' to 'EVT_ID'
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : NULL;
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['post'] ) && empty( $this->_req_data['EVT_ID'] ) ? $this->_req_data['post'] : $this->_req_data['EVT_ID'];
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['post']) && empty($this->_req_data['EVT_ID']) ? $this->_req_data['post'] : $this->_req_data['EVT_ID'];
 
-		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID'] ) && isset($this->_req_data['evt_id'] ) ? $this->_req_data['evt_id'] : $this->_req_data['EVT_ID'];
+		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID']) && isset($this->_req_data['evt_id']) ? $this->_req_data['evt_id'] : $this->_req_data['EVT_ID'];
 
 
 		$EEM_controller = new EE_messages;
@@ -127,11 +127,11 @@ 
 
 		//empty messengers?
 		//Note message types will always have at least one available because every messenger has a default message type associated with it (payment) if no other message types are selected.
-		if ( empty( $active_messengers ) ) {
-			$msg_activate_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'settings'), EE_MSG_ADMIN_URL );
-			$error_msg = sprintf( __('There are no active messengers. So no notifications will go out for <strong>any</strong> events.  You will want to %sActivate a Messenger%s.', 'event_espresso'), '<a href="' . $msg_activate_url . '">', '</a>');
-			$error_content = '<div class="error"><p>' . $error_msg . '</p></div>';
-			$internal_content = '<div id="messages-error"><p>' . $error_msg . '</p></div>';
+		if (empty($active_messengers)) {
+			$msg_activate_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'settings'), EE_MSG_ADMIN_URL);
+			$error_msg = sprintf(__('There are no active messengers. So no notifications will go out for <strong>any</strong> events.  You will want to %sActivate a Messenger%s.', 'event_espresso'), '<a href="'.$msg_activate_url.'">', '</a>');
+			$error_content = '<div class="error"><p>'.$error_msg.'</p></div>';
+			$internal_content = '<div id="messages-error"><p>'.$error_msg.'</p></div>';
 
 			echo $error_content;
 			echo $internal_content;
@@ -140,39 +140,39 @@ 
 
 		$event_id = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
 		//get content for active messengers
-		foreach ( $active_messengers as $name => $messenger ) {
+		foreach ($active_messengers as $name => $messenger) {
 			//first check if there are any active message types for this messenger.
-			$active_mts = $EEM_controller->get_active_message_types_per_messenger( $name );
-			if ( empty( $active_mts ) ) {
+			$active_mts = $EEM_controller->get_active_message_types_per_messenger($name);
+			if (empty($active_mts)) {
 				continue;
 			}
 
-			$tcont = $messenger->get_messenger_admin_page_content('events', 'edit', array('event' => $event_id) );
+			$tcont = $messenger->get_messenger_admin_page_content('events', 'edit', array('event' => $event_id));
 
-			if ( ! empty( $tcont ) ) {
+			if ( ! empty($tcont)) {
 				$tabs[$name] = $tcont;
 			}
 		}
 
 
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 		//we want this to be tabbed content so let's use the EEH_Tabbed_Content::display helper.
 		$tabbed_content = EEH_Tabbed_Content::display($tabs);
-		if ( is_wp_error($tabbed_content) ) {
+		if (is_wp_error($tabbed_content)) {
 			$tabbed_content = $tabbed_content->get_error_message();
 		}
 
 		$notices = '<div id="espresso-ajax-loading" class="ajax-loader-grey">
-				<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso') . '</span>
+				<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso').'</span>
 			</div><div class="ee-notices"></div>';
 
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			return $tabbed_content;
 		}
 
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content' );
-		echo $notices . '<div class="messages-tabs-content">' . $tabbed_content . '</div>';
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content' );
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content');
+		echo $notices.'<div class="messages-tabs-content">'.$tabbed_content.'</div>';
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content');
 
 	}
 
@@ -186,22 +186,22 @@ 
 	 */
 	public function create_new_custom() {
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'create_new_custom_ajax' ) ) {
-			wp_die( __('You don\'t have privileges to do this action', 'event_espresso' ) );
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'create_new_custom_ajax')) {
+			wp_die(__('You don\'t have privileges to do this action', 'event_espresso'));
 		}
 
 		//let's clean up the _POST global a bit for downstream usage of name and description.
-		$_POST['templateName'] = !empty( $this->_req_data['custom_template_args']['MTP_name'] ) ? $this->_req_data['custom_template_args']['MTP_name'] : '';
-		$_POST['templateDescription'] = !empty( $this->_req_data['custom_template_args']['MTP_description'] ) ? $this->_req_data['custom_template_args']['MTP_description'] : '';
+		$_POST['templateName'] = ! empty($this->_req_data['custom_template_args']['MTP_name']) ? $this->_req_data['custom_template_args']['MTP_name'] : '';
+		$_POST['templateDescription'] = ! empty($this->_req_data['custom_template_args']['MTP_description']) ? $this->_req_data['custom_template_args']['MTP_description'] : '';
 
 
 		//set EE_Admin_Page object (see method details in EE_Admin_Hooks parent
 		$this->_set_page_object();
 
 		//is this a template switch if so EE_Admin_Page child needs this object
-		$this->_page_object->set_hook_object( $this );
+		$this->_page_object->set_hook_object($this);
 
-		$this->_page_object->add_message_template( $this->_req_data['messageType'], $this->_req_data['messenger'], $this->_req_data['group_ID'] );
+		$this->_page_object->add_message_template($this->_req_data['messageType'], $this->_req_data['messenger'], $this->_req_data['group_ID']);
 	}
 
 
@@ -216,7 +216,7 @@ 
 	 * @return string (admin_footer contents)
 	 */
 	public function edit_admin_footer() {
-		$template_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/create_custom_template_form.template.php';
+		$template_path = EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/create_custom_template_form.template.php';
 		EEH_Template::display_template($template_path, array());
 	}
 

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Questions_Admin_List_Table.class.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,15 +31,15 @@ 
 
 class Extend_Registration_Form_Questions_Admin_List_Table extends Registration_Form_Questions_Admin_List_Table {
 
-	public function __construct( $admin_page ) {
-		parent::__construct( $admin_page );
+	public function __construct($admin_page) {
+		parent::__construct($admin_page);
 	}
 
 	public function column_display_text(EE_Question $item) {
 		$system_question = $item->is_system_question();
 		$actions = array();
 
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -67,35 +67,35 @@ 
 				'QST_ID' => $item->ID()
 			);
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
-		$duplicate_link = EE_Admin_Page::add_query_args_and_nonce( $duplicate_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
+		$duplicate_link = EE_Admin_Page::add_query_args_and_nonce($duplicate_query_args, EE_FORMS_ADMIN_URL);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . __('Edit Question', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.__('Edit Question', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
 
-		if ( ! $system_question && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_trash_question', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . __('Trash Question', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ( ! $system_question && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_trash_question', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.__('Trash Question', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_restore_question', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . __('Restore Question', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+		if ($this->_view == 'trash') {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_restore_question', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.__('Restore Question', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
-			if ( $item->count_related('Answer') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_delete_questions', $item->ID() ) ) {
-				$actions['delete'] = '<a href="' . $delete_link . '" title="' . __('Delete Question Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ($item->count_related('Answer') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_delete_questions', $item->ID())) {
+				$actions['delete'] = '<a href="'.$delete_link.'" title="'.__('Delete Question Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_questions', 'espresso_registration_form_edit_question' ) ) {
-			$actions[ 'duplicate' ] = '<a href="' . $duplicate_link . '" title="' . __('Duplicate Question', 'event_espresso') . '">' . __('Duplicate', 'event_espresso') . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_questions', 'espresso_registration_form_edit_question')) {
+			$actions['duplicate'] = '<a href="'.$duplicate_link.'" title="'.__('Duplicate Question', 'event_espresso').'">'.__('Duplicate', 'event_espresso').'</a>';
 		}
 
-		$content = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>' : $item->display_text();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>' : $item->display_text();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}

caffeinated/admin/extend/registration_form/Registration_Form_Question_Groups_Admin_List_Table.class.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,7 +31,7 @@ 
 class Registration_Form_Question_Groups_Admin_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, FALSE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, FALSE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, FALSE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, FALSE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('question group', 'event_espresso' ),
-			'plural' => __('question groups', 'event_espresso' ),
+			'singular' => __('question group', 'event_espresso'),
+			'plural' => __('question groups', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -65,8 +65,8 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'QSG_ID' => FALSE ),
-			'name' => array( 'QSG_name' => FALSE )
+			'id' => array('QSG_ID' => FALSE),
+			'name' => array('QSG_name' => FALSE)
 			);
 
 		$this->_hidden_columns = array(
@@ -92,9 +92,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE );
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_group' ) ) {
-			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_views['all']['count'] = $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_group')) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		$system_group = $item->get('QSG_system');
 		$has_questions_with_answers = $item->has_questions_with_answers();
 		$lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-		return $system_group > 0 || ( $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups' ) ? '<span class="' . $lock_icon . '"></span>'  . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
+		return $system_group > 0 || ($system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers) || ! EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups') ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
 	}
 
 
@@ -117,7 +117,7 @@ 
 
 	public function column_id(EE_Question_Group $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' .$item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -127,7 +127,7 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -152,32 +152,32 @@ 
 
 
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
 
-		if (  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Question Group', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Question Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
-		if ( $item->get('QSG_system') < 1 && $this->_view != 'trash' &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . esc_attr__('Delete Question Group', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->get('QSG_system') < 1 && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.esc_attr__('Delete Question Group', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
+		if ($this->_view == 'trash') {
 
-			if (  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . esc_attr__('Restore Question Group', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.esc_attr__('Restore Question Group', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
 
-			if ( !$item->has_questions_with_answers() &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID() ) ) {
-				$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ( ! $item->has_questions_with_answers() && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID())) {
+				$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Question Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		$content =  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' : $item->name();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>' : $item->name();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -198,13 +198,13 @@ 
 
 
 	public function column_show_group_name(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_name() ];
+		return $this->_yes_no[$item->show_group_name()];
 	}
 
 
 
 	public function column_show_group_desc(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_desc() ];
+		return $this->_yes_no[$item->show_group_desc()];
 	}
 
 

caffeinated/admin/extend/registration_form/espresso_events_Registration_Form_Hooks_Extend.class.php

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class espresso_events_Registration_Form_Hooks_Extend extends espresso_events_Registration_Form_Hooks {
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -54,31 +54,31 @@ 
 				)
 			);
 
-		$this->_metaboxes = array_merge( $this->_metaboxes, $new_metaboxes);
+		$this->_metaboxes = array_merge($this->_metaboxes, $new_metaboxes);
 	}
 
 
 
 
-	public function modify_callbacks( $callbacks ) {
-		$callbacks = parent::modify_callbacks( $callbacks );
-		$callbacks[] = array( $this, 'additional_question_group_update' );
+	public function modify_callbacks($callbacks) {
+		$callbacks = parent::modify_callbacks($callbacks);
+		$callbacks[] = array($this, 'additional_question_group_update');
 		return $callbacks;
 	}
 
 
 
-	public function restore_revision( $post_id, $revision_id ) {
-		$post_evt = parent::restore_revision( $post_id, $revision_id );
+	public function restore_revision($post_id, $revision_id) {
+		$post_evt = parent::restore_revision($post_id, $revision_id);
 
 		//restore revision for additional questions
-		$post_evt->restore_revision( $revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 0 ) ) );
+		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 0)));
 	}
 
 
 
 
-	public function additional_questions( $post_id, $post ) {
+	public function additional_questions($post_id, $post) {
 		$this->_event = $this->_adminpage_obj->get_event_object();
 		$event_id = $this->_event->ID();
 		?>
@@ -95,32 +95,32 @@ 
 			<?php
 
 			$qsg_where['QSG_deleted'] = FALSE;
-			$query_params = array( $qsg_where, 'order_by' => array( 'QSG_order' => 'ASC' ) );
-			$QSGs = EEM_Question_Group::instance()->get_all( $query_params );
-			$EQGs = !empty( $event_id ) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0 )) ) : array();
+			$query_params = array($qsg_where, 'order_by' => array('QSG_order' => 'ASC'));
+			$QSGs = EEM_Question_Group::instance()->get_all($query_params);
+			$EQGs = ! empty($event_id) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0))) : array();
 			$EQGids = array_keys($EQGs);
 
-			if ( ! empty( $QSGs )) {
- 				$html = count( $QSGs ) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
-				foreach ( $QSGs as $QSG ) {
+			if ( ! empty($QSGs)) {
+ 				$html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
+				foreach ($QSGs as $QSG) {
 
-					$checked = in_array( $QSG->ID(), $EQGids ) ? ' checked="checked" ' : '';
-					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce( array( 'action' => 'edit_question_group', 'QSG_ID' => $QSG->ID() ), EE_FORMS_ADMIN_URL );
+					$checked = in_array($QSG->ID(), $EQGids) ? ' checked="checked" ' : '';
+					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce(array('action' => 'edit_question_group', 'QSG_ID' => $QSG->ID()), EE_FORMS_ADMIN_URL);
 
 					$html .= '
-					<p id="event-question-group-' . $QSG->ID() . '">
-						<input value="' . $QSG->ID() . '" type="checkbox" name="add_attendee_question_groups[' . $QSG->ID() . ']"' . $checked . ' />
-						<a href="' . $edit_link . '" title="' . sprintf( esc_attr__( 'Edit %s Group', 'event_espresso' ),  $QSG->get('QSG_name') ) . '" target="_blank">' . $QSG->get('QSG_name') . '</a>
+					<p id="event-question-group-' . $QSG->ID().'">
+						<input value="' . $QSG->ID().'" type="checkbox" name="add_attendee_question_groups['.$QSG->ID().']"'.$checked.' />
+						<a href="' . $edit_link.'" title="'.sprintf(esc_attr__('Edit %s Group', 'event_espresso'), $QSG->get('QSG_name')).'" target="_blank">'.$QSG->get('QSG_name').'</a>
 					</p>';
 				}
-				$html .= count( $QSGs ) > 10 ? '</div>' : '';
+				$html .= count($QSGs) > 10 ? '</div>' : '';
 
 				echo $html;
 
 			} else {
 				echo __('There seems to be a problem with your questions. Please contact support@eventespresso.com', 'event_espresso');
 			}
-			do_action( 'AHEE__espresso_events_Registration_Form_Hooks__additional_questions__after_content' );
+			do_action('AHEE__espresso_events_Registration_Form_Hooks__additional_questions__after_content');
 			?>
 		</div>
 		<?php
@@ -130,31 +130,31 @@ 
 
 
 
-	public function additional_question_group_update( $evtobj, $data ) {
-		$question_groups = !empty( $data['add_attendee_question_groups'] ) ? (array) $data['add_attendee_question_groups'] : array();
+	public function additional_question_group_update($evtobj, $data) {
+		$question_groups = ! empty($data['add_attendee_question_groups']) ? (array) $data['add_attendee_question_groups'] : array();
 		$added_qgs = array_keys($question_groups);
 		$success = array();
 
 		//let's get all current question groups associated with this event.
-		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0) ) );
+		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0)));
 		$current_qgs = array_keys($current_qgs); //we just want the ids
 
 		//now let's get the groups selected in the editor and update (IF we have data)
-		if ( !empty( $question_groups ) ) {
-			foreach ( $question_groups as $id => $val ) {
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $id => $val) {
 				//add to event
-				if ( $val )
-					$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 0) );
-				$success[] = !empty($qg) ? 1 : 0;
+				if ($val)
+					$qg = $evtobj->_add_relation_to($id, 'Question_Group', array('EQG_primary' => 0));
+				$success[] = ! empty($qg) ? 1 : 0;
 			}
 		}
 
 		//wait a minute... are there question groups missing in the saved groups that ARE with the current event?
-		$removed_qgs = array_diff( $current_qgs, $added_qgs );
+		$removed_qgs = array_diff($current_qgs, $added_qgs);
 
-		foreach ( $removed_qgs as $qgid ) {
-			$qg = $evtobj->_remove_relation_to( $qgid, 'Question_Group', array('EQG_primary' => 0 ) );
-			$success[] = !empty($qg) ? 1 : 0;
+		foreach ($removed_qgs as $qgid) {
+			$qg = $evtobj->_remove_relation_to($qgid, 'Question_Group', array('EQG_primary' => 0));
+			$success[] = ! empty($qg) ? 1 : 0;
 		}
 
 

caffeinated/admin/extend/registration_form/templates/question_groups_main_meta_box.template.php

Spacing +25 added lines, -25 removed lines

@@ -9,8 +9,8 @@ 
 assert($question_group);
 assert($question_group instanceof EE_Question_Group);
 /* @var EE_Question[] $all_questions */
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));//list of unused questions
-foreach($all_questions as $unused_question){
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); //list of unused questions
+foreach ($all_questions as $unused_question) {
 	assert($unused_question);
 	assert($unused_question instanceof EE_Question);
 }
@@ -19,8 +19,8 @@ 
 
 $QSG_system = $question_group->system_group();
 
-$disabled = ! empty( $QSG_system ) ? ' disabled="disabled"' : '';
-$id =  ! empty( $QST_system ) ? '_disabled' : '';
+$disabled = ! empty($QSG_system) ? ' disabled="disabled"' : '';
+$id = ! empty($QST_system) ? '_disabled' : '';
 ?>
 
 <div id="group-details" class="edit-group padding">
@@ -30,7 +30,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_name">
-						<?php _e('Group Name','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_name_info');?>
+						<?php _e('Group Name', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_name_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -42,14 +42,14 @@ 
 			<tr>
 				<th>
 					<label for="QSG_identifier">
-						<?php _e('Group Identifier','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_identifier_info');?>
+						<?php _e('Group Identifier', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_identifier_info'); ?>
 					</label>
 				</th>
 				<td>
 					<input id="QSG_identifier" name="QSG_identifier<?php echo $id; ?>" value="<?php echo $question_group->identifier()?>" type="text" class="regular-text"<?php echo $disabled; ?>>
-					<?php if ( ! empty( $QSG_system )) { ?>
+					<?php if ( ! empty($QSG_system)) { ?>
 					<p><span class="description" style="color:#D54E21;">
-							<?php _e('System question group! This field cannot be changed.','event_espresso')?>
+							<?php _e('System question group! This field cannot be changed.', 'event_espresso')?>
 					</span><br/></p>
 					<?php } ?>
 
@@ -58,7 +58,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_desc">
-						<?php _e('Description','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_description_info');?>
+						<?php _e('Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_description_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -69,7 +69,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_order">
-						<?php _e('Question Group Order','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_order_info');?>
+						<?php _e('Question Group Order', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_order_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -80,13 +80,13 @@ 
 			<tr>
 				<th>
 					<label>
-						<?php _e('Show Name','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('show_group_name_info');?>
+						<?php _e('Show Name', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('show_group_name_info'); ?>
 					</label>
 				</th>
 				<td>
 					<label for="QSG_show_group_name">
-                        <?php echo EEH_Form_Fields::select_input( 'QSG_show_group_name', $values, $question_group->show_group_name() ); ?>
-						<p class="description"><?php _e('Show Group Name on Registration Page?','event_espresso');?></p>
+                        <?php echo EEH_Form_Fields::select_input('QSG_show_group_name', $values, $question_group->show_group_name()); ?>
+						<p class="description"><?php _e('Show Group Name on Registration Page?', 'event_espresso'); ?></p>
 					</label>
 				</td>
 			</tr>
@@ -94,13 +94,13 @@ 
 			<tr>
 				<th>
 					<label>
-						<?php _e(' Show Description','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('show_group_description_info');?>
+						<?php _e(' Show Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('show_group_description_info'); ?>
 					</label>
 				</th>
 				<td>
                     <label for="QSG_show_group_order">
-                        <?php echo EEH_Form_Fields::select_input( 'QSG_show_group_desc', $values, $question_group->show_group_desc() ); ?>
-                        <p class="description"><?php _e(' Show Group Description on Registration Page?','event_espresso');?></p>
+                        <?php echo EEH_Form_Fields::select_input('QSG_show_group_desc', $values, $question_group->show_group_desc()); ?>
+                        <p class="description"><?php _e(' Show Group Description on Registration Page?', 'event_espresso'); ?></p>
 					</label>
                     <input type="hidden" name="QSG_system" value="<?php echo $question_group->system_group(); ?>">
                 </td>
@@ -111,8 +111,8 @@ 
 </div>
 
 <div id="group-questions" class="edit-group padding question-group-questions-container postbox">
-    <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'event_espresso' ); ?>"><br></div>
-    <h2 class="handle"><?php _e('Questions','event_espresso');?></h2>
+    <div class="handlediv" title="<?php esc_attr_e('Click to toggle', 'event_espresso'); ?>"><br></div>
+    <h2 class="handle"><?php _e('Questions', 'event_espresso'); ?></h2>
 	<div class="form-table question-group-questions inside">
         <div class="padding">
             <p><span class="description"><?php _e('Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.', 'event_espresso'); ?></span></p>
@@ -121,26 +121,26 @@ 
                     <?php
 					$question_order = 0;
 					$question_group_questions = $question_group->questions();
-                    foreach( $all_questions as $question_ID => $question ){
-						if ( $question instanceof EE_Question ) {
+                    foreach ($all_questions as $question_ID => $question) {
+						if ($question instanceof EE_Question) {
 							/*@var $question EE_Question*/
-							$checked = isset( $question_group_questions[ $question_ID ] ) ? ' checked="checked"' : '';
+							$checked = isset($question_group_questions[$question_ID]) ? ' checked="checked"' : '';
 							// disable questions from the personal information question group
 							// is it required in the current question group? if so don't allow admins to remove it
-							$disabled = in_array( $question->system_ID(), EEM_Question::instance()->required_system_questions_in_system_question_group( $QSG_system ) ) ? 'disabled="disabled"' : '';
+							$disabled = in_array($question->system_ID(), EEM_Question::instance()->required_system_questions_in_system_question_group($QSG_system)) ? 'disabled="disabled"' : '';
 							//limit where system questions can appear
 							if (
 								$question->system_ID() &&
-								! in_array( $question->system_ID(), EEM_Question::instance()->allowed_system_questions_in_system_question_group( $QSG_system ) )
+								! in_array($question->system_ID(), EEM_Question::instance()->allowed_system_questions_in_system_question_group($QSG_system))
 							) {
 								continue; //skip over system question not assigned to this group except for the address system group cause we want the address questions to display even if they aren't selected (but still not show the personal system questions).  The third condition checks if we're displaying a non system question group and the question is a system question, then we skip because for non-system question groups we only want to show non-system questions.
 							}
 						?>
                     <li class="ee-question-sortable">
                         <label for="question-<?php echo $question_ID?>">
-                            <input type="checkbox" name="questions[<?php echo $question_ID;?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID;?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
+                            <input type="checkbox" name="questions[<?php echo $question_ID; ?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID; ?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
                             <span class="question-text">
-								<?php echo trim( $question->display_text() ) . ( 95 <= strlen( trim( $question->display_text() ) ) ? "&hellip;" : '' ); ?>
+								<?php echo trim($question->display_text()).(95 <= strlen(trim($question->display_text())) ? "&hellip;" : ''); ?>
 							</span>
                             <input class="question-group-QGQ_order" type="hidden" name="question_orders[<?php echo $question_ID; ?>]" value="<?php echo $question_order; ?>">
                         </label>