@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * ------------------------------------------------------------------------ |
| 25 | 25 | */ |
| 26 | -class Tickets_Admin_Page_Init extends EE_Admin_Page_Init { |
|
| 26 | +class Tickets_Admin_Page_Init extends EE_Admin_Page_Init { |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | |
@@ -36,19 +36,19 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | public function __construct() { |
| 38 | 38 | |
| 39 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
| 39 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
| 40 | 40 | |
| 41 | - define( 'TICKETS_PG_SLUG', 'tickets' ); |
|
| 42 | - define( 'TICKETS_LABEL', __('Default Tickets', 'event_espresso')); |
|
| 43 | - define( 'TICKETS_ADMIN', EE_CORE_CAF_ADMIN . 'new' . DS . TICKETS_PG_SLUG . DS ); |
|
| 44 | - define( 'TICKETS_ADMIN_URL', admin_url( 'admin.php?page=' . TICKETS_PG_SLUG )); |
|
| 45 | - define( 'TICKETS_ASSETS_PATH', TICKETS_ADMIN . 'assets' . DS ); |
|
| 46 | - define( 'TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG .'/assets/' ); |
|
| 47 | - define( 'TICKETS_TEMPLATE_PATH', TICKETS_ADMIN . 'templates' . DS ); |
|
| 48 | - define( 'TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG . DS . 'templates/' ); |
|
| 41 | + define('TICKETS_PG_SLUG', 'tickets'); |
|
| 42 | + define('TICKETS_LABEL', __('Default Tickets', 'event_espresso')); |
|
| 43 | + define('TICKETS_ADMIN', EE_CORE_CAF_ADMIN.'new'.DS.TICKETS_PG_SLUG.DS); |
|
| 44 | + define('TICKETS_ADMIN_URL', admin_url('admin.php?page='.TICKETS_PG_SLUG)); |
|
| 45 | + define('TICKETS_ASSETS_PATH', TICKETS_ADMIN.'assets'.DS); |
|
| 46 | + define('TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.'/assets/'); |
|
| 47 | + define('TICKETS_TEMPLATE_PATH', TICKETS_ADMIN.'templates'.DS); |
|
| 48 | + define('TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.DS.'templates/'); |
|
| 49 | 49 | |
| 50 | 50 | parent::__construct(); |
| 51 | - $this->_folder_path = EE_CORE_CAF_ADMIN . 'new' . DS . $this->_folder_name . DS; |
|
| 51 | + $this->_folder_path = EE_CORE_CAF_ADMIN.'new'.DS.$this->_folder_name.DS; |
|
| 52 | 52 | |
| 53 | 53 | } |
| 54 | 54 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | protected function _set_menu_map() { |
| 65 | - $this->_menu_map = new EE_Admin_Page_Sub_Menu( array( |
|
| 65 | + $this->_menu_map = new EE_Admin_Page_Sub_Menu(array( |
|
| 66 | 66 | 'menu_group' => 'management', |
| 67 | 67 | 'menu_order' => 15, |
| 68 | 68 | 'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY, |
@@ -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 | * |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | 'TKT_taxable' => __('Taxable', 'event_espresso') |
| 60 | 60 | ); |
| 61 | 61 | |
| 62 | - $this->_sortable_columns = array( |
|
| 62 | + $this->_sortable_columns = array( |
|
| 63 | 63 | // TRUE means its already sorted |
| 64 | 64 | 'TKT_name' => array( 'TKT_name', TRUE ), |
| 65 | 65 | 'TKT_description' => array( 'TKT_description', FALSE ), |
@@ -68,9 +68,9 @@ discard block |
||
| 68 | 68 | 'TKT_min' => array( 'TKT_min', FALSE ), |
| 69 | 69 | 'TKT_max' => array( 'TKT_max', FALSE ), |
| 70 | 70 | 'TKT_price' => array( 'TKT_price', FALSE ) |
| 71 | - ); |
|
| 71 | + ); |
|
| 72 | 72 | |
| 73 | - $this->_hidden_columns = array( |
|
| 73 | + $this->_hidden_columns = array( |
|
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | 76 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | protected function _setup_data() { |
| 33 | 33 | $trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE; |
| 34 | - $this->_data = $this->_admin_page->get_default_tickets( $this->_per_page, FALSE, $trashed ); |
|
| 35 | - $this->_all_data_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, FALSE ); |
|
| 36 | - $this->_trashed_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, TRUE ); |
|
| 34 | + $this->_data = $this->_admin_page->get_default_tickets($this->_per_page, FALSE, $trashed); |
|
| 35 | + $this->_all_data_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, FALSE); |
|
| 36 | + $this->_trashed_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, TRUE); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
@@ -61,13 +61,13 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | $this->_sortable_columns = array( |
| 63 | 63 | // TRUE means its already sorted |
| 64 | - 'TKT_name' => array( 'TKT_name', TRUE ), |
|
| 65 | - 'TKT_description' => array( 'TKT_description', FALSE ), |
|
| 66 | - 'TKT_qty' => array( 'TKT_qty', FALSE ), |
|
| 67 | - 'TKT_uses' => array( 'TKT_uses', FALSE ), |
|
| 68 | - 'TKT_min' => array( 'TKT_min', FALSE ), |
|
| 69 | - 'TKT_max' => array( 'TKT_max', FALSE ), |
|
| 70 | - 'TKT_price' => array( 'TKT_price', FALSE ) |
|
| 64 | + 'TKT_name' => array('TKT_name', TRUE), |
|
| 65 | + 'TKT_description' => array('TKT_description', FALSE), |
|
| 66 | + 'TKT_qty' => array('TKT_qty', FALSE), |
|
| 67 | + 'TKT_uses' => array('TKT_uses', FALSE), |
|
| 68 | + 'TKT_min' => array('TKT_min', FALSE), |
|
| 69 | + 'TKT_max' => array('TKT_max', FALSE), |
|
| 70 | + 'TKT_price' => array('TKT_price', FALSE) |
|
| 71 | 71 | ); |
| 72 | 72 | |
| 73 | 73 | $this->_hidden_columns = array( |
@@ -87,14 +87,14 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | protected function _add_view_counts() { |
| 89 | 89 | $this->_views['all']['count'] = $this->_all_data_count; |
| 90 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) |
|
| 90 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_tickets', 'trash_ticket')) |
|
| 91 | 91 | $this->_views['trashed']['count'] = $this->_trashed_count; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | |
| 96 | 96 | function column_cb($item) { |
| 97 | - 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() ); |
|
| 97 | + 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()); |
|
| 98 | 98 | |
| 99 | 99 | } |
| 100 | 100 | |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | $actions = array(); |
| 106 | 106 | |
| 107 | 107 | //trash links |
| 108 | - if ( $item->ID() !== 1 ) { |
|
| 109 | - if ( $this->_view == 'all' ) { |
|
| 110 | - $trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'trash_ticket', 'TKT_ID' => $item->ID() ), TICKETS_ADMIN_URL ); |
|
| 111 | - $actions['trash'] = '<a href="' . $trash_lnk_url . '" title="' . esc_attr__('Move Ticket to trash', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>'; |
|
| 108 | + if ($item->ID() !== 1) { |
|
| 109 | + if ($this->_view == 'all') { |
|
| 110 | + $trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'trash_ticket', 'TKT_ID' => $item->ID()), TICKETS_ADMIN_URL); |
|
| 111 | + $actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Ticket to trash', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>'; |
|
| 112 | 112 | } else { |
| 113 | 113 | // restore price link |
| 114 | - $restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL ); |
|
| 115 | - $actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Ticket', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>'; |
|
| 114 | + $restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL); |
|
| 115 | + $actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Ticket', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>'; |
|
| 116 | 116 | // delete price link |
| 117 | - $delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL ); |
|
| 118 | - $actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Ticket Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>'; |
|
| 117 | + $delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL); |
|
| 118 | + $actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Ticket Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>'; |
|
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - return $item->get('TKT_name') . $this->row_actions( $actions ); |
|
| 122 | + return $item->get('TKT_name').$this->row_actions($actions); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | |
@@ -132,13 +132,13 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | |
| 134 | 134 | function column_TKT_qty($item) { |
| 135 | - return $item->get_pretty('TKT_qty','text'); |
|
| 135 | + return $item->get_pretty('TKT_qty', 'text'); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | function column_TKT_uses($item) { |
| 141 | - return $item->get_pretty('TKT_uses','text'); |
|
| 141 | + return $item->get_pretty('TKT_uses', 'text'); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | function column_TKT_max($item) { |
| 152 | - return $item->get_pretty('TKT_max','text'); |
|
| 152 | + return $item->get_pretty('TKT_max', 'text'); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | |
@@ -1,4 +1,6 @@ discard block |
||
| 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 | /** |
| 4 | 6 | * Event Espresso |
@@ -87,8 +89,9 @@ discard block |
||
| 87 | 89 | |
| 88 | 90 | protected function _add_view_counts() { |
| 89 | 91 | $this->_views['all']['count'] = $this->_all_data_count; |
| 90 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) |
|
| 91 | - $this->_views['trashed']['count'] = $this->_trashed_count; |
|
| 92 | + if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) { |
|
| 93 | + $this->_views['trashed']['count'] = $this->_trashed_count; |
|
| 94 | + } |
|
| 92 | 95 | } |
| 93 | 96 | |
| 94 | 97 | |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | <tbody> |
| 34 | 34 | <tr> |
| 35 | 35 | <td> |
| 36 | - <h2><?php printf( __('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]' ); ?></h2> |
|
| 36 | + <h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2> |
|
| 37 | 37 | <p class="lead"><?php _e("We've got a few things we want to share with you!", 'event_espresso'); ?></p> |
| 38 | 38 | <div> |
| 39 | 39 | [NEWSLETTER_CONTENT] |
@@ -1,1 +1,1 @@ |
||
| 1 | -<?php printf( __('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) ); ?> |
|
| 1 | +<?php printf(__('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty('name')); ?> |
|
@@ -6,11 +6,11 @@ |
||
| 6 | 6 | <li class="ticket-registration"> |
| 7 | 7 | <table class="registration-details"> |
| 8 | 8 | <tr class="odd"> |
| 9 | - <th><?php _e('Attendee', 'event_espresso');?></th> |
|
| 9 | + <th><?php _e('Attendee', 'event_espresso'); ?></th> |
|
| 10 | 10 | <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td> |
| 11 | 11 | </tr> |
| 12 | 12 | <tr> |
| 13 | - <th><?php _e("Registration Code:", "event_espresso");?></th> |
|
| 13 | + <th><?php _e("Registration Code:", "event_espresso"); ?></th> |
|
| 14 | 14 | <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td> |
| 15 | 15 | </tr> |
| 16 | 16 | <tr> |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | //remove unwanted transaction shortcode |
| 81 | 81 | foreach ( $this->_valid_shortcodes as $context => $shortcodes ) { |
| 82 | 82 | if( ($key = array_search('transaction', $shortcodes) ) !== false) { |
| 83 | - unset($this->_valid_shortcodes[$context][$key]); |
|
| 83 | + unset($this->_valid_shortcodes[$context][$key]); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
| 3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
| 4 | 4 | exit('NO direct script access allowed'); |
| 5 | 5 | |
| 6 | 6 | /** |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | parent::_set_valid_shortcodes(); |
| 79 | 79 | |
| 80 | 80 | //remove unwanted transaction shortcode |
| 81 | - foreach ( $this->_valid_shortcodes as $context => $shortcodes ) { |
|
| 82 | - if( ($key = array_search('transaction', $shortcodes) ) !== false) { |
|
| 81 | + foreach ($this->_valid_shortcodes as $context => $shortcodes) { |
|
| 82 | + if (($key = array_search('transaction', $shortcodes)) !== false) { |
|
| 83 | 83 | unset($this->_valid_shortcodes[$context][$key]); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -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 |
@@ -5,7 +5,9 @@ discard block |
||
| 5 | 5 | * @subpackage helpers |
| 6 | 6 | * @since 4.3.0 |
| 7 | 7 | */ |
| 8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 9 | + exit('No direct script access allowed'); |
|
| 10 | +} |
|
| 9 | 11 | |
| 10 | 12 | /** |
| 11 | 13 | * Holds any special validation rules for template fields with Email messenger and Newsletter |
@@ -29,8 +31,9 @@ discard block |
||
| 29 | 31 | * custom validator (restricting what was originally set by the messenger) |
| 30 | 32 | */ |
| 31 | 33 | protected function _modify_validator() { |
| 32 | - if ( $this->_context == 'attendee' ) |
|
| 33 | - $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization'); |
|
| 34 | + if ( $this->_context == 'attendee' ) { |
|
| 35 | + $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization'); |
|
| 36 | + } |
|
| 34 | 37 | |
| 35 | 38 | //excluded shortcodes |
| 36 | 39 | $fields = array('to','from','subject','content','newsletter_content'); |
@@ -18,27 +18,27 @@ |
||
| 18 | 18 | * @author Darren Ethier |
| 19 | 19 | */ |
| 20 | 20 | class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator { |
| 21 | - public function __construct( $fields, $context ) { |
|
| 22 | - $this->_m_name = 'email'; |
|
| 23 | - $this->_mt_name = 'newsletter'; |
|
| 21 | + public function __construct( $fields, $context ) { |
|
| 22 | + $this->_m_name = 'email'; |
|
| 23 | + $this->_mt_name = 'newsletter'; |
|
| 24 | 24 | |
| 25 | - parent::__construct( $fields, $context ); |
|
| 26 | - } |
|
| 25 | + parent::__construct( $fields, $context ); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * custom validator (restricting what was originally set by the messenger) |
|
| 30 | - */ |
|
| 31 | - protected function _modify_validator() { |
|
| 32 | - if ( $this->_context == 'attendee' ) |
|
| 33 | - $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization'); |
|
| 28 | + /** |
|
| 29 | + * custom validator (restricting what was originally set by the messenger) |
|
| 30 | + */ |
|
| 31 | + protected function _modify_validator() { |
|
| 32 | + if ( $this->_context == 'attendee' ) |
|
| 33 | + $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization'); |
|
| 34 | 34 | |
| 35 | - //excluded shortcodes |
|
| 36 | - $fields = array('to','from','subject','content','newsletter_content'); |
|
| 37 | - foreach ( $fields as $field ) { |
|
| 38 | - $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]'); |
|
| 39 | - } |
|
| 40 | - $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]'); |
|
| 41 | - $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes); |
|
| 42 | - $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') ); |
|
| 43 | - } |
|
| 35 | + //excluded shortcodes |
|
| 36 | + $fields = array('to','from','subject','content','newsletter_content'); |
|
| 37 | + foreach ( $fields as $field ) { |
|
| 38 | + $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]'); |
|
| 39 | + } |
|
| 40 | + $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]'); |
|
| 41 | + $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes); |
|
| 42 | + $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') ); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -18,27 +18,27 @@ |
||
| 18 | 18 | * @author Darren Ethier |
| 19 | 19 | */ |
| 20 | 20 | class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator { |
| 21 | - public function __construct( $fields, $context ) { |
|
| 21 | + public function __construct($fields, $context) { |
|
| 22 | 22 | $this->_m_name = 'email'; |
| 23 | 23 | $this->_mt_name = 'newsletter'; |
| 24 | 24 | |
| 25 | - parent::__construct( $fields, $context ); |
|
| 25 | + parent::__construct($fields, $context); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * custom validator (restricting what was originally set by the messenger) |
| 30 | 30 | */ |
| 31 | 31 | protected function _modify_validator() { |
| 32 | - if ( $this->_context == 'attendee' ) |
|
| 32 | + if ($this->_context == 'attendee') |
|
| 33 | 33 | $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization'); |
| 34 | 34 | |
| 35 | 35 | //excluded shortcodes |
| 36 | - $fields = array('to','from','subject','content','newsletter_content'); |
|
| 37 | - foreach ( $fields as $field ) { |
|
| 36 | + $fields = array('to', 'from', 'subject', 'content', 'newsletter_content'); |
|
| 37 | + foreach ($fields as $field) { |
|
| 38 | 38 | $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]'); |
| 39 | 39 | } |
| 40 | - $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]'); |
|
| 40 | + $add_excludes = array('[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]', '[CO_ADD2]', '[CO_CITY]', '[CO_STATE]', '[CO_ZIP]', '[CO_LOGO]', '[CO_PHONE]', '[CO_LOGO_URL]', '[CO_FACEBOOK_URL]', '[CO_TWITTER_URL]', '[CO_PINTEREST_URL]', '[CO_GOOGLE_URL]', '[CO_LINKEDIN_URL]', '[CO_INSTAGRAM_URL]'); |
|
| 41 | 41 | $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes); |
| 42 | - $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') ); |
|
| 42 | + $this->_specific_shortcode_excludes['content'] = array_merge($this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]')); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
| 3 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
| 4 | 4 | exit('NO direct script access allowed'); |
| 5 | +} |
|
| 5 | 6 | |
| 6 | 7 | /** |
| 7 | 8 | * EE_Payment_Cancelled_message_type extends EE_message_type |
@@ -1,5 +1,5 @@ |
||
| 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 | /** |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
| 3 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
| 4 | 4 | exit('NO direct script access allowed'); |
| 5 | +} |
|
| 5 | 6 | |
| 6 | 7 | /** |
| 7 | 8 | * EE_Payment_Failed_message_type extends EE_message_type |
@@ -1,5 +1,5 @@ |
||
| 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 | /** |