Completed
Branch BUG-9625-better-us-phone-valid... (e0ce21)
by
unknown
1074:20 queued 1061:19
created
messages/templates/ee_msg_messages_shortcodes_help_tab.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 <p><?php _e('The following list of shortcodes can be used for this Messenger and Message Type. You can use the descriptions to learn what the shortcode will be parsed to when the final message is generated.', 'event_espresso'); ?></p>
3 3
 
4 4
 <?php
5
-foreach ( $shortcodes as $name => $description ) :
5
+foreach ($shortcodes as $name => $description) :
6 6
 ?>
7 7
 	<h3><?php echo $name; ?></h3>
8 8
 	<p><?php echo $description; ?></p>
Please login to merge, or discard this patch.
messages/templates/ee_msg_messages_templates_editor_help_tab.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 <p><?php echo $img2; ?></p>
8 8
 <p><?php _e('The context switcher allows you to quickly switch between templates. The current context you are working on is displayed in the dropdown. You can switch to any other template for contexts available to the messenger and message type template group you are working on.', 'event_espresso'); ?></p>
9 9
 <p><?php _e('Remember that contexts can represent different things. In this example they represent "recipients" and so they are labelled as such. In this example (for email payment confirmations), you may want Event Administrators to receive different information than Primary Registrants (the other context available to edit).', 'event_espresso'); ?></p>
10
-<p><?php printf( __('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>' ); ?>
10
+<p><?php printf(__('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>'); ?>
11 11
 </p>
12 12
 <h3><?php _e('3. Template Form Fields', 'event_espresso'); ?></h3>
13 13
 <p><?php echo $img3; ?><?php _e('The middle area of the page is dedicated to all the fields related to the message template. These fields are dynamic in the sense that different messengers may require different fields (and sometimes different message types will add or subtract fields as well.', 'event_espresso'); ?></p>
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	<?php echo $img4; ?><?php _e('The "Valid Shortcodes" metabox contains a list of all the shortcodes that can be used for the displayed template. This list is dynamic and will vary between templates.', 'event_espresso'); ?>
19 19
 </p>
20 20
 <p><?php _e('This box is at a fixed height, but contents are scrollable. You can click the question mark to find out what the given shortcode will parse to when used in your template.', 'event_espresso'); ?></p>
21
-<p><?php printf( __('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>' ); ?>
21
+<p><?php printf(__('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>'); ?>
22 22
 </p>
23 23
 <div style="clear:both"></div>
24 24
 <h3><?php _e('5. Override All Custom', 'event_espresso'); ?></h3>
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_messenger_help_tab.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <h2><?php _e('What are Messengers?', 'event_espresso'); ?></h2>
2
-<p><?php printf( __('Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
3 2
\ No newline at end of file
3
+<p><?php printf(__('Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
4 4
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_mt_settings_content.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 	<div class"mt-settings">
6 6
 		<form method="POST" action="" class="mt-settings-form<?php echo $show_form; ?>">
7 7
 			<?php echo $template_form_fields; ?>
8
-			<?php foreach ( $hidden_fields as $name => $field ) {
8
+			<?php foreach ($hidden_fields as $name => $field) {
9 9
 				echo $field['field'];
10 10
 			} ?> 
11 11
 			<input type="submit" value="<?php _e('Submit', 'event_espresso'); ?>" class="button-secondary mt-settings-submit no-drag" />
Please login to merge, or discard this patch.
admin_pages/other_services/Other_Services_Admin_Page.core.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 /**
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
 
88 88
 
89 89
 	public function load_scripts_styles() {
90
-		wp_register_style( 'ee-other-services-css', EE_OTHER_SERVICES_ASSETS_URL . 'other-services.css' , array('ee-admin-css') , EVENT_ESPRESSO_VERSION );
91
-		wp_enqueue_style( 'ee-other-services-css' );
90
+		wp_register_style('ee-other-services-css', EE_OTHER_SERVICES_ASSETS_URL.'other-services.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
91
+		wp_enqueue_style('ee-other-services-css');
92 92
 	}
93 93
 
94 94
 
95 95
 	protected function _other_services() {
96
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH . 'other_services_content.template.php', array(), true );
96
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH.'other_services_content.template.php', array(), true);
97 97
 		$this->display_admin_page_with_no_sidebar();
98 98
 	}
99 99
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
admin_pages/other_services/Other_Services_Admin_Page_Init.core.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 /**
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function __construct() {
34 34
 		//define some help/support page related constants
35
-		define( 'EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages' );
36
-		define( 'EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page=' . EE_OTHER_SERVICES_PG_SLUG ));
37
-		define( 'EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'other_services/templates/');
38
-		define( 'EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES . 'other_services/' );
39
-		define( 'EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'other_services/assets/');
35
+		define('EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages');
36
+		define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page='.EE_OTHER_SERVICES_PG_SLUG));
37
+		define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'other_services/templates/');
38
+		define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES.'other_services/');
39
+		define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL.'other_services/assets/');
40 40
 
41 41
 		parent::__construct();
42 42
 	}
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	protected function _set_menu_map() {
49
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
49
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
50 50
 			'menu_group' => 'extras',
51 51
 			'menu_order' => 30,
52 52
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
admin_pages/payments/Payment_Log_Admin_List_Table.class.php 3 patches
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 /**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @param \EE_Admin_Page $admin_page
36 36
 	 * @return Payment_Log_Admin_List_Table
37 37
 	 */
38
-	public function __construct( $admin_page ) {
38
+	public function __construct($admin_page) {
39 39
 		parent::__construct($admin_page);
40 40
 	}
41 41
 
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 //		}else{
53 53
 //			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
54 54
 //		}
55
-		$this->_all_data_count = $this->_admin_page->get_payment_logs( $this->_per_page,$this->_current_page, TRUE );
56
-		add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',array($this,'add_download_logs_checkbox'));
55
+		$this->_all_data_count = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, TRUE);
56
+		add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_download_logs_checkbox'));
57 57
 	}
58 58
 
59 59
 
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 	 * adds a checkbox to the bottom of the list table, instead of at the top with the rest of the filters
64 64
 	 * @return void
65 65
 	 */
66
-	public function add_download_logs_checkbox(){
67
-		echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='".  __( 'Download Results', 'event_espresso' )."'>";
66
+	public function add_download_logs_checkbox() {
67
+		echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='".__('Download Results', 'event_espresso')."'>";
68 68
 	}
69 69
 
70 70
 
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	protected function _set_properties() {
77 77
 		$this->_wp_list_args = array(
78
-			'singular' => __('payment log', 'event_espresso' ),
79
-			'plural' => __('payment logs', 'event_espresso' ),
78
+			'singular' => __('payment log', 'event_espresso'),
79
+			'plural' => __('payment logs', 'event_espresso'),
80 80
 			'ajax' => TRUE, //for now,
81 81
 			'screen' => $this->_admin_page->get_current_screen()->id
82 82
 			);
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 			);
91 91
 
92 92
 		$this->_sortable_columns = array(
93
-			'LOG_time' => array( 'LOG_time' => TRUE ),
93
+			'LOG_time' => array('LOG_time' => TRUE),
94 94
 			);
95 95
 
96 96
 		$this->_hidden_columns = array(
@@ -107,20 +107,20 @@  discard block
 block discarded – undo
107 107
 	protected function _get_table_filters() {
108 108
 		$filters = array();
109 109
 		//todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
110
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
110
+		EE_Registry::instance()->load_helper('Form_Fields');
111 111
 		$payment_methods = EEM_Payment_Method::instance()->get_all();
112
-		$payment_method_names = array(array('id'=>'all','text'=>  __("All", 'event_espresso')),array('id'=>'0','text'=>  __("Unknown Payment Method", 'event_espresso')));
113
-		foreach($payment_methods as $payment_method){
114
-			$payment_method_names[] = array('id'=>$payment_method->ID(),'text'=>$payment_method->admin_name());
112
+		$payment_method_names = array(array('id'=>'all', 'text'=>  __("All", 'event_espresso')), array('id'=>'0', 'text'=>  __("Unknown Payment Method", 'event_espresso')));
113
+		foreach ($payment_methods as $payment_method) {
114
+			$payment_method_names[] = array('id'=>$payment_method->ID(), 'text'=>$payment_method->admin_name());
115 115
 		}
116 116
 		$filters[] = EEH_Form_Fields::select_input('_payment_method', $payment_method_names, isset($this->_req_data['_payment_method']) ? $this->_req_data['_payment_method'] : 'all');
117
-		$start_date = isset( $this->_req_data['payment-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-6 months' ));
118
-		$end_date = isset( $this->_req_data['payment-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] ) : date( 'm/d/Y' );
117
+		$start_date = isset($this->_req_data['payment-filter-start-date']) ? wp_strip_all_tags($this->_req_data['payment-filter-start-date']) : date('m/d/Y', strtotime('-6 months'));
118
+		$end_date = isset($this->_req_data['payment-filter-end-date']) ? wp_strip_all_tags($this->_req_data['payment-filter-end-date']) : date('m/d/Y');
119 119
 		ob_start();
120 120
 		?>
121
-		<label for="txn-filter-start-date"><?php _e( 'Display Transactions from ', 'event_espresso' ); ?></label>
121
+		<label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
122 122
 		<input id="payment-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>" name="payment-filter-start-date" size="15"/>
123
-		<label for="txn-filter-end-date"><?php _e( ' until ', 'event_espresso' ); ?></label>
123
+		<label for="txn-filter-end-date"><?php _e(' until ', 'event_espresso'); ?></label>
124 124
 		<input id="payment-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>" name="payment-filter-end-date" size="15"/>
125 125
 		<?php
126 126
 		$filters[] = ob_get_clean();
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @return void
135 135
 	 */
136 136
 	protected function _add_view_counts() {
137
-		$this->_views['all']['count'] = $this->_admin_page->get_payment_logs( $this->_per_page,$this->_current_page, TRUE );
137
+		$this->_views['all']['count'] = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, TRUE);
138 138
 	}
139 139
 
140 140
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	 * @return string
146 146
 	 */
147 147
 	public function column_cb($item) {
148
-		return sprintf( '<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
148
+		return sprintf('<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
149 149
 	}
150 150
 
151 151
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @param \EE_Change_Log $item
172 172
 	 * @return string
173 173
 	 */
174
-	public function column_LOG_time(EE_Change_Log $item){
174
+	public function column_LOG_time(EE_Change_Log $item) {
175 175
 		return $item->get_datetime('LOG_time');
176 176
 	}
177 177
 
@@ -182,12 +182,12 @@  discard block
 block discarded – undo
182 182
 	 * @param \EE_Change_Log $item
183 183
 	 * @return string
184 184
 	 */
185
-	public function column_PMD_ID(EE_Change_Log $item){
186
-		if($item->object() instanceof EE_Payment_Method){
185
+	public function column_PMD_ID(EE_Change_Log $item) {
186
+		if ($item->object() instanceof EE_Payment_Method) {
187 187
 			return $item->object()->admin_name();
188
-		}elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
188
+		}elseif ($item->object() instanceof EE_Payment && $item->object()->payment_method()) {
189 189
 			return $item->object()->payment_method()->admin_name();
190
-		}else{
190
+		} else {
191 191
 			return __("No longer exists", 'event_espresso');
192 192
 		}
193 193
 	}
@@ -199,11 +199,11 @@  discard block
 block discarded – undo
199 199
 	 * @param \EE_Change_Log $item
200 200
 	 * @return string
201 201
 	 */
202
-	public function column_TXN_ID(EE_Change_Log $item){
203
-		if($item->object() instanceof EE_Payment){
204
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $item->object()->TXN_ID() )) {
205
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->object()->TXN_ID() ), TXN_ADMIN_URL );
206
-				return '<a href="'.$view_txn_lnk_url.'"  title="' . sprintf( esc_attr__( 'click to view transaction #%s', 'event_espresso' ),  $item->object()->TXN_ID() ) . '">' . sprintf( __( 'view txn %s', 'event_espresso' ),  $item->object()->TXN_ID() ) . '</a>';
202
+	public function column_TXN_ID(EE_Change_Log $item) {
203
+		if ($item->object() instanceof EE_Payment) {
204
+			if (EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->object()->TXN_ID())) {
205
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->object()->TXN_ID()), TXN_ADMIN_URL);
206
+				return '<a href="'.$view_txn_lnk_url.'"  title="'.sprintf(esc_attr__('click to view transaction #%s', 'event_espresso'), $item->object()->TXN_ID()).'">'.sprintf(__('view txn %s', 'event_espresso'), $item->object()->TXN_ID()).'</a>';
207 207
 			}
208 208
 		} else {
209 209
 			return __("Unable to find transaction", 'event_espresso');
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
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
@@ -185,9 +186,9 @@  discard block
 block discarded – undo
185 186
 	public function column_PMD_ID(EE_Change_Log $item){
186 187
 		if($item->object() instanceof EE_Payment_Method){
187 188
 			return $item->object()->admin_name();
188
-		}elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
189
+		} elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
189 190
 			return $item->object()->payment_method()->admin_name();
190
-		}else{
191
+		} else{
191 192
 			return __("No longer exists", 'event_espresso');
192 193
 		}
193 194
 	}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 	 *
94 94
 	 * @abstract
95 95
 	 * @access protected
96
-	 * @return array
96
+	 * @return string[]
97 97
 	 */
98 98
 	protected function _get_table_filters() {
99 99
 		$filters = array();
Please login to merge, or discard this patch.
admin_pages/payments/Payments_Admin_Page_Init.core.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 /**
@@ -35,15 +35,15 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function __construct() {
37 37
 		//define some page related constants
38
-		define( 'EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings' );
39
-		define( 'EE_PAYMENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EE_PAYMENTS_PG_SLUG ));
40
-		define( 'EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS );
41
-		define( 'EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS );
42
-		define( 'EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/' );
38
+		define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
39
+		define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
40
+		define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments'.DS);
41
+		define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates'.DS);
42
+		define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
43 43
 
44 44
 		//check that there are active gateways on all admin page loads. but dont do it just yet
45 45
 //		echo "constructing payments admin page";die;
46
-		add_action('admin_notices',array($this,'check_payment_gateway_setup'));
46
+		add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
47 47
 		parent::__construct();
48 48
 	}
49 49
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	}
53 53
 
54 54
 	protected function _set_menu_map() {
55
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
55
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
56 56
 			'menu_group' => 'settings',
57 57
 			'menu_order' => 30,
58 58
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
@@ -68,23 +68,23 @@  discard block
 block discarded – undo
68 68
 	/**
69 69
 	 * Checks that there is at least one active gateway. If not, add a notice
70 70
 	 */
71
-	public function check_payment_gateway_setup(){
71
+	public function check_payment_gateway_setup() {
72 72
 		//ONLY do this check if models can query
73 73
 		//and avoid a bug where when we nuke EE4's data that this causes a fatal error
74 74
 		//because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
75 75
 		EE_Registry::instance()->load_helper('Activation');
76
-		if ( ! EE_Maintenance_Mode::instance()->models_can_query() || ! EEH_Activation::table_exists( EEM_Payment_Method::instance()->table() ) ) {
76
+		if ( ! EE_Maintenance_Mode::instance()->models_can_query() || ! EEH_Activation::table_exists(EEM_Payment_Method::instance()->table())) {
77 77
 			return;
78 78
 		}
79 79
 
80 80
 
81 81
 		// ensure Payment_Method model is loaded
82
-		EE_Registry::instance()->load_model( 'Payment_Method' );
83
-		$actives = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
84
-		if( $actives  < 1 ){
82
+		EE_Registry::instance()->load_model('Payment_Method');
83
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
84
+		if ($actives < 1) {
85 85
 			$url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
86 86
 			echo '<div class="error">
87
-				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"),"<a href='$url'>","</a>").'</p>
87
+				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"), "<a href='$url'>", "</a>").'</p>
88 88
 			 </div>';
89 89
 		}
90 90
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
payments/help_tabs/payment_methods_overview_mijireh.help_tab.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@
 block discarded – undo
2 2
 <?php _e('Mijireh Gateway', 'event_espresso'); ?>
3 3
 </h3>
4 4
 <p>
5
-<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'),'<a href="http://www.mijireh.com/">','</a>','<a href="http://www.mijireh.com/docs/payment-gateways/">','</a>'); ?>
5
+<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'), '<a href="http://www.mijireh.com/">', '</a>', '<a href="http://www.mijireh.com/docs/payment-gateways/">', '</a>'); ?>
6 6
 </p>
7 7
 <h3><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></h3>
8 8
 <p>
9
-<?php _e("As you're probably aware, when users pay with Mijireh Gateway, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page. ", 'event_espresso');?>
10
-<?php printf(__("In order to do this, we automatically create a new WordPress page which is design to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft. ", 'event_espresso'),'<a href="https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMdjREYUtGM18wSms/edit?usp=drivesdk">','</a>');?>
9
+<?php _e("As you're probably aware, when users pay with Mijireh Gateway, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page. ", 'event_espresso'); ?>
10
+<?php printf(__("In order to do this, we automatically create a new WordPress page which is design to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft. ", 'event_espresso'), '<a href="https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMdjREYUtGM18wSms/edit?usp=drivesdk">', '</a>'); ?>
11 11
 </p>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.