Completed
Branch FET-9046-messages-queue (08ecff)
by
unknown
1402:50 queued 1382:56
created
line_item_display/EE_Receipt_Line_Item_Display_Strategy.strategy.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	/**
32 32
 	 * @param EE_Line_Item $line_item
33 33
 	 * @param array        $options
34
-	 * @return mixed
34
+	 * @return string
35 35
 	 */
36 36
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
37 37
 
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,17 +14,17 @@
 block discarded – undo
14 14
  * ------------------------------------------------------------------------
15 15
  */
16 16
  /**
17
- *
18
- * Class EE_Receipt_Line_Item_Display_Strategy
19
- *
20
- * Description
21
- *
22
- * @package         Event Espresso
23
- * @subpackage    core
24
- * @author				Brent Christensen
25
- * @since		 	   $VID:$
26
- *
27
- */
17
+  *
18
+  * Class EE_Receipt_Line_Item_Display_Strategy
19
+  *
20
+  * Description
21
+  *
22
+  * @package         Event Espresso
23
+  * @subpackage    core
24
+  * @author				Brent Christensen
25
+  * @since		 	   $VID:$
26
+  *
27
+  */
28 28
 
29 29
 class EE_Receipt_Line_Item_Display_Strategy  implements EEI_Line_Item_Display {
30 30
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	 * @param array        $options
34 34
 	 * @return mixed
35 35
 	 */
36
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
36
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
37 37
 
38
-		EE_Registry::instance()->load_helper( 'HTML' );
38
+		EE_Registry::instance()->load_helper('HTML');
39 39
 
40 40
 		$html = '';
41 41
 		// set some default options and merge with incoming
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 			'show_desc' => TRUE,
44 44
 			'odd' => FALSE
45 45
 		);
46
-		$options = array_merge( $default_options, (array)$options );
47
-		switch( $line_item->type() ) {
46
+		$options = array_merge($default_options, (array) $options);
47
+		switch ($line_item->type()) {
48 48
 
49 49
 			case EEM_Line_Item::type_total:
50 50
 				// loop thru children
51
-				foreach( $line_item->children() as $child_line_item ) {
51
+				foreach ($line_item->children() as $child_line_item) {
52 52
 					// recursively feed children back into this method
53 53
 //					$html .= $this->display_line_item( $child_line_item, $options );
54 54
 				}
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 			case EEM_Line_Item::type_sub_total:
61 61
 				// loop thru children
62
-				foreach( $line_item->children() as $child_line_item ) {
62
+				foreach ($line_item->children() as $child_line_item) {
63 63
 					// recursively feed children back into this method
64 64
 //					$html .= $this->display_line_item( $child_line_item, $options );
65 65
 				}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
 			case EEM_Line_Item::type_tax_sub_total:
71 71
 				// loop thru children
72
-				foreach( $line_item->children() as $child_line_item ) {
72
+				foreach ($line_item->children() as $child_line_item) {
73 73
 					// recursively feed children back into this method
74 74
 //					$html .= $this->display_line_item( $child_line_item, $options );
75 75
 				}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 				// item row
82 82
 //				$html .= $this->_item_row( $line_item, $options );
83 83
 				// got any kids?
84
-				foreach( $line_item->children() as $child_line_item ) {
84
+				foreach ($line_item->children() as $child_line_item) {
85 85
 //					$this->display_line_item( $child_line_item, $options );
86 86
 				}
87 87
 				break;
Please login to merge, or discard this patch.
libraries/line_item_display/EE_SPCO_Line_Item_Display_Strategy.strategy.php 3 patches
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	/**
68 68
 	 * @param EE_Line_Item $line_item
69 69
 	 * @param array        $options
70
-	 * @return mixed
70
+	 * @return string
71 71
 	 */
72 72
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
73 73
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 *    _event_row - basically a Heading row displayed once above each event's ticket rows
207 207
 	 *
208 208
 	 * @param EE_Line_Item $line_item
209
-	 * @return mixed
209
+	 * @return string
210 210
 	 */
211 211
 	private function _event_row( EE_Line_Item $line_item ) {
212 212
 		// start of row
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 *
226 226
 	 * @param EE_Line_Item $line_item
227 227
 	 * @param array        $options
228
-	 * @return mixed
228
+	 * @return string
229 229
 	 */
230 230
 	private function _ticket_row( EE_Line_Item $line_item, $options = array() ) {
231 231
 		// start of row
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 *
269 269
 	 * @param EE_Line_Item $line_item
270 270
 	 * @param array        $options
271
-	 * @return mixed
271
+	 * @return string
272 272
 	 */
273 273
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
274 274
 		// start of row
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 	 *
315 315
 	 * @param EE_Line_Item $line_item
316 316
 	 * @param array        $options
317
-	 * @return mixed
317
+	 * @return string
318 318
 	 */
319 319
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
320 320
 		// start of row
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 	 *
345 345
 	 * @param EE_Line_Item $line_item
346 346
 	 * @param array        $options
347
-	 * @return mixed
347
+	 * @return string
348 348
 	 */
349 349
 	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
350 350
 		// start of row
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	 * @param EE_Line_Item $line_item
375 375
 	 * @param string $text
376 376
 	 * @param array $options
377
-	 * @return mixed
377
+	 * @return string
378 378
 	 */
379 379
 	private function _total_tax_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
380 380
 		$html = '';
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 	 * @param EE_Line_Item $line_item
402 402
 	 * @param string       $text
403 403
 	 * @param array        $options
404
-	 * @return mixed
404
+	 * @return string
405 405
 	 */
406 406
 	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
407 407
 		$html = '';
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 	 *
427 427
 	 * @param EE_Line_Item $line_item
428 428
 	 * @param string       $text
429
-	 * @return mixed
429
+	 * @return string
430 430
 	 */
431 431
 	private function _total_row( EE_Line_Item $line_item, $text = '' ) {
432 432
 		// start of row
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 	 * 	_payments_and_amount_owing_rows
447 447
 	 *
448 448
 	 * @param EE_Line_Item $line_item
449
-	 * @return mixed
449
+	 * @return string
450 450
 	 */
451 451
 	private function _payments_and_amount_owing_rows( EE_Line_Item $line_item ) {
452 452
 		$html = '';
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
  /**
3
- *
4
- * Class EE_SPCO_Line_Item_Display_Strategy
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_SPCO_Line_Item_Display_Strategy
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 
15 15
 class EE_SPCO_Line_Item_Display_Strategy implements EEI_Line_Item_Display {
16 16
 
Please login to merge, or discard this patch.
Spacing   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -69,104 +69,104 @@  discard block
 block discarded – undo
69 69
 	 * @param array        $options
70 70
 	 * @return mixed
71 71
 	 */
72
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
72
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
73 73
 
74
-		EE_Registry::instance()->load_helper( 'Template' );
75
-		EE_Registry::instance()->load_helper( 'HTML' );
74
+		EE_Registry::instance()->load_helper('Template');
75
+		EE_Registry::instance()->load_helper('HTML');
76 76
 
77 77
 		$html = '';
78 78
 		// set some default options and merge with incoming
79 79
 		$default_options = array(
80
-			'show_desc' => true,  // 	true 		false
80
+			'show_desc' => true, // 	true 		false
81 81
 			'odd' => false
82 82
 		);
83
-		$options = array_merge( $default_options, (array)$options );
83
+		$options = array_merge($default_options, (array) $options);
84 84
 
85
-		switch( $line_item->type() ) {
85
+		switch ($line_item->type()) {
86 86
 
87 87
 			case EEM_Line_Item::type_line_item:
88 88
 				$this->_show_taxes = $line_item->is_taxable() ? true : $this->_show_taxes;
89
-				if ( $line_item->OBJ_type() == 'Ticket' ) {
89
+				if ($line_item->OBJ_type() == 'Ticket') {
90 90
 					// item row
91
-					$html .= $this->_ticket_row( $line_item, $options );
91
+					$html .= $this->_ticket_row($line_item, $options);
92 92
 					// got any kids?
93
-					foreach ( $line_item->children() as $child_line_item ) {
94
-						$this->display_line_item( $child_line_item, $options );
93
+					foreach ($line_item->children() as $child_line_item) {
94
+						$this->display_line_item($child_line_item, $options);
95 95
 					}
96 96
 				} else {
97 97
 					// item row
98
-					$html .= $this->_item_row( $line_item, $options );
98
+					$html .= $this->_item_row($line_item, $options);
99 99
 					// got any kids?
100
-					foreach ( $line_item->children() as $child_line_item ) {
101
-						$this->display_line_item( $child_line_item, $options );
100
+					foreach ($line_item->children() as $child_line_item) {
101
+						$this->display_line_item($child_line_item, $options);
102 102
 					}
103 103
 				}
104 104
 				break;
105 105
 
106 106
 			case EEM_Line_Item::type_sub_line_item:
107
-				$html .= $this->_sub_item_row( $line_item, $options );
107
+				$html .= $this->_sub_item_row($line_item, $options);
108 108
 				break;
109 109
 
110 110
 			case EEM_Line_Item::type_sub_total:
111 111
 				static $sub_total = 0;
112 112
 				$event_sub_total = 0;
113
-				$text = __( 'Sub-Total', 'event_espresso' );
114
-				if ( $line_item->OBJ_type() == 'Event' ) {
115
-					$options[ 'event_id' ] = $event_id = $line_item->OBJ_ID();
116
-					if ( ! isset( $this->_events[ $options[ 'event_id' ] ] ) ) {
117
-						$event = EEM_Event::instance()->get_one_by_ID( $options[ 'event_id' ] );
118
-						if ( $event instanceof EE_Event ) {
119
-							if ( $event->default_registration_status() == EEM_Registration::status_id_not_approved ) {
113
+				$text = __('Sub-Total', 'event_espresso');
114
+				if ($line_item->OBJ_type() == 'Event') {
115
+					$options['event_id'] = $event_id = $line_item->OBJ_ID();
116
+					if ( ! isset($this->_events[$options['event_id']])) {
117
+						$event = EEM_Event::instance()->get_one_by_ID($options['event_id']);
118
+						if ($event instanceof EE_Event) {
119
+							if ($event->default_registration_status() == EEM_Registration::status_id_not_approved) {
120 120
 								return '';
121 121
 							}
122 122
 						}
123
-						$this->_events[ $options[ 'event_id' ] ] = 0;
124
-						$html .= $this->_event_row( $line_item );
125
-						$text = __( 'Event Sub-Total', 'event_espresso' );
123
+						$this->_events[$options['event_id']] = 0;
124
+						$html .= $this->_event_row($line_item);
125
+						$text = __('Event Sub-Total', 'event_espresso');
126 126
 					}
127 127
 				}
128 128
 				$child_line_items = $line_item->children();
129 129
 				// loop thru children
130
-				foreach( $child_line_items as $child_line_item ) {
130
+				foreach ($child_line_items as $child_line_item) {
131 131
 					// recursively feed children back into this method
132
-					$html .= $this->display_line_item( $child_line_item, $options );
132
+					$html .= $this->display_line_item($child_line_item, $options);
133 133
 				}
134
-				$event_sub_total += isset( $options[ 'event_id' ] ) ? $this->_events[ $options[ 'event_id' ] ] : 0;
134
+				$event_sub_total += isset($options['event_id']) ? $this->_events[$options['event_id']] : 0;
135 135
 				$sub_total += $event_sub_total;
136 136
 				if (
137 137
 					(
138 138
 						// event subtotals
139 139
 						$line_item->code() != 'pre-tax-subtotal' &&
140
-						count( $child_line_items ) > 1
140
+						count($child_line_items) > 1
141 141
 					)
142 142
 					||
143 143
 					(
144 144
 						// pre-tax subtotals
145 145
 						$line_item->code() == 'pre-tax-subtotal' &&
146
-						count( $this->_events ) > 1
146
+						count($this->_events) > 1
147 147
 					)
148 148
 				) {
149 149
 					$options['sub_total'] = $line_item->OBJ_type() == 'Event' ? $event_sub_total : $sub_total;
150
-					$html .= $this->_sub_total_row( $line_item, $text, $options );
150
+					$html .= $this->_sub_total_row($line_item, $text, $options);
151 151
 				}
152 152
 				break;
153 153
 
154 154
 			case EEM_Line_Item::type_tax:
155
-				if ( $this->_show_taxes ) {
156
-					$this->_taxes_html .= $this->_tax_row( $line_item, $options );
155
+				if ($this->_show_taxes) {
156
+					$this->_taxes_html .= $this->_tax_row($line_item, $options);
157 157
 				}
158 158
 				break;
159 159
 
160 160
 			case EEM_Line_Item::type_tax_sub_total:
161
-				if ( $this->_show_taxes ) {
161
+				if ($this->_show_taxes) {
162 162
 					$child_line_items = $line_item->children();
163 163
 					// loop thru children
164
-					foreach( $child_line_items as $child_line_item ) {
164
+					foreach ($child_line_items as $child_line_item) {
165 165
 						// recursively feed children back into this method
166
-						$html .= $this->display_line_item( $child_line_item, $options );
166
+						$html .= $this->display_line_item($child_line_item, $options);
167 167
 					}
168
-					if ( count( $child_line_items ) > 1 ) {
169
-						$this->_taxes_html .= $this->_total_tax_row( $line_item, __( 'Tax Total', 'event_espresso' ) );
168
+					if (count($child_line_items) > 1) {
169
+						$this->_taxes_html .= $this->_total_tax_row($line_item, __('Tax Total', 'event_espresso'));
170 170
 					}
171 171
 				}
172 172
 				break;
@@ -175,25 +175,25 @@  discard block
 block discarded – undo
175 175
 				// get all child line items
176 176
 				$children = $line_item->children();
177 177
 				// loop thru all non-tax child line items
178
-				foreach( $children as $child_line_item ) {
179
-					if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) {
178
+				foreach ($children as $child_line_item) {
179
+					if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) {
180 180
 						// recursively feed children back into this method
181
-						$html .= $this->display_line_item( $child_line_item, $options );
181
+						$html .= $this->display_line_item($child_line_item, $options);
182 182
 					}
183 183
 				}
184 184
 
185 185
 				// now loop thru  tax child line items
186
-				foreach( $children as $child_line_item ) {
187
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) {
186
+				foreach ($children as $child_line_item) {
187
+					if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) {
188 188
 						// recursively feed children back into this method
189
-						$html .= $this->display_line_item( $child_line_item, $options );
189
+						$html .= $this->display_line_item($child_line_item, $options);
190 190
 					}
191 191
 				}
192 192
 				$html .= $this->_taxes_html;
193
-				$html .= $this->_total_row( $line_item, __('Total', 'event_espresso') );
193
+				$html .= $this->_total_row($line_item, __('Total', 'event_espresso'));
194 194
 
195 195
 
196
-				$html .= $this->_payments_and_amount_owing_rows( $line_item, $options );
196
+				$html .= $this->_payments_and_amount_owing_rows($line_item, $options);
197 197
 				break;
198 198
 
199 199
 		}
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
 	 * @param EE_Line_Item $line_item
209 209
 	 * @return mixed
210 210
 	 */
211
-	private function _event_row( EE_Line_Item $line_item ) {
211
+	private function _event_row(EE_Line_Item $line_item) {
212 212
 		// start of row
213
-		$html = EEH_HTML::tr( '', 'event-cart-total-row', 'total_tr odd' );
213
+		$html = EEH_HTML::tr('', 'event-cart-total-row', 'total_tr odd');
214 214
 		// event name td
215
-		$html .= EEH_HTML::td( EEH_HTML::strong( $line_item->name() ), '', 'event-header', '', ' colspan="4"' );
215
+		$html .= EEH_HTML::td(EEH_HTML::strong($line_item->name()), '', 'event-header', '', ' colspan="4"');
216 216
 		// end of row
217 217
 		$html .= EEH_HTML::trx();
218 218
 		return $html;
@@ -227,10 +227,10 @@  discard block
 block discarded – undo
227 227
 	 * @param array        $options
228 228
 	 * @return mixed
229 229
 	 */
230
-	private function _ticket_row( EE_Line_Item $line_item, $options = array() ) {
230
+	private function _ticket_row(EE_Line_Item $line_item, $options = array()) {
231 231
 		// start of row
232 232
 		$row_class = $options['odd'] ? 'item odd' : 'item';
233
-		$html = EEH_HTML::tr( '', '', $row_class );
233
+		$html = EEH_HTML::tr('', '', $row_class);
234 234
 		// name && desc
235 235
 		$name_and_desc = apply_filters(
236 236
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name',
@@ -239,23 +239,23 @@  discard block
 block discarded – undo
239 239
 		);
240 240
 		$name_and_desc .= apply_filters(
241 241
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc',
242
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
242
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
243 243
 			$line_item,
244 244
 			$options
245 245
 		);
246 246
 		$name_and_desc .= $line_item->is_taxable() ? ' * ' : '';
247 247
 		// name td
248
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l' );
248
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' );
249 249
 		// price td
250
-		$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
250
+		$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
251 251
 		// quantity td
252
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' );
252
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
253 253
 		$this->_total_items += $line_item->quantity();
254 254
 		// determine total for line item
255 255
 		$total = $line_item->total();
256
-		$this->_events[ $options[ 'event_id' ] ] += $total;
256
+		$this->_events[$options['event_id']] += $total;
257 257
 		// total td
258
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '',  'item_r jst-rght' );
258
+		$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght');
259 259
 		// end of row
260 260
 		$html .= EEH_HTML::trx();
261 261
 		return $html;
@@ -270,41 +270,41 @@  discard block
 block discarded – undo
270 270
 	 * @param array        $options
271 271
 	 * @return mixed
272 272
 	 */
273
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
273
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
274 274
 		// start of row
275 275
 		$row_class = $options['odd'] ? 'item odd' : 'item';
276
-		$html = EEH_HTML::tr( '', '', $row_class );
277
-		$obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type() . ': ' : '';
276
+		$html = EEH_HTML::tr('', '', $row_class);
277
+		$obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type().': ' : '';
278 278
 		// name && desc
279 279
 		$name_and_desc = apply_filters(
280 280
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name',
281
-			 $obj_name . $line_item->name(),
281
+			 $obj_name.$line_item->name(),
282 282
 			$line_item
283 283
 		);
284 284
 		$name_and_desc .= apply_filters(
285 285
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc',
286
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
286
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
287 287
 			$line_item,
288 288
 			$options
289 289
 		);
290 290
 		$name_and_desc .= $line_item->is_taxable() ? ' * ' : '';
291 291
 		// name td
292
-		$html .= EEH_HTML::td( $name_and_desc, '',  'item_l' );
292
+		$html .= EEH_HTML::td($name_and_desc, '', 'item_l');
293 293
 		// price td
294
-		if ( $line_item->is_percent() ) {
295
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c jst-rght' );
294
+		if ($line_item->is_percent()) {
295
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c jst-rght');
296 296
 		} else {
297
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' );
297
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
298 298
 		}
299 299
 		// quantity td
300
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' );
300
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
301 301
 		//$total = $line_item->total() * $line_item->quantity();
302 302
 		$total = $line_item->total();
303
-		if( isset( $options[ 'event_id' ] ) && isset( $this->_events[ $options[ 'event_id' ] ] ) ) {
304
-			$this->_events[ $options[ 'event_id' ] ] += $total;
303
+		if (isset($options['event_id']) && isset($this->_events[$options['event_id']])) {
304
+			$this->_events[$options['event_id']] += $total;
305 305
 		}
306 306
 		// total td
307
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '',  'item_r jst-rght' );
307
+		$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght');
308 308
 		// end of row
309 309
 		$html .= EEH_HTML::trx();
310 310
 		return $html;
@@ -319,22 +319,22 @@  discard block
 block discarded – undo
319 319
 	 * @param array        $options
320 320
 	 * @return mixed
321 321
 	 */
322
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
322
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
323 323
 		// start of row
324
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
324
+		$html = EEH_HTML::tr('', 'item sub-item-row');
325 325
 		// name && desc
326 326
 		$name_and_desc = $line_item->name();
327
-		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '';
327
+		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : '';
328 328
 		// name td
329
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
329
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
330 330
 		// discount/surcharge td
331
-		if ( $line_item->is_percent() ) {
332
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
331
+		if ($line_item->is_percent()) {
332
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
333 333
 		} else {
334
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
334
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
335 335
 		}
336 336
 		// total td
337
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
337
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
338 338
 		// end of row
339 339
 		$html .= EEH_HTML::trx();
340 340
 		return $html;
@@ -349,21 +349,21 @@  discard block
 block discarded – undo
349 349
 	 * @param array        $options
350 350
 	 * @return mixed
351 351
 	 */
352
-	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
352
+	private function _tax_row(EE_Line_Item $line_item, $options = array()) {
353 353
 		// start of row
354
-		$html = EEH_HTML::tr( '', 'item sub-item tax-total' );
354
+		$html = EEH_HTML::tr('', 'item sub-item tax-total');
355 355
 		// name && desc
356 356
 		$name_and_desc = $line_item->name();
357
-		$name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable items', 'event_espresso' ) . '</span>';
358
-		$name_and_desc .= $options[ 'show_desc' ] ? '<br/>' . $line_item->desc() : '';
357
+		$name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable items', 'event_espresso').'</span>';
358
+		$name_and_desc .= $options['show_desc'] ? '<br/>'.$line_item->desc() : '';
359 359
 		// name td
360
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
360
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
361 361
 		// percent td
362
-		$html .= EEH_HTML::td( $line_item->percent() . '%', '',  ' jst-rght', '' );
362
+		$html .= EEH_HTML::td($line_item->percent().'%', '', ' jst-rght', '');
363 363
 		// empty td (price)
364
-		$html .= EEH_HTML::td( EEH_HTML::nbsp() );
364
+		$html .= EEH_HTML::td(EEH_HTML::nbsp());
365 365
 		// total td
366
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
366
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
367 367
 		// end of row
368 368
 		$html .= EEH_HTML::trx();
369 369
 		return $html;
@@ -378,17 +378,17 @@  discard block
 block discarded – undo
378 378
 	 * @param string $text
379 379
 	 * @return mixed
380 380
 	 */
381
-	private function _total_tax_row( EE_Line_Item $line_item, $text = '' ) {
381
+	private function _total_tax_row(EE_Line_Item $line_item, $text = '') {
382 382
 		$html = '';
383
-		if ( $line_item->total() ) {
383
+		if ($line_item->total()) {
384 384
 			// start of row
385
-			$html = EEH_HTML::tr( '', '', 'total_tr odd' );
385
+			$html = EEH_HTML::tr('', '', 'total_tr odd');
386 386
 			// total td
387
-			$html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="2"' );
387
+			$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="2"');
388 388
 			// empty td (price)
389
-			$html .= EEH_HTML::td( EEH_HTML::nbsp() );
389
+			$html .= EEH_HTML::td(EEH_HTML::nbsp());
390 390
 			// total td
391
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' );
391
+			$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght');
392 392
 			// end of row
393 393
 			$html .= EEH_HTML::trx();
394 394
 		}
@@ -405,15 +405,15 @@  discard block
 block discarded – undo
405 405
 	 * @param array        $options
406 406
 	 * @return mixed
407 407
 	 */
408
-	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
408
+	private function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
409 409
 		$html = '';
410
-		if ( $line_item->total() ) {
410
+		if ($line_item->total()) {
411 411
 			// start of row
412
-			$html = EEH_HTML::tr( '', '', 'total_tr odd' );
412
+			$html = EEH_HTML::tr('', '', 'total_tr odd');
413 413
 			// total td
414
-			$html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' );
414
+			$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"');
415 415
 			// total td
416
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $options[ 'sub_total' ], false, false ), '', 'total jst-rght' );
416
+			$html .= EEH_HTML::td(EEH_Template::format_currency($options['sub_total'], false, false), '', 'total jst-rght');
417 417
 			// end of row
418 418
 			$html .= EEH_HTML::trx();
419 419
 		}
@@ -430,13 +430,13 @@  discard block
 block discarded – undo
430 430
 	 * @param string       $text
431 431
 	 * @return mixed
432 432
 	 */
433
-	private function _total_row( EE_Line_Item $line_item, $text = '' ) {
433
+	private function _total_row(EE_Line_Item $line_item, $text = '') {
434 434
 		// start of row
435
-		$html = EEH_HTML::tr( '', '', 'spco-grand-total total_tr odd' );
435
+		$html = EEH_HTML::tr('', '', 'spco-grand-total total_tr odd');
436 436
 		// total td
437
-		$html .= EEH_HTML::td( $text, '',  'total_currency total jst-rght',  '',  ' colspan="3"' );
437
+		$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"');
438 438
 		// total td
439
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'total jst-rght' );
439
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght');
440 440
 		// end of row
441 441
 		$html .= EEH_HTML::trx();
442 442
 		return $html;
@@ -451,30 +451,30 @@  discard block
 block discarded – undo
451 451
 	 * @param array        $options
452 452
 	 * @return mixed
453 453
 	 */
454
-	private function _payments_and_amount_owing_rows( EE_Line_Item $line_item, $options = array() ) {
454
+	private function _payments_and_amount_owing_rows(EE_Line_Item $line_item, $options = array()) {
455 455
 		$html = '';
456 456
 		$owing = $line_item->total();
457
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $line_item->TXN_ID() );
458
-		if ( $transaction instanceof EE_Transaction ) {
457
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($line_item->TXN_ID());
458
+		if ($transaction instanceof EE_Transaction) {
459 459
 			$registration_payments = array();
460
-			$registrations = ! empty( $options['registrations'] )
461
-				? $options[ 'registrations' ]
460
+			$registrations = ! empty($options['registrations'])
461
+				? $options['registrations']
462 462
 				: $transaction->registrations();
463
-			foreach ( $registrations as $registration ) {
464
-				if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
463
+			foreach ($registrations as $registration) {
464
+				if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
465 465
 					$registration_payments = $registration_payments + $registration->registration_payments();
466 466
 				}
467 467
 			}
468
-			if ( ! empty( $registration_payments )) {
469
-				foreach ( $registration_payments as $registration_payment ) {
470
-					if ( $registration_payment instanceof EE_Registration_Payment ) {
468
+			if ( ! empty($registration_payments)) {
469
+				foreach ($registration_payments as $registration_payment) {
470
+					if ($registration_payment instanceof EE_Registration_Payment) {
471 471
 						$owing = $owing - $registration_payment->amount();
472 472
 						$payment = $registration_payment->payment();
473
-						if ( $payment instanceof EE_Payment ) {
473
+						if ($payment instanceof EE_Payment) {
474 474
 							$payment_desc = sprintf(
475
-								__( 'Payment%1$s Received: %2$s', 'event_espresso' ),
475
+								__('Payment%1$s Received: %2$s', 'event_espresso'),
476 476
 								$payment->txn_id_chq_nmbr() != ''
477
-									? ' <span class="small-text">(#' . $payment->txn_id_chq_nmbr() . ')</span> '
477
+									? ' <span class="small-text">(#'.$payment->txn_id_chq_nmbr().')</span> '
478 478
 									: '',
479 479
 								$payment->timestamp()
480 480
 							);
@@ -482,12 +482,12 @@  discard block
 block discarded – undo
482 482
 							$payment_desc = '';
483 483
 						}
484 484
 						// start of row
485
-						$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
485
+						$html .= EEH_HTML::tr('', '', 'total_tr odd');
486 486
 						// payment desc
487
-						$html .= EEH_HTML::td( $payment_desc, '', '', '', ' colspan="3"' );
487
+						$html .= EEH_HTML::td($payment_desc, '', '', '', ' colspan="3"');
488 488
 						// total td
489 489
 						$html .= EEH_HTML::td(
490
-							EEH_Template::format_currency( $registration_payment->amount(), false, false ),
490
+							EEH_Template::format_currency($registration_payment->amount(), false, false),
491 491
 							'',
492 492
 							'total jst-rght'
493 493
 						);
@@ -495,17 +495,17 @@  discard block
 block discarded – undo
495 495
 						$html .= EEH_HTML::trx();
496 496
 					}
497 497
 				}
498
-				if ( $line_item->total() ) {
498
+				if ($line_item->total()) {
499 499
 					// start of row
500
-					$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
500
+					$html .= EEH_HTML::tr('', '', 'total_tr odd');
501 501
 					// total td
502 502
 					$html .= EEH_HTML::td(
503 503
 						__('Amount Owing', 'event_espresso'),
504
-						'',  'total_currency total jst-rght',  '',  ' colspan="3"'
504
+						'', 'total_currency total jst-rght', '', ' colspan="3"'
505 505
 					);
506 506
 					// total td
507 507
 					$html .= EEH_HTML::td(
508
-						EEH_Template::format_currency( $owing, false, false ), '',  'total jst-rght'
508
+						EEH_Template::format_currency($owing, false, false), '', 'total jst-rght'
509 509
 					);
510 510
 					// end of row
511 511
 					$html .= EEH_HTML::trx();
Please login to merge, or discard this patch.
core/libraries/messages/defaults/EE_Messages_Template_Pack.core.php 3 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -316,6 +316,7 @@
 block discarded – undo
316 316
 	 * @param EE_message_type $message_type
317 317
 	 * @param string          $field          The field reference for the specific template being looked up.
318 318
 	 * @param string          $context      The context reference for the specific template being looked up
319
+	 * @param EE_Messages_Template_Pack_Default|null $default_pack
319 320
 	 *
320 321
 	 * @return string          The template contents.
321 322
 	 */
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@  discard block
 block discarded – undo
5 5
  * @subpackage messages
6 6
  * @since           4.5.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
  * EE_Template_Packs are classes that contain all the information related to messages templates for a given "template pack".
@@ -282,8 +284,9 @@  discard block
 block discarded – undo
282 284
 
283 285
 		foreach ( $contexts as $context => $details ) {
284 286
 			foreach ( $fields as $field => $field_details ) {
285
-				if ( empty( $field_details ) )
286
-					continue;
287
+				if ( empty( $field_details ) ) {
288
+									continue;
289
+				}
287 290
 				/**
288 291
 				 * is this a field array (linked to a main field)?
289 292
 				 */
Please login to merge, or discard this patch.
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -167,48 +167,48 @@  discard block
 block discarded – undo
167 167
 	public function __construct() {
168 168
 		$this->_set_props();
169 169
 		//make sure classname is correct
170
-		$classname = get_class( $this );
170
+		$classname = get_class($this);
171 171
 		//make sure required props have been set
172 172
 
173 173
 		//if label is empty then throw an error because we should have it defined by now.
174
-		if ( ! isset( $this->label )  ) {
175
-			throw new EE_Error( sprintf( __('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
174
+		if ( ! isset($this->label)) {
175
+			throw new EE_Error(sprintf(__('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
176 176
 		}
177 177
 
178 178
 
179 179
 		//the reference for this template pack
180
-		if ( ! isset( $this->dbref )  ) {
181
-			throw new EE_Error( sprintf( __('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
180
+		if ( ! isset($this->dbref)) {
181
+			throw new EE_Error(sprintf(__('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
182 182
 		}
183 183
 
184 184
 		//make sure dbref is safe
185
-		$this->dbref = str_replace( '-', '_', sanitize_key( $this->dbref ) );
185
+		$this->dbref = str_replace('-', '_', sanitize_key($this->dbref));
186 186
 
187
-		$should_be = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $this->dbref ) ) );
187
+		$should_be = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $this->dbref)));
188 188
 
189
-		if ( $should_be !== $classname ) {
190
-			throw new EE_Error( sprintf( __('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso' ), $classname, $should_be ) );
189
+		if ($should_be !== $classname) {
190
+			throw new EE_Error(sprintf(__('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso'), $classname, $should_be));
191 191
 		}
192 192
 
193 193
 		//if _base_path is not set then throw an error because a base path string is needed.
194
-		if ( empty( $this->_base_path ) ) {
195
-			throw new EE_Error( sprintf( __('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
194
+		if (empty($this->_base_path)) {
195
+			throw new EE_Error(sprintf(__('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
196 196
 		}
197 197
 
198 198
 
199 199
 		//if _base_url is not set then throw an error because a  string is needed for variations.
200
-		if ( empty( $this->_base_url ) ) {
201
-			throw new EE_Error( sprintf( __('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
200
+		if (empty($this->_base_url)) {
201
+			throw new EE_Error(sprintf(__('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
202 202
 		}
203 203
 
204 204
 
205 205
 		//if $supports is not set then throw an error because that effectively means this template_pack does not have any templates!
206
-		if ( empty( $this->_supports ) ) {
207
-			throw new EE_Error( sprintf( __('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
206
+		if (empty($this->_supports)) {
207
+			throw new EE_Error(sprintf(__('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
208 208
 		}
209 209
 
210 210
 		//load template helper
211
-		EE_Registry::instance()->load_helper( 'Template' );
211
+		EE_Registry::instance()->load_helper('Template');
212 212
 
213 213
 	}
214 214
 
@@ -243,8 +243,8 @@  discard block
 block discarded – undo
243 243
 	 *
244 244
 	 * @return array
245 245
 	 */
246
-	public function get_templates( EE_Messenger $messenger, EE_message_type $message_type ) {
247
-		return isset( $this->_templates[$messenger->name][$message_type->name] ) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates( $messenger, $message_type );
246
+	public function get_templates(EE_Messenger $messenger, EE_message_type $message_type) {
247
+		return isset($this->_templates[$messenger->name][$message_type->name]) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates($messenger, $message_type);
248 248
 	}
249 249
 
250 250
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 	 * @return array          Returns an multi-level associative array indexed by template context and field in the format:
262 262
 	 *                                array( 'context' => array( 'field' => 'value', 'another-field', 'value' ) );
263 263
 	 */
264
-	protected function _get_templates( EE_Messenger $messenger, EE_message_type $message_type ) {
264
+	protected function _get_templates(EE_Messenger $messenger, EE_message_type $message_type) {
265 265
 		$templates = array();
266 266
 
267 267
 		/**
@@ -280,28 +280,28 @@  discard block
 block discarded – undo
280 280
 		$contexts = $message_type->get_contexts();
281 281
 
282 282
 
283
-		foreach ( $contexts as $context => $details ) {
284
-			foreach ( $fields as $field => $field_details ) {
285
-				if ( empty( $field_details ) )
283
+		foreach ($contexts as $context => $details) {
284
+			foreach ($fields as $field => $field_details) {
285
+				if (empty($field_details))
286 286
 					continue;
287 287
 				/**
288 288
 				 * is this a field array (linked to a main field)?
289 289
 				 */
290
-				if ( $field == 'extra'  ) {
291
-					foreach ( $field_details as $main_field => $sub_fields ) {
292
-						foreach ( $sub_fields as $sub_field => $sub_field_details ) {
290
+				if ($field == 'extra') {
291
+					foreach ($field_details as $main_field => $sub_fields) {
292
+						foreach ($sub_fields as $sub_field => $sub_field_details) {
293 293
 							//make sure that the template_field_ref matches what the main template field is for this template group.
294 294
 							$template_field_ref = $sub_field == 'main' ? $main_field : $sub_field;
295
-							$templates[ $context ][ $main_field ][ $sub_field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $template_field_ref, $context );
295
+							$templates[$context][$main_field][$sub_field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $template_field_ref, $context);
296 296
 						}
297 297
 					}
298 298
 				} else {
299
-					$templates[ $context ][ $field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $field, $context );
299
+					$templates[$context][$field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $field, $context);
300 300
 				}
301 301
 			}
302 302
 		}
303 303
 
304
-		$templates = apply_filters( 'FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this );
304
+		$templates = apply_filters('FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this);
305 305
 
306 306
 		$this->_templates[$messenger->name][$message_type->name] = $templates;
307 307
 		 return $templates;
@@ -319,22 +319,22 @@  discard block
 block discarded – undo
319 319
 	 *
320 320
 	 * @return string          The template contents.
321 321
 	 */
322
-	protected function _get_specific_template( $default_pack, EE_Messenger $messenger, EE_message_type $message_type, $field, $context ) {
322
+	protected function _get_specific_template($default_pack, EE_Messenger $messenger, EE_message_type $message_type, $field, $context) {
323 323
 
324 324
 		//default templates
325
-		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates( $messenger, $message_type ) : array();
325
+		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates($messenger, $message_type) : array();
326 326
 
327 327
 		//first we allow for the $_base_path to be filtered.  However, we assign this to a new variable so that we have the original base_path as a fallback.
328
-		$filtered_base_path = apply_filters( 'FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this );
328
+		$filtered_base_path = apply_filters('FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this);
329 329
 
330 330
 		$master_templates = $message_type->get_master_templates();
331
-		$master_templates_mt = isset( $master_templates[$messenger->name] ) ? $master_templates[$messenger->name] : $message_type->name;
332
-		$full_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '_' . $context . '.template.php';
333
-		$fallback_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '.template.php';
334
-		$mt_defined_full_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
335
-		$mt_defined_fallback_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
336
-		$base_defined_full_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
337
-		$base_defined_fallback_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
331
+		$master_templates_mt = isset($master_templates[$messenger->name]) ? $master_templates[$messenger->name] : $message_type->name;
332
+		$full_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'_'.$context.'.template.php';
333
+		$fallback_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'.template.php';
334
+		$mt_defined_full_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
335
+		$mt_defined_fallback_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
336
+		$base_defined_full_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
337
+		$base_defined_fallback_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
338 338
 
339 339
 		/**
340 340
 		 * Template checks are done hierarchically in the following order:
@@ -348,28 +348,28 @@  discard block
 block discarded – undo
348 348
 		 */
349 349
 
350 350
 
351
-		if ( is_readable( $full_path ) ) {
351
+		if (is_readable($full_path)) {
352 352
 			$actual_path = $full_path;
353
-		} elseif ( is_readable( $fallback_path ) ) {
353
+		} elseif (is_readable($fallback_path)) {
354 354
 			$actual_path = $fallback_path;
355
-		} elseif ( is_readable( $mt_defined_full_path ) ) {
355
+		} elseif (is_readable($mt_defined_full_path)) {
356 356
 			$actual_path = $mt_defined_full_path;
357
-		} elseif ( is_readable( $mt_defined_fallback_path ) ) {
357
+		} elseif (is_readable($mt_defined_fallback_path)) {
358 358
 			$actual_path = $mt_defined_fallback_path;
359
-		} elseif ( is_readable( $base_defined_full_path ) ) {
359
+		} elseif (is_readable($base_defined_full_path)) {
360 360
 			$actual_path = $base_defined_full_path;
361
-		} elseif ( is_readable( $base_defined_fallback_path ) ) {
361
+		} elseif (is_readable($base_defined_fallback_path)) {
362 362
 			$actual_path = $base_defined_fallback_path;
363
-		} else  {
363
+		} else {
364 364
 			$actual_path = '';
365 365
 		}
366
-		if ( empty( $actual_path ) ) {
367
-			$contents = isset( $default_templates[$context][$field] ) ? $default_templates[$context][$field] : '';
366
+		if (empty($actual_path)) {
367
+			$contents = isset($default_templates[$context][$field]) ? $default_templates[$context][$field] : '';
368 368
 		} else {
369
-			$contents = EEH_Template::display_template( $actual_path, array(), TRUE );
369
+			$contents = EEH_Template::display_template($actual_path, array(), TRUE);
370 370
 		}
371 371
 
372
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this );
372
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this);
373 373
 	}
374 374
 
375 375
 
@@ -384,8 +384,8 @@  discard block
 block discarded – undo
384 384
 	 * @return array
385 385
 	 */
386 386
 	public function get_supports() {
387
-		$supports = apply_filters( 'FHEE__' . get_class( $this ) . '__get_supports', $this->_supports );
388
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this );
387
+		$supports = apply_filters('FHEE__'.get_class($this).'__get_supports', $this->_supports);
388
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this);
389 389
 	}
390 390
 
391 391
 
@@ -400,11 +400,11 @@  discard block
 block discarded – undo
400 400
 	 *
401 401
 	 * @return array|string
402 402
 	 */
403
-	public function get_default_variation_labels( $messenger = '' ) {
404
-		$label = empty( $messenger ) ? $this->_default_variation_labels : array();
405
-		$label = empty( $label ) && ! empty( $this->_default_variation_labels[$messenger] ) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
403
+	public function get_default_variation_labels($messenger = '') {
404
+		$label = empty($messenger) ? $this->_default_variation_labels : array();
405
+		$label = empty($label) && ! empty($this->_default_variation_labels[$messenger]) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
406 406
 
407
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger );
407
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger);
408 408
 	}
409 409
 
410 410
 
@@ -420,25 +420,25 @@  discard block
 block discarded – undo
420 420
 	 * @param string $message_type if included then css variations matching the message_type are returned (must have $messenger set).  Otherwise the array of variations per message type are returned.  If message_type is provided but NOT the messenger, then just all variations for all messengers are returned.
421 421
 	 * @return array
422 422
 	 */
423
-	public function get_variations( $messenger = '', $message_type = '' ) {
424
-		$messenger_variations = ! empty( $messenger ) && isset( $this->_variations[$messenger] ) ? $this->_variations[$messenger] : array();
423
+	public function get_variations($messenger = '', $message_type = '') {
424
+		$messenger_variations = ! empty($messenger) && isset($this->_variations[$messenger]) ? $this->_variations[$messenger] : array();
425 425
 
426 426
 		//message_type provided? IF so, then we've requested a specific set of variations, so we need to make sure we set it as empty if that's not present.
427
-		$variations = !empty( $messenger ) && !empty( $message_type ) && isset( $messenger_variations[$message_type] ) ? $messenger_variations[$message_type] : array();
427
+		$variations = ! empty($messenger) && ! empty($message_type) && isset($messenger_variations[$message_type]) ? $messenger_variations[$message_type] : array();
428 428
 
429 429
 		//now let's account for the possibility we just want all the variations for a messenger (which is indicated by providing the messenger but not the message type).
430
-		$variations = empty( $variations ) && !empty( $messenger ) && empty( $message_type ) ? $messenger_variations : $variations;
430
+		$variations = empty($variations) && ! empty($messenger) && empty($message_type) ? $messenger_variations : $variations;
431 431
 
432 432
 		//filter per template pack and globally.
433
-		$variations = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variations', $variations, $messenger, $message_type );
434
-		$variations = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this );
433
+		$variations = apply_filters('FHEE__'.get_class($this).'__get_variations', $variations, $messenger, $message_type);
434
+		$variations = apply_filters('FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this);
435 435
 
436 436
 		//prepend the _default_variation, but ONLY if we're returning the fully validated array.
437
-		if ( !empty( $messenger ) && !empty( $message_type ) && ! empty( $variations ) ) {
438
-			$variations = array( 'default' => $this->get_default_variation_labels( $messenger ) ) + $variations;
437
+		if ( ! empty($messenger) && ! empty($message_type) && ! empty($variations)) {
438
+			$variations = array('default' => $this->get_default_variation_labels($messenger)) + $variations;
439 439
 		}
440 440
 
441
-		return empty( $variations ) ? array( 'default' => $this->get_default_variation_labels('dft') ): $variations;
441
+		return empty($variations) ? array('default' => $this->get_default_variation_labels('dft')) : $variations;
442 442
 	}
443 443
 
444 444
 
@@ -459,39 +459,39 @@  discard block
 block discarded – undo
459 459
 	 *
460 460
 	 * @return string The variation path or url (typically css reference)
461 461
 	 */
462
-	public function get_variation( $messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE ) {
462
+	public function get_variation($messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE) {
463 463
 
464 464
 		$base = $url ? $this->_base_url : $this->_base_path;
465 465
 		$base_path = $this->_base_path;
466 466
 
467
-		if ( ! $skip_filters ) {
468
-			$base =  apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this );
469
-			$base_path = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this );
467
+		if ( ! $skip_filters) {
468
+			$base = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this);
469
+			$base_path = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this);
470 470
 		}
471 471
 
472
-		$default_pack = get_class( $this ) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
472
+		$default_pack = get_class($this) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
473 473
 
474 474
 		//possible variation paths considering whether message type is present or not in the file name.
475
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_' . $variation . $file_extension;
476
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_' . $variation . $file_extension;
475
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_'.$variation.$file_extension;
476
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_'.$variation.$file_extension;
477 477
 
478 478
 		//first see if fully validated file exists.
479
-		if ( is_readable( $base_path . $path_string ) ) {
480
-			$variation_path = $base . $path_string;
479
+		if (is_readable($base_path.$path_string)) {
480
+			$variation_path = $base.$path_string;
481 481
 		//otherwise see if default exists.
482
-		} elseif ( is_readable( $base_path . $default_path_string ) ) {
483
-			$variation_path = $base . $default_path_string;
482
+		} elseif (is_readable($base_path.$default_path_string)) {
483
+			$variation_path = $base.$default_path_string;
484 484
 		} else {
485
-			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) : '';
485
+			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation($messenger, $message_type, $type, $url, $file_extension) : '';
486 486
 		}
487 487
 
488
-		if ( $skip_filters ) {
488
+		if ($skip_filters) {
489 489
 			return $variation_path;
490 490
 		}
491 491
 
492 492
 		//filter result
493
-		$variation_path = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url );
494
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this );
493
+		$variation_path = apply_filters('FHEE__'.get_class($this).'__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url);
494
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this);
495 495
 	}
496 496
 
497 497
 
@@ -506,19 +506,19 @@  discard block
 block discarded – undo
506 506
 	 *
507 507
 	 * @return string returns the path for the requested wrapper template.
508 508
 	 */
509
-	public function get_wrapper( $messenger, $type = 'main' ) {
510
-		$default_pack = get_class( $this ) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
509
+	public function get_wrapper($messenger, $type = 'main') {
510
+		$default_pack = get_class($this) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
511 511
 
512
-		$path_string = $this->_base_path . $messenger . '_' . $type . '_wrapper.template.php';
512
+		$path_string = $this->_base_path.$messenger.'_'.$type.'_wrapper.template.php';
513 513
 
514
-		if ( is_readable( $path_string ) ) {
514
+		if (is_readable($path_string)) {
515 515
 			$template = $path_string;
516 516
 		} else {
517
-			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper( $messenger, $type ) : '';
517
+			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper($messenger, $type) : '';
518 518
 		}
519 519
 
520 520
 		//filter
521
-		$template = apply_filters( 'FHEE__' . get_class( $this ) . '__get_wrapper', $template, $messenger, $type );
522
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this );
521
+		$template = apply_filters('FHEE__'.get_class($this).'__get_wrapper', $template, $messenger, $type);
522
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this);
523 523
 	}
524 524
 }
Please login to merge, or discard this patch.
core/libraries/messages/messenger/EE_Pdf_messenger.class.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -332,7 +332,7 @@
 block discarded – undo
332 332
 
333 333
 
334 334
 	/**
335
-	 * @return string
335
+	 * @return boolean|null
336 336
 	 */
337 337
 	protected function _preview() { return $this->_send_message(); }
338 338
 
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This contains the class for the EE PDF messenger.
4
- *
5
- * @since 4.5.0
6
- * @package Event Espresso
7
- * @subpackage messages
8
- */
3
+	 * This contains the class for the EE PDF messenger.
4
+	 *
5
+	 * @since 4.5.0
6
+	 * @package Event Espresso
7
+	 * @subpackage messages
8
+	 */
9 9
 if (!defined('EVENT_ESPRESSO_VERSION') )
10 10
 	exit('NO direct script access allowed');
11 11
 
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.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 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
 /**
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  * @subpackage		messages
21 21
  * @author			Darren Ethier
22 22
  */
23
-class EE_Pdf_Messenger extends EE_Messenger  {
23
+class EE_Pdf_Messenger extends EE_Messenger {
24 24
 
25 25
 
26 26
 	/**
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @see abstract declaration in EE_Messenger for details.
94 94
 	 */
95 95
 	protected function _set_admin_pages() {
96
-		$this->admin_registered_pages = array( 'events_edit' => false );
96
+		$this->admin_registered_pages = array('events_edit' => false);
97 97
 	}
98 98
 
99 99
 
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
113 113
 	protected function _set_validator_config() {
114 114
 		$this->_validator_config = array(
115 115
 			'subject' => array(
116
-				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
116
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
117 117
 				),
118 118
 			'content' => array(
119
-				'shortcodes' => array( 'recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
119
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
120 120
 				),
121 121
 			'attendee_list' => array(
122 122
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 				'required' => array('[EVENT_LIST]')
128 128
 				),
129 129
 			'ticket_list' => array(
130
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
130
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
131 131
 				'required' => array('[TICKET_LIST]')
132 132
 				),
133 133
 			'datetime_list' => array(
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 */
148 148
 	public  function enqueue_scripts_styles() {
149 149
 		parent::enqueue_scripts_styles();
150
-		do_action( 'AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
150
+		do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
151 151
 	}
152 152
 
153 153
 
@@ -273,18 +273,18 @@  discard block
 block discarded – undo
273 273
 	 */
274 274
 	protected function _send_message() {
275 275
 		$this->_template_args = array(
276
-			'page_title' => html_entity_decode( stripslashes( $this->_subject ), ENT_QUOTES, "UTF-8"),
277
-			'base_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation ),
278
-			'print_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation ),
279
-			'main_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation ),
280
-			'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
281
-			'main_body' => apply_filters( 'FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) )), $this->_content )
276
+			'page_title' => html_entity_decode(stripslashes($this->_subject), ENT_QUOTES, "UTF-8"),
277
+			'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation),
278
+			'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation),
279
+			'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation),
280
+			'extra_css' => EE_LIBRARIES_URL.'messages/defaults/default/variations/pdf_base_default.css',
281
+			'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8"))), $this->_content)
282 282
 			);
283 283
 		$this->_deregister_wp_hooks();
284
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
284
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
285 285
 		$content = $this->_get_main_template();
286 286
 //		die( $content );
287
-		$this->_do_pdf( $content );
287
+		$this->_do_pdf($content);
288 288
 		exit(0);
289 289
 	}
290 290
 
@@ -308,8 +308,8 @@  discard block
 block discarded – undo
308 308
 
309 309
 		//just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
310 310
 		add_action('wp_head', 'wp_enqueue_scripts');
311
-		add_action( 'wp_footer', 'wp_print_footer_scripts' );
312
-		add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
311
+		add_action('wp_footer', 'wp_print_footer_scripts');
312
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
313 313
 	}
314 314
 
315 315
 
@@ -322,15 +322,15 @@  discard block
 block discarded – undo
322 322
 	 * @param bool $preview
323 323
 	 * @return string
324 324
 	 */
325
-	protected function _get_main_template( $preview = FALSE ) {
326
-		$wrapper_template = $this->_tmp_pack->get_wrapper( 'html', 'main' );
325
+	protected function _get_main_template($preview = FALSE) {
326
+		$wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
327 327
 
328 328
 		//add message type to template_args
329 329
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
330 330
 
331 331
 		//require template helper
332
-		EE_Registry::instance()->load_helper( 'Template' );
333
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
332
+		EE_Registry::instance()->load_helper('Template');
333
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
334 334
 	}
335 335
 
336 336
 
@@ -343,21 +343,21 @@  discard block
 block discarded – undo
343 343
 	 *
344 344
 	 * @return void
345 345
 	 */
346
-	protected function _do_pdf( $content = '' ) {
347
-		$invoice_name = html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8");
346
+	protected function _do_pdf($content = '') {
347
+		$invoice_name = html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8");
348 348
 
349 349
 		//only load dompdf if nobody else has yet...
350
-		if( ! defined('DOMPDF_DIR')){
350
+		if ( ! defined('DOMPDF_DIR')) {
351 351
 			define('DOMPDF_ENABLE_REMOTE', TRUE);
352 352
 			define('DOMPDF_ENABLE_JAVASCRIPT', FALSE);
353 353
 			define('DOMPDF_ENABLE_CSS_FLOAT', TRUE);
354
-			require_once(EE_THIRD_PARTY . 'dompdf/dompdf_config.inc.php');
354
+			require_once(EE_THIRD_PARTY.'dompdf/dompdf_config.inc.php');
355 355
 		}
356 356
 		$dompdf = new DOMPDF();
357 357
 		$dompdf->load_html($content);
358 358
 		$dompdf->render();
359 359
 		//forcing the browser to open a download dialog.
360
-		$dompdf->stream($invoice_name . ".pdf", array( 'Attachment' => TRUE ));
360
+		$dompdf->stream($invoice_name.".pdf", array('Attachment' => TRUE));
361 361
 	}
362 362
 
363 363
 
Please login to merge, or discard this patch.
core/libraries/messages/validators/EE_Messages_Validator.core.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -442,7 +442,7 @@
 block discarded – undo
442 442
 	 *
443 443
 	 * @param  string $value      string to evaluate
444 444
 	 * @param  array  $valid_shortcodes array of shortcodes that are acceptable.
445
-	 * @return mixed (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
445
+	 * @return false|string (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
446 446
 	 */
447 447
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
448 448
 		//first we need to go through the string and get the shortcodes in the string
Please login to merge, or discard this patch.
Spacing   +95 added lines, -95 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 /**
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 	 * @param       $context
120 120
 	 * @throws \EE_Error
121 121
 	 */
122
-	public function __construct( $fields, $context ) {
122
+	public function __construct($fields, $context) {
123 123
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
124
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
124
+		if (empty($this->_m_name) || empty($this->_mt_name))
125 125
 			throw new EE_Error(
126 126
 				__(
127 127
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
@@ -167,14 +167,14 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	private function _load_objects() {
169 169
 		//load messenger
170
-		$messenger = ucwords( str_replace( '_', ' ', $this->_m_name ) );
171
-		$messenger = str_replace( ' ', '_', $messenger );
172
-		$messenger = 'EE_' . $messenger . '_messenger';
170
+		$messenger = ucwords(str_replace('_', ' ', $this->_m_name));
171
+		$messenger = str_replace(' ', '_', $messenger);
172
+		$messenger = 'EE_'.$messenger.'_messenger';
173 173
 
174
-		if ( ! class_exists( $messenger ) ) {
174
+		if ( ! class_exists($messenger)) {
175 175
 			throw new EE_Error(
176 176
 				sprintf(
177
-					__( 'There is no messenger class for the given string (%s)', 'event_espresso' ),
177
+					__('There is no messenger class for the given string (%s)', 'event_espresso'),
178 178
 					$this->_m_name
179 179
 				)
180 180
 			);
@@ -183,14 +183,14 @@  discard block
 block discarded – undo
183 183
 		$this->_messenger = new $messenger();
184 184
 
185 185
 		//load message type
186
-		$message_type = ucwords( str_replace( '_', ' ', $this->_mt_name ) );
187
-		$message_type = str_replace( ' ', '_', $message_type );
188
-		$message_type = 'EE_' . $message_type . '_message_type';
186
+		$message_type = ucwords(str_replace('_', ' ', $this->_mt_name));
187
+		$message_type = str_replace(' ', '_', $message_type);
188
+		$message_type = 'EE_'.$message_type.'_message_type';
189 189
 
190
-		if ( !class_exists( $message_type ) ) {
190
+		if ( ! class_exists($message_type)) {
191 191
 			throw new EE_Error(
192 192
 				sprintf(
193
-					__( 'There is no message type class for the given string (%s)', 'event_espresso' ),
193
+					__('There is no message type class for the given string (%s)', 'event_espresso'),
194 194
 					$this->_mt_name
195 195
 				)
196 196
 			);
@@ -227,25 +227,25 @@  discard block
 block discarded – undo
227 227
 		$shortcode_groups = $mt_codes;
228 228
 		$groups_per_field = array();
229 229
 
230
-		foreach ( $msgr_validator as $field => $config ) {
231
-			if ( empty($config) || !isset($config['shortcodes']) )
232
-				continue;  //Nothing to see here.
233
-			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
234
-			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
230
+		foreach ($msgr_validator as $field => $config) {
231
+			if (empty($config) || ! isset($config['shortcodes']))
232
+				continue; //Nothing to see here.
233
+			$groups_per_field[$field] = array_intersect($config['shortcodes'], $mt_codes);
234
+			$shortcode_groups = array_merge($config['shortcodes'], $shortcode_groups);
235 235
 		}
236 236
 
237
-		$shortcode_groups = array_unique( $shortcode_groups);
237
+		$shortcode_groups = array_unique($shortcode_groups);
238 238
 
239 239
 		// okay now we've got our groups.
240 240
 		// Let's get the codes from the objects into an array indexed by group for easy retrieval later.
241 241
 		$codes_from_objs = array();
242 242
 
243
-		foreach ( $shortcode_groups as $group ) {
244
-			$ref = ucwords( str_replace('_', ' ', $group ) );
245
-			$ref = str_replace( ' ', '_', $ref );
246
-			$classname = 'EE_' . $ref . '_Shortcodes';
247
-			if ( class_exists( $classname ) ) {
248
-				$a = new ReflectionClass( $classname );
243
+		foreach ($shortcode_groups as $group) {
244
+			$ref = ucwords(str_replace('_', ' ', $group));
245
+			$ref = str_replace(' ', '_', $ref);
246
+			$classname = 'EE_'.$ref.'_Shortcodes';
247
+			if (class_exists($classname)) {
248
+				$a = new ReflectionClass($classname);
249 249
 				$obj = $a->newInstance();
250 250
 				$codes_from_objs[$group] = $obj->get_shortcodes();
251 251
 			}
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 
255 255
 		//let's just replace the $mt shortcode group indexes with the actual shortcodes (unique)
256 256
 		$final_mt_codes = array();
257
-		foreach ( $mt_codes as $group ) {
258
-			$final_mt_codes = array_merge( $final_mt_codes, $codes_from_objs[$group] );
257
+		foreach ($mt_codes as $group) {
258
+			$final_mt_codes = array_merge($final_mt_codes, $codes_from_objs[$group]);
259 259
 		}
260 260
 
261 261
 		$mt_codes = $final_mt_codes;
@@ -263,60 +263,60 @@  discard block
 block discarded – undo
263 263
 
264 264
 		// k now in this next loop we're going to loop through $msgr_validator again
265 265
 		// and setup the _validators property from the data we've setup so far.
266
-		foreach ( $msgr_validator as $field => $config ) {
266
+		foreach ($msgr_validator as $field => $config) {
267 267
 			//if required shortcode is not in our list of codes for the given field, then we skip this field.
268 268
 			$required = isset($config['required'])
269 269
 				? array_intersect($config['required'], array_keys($mt_codes))
270 270
 				: true;
271
-			if ( empty($required) )
271
+			if (empty($required))
272 272
 				continue;
273 273
 
274 274
 			//If we have an override then we use it to indicate the codes we want.
275
-			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
276
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
277
-					$this->_valid_shortcodes_modifier[ $context ][ $field ],
275
+			if (isset($this->_valid_shortcodes_modifier[$context][$field])) {
276
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
277
+					$this->_valid_shortcodes_modifier[$context][$field],
278 278
 					$codes_from_objs
279 279
 				);
280 280
 			}
281 281
 
282 282
 			//if we have specific shortcodes for a field then we need to use them
283
-			else if ( isset( $groups_per_field[$field] ) ) {
284
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
285
-					$groups_per_field[ $field ],
283
+			else if (isset($groups_per_field[$field])) {
284
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
285
+					$groups_per_field[$field],
286 286
 					$codes_from_objs
287 287
 				);
288 288
 			}
289 289
 
290 290
 			//if empty config then we're assuming we're just going to use the shortcodes from the message type context
291
-			else if ( empty( $config ) ) {
291
+			else if (empty($config)) {
292 292
 				$this->_validators[$field]['shortcodes'] = $mt_codes;
293 293
 			}
294 294
 
295 295
 			//if we have specific shortcodes then we need to use them
296
-			else if ( isset($config['specific_shortcodes'] ) ) {
296
+			else if (isset($config['specific_shortcodes'])) {
297 297
 				$this->_validators[$field]['shortcodes'] = $config['specific_shortcodes'];
298 298
 			}
299 299
 
300 300
 			//otherwise the shortcodes are what is set by the messenger for that field
301 301
 			else {
302
-				foreach ( $config['shortcodes'] as $group ) {
302
+				foreach ($config['shortcodes'] as $group) {
303 303
 					$this->_validators[$field]['shortcodes'] = isset($this->_validators[$field]['shortcodes'])
304
-						? array_merge( $this->_validators[$field]['shortcodes'], $codes_from_objs[$group] )
304
+						? array_merge($this->_validators[$field]['shortcodes'], $codes_from_objs[$group])
305 305
 						: $codes_from_objs[$group];
306 306
 				}
307 307
 			}
308 308
 
309 309
 			//now let's just make sure that any excluded specific shortcodes are removed.
310 310
 			$specific_excludes = $this->get_specific_shortcode_excludes();
311
-			if ( isset( $specific_excludes[$field] ) ) {
312
-				foreach( $specific_excludes[$field] as $sex ) {
313
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
314
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
311
+			if (isset($specific_excludes[$field])) {
312
+				foreach ($specific_excludes[$field] as $sex) {
313
+					if (isset($this->_validators[$field]['shortcodes'][$sex]))
314
+						unset($this->_validators[$field]['shortcodes'][$sex]);
315 315
 				}
316 316
 			}
317 317
 
318 318
 			//hey! don't forget to include the type if present!
319
-			$this->_validators[$field]['type'] = isset( $config['type'] ) ? $config['type'] : NULL;
319
+			$this->_validators[$field]['type'] = isset($config['type']) ? $config['type'] : NULL;
320 320
 		}
321 321
 	}
322 322
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 	public function get_specific_shortcode_excludes() {
345 345
 		//specific validator filter
346 346
 		$shortcode_excludes = apply_filters(
347
-			'FHEE__' . get_class( $this ) . '__get_specific_shortcode_excludes;',
347
+			'FHEE__'.get_class($this).'__get_specific_shortcode_excludes;',
348 348
 			$this->_specific_shortcode_excludes,
349 349
 			$this->_context
350 350
 		);
@@ -372,20 +372,20 @@  discard block
 block discarded – undo
372 372
 		//some defaults
373 373
 		$template_fields = $this->_messenger->get_template_fields();
374 374
 		//loop through the fields and check!
375
-		foreach ( $this->_fields as $field => $value ) {
375
+		foreach ($this->_fields as $field => $value) {
376 376
 			$this->_errors[$field] = array();
377 377
 			$err_msg = '';
378 378
 			$field_label = '';
379 379
 			//if field is not present in the _validators array then we continue
380
-			if ( !isset( $this->_validators[$field] ) ) {
381
-				unset( $this->_errors[$field] );
380
+			if ( ! isset($this->_validators[$field])) {
381
+				unset($this->_errors[$field]);
382 382
 				continue;
383 383
 			}
384 384
 
385 385
 			//get the translated field label!
386 386
 			//first check if it's in the main fields list
387
-			if ( isset( $template_fields[$field] ) ) {
388
-				if ( empty( $template_fields[$field] ) )
387
+			if (isset($template_fields[$field])) {
388
+				if (empty($template_fields[$field]))
389 389
 					$field_label = $field; //most likely the field is found in the 'extra' array.
390 390
 				else
391 391
 					$field_label = $template_fields[$field]['label'];
@@ -393,16 +393,16 @@  discard block
 block discarded – undo
393 393
 
394 394
 			// if field label is empty OR is equal to the current field
395 395
 			// then we need to loop through the 'extra' fields in the template_fields config (if present)
396
-			if ( isset( $template_fields['extra'] ) && ( empty($field_label) ) || $field_label == $field ) {
397
-				foreach( $template_fields['extra'] as $main_field => $secondary_field ) {
398
-					foreach ( $secondary_field as $name => $values ) {
399
-						if ( $name == $field ) {
396
+			if (isset($template_fields['extra']) && (empty($field_label)) || $field_label == $field) {
397
+				foreach ($template_fields['extra'] as $main_field => $secondary_field) {
398
+					foreach ($secondary_field as $name => $values) {
399
+						if ($name == $field) {
400 400
 							$field_label = $values['label'];
401 401
 						}
402 402
 
403 403
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
404 404
 						// which means it contains the label for this field.
405
-						if ( $name == 'main' && $main_field == $field_label )
405
+						if ($name == 'main' && $main_field == $field_label)
406 406
 							$field_label = $values['label'];
407 407
 					}
408 408
 				}
@@ -410,36 +410,36 @@  discard block
 block discarded – undo
410 410
 
411 411
 			//field is present. Let's validate shortcodes first (but only if shortcodes present).
412 412
 			if (
413
-				isset( $this->_validators[ $field ][ 'shortcodes' ] )
414
-				&& ! empty( $this->_validators[ $field ][ 'shortcodes' ] )
413
+				isset($this->_validators[$field]['shortcodes'])
414
+				&& ! empty($this->_validators[$field]['shortcodes'])
415 415
 			) {
416
-				$invalid_shortcodes = $this->_invalid_shortcodes( $value, $this->_validators[$field]['shortcodes'] );
416
+				$invalid_shortcodes = $this->_invalid_shortcodes($value, $this->_validators[$field]['shortcodes']);
417 417
 				// if true then that means there is a returned error message
418 418
 				// that we'll need to add to the _errors array for this field.
419
-				if ( $invalid_shortcodes ) {
419
+				if ($invalid_shortcodes) {
420 420
 					$v_s = array_keys($this->_validators[$field]['shortcodes']);
421 421
 					$err_msg = sprintf(
422 422
 						__(
423 423
 							'%3$sThe following shortcodes were found in the "%1$s" field that ARE not valid: %2$s%4$s',
424 424
 							'event_espresso'
425 425
 						),
426
-						'<strong>' . $field_label . '</strong>',
426
+						'<strong>'.$field_label.'</strong>',
427 427
 						$invalid_shortcodes,
428 428
 						'<p>',
429 429
 						'</p >'
430 430
 					);
431 431
 					$err_msg .= sprintf(
432
-						__( '%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso' ),
433
-						implode( ', ', $v_s )
432
+						__('%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso'),
433
+						implode(', ', $v_s)
434 434
 					);
435 435
 				}
436 436
 			}
437 437
 
438 438
 			//if there's a "type" to be validated then let's do that too.
439
-			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
440
-				switch ( $this->_validators[$field]['type'] ) {
439
+			if (isset($this->_validators[$field]['type']) && ! empty($this->_validators[$field]['type'])) {
440
+				switch ($this->_validators[$field]['type']) {
441 441
 					case 'number' :
442
-						if ( !is_numeric($value) )
442
+						if ( ! is_numeric($value))
443 443
 							$err_msg .= sprintf(
444 444
 								__(
445 445
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 						break;
454 454
 					case 'email' :
455 455
 						$valid_email = $this->_validate_email($value);
456
-						if ( !$valid_email )
456
+						if ( ! $valid_email)
457 457
 							$err_msg .= htmlentities(
458 458
 								sprintf(
459 459
 									__(
@@ -470,23 +470,23 @@  discard block
 block discarded – undo
470 470
 			}
471 471
 
472 472
 			//if $err_msg isn't empty let's setup the _errors array for this field.
473
-			if ( !empty($err_msg ) ) {
473
+			if ( ! empty($err_msg)) {
474 474
 				$this->_errors[$field]['msg'] = $err_msg;
475 475
 			} else {
476
-				unset( $this->_errors[$field] );
476
+				unset($this->_errors[$field]);
477 477
 			}
478 478
 		}
479 479
 
480 480
 		// if we have ANY errors, then we want to make sure we return the values
481 481
 		// for ALL the fields so the user doesn't have to retype them all.
482
-		if ( !empty( $this->_errors ) ) {
483
-			foreach ( $this->_fields as $field => $value ) {
482
+		if ( ! empty($this->_errors)) {
483
+			foreach ($this->_fields as $field => $value) {
484 484
 				$this->_errors[$field]['value'] = stripslashes($value);
485 485
 			}
486 486
 		}
487 487
 
488 488
 		//return any errors or just TRUE if everything validates
489
-		return empty( $this->_errors ) ? TRUE : $this->_errors;
489
+		return empty($this->_errors) ? TRUE : $this->_errors;
490 490
 	}
491 491
 
492 492
 
@@ -499,10 +499,10 @@  discard block
 block discarded – undo
499 499
 	 * @param  array $codes_from_objs All the codes available.
500 500
 	 * @return array                   an array of actual shortcodes (that will be used for validation).
501 501
 	 */
502
-	private function _reassemble_valid_shortcodes_from_group( $groups, $codes_from_objs ) {
502
+	private function _reassemble_valid_shortcodes_from_group($groups, $codes_from_objs) {
503 503
 		$shortcodes = array();
504
-		foreach ( $groups as $group ) {
505
-			$shortcodes = array_merge( $shortcodes, $codes_from_objs[$group] );
504
+		foreach ($groups as $group) {
505
+			$shortcodes = array_merge($shortcodes, $codes_from_objs[$group]);
506 506
 		}
507 507
 		return $shortcodes;
508 508
 	}
@@ -521,29 +521,29 @@  discard block
 block discarded – undo
521 521
 	 */
522 522
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
523 523
 		//first we need to go through the string and get the shortcodes in the string
524
-		preg_match_all( '/(\[.+?\])/', $value, $matches );
524
+		preg_match_all('/(\[.+?\])/', $value, $matches);
525 525
 		$incoming_shortcodes = (array) $matches[0];
526 526
 
527 527
 		//get a diff of the shortcodes in the string vs the valid shortcodes
528
-		$diff = array_diff( $incoming_shortcodes, array_keys($valid_shortcodes) );
528
+		$diff = array_diff($incoming_shortcodes, array_keys($valid_shortcodes));
529 529
 
530 530
 		//we need to account for custom codes so let's loop through the diff and remove any of those type of codes
531
-		foreach ( $diff as $ind => $code ) {
532
-			if ( preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code ) ) {
531
+		foreach ($diff as $ind => $code) {
532
+			if (preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code)) {
533 533
 				//strip the shortcode so we just have the BASE string (i.e. [ANSWER_*] )
534 534
 				$dynamic_sc = preg_replace('/(_\*+.+)/', '_*]', $code);
535 535
 				//does this exist in the $valid_shortcodes?  If so then unset.
536
-				if ( isset( $valid_shortcodes[$dynamic_sc] ) ) {
537
-					unset( $diff[$ind] );
536
+				if (isset($valid_shortcodes[$dynamic_sc])) {
537
+					unset($diff[$ind]);
538 538
 				}
539 539
 			}
540 540
 		}
541 541
 
542
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
542
+		if (empty($diff)) return FALSE; //there is no diff, we have no invalid shortcodes, so return
543 543
 
544 544
 		//made it here? then let's assemble the error message
545
-		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
546
-		$invalid_shortcodes = '<strong>' . $invalid_shortcodes . '</strong>';
545
+		$invalid_shortcodes = implode('</strong>,<strong>', $diff);
546
+		$invalid_shortcodes = '<strong>'.$invalid_shortcodes.'</strong>';
547 547
 		return $invalid_shortcodes;
548 548
 	}
549 549
 
@@ -555,13 +555,13 @@  discard block
 block discarded – undo
555 555
 	 * @param  string $value incoming value to validate
556 556
 	 * @return bool        true if the string validates, false if it doesn't
557 557
 	 */
558
-	protected function _validate_email( $value ) {
558
+	protected function _validate_email($value) {
559 559
 		$validate = TRUE;
560 560
 		$or_val = $value;
561 561
 
562 562
 		// empty strings will validate because this is how a message template
563 563
 		// for a particular context can be "turned off" (if there is no email then no message)
564
-		if ( empty( $value ) )
564
+		if (empty($value))
565 565
 			return $validate;
566 566
 
567 567
 		// first determine if there ARE any shortcodes.
@@ -579,19 +579,19 @@  discard block
 block discarded – undo
579 579
 		// its possible that this message is being "turned off" for a particular context
580 580
 
581 581
 
582
-		if ( !empty($or_val) && empty($value) )
582
+		if ( ! empty($or_val) && empty($value))
583 583
 			return $validate;
584 584
 
585 585
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
586
-		$value = trim( trim($value), ',' );
586
+		$value = trim(trim($value), ',');
587 587
 
588 588
 
589 589
 		//next we need to split up the string if its comma delimited.
590 590
 		$emails = explode(',', $value);
591 591
 		$empty = FALSE; //used to indicate that there is an empty comma.
592 592
 		//now let's loop through the emails and do our checks
593
-		foreach ( $emails as $email ) {
594
-			if ( empty($email) ) {
593
+		foreach ($emails as $email) {
594
+			if (empty($email)) {
595 595
 				$empty = TRUE;
596 596
 				continue;
597 597
 			}
@@ -599,20 +599,20 @@  discard block
 block discarded – undo
599 599
 			//trim whitespace
600 600
 			$email = trim($email);
601 601
 			//either its of type "[email protected]", or its of type "fname lname <[email protected]>"
602
-			if(is_email($email)){
602
+			if (is_email($email)) {
603 603
 				continue;
604
-			}else{
604
+			} else {
605 605
 				$matches = array();
606
-				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
607
-				if( $validate && is_email($matches[2])){
606
+				$validate = preg_match('/(.*)<(.+)>/', $email, $matches) ? TRUE : FALSE;
607
+				if ($validate && is_email($matches[2])) {
608 608
 					continue;
609
-				}else{
609
+				} else {
610 610
 					return false;
611 611
 				}
612 612
 			}
613 613
 		}
614 614
 
615
-		$validate = $empty && !$has_shortcodes ? FALSE : $validate;
615
+		$validate = $empty && ! $has_shortcodes ? FALSE : $validate;
616 616
 
617 617
 		return $validate;
618 618
 
Please login to merge, or discard this patch.
Braces   +43 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
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_Messages_Validator class
@@ -121,13 +122,14 @@  discard block
 block discarded – undo
121 122
 	 */
122 123
 	public function __construct( $fields, $context ) {
123 124
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
124
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
125
-			throw new EE_Error(
125
+		if ( empty($this->_m_name ) || empty( $this->_mt_name) ) {
126
+					throw new EE_Error(
126 127
 				__(
127 128
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
128 129
 					'event_espresso'
129 130
 				)
130 131
 			);
132
+		}
131 133
 		$this->_fields = $fields;
132 134
 		$this->_context = $context;
133 135
 
@@ -228,8 +230,10 @@  discard block
 block discarded – undo
228 230
 		$groups_per_field = array();
229 231
 
230 232
 		foreach ( $msgr_validator as $field => $config ) {
231
-			if ( empty($config) || !isset($config['shortcodes']) )
232
-				continue;  //Nothing to see here.
233
+			if ( empty($config) || !isset($config['shortcodes']) ) {
234
+							continue;
235
+			}
236
+			//Nothing to see here.
233 237
 			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
234 238
 			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
235 239
 		}
@@ -268,8 +272,9 @@  discard block
 block discarded – undo
268 272
 			$required = isset($config['required'])
269 273
 				? array_intersect($config['required'], array_keys($mt_codes))
270 274
 				: true;
271
-			if ( empty($required) )
272
-				continue;
275
+			if ( empty($required) ) {
276
+							continue;
277
+			}
273 278
 
274 279
 			//If we have an override then we use it to indicate the codes we want.
275 280
 			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
@@ -310,8 +315,9 @@  discard block
 block discarded – undo
310 315
 			$specific_excludes = $this->get_specific_shortcode_excludes();
311 316
 			if ( isset( $specific_excludes[$field] ) ) {
312 317
 				foreach( $specific_excludes[$field] as $sex ) {
313
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
314
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
318
+					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) ) {
319
+											unset( $this->_validators[$field]['shortcodes'][$sex] );
320
+					}
315 321
 				}
316 322
 			}
317 323
 
@@ -385,10 +391,13 @@  discard block
 block discarded – undo
385 391
 			//get the translated field label!
386 392
 			//first check if it's in the main fields list
387 393
 			if ( isset( $template_fields[$field] ) ) {
388
-				if ( empty( $template_fields[$field] ) )
389
-					$field_label = $field; //most likely the field is found in the 'extra' array.
390
-				else
391
-					$field_label = $template_fields[$field]['label'];
394
+				if ( empty( $template_fields[$field] ) ) {
395
+									$field_label = $field;
396
+				}
397
+				//most likely the field is found in the 'extra' array.
398
+				else {
399
+									$field_label = $template_fields[$field]['label'];
400
+				}
392 401
 			}
393 402
 
394 403
 			// if field label is empty OR is equal to the current field
@@ -402,8 +411,9 @@  discard block
 block discarded – undo
402 411
 
403 412
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
404 413
 						// which means it contains the label for this field.
405
-						if ( $name == 'main' && $main_field == $field_label )
406
-							$field_label = $values['label'];
414
+						if ( $name == 'main' && $main_field == $field_label ) {
415
+													$field_label = $values['label'];
416
+						}
407 417
 					}
408 418
 				}
409 419
 			}
@@ -439,8 +449,8 @@  discard block
 block discarded – undo
439 449
 			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
440 450
 				switch ( $this->_validators[$field]['type'] ) {
441 451
 					case 'number' :
442
-						if ( !is_numeric($value) )
443
-							$err_msg .= sprintf(
452
+						if ( !is_numeric($value) ) {
453
+													$err_msg .= sprintf(
444 454
 								__(
445 455
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
446 456
 									'event_espresso'
@@ -450,11 +460,12 @@  discard block
 block discarded – undo
450 460
 								'<p>',
451 461
 								'</p >'
452 462
 							);
463
+						}
453 464
 						break;
454 465
 					case 'email' :
455 466
 						$valid_email = $this->_validate_email($value);
456
-						if ( !$valid_email )
457
-							$err_msg .= htmlentities(
467
+						if ( !$valid_email ) {
468
+													$err_msg .= htmlentities(
458 469
 								sprintf(
459 470
 									__(
460 471
 										'The %1$s field has at least one string that is not a valid email address record.  Valid emails are in the format: "Name <[email protected]>" or "[email protected]" and multiple emails can be separated by a comma.'
@@ -463,6 +474,7 @@  discard block
 block discarded – undo
463 474
 
464 475
 								)
465 476
 							);
477
+						}
466 478
 						break;
467 479
 					default :
468 480
 						break;
@@ -539,7 +551,10 @@  discard block
 block discarded – undo
539 551
 			}
540 552
 		}
541 553
 
542
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
554
+		if ( empty( $diff ) ) {
555
+			return FALSE;
556
+		}
557
+		//there is no diff, we have no invalid shortcodes, so return
543 558
 
544 559
 		//made it here? then let's assemble the error message
545 560
 		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
@@ -561,8 +576,9 @@  discard block
 block discarded – undo
561 576
 
562 577
 		// empty strings will validate because this is how a message template
563 578
 		// for a particular context can be "turned off" (if there is no email then no message)
564
-		if ( empty( $value ) )
565
-			return $validate;
579
+		if ( empty( $value ) ) {
580
+					return $validate;
581
+		}
566 582
 
567 583
 		// first determine if there ARE any shortcodes.
568 584
 		// If there are shortcodes and then later we find that there were no other valid emails
@@ -579,8 +595,9 @@  discard block
 block discarded – undo
579 595
 		// its possible that this message is being "turned off" for a particular context
580 596
 
581 597
 
582
-		if ( !empty($or_val) && empty($value) )
583
-			return $validate;
598
+		if ( !empty($or_val) && empty($value) ) {
599
+					return $validate;
600
+		}
584 601
 
585 602
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
586 603
 		$value = trim( trim($value), ',' );
@@ -601,12 +618,12 @@  discard block
 block discarded – undo
601 618
 			//either its of type "[email protected]", or its of type "fname lname <[email protected]>"
602 619
 			if(is_email($email)){
603 620
 				continue;
604
-			}else{
621
+			} else{
605 622
 				$matches = array();
606 623
 				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
607 624
 				if( $validate && is_email($matches[2])){
608 625
 					continue;
609
-				}else{
626
+				} else{
610 627
 					return false;
611 628
 				}
612 629
 			}
Please login to merge, or discard this patch.
core/libraries/payment_methods/EE_Gateway.lib.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@
 block discarded – undo
208 208
 
209 209
 	/**
210 210
 	 * @param $message
211
-	 * @param $payment
211
+	 * @param EEI_Payment $payment
212 212
 	 */
213 213
 	public function log($message,$payment){
214 214
 		if($payment instanceof EEI_Payment){
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
  * needed helpers and models (see all the methods starting with "set_", eg seg_line_item_helper which should be passed an object
31 31
  * which implements EEHI_Line_Item_Helper; etc).
32 32
  */
33
-abstract class EE_Gateway{
33
+abstract class EE_Gateway {
34 34
 	/**
35 35
 	 * a constant used as a possible value for $_currencies_supported to indicate
36 36
 	 * that ALL currencies are supported by this gateway
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	/**
109 109
 	 * @return EE_Gateway
110 110
 	 */
111
-	public function __construct(){
111
+	public function __construct() {
112 112
 	}
113 113
 
114 114
 	/**
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
 	 * beginning again)
121 121
 	 * @return array
122 122
 	 */
123
-	public function __sleep(){
123
+	public function __sleep() {
124 124
 		$properties = get_object_vars($this);
125
-		unset( $properties[ '_pay_model' ] );
126
-		unset( $properties[ '_pay_log' ] );
125
+		unset($properties['_pay_model']);
126
+		unset($properties['_pay_log']);
127 127
 		return array_keys($properties);
128 128
 	}
129 129
 	/**
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * see $_supports_sending_refunds
132 132
 	 * @return boolean
133 133
 	 */
134
-	public function supports_sending_refunds(){
134
+	public function supports_sending_refunds() {
135 135
 		return $this->_supports_sending_refunds;
136 136
 	}
137 137
 	/**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 * see $_supports_receiving_refunds
140 140
 	 * @return boolean
141 141
 	 */
142
-	public function supports_receiving_refunds(){
142
+	public function supports_receiving_refunds() {
143 143
 		return $this->_supports_receiving_refunds;
144 144
 	}
145 145
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 * @return EE_Payment for the refund
155 155
 	 * @throws EE_Error
156 156
 	 */
157
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
157
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
158 158
 		return NULL;
159 159
 	}
160 160
 
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 	 * etc
166 166
 	 * @param array $settings_array
167 167
 	 */
168
-	public function set_settings($settings_array){
169
-		foreach($settings_array as $name => $value){
168
+	public function set_settings($settings_array) {
169
+		foreach ($settings_array as $name => $value) {
170 170
 			$property_name = "_".$name;
171 171
 			$this->$property_name = $value;
172 172
 		}
@@ -175,14 +175,14 @@  discard block
 block discarded – undo
175 175
 	 * See this class description
176 176
 	 * @param EEMI_Payment $payment_model
177 177
 	 */
178
-	public function set_payment_model($payment_model){
178
+	public function set_payment_model($payment_model) {
179 179
 		$this->_pay_model = $payment_model;
180 180
 	}
181 181
 	/**
182 182
 	 * See this class description
183 183
 	 * @param EEMI_Payment_Log $payment_log_model
184 184
 	 */
185
-	public function set_payment_log($payment_log_model){
185
+	public function set_payment_log($payment_log_model) {
186 186
 		$this->_pay_log = $payment_log_model;
187 187
 	}
188 188
 
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	 * See this class description
191 191
 	 * @param EEHI_Template $template_helper
192 192
 	 */
193
-	public function set_template_helper($template_helper){
193
+	public function set_template_helper($template_helper) {
194 194
 		$this->_template = $template_helper;
195 195
 	}
196 196
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * See this class description
199 199
 	 * @param EEHI_Line_Item $line_item_helper
200 200
 	 */
201
-	public function set_line_item_helper( $line_item_helper ){
201
+	public function set_line_item_helper($line_item_helper) {
202 202
 		$this->_line_item = $line_item_helper;
203 203
 	}
204 204
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 * See this class description
207 207
 	 * @param EEHI_Money $money_helper
208 208
 	 */
209
-	public function set_money_helper( $money_helper ){
209
+	public function set_money_helper($money_helper) {
210 210
 		$this->_money = $money_helper;
211 211
 	}
212 212
 
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 	 * @param $message
216 216
 	 * @param $payment
217 217
 	 */
218
-	public function log($message,$payment){
219
-		if($payment instanceof EEI_Payment){
220
-			$type='Payment';
218
+	public function log($message, $payment) {
219
+		if ($payment instanceof EEI_Payment) {
220
+			$type = 'Payment';
221 221
 			$id = $payment->ID();
222
-		}else{
222
+		} else {
223 223
 			$type = 'Payment_Method';
224 224
 			$id = $this->_ID;
225 225
 		}
226
-		$this->_pay_log->gateway_log($message,$id,$type);
226
+		$this->_pay_log->gateway_log($message, $id, $type);
227 227
 	}
228 228
 	/**
229 229
 	 * Formats the amount so it can generally be sent to gateways
230 230
 	 * @param float $amount
231 231
 	 * @return string
232 232
 	 */
233
-	public function format_currency($amount){
234
-		return number_format( $amount, 2, '.', '' );
233
+	public function format_currency($amount) {
234
+		return number_format($amount, 2, '.', '');
235 235
 //		return $this->_template->format_currency($amount, true);
236 236
 	}
237 237
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
241 241
 	 * @return mixed array or string
242 242
 	 */
243
-	public function currencies_supported(){
243
+	public function currencies_supported() {
244 244
 		return $this->_currencies_supported;
245 245
 	}
246 246
 
@@ -252,14 +252,14 @@  discard block
 block discarded – undo
252 252
 	 * @param EE_Transaction  $transaction
253 253
 	 * @return float
254 254
 	 */
255
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
255
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
256 256
 		$total_line_item = $transaction->total_line_item();
257 257
 		$total = 0;
258
-		foreach($total_line_item->get_items() as $item_line_item ){
259
-			$total += max( $item_line_item->total(), 0 );
258
+		foreach ($total_line_item->get_items() as $item_line_item) {
259
+			$total += max($item_line_item->total(), 0);
260 260
 		}
261
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
262
-			$total += max( $tax_line_item->total(), 0 );
261
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
262
+			$total += max($tax_line_item->total(), 0);
263 263
 		}
264 264
 		return $total;
265 265
 	}
@@ -270,9 +270,9 @@  discard block
 block discarded – undo
270 270
 	 * @param EEI_Payment $payment
271 271
 	 * @return boolean
272 272
 	 */
273
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
273
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
274 274
 		return  $this->_money->compare_floats(
275
-					$this->_sum_items_and_taxes( $payment->transaction() ),
275
+					$this->_sum_items_and_taxes($payment->transaction()),
276 276
 					$payment->transaction()->total() ) &&
277 277
 				$this->_money->compare_floats(
278 278
 					$payment->amount(),
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	 * @param EE_Payment $payment
291 291
 	 * @return void
292 292
 	 */
293
-	public function update_txn_based_on_payment( $payment ){
293
+	public function update_txn_based_on_payment($payment) {
294 294
 		//maybe update the transaction or line items or registrations
295 295
 		//but most gateways don't need to do this, because they only update the payment
296 296
 	}
Please login to merge, or discard this patch.
core/libraries/payment_methods/EE_PMT_Base.lib.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@
 block discarded – undo
266 266
 	 *
267 267
 	 * @param \EE_Transaction $transaction
268 268
 	 * @param array $extra_args
269
-	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
269
+	 * @return EE_Billing_Info_Form
270 270
 	 */
271 271
 	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
272 272
 		// has billing form already been regenerated ? or overwrite cache?
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -3,17 +3,17 @@
 block discarded – undo
3 3
 EE_Registry::instance()->load_lib('Onsite_Gateway');
4 4
 EE_Registry::instance()->load_lib('Offsite_Gateway');
5 5
 /**
6
- *
7
- * Class EE_PMT_Base
8
- *
9
- * Description
10
- *
11
- * @package 			Event Espresso
12
- * @subpackage 	core
13
- * @author 				Mike Nelson
14
- * @since 				$VID:$
15
- *
16
- */
6
+	 *
7
+	 * Class EE_PMT_Base
8
+	 *
9
+	 * Description
10
+	 *
11
+	 * @package 			Event Espresso
12
+	 * @subpackage 	core
13
+	 * @author 				Mike Nelson
14
+	 * @since 				$VID:$
15
+	 *
16
+	 */
17 17
 abstract class EE_PMT_Base{
18 18
 
19 19
 	const onsite = 'on-site';
Please login to merge, or discard this patch.
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @since 				$VID:$
15 15
  *
16 16
  */
17
-abstract class EE_PMT_Base{
17
+abstract class EE_PMT_Base {
18 18
 
19 19
 	const onsite = 'on-site';
20 20
 	const offsite = 'off-site';
@@ -95,36 +95,36 @@  discard block
 block discarded – undo
95 95
 	 * @return EE_PMT_Base
96 96
 	 */
97 97
 	function __construct($pm_instance = NULL) {
98
-		if ( $pm_instance instanceof EE_Payment_Method ){
98
+		if ($pm_instance instanceof EE_Payment_Method) {
99 99
 			$this->set_instance($pm_instance);
100 100
 		}
101 101
 		$this->_set_file_folder();
102 102
 		$this->_set_file_url();
103
-		if($this->_gateway){
104
-			$this->_gateway->set_payment_model( EEM_Payment::instance() );
105
-			$this->_gateway->set_payment_log( EEM_Change_Log::instance() );
106
-			EE_Registry::instance()->load_helper( 'Template' );
107
-			$this->_gateway->set_template_helper( new EEH_Template() );
108
-			EE_Registry::instance()->load_helper( 'Line_Item' );
109
-			$this->_gateway->set_line_item_helper( new EEH_Line_Item() );
110
-			EE_Registry::instance()->load_helper( 'Money' );
111
-			$this->_gateway->set_money_helper( new EEH_Money() );
103
+		if ($this->_gateway) {
104
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
105
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
106
+			EE_Registry::instance()->load_helper('Template');
107
+			$this->_gateway->set_template_helper(new EEH_Template());
108
+			EE_Registry::instance()->load_helper('Line_Item');
109
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
110
+			EE_Registry::instance()->load_helper('Money');
111
+			$this->_gateway->set_money_helper(new EEH_Money());
112 112
 		}
113
-		if ( ! isset( $this->_has_billing_form ) ) {
113
+		if ( ! isset($this->_has_billing_form)) {
114 114
 			// by default, On Site gateways have a billing form
115
-			if ( $this->payment_occurs() == EE_PMT_Base::onsite ) {
116
-				$this->set_has_billing_form( true );
115
+			if ($this->payment_occurs() == EE_PMT_Base::onsite) {
116
+				$this->set_has_billing_form(true);
117 117
 			} else {
118
-				$this->set_has_billing_form( false );
118
+				$this->set_has_billing_form(false);
119 119
 			}
120 120
 		}
121 121
 
122
-		if( ! $this->_pretty_name){
122
+		if ( ! $this->_pretty_name) {
123 123
 			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
124 124
 		}
125 125
 		//if the child didn't specify a default button, use the credit card one
126
-		if( $this->_default_button_url === NULL){
127
-			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
126
+		if ($this->_default_button_url === NULL) {
127
+			$this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
128 128
 		}
129 129
 	}
130 130
 
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 	/**
134 134
 	 * @param boolean $has_billing_form
135 135
 	 */
136
-	public function set_has_billing_form( $has_billing_form ) {
137
-		$this->_has_billing_form = filter_var( $has_billing_form, FILTER_VALIDATE_BOOLEAN );
136
+	public function set_has_billing_form($has_billing_form) {
137
+		$this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
138 138
 	}
139 139
 
140 140
 
@@ -142,10 +142,10 @@  discard block
 block discarded – undo
142 142
 	/**
143 143
 	 * sets the file_folder property
144 144
 	 */
145
-	protected function _set_file_folder(){
145
+	protected function _set_file_folder() {
146 146
 		$reflector = new ReflectionClass(get_class($this));
147 147
 		$fn = $reflector->getFileName();
148
-		$this->_file_folder =  dirname($fn).DS;
148
+		$this->_file_folder = dirname($fn).DS;
149 149
 	}
150 150
 
151 151
 
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	/**
154 154
 	 * sets the file URL with a trailing slash for this PMT
155 155
 	 */
156
-	protected function _set_file_url(){
157
-		$plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR);
158
-		$file_folder_fixed = str_replace('\\',DS,$this->file_folder());
159
-		$file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed);
156
+	protected function _set_file_url() {
157
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
158
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
159
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
160 160
 		$this->_file_url = $file_path;
161 161
 	}
162 162
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * Gets the default description on all payment methods of this type
165 165
 	 * @return string
166 166
 	 */
167
-	public function default_description(){
167
+	public function default_description() {
168 168
 		return $this->_default_description;
169 169
 	}
170 170
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 	 * Returns the folder containing the PMT child class, with a trailing slash
175 175
 	 * @return string
176 176
 	 */
177
-	public function file_folder(){
177
+	public function file_folder() {
178 178
 		return $this->_file_folder;
179 179
 	}
180 180
 
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	/**
184 184
 	 * @return string
185 185
 	 */
186
-	public function file_url(){
186
+	public function file_url() {
187 187
 		return $this->_file_url;
188 188
 	}
189 189
 
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
 	 * Its important teh payment method instance is set before
195 195
 	 * @param EE_Payment_Method $payment_method_instance
196 196
 	 */
197
-	function set_instance($payment_method_instance){
197
+	function set_instance($payment_method_instance) {
198 198
 		$this->_pm_instance = $payment_method_instance;
199 199
 		//if they have already requested the settings form, make sure its
200 200
 		//data matches this model object
201
-		if($this->_settings_form){
201
+		if ($this->_settings_form) {
202 202
 			$this->settings_form()->populate_model_obj($payment_method_instance);
203 203
 		}
204
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
204
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
205 205
 			$this->_gateway->set_settings($payment_method_instance->settings_array());
206 206
 		}
207 207
 	}
@@ -212,14 +212,14 @@  discard block
 block discarded – undo
212 212
 	 * Gets teh form for displaying to admins where they setup the payment method
213 213
 	 * @return EE_Payment_Method_Form
214 214
 	 */
215
-	function settings_form(){
216
-		if( ! $this->_settings_form){
215
+	function settings_form() {
216
+		if ( ! $this->_settings_form) {
217 217
 			$this->_settings_form = $this->generate_new_settings_form();
218
-			$this->_settings_form->set_payment_method_type( $this );
219
-			$this->_settings_form->_construct_finalize(NULL, NULL );
218
+			$this->_settings_form->set_payment_method_type($this);
219
+			$this->_settings_form->_construct_finalize(NULL, NULL);
220 220
 			//if we have already assigned a model object to this pmt, make
221 221
 			//sure its reflected in teh form we just generated
222
-			if($this->_pm_instance){
222
+			if ($this->_pm_instance) {
223 223
 				$this->_settings_form->populate_model_obj($this->_pm_instance);
224 224
 			}
225 225
 		}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 	 * this payment method type's settings form later in the request
246 246
 	 * @param EE_Payment_Method_Form $form
247 247
 	 */
248
-	public function set_settings_form($form){
248
+	public function set_settings_form($form) {
249 249
 		$this->_settings_form = $form;
250 250
 	}
251 251
 
@@ -268,10 +268,10 @@  discard block
 block discarded – undo
268 268
 	 * @param array $extra_args
269 269
 	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
270 270
 	 */
271
-	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
271
+	public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array()) {
272 272
 		// has billing form already been regenerated ? or overwrite cache?
273
-		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form ){
274
-			$this->_billing_form = $this->generate_new_billing_form( $transaction, $extra_args );
273
+		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) {
274
+			$this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
275 275
 		}
276 276
 		//if we know who the attendee is, and this is a billing form
277 277
 		//that uses attendee info, populate it
@@ -280,8 +280,8 @@  discard block
 block discarded – undo
280 280
 			$transaction instanceof EE_Transaction &&
281 281
 			$transaction->primary_registration() instanceof EE_Registration &&
282 282
 			$transaction->primary_registration()->attendee() instanceof EE_Attendee
283
-		){
284
-			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
283
+		) {
284
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
285 285
 		}
286 286
 		return $this->_billing_form;
287 287
 	}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 	 * @param \EE_Transaction $transaction
293 293
 	 * @return \EE_Billing_Info_Form
294 294
 	 */
295
-	abstract function generate_new_billing_form( EE_Transaction $transaction = NULL );
295
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
296 296
 
297 297
 
298 298
 
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 	 * @param \EE_Billing_Info_Form $billing_form
304 304
 	 * @return \EE_Billing_Info_Form
305 305
 	 */
306
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
306
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
307 307
 		return $billing_form;
308 308
 	}
309 309
 
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 	 * if you have form
315 315
 	 * @param EE_Payment_Method $form
316 316
 	 */
317
-	public function set_billing_form($form){
317
+	public function set_billing_form($form) {
318 318
 		$this->_billing_form = $form;
319 319
 	}
320 320
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	 * Returns whether or not this payment method requires HTTPS to be used
325 325
 	 * @return boolean
326 326
 	 */
327
-	function requires_https(){
327
+	function requires_https() {
328 328
 		return $this->_requires_https;
329 329
 	}
330 330
 
@@ -342,9 +342,9 @@  discard block
 block discarded – undo
342 342
 	 * @return EE_Payment
343 343
 	 * @throws EE_Error
344 344
 	 */
345
-	function process_payment( EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null,$fail_url = '', $method = 'CART', $by_admin = false ){
345
+	function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false) {
346 346
 		// @todo: add surcharge for the payment method, if any
347
-		if ( $this->_gateway ) {
347
+		if ($this->_gateway) {
348 348
 			//there is a gateway, so we're going to make a payment object
349 349
 			//but wait! do they already have a payment in progress that we thought was failed?
350 350
 			$duplicate_properties = array(
@@ -355,10 +355,10 @@  discard block
 block discarded – undo
355 355
 				'PAY_amount' 					=> $amount !== null ? $amount : $transaction->remaining(),
356 356
 				'PAY_gateway_response' 	=> null,
357 357
 			);
358
-			$payment = EEM_Payment::instance()->get_one( array( $duplicate_properties ));
358
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
359 359
 			//if we didn't already have a payment in progress for the same thing,
360 360
 			//then we actually want to make a new payment
361
-			if ( ! $payment instanceof EE_Payment ){
361
+			if ( ! $payment instanceof EE_Payment) {
362 362
 				$payment = EE_Payment::new_instance(
363 363
 					array_merge(
364 364
 						$duplicate_properties,
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
374 374
 			}
375 375
 			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
376 376
 			$payment->save();
377
-			$billing_values = $this->_get_billing_values_from_form( $billing_info );
377
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
378 378
 
379 379
 			//  Offsite Gateway
380
-			if( $this->_gateway instanceof EE_Offsite_Gateway ){
380
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
381 381
 
382 382
 				$payment = $this->_gateway->set_redirection_info(
383 383
 					$payment,
@@ -393,17 +393,17 @@  discard block
 block discarded – undo
393 393
 				);
394 394
 				$payment->save();
395 395
 			//  Onsite Gateway
396
-			} elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) {
396
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
397 397
 
398
-				$payment = $this->_gateway->do_direct_payment($payment,$billing_values);
398
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
399 399
 				$payment->save();
400 400
 
401 401
 			} else {
402 402
 				throw new EE_Error(
403 403
 					sprintf(
404
-						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso' ),
404
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
405 405
 						get_class($this),
406
-						gettype( $this->_gateway )
406
+						gettype($this->_gateway)
407 407
 					)
408 408
 				);
409 409
 			}
@@ -425,8 +425,8 @@  discard block
 block discarded – undo
425 425
 		}
426 426
 
427 427
 		// if there is billing info, clean it and save it now
428
-		if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){
429
-			$this->_save_billing_info_to_attendee( $billing_info, $transaction );
428
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
429
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
430 430
 		}
431 431
 
432 432
 		return $payment;
@@ -439,10 +439,10 @@  discard block
 block discarded – undo
439 439
 	 * @param EE_Billing_Info_Form $billing_form
440 440
 	 * @return array
441 441
 	 */
442
-	protected function _get_billing_values_from_form( $billing_form ){
443
-		if($billing_form instanceof EE_Form_Section_Proper ){
444
-			return $billing_form->input_pretty_values( true );
445
-		}else{
442
+	protected function _get_billing_values_from_form($billing_form) {
443
+		if ($billing_form instanceof EE_Form_Section_Proper) {
444
+			return $billing_form->input_pretty_values(true);
445
+		} else {
446 446
 			return NULL;
447 447
 		}
448 448
 	}
@@ -456,13 +456,13 @@  discard block
 block discarded – undo
456 456
 	 * @return EE_Payment
457 457
 	 * @throws EE_Error
458 458
 	 */
459
-	public function handle_ipn($req_data,$transaction){
459
+	public function handle_ipn($req_data, $transaction) {
460 460
 		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
461
-		if( ! $this->_gateway instanceof EE_Offsite_Gateway){
462
-			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE )));
461
+		if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
462
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
463 463
 
464 464
 		}
465
-		$payment = $this->_gateway->handle_payment_update( $req_data, $transaction );
465
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
466 466
 		return $payment;
467 467
 	}
468 468
 
@@ -475,22 +475,22 @@  discard block
 block discarded – undo
475 475
 	 * @param EE_Transaction $transaction
476 476
 	 * @return boolean success
477 477
 	 */
478
-	protected function _save_billing_info_to_attendee($billing_form, $transaction){
479
-		if( ! $transaction || ! $transaction instanceof EE_Transaction){
478
+	protected function _save_billing_info_to_attendee($billing_form, $transaction) {
479
+		if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
480 480
 			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
481 481
 			return false;
482 482
 		}
483 483
 		$primary_reg = $transaction->primary_registration();
484
-		if( ! $primary_reg ){
484
+		if ( ! $primary_reg) {
485 485
 			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
486 486
 			return false;
487 487
 		}
488 488
 		$attendee = $primary_reg->attendee();
489
-		if( ! $attendee ){
489
+		if ( ! $attendee) {
490 490
 			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
491 491
 			return false;
492 492
 		}
493
-		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() );
493
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
494 494
 
495 495
 	}
496 496
 
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
 	 * @param array $req_data
504 504
 	 * @return EE_Payment
505 505
 	 */
506
-	protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){
506
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) {
507 507
 		return $transaction->last_payment();
508 508
 	}
509 509
 
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
520 520
 	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
521 521
 	 * @throws EE_Error
522 522
 	 */
523
-	public function handle_unclaimed_ipn( $req_data = array() ){
524
-		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) ));
523
+	public function handle_unclaimed_ipn($req_data = array()) {
524
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
525 525
 	}
526 526
 
527 527
 
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 	 * @param EE_Transaction $transaction
538 538
 	 * @return EE_Payment
539 539
 	 */
540
-	public function finalize_payment_for($transaction){
540
+	public function finalize_payment_for($transaction) {
541 541
 		return $transaction->last_payment();
542 542
 	}
543 543
 
@@ -547,10 +547,10 @@  discard block
 block discarded – undo
547 547
 	 * Whether or not this payment method's gateway supports sending refund requests
548 548
 	 * @return boolean
549 549
 	 */
550
-	public function supports_sending_refunds(){
551
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
550
+	public function supports_sending_refunds() {
551
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
552 552
 			return $this->_gateway->supports_sending_refunds();
553
-		}else{
553
+		} else {
554 554
 			return false;
555 555
 		}
556 556
 	}
@@ -564,14 +564,14 @@  discard block
 block discarded – undo
564 564
 	 * @throws EE_Error
565 565
 	 * @return EE_Payment
566 566
 	 */
567
-	public function process_refund( EE_Payment $payment, $refund_info = array()){
568
-		if ( $this->_gateway && $this->_gateway instanceof EE_Gateway ) {
569
-			return $this->_gateway->do_direct_refund( $payment, $refund_info );
567
+	public function process_refund(EE_Payment $payment, $refund_info = array()) {
568
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
569
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
570 570
 		} else {
571 571
 			throw new EE_Error(
572 572
 				sprintf(
573
-					__( 'Payment Method Type "%s" does not support sending refund requests', 'event_espresso' ),
574
-					get_class( $this )
573
+					__('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
574
+					get_class($this)
575 575
 				)
576 576
 			);
577 577
 		}
@@ -585,15 +585,15 @@  discard block
 block discarded – undo
585 585
 	 * @return string
586 586
 	 * @throws EE_Error
587 587
 	 */
588
-	public function payment_occurs(){
589
-		if( ! $this->_gateway){
588
+	public function payment_occurs() {
589
+		if ( ! $this->_gateway) {
590 590
 			return EE_PMT_Base::offline;
591
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
591
+		}elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
592 592
 			return EE_PMT_Base::onsite;
593
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
593
+		}elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
594 594
 			return EE_PMT_Base::offsite;
595
-		}else{
596
-			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
595
+		} else {
596
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
597 597
 		}
598 598
 	}
599 599
 
@@ -606,9 +606,9 @@  discard block
 block discarded – undo
606 606
 	 * @param EE_Payment $payment
607 607
 	 * @return string
608 608
 	 */
609
-	public function payment_overview_content(EE_Payment $payment){
609
+	public function payment_overview_content(EE_Payment $payment) {
610 610
 		EE_Registry::instance()->load_helper('Template');
611
-		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true);
611
+		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true);
612 612
 	}
613 613
 
614 614
 
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 	/**
617 617
 	 * @return array exactly like EE_Admin_Page _page_config's 'help_tabs' attribute. @see EE_Admin_Page::_set_page_config()
618 618
 	 */
619
-	public function help_tabs_config(){
619
+	public function help_tabs_config() {
620 620
 		return array();
621 621
 	}
622 622
 
@@ -627,9 +627,9 @@  discard block
 block discarded – undo
627 627
 	 * the payment method's table's PMT_type column)
628 628
 	 * @return string
629 629
 	 */
630
-	public function system_name(){
630
+	public function system_name() {
631 631
 		$classname = get_class($this);
632
-		return str_replace("EE_PMT_",'',$classname);
632
+		return str_replace("EE_PMT_", '', $classname);
633 633
 	}
634 634
 
635 635
 
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 	 * A pretty i18n version of the PMT name
639 639
 	 * @return string
640 640
 	 */
641
-	public function pretty_name(){
641
+	public function pretty_name() {
642 642
 		return $this->_pretty_name;
643 643
 	}
644 644
 
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 	 * Gets the default absolute URL to the payment method type's button
649 649
 	 * @return string
650 650
 	 */
651
-	public function default_button_url(){
651
+	public function default_button_url() {
652 652
 		return $this->_default_button_url;
653 653
 	}
654 654
 
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 	 * Gets the gateway used by this payment method (if any)
659 659
 	 * @return EE_Gateway
660 660
 	 */
661
-	public function get_gateway(){
661
+	public function get_gateway() {
662 662
 		return $this->_gateway;
663 663
 	}
664 664
 
@@ -667,9 +667,9 @@  discard block
 block discarded – undo
667 667
 	/**
668 668
 	 * @return string html for the link to a help tab
669 669
 	 */
670
-	public function get_help_tab_link(){
671
-		EE_Registry::instance()->load_helper( 'Template' );
672
-		return EEH_Template::get_help_tab_link( $this->get_help_tab_name() );
670
+	public function get_help_tab_link() {
671
+		EE_Registry::instance()->load_helper('Template');
672
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
673 673
 	}
674 674
 
675 675
 
@@ -678,8 +678,8 @@  discard block
 block discarded – undo
678 678
 	 * Returns the name of the help tab for this PMT
679 679
 	 * @return string
680 680
 	 */
681
-	public function get_help_tab_name(){
682
-		return 'ee_' . strtolower( $this->system_name() ) . '_help_tab';
681
+	public function get_help_tab_name() {
682
+		return 'ee_'.strtolower($this->system_name()).'_help_tab';
683 683
 	}
684 684
 
685 685
 	/**
@@ -687,8 +687,8 @@  discard block
 block discarded – undo
687 687
 	 * this PMT by an admin
688 688
 	 * @return string
689 689
 	 */
690
-	public function cap_name(){
691
-		return 'ee_payment_method_' . strtolower( $this->system_name() );
690
+	public function cap_name() {
691
+		return 'ee_payment_method_'.strtolower($this->system_name());
692 692
 	}
693 693
 
694 694
 	/**
@@ -700,9 +700,9 @@  discard block
 block discarded – undo
700 700
 	 * @param EE_Payment $payment
701 701
 	 * @return void
702 702
 	 */
703
-	public function update_txn_based_on_payment( $payment ){
704
-		if( $this->_gateway instanceof EE_Gateway ){
705
-			$this->_gateway->update_txn_based_on_payment( $payment );
703
+	public function update_txn_based_on_payment($payment) {
704
+		if ($this->_gateway instanceof EE_Gateway) {
705
+			$this->_gateway->update_txn_based_on_payment($payment);
706 706
 		}
707 707
 	}
708 708
 
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 	protected function _get_billing_values_from_form( $billing_form ){
443 443
 		if($billing_form instanceof EE_Form_Section_Proper ){
444 444
 			return $billing_form->input_pretty_values( true );
445
-		}else{
445
+		} else{
446 446
 			return NULL;
447 447
 		}
448 448
 	}
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
 	public function supports_sending_refunds(){
551 551
 		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
552 552
 			return $this->_gateway->supports_sending_refunds();
553
-		}else{
553
+		} else{
554 554
 			return false;
555 555
 		}
556 556
 	}
@@ -588,11 +588,11 @@  discard block
 block discarded – undo
588 588
 	public function payment_occurs(){
589 589
 		if( ! $this->_gateway){
590 590
 			return EE_PMT_Base::offline;
591
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
591
+		} elseif($this->_gateway instanceof EE_Onsite_Gateway){
592 592
 			return EE_PMT_Base::onsite;
593
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
593
+		} elseif($this->_gateway instanceof EE_Offsite_Gateway){
594 594
 			return EE_PMT_Base::offsite;
595
-		}else{
595
+		} else{
596 596
 			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
597 597
 		}
598 598
 	}
Please login to merge, or discard this patch.
core/libraries/qtips/EE_Qtip_Config.lib.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@
 block discarded – undo
200 200
 	 * return the _qtips property contents
201 201
 	 *
202 202
 	 * @access public
203
-	 * @return EE_Qtip[]
203
+	 * @return EE_Qtip
204 204
 	 */
205 205
 	public function get_tips() {
206 206
 		return $this->_qtips;
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 				'event' => 'mouseleave', //similar as what you do for show.event.
143 143
 				'target' => false, //Options jQuery::#selector. which html element will trigger hide event. When false, the element the .qtip() method was called upon is used.
144 144
 				'delay' => 0, //set time in milliseconds for delaying the hide of the tooltip
145
-				'inactive' => false,  //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
145
+				'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
146 146
 				'fixed' => false, //when set to true, the tooltip will not hide if moused over.
147 147
 				'leave' => 'window', //specify whether the tooltip will hide when leaving the window it's conained within.
148 148
 				'distance' => false, //if integer, distance in pixels that the tooltip hides when the mouse is moved from the point it triggered the tooltip.
@@ -175,21 +175,21 @@  discard block
 block discarded – undo
175 175
 	 * @return void
176 176
 	 */
177 177
 	protected function _construct_tips() {
178
-		foreach ( $this->_qtipsa as $qt ) {
178
+		foreach ($this->_qtipsa as $qt) {
179 179
 			//make sure we have what we need.
180
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
181
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
180
+			if ( ! isset($qt['content_id']) || ! isset($qt['target']) || ! isset($qt['content']))
181
+				throw new EE_Error(sprintf(__('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true)));
182 182
 
183 183
 			//make sure the options include defaults and just override via set config.
184
-			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
185
-			$options = array_merge( $this->_default_options, $options_override );
184
+			$options_override = isset($qt['options']) ? (array) $qt['options'] : array();
185
+			$options = array_merge($this->_default_options, $options_override);
186 186
 			$setup = array(
187 187
 				'content_id' => $qt['content_id'],
188 188
 				'options' => $options,
189 189
 				'target' => $qt['target'],
190 190
 				'content' => $qt['content']
191 191
 				);
192
-			$this->_qtips[] = new EE_Qtip( $setup );
192
+			$this->_qtips[] = new EE_Qtip($setup);
193 193
 		}
194 194
 	}
195 195
 
@@ -264,9 +264,9 @@  discard block
 block discarded – undo
264 264
 	public $target;
265 265
 	public $content;
266 266
 
267
-	public function __construct( $setup_array ) {
268
-		foreach ( $setup_array as $prop => $value ) {
269
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
267
+	public function __construct($setup_array) {
268
+		foreach ($setup_array as $prop => $value) {
269
+			if (EEH_Class_Tools::has_property($this, $prop))
270 270
 				$this->$prop = $value;
271 271
 		}
272 272
 	}
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -177,8 +177,9 @@  discard block
 block discarded – undo
177 177
 	protected function _construct_tips() {
178 178
 		foreach ( $this->_qtipsa as $qt ) {
179 179
 			//make sure we have what we need.
180
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
181
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
180
+			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) {
181
+							throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
182
+			}
182 183
 
183 184
 			//make sure the options include defaults and just override via set config.
184 185
 			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
@@ -266,8 +267,9 @@  discard block
 block discarded – undo
266 267
 
267 268
 	public function __construct( $setup_array ) {
268 269
 		foreach ( $setup_array as $prop => $value ) {
269
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
270
-				$this->$prop = $value;
270
+			if ( EEH_Class_Tools::has_property( $this, $prop ) ) {
271
+							$this->$prop = $value;
272
+			}
271 273
 		}
272 274
 	}
273 275
 }
274 276
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Event_Shortcodes.lib.php 3 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -179,6 +179,7 @@
 block discarded – undo
179 179
 	/**
180 180
 	 * returns the link to the event
181 181
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
182
+	 * @param EE_Event $event
182 183
 	 * @return string
183 184
 	 */
184 185
 	private function _get_event_link( $event, $full_link = TRUE ) {
Please login to merge, or discard this patch.
Braces   +11 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
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
  * Event Espresso
@@ -85,8 +86,9 @@  discard block
 block discarded – undo
85 86
 
86 87
 
87 88
 		//If there is no event objecdt by now then get out.
88
-		if ( ! $this->_event instanceof EE_Event )
89
-			return '';
89
+		if ( ! $this->_event instanceof EE_Event ) {
90
+					return '';
91
+		}
90 92
 
91 93
 		switch ( $shortcode ) {
92 94
 
@@ -125,14 +127,16 @@  discard block
 block discarded – undo
125 127
 
126 128
 			case '[VIRTUAL_URL]' :
127 129
 				$venue = $this->_event->get_first_related('Venue');
128
-				if ( empty( $venue ) )
129
-					return '';
130
+				if ( empty( $venue ) ) {
131
+									return '';
132
+				}
130 133
 				return $venue->get('VNU_virtual_url');
131 134
 
132 135
 			case '[VIRTUAL_PHONE]' :
133 136
 				$venue = $this->_event->get_first_related('Venue');
134
-				if ( empty( $venue ) )
135
-					return '';
137
+				if ( empty( $venue ) ) {
138
+									return '';
139
+				}
136 140
 				return $venue->get('VNU_virtual_phone');
137 141
 				break;
138 142
 
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 /**
@@ -56,34 +56,34 @@  discard block
 block discarded – undo
56 56
 			'[EVENT_NAME]' => __("This also can be used for the name of the event", 'event_espresso'),
57 57
 			'[EVENT_PHONE]' => __('The phone number for the event (usually an info number)', 'event_espresso'),
58 58
 			'[EVENT_DESCRIPTION]' => __('The description of the event', 'event_espresso'),
59
-			'[EVENT_EXCERPT]' => __( 'This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso' ),
59
+			'[EVENT_EXCERPT]' => __('This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso'),
60 60
 			'[EVENT_LINK]' => __('A link associated with the event', 'event_espresso'),
61 61
 			'[EVENT_URL]' => __('A link to the event set up on the host site.', 'event_espresso'),
62 62
 			'[VIRTUAL_URL]' => __('What was used for the "URL of Event" field in the Venue settings', 'event_espresso'),
63 63
 			'[VIRTUAL_PHONE]' => __('An alternate phone number for the event. Typically used as a "call-in" number', 'event_espresso'),
64 64
 			'[EVENT_IMAGE]' => __('This will parse to the Feature image for the event.', 'event_espresso'),
65 65
 			'[EVENT_TOTAL_AVAILABLE_SPACES_*]' => sprintf(
66
-				__( 'This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso' ),
66
+				__('This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso'),
67 67
 				'<code>',
68 68
 				'</code>'
69 69
 				),
70
-			'[EVENT_TOTAL_SPOTS_TAKEN]' => __( 'This shortcode will parse to the output the total approved registrations for this event', 'event_espresso' ),
70
+			'[EVENT_TOTAL_SPOTS_TAKEN]' => __('This shortcode will parse to the output the total approved registrations for this event', 'event_espresso'),
71 71
 			'[EVENT_FACEBOOK_URL]' => __('This will return the Facebook URL for the event if you have it set via custom field in your event, otherwise it will use the Facebook URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_facebook</code> and the value as your facebook url.', 'event_espresso'),
72 72
 			'[EVENT_TWITTER_URL]' => __('This will return the Twitter URL for the event if you have it set via custom field in your event, otherwise it will use the Twitter URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_twitter</code> and the value as your facebook url', 'event_espresso'),
73 73
 			'[EVENT_META_*]' => __('This is a special dynamic shortcode. After the "*", add the exact name for your custom field, if there is a value set for that custom field within the event then it will be output in place of this shortcode.', 'event_espresso'),
74
-			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __( 'This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso' ),
74
+			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __('This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso'),
75 75
 			);
76 76
 	}
77 77
 
78 78
 
79
-	protected function _parser( $shortcode ) {
79
+	protected function _parser($shortcode) {
80 80
 
81
-		EE_Registry::instance()->load_helper( 'Formatter' );
81
+		EE_Registry::instance()->load_helper('Formatter');
82 82
 
83 83
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
84 84
 
85 85
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
86
-		if ( empty( $this->_event ) ) {
86
+		if (empty($this->_event)) {
87 87
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
88 88
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
89 89
 
@@ -92,17 +92,17 @@  discard block
 block discarded – undo
92 92
 
93 93
 
94 94
 		//If there is no event objecdt by now then get out.
95
-		if ( ! $this->_event instanceof EE_Event )
95
+		if ( ! $this->_event instanceof EE_Event)
96 96
 			return '';
97 97
 
98
-		switch ( $shortcode ) {
98
+		switch ($shortcode) {
99 99
 
100 100
 			case '[EVENT_ID]' :
101 101
 				return $this->_event->ID();
102 102
 				break;
103 103
 
104 104
 			case '[EVENT_IDENTIFIER]' :
105
-				return isset($this->_data['line_ref']) ? $this->_data['line_ref']: '';
105
+				return isset($this->_data['line_ref']) ? $this->_data['line_ref'] : '';
106 106
 				break;
107 107
 
108 108
 			case '[EVENT]' :
@@ -132,71 +132,71 @@  discard block
 block discarded – undo
132 132
 
133 133
 			case '[VIRTUAL_URL]' :
134 134
 				$venue = $this->_event->get_first_related('Venue');
135
-				if ( empty( $venue ) )
135
+				if (empty($venue))
136 136
 					return '';
137 137
 				return $venue->get('VNU_virtual_url');
138 138
 
139 139
 			case '[VIRTUAL_PHONE]' :
140 140
 				$venue = $this->_event->get_first_related('Venue');
141
-				if ( empty( $venue ) )
141
+				if (empty($venue))
142 142
 					return '';
143 143
 				return $venue->get('VNU_virtual_phone');
144 144
 				break;
145 145
 
146 146
 			case '[EVENT_IMAGE]' :
147
-				$image = $this->_event->feature_image_url(array(600,300) );
147
+				$image = $this->_event->feature_image_url(array(600, 300));
148 148
 				// @todo: eventually we should make this an attribute shortcode so that em can send along what size they want returned.
149
-				return !empty( $image ) ? '<img src="' . $image . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name') ) . '" />' : '';
149
+				return ! empty($image) ? '<img src="'.$image.'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name')).'" />' : '';
150 150
 				break;
151 151
 
152 152
 			case '[EVENT_FACEBOOK_URL]' :
153
-				$facebook_url = $this->_event->get_post_meta('event_facebook', true );
154
-				return empty( $facebook_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : $facebook_url;
153
+				$facebook_url = $this->_event->get_post_meta('event_facebook', true);
154
+				return empty($facebook_url) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : $facebook_url;
155 155
 				break;
156 156
 
157 157
 			case '[EVENT_TWITTER_URL]' :
158 158
 				$twitter_url = $this->_event->get_post_meta('event_twitter', true);
159
-				return empty( $twitter_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : $twitter_url;
159
+				return empty($twitter_url) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : $twitter_url;
160 160
 				break;
161 161
 
162 162
 			case '[EVENT_AUTHOR_EMAIL]' :
163 163
 				$author_id = $this->_event->get('EVT_wp_user');
164
-				$user_data = get_userdata( (int) $author_id );
164
+				$user_data = get_userdata((int) $author_id);
165 165
 				return $user_data->user_email;
166 166
 				break;
167 167
 
168 168
 			case '[EVENT_TOTAL_SPOTS_TAKEN]' :
169
-				return EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
169
+				return EEM_Registration::instance()->count(array(array('EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
170 170
 				break;
171 171
 
172 172
 			case '[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' :
173
-				EE_Registry::instance()->load_helper( 'URL' );
173
+				EE_Registry::instance()->load_helper('URL');
174 174
 				return EEH_URL::add_query_args_and_nonce(
175 175
 					array(
176 176
 						'event_id' => $this->_event->ID(),
177 177
 						'page' => 'espresso_registrations',
178 178
 						'action' => 'default'
179 179
 					),
180
-					admin_url( 'admin.php' ),
180
+					admin_url('admin.php'),
181 181
 					true
182 182
 				);
183 183
 				break;
184 184
 		}
185 185
 
186
-		if ( strpos( $shortcode, '[EVENT_META_*' ) !== false ) {
187
-			$shortcode = str_replace( '[EVENT_META_*', '', $shortcode );
188
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
186
+		if (strpos($shortcode, '[EVENT_META_*') !== false) {
187
+			$shortcode = str_replace('[EVENT_META_*', '', $shortcode);
188
+			$shortcode = trim(str_replace(']', '', $shortcode));
189 189
 
190 190
 			//pull the meta value from the event post
191
-			$event_meta = $this->_event->get_post_meta( $shortcode, true );
191
+			$event_meta = $this->_event->get_post_meta($shortcode, true);
192 192
 
193
-			return !empty( $event_meta ) ? $this->_event->get_post_meta( $shortcode, true ) : '';
193
+			return ! empty($event_meta) ? $this->_event->get_post_meta($shortcode, true) : '';
194 194
 
195 195
 		}
196 196
 
197
-		if ( strpos( $shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*' ) !== false ) {
198
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
199
-			$method = empty( $attrs['method'] ) ? 'current' : $attrs['method'];
197
+		if (strpos($shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*') !== false) {
198
+			$attrs = $this->_get_shortcode_attrs($shortcode);
199
+			$method = empty($attrs['method']) ? 'current' : $attrs['method'];
200 200
 			$method = $method === 'current';
201 201
 			$available = $this->_event->total_available_spaces($method);
202 202
 			return $available === INF ? '&infin;' : $available;
@@ -212,10 +212,10 @@  discard block
 block discarded – undo
212 212
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
213 213
 	 * @return string
214 214
 	 */
215
-	private function _get_event_link( $event, $full_link = TRUE ) {
215
+	private function _get_event_link($event, $full_link = TRUE) {
216 216
 		$url = get_permalink($event->ID());
217 217
 
218
-		return $full_link ? '<a href="' . $url . '">' . $event->get('EVT_name') . '</a>' : $url;
218
+		return $full_link ? '<a href="'.$url.'">'.$event->get('EVT_name').'</a>' : $url;
219 219
 	}
220 220
 
221 221
 
Please login to merge, or discard this patch.