Completed
Branch BUG-9715-shortcode-resources (aae731)
by
unknown
73:19 queued 63:44
created
core/libraries/shortcodes/EE_Event_Author_Shortcodes.lib.php 2 patches
Braces   +5 added lines, -3 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
@@ -58,8 +59,9 @@  discard block
 block discarded – undo
58 59
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
59 60
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
60 61
 
61
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
62
-			return '';
62
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event ) {
63
+					return '';
64
+		}
63 65
 
64 66
 		switch ( $shortcode ) {
65 67
 			case '[EVENT_AUTHOR_FNAME]' :
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 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
 /**
@@ -49,54 +49,54 @@  discard block
 block discarded – undo
49 49
 
50 50
 
51 51
 
52
-	protected function _parser( $shortcode ) {
52
+	protected function _parser($shortcode) {
53 53
 		//make sure we end up with a copy of the EE_Messages_Addressee object
54 54
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
55
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
56
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
55
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
56
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
57 57
 
58 58
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
59 59
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
60 60
 
61
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
61
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event)
62 62
 			return '';
63 63
 
64
-		switch ( $shortcode ) {
64
+		switch ($shortcode) {
65 65
 			case '[EVENT_AUTHOR_FNAME]' :
66
-				$fname =  !empty( $recipient ) ? $recipient->fname : NULL;
67
-				if ( empty( $fname ) && !empty( $event ) ) {
68
-					$user = $this->_get_author_for_event( $event );
66
+				$fname = ! empty($recipient) ? $recipient->fname : NULL;
67
+				if (empty($fname) && ! empty($event)) {
68
+					$user = $this->_get_author_for_event($event);
69 69
 					$fname = $user->first_name;
70 70
 				}
71 71
 				return $fname;
72 72
 				break;
73 73
 
74 74
 			case '[EVENT_AUTHOR_LNAME]' :
75
-				$lname =  !empty( $recipient ) ? $recipient->lname : NULL;
76
-				if ( empty( $lname ) && !empty( $event ) ) {
77
-					$user = $this->_get_author_for_event( $event );
75
+				$lname = ! empty($recipient) ? $recipient->lname : NULL;
76
+				if (empty($lname) && ! empty($event)) {
77
+					$user = $this->_get_author_for_event($event);
78 78
 					$lname = $user->last_name;
79 79
 				}
80 80
 				return $lname;
81 81
 				break;
82 82
 
83 83
 			case '[EVENT_AUTHOR_FORMATTED_EMAIL]' :
84
-				if ( !empty( $recipient ) ) {
85
-					$email =  !empty( $recipient->fname ) ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $recipient->admin_email . '>';
84
+				if ( ! empty($recipient)) {
85
+					$email = ! empty($recipient->fname) ? $recipient->fname.' '.$recipient->lname.'<'.$recipient->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$recipient->admin_email.'>';
86 86
 				} else {
87 87
 					$email = NULL;
88 88
 				}
89
-				if ( empty( $email ) && ! empty( $event ) ) {
90
-					$user = $this->_get_author_for_event( $event );
91
-					$email = ! empty( $user->first_name ) ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $user->user_email . '>';
89
+				if (empty($email) && ! empty($event)) {
90
+					$user = $this->_get_author_for_event($event);
91
+					$email = ! empty($user->first_name) ? $user->first_name.' '.$user->last_name.'<'.$user->user_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$user->user_email.'>';
92 92
 				}
93 93
 				return $email;
94 94
 				break;
95 95
 
96 96
 			case '[EVENT_AUTHOR_EMAIL]' :
97
-				$email = ! empty( $recipient ) ? $recipient->admin_email : NULL;
98
-				if ( empty( $email ) && !empty( $event ) ) {
99
-					$user = $this->_get_author_for_event( $event );
97
+				$email = ! empty($recipient) ? $recipient->admin_email : NULL;
98
+				if (empty($email) && ! empty($event)) {
99
+					$user = $this->_get_author_for_event($event);
100 100
 					$email = $user->user_email;
101 101
 				}
102 102
 				return $email;
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
 	 *
118 118
 	 * @return WP_User
119 119
 	 */
120
-	private function _get_author_for_event( EE_Event $event ) {
120
+	private function _get_author_for_event(EE_Event $event) {
121 121
 		$author_id = $event->wp_user();
122
-		$user_data = get_userdata( (int) $author_id );
122
+		$user_data = get_userdata((int) $author_id);
123 123
 		return $user_data;
124 124
 	}
125 125
 
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Event_Meta_Shortcodes.lib.php 2 patches
Spacing   +5 added lines, -5 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
 /**
@@ -51,19 +51,19 @@  discard block
 block discarded – undo
51 51
 	 * @param  mixed (array|object) $data      incoming data object/array
52 52
 	 * @return string            parsed code.
53 53
 	 */
54
-	public function parser( $shortcode, $data, $extra_data = array() ) {
54
+	public function parser($shortcode, $data, $extra_data = array()) {
55 55
 		
56 56
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
57
-		if ( empty( $this->_data['ID'] ) )
57
+		if (empty($this->_data['ID']))
58 58
 			return ''; //need the event id to do anything!
59 59
 
60 60
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
61 61
 
62
-		return !empty( $meta ) ? $meta : '';
62
+		return ! empty($meta) ? $meta : '';
63 63
 	}
64 64
 
65 65
 
66
-	protected function _parser( $shortcode ) {}
66
+	protected function _parser($shortcode) {}
67 67
 
68 68
 
69 69
 } //end EE_Event_Meta_Shortcodes class
70 70
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 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
@@ -54,8 +55,10 @@  discard block
 block discarded – undo
54 55
 	public function parser( $shortcode, $data, $extra_data = array() ) {
55 56
 		
56 57
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
57
-		if ( empty( $this->_data['ID'] ) )
58
-			return ''; //need the event id to do anything!
58
+		if ( empty( $this->_data['ID'] ) ) {
59
+					return '';
60
+		}
61
+		//need the event id to do anything!
59 62
 
60 63
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
61 64
 
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Line_Item_Shortcodes.lib.php 2 patches
Spacing   +11 added lines, -11 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
 /**
@@ -34,23 +34,23 @@  discard block
 block discarded – undo
34 34
 			'[LINE_ITEM_NAME]' => __('Outputs the line item name.', 'event_espresso'),
35 35
 			'[LINE_ITEM_DESCRIPTION]' => __('Outputs a the description for the line item.', 'event_espresso'),
36 36
 			'[LINE_ITEM_QUANTITY]' => __('Outputs the quantity for this line item.', 'event_espresso'),
37
-			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso' ),
37
+			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso'),
38 38
 			'[LINE_ITEM_TOTAL]' => __('This outputs the line item total.', 'event_espresso'),
39
-			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso' )
39
+			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso')
40 40
 			);
41 41
 	}
42 42
 
43 43
 
44 44
 
45
-	protected function _parser( $shortcode ) {
45
+	protected function _parser($shortcode) {
46 46
 		//ensure that the incoming object IS a line item.  If it isn't then bail early.
47
-		if ( ! $this->_data instanceof EE_Line_Item ) {
47
+		if ( ! $this->_data instanceof EE_Line_Item) {
48 48
 			return '';
49 49
 		}
50 50
 
51 51
 		$line_item = $this->_data;
52 52
 
53
-		switch ( $shortcode ) {
53
+		switch ($shortcode) {
54 54
 			case '[LINE_ITEM_NAME]' :
55 55
 				return $line_item->name();
56 56
 				break;
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 				break;
65 65
 
66 66
 			case '[LINE_ITEM_AMOUNT]' :
67
-				return $line_item->is_percent() ? $line_item->percent() . '%' : $line_item->unit_price_no_code();
67
+				return $line_item->is_percent() ? $line_item->percent().'%' : $line_item->unit_price_no_code();
68 68
 				break;
69 69
 
70 70
 			case '[LINE_ITEM_TOTAL]' :
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
 				break;
73 73
 		}
74 74
 
75
-		if ( strpos( $shortcode, '[LINE_ITEM_TAXABLE_*' ) !== FALSE ) {
76
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
77
-			if ( $line_item->is_taxable() ) {
78
-				return !empty( $attrs['symbol'] ) ? $attrs['symbol'] : '*';
75
+		if (strpos($shortcode, '[LINE_ITEM_TAXABLE_*') !== FALSE) {
76
+			$attrs = $this->_get_shortcode_attrs($shortcode);
77
+			if ($line_item->is_taxable()) {
78
+				return ! empty($attrs['symbol']) ? $attrs['symbol'] : '*';
79 79
 			}
80 80
 		}
81 81
 
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.
core/libraries/shortcodes/EE_Messenger_Shortcodes.lib.php 2 patches
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage shortcodes library
8 8
  */
9
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
9
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
10
+	exit('No direct script access allowed');
11
+}
10 12
 /**
11 13
  * EE_Messenger_Shortcodes
12 14
  *
@@ -69,8 +71,9 @@  discard block
 block discarded – undo
69 71
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
70 72
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
71 73
 
72
-		if ( ! $recipient instanceof EE_Messages_Addressee )
73
-			return '';
74
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
75
+					return '';
76
+		}
74 77
 
75 78
 		switch ( $shortcode ) {
76 79
 			case '[DISPLAY_HTML_URL]' :
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -41,22 +41,22 @@  discard block
 block discarded – undo
41 41
 		$this->label = __('Messenger Shortcodes', 'event_espresso');
42 42
 		$this->description = __('All shortcodes that are messenger specific.', 'event_espresso');
43 43
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
44
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
44
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
45 45
 		//add messages about what happens  when the messenger is active.
46 46
 		$this->_active_messengers = $message_resource_manager->active_messengers();
47 47
 
48
-		$this->_shortcodes['[DISPLAY_HTML_URL]'] =__('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
49
-		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso' );
48
+		$this->_shortcodes['[DISPLAY_HTML_URL]'] = __('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
49
+		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso');
50 50
 		$this->_shortcodes['[DISPLAY_PDF_BUTTON]'] = __('This will return html for a download pdf button trigger if the pdf messenger is active.', 'event_espresso');
51 51
 
52 52
 		//show error message about buttons/urls not working as expected if messenger deactivated.
53
-		if ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'update_message_template' ) {
54
-			if ( ! isset( $this->_active_messengers['pdf'] ) ) {
55
-				EE_Error::add_attention( __('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso' ) );
53
+		if (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'update_message_template') {
54
+			if ( ! isset($this->_active_messengers['pdf'])) {
55
+				EE_Error::add_attention(__('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso'));
56 56
 			}
57 57
 
58
-			if ( !isset( $this->_active_messengers['html'] ) ) {
59
-				EE_Error::add_attention( __('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso' ) );
58
+			if ( ! isset($this->_active_messengers['html'])) {
59
+				EE_Error::add_attention(__('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso'));
60 60
 			}
61 61
 		}
62 62
 
@@ -64,24 +64,24 @@  discard block
 block discarded – undo
64 64
 
65 65
 
66 66
 
67
-	protected function _parser( $shortcode ) {
67
+	protected function _parser($shortcode) {
68 68
 		//make sure we end up with a copy of the EE_Messages_Addressee object
69 69
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
70
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
71
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
70
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
71
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
72 72
 
73
-		if ( ! $recipient instanceof EE_Messages_Addressee )
73
+		if ( ! $recipient instanceof EE_Messages_Addressee)
74 74
 			return '';
75 75
 
76
-		switch ( $shortcode ) {
76
+		switch ($shortcode) {
77 77
 			case '[DISPLAY_HTML_URL]' :
78
-				return  isset( $this->_active_messengers['html'] ) ? $this->_get_url( $recipient, 'html' ) : '';
78
+				return  isset($this->_active_messengers['html']) ? $this->_get_url($recipient, 'html') : '';
79 79
 				break;
80 80
 			case '[DISPLAY_PDF_URL]' :
81
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_url( $recipient, 'pdf' ) : '';
81
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_url($recipient, 'pdf') : '';
82 82
 				break;
83 83
 			case '[DISPLAY_PDF_BUTTON]' :
84
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_button( $recipient, 'pdf' ) : '';
84
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_button($recipient, 'pdf') : '';
85 85
 				break;
86 86
 		}
87 87
 		return '';
@@ -99,11 +99,11 @@  discard block
 block discarded – undo
99 99
 	 *
100 100
 	 * @return string                Generated html
101 101
 	 */
102
-	private function _get_button( EE_Messages_Addressee $recipient, $sending_messenger ) {
103
-		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso' );
102
+	private function _get_button(EE_Messages_Addressee $recipient, $sending_messenger) {
103
+		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso');
104 104
 		$content = '
105
-<form method="post" action="' . $this->_get_url( $recipient, $sending_messenger ) . '" >
106
-	<input class="print_button" type="submit" value="' . $download_text . '" />
105
+<form method="post" action="' . $this->_get_url($recipient, $sending_messenger).'" >
106
+	<input class="print_button" type="submit" value="' . $download_text.'" />
107 107
 </form>
108 108
 		';
109 109
 		return $content;
@@ -122,18 +122,18 @@  discard block
 block discarded – undo
122 122
 	 * @return string The generated url for displaying the link.
123 123
 	 * @throws EE_Error
124 124
 	 */
125
-	private function _get_url( EE_Messages_Addressee $recipient, $sending_messenger ) {
125
+	private function _get_url(EE_Messages_Addressee $recipient, $sending_messenger) {
126 126
 
127 127
 		$reg = $recipient->reg_obj;
128 128
 		$reg = ! $reg instanceof EE_Registration ? $recipient->primary_reg_obj : $reg;
129 129
 
130 130
 
131
-		if ( $this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message ) {
132
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
131
+		if ($this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message) {
132
+			EE_Registry::instance()->load_helper('MSG_Template');
133 133
 			try {
134
-				return EEH_MSG_Template::get_url_trigger( $this->_message_type, $this->_message, $reg, $sending_messenger );
135
-			} catch( EE_Error $e ) {
136
-				if ( WP_DEBUG ) {
134
+				return EEH_MSG_Template::get_url_trigger($this->_message_type, $this->_message, $reg, $sending_messenger);
135
+			} catch (EE_Error $e) {
136
+				if (WP_DEBUG) {
137 137
 					$e->get_error();
138 138
 				}
139 139
 			}
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php 2 patches
Spacing   +24 added lines, -24 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
 /**
@@ -63,91 +63,91 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 
66
-	protected function _parser( $shortcode ) {
66
+	protected function _parser($shortcode) {
67 67
 
68
-		switch ( $shortcode ) {
68
+		switch ($shortcode) {
69 69
 
70 70
 			case '[COMPANY]' :
71
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
71
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
72 72
 				break;
73 73
 
74 74
 			case '[CO_ADD1]' :
75
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' );
75
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
76 76
 				break;
77 77
 
78 78
 			case '[CO_ADD2]' :
79
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' );
79
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
80 80
 				break;
81 81
 
82 82
 			case '[CO_CITY]' :
83
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'city' );
83
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
84 84
 				break;
85 85
 
86 86
 			case '[CO_STATE]' :
87
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( EE_Registry::instance()->CFG->organization->STA_ID );
87
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(EE_Registry::instance()->CFG->organization->STA_ID);
88 88
 				return $state->name();
89 89
 				break;
90 90
 
91 91
 			case '[CO_ZIP]' :
92
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'zip' );
92
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
93 93
 				break;
94 94
 
95 95
 			case '[CO_EMAIL]' :
96
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
96
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
97 97
 				break;
98 98
 
99 99
 			case '[CO_PHONE]' :
100
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'phone' );
100
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
101 101
 				break;
102 102
 
103 103
 			case '[CO_LOGO]' :
104
-				return '<img src="' . EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) . '" id="headerImage" />';
104
+				return '<img src="'.EE_Registry::instance()->CFG->organization->get_pretty('logo_url').'" id="headerImage" />';
105 105
 				break;
106 106
 
107 107
 			case '[CO_LOGO_URL]' :
108
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
108
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
109 109
 				break;
110 110
 
111 111
 			case '[CO_FACEBOOK_URL]' :
112
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
112
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
113 113
 				break;
114 114
 
115 115
 			case '[CO_TWITTER_URL]' :
116
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
116
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
117 117
 				break;
118 118
 
119 119
 			case '[CO_PINTEREST_URL]' :
120
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
120
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
121 121
 				break;
122 122
 
123 123
 			case '[CO_LINKEDIN_URL]' :
124
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
124
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
125 125
 				break;
126 126
 
127 127
 			case '[CO_GOOGLE_URL]' :
128
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
128
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
129 129
 				break;
130 130
 
131 131
 			case '[CO_INSTAGRAM_URL]' :
132
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
132
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
133 133
 				break;
134 134
 
135 135
 		}
136 136
 
137 137
 		//also allow for parameter shortcode
138
-		if ( strpos( $shortcode, '[CO_TAX_NUMBER_*' ) !== FALSE ) {
138
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== FALSE) {
139 139
 			//first see if there is any company tax number set and bail early if not
140 140
 			$tax_number = EE_Registry::instance()->CFG->organization->vat;
141
-			if ( empty( $tax_number ) ) {
141
+			if (empty($tax_number)) {
142 142
 				return '';
143 143
 			}
144 144
 
145 145
 			//see if there are any attributes.
146
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
146
+			$attrs = $this->_get_shortcode_attrs($shortcode);
147 147
 
148 148
 			//set custom attrs if present (or default)
149
-			$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
150
-			return $prefix . $tax_number;
149
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
150
+			return $prefix.$tax_number;
151 151
 		}
152 152
 
153 153
 		return '';
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Payment_Shortcodes.lib.php 2 patches
Spacing   +9 added lines, -9 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
 /**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			'[PAYMENT_TIMESTAMP]' => __('Outputs the date of the payment (using the default date format).', 'event_espresso'),
35 35
 			'[PAYMENT_METHOD]' => __('Outputs a the payment method.', 'event_espresso'),
36 36
 			'[PAYMENT_AMOUNT]' => __('Outputs the payment amount (with currency symbol).', 'event_espresso'),
37
-			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso' ),
37
+			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso'),
38 38
 			'[PAYMENT_GATEWAY_RESPONSE]' => __('Outputs the payment gateway response.', 'event_espresso'),
39 39
 			'[PAYMENT_GATEWAY_TXN_ID]' => __('This will either be the gateway transaction ID, or the manual ID added with payment applied via the admin.', 'event_espresso'),
40 40
 			'[PAYMENT_PO_NUMBER]' => __('Purchase Order number (if present)', 'event_espresso'),
@@ -46,15 +46,15 @@  discard block
 block discarded – undo
46 46
 
47 47
 
48 48
 
49
-	protected function _parser( $shortcode ) {
49
+	protected function _parser($shortcode) {
50 50
 		//ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
51
-		if ( ! $this->_data instanceof EE_Payment ) {
51
+		if ( ! $this->_data instanceof EE_Payment) {
52 52
 			return '';
53 53
 		}
54 54
 
55 55
 		$payment = $this->_data;
56 56
 
57
-		switch ( $shortcode ) {
57
+		switch ($shortcode) {
58 58
 			case '[PAYMENT_TIMESTAMP]' :
59 59
 				return $payment->timestamp();
60 60
 				break;
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
70 70
 
71 71
 			case '[PAYMENT_GATEWAY]' :
72 72
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
73
-				if( $payment->payment_method() instanceof EE_Payment_Method ){
73
+				if ($payment->payment_method() instanceof EE_Payment_Method) {
74 74
 					return $payment->payment_method()->name();
75
-				}else{
76
-					return __( 'Unknown', 'event_espresso' );
75
+				} else {
76
+					return __('Unknown', 'event_espresso');
77 77
 				}
78 78
 				break;
79 79
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 				break;
99 99
 
100 100
 			case '[PAYMENT_STATUS_WITH_ICONS]' :
101
-				return $payment->pretty_status( TRUE );
101
+				return $payment->pretty_status(TRUE);
102 102
 				break;
103 103
 
104 104
 			default :
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@  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 13
 /**
13 14
  *
@@ -72,7 +73,7 @@  discard block
 block discarded – undo
72 73
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
73 74
 				if( $payment->payment_method() instanceof EE_Payment_Method ){
74 75
 					return $payment->payment_method()->name();
75
-				}else{
76
+				} else{
76 77
 					return __( 'Unknown', 'event_espresso' );
77 78
 				}
78 79
 				break;
Please login to merge, or discard this patch.
libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php 2 patches
Spacing   +18 added lines, -18 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
 /**
@@ -45,32 +45,32 @@  discard block
 block discarded – undo
45 45
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
46 46
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
47 47
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
48
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
48
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
49 49
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
50 50
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
51 51
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
52
-			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso' )
52
+			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso')
53 53
 			);
54 54
 	}
55 55
 
56 56
 
57 57
 
58
-	protected function _parser( $shortcode ) {
58
+	protected function _parser($shortcode) {
59 59
 		//make sure we end up with a copy of the EE_Messages_Addressee object
60 60
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
61
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
62
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
61
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
62
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
63 63
 
64
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
64
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
65 65
 			return '';
66 66
 
67 67
 		$attendee = $primary_registration->primary_att_obj;
68 68
 		$primary_reg = $primary_registration->primary_reg_obj;
69 69
 
70
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
70
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration)
71 71
 			return '';
72 72
 
73
-		switch ( $shortcode ) {
73
+		switch ($shortcode) {
74 74
 			case '[PRIMARY_REGISTRANT_FNAME]' :
75 75
 				return $attendee->fname();
76 76
 				break;
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 				break;
119 119
 
120 120
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
121
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
121
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
122 122
 					return '';
123
-				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
123
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
124 124
 				break;
125 125
 
126 126
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
 				break;
129 129
 		}
130 130
 
131
-		if ( strpos( $shortcode, '[PRIMARY_REGISTRANT_ANSWER_*' ) !== false ) {
132
-			$shortcode = str_replace( '[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode );
133
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
131
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
132
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
133
+			$shortcode = trim(str_replace(']', '', $shortcode));
134 134
 
135 135
 
136 136
 			//now let's figure out what question has this text
137
-			if ( empty( $primary_registration->questions ) ) {
137
+			if (empty($primary_registration->questions)) {
138 138
 				return '';
139 139
 			}
140 140
 
141
-			foreach ( $primary_registration->questions as $ansid => $question ) {
142
-				if ( $question->get('QST_display_text') == $shortcode && isset( $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid] ) ) {
143
-					return $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid]->get_pretty( 'ANS_value', 'no_wpautop' );
141
+			foreach ($primary_registration->questions as $ansid => $question) {
142
+				if ($question->get('QST_display_text') == $shortcode && isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])) {
143
+					return $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
144 144
 				}
145 145
 			}
146 146
 		}
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
@@ -61,14 +62,16 @@  discard block
 block discarded – undo
61 62
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
62 63
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
63 64
 
64
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
65
-			return '';
65
+		if ( ! $primary_registration instanceof EE_Messages_Addressee ) {
66
+					return '';
67
+		}
66 68
 
67 69
 		$attendee = $primary_registration->primary_att_obj;
68 70
 		$primary_reg = $primary_registration->primary_reg_obj;
69 71
 
70
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
71
-			return '';
72
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration ) {
73
+					return '';
74
+		}
72 75
 
73 76
 		switch ( $shortcode ) {
74 77
 			case '[PRIMARY_REGISTRANT_FNAME]' :
@@ -118,8 +121,9 @@  discard block
 block discarded – undo
118 121
 				break;
119 122
 
120 123
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
121
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
122
-					return '';
124
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
125
+									return '';
126
+				}
123 127
 				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
124 128
 				break;
125 129
 
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php 2 patches
Braces   +14 added lines, -9 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
@@ -65,12 +66,14 @@  discard block
 block discarded – undo
65 66
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
66 67
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
67 68
 
68
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
69
-			return '';
69
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee ) {
70
+					return '';
71
+		}
70 72
 
71 73
 		$attendee = $this->_recipient->att_obj;
72
-		if ( ! $attendee instanceof EE_Attendee )
73
-			return '';
74
+		if ( ! $attendee instanceof EE_Attendee ) {
75
+					return '';
76
+		}
74 77
 
75 78
 		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] ) ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] : array();
76 79
 
@@ -88,14 +91,16 @@  discard block
 block discarded – undo
88 91
 				break;
89 92
 
90 93
 			case '[RECIPIENT_REGISTRATION_CODE]' :
91
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
92
-					return '';
94
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
95
+									return '';
96
+				}
93 97
 				return $this->_get_reg_code();
94 98
 				break;
95 99
 
96 100
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
97
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
98
-					return '';
101
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
102
+									return '';
103
+				}
99 104
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
100 105
 				break;
101 106
 
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 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
 /**
@@ -50,31 +50,31 @@  discard block
 block discarded – undo
50 50
 			'[RECIPIENT_ADDRESS2]' => __('Whatever was in the address 2 field for the recipient of the message.', 'event_espresso'),
51 51
 			'[RECIPIENT_CITY]' => __('The city for the recipient of the message.', 'event_espresso'),
52 52
 			'[RECIPIENT_ZIP_PC]' => __('The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso'),
53
-			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso' ),
53
+			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso'),
54 54
 			'[RECIPIENT_COUNTRY]' => __('The country for the recipient of the message.', 'event_espresso'),
55
-			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso' )
55
+			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso')
56 56
 			);
57 57
 	}
58 58
 
59 59
 
60 60
 
61
-	protected function _parser( $shortcode ) {
61
+	protected function _parser($shortcode) {
62 62
 
63 63
 		//make sure we end up with a copy of the EE_Messages_Addressee object
64 64
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
65
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
66
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
65
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
66
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
67 67
 
68
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
68
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee)
69 69
 			return '';
70 70
 
71 71
 		$attendee = $this->_recipient->att_obj;
72
-		if ( ! $attendee instanceof EE_Attendee )
72
+		if ( ! $attendee instanceof EE_Attendee)
73 73
 			return '';
74 74
 
75
-		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] ) ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] : array();
75
+		$this->_registrations_for_recipient = isset($this->_recipient->attendees[$attendee->ID()]['reg_objs']) ? $this->_recipient->attendees[$attendee->ID()]['reg_objs'] : array();
76 76
 
77
-		switch ( $shortcode ) {
77
+		switch ($shortcode) {
78 78
 			case '[RECIPIENT_FNAME]' :
79 79
 				return $attendee->fname();
80 80
 				break;
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 				break;
89 89
 
90 90
 			case '[RECIPIENT_REGISTRATION_CODE]' :
91
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
91
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
92 92
 					return '';
93 93
 				return $this->_get_reg_code();
94 94
 				break;
95 95
 
96 96
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
97
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
97
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
98 98
 					return '';
99 99
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
100 100
 				break;
@@ -130,19 +130,19 @@  discard block
 block discarded – undo
130 130
 				break;
131 131
 		}
132 132
 
133
-		if ( strpos( $shortcode, '[RECIPIENT_ANSWER_*' ) !== false ) {
134
-			$shortcode = str_replace( '[RECIPIENT_ANSWER_*', '', $shortcode );
135
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
133
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
134
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
135
+			$shortcode = trim(str_replace(']', '', $shortcode));
136 136
 
137 137
 
138 138
 			//now let's figure out what question has this text
139
-			if ( empty( $this->_recipient->questions ) || ! $this->_recipient->reg_obj instanceof EE_Registration ) {
139
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
140 140
 				return '';
141 141
 			}
142 142
 
143
-			foreach ( $this->_recipient->questions as $ansid => $question ) {
144
-				if ( $question instanceof EE_Question && $question->display_text() == $shortcode && isset( $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid] ) ) {
145
-					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty( 'ANS_value', 'no_wpautop' );
143
+			foreach ($this->_recipient->questions as $ansid => $question) {
144
+				if ($question instanceof EE_Question && $question->display_text() == $shortcode && isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])) {
145
+					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
146 146
 				}
147 147
 			}
148 148
 		}
@@ -173,53 +173,53 @@  discard block
 block discarded – undo
173 173
 	protected function _get_reg_code() {
174 174
 
175 175
 		//if only one related registration for the recipient then just return that reg code.
176
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
176
+		if (count($this->_registrations_for_recipient) <= 1) {
177 177
 			return $this->_recipient->reg_obj->reg_code();
178 178
 		}
179 179
 
180 180
 		//k more than one registration so let's see if we can get specific to context
181 181
 		//are we parsing event_list?
182
-		if ( $this->_data instanceof EE_Event ) {
182
+		if ($this->_data instanceof EE_Event) {
183 183
 			$reg_code = array();
184 184
 			//loop through registrations for recipient and see if there is a match for this event
185
-			foreach ( $this->_registrations_for_recipient as $reg ) {
186
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
185
+			foreach ($this->_registrations_for_recipient as $reg) {
186
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
187 187
 					$reg_code[] = $reg->reg_code();
188 188
 				}
189 189
 			}
190
-			return implode( ', ', $reg_code );
190
+			return implode(', ', $reg_code);
191 191
 		}
192 192
 
193 193
 		//are we parsing ticket list?
194
-		if ( $this->_data instanceof EE_Ticket ) {
194
+		if ($this->_data instanceof EE_Ticket) {
195 195
 			$reg_code = array();
196 196
 			//loop through each registration for recipient and see if there is a match for this ticket
197
-			foreach ( $this->_registrations_for_recipient as $reg ) {
198
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
197
+			foreach ($this->_registrations_for_recipient as $reg) {
198
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
199 199
 					$reg_code = $reg->reg_code();
200 200
 				}
201 201
 			}
202
-			return implode( ', ', $reg_code );
202
+			return implode(', ', $reg_code);
203 203
 		}
204 204
 
205 205
 		//do we have a specific reg_obj?  Let's use it
206
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
206
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
207 207
 			return $this->_data->reg_obj->reg_code();
208 208
 		}
209 209
 
210 210
 		//do we have a specific reg_obj?  Let's use it
211
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
211
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
212 212
 			return $this->_data->reg_obj->reg_code();
213 213
 		}
214 214
 
215 215
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
216 216
 		$reg_code = array();
217
-		foreach ( $this->_registrations_for_recipient as $reg ) {
218
-			if ( $reg instanceof EE_Registration ) {
217
+		foreach ($this->_registrations_for_recipient as $reg) {
218
+			if ($reg instanceof EE_Registration) {
219 219
 				$reg_code[] = $reg->reg_code();
220 220
 			}
221 221
 		}
222
-		return implode(', ', $reg_code );
222
+		return implode(', ', $reg_code);
223 223
 	}
224 224
 
225 225
 
Please login to merge, or discard this patch.
core/libraries/shortcodes/EE_Ticket_Shortcodes.lib.php 2 patches
Braces   +5 added lines, -3 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
@@ -80,8 +81,9 @@  discard block
 block discarded – undo
80 81
 
81 82
 
82 83
 		//If there is no event object by now then get out.
83
-		if ( ! $this->_ticket instanceof EE_Ticket )
84
-			return '';
84
+		if ( ! $this->_ticket instanceof EE_Ticket ) {
85
+					return '';
86
+		}
85 87
 
86 88
 		switch ( $shortcode ) {
87 89
 
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 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
 /**
@@ -50,38 +50,38 @@  discard block
 block discarded – undo
50 50
 			'[TICKET_PRICE]' => __('The price of the ticket', 'event_espresso'),
51 51
 			'[TICKET_PRICE_WITH_TAXES]' => __('The price of the ticket including any taxes that might be on the ticket', 'event_espresso'),
52 52
 			'[TKT_QTY_PURCHASED]' => __('The total quantity of the current ticket in the list that has been purchased in this transaction', 'event_espresso'),
53
-			'[TKT_USES_*]' => __( 'This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso' ) .
54
-				'<p><ul>' .
55
-				'<li><strong>symbol</strong>:' . __('This returns the &infin; symbol.', 'event_espresso') . '</li>' .
56
-				'<li><strong>text</strong>:' . __('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso' ) . '</li>' .
57
-				'<li><strong>{custom}</strong>:' . __('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso' ) . '</li>' .
53
+			'[TKT_USES_*]' => __('This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso').
54
+				'<p><ul>'.
55
+				'<li><strong>symbol</strong>:'.__('This returns the &infin; symbol.', 'event_espresso').'</li>'.
56
+				'<li><strong>text</strong>:'.__('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso').'</li>'.
57
+				'<li><strong>{custom}</strong>:'.__('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso').'</li>'.
58 58
 				'</ul></p>'
59 59
 			);
60 60
 	}
61 61
 
62 62
 
63
-	protected function _parser( $shortcode ) {
63
+	protected function _parser($shortcode) {
64 64
 
65 65
 		$this->_ticket = $this->_data instanceof EE_Ticket ? $this->_data : null;
66 66
 
67 67
 		$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
68
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $this->_extra_data ) && isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
68
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
69 69
 
70 70
 
71 71
 		//possible EE_Line_Item may be incoming data
72
-		$this->_ticket = empty( $this->_ticket ) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty( $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] ) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
72
+		$this->_ticket = empty($this->_ticket) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty($aee->line_items_with_children[$this->_data->ID()]['EE_Ticket']) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
73 73
 
74 74
 		//if still no ticket, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the ticket from the reg_obj instead.
75
-		if ( empty( $this->_ticket ) ) {
75
+		if (empty($this->_ticket)) {
76 76
 			$this->_ticket = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->ticket() : NULL;
77 77
 		}
78 78
 
79 79
 
80 80
 		//If there is no event object by now then get out.
81
-		if ( ! $this->_ticket instanceof EE_Ticket )
81
+		if ( ! $this->_ticket instanceof EE_Ticket)
82 82
 			return '';
83 83
 
84
-		switch ( $shortcode ) {
84
+		switch ($shortcode) {
85 85
 
86 86
 			case '[TICKET_ID]' :
87 87
 				return $this->_ticket->ID();
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
 				break;
97 97
 
98 98
 			case '[TICKET_PRICE]' :
99
-				return EEH_Template::format_currency( $this->_ticket->get('TKT_price') );
99
+				return EEH_Template::format_currency($this->_ticket->get('TKT_price'));
100 100
 				break;
101 101
 
102 102
 			case '[TICKET_PRICE_WITH_TAXES]' :
103
-				return EEH_Template::format_currency( $this->_ticket->get_ticket_total_with_taxes() );
103
+				return EEH_Template::format_currency($this->_ticket->get_ticket_total_with_taxes());
104 104
 				break;
105 105
 
106 106
 			case '[TKT_QTY_PURCHASED]' :
@@ -108,10 +108,10 @@  discard block
 block discarded – undo
108 108
 				break;
109 109
 		}
110 110
 
111
-		if ( strpos( $shortcode, '[TKT_USES_*') !== FALSE  ) {
112
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
113
-			$schema = empty( $attrs['schema'] ) ? null : $attrs['schema'];
114
-			return $this->_ticket->get_pretty( 'TKT_uses', $schema );
111
+		if (strpos($shortcode, '[TKT_USES_*') !== FALSE) {
112
+			$attrs = $this->_get_shortcode_attrs($shortcode);
113
+			$schema = empty($attrs['schema']) ? null : $attrs['schema'];
114
+			return $this->_ticket->get_pretty('TKT_uses', $schema);
115 115
 		}
116 116
 		return '';
117 117
 
Please login to merge, or discard this patch.