eventespresso / event-espresso-core

caffeinated/admin/new/pricing/help_tours/Pricing_Price_Types_Default_Help_Tour.class.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -99,37 +99,37 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Price Types', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Price Types page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Price Types', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Price Types page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
 	protected function _name_column_stop() {
-		return '<p>' . __('The name of the price type. Can be sorted in ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('The name of the price type. Can be sorted in ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _base_type_stop() {
-		return '<p>' . __('View if a price type is a discount, surcharge, or tax.', 'event_espresso') . '</p>';
+		return '<p>'.__('View if a price type is a discount, surcharge, or tax.', 'event_espresso').'</p>';
 	}
 
 	protected function _member_column_stop() {
-		return '<p>' . __('Here you can see if the discount/surcharge is percentage based or a flat monetary amount.', 'event_espresso') . '</p>';
+		return '<p>'.__('Here you can see if the discount/surcharge is percentage based or a flat monetary amount.', 'event_espresso').'</p>';
 	}
 
 	protected function _percent_column_stop() {
-		return '<p>' . __('View if the discount, surcharge, or tax is percentage-based or a fixed amount.', 'event_espresso') . '</p>';
+		return '<p>'.__('View if the discount, surcharge, or tax is percentage-based or a fixed amount.', 'event_espresso').'</p>';
 	}
 
 	protected function _order_column_stop() {
-		return '<p>' . __('View the order in which each discount, surcharge, or tax will be applied to the base ticket cost. Zero (0) means it will be applied first.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the order in which each discount, surcharge, or tax will be applied to the base ticket cost. Zero (0) means it will be applied first.', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple price types.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple price types.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through price types. The following source will be searched: Price Type Name.', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through price types. The following source will be searched: Price Type Name.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

caffeinated/admin/new/pricing/templates/event_tickets_datetime_price_modifier_selector.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php echo $price_modifier_selector; ?>
-<?php if ( $disabled ) : ?>
+<?php if ($disabled) : ?>
 	<input type="hidden" name="<?php echo $main_name; ?>" value="<?php echo $selected_price_type_id; ?>">
 <?php endif; ?>
 

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_price_row.template.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 		<span class="ticket-price-info-display ticket-price-dollar-sign-display"<?php echo $show_currency_symbol; ?>><?php echo $price_currency_symbol; ?></span>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" size="1" class="edit-price-PRC_amount ee-numeric" name="<?php echo $edit_prices_name; ?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>">
 			<input type="text" size="1" class="edit-price-PRC_amount ee-numeric" name="prices_archive[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>" disabled>
 		<?php else : ?>
@@ -28,7 +28,7 @@ 
 		<span class="ticket-price-info-display ticket-price-percentage-char-display"<?php echo $show_percentage; ?>>%</span>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<span class="ee-lock-icon"></span>
 		<?php else : ?>
 			<!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo $tkt_row; ?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"></span> -->

Braces +10 added lines, -4 removed lines

@@ -20,8 +20,11 @@ 
 		<?php if ( $disabled ) : ?>
 			<input type="hidden" size="1" class="edit-price-PRC_amount ee-numeric" name="<?php echo $edit_prices_name; ?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>">
 			<input type="text" size="1" class="edit-price-PRC_amount ee-numeric" name="prices_archive[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>" disabled>
-		<?php else : ?>
-			<input type="text" size="1" class="edit-price-PRC_amount ee-numeric" name="<?php echo $edit_prices_name; ?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>">
+		<?php else {
+	: ?>
+			<input type="text" size="1" class="edit-price-PRC_amount ee-numeric" name="<?php echo $edit_prices_name;
+}
+?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]" value="<?php echo $PRC_amount; ?>">
 		<?php endif; ?>
 	</td>
 	<td>
@@ -30,8 +33,11 @@ 
 	<td>
 		<?php if ( $disabled ) : ?>
 			<span class="ee-lock-icon"></span>
-		<?php else : ?>
-			<!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo $tkt_row; ?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"></span> -->
+		<?php else {
+	: ?>
+			<!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo $tkt_row;
+}
+?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"></span> -->
 			<span class="trash-icon dashicons dashicons-post-trash clickable" data-ticket-row="<?php echo $tkt_row; ?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"<?php echo $show_trash_icon; ?>></span>
 			<button data-ticket-row="<?php echo $tkt_row; ?>" data-price-row="<?php echo $PRC_order; ?>" data-context="price" class="ee-create-button"<?php echo $show_create_button; ?>><strong>+</strong></button>
 		<?php endif; ?>

caffeinated/admin/new/pricing/templates/pricing_admin_overview.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 		
 	<div id="evt-prc-overview-filters-dv">
 		<ul class="subsubsub">
-			<?php foreach ( $view_RLs as $view ) : ?>
+			<?php foreach ($view_RLs as $view) : ?>
 			<li class="">
-				<a class="<?php echo $view['class']; ?>" href="<?php echo $view['url'];?>">
-					<?php _e( $view['label'], 'event_espresso' ); ?> <span class="count">(<?php echo $view['count']; ?>)</span>
+				<a class="<?php echo $view['class']; ?>" href="<?php echo $view['url']; ?>">
+					<?php _e($view['label'], 'event_espresso'); ?> <span class="count">(<?php echo $view['count']; ?>)</span>
 				</a>
 			</li>
 			<?php endforeach; ?>
@@ -12,9 +12,9 @@ 
 		<!--<div class="clear"></div>-->
 	</div>
 
-    <form id="event-price-overview-frm" action="<?php echo $evt_prc_overview_url;?>" method="post">
+    <form id="event-price-overview-frm" action="<?php echo $evt_prc_overview_url; ?>" method="post">
  		<?php //$list_table->search_box( $search['btn_label'], $search['callback'] ); ?>
-		<input type="hidden" id="status" name="status" value="<?php echo $status;?>" />
+		<input type="hidden" id="status" name="status" value="<?php echo $status; ?>" />
 		<input type="hidden" id="per_page" name="per_page" value="" />
 		<?php echo $list_table->display(); ?>
     </form>

caffeinated/admin/new/pricing/templates/pricing_details_main_meta_box.template.php

Braces +5 added lines, -2 removed lines

@@ -9,8 +9,11 @@
 						<input type="hidden" name="PRT_ID" id="PRT_ID" value="<?php echo $price->type(); ?>" />
 						<p><strong><?php _e('Price', 'event_espresso'); ?></strong></p>
 						<p class="description"><?php _e('This is the default base price. Every new ticket created will start off with this base price.', 'event_espresso'); ?></p>
-					<?php else : ?>
-						<?php echo EEH_Form_Fields::select_input('PRT_ID', $price_types, $price->type(), 'id="PRT_ID"'); ?>
+					<?php else {
+	: ?>
+						<?php echo EEH_Form_Fields::select_input('PRT_ID', $price_types, $price->type(), 'id="PRT_ID"');
+}
+?>
 						<p class="description"><?php _e('Price Modifier. Default items will apply to ALL new events you create.', 'event_espresso'); ?></p>
 					<?php endif; ?>
 				</td>

Spacing +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@ 
 	<table class="form-table">
 		<tbody>
 			<tr valign="top">
-				<th><label for="PRT_ID"><?php _e('Type', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info');?></th>
+				<th><label for="PRT_ID"><?php _e('Type', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info'); ?></th>
 				<td>
-					<?php if ( $price->type_obj() && $price->type_obj()->base_type() === 1 ) : ?>
+					<?php if ($price->type_obj() && $price->type_obj()->base_type() === 1) : ?>
 						<input type="hidden" name="PRT_ID" id="PRT_ID" value="<?php echo $price->type(); ?>" />
 						<p><strong><?php _e('Price', 'event_espresso'); ?></strong></p>
 						<p class="description"><?php _e('This is the default base price. Every new ticket created will start off with this base price.', 'event_espresso'); ?></p>
@@ -16,13 +16,13 @@ 
 				</td>
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_name"><?php _e('Name', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info');?></th>
+				<th><label for="PRC_name"><?php _e('Name', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info'); ?></th>
 				<td>
 					<input class="regular-text" type="text" id="PRC_name" name="PRC_name" value="<?php $price->f('PRC_name'); ?>"/>
 				</td>
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_desc"><?php _e('Description', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info');?></th>
+				<th><label for="PRC_desc"><?php _e('Description', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info'); ?></th>
 				<td>
 					<textarea class="regular-text" id="PRC_desc" name="PRC_desc" rows="5" ><?php
 					 $price->f('PRC_desc');
@@ -30,7 +30,7 @@ 
 				</td>							
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_amount"><?php _e('Amount', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('amount_field_info');?></label></th>
+				<th><label for="PRC_amount"><?php _e('Amount', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('amount_field_info'); ?></label></th>
 				<td>
 					<input class="small-text ee-numeric" type="text" id="PRC_amount" name="PRC_amount" value="<?php echo $price->amount(); ?>"/>
 				</td>

caffeinated/admin/new/pricing/templates/pricing_type_details_main_meta_box.template.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
 					<label for="PRT_name"><?php _e('Price Type Name', 'event_espresso'); ?></label>
 				</th>
 				<td>
-					<input class="regular-text" type="text" id="PRT_name" name="PRT_name" value="<?php echo htmlentities($price_type->name()) ;?>"/>
+					<input class="regular-text" type="text" id="PRT_name" name="PRT_name" value="<?php echo htmlentities($price_type->name()); ?>"/>
 					<p class="description"><?php _e('A name for this Price Type.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
@@ -29,18 +29,18 @@ 
 				</th>
 				<td>
 					<?php $yes_checked = $price_type->is_percent() ? ' checked="checked"' : ''; ?>
-					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="1"<?php echo $yes_checked;?> style="margin-right:5px;">
-						<?php _e('Percentage', 'event_espresso');?>
+					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="1"<?php echo $yes_checked; ?> style="margin-right:5px;">
+						<?php _e('Percentage', 'event_espresso'); ?>
 					</label>
 					<?php $no_checked = $price_type->is_percent() ? '' : ' checked="checked"'; ?>
-					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="0"<?php echo $no_checked;?> style="margin-right:5px;">
-						<?php _e('Fixed', 'event_espresso');?>
+					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="0"<?php echo $no_checked; ?> style="margin-right:5px;">
+						<?php _e('Fixed', 'event_espresso'); ?>
 					</label>
 					<p class="description"><?php _e('Whether this Price Type will be applied as a percentage or applied as a set fixed amount.', 'event_espresso'); ?></p>
-					<?php if ( $price_type->base_type() == EEM_Price_Type::base_type_tax ) :
+					<?php if ($price_type->base_type() == EEM_Price_Type::base_type_tax) :
 						//base type is tax so let's just let the user know that taxes are always percentage.
 						?>
-						<p class="description" style="color:#E44064"><?php _e( 'The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.', 'event_espresso' ); ?></p>
+						<p class="description" style="color:#E44064"><?php _e('The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.', 'event_espresso'); ?></p>
 					<?php endif; ?>
 				</td>
 			</tr>

caffeinated/admin/new/tickets/Tickets_Admin_Page.core.php

Spacing +45 added lines, -45 removed lines

@@ -52,7 +52,7 @@ 
 
 	protected function _set_page_routes() {
 
-		$tkt_id = ! empty( $this->_req_data['TKT_ID'] )  && ! is_array( $this->_req_data['TKT_ID'] ) ? $this->_req_data['TKT_ID'] : 0;
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID']) ? $this->_req_data['TKT_ID'] : 0;
 
 		$this->_page_routes = array(
 			'default' => array(
@@ -62,14 +62,14 @@ 
 			'trash_ticket' => array(
 				'func' => '_trash_or_restore_ticket',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id' => $tkt_id
 				),
 			'trash_tickets' => array(
 				'func' => '_trash_or_restore_ticket',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_default_tickets'
 				),
 			'restore_ticket' => array(
@@ -143,7 +143,7 @@ 
 				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
-					'restore_tickets' => __('Restore from Trash' , 'event_espresso'),
+					'restore_tickets' => __('Restore from Trash', 'event_espresso'),
 					'delete_tickets' => __('Delete Permanently', 'event_espresso')
 					)
 				)
@@ -161,53 +161,53 @@ 
 
 
 
-	public function get_default_tickets( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_default_tickets($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		$orderby= empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $order;
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $order;
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted' => $trashed
 			);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name' => array('LIKE',$sstr ),
-				'TKT_description' => array('LIKE',$sstr )
+				'TKT_name' => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
@@ -218,9 +218,9 @@ 
 			'group_by'=>'TKT_ID'
 			);
 
-		if($count){
+		if ($count) {
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else {
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -230,41 +230,41 @@ 
 
 
 
-	protected function _trash_or_restore_ticket(  $trash = FALSE ) {
+	protected function _trash_or_restore_ticket($trash = FALSE) {
 		$success = 1;
 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID))
 						$success = 0;
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+					if ( ! $TKT->restore_by_ID($TKT_ID))
 						$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
 
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID))
 					$success = 0;
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+				if ( ! $TKT->restore_by_ID($TKT_ID))
 					$success = 0;
 			}
 		}
 
 		$action_desc = $trash ? 'moved to the trash' : 'restored';
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, array() );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
 	}
 
 
@@ -277,34 +277,34 @@ 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 		}
 
 		$action_desc = 'deleted';
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, array() );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
 	}
 
 
 
 
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
 
 		//delete all related prices first
 		$tkt->delete_related_permanently('Price');

Braces +16 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -220,7 +222,7 @@ 
 
 		if($count){
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -243,11 +245,13 @@ 
 			//cycle thru the boxes
 			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
 				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				}
 			}
 		} else {
@@ -255,11 +259,13 @@ 
 			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
 
 			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			}
 		}
 

caffeinated/admin/new/tickets/Tickets_Admin_Page_Init.core.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
 *
 * ------------------------------------------------------------------------
 */
-class Tickets_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Tickets_Admin_Page_Init extends EE_Admin_Page_Init {
 
 
 
@@ -36,19 +36,19 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'TICKETS_PG_SLUG', 'tickets' );
-		define( 'TICKETS_LABEL', __('Default Tickets', 'event_espresso'));
-		define( 'TICKETS_ADMIN', EE_CORE_CAF_ADMIN . 'new' . DS . TICKETS_PG_SLUG . DS );
-		define( 'TICKETS_ADMIN_URL', admin_url( 'admin.php?page=' . TICKETS_PG_SLUG ));
-		define( 'TICKETS_ASSETS_PATH', TICKETS_ADMIN . 'assets' . DS );
-		define( 'TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG .'/assets/' );
-		define( 'TICKETS_TEMPLATE_PATH', TICKETS_ADMIN . 'templates' . DS );
-		define( 'TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG . DS . 'templates/' );
+		define('TICKETS_PG_SLUG', 'tickets');
+		define('TICKETS_LABEL', __('Default Tickets', 'event_espresso'));
+		define('TICKETS_ADMIN', EE_CORE_CAF_ADMIN.'new'.DS.TICKETS_PG_SLUG.DS);
+		define('TICKETS_ADMIN_URL', admin_url('admin.php?page='.TICKETS_PG_SLUG));
+		define('TICKETS_ASSETS_PATH', TICKETS_ADMIN.'assets'.DS);
+		define('TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.'/assets/');
+		define('TICKETS_TEMPLATE_PATH', TICKETS_ADMIN.'templates'.DS);
+		define('TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.DS.'templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_CORE_CAF_ADMIN . 'new' . DS . $this->_folder_name . DS;
+		$this->_folder_path = EE_CORE_CAF_ADMIN.'new'.DS.$this->_folder_name.DS;
 
 	}
 
@@ -62,7 +62,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' => 15,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
 * Event Espresso
 *

caffeinated/admin/new/tickets/Tickets_List_Table.class.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 				'TKT_taxable' => __('Taxable', 'event_espresso')
 			);
 
-        $this->_sortable_columns = array(
+		$this->_sortable_columns = array(
 				// TRUE means its already sorted
 				'TKT_name' => array( 'TKT_name', TRUE ),
 				'TKT_description' => array( 'TKT_description', FALSE ),
@@ -68,9 +68,9 @@ 
 				'TKT_min' => array( 'TKT_min', FALSE ),
 				'TKT_max' => array( 'TKT_max', FALSE ),
 				'TKT_price' => array( 'TKT_price', FALSE )
-	        	);
+				);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
 	}

Spacing +24 added lines, -24 removed lines

@@ -31,9 +31,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_default_tickets( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_default_tickets($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -61,13 +61,13 @@ 
 
         $this->_sortable_columns = array(
 				// TRUE means its already sorted
-				'TKT_name' => array( 'TKT_name', TRUE ),
-				'TKT_description' => array( 'TKT_description', FALSE ),
-				'TKT_qty' => array( 'TKT_qty', FALSE ),
-				'TKT_uses' => array( 'TKT_uses', FALSE ),
-				'TKT_min' => array( 'TKT_min', FALSE ),
-				'TKT_max' => array( 'TKT_max', FALSE ),
-				'TKT_price' => array( 'TKT_price', FALSE )
+				'TKT_name' => array('TKT_name', TRUE),
+				'TKT_description' => array('TKT_description', FALSE),
+				'TKT_qty' => array('TKT_qty', FALSE),
+				'TKT_uses' => array('TKT_uses', FALSE),
+				'TKT_min' => array('TKT_min', FALSE),
+				'TKT_max' => array('TKT_max', FALSE),
+				'TKT_price' => array('TKT_price', FALSE)
 	        	);
 
         $this->_hidden_columns = array(
@@ -87,14 +87,14 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_tickets', 'trash_ticket'))
 		$this->_views['trashed']['count'] = $this->_trashed_count;
 	}
 
 
 
 	function column_cb($item) {
-		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 
 	}
 
@@ -105,21 +105,21 @@ 
 		$actions = array();
 
 		//trash links
-		if ( $item->ID() !== 1 ) {
-			if ( $this->_view == 'all' ) {
-				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'trash_ticket', 'TKT_ID' => $item->ID() ), TICKETS_ADMIN_URL );
-				$actions['trash'] = '<a href="' . $trash_lnk_url . '" title="' . esc_attr__('Move Ticket to trash', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->ID() !== 1) {
+			if ($this->_view == 'all') {
+				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'trash_ticket', 'TKT_ID' => $item->ID()), TICKETS_ADMIN_URL);
+				$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Ticket to trash', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 			} else {
 				// restore price link
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Ticket', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Ticket', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				// delete price link
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Ticket Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Ticket Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		return $item->get('TKT_name') . $this->row_actions( $actions );
+		return $item->get('TKT_name').$this->row_actions($actions);
 	}
 
 
@@ -132,13 +132,13 @@ 
 
 
 	function column_TKT_qty($item) {
-		return $item->get_pretty('TKT_qty','text');
+		return $item->get_pretty('TKT_qty', 'text');
 	}
 
 
 
 	function column_TKT_uses($item) {
-		return $item->get_pretty('TKT_uses','text');
+		return $item->get_pretty('TKT_uses', 'text');
 	}
 
 
@@ -149,7 +149,7 @@ 
 
 
 	function column_TKT_max($item) {
-		return $item->get_pretty('TKT_max','text');
+		return $item->get_pretty('TKT_max', 'text');
 	}
 
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -87,8 +89,9 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
-		$this->_views['trashed']['count'] = $this->_trashed_count;
+		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) {
+				$this->_views['trashed']['count'] = $this->_trashed_count;
+		}
 	}