| @@ -1,6 +1,7 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * | 
| @@ -152,8 +153,9 @@ discard block | ||
| 152 | 153 |  		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE; | 
| 153 | 154 | |
| 154 | 155 | //if ALL steps are done, let's just return FALSE so we don't display anything | 
| 155 | - if ( $done_step_one && $done_step_two && $done_step_three ) | |
| 156 | - return FALSE; | |
| 156 | +		if ( $done_step_one && $done_step_two && $done_step_three ) { | |
| 157 | + return FALSE; | |
| 158 | + } | |
| 157 | 159 | |
| 158 | 160 | //now let's put it together | 
| 159 | 161 | $steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' ); | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -139,11 +139,11 @@ discard block | ||
| 139 | 139 | //Copied from _whats_new() | 
| 140 | 140 | $steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE; | 
| 141 | 141 | $steps = $steps !== FALSE ? $steps : ''; | 
| 142 | -		$this->_admin_page_title = sprintf( esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION ); | |
| 142 | +		$this->_admin_page_title = sprintf(esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); | |
| 143 | 143 | $settings_message = $steps; | 
| 144 | -		$this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message; | |
| 145 | - $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php'; | |
| 146 | - $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE ); | |
| 144 | +		$this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message; | |
| 145 | + $template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php'; | |
| 146 | + $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE); | |
| 147 | 147 | $this->display_about_admin_page(); | 
| 148 | 148 | } | 
| 149 | 149 | |
| @@ -151,36 +151,36 @@ discard block | ||
| 151 | 151 | |
| 152 | 152 |  	protected function _get_started_steps() { | 
| 153 | 153 |  		$steps = '<h2>'.esc_html__('Getting Started').'</h2>'; | 
| 154 | -		$step_one = '<p>'.sprintf( esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>'; | |
| 155 | -		$step_two = '<p>'.sprintf( esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>'; | |
| 156 | -		$step_three = '<p>'.sprintf( esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>'; | |
| 154 | +		$step_one = '<p>'.sprintf(esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>'; | |
| 155 | +		$step_two = '<p>'.sprintf(esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>'; | |
| 156 | +		$step_three = '<p>'.sprintf(esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>'; | |
| 157 | 157 | |
| 158 | 158 | //done? | 
| 159 | 159 | $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE; | 
| 160 | - $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) ); | |
| 161 | - $active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ); | |
| 160 | +		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice'))); | |
| 161 | + $active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart); | |
| 162 | 162 | //done step two if a non-invoice paymetn method is active; or there is more than one PM active, or | 
| 163 | 163 | //if only the invoice is active but it's clearly been updated | 
| 164 | - $done_step_two = $active_pms_count > 1 || | |
| 165 | - ( $active_pms_count === 1 && ! $active_invoice_pm ) || | |
| 166 | - ( $active_invoice_pm instanceof EE_Payment_Method && ( | |
| 167 | - $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) || | |
| 168 | - $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) || | |
| 169 | - $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) || | |
| 170 | - $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) || | |
| 171 | - $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' ) | |
| 164 | + $done_step_two = $active_pms_count > 1 || | |
| 165 | + ($active_pms_count === 1 && ! $active_invoice_pm) || | |
| 166 | + ($active_invoice_pm instanceof EE_Payment_Method && ( | |
| 167 | +								 $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') || | |
| 168 | +								 $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') || | |
| 169 | +								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') || | |
| 170 | +								 $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') || | |
| 171 | +								 $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '') | |
| 172 | 172 | ) | 
| 173 | 173 | ); | 
| 174 | 174 |  		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE; | 
| 175 | 175 | |
| 176 | 176 | //if ALL steps are done, let's just return FALSE so we don't display anything | 
| 177 | - if ( $done_step_one && $done_step_two && $done_step_three ) | |
| 177 | + if ($done_step_one && $done_step_two && $done_step_three) | |
| 178 | 178 | return FALSE; | 
| 179 | 179 | |
| 180 | 180 | //now let's put it together | 
| 181 | - $steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' ); | |
| 182 | - $steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' ); | |
| 183 | - $steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' ); | |
| 181 | +		$steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : ''); | |
| 182 | +		$steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : ''); | |
| 183 | +		$steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : ''); | |
| 184 | 184 | |
| 185 | 185 | return $steps; | 
| 186 | 186 | } | 
| @@ -188,27 +188,27 @@ discard block | ||
| 188 | 188 | |
| 189 | 189 | |
| 190 | 190 |  	protected function _credits() { | 
| 191 | -		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION ); | |
| 191 | +		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); | |
| 192 | 192 |  		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso'); | 
| 193 | - $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php'; | |
| 194 | - $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE ); | |
| 193 | + $template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php'; | |
| 194 | + $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE); | |
| 195 | 195 | $this->display_about_admin_page(); | 
| 196 | 196 | } | 
| 197 | 197 | |
| 198 | 198 | |
| 199 | 199 |  	protected function _decafvpro() { | 
| 200 | -		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION ); | |
| 200 | +		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); | |
| 201 | 201 |  		$this->_template_args['admin_page_subtitle'] = sprintf(__('Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s', 'event_espresso'), '<em>', '</em>', '<strong>', '</strong>'); | 
| 202 | - $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php'; | |
| 203 | - $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE ); | |
| 202 | + $template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php'; | |
| 203 | + $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE); | |
| 204 | 204 | $this->display_about_admin_page(); | 
| 205 | 205 | } | 
| 206 | 206 | |
| 207 | 207 |  	protected function _reviews() { | 
| 208 | 208 |  		$this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso'); | 
| 209 | 209 |  		$this->_template_args['admin_page_subtitle'] = __('At Event Espresso, customer satisfaction is our ultimate goal.', 'event_espresso'); | 
| 210 | - $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php'; | |
| 211 | - $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE ); | |
| 210 | + $template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php'; | |
| 211 | + $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE); | |
| 212 | 212 | $this->display_about_admin_page(); | 
| 213 | 213 | } | 
| 214 | 214 | |
| @@ -30,12 +30,12 @@ discard block | ||
| 30 | 30 | |
| 31 | 31 |  	public function __construct() { | 
| 32 | 32 | //define some events related constants | 
| 33 | - define( 'EE_ABOUT_PG_SLUG', 'espresso_about' ); | |
| 34 | -		define( 'EE_ABOUT_LABEL', __('About', 'event_espresso')); | |
| 35 | - define( 'EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about' . DS ); | |
| 36 | - define( 'EE_ABOUT_ADMIN_URL', admin_url( 'admin.php?page=' . EE_ABOUT_PG_SLUG )); | |
| 37 | - define( 'EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates' . DS ); | |
| 38 | - define( 'EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/' ); | |
| 33 | +		define('EE_ABOUT_PG_SLUG', 'espresso_about'); | |
| 34 | +		define('EE_ABOUT_LABEL', __('About', 'event_espresso')); | |
| 35 | +		define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES.'about'.DS); | |
| 36 | +		define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page='.EE_ABOUT_PG_SLUG)); | |
| 37 | +		define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN.'templates'.DS); | |
| 38 | +		define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL.'about/assets/'); | |
| 39 | 39 | parent::__construct(); | 
| 40 | 40 | } | 
| 41 | 41 | |
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 |  	protected function _set_menu_map() { | 
| 47 | - $this->_menu_map = new EE_Admin_Page_Sub_Menu( array( | |
| 47 | + $this->_menu_map = new EE_Admin_Page_Sub_Menu(array( | |
| 48 | 48 | 'menu_group' => 'extras', | 
| 49 | 49 | 'menu_order' => 40, | 
| 50 | 50 | 'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN, | 
| @@ -1,4 +1,6 @@ | ||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); | |
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { | |
| 2 | +	exit('No direct script access allowed'); | |
| 3 | +} | |
| 2 | 4 | /** | 
| 3 | 5 | * Event Espresso | 
| 4 | 6 | * | 
| @@ -1,25 +1,25 @@ | ||
| 1 | 1 | <div class="changelog point-releases"> | 
| 2 | - <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> | |
| 3 | - <!-- <h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>--> | |
| 2 | +	<h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> | |
| 3 | +	<!-- <h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>--> | |
| 4 | 4 | <?php $type = 'minor'; ?> | 
| 5 | 5 | <?php //$type = 'major'; ?> | 
| 6 | - <p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?> | |
| 6 | +	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?> | |
| 7 | 7 | <?php | 
| 8 | - $ver = explode( '.', EVENT_ESPRESSO_VERSION ); | |
| 9 | - array_pop( $ver ); | |
| 10 | - $ver = implode( '.', $ver ); | |
| 8 | +			$ver = explode('.', EVENT_ESPRESSO_VERSION); | |
| 9 | + array_pop($ver); | |
| 10 | +			$ver = implode('.', $ver); | |
| 11 | 11 | ?> | 
| 12 | - <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?> | |
| 12 | +		<?php printf(__('For more information, see <a href="%s">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?> | |
| 13 | 13 | </p> | 
| 14 | 14 | </div> | 
| 15 | 15 | |
| 16 | 16 | <div class="changelog"> | 
| 17 | 17 | <?php | 
| 18 | 18 | //maintenance mode on? | 
| 19 | -	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) { | |
| 19 | +	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) { | |
| 20 | 20 | ?> | 
| 21 | 21 | <div class="ee-attention"> | 
| 22 | -			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2> | |
| 22 | +			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2> | |
| 23 | 23 | <p> | 
| 24 | 24 | <?php | 
| 25 | 25 | printf( | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -31,7 +31,7 @@ discard block | ||
| 31 | 31 | |
| 32 | 32 |  class Event_Categories_Admin_List_Table extends EE_Admin_List_Table { | 
| 33 | 33 | |
| 34 | -	public function __construct( $admin_page ) { | |
| 34 | +	public function __construct($admin_page) { | |
| 35 | 35 | parent::__construct($admin_page); | 
| 36 | 36 | } | 
| 37 | 37 | |
| @@ -39,8 +39,8 @@ discard block | ||
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 |  	protected function _setup_data() { | 
| 42 | - $this->_data = $this->_admin_page->get_categories( $this->_per_page, $this->_current_page); | |
| 43 | - $this->_all_data_count = EEM_Term_Taxonomy::instance()->count( array( array( 'taxonomy' => 'espresso_event_categories' ) ) ); | |
| 42 | + $this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page); | |
| 43 | +		$this->_all_data_count = EEM_Term_Taxonomy::instance()->count(array(array('taxonomy' => 'espresso_event_categories'))); | |
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | |
| @@ -49,8 +49,8 @@ discard block | ||
| 49 | 49 | |
| 50 | 50 |  	protected function _set_properties() { | 
| 51 | 51 | $this->_wp_list_args = array( | 
| 52 | -			'singular' => __('event category', 'event_espresso' ), | |
| 53 | -			'plural' => __('event categories', 'event_espresso' ), | |
| 52 | +			'singular' => __('event category', 'event_espresso'), | |
| 53 | +			'plural' => __('event categories', 'event_espresso'), | |
| 54 | 54 | 'ajax' => TRUE, //for now, | 
| 55 | 55 | 'screen' => $this->_admin_page->get_current_screen()->id | 
| 56 | 56 | ); | 
| @@ -64,9 +64,9 @@ discard block | ||
| 64 | 64 | ); | 
| 65 | 65 | |
| 66 | 66 | $this->_sortable_columns = array( | 
| 67 | - 'id' => array( 'Term.term_id' => true ), | |
| 68 | - 'name' => array( 'Term.slug' => false ), | |
| 69 | - 'count' => array( 'term_count' => false ) | |
| 67 | +			'id' => array('Term.term_id' => true), | |
| 68 | +			'name' => array('Term.slug' => false), | |
| 69 | +			'count' => array('term_count' => false) | |
| 70 | 70 | ); | 
| 71 | 71 | |
| 72 | 72 | $this->_primary_column = 'id'; | 
| @@ -98,7 +98,7 @@ discard block | ||
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 |  	public function column_cb($item) { | 
| 101 | -		return sprintf( '<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id') ); | |
| 101 | +		return sprintf('<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id')); | |
| 102 | 102 | } | 
| 103 | 103 | |
| 104 | 104 | |
| @@ -107,7 +107,7 @@ discard block | ||
| 107 | 107 | |
| 108 | 108 |  	public function column_id($item) { | 
| 109 | 109 |  		$content = $item->get('term_id'); | 
| 110 | -		$content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get('name') . '</span>'; | |
| 110 | +		$content .= '  <span class="show-on-mobile-view-only">'.$item->get_first_related('Term')->get('name').'</span>'; | |
| 111 | 111 | return $content; | 
| 112 | 112 | } | 
| 113 | 113 | |
| @@ -127,17 +127,17 @@ discard block | ||
| 127 | 127 |  			'EVT_CAT_ID' => $item->get('term_id') | 
| 128 | 128 | ); | 
| 129 | 129 | |
| 130 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); | |
| 131 | - $delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EVENTS_ADMIN_URL ); | |
| 130 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); | |
| 131 | + $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EVENTS_ADMIN_URL); | |
| 132 | 132 | |
| 133 | 133 | $actions = array( | 
| 134 | -			'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Category', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>' | |
| 134 | +			'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Category', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>' | |
| 135 | 135 | ); | 
| 136 | 136 | |
| 137 | 137 | |
| 138 | -		$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Category', 'event_espresso') . '">' . __('Delete', 'event_espresso') . '</a>'; | |
| 138 | +		$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Category', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>'; | |
| 139 | 139 | |
| 140 | -		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get('name') . '</a></strong>'; | |
| 140 | +		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->get_first_related('Term')->get('name').'</a></strong>'; | |
| 141 | 141 | $content .= $this->row_actions($actions); | 
| 142 | 142 | return $content; | 
| 143 | 143 | } | 
| @@ -146,20 +146,20 @@ discard block | ||
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 |  	public function column_shortcode($item) { | 
| 149 | -		$content = '[ESPRESSO_EVENTS category_slug=' . $item->get_first_related('Term')->get('slug') . ']'; | |
| 149 | +		$content = '[ESPRESSO_EVENTS category_slug='.$item->get_first_related('Term')->get('slug').']'; | |
| 150 | 150 | return $content; | 
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | |
| 155 | 155 | |
| 156 | -	public function column_count( $item ) { | |
| 156 | +	public function column_count($item) { | |
| 157 | 157 | $e_args = array( | 
| 158 | 158 | 'action' => 'default', | 
| 159 | 159 |  			'EVT_CAT' => $item->get_first_related('Term')->ID() | 
| 160 | 160 | ); | 
| 161 | - $e_link = EE_Admin_Page::add_query_args_and_nonce( $e_args, EVENTS_ADMIN_URL ); | |
| 162 | -		$content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>'; | |
| 161 | + $e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EVENTS_ADMIN_URL); | |
| 162 | +		$content = '<a href="'.$e_link.'">'.$item->get('term_count').'</a>'; | |
| 163 | 163 | return $content; | 
| 164 | 164 | } | 
| 165 | 165 | } | 
| @@ -33,13 +33,13 @@ discard block | ||
| 33 | 33 | * define some events related constants but only if not defined (need to check because unit tests | 
| 34 | 34 | * may load) | 
| 35 | 35 | */ | 
| 36 | -		if ( ! defined( 'EVENTS_PG_SLUG' ) ) { | |
| 37 | - define( 'EVENTS_PG_SLUG', 'espresso_events' ); | |
| 38 | -			define( 'EVENTS_LABEL', __('Events', 'event_espresso')); | |
| 39 | - define( 'EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS ); | |
| 40 | - define( 'EVENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EVENTS_PG_SLUG )); | |
| 41 | - define( 'EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS ); | |
| 42 | - define( 'EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/' ); | |
| 36 | +		if ( ! defined('EVENTS_PG_SLUG')) { | |
| 37 | +			define('EVENTS_PG_SLUG', 'espresso_events'); | |
| 38 | +			define('EVENTS_LABEL', __('Events', 'event_espresso')); | |
| 39 | +			define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events'.DS); | |
| 40 | +			define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG)); | |
| 41 | +			define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates'.DS); | |
| 42 | +			define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/'); | |
| 43 | 43 | } | 
| 44 | 44 | parent::__construct(); | 
| 45 | 45 | } | 
| @@ -49,7 +49,7 @@ discard block | ||
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 |  	protected function _set_menu_map() { | 
| 52 | - $this->_menu_map = new EE_Admin_Page_Main_Menu( array( | |
| 52 | + $this->_menu_map = new EE_Admin_Page_Main_Menu(array( | |
| 53 | 53 | 'menu_group' => 'main', | 
| 54 | 54 | 'menu_order' => 10, | 
| 55 | 55 |  			'subtitle' => __('Events', 'event_espresso'), | 
| @@ -1,4 +1,6 @@ | ||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); | |
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { | |
| 2 | +	exit('No direct script access allowed'); | |
| 3 | +} | |
| 2 | 4 | /** | 
| 3 | 5 | * Event Espresso | 
| 4 | 6 | * | 
| @@ -33,7 +33,7 @@ | ||
| 33 | 33 | </li> | 
| 34 | 34 | <li> | 
| 35 | 35 |  <strong><?php _e('Display Descriptions', 'event_espresso'); ?></strong><br /> | 
| 36 | -<?php printf( __('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "' . htmlentities( '<!--more-->' ) . '" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>' );?> | |
| 36 | +<?php printf(__('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "'.htmlentities('<!--more-->').'" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>'); ?> | |
| 37 | 37 | </li> | 
| 38 | 38 | <li> | 
| 39 | 39 |  <strong><?php _e('Display Ticket Selector', 'event_espresso'); ?></strong><br /> | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | 'options' => array( | 
| 56 | 56 | 'tipLocation' => 'right', | 
| 57 | 57 | 'tipAdjustmentY' => -55, | 
| 58 | - 'tipAdjustmentX' => 5 | |
| 58 | + 'tipAdjustmentX' => 5 | |
| 59 | 59 | ) | 
| 60 | 60 | ), | 
| 61 | 61 | 40 => array( | 
| @@ -64,7 +64,7 @@ discard block | ||
| 64 | 64 | 'options' => array( | 
| 65 | 65 | 'tipLocation' => 'top', | 
| 66 | 66 | 'tipAdjustmentY' => -75, | 
| 67 | - 'tipAdjustmentX' => 250 | |
| 67 | + 'tipAdjustmentX' => 250 | |
| 68 | 68 | ) | 
| 69 | 69 | ) | 
| 70 | 70 | ); | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -72,21 +72,21 @@ discard block | ||
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 |  	protected function _stop_one() { | 
| 75 | -		$content = '<h3>' . __('Add New Event Category', 'event_espresso') . '</h3>'; | |
| 76 | -		$content .= '<p>' . __('This tour of the Add New Event Category page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>'; | |
| 75 | +		$content = '<h3>'.__('Add New Event Category', 'event_espresso').'</h3>'; | |
| 76 | +		$content .= '<p>'.__('This tour of the Add New Event Category page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>'; | |
| 77 | 77 | return $content; | 
| 78 | 78 | } | 
| 79 | 79 | |
| 80 | 80 |  	protected function _stop_two() { | 
| 81 | -		return '<p>' . __('Enter a name for your new category.', 'event_espresso') . '</p>'; | |
| 81 | +		return '<p>'.__('Enter a name for your new category.', 'event_espresso').'</p>'; | |
| 82 | 82 | } | 
| 83 | 83 | |
| 84 | 84 |  	protected function _stop_three() { | 
| 85 | -		return '<p>' . __('Enter a unique ID for your new category.', 'event_espresso') . '</p>'; | |
| 85 | +		return '<p>'.__('Enter a unique ID for your new category.', 'event_espresso').'</p>'; | |
| 86 | 86 | } | 
| 87 | 87 | |
| 88 | 88 |  	protected function _stop_four() { | 
| 89 | -		return '<p>' . __('The rich text editor can be used to add information about your category. Images and links can also be added along with your text.', 'event_espresso') . '</p>'; | |
| 89 | +		return '<p>'.__('The rich text editor can be used to add information about your category. Images and links can also be added along with your text.', 'event_espresso').'</p>'; | |
| 90 | 90 | } | 
| 91 | 91 | |
| 92 | 92 | } | 
| 93 | 93 | \ No newline at end of file | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -34,7 +34,7 @@ | ||
| 34 | 34 | $this->_slug = 'event-categories-joyride'; | 
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | -    protected function _set_tour_stops() { | |
| 37 | +	protected function _set_tour_stops() { | |
| 38 | 38 | $this->_stops = array( | 
| 39 | 39 | 10 => array( | 
| 40 | 40 | 'content' => $this->_start(), | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -107,36 +107,36 @@ discard block | ||
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 |  	protected function _start() { | 
| 110 | -		$content = '<h3>' . __('Event Categories', 'event_espresso') . '</h3>'; | |
| 111 | -		$content .= '<p>' . __('This tour of the Event Categories page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>'; | |
| 110 | +		$content = '<h3>'.__('Event Categories', 'event_espresso').'</h3>'; | |
| 111 | +		$content .= '<p>'.__('This tour of the Event Categories page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>'; | |
| 112 | 112 | return $content; | 
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | 115 |  	protected function _id_stop() { | 
| 116 | -		return '<p>' . __('View the event category ID. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>'; | |
| 116 | +		return '<p>'.__('View the event category ID. Can be sorted by ascending or descending order.', 'event_espresso').'</p>'; | |
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 |  	protected function _name_stop() { | 
| 120 | -		return '<p>' . __('View the name of each event category. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>'; | |
| 120 | +		return '<p>'.__('View the name of each event category. Can be sorted by ascending or descending order.', 'event_espresso').'</p>'; | |
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 |  	protected function _shortcode_stop() { | 
| 124 | -		return '<p>' . __('View the shortcode for an event. This shortcode can be added to a WordPress post or WordPress page. ', 'event_espresso') . '</p>'; | |
| 124 | +		return '<p>'.__('View the shortcode for an event. This shortcode can be added to a WordPress post or WordPress page. ', 'event_espresso').'</p>'; | |
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 |  	protected function _count_stop() { | 
| 128 | -		return '<p>' . __('View the number of events that are associated with an event category.', 'event_espresso') . '</p>'; | |
| 128 | +		return '<p>'.__('View the number of events that are associated with an event category.', 'event_espresso').'</p>'; | |
| 129 | 129 | } | 
| 130 | 130 | |
| 131 | 131 |  	protected function _bulk_actions_stop() { | 
| 132 | -		return '<p>' . __('Perform bulk actions to multiple event categories.', 'event_espresso') . '</p>'; | |
| 132 | +		return '<p>'.__('Perform bulk actions to multiple event categories.', 'event_espresso').'</p>'; | |
| 133 | 133 | } | 
| 134 | 134 | |
| 135 | 135 |  	protected function _search_stop() { | 
| 136 | -		return '<p>' . __('Search through event categories. The following sources will be searched: Event Category Name, Event Category Description.', 'event_espresso') . '</p>'; | |
| 136 | +		return '<p>'.__('Search through event categories. The following sources will be searched: Event Category Name, Event Category Description.', 'event_espresso').'</p>'; | |
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | 139 |  	protected function _new_category_stop() { | 
| 140 | -		return '<p>' . __('Click here to add a new event category.', 'event_espresso') . '</p>'; | |
| 140 | +		return '<p>'.__('Click here to add a new event category.', 'event_espresso').'</p>'; | |
| 141 | 141 | } | 
| 142 | 142 | } | 
| 143 | 143 | \ No newline at end of file | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -59,7 +59,7 @@ | ||
| 59 | 59 | return $content; | 
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | - //Options below are showing in full caps. Manually adding statuses and leaving code as is. | |
| 62 | + //Options below are showing in full caps. Manually adding statuses and leaving code as is. | |
| 63 | 63 |  	protected function _stop_two() { | 
| 64 | 64 |  		return '<p>' . sprintf( __('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_approved, 'lowercase' ) ) . '</p>'; | 
| 65 | 65 | } | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -54,14 +54,14 @@ discard block | ||
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 |  	protected function _stop_one() { | 
| 57 | -		$content = '<h3>' . __('Event Default Settings', 'event_espresso') . '</h3>'; | |
| 58 | -		$content .= '<p>' . __('This tour of the Default Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>'; | |
| 57 | +		$content = '<h3>'.__('Event Default Settings', 'event_espresso').'</h3>'; | |
| 58 | +		$content .= '<p>'.__('This tour of the Default Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>'; | |
| 59 | 59 | return $content; | 
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | //Options below are showing in full caps. Manually adding statuses and leaving code as is. | 
| 63 | 63 |  	protected function _stop_two() { | 
| 64 | -		return '<p>' . sprintf( __('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_approved, 'lowercase' ) ) . '</p>'; | |
| 64 | +		return '<p>'.sprintf(__('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, 'lowercase'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, 'lowercase'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, 'lowercase')).'</p>'; | |
| 65 | 65 | } | 
| 66 | 66 | |
| 67 | 67 | } | 
| 68 | 68 | \ No newline at end of file | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso |