eventespresso / event-espresso-core

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

Braces +5 added lines, -3 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
@@ -125,8 +126,9 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		if ( !defined('REG_ADMIN_URL') ) {
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 
 		$edit_query_args = array(
 				'action' => 'edit_question_group',

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', $item->ID() ) ? '<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', $item->ID()) ? '<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/templates/question_groups_main_meta_box.template.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                     <?php
 					$question_order = 0;
 					$question_group_questions = $question_group->questions();
-                    foreach( $all_questions as $question_ID => $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"' : '';

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>

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

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@
 <?php
 //required variables for template:
 assert($question_group instanceof EE_Question_Group);
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));//list of unused questions
-foreach($all_questions as $question_option){
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); //list of unused questions
+foreach ($all_questions as $question_option) {
 	assert($question_option);
 	assert($question_option instanceof EE_Question);
 }
 ?>
-<h4><?php _e('Check off all questions that you wish to appear in this group.','event_espresso');?></h4>
+<h4><?php _e('Check off all questions that you wish to appear in this group.', 'event_espresso'); ?></h4>
 <ul>
 	<?php 
-	foreach( $all_questions as $question_ID=>$question ){
+	foreach ($all_questions as $question_ID=>$question) {
 		/*@var $question EE_Question*/
-		$checked = array_key_exists( $question_ID, $question_group->questions() ) ? ' checked="checked"' : '';
+		$checked = array_key_exists($question_ID, $question_group->questions()) ? ' checked="checked"' : '';
 	?>
 	<li>
 		<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 $checked;?>/>
+			<input type="checkbox" name="questions[<?php echo $question_ID; ?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID; ?>"<?php echo $checked; ?>/>
 			<?php echo $question->display_text()?>				
 		</label>
 	</li>

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

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <div class="padding">
-		<?php do_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template' ); ?>
+		<?php do_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template'); ?>
 </div>

caffeinated/admin/extend/registrations/templates/newsletter-send-form.template.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                 <input type="hidden" id="get_newsletter_form_content_nonce" name="get_newsletter_form_content_nonce" value="<?php echo $ajax_nonce; ?>">
                 <input type="hidden" name="batch_message[id_type]" value="<?php echo $id_type; ?>">
                 <input id="newsletter-batch-ids" type="hidden" name="batch_message[ids]" value="">
-                <h3 class="newsletter-send-form-title"><?php printf( __('Sending batch message to %s people...', 'event_espresso'), '[NUMPEOPLE]' ); ?></h3>
+                <h3 class="newsletter-send-form-title"><?php printf(__('Sending batch message to %s people...', 'event_espresso'), '[NUMPEOPLE]'); ?></h3>
                 <label for="batch-message-template-selector"><?php _e('Select Template:', 'event_espresso'); ?></label>
                 <?php echo $template_selector; ?>
                 <div class="batch-message-edit-fields" style="display:none;">

caffeinated/admin/new/pricing/Price_Types_List_Table.class.php

Spacing +30 added lines, -30 removed lines

@@ -28,9 +28,9 @@ 
  */
 class Price_Types_List_Table extends EE_Admin_List_Table {
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 	}
 
@@ -39,9 +39,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_price_types_overview_data( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_price_types_overview_data( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_price_types_overview_data( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_price_types_overview_data($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_price_types_overview_data($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_price_types_overview_data($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -57,14 +57,14 @@ 
 		$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
 				'name' => __('Name', 'event_espresso'),
-				'base_type' => '<div class="jst-cntr">' . __('Base Type', 'event_espresso') . '</div>',
-				'percent' => '<div class="jst-cntr">' . __('Applied', 'event_espresso') . '<br/>' . __('as ', 'event_espresso') . '<span class="big-text">' . __('%', 'event_espresso') . '</span>' . __(' or ', 'event_espresso') . '<span class="big-text">' . __('$', 'event_espresso') . '</span></div>',
-				'order' => '<div class="jst-cntr">' . __('Order of', 'event_espresso') . '<br/>' . __('Application', 'event_espresso') . '</div>'
+				'base_type' => '<div class="jst-cntr">'.__('Base Type', 'event_espresso').'</div>',
+				'percent' => '<div class="jst-cntr">'.__('Applied', 'event_espresso').'<br/>'.__('as ', 'event_espresso').'<span class="big-text">'.__('%', 'event_espresso').'</span>'.__(' or ', 'event_espresso').'<span class="big-text">'.__('$', 'event_espresso').'</span></div>',
+				'order' => '<div class="jst-cntr">'.__('Order of', 'event_espresso').'<br/>'.__('Application', 'event_espresso').'</div>'
 			);
 
 		$this->_sortable_columns = array(
 			// TRUE means its already sorted
-			'name' => array( 'name' => FALSE )
+			'name' => array('name' => FALSE)
 		);
 
 		$this->_hidden_columns = array();
@@ -82,7 +82,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_types', 'pricing_trash_price_type' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_types', 'pricing_trash_price_type')) {
 			$this->_views['trashed']['count'] = $this->_trashed_count;
 		}
 	}
@@ -92,8 +92,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		if ($item->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -106,30 +106,30 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price_type', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price Type', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price_type', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price Type', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price Type', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price_type', 'pricing_edit_price_type', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price Type', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->base_type() !== 1 ) {
-			if ( $this->_view == 'all' ) {
+		if ($item->base_type() !== 1) {
+			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_trash_price_type', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price Type to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_trash_price_type', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price Type to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
 				// restore price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_restore_price_type', $item->ID() ) ) {
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price Type', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_restore_price_type', $item->ID())) {
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price Type', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_type', 'pricing_delete_price_type', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price_type', 'id'=>$item->ID(), 'noheader' => TRUE ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Type Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_type', 'pricing_delete_price_type', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price_type', 'id'=>$item->ID(), 'noheader' => TRUE), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Type Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -147,14 +147,14 @@ 
 
 
 	function column_base_type($item) {
-		return '<div class="jst-cntr">' . $item->base_type_name()  . '</div>';
+		return '<div class="jst-cntr">'.$item->base_type_name().'</div>';
 	}
 
 
 
 
 	function column_percent($item) {
-		return '<div class="jst-cntr">' . ( $item->is_percent() ? '%' : EE_Registry::instance()->CFG->currency->sign ) . '</div>';
+		return '<div class="jst-cntr">'.($item->is_percent() ? '%' : EE_Registry::instance()->CFG->currency->sign).'</div>';
 	}
 
 
@@ -162,7 +162,7 @@ 
 
 
 	function column_order($item) {
-		return '<div class="jst-cntr">' . $item->order() . '</div>';
+		return '<div class="jst-cntr">'.$item->order().'</div>';
 	}
 
 

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
@@ -92,8 +94,9 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		if ( $item->base_type() !== 1 ) {
+					return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', /* $1%s */ $item->ID() );
+		}
 		return '';
 	}
 

caffeinated/admin/new/pricing/Prices_List_Table.class.php

Braces +9 added lines, -5 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
@@ -118,8 +120,9 @@ 
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
-			$new_row .= ' rowsortable';
+		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 ) {
+					$new_row .= ' rowsortable';
+		}
 
 		return ' class="' . $new_row . '"';
 	}
@@ -131,8 +134,9 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ( $item->type_obj()->base_type() !== 1 ) {
+					return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		}
 		return '';
 	}
 

Spacing +33 added lines, -33 removed lines

@@ -36,9 +36,9 @@ 
 	 */
 	protected $_price_types = array();
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 		$this->_price_types = $this->_PRT->get_all_deleted_and_undeleted();
 	}
@@ -48,9 +48,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? true : false;
-		$this->_data = $this->_admin_page->get_prices_overview_data( $this->_per_page, false, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, false );
-		$this->_trashed_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, true );
+		$this->_data = $this->_admin_page->get_prices_overview_data($this->_per_page, false, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, false);
+		$this->_trashed_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, true);
 	}
 
 
@@ -74,9 +74,9 @@ 
 
 			$this->_sortable_columns = array(
 						// true means its already sorted
-						'name' => array( 'name' => false ),
-						'type' => array( 'type' => false ),
-						'amount' => array( 'amount' => false )
+						'name' => array('name' => false),
+						'type' => array('type' => false),
+						'amount' => array('amount' => false)
 			);
 
         $this->_hidden_columns = array(
@@ -98,7 +98,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price') ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed']['count'] = $this->_trashed_count;
 		}
 	}
@@ -112,16 +112,16 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
+		if ($item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4)
 			$new_row .= ' rowsortable';
 
-		return ' class="' . $new_row . '"';
+		return ' class="'.$new_row.'"';
 	}
 
 
@@ -131,8 +131,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ($item->type_obj()->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -145,31 +145,31 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'pricing_edit_price', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'pricing_edit_price', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'edit_price', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'edit_price', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->type_obj()->base_type() !== 1 ) {
+		if ($item->type_obj()->base_type() !== 1) {
 			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_trash_price', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_trash_price', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_restore_price', $item->ID() ) ) {
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_restore_price', $item->ID())) {
 					// restore price link
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_delete_price', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_delete_price', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -178,7 +178,7 @@ 
 		return sprintf('%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->ID(),
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -195,7 +195,7 @@ 
 
 
 	function column_description($item) {
-		return stripslashes( $item->desc() );
+		return stripslashes($item->desc());
 	}
 
 
@@ -204,9 +204,9 @@ 
 
 	function column_amount($item) {
 		if ($this->_price_types[$item->type()]->is_percent()) {
-			return '<div class="pad-amnt-rght">' . number_format($item->amount(), 1) . '%</div>';
+			return '<div class="pad-amnt-rght">'.number_format($item->amount(), 1).'%</div>';
 		} else {
-			return '<div class="pad-amnt-rght">' . EEH_Template::format_currency( $item->amount() ) . '</div>';
+			return '<div class="pad-amnt-rght">'.EEH_Template::format_currency($item->amount()).'</div>';
 		}
 	}
 

Indentation +2 added lines, -2 removed lines

@@ -79,10 +79,10 @@
 						'amount' => array( 'amount' => false )
 			);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
-        $this->_ajax_sorting_callback = 'update_prices_order';
+		$this->_ajax_sorting_callback = 'update_prices_order';
 
 	}
 

caffeinated/admin/new/pricing/Pricing_Admin_Page_Init.core.php

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
 *
 * ------------------------------------------------------------------------
 */
-class Pricing_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Pricing_Admin_Page_Init extends EE_Admin_Page_Init {
 
 
 
@@ -36,20 +36,20 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'PRICING_PG_SLUG', 'pricing' );
-		define( 'PRICING_LABEL', __('Pricing', 'event_espresso'));
-		define( 'PRICING_PG_NAME', ucwords( str_replace( '_', '', PRICING_PG_SLUG )));
-		define( 'PRICING_ADMIN', EE_CORE_CAF_ADMIN . 'new' . DS . PRICING_PG_SLUG . DS );
-		define( 'PRICING_ADMIN_URL', admin_url( 'admin.php?page=' . PRICING_PG_SLUG ));
-		define( 'PRICING_ASSETS_PATH', PRICING_ADMIN . 'assets' . DS );
-		define( 'PRICING_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . PRICING_PG_SLUG .'/assets/' );
-		define( 'PRICING_TEMPLATE_PATH', PRICING_ADMIN . 'templates' . DS );
-		define( 'PRICING_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . PRICING_PG_SLUG . DS . 'templates/' );
+		define('PRICING_PG_SLUG', 'pricing');
+		define('PRICING_LABEL', __('Pricing', 'event_espresso'));
+		define('PRICING_PG_NAME', ucwords(str_replace('_', '', PRICING_PG_SLUG)));
+		define('PRICING_ADMIN', EE_CORE_CAF_ADMIN.'new'.DS.PRICING_PG_SLUG.DS);
+		define('PRICING_ADMIN_URL', admin_url('admin.php?page='.PRICING_PG_SLUG));
+		define('PRICING_ASSETS_PATH', PRICING_ADMIN.'assets'.DS);
+		define('PRICING_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.PRICING_PG_SLUG.'/assets/');
+		define('PRICING_TEMPLATE_PATH', PRICING_ADMIN.'templates'.DS);
+		define('PRICING_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.PRICING_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;
 
 	}
 
@@ -64,7 +64,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' => 20,
 			'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/pricing/help_tours/Pricing_Add_New_Default_Price_Help_Tour.class.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');
 
 /**
@@ -78,25 +78,25 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Add New Default Price', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the add new default price page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add New Default Price', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the add new default price 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 _price_type_stop() {
-		return '<p>' . __('Price Types are a way of categorizing a price, discount, tax, or surcharge and indicating how it gets applied to a running total when a transaction occurs.', 'event_espresso') . '</p>';
+		return '<p>'.__('Price Types are a way of categorizing a price, discount, tax, or surcharge and indicating how it gets applied to a running total when a transaction occurs.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_name_stop() {
-		return '<p>' . __('The name of the price, discount, tax, or surcharge that will be seen by your customers.', 'event_espresso') . '</p>';
+		return '<p>'.__('The name of the price, discount, tax, or surcharge that will be seen by your customers.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_description_stop() {
-		return '<p>' . __('View the price type (price, discount, tax or surcharge) description.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the price type (price, discount, tax or surcharge) description.', 'event_espresso').'</p>';
 	}
 
 	protected function _price_amount_stop() {
-		return '<p>' . __('The ticket amount before any deductions.', 'event_espresso') . '</p>';
+		return '<p>'.__('The ticket amount before any deductions.', '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