Completed
Branch BUG-7537 (60d82a)
by
unknown
88:25 queued 72:30
created
espresso.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@  discard block
 block discarded – undo
27 27
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
28 28
  */
29 29
 /**
30
- * Event Espresso
31
- *
32
- * Event Registration and Management Plugin for WordPress
33
- *
34
- * @package 	Event Espresso
35
- * @author 		Seth Shoultes
36
- * @copyright 	(c) 2008-2014 Event Espresso  All Rights Reserved.
37
- * @license 	{@link http://eventespresso.com/support/terms-conditions/}
38
- * @see         Plugin Licensing
39
- * @link 		{@link http://www.eventespresso.com}
40
- * @since 		4.0
41
- *
42
- */
30
+	 * Event Espresso
31
+	 *
32
+	 * Event Registration and Management Plugin for WordPress
33
+	 *
34
+	 * @package 	Event Espresso
35
+	 * @author 		Seth Shoultes
36
+	 * @copyright 	(c) 2008-2014 Event Espresso  All Rights Reserved.
37
+	 * @license 	{@link http://eventespresso.com/support/terms-conditions/}
38
+	 * @see         Plugin Licensing
39
+	 * @link 		{@link http://www.eventespresso.com}
40
+	 * @since 		4.0
41
+	 *
42
+	 */
43 43
 
44 44
 if ( function_exists( 'espresso_version' ) ) {
45 45
 
@@ -236,13 +236,13 @@  discard block
 block discarded – undo
236 236
 
237 237
 if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
238 238
 	/**
239
-	*    deactivate_plugin
240
-	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
241
-	*
242
-	* @access public
243
-	* @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
244
-	* @return    void
245
-	*/
239
+	 *    deactivate_plugin
240
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
241
+	 *
242
+	 * @access public
243
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
244
+	 * @return    void
245
+	 */
246 246
 	function espresso_deactivate_plugin( $plugin_basename = '' ) {
247 247
 		if ( ! function_exists( 'deactivate_plugins' ) ) {
248 248
 			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
Please login to merge, or discard this patch.
registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php 2 patches
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
  * @since		 	   4.8.30.rc.009
14 14
  *
15 15
  */
16
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
17
-	exit( 'No direct script access allowed' );
16
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
17
+	exit('No direct script access allowed');
18 18
 }
19 19
 
20
-class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{
20
+class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper {
21 21
 	/**
22 22
 	 *
23 23
 	 * @var EE_Registration
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
29 29
 	 * @param EE_Registration $reg
30 30
 	 * @param array $options
31 31
 	 */
32
-	public function __construct( EE_Registration $reg, $options = array() ) {
32
+	public function __construct(EE_Registration $reg, $options = array()) {
33 33
 		$this->_registration = $reg;
34
-		if( ! isset( $options[ 'layout_strategy' ] ) ) {
35
-			$options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout();
34
+		if ( ! isset($options['layout_strategy'])) {
35
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
36 36
 		}
37
-		if( ! isset( $options[ 'html_id' ] ) ) {
38
-			$options[ 'html_id' ] = 'reg-admin-attendee-questions-frm';
37
+		if ( ! isset($options['html_id'])) {
38
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
39 39
 		}
40 40
 		$this->build_form_from_registration();
41
-		parent::__construct( $options );
41
+		parent::__construct($options);
42 42
 	}
43 43
 
44 44
 
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 
53 53
 	public function build_form_from_registration() {
54 54
 		$reg = $this->get_registration();
55
-		if( ! $reg instanceof EE_Registration ) {
56
-			throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') );
55
+		if ( ! $reg instanceof EE_Registration) {
56
+			throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
57 57
 		}
58 58
 		//we want to get all their question groups
59 59
 		$question_groups = EEM_Question_Group::instance()->get_all( 
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 					'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE,
64 64
 					'Question.QST_system' =>  ''
65 65
 				),
66
-				'order_by' => array( 'QSG_order' => 'ASC' ) 
66
+				'order_by' => array('QSG_order' => 'ASC') 
67 67
 			)
68 68
 		);
69 69
 		//get each question groups questions
70
-		foreach( $question_groups as $question_group ) {
71
-			if ( $question_group instanceof EE_Question_Group ) {
72
-				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
70
+		foreach ($question_groups as $question_group) {
71
+			if ($question_group instanceof EE_Question_Group) {
72
+				$this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
73 73
 					$question_group,
74 74
 					$reg
75 75
 				);
@@ -86,24 +86,24 @@  discard block
 block discarded – undo
86 86
 	 * @return \EE_Form_Section_Proper
87 87
 	 * @throws \EE_Error
88 88
 	 */
89
-	public function build_subform_from_question_group( $question_group, $registration ) {
90
-		if( ! $question_group instanceof EE_Question_Group ||
89
+	public function build_subform_from_question_group($question_group, $registration) {
90
+		if ( ! $question_group instanceof EE_Question_Group ||
91 91
 			! $registration instanceof EE_Registration) {
92
-			throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) );
92
+			throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
93 93
 		}
94 94
 		$parts_of_subsection = array(
95 95
 			'title' => new EE_Form_Section_HTML(
96
-					EEH_HTML::h5( $question_group->name(),
96
+					EEH_HTML::h5($question_group->name(),
97 97
 					$question_group->identifier(),
98
-					'espresso-question-group-title-h5 section-title' )
98
+					'espresso-question-group-title-h5 section-title')
99 99
 				)
100 100
 		);
101
-		foreach( $question_group->questions( array( array( 'QST_system' => '' ))) as $question ) {
102
-			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration );
101
+		foreach ($question_group->questions(array(array('QST_system' => ''))) as $question) {
102
+			$parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
103 103
 		}
104
-		$parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML(
105
-				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
106
-					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
104
+		$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
105
+				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'">
106
+					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
107 107
 					<div class="dashicons dashicons-edit"></div>
108 108
 				</a></td></tr>'
109 109
 			);
@@ -124,12 +124,12 @@  discard block
 block discarded – undo
124 124
 	protected function _normalize($req_data) {
125 125
 		$this->_received_submission = TRUE;
126 126
 		$this->_validation_errors = array();
127
-		foreach($this->get_validatable_subsections() as $subsection){
128
-			if( $subsection->form_data_present_in( $req_data ) ) {
129
-				try{
127
+		foreach ($this->get_validatable_subsections() as $subsection) {
128
+			if ($subsection->form_data_present_in($req_data)) {
129
+				try {
130 130
 					$subsection->_normalize($req_data);
131
-				}catch( EE_Validation_Error $e ){
132
-					$subsection->add_validation_error( $e );
131
+				} catch (EE_Validation_Error $e) {
132
+					$subsection->add_validation_error($e);
133 133
 				}
134 134
 			}
135 135
 		}
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 	 * calling parent::_validate() first.
145 145
 	 */
146 146
 	protected function _validate() {
147
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
148
-			if( $subsection->form_data_present_in( $req_data ) ) {
149
-				if(method_exists($this,'_validate_'.$subsection_name)){
150
-					call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
147
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
148
+			if ($subsection->form_data_present_in($req_data)) {
149
+				if (method_exists($this, '_validate_'.$subsection_name)) {
150
+					call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
151 151
 				}
152 152
 				$subsection->_validate();
153
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
153
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
154 154
 				$subsection->_received_submission = true;
155 155
 			}
156 156
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
 			if( $subsection->form_data_present_in( $req_data ) ) {
129 129
 				try{
130 130
 					$subsection->_normalize($req_data);
131
-				}catch( EE_Validation_Error $e ){
131
+				} catch( EE_Validation_Error $e ){
132 132
 					$subsection->add_validation_error( $e );
133 133
 				}
134 134
 			}
Please login to merge, or discard this patch.
core/admin/templates/admin_wrapper.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <div class="wrap espresso-admin">
2 2
 
3
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
3
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
4 4
 
5 5
 	<div id="ajax-notices-container"></div>
6 6
 
7 7
 	<?php echo $nav_tabs; ?>
8 8
 
9 9
 	<?php
10
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
10
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
11 11
 	echo $before_admin_page_content;
12 12
 	echo $admin_page_content;
13 13
 	echo $after_admin_page_content;
14
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
14
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
15 15
 	?>
16 16
 
17 17
 </div>
Please login to merge, or discard this patch.
core/admin/templates/admin_wrapper_ajax.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <div class="wrap espresso-admin">
2
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
2
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
3 3
 
4
-	<div class="ee-notices"><?php echo isset( $ajax_notices ) ? $ajax_notices : ''; ?></div>
4
+	<div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div>
5 5
 	<?php
6
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
6
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
7 7
 	echo $before_admin_page_content;
8 8
 	echo $admin_page_content;
9 9
 	echo $after_admin_page_content;
10
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
10
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
11 11
 	?>
12 12
 </div>
13 13
 <!-- espresso-admin -->
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/countries_settings.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 
2 2
 <div class="padding">
3 3
 
4
-	<h3 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info');?></h3>
4
+	<h3 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h3>
5 5
 	<table class="form-table">
6 6
 		<tbody>
7
-			<?php echo EEH_Form_Fields::generate_form_input( $countries ); ?>
7
+			<?php echo EEH_Form_Fields::generate_form_input($countries); ?>
8 8
 		</tbody>
9 9
 	</table>
10 10
 	<br/>
@@ -12,12 +12,12 @@  discard block
 block discarded – undo
12 12
         <?php _e('The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.', 'event_espresso'); ?>
13 13
 	</p>
14 14
 	<div id="country-details-settings-dv">
15
-		<h3 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info');?></h3>
15
+		<h3 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h3>
16 16
 		<div id="country-details-dv"><?php  echo $country_details_settings; ?></div>
17 17
 	</div>
18 18
 	
19 19
 	<div id="country-states-settings-dv">
20
-		<h3 class="ee-admin-settings-hdr"><?php _e( 'States/Provinces', 'event_espresso' );?> <?php echo EEH_Template::get_help_tab_link('country_states_info');?></h3>
20
+		<h3 class="ee-admin-settings-hdr"><?php _e('States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h3>
21 21
 		<div id="country-states-dv"><?php  echo $country_states_settings; ?></div>
22 22
 	</div>
23 23
 	
Please login to merge, or discard this patch.
admin_pages/transactions/templates/txn_admin_details_header.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 
2
-		<h3 class="txn-navigation-strip"><?php echo $previous_transaction . '&nbsp;'; echo __( 'Transaction # ', 'event_espresso' ) . $txn_nmbr['value']; echo '&nbsp;' . $next_transaction; ?></h3>
3
-		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value'];?></h2>
2
+		<h3 class="txn-navigation-strip"><?php echo $previous_transaction.'&nbsp;'; echo __('Transaction # ', 'event_espresso').$txn_nmbr['value']; echo '&nbsp;'.$next_transaction; ?></h3>
3
+		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value']; ?></h2>
4 4
 
5 5
 		<?php echo $send_payment_reminder_button; ?>
6 6
 		<h2 id="txn-status-h2" class="txn-status-h2">
7
-			<?php echo __( 'Transaction Status: ', 'event_espresso' );?><span id="txn-status" class="<?php echo $txn_status['class'];?>"><?php echo $txn_status['value'];?></span>
7
+			<?php echo __('Transaction Status: ', 'event_espresso'); ?><span id="txn-status" class="<?php echo $txn_status['class']; ?>"><?php echo $txn_status['value']; ?></span>
8 8
 		</h2>
9 9
 
10 10
 	<?php $attributes = $amount_due ? 'class="txn-amount-due-h2"' : 'class="txn-amount-due-h2 hidden"'; ?>
11 11
 		<h2 id="txn-amount-due-h2" <?php echo $attributes; ?>>
12
-			<?php echo __( 'Total Amount Due: ', 'event_espresso' );?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class;?>"><?php echo $amount_due;?></span>
12
+			<?php echo __('Total Amount Due: ', 'event_espresso'); ?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class; ?>"><?php echo $amount_due; ?></span>
13 13
 		</h2>
14 14
 
15 15
 		<h3 id="txn-selected-method-of-payment-h3" class="txn-selected-method-of-payment-h3">
16
-			<?php echo __( 'Last Method of Payment: ', 'event_espresso' );?><?php echo $method_of_payment_name;?>
16
+			<?php echo __('Last Method of Payment: ', 'event_espresso'); ?><?php echo $method_of_payment_name; ?>
17 17
 		</h3>
18 18
 
19 19
 
Please login to merge, or discard this patch.
admin_pages/payments/help_tabs/payment_methods_overview.help_tab.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,40 +2,40 @@
 block discarded – undo
2 2
 <p>
3 3
 <?php _e('This page shows all available payment methods for Event Espresso.', 'event_espresso'); ?>
4 4
 </p>
5
-<p><strong><?php _e('Common Settings', 'event_espresso' )?></strong></p>
5
+<p><strong><?php _e('Common Settings', 'event_espresso')?></strong></p>
6 6
 <ul>
7 7
 	<li>
8
-		<strong><?php _e( 'Name', 'event_espresso' );?></strong><br>
9
-		<?php _e( 'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso' );?>
8
+		<strong><?php _e('Name', 'event_espresso'); ?></strong><br>
9
+		<?php _e('The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso'); ?>
10 10
 	</li>
11 11
 	<li>
12
-		<strong><?php _e( 'Description', 'event_espresso' );?></strong><br/>
13
-		<?php _e( 'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso' );?>
12
+		<strong><?php _e('Description', 'event_espresso'); ?></strong><br/>
13
+		<?php _e('The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso'); ?>
14 14
 	</li>
15
-	<li><strong><?php _e( 'Admin-Only Name', 'event_espresso' );?></strong><br/>
16
-		<?php _e( 'The name of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
15
+	<li><strong><?php _e('Admin-Only Name', 'event_espresso'); ?></strong><br/>
16
+		<?php _e('The name of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
17 17
 	</li>
18 18
 	<li>
19
-		<strong><?php _e( 'Admin-Only Description', 'event_espresso' );?></strong><br/>
20
-		<?php _e( 'The description of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
19
+		<strong><?php _e('Admin-Only Description', 'event_espresso'); ?></strong><br/>
20
+		<?php _e('The description of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
21 21
 	</li>
22 22
 	<li>
23
-		<strong><?php _e( 'Debug (sandbox) Mode', 'event_espresso' );?></strong><br/>
24
-		<?php _e( 'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso' );?>
23
+		<strong><?php _e('Debug (sandbox) Mode', 'event_espresso'); ?></strong><br/>
24
+		<?php _e('Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso'); ?>
25 25
 	</li>
26 26
 	<li>
27
-		<strong><?php _e( 'Open by Default', 'event_espresso' );?></strong><br/>
28
-		<?php _e( 'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso' );?>
27
+		<strong><?php _e('Open by Default', 'event_espresso'); ?></strong><br/>
28
+		<?php _e('If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso'); ?>
29 29
 	</li>
30 30
 	<li>
31
-		<strong><?php _e( 'Button URL', 'event_espresso' );?></strong><br/>
32
-		<?php printf( __( 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso' ), '<img src="' . admin_url('images/media-button-image.gif') . '">' );?>
31
+		<strong><?php _e('Button URL', 'event_espresso'); ?></strong><br/>
32
+		<?php printf(__('The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso'), '<img src="'.admin_url('images/media-button-image.gif').'">'); ?>
33 33
 	</li>
34
-	<li><strong><?php _e( 'Usable From', 'event_espresso' );?></strong><br/>
35
-	<?php _e( 'Where this payment method can be used from.', 'event_espresso' );?>
34
+	<li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/>
35
+	<?php _e('Where this payment method can be used from.', 'event_espresso'); ?>
36 36
 		<ul>
37
-			<li><?php _e( 'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso' );?></li>
38
-			<li><?php _e( 'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso' );?></li>
37
+			<li><?php _e('Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso'); ?></li>
38
+			<li><?php _e('Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso'); ?></li>
39 39
 		</ul>
40 40
 	</li>
41 41
 </ul>
Please login to merge, or discard this patch.
templates/reg_admin_details_main_meta_box_reg_details.template.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -4,33 +4,33 @@  discard block
 block discarded – undo
4 4
 	<?php echo $resend_registration_button; ?>
5 5
 	<br/>
6 6
 
7
-	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h3>
7
+	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h3>
8 8
 
9 9
 	<?php echo $line_item_table; ?>
10 10
 
11 11
 	<?php
12
-	if ( WP_DEBUG ) {
13
-		$delivered_messages = get_option( 'EED_Messages__maybe_registration', array() );
14
-		if ( isset( $delivered_messages[ $REG_ID ] )) {
12
+	if (WP_DEBUG) {
13
+		$delivered_messages = get_option('EED_Messages__maybe_registration', array());
14
+		if (isset($delivered_messages[$REG_ID])) {
15 15
 	?>
16
-	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Registrant', 'event_espresso' );?></h4>
16
+	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Registrant', 'event_espresso'); ?></h4>
17 17
 
18 18
 	<div class="admin-primary-mbox-tbl-wrap">
19 19
 		<table class="admin-primary-mbox-tbl">
20 20
 			<thead>
21 21
 				<tr>
22
-					<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
23
-					<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
24
-					<th class="jst-left"><?php _e( 'REG Status Upon Sending', 'event_espresso' );?></th>
22
+					<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
23
+					<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
24
+					<th class="jst-left"><?php _e('REG Status Upon Sending', 'event_espresso'); ?></th>
25 25
 				</tr>
26 26
 			</thead>
27 27
 			<tbody>
28
-				<?php foreach ( $delivered_messages[ $REG_ID ] as $timestamp => $delivered_message ) :
28
+				<?php foreach ($delivered_messages[$REG_ID] as $timestamp => $delivered_message) :
29 29
 					?>
30 30
 					<tr>
31
-						<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
32
-						<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
33
-						<td class="jst-left"><?php echo isset( $delivered_message['reg_status'] ) ? $delivered_message['reg_status'] : '';?></td>
31
+						<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
32
+						<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
33
+						<td class="jst-left"><?php echo isset($delivered_message['reg_status']) ? $delivered_message['reg_status'] : ''; ?></td>
34 34
 					</tr>
35 35
 				<?php endforeach; // $delivered_messages?>
36 36
 			</tbody>
@@ -42,27 +42,27 @@  discard block
 block discarded – undo
42 42
 	?>
43 43
 
44 44
 	<a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info">
45
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?>
45
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?>
46 46
 	</a>
47 47
 
48 48
 	<div id="additional-registration-session-info-dv" class="hidden">
49 49
 
50 50
 		<a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info">
51
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?>
51
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?>
52 52
 		</a>
53 53
 	<br class="clear"/>
54 54
 
55
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h3>
55
+		<h3 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h3>
56 56
 
57 57
 		<table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows">
58 58
 			<tbody>
59
-			<?php foreach ( $reg_details as $key => $reg_detail ) : ?>
59
+			<?php foreach ($reg_details as $key => $reg_detail) : ?>
60 60
 				<tr>
61 61
 					<th>
62
-						<label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label>
62
+						<label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label>
63 63
 					</th>
64 64
 					<td>
65
-						<?php echo $reg_detail['value'];?>
65
+						<?php echo $reg_detail['value']; ?>
66 66
 					</td>
67 67
 				</tr>
68 68
 			<?php endforeach; // $reg_details?>
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/ee_data_reset_and_delete.template.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -4,14 +4,14 @@  discard block
 block discarded – undo
4 4
 */
5 5
 ?>
6 6
 <h3>
7
-	<?php _e( 'Reset/Delete Data for Event Espresso', 'event_espresso' );?>
7
+	<?php _e('Reset/Delete Data for Event Espresso', 'event_espresso'); ?>
8 8
 </h3>
9 9
 <br />
10 10
 
11 11
 <!-- reset DB url is here. Just need to make it look pretty and unhide it-->
12 12
 <div class="padding">
13
-	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso');?></h4>
14
-	<p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso');?></p>
13
+	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso'); ?></h4>
14
+	<p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso'); ?></p>
15 15
 	<div class="float-right"><?php echo $reset_capabilities_button; ?></div>
16 16
 	<div class="clear"></div>
17 17
 </div>
@@ -19,24 +19,24 @@  discard block
 block discarded – undo
19 19
 <br />
20 20
 
21 21
 <div class="padding">
22
-	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso');?></h4>
23
-	<p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso');?></p>
24
-	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url;?>"><?php _e('Reset Event Espresso Tables', 'event_espresso');?></a></div>
22
+	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></h4>
23
+	<p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso'); ?></p>
24
+	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url; ?>"><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></a></div>
25 25
 	<div class="clear"></div>
26 26
 </div>
27 27
 <br />
28 28
 <br />
29 29
 
30 30
 <div class="padding">
31
-	<h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso');?></h4>
32
-	<p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso');?></p>
33
-	<p class="important-notice"><?php printf( __('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>' ); ?><br/></p>
31
+	<h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso'); ?></h4>
32
+	<p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso'); ?></p>
33
+	<p class="important-notice"><?php printf(__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>'); ?><br/></p>
34 34
 	<ol>
35
-		<li><?php  printf( __('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being migrated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the migration will continue where it left off.', 'event_espresso'), '<strong>', '</strong>' );?></li>
36
-		<li><?php printf( __('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
37
-        <li><?php printf( __('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
35
+		<li><?php  printf(__('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being migrated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the migration will continue where it left off.', 'event_espresso'), '<strong>', '</strong>'); ?></li>
36
+		<li><?php printf(__('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
37
+        <li><?php printf(__('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
38 38
 	</ol>
39
-	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso');?></a></div>
39
+	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso'); ?></a></div>
40 40
 	<div class="clear"></div>
41 41
 </div>
42 42
 <br/>
Please login to merge, or discard this patch.