Completed
Branch FET-9576-iframes (7043fb)
by
unknown
486:30 queued 469:44
created
core/helpers/EEH_Autoloader.helper.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
50 50
 	 * @return \EEH_Autoloader
51 51
 	 */
52 52
 	private function __construct() {
53
-		if ( self::$_autoloaders === null ) {
53
+		if (self::$_autoloaders === null) {
54 54
 			self::$_autoloaders = array();
55 55
 			$this->_register_custom_autoloaders();
56
-			spl_autoload_register( array( $this, 'espresso_autoloader' ) );
56
+			spl_autoload_register(array($this, 'espresso_autoloader'));
57 57
 		}
58 58
 	}
59 59
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	 */
66 66
 	public static function instance() {
67 67
 		// check if class object is instantiated
68
-		if ( ! self::$_instance instanceof EEH_Autoloader ) {
68
+		if ( ! self::$_instance instanceof EEH_Autoloader) {
69 69
 			self::$_instance = new self();
70 70
 		}
71 71
 		return self::$_instance;
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @internal  param string $class_name - simple class name ie: session
83 83
 	 * @return 	void
84 84
 	 */
85
-	public static function espresso_autoloader( $class_name ) {
86
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
87
-			require_once( self::$_autoloaders[ $class_name ] );
85
+	public static function espresso_autoloader($class_name) {
86
+		if (isset(self::$_autoloaders[$class_name])) {
87
+			require_once(self::$_autoloaders[$class_name]);
88 88
 		}
89 89
 	}
90 90
 
@@ -99,26 +99,26 @@  discard block
 block discarded – undo
99 99
 	 * @param bool           $debug **deprecated**
100 100
 	 * @throws \EE_Error
101 101
 	 */
102
-	public static function register_autoloader( $class_paths, $read_check = true, $debug = false ) {
103
-		$class_paths = is_array( $class_paths ) ? $class_paths : array( $class_paths );
104
-		foreach ( $class_paths as $class => $path ) {
102
+	public static function register_autoloader($class_paths, $read_check = true, $debug = false) {
103
+		$class_paths = is_array($class_paths) ? $class_paths : array($class_paths);
104
+		foreach ($class_paths as $class => $path) {
105 105
 			// don't give up! you gotta...
106 106
 			// get some class
107
-			if ( empty( $class )) {
108
-				throw new EE_Error ( sprintf( __( 'No Class name was specified while registering an autoloader for the following path: %s.','event_espresso' ), $path ));
107
+			if (empty($class)) {
108
+				throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
109 109
 			}
110 110
 			// one day you will find the path young grasshopper
111
-			if ( empty( $path )) {
112
-				throw new EE_Error ( sprintf( __( 'No path was specified while registering an autoloader for the %s class.','event_espresso' ), $class ));
111
+			if (empty($path)) {
112
+				throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
113 113
 			}
114 114
 			// is file readable ?
115
-			if ( $read_check && ! is_readable( $path )) {
116
-				throw new EE_Error ( sprintf( __( 'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s','event_espresso' ), $class, $path ));
115
+			if ($read_check && ! is_readable($path)) {
116
+				throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
117 117
 			}
118
-			if ( ! isset( self::$_autoloaders[ $class ] )) {
119
-				self::$_autoloaders[ $class ] = str_replace( array( '/', '\\' ), DS, $path );
120
-				if ( EE_DEBUG && ( EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug ) ) {
121
-					EEH_Debug_Tools::printr( self::$_autoloaders[ $class ], $class, __FILE__, __LINE__ );
118
+			if ( ! isset(self::$_autoloaders[$class])) {
119
+				self::$_autoloaders[$class] = str_replace(array('/', '\\'), DS, $path);
120
+				if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
121
+					EEH_Debug_Tools::printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
122 122
 				}
123 123
 			}
124 124
 		}
@@ -149,14 +149,14 @@  discard block
 block discarded – undo
149 149
 	private function _register_custom_autoloaders() {
150 150
 		EEH_Autoloader::$debug = '';
151 151
 		\EEH_Autoloader::register_helpers_autoloaders();
152
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'interfaces' );
153
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE );
154
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_INTERFACES, true );
155
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_MODELS, true );
156
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CLASSES );
157
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
158
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'messages' );
159
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' ) {
152
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces');
153
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
154
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
155
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
156
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
157
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
158
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'messages');
159
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
160 160
 			EEH_Debug_Tools::instance()->show_times();
161 161
 		}
162 162
 	}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 * @access public
170 170
 	 */
171 171
 	public static function register_helpers_autoloaders() {
172
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_HELPERS );
172
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
173 173
 	}
174 174
 
175 175
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 * 	@return void
196 196
 	 */
197 197
 	public static function register_line_item_display_autoloaders() {
198
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_display' , true );
198
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
199 199
 	}
200 200
 
201 201
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	 * 	@return void
209 209
 	 */
210 210
 	public static function register_line_item_filter_autoloaders() {
211
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_filters' , true );
211
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
212 212
 	}
213 213
 
214 214
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	 * 	@return void
222 222
 	 */
223 223
 	public static function register_template_part_autoloaders() {
224
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'template_parts', true );
224
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
225 225
 	}
226 226
 
227 227
 
@@ -238,35 +238,35 @@  discard block
 block discarded – undo
238 238
 	 * @param bool   $debug  **deprecated**
239 239
 	 * @throws \EE_Error
240 240
 	 */
241
-	public static function register_autoloaders_for_each_file_in_folder( $folder, $recursive = false, $debug = false ){
242
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug ) {
243
-			EEH_Debug_Tools::instance()->start_timer( basename( $folder ) );
241
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false) {
242
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
243
+			EEH_Debug_Tools::instance()->start_timer(basename($folder));
244 244
 		}
245 245
 		// make sure last char is a /
246
-		$folder .= $folder[strlen($folder)-1] !== DS ? DS : '';
246
+		$folder .= $folder[strlen($folder) - 1] !== DS ? DS : '';
247 247
 		$class_to_filepath_map = array();
248
-		$exclude = array( 'index' );
248
+		$exclude = array('index');
249 249
 		//get all the files in that folder that end in php
250
-		$filepaths = glob( $folder.'*');
250
+		$filepaths = glob($folder.'*');
251 251
 
252
-		if ( empty( $filepaths ) ) {
252
+		if (empty($filepaths)) {
253 253
 			return;
254 254
 		}
255 255
 
256
-		foreach( $filepaths as $filepath ) {
257
-			if ( substr( $filepath, -4, 4 ) === '.php' ) {
258
-				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename( $filepath );
259
-				if ( ! in_array( $class_name, $exclude )) {
260
-					$class_to_filepath_map [ $class_name ] = $filepath;
256
+		foreach ($filepaths as $filepath) {
257
+			if (substr($filepath, -4, 4) === '.php') {
258
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
259
+				if ( ! in_array($class_name, $exclude)) {
260
+					$class_to_filepath_map [$class_name] = $filepath;
261 261
 				}
262
-			} else if ( $recursive ) {
263
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $filepath, $recursive, $debug );
262
+			} else if ($recursive) {
263
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
264 264
 			}
265 265
 		}
266 266
 		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
267
-		self::register_autoloader( $class_to_filepath_map, false, $debug );
268
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' ) {
269
-			EEH_Debug_Tools::instance()->stop_timer( basename( $folder ) );
267
+		self::register_autoloader($class_to_filepath_map, false, $debug);
268
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
269
+			EEH_Debug_Tools::instance()->stop_timer(basename($folder));
270 270
 		}
271 271
 	}
272 272
 
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
 	 * @param string $class_name - simple class name ie: EE_Session
281 281
 	 * @param string $alias - variation on class name ie: EE_session, session, etc
282 282
 	 */
283
-	public static function add_alias( $class_name, $alias ) {
284
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
285
-			self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
283
+	public static function add_alias($class_name, $alias) {
284
+		if (isset(self::$_autoloaders[$class_name])) {
285
+			self::$_autoloaders[$alias] = self::$_autoloaders[$class_name];
286 286
 		}
287 287
 	}
288 288
 
Please login to merge, or discard this patch.
core/db_classes/EE_Registration.class.php 2 patches
Spacing   +188 added lines, -188 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * EE_Registration class
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
 	 *                             		    date_format and the second value is the time format
42 42
 	 * @return EE_Registration
43 43
 	 */
44
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
45
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
46
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
44
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
45
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
46
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
47 47
 	}
48 48
 
49 49
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 	 *                          		the website will be used.
55 55
 	 * @return EE_Registration
56 56
 	 */
57
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
58
-		return new self( $props_n_values, TRUE, $timezone );
57
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
58
+		return new self($props_n_values, TRUE, $timezone);
59 59
 	}
60 60
 
61 61
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 	 * @access        public
67 67
 	 * @param        int $EVT_ID Event ID
68 68
 	 */
69
-	public function set_event( $EVT_ID = 0 ) {
70
-		$this->set( 'EVT_ID', $EVT_ID );
69
+	public function set_event($EVT_ID = 0) {
70
+		$this->set('EVT_ID', $EVT_ID);
71 71
 	}
72 72
 
73 73
 
@@ -78,18 +78,18 @@  discard block
 block discarded – undo
78 78
 	 * @param mixed  $field_value
79 79
 	 * @param bool   $use_default
80 80
 	 */
81
-	public function set( $field_name, $field_value, $use_default = FALSE ) {
82
-		switch( $field_name ) {
81
+	public function set($field_name, $field_value, $use_default = FALSE) {
82
+		switch ($field_name) {
83 83
 			case 'REG_code' :
84
-				if ( ! empty( $field_value ) && $this->reg_code() == '' ) {
85
-					$this->set_reg_code( $field_value, $use_default );
84
+				if ( ! empty($field_value) && $this->reg_code() == '') {
85
+					$this->set_reg_code($field_value, $use_default);
86 86
 				}
87 87
 				break;
88 88
 			case 'STS_ID' :
89
-				$this->set_status( $field_value, $use_default );
89
+				$this->set_status($field_value, $use_default);
90 90
 				break;
91 91
 			default :
92
-				parent::set( $field_name, $field_value, $use_default );
92
+				parent::set($field_name, $field_value, $use_default);
93 93
 		}
94 94
 	}
95 95
 
@@ -106,30 +106,30 @@  discard block
 block discarded – undo
106 106
 	 * @param boolean $use_default
107 107
 	 * @return bool
108 108
 	 */
109
-	public function set_status( $new_STS_ID = NULL, $use_default = FALSE ) {
109
+	public function set_status($new_STS_ID = NULL, $use_default = FALSE) {
110 110
 		// get current REG_Status
111 111
 		$old_STS_ID = $this->status_ID();
112 112
 		// if status has changed
113
-		if ( $old_STS_ID != $new_STS_ID  ) {
113
+		if ($old_STS_ID != $new_STS_ID) {
114 114
 			// TO approved
115
-			if ( $new_STS_ID == EEM_Registration::status_id_approved ) {
115
+			if ($new_STS_ID == EEM_Registration::status_id_approved) {
116 116
 				// reserve a space by incrementing ticket and datetime sold values
117 117
 				$this->_reserve_registration_space();
118
-				do_action( 'AHEE__EE_Registration__set_status__to_approved', $this, $old_STS_ID, $new_STS_ID );
118
+				do_action('AHEE__EE_Registration__set_status__to_approved', $this, $old_STS_ID, $new_STS_ID);
119 119
 			// OR FROM  approved
120
-			} else if ( $old_STS_ID == EEM_Registration::status_id_approved ) {
120
+			} else if ($old_STS_ID == EEM_Registration::status_id_approved) {
121 121
 				// release a space by decrementing ticket and datetime sold values
122 122
 				$this->_release_registration_space();
123
-				do_action( 'AHEE__EE_Registration__set_status__from_approved', $this, $old_STS_ID, $new_STS_ID );
123
+				do_action('AHEE__EE_Registration__set_status__from_approved', $this, $old_STS_ID, $new_STS_ID);
124 124
 			}
125 125
 			// update status
126
-			parent::set( 'STS_ID', $new_STS_ID, $use_default );
127
-			do_action( 'AHEE__EE_Registration__set_status__after_update', $this );
126
+			parent::set('STS_ID', $new_STS_ID, $use_default);
127
+			do_action('AHEE__EE_Registration__set_status__after_update', $this);
128 128
 			return TRUE;
129
-		}else{
129
+		} else {
130 130
 			//even though the old value matches the new value, it's still good to
131 131
 			//allow the parent set method to have a say
132
-			parent::set( 'STS_ID', $new_STS_ID, $use_default );
132
+			parent::set('STS_ID', $new_STS_ID, $use_default);
133 133
 			return TRUE;
134 134
 		}
135 135
 	}
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @access        public
142 142
 	 */
143 143
 	public function status_ID() {
144
-		return $this->get( 'STS_ID' );
144
+		return $this->get('STS_ID');
145 145
 	}
146 146
 
147 147
 
@@ -166,12 +166,12 @@  discard block
 block discarded – undo
166 166
 	 * @param boolean $include_archived whether to include archived tickets or not.
167 167
 	 * @return EE_Ticket
168 168
 	 */
169
-	public function ticket( $include_archived = TRUE ) {
169
+	public function ticket($include_archived = TRUE) {
170 170
 		$query_params = array();
171
-		if ( $include_archived ) {
172
-			$query_params[ 'default_where_conditions' ] = 'none';
171
+		if ($include_archived) {
172
+			$query_params['default_where_conditions'] = 'none';
173 173
 		}
174
-		return $this->get_first_related( 'Ticket', $query_params );
174
+		return $this->get_first_related('Ticket', $query_params);
175 175
 	}
176 176
 
177 177
 
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 * @return EE_Event
182 182
 	 */
183 183
 	public function event() {
184
-		return $this->get_first_related( 'Event' );
184
+		return $this->get_first_related('Event');
185 185
 	}
186 186
 
187 187
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	public function wp_user() {
197 197
 		$event = $this->event();
198
-		if ( $event instanceof EE_Event ) {
198
+		if ($event instanceof EE_Event) {
199 199
 			return $event->wp_user();
200 200
 		}
201 201
 		return 0;
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 	 * @access        public
222 222
 	 * @param        int $ATT_ID Attendee ID
223 223
 	 */
224
-	public function set_attendee_id( $ATT_ID = 0 ) {
225
-		$this->set( 'ATT_ID', $ATT_ID );
224
+	public function set_attendee_id($ATT_ID = 0) {
225
+		$this->set('ATT_ID', $ATT_ID);
226 226
 	}
227 227
 
228 228
 
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 * @access        public
234 234
 	 * @param        int $TXN_ID Transaction ID
235 235
 	 */
236
-	public function set_transaction_id( $TXN_ID = 0 ) {
237
-		$this->set( 'TXN_ID', $TXN_ID );
236
+	public function set_transaction_id($TXN_ID = 0) {
237
+		$this->set('TXN_ID', $TXN_ID);
238 238
 	}
239 239
 
240 240
 
@@ -245,8 +245,8 @@  discard block
 block discarded – undo
245 245
 	 * @access    public
246 246
 	 * @param    string $REG_session PHP Session ID
247 247
 	 */
248
-	public function set_session( $REG_session = '' ) {
249
-		$this->set( 'REG_session', $REG_session );
248
+	public function set_session($REG_session = '') {
249
+		$this->set('REG_session', $REG_session);
250 250
 	}
251 251
 
252 252
 
@@ -257,8 +257,8 @@  discard block
 block discarded – undo
257 257
 	 * @access    public
258 258
 	 * @param    string $REG_url_link Registration URL Link
259 259
 	 */
260
-	public function set_reg_url_link( $REG_url_link = '' ) {
261
-		$this->set( 'REG_url_link', $REG_url_link );
260
+	public function set_reg_url_link($REG_url_link = '') {
261
+		$this->set('REG_url_link', $REG_url_link);
262 262
 	}
263 263
 
264 264
 
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
 	 * @access        public
270 270
 	 * @param        int $REG_count Primary Attendee
271 271
 	 */
272
-	public function set_count( $REG_count = 1 ) {
273
-		$this->set( 'REG_count', $REG_count );
272
+	public function set_count($REG_count = 1) {
273
+		$this->set('REG_count', $REG_count);
274 274
 	}
275 275
 
276 276
 
@@ -281,8 +281,8 @@  discard block
 block discarded – undo
281 281
 	 * @access        public
282 282
 	 * @param        boolean $REG_group_size Group Registration
283 283
 	 */
284
-	public function set_group_size( $REG_group_size = FALSE ) {
285
-		$this->set( 'REG_group_size', $REG_group_size );
284
+	public function set_group_size($REG_group_size = FALSE) {
285
+		$this->set('REG_group_size', $REG_group_size);
286 286
 	}
287 287
 
288 288
 
@@ -365,8 +365,8 @@  discard block
 block discarded – undo
365 365
 	 * @access        public
366 366
 	 * @param        mixed ( int or string ) $REG_date Registration Date - Unix timestamp or string representation of Date
367 367
 	 */
368
-	public function set_reg_date( $REG_date = FALSE ) {
369
-		$this->set( 'REG_date', $REG_date );
368
+	public function set_reg_date($REG_date = FALSE) {
369
+		$this->set('REG_date', $REG_date);
370 370
 	}
371 371
 
372 372
 
@@ -377,8 +377,8 @@  discard block
 block discarded – undo
377 377
 	 * @access    public
378 378
 	 * @param    float $REG_final_price
379 379
 	 */
380
-	public function set_final_price( $REG_final_price = 0.00 ) {
381
-		$this->set( 'REG_final_price', $REG_final_price );
380
+	public function set_final_price($REG_final_price = 0.00) {
381
+		$this->set('REG_final_price', $REG_final_price);
382 382
 	}
383 383
 
384 384
 
@@ -389,8 +389,8 @@  discard block
 block discarded – undo
389 389
 	 * @access    public
390 390
 	 * @param    float $REG_paid
391 391
 	 */
392
-	public function set_paid( $REG_paid = 0.00 ) {
393
-		$this->set( 'REG_paid', $REG_paid );
392
+	public function set_paid($REG_paid = 0.00) {
393
+		$this->set('REG_paid', $REG_paid);
394 394
 	}
395 395
 
396 396
 
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
 	 * @access        public
402 402
 	 * @param        boolean $REG_att_is_going Attendee Is Going
403 403
 	 */
404
-	public function set_att_is_going( $REG_att_is_going = FALSE ) {
405
-		$this->set( 'REG_att_is_going', $REG_att_is_going );
404
+	public function set_att_is_going($REG_att_is_going = FALSE) {
405
+		$this->set('REG_att_is_going', $REG_att_is_going);
406 406
 	}
407 407
 
408 408
 
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 	 * @return EE_Attendee
413 413
 	 */
414 414
 	public function attendee() {
415
-		return $this->get_first_related( 'Attendee' );
415
+		return $this->get_first_related('Attendee');
416 416
 	}
417 417
 
418 418
 
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 	 * @access        public
423 423
 	 */
424 424
 	public function event_ID() {
425
-		return $this->get( 'EVT_ID' );
425
+		return $this->get('EVT_ID');
426 426
 	}
427 427
 
428 428
 
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 	 */
434 434
 	public function event_name() {
435 435
 		$event = $this->event_obj();
436
-		if ( $event ) {
436
+		if ($event) {
437 437
 			return $event->name();
438 438
 		} else {
439 439
 			return NULL;
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 	 * @return EE_Event
448 448
 	 */
449 449
 	public function event_obj() {
450
-		return $this->get_first_related( 'Event' );
450
+		return $this->get_first_related('Event');
451 451
 	}
452 452
 
453 453
 
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 	 * @access        public
458 458
 	 */
459 459
 	public function attendee_ID() {
460
-		return $this->get( 'ATT_ID' );
460
+		return $this->get('ATT_ID');
461 461
 	}
462 462
 
463 463
 
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 	 * @access        public
468 468
 	 */
469 469
 	public function session_ID() {
470
-		return $this->get( 'REG_session' );
470
+		return $this->get('REG_session');
471 471
 	}
472 472
 
473 473
 
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 	 * @param string $messenger 'pdf' or 'html'.  Default 'html'.
478 478
 	 * @return string
479 479
 	 */
480
-	public function receipt_url( $messenger = 'html' ) {
480
+	public function receipt_url($messenger = 'html') {
481 481
 
482 482
 		/**
483 483
 		 * The below will be deprecated one version after this.  We check first if there is a custom receipt template already in use on old system.  If there is then we just return the standard url for it.
@@ -485,12 +485,12 @@  discard block
 block discarded – undo
485 485
 		 * @since 4.5.0
486 486
 		 */
487 487
 		$template_relative_path = 'modules/gateways/Invoice/lib/templates/receipt_body.template.php';
488
-		$has_custom = EEH_Template::locate_template( $template_relative_path , array(), TRUE, TRUE, TRUE );
488
+		$has_custom = EEH_Template::locate_template($template_relative_path, array(), TRUE, TRUE, TRUE);
489 489
 
490
-		if ( $has_custom ) {
491
-			return add_query_arg( array( 'receipt' => 'true' ), $this->invoice_url( 'launch' ) );
490
+		if ($has_custom) {
491
+			return add_query_arg(array('receipt' => 'true'), $this->invoice_url('launch'));
492 492
 		}
493
-		return apply_filters( 'FHEE__EE_Registration__receipt_url__receipt_url', '', $this, $messenger, 'receipt' );
493
+		return apply_filters('FHEE__EE_Registration__receipt_url__receipt_url', '', $this, $messenger, 'receipt');
494 494
 	}
495 495
 
496 496
 
@@ -501,28 +501,28 @@  discard block
 block discarded – undo
501 501
 	 * @param string $messenger 'pdf' or 'html'.  Default 'html'.
502 502
 	 * @return string
503 503
 	 */
504
-	public function invoice_url( $messenger = 'html' ) {
504
+	public function invoice_url($messenger = 'html') {
505 505
 		/**
506 506
 		 * The below will be deprecated one version after this.  We check first if there is a custom invoice template already in use on old system.  If there is then we just return the standard url for it.
507 507
 		 *
508 508
 		 * @since 4.5.0
509 509
 		 */
510 510
 		$template_relative_path = 'modules/gateways/Invoice/lib/templates/invoice_body.template.php';
511
-		$has_custom = EEH_Template::locate_template( $template_relative_path , array(), TRUE, TRUE, TRUE );
511
+		$has_custom = EEH_Template::locate_template($template_relative_path, array(), TRUE, TRUE, TRUE);
512 512
 
513
-		if ( $has_custom ) {
514
-			if ( $messenger == 'html' ) {
515
-				return $this->invoice_url( 'launch' );
513
+		if ($has_custom) {
514
+			if ($messenger == 'html') {
515
+				return $this->invoice_url('launch');
516 516
 			}
517 517
 			$route = $messenger == 'download' || $messenger == 'pdf' ? 'download_invoice' : 'launch_invoice';
518 518
 
519
-			$query_args = array( 'ee' => $route, 'id' => $this->reg_url_link() );
520
-			if ( $messenger == 'html' ) {
519
+			$query_args = array('ee' => $route, 'id' => $this->reg_url_link());
520
+			if ($messenger == 'html') {
521 521
 				$query_args['html'] = TRUE;
522 522
 			}
523
-			return add_query_arg( $query_args, get_permalink( EE_Registry::instance()->CFG->core->thank_you_page_id ) );
523
+			return add_query_arg($query_args, get_permalink(EE_Registry::instance()->CFG->core->thank_you_page_id));
524 524
 		}
525
-		return apply_filters( 'FHEE__EE_Registration__invoice_url__invoice_url', '', $this, $messenger, 'invoice' );
525
+		return apply_filters('FHEE__EE_Registration__invoice_url__invoice_url', '', $this, $messenger, 'invoice');
526 526
 	}
527 527
 
528 528
 
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 	 * @throws \EE_Error
536 536
 	 */
537 537
 	public function reg_url_link() {
538
-		return (string)$this->get( 'REG_url_link' );
538
+		return (string) $this->get('REG_url_link');
539 539
 	}
540 540
 
541 541
 
@@ -545,8 +545,8 @@  discard block
 block discarded – undo
545 545
 	 * @param string $type 'download','launch', or 'html' (default is 'launch')
546 546
 	 * @return void
547 547
 	 */
548
-	public function e_invoice_url( $type = 'launch' ) {
549
-		echo $this->invoice_url( $type );
548
+	public function e_invoice_url($type = 'launch') {
549
+		echo $this->invoice_url($type);
550 550
 	}
551 551
 
552 552
 
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 	 * @return string
567 567
 	 */
568 568
 	public function payment_overview_url() {
569
-		return add_query_arg( array( 'e_reg_url_link' => $this->reg_url_link(), 'step' => 'payment_options', 'revisit' => TRUE ), EE_Registry::instance()->CFG->core->reg_page_url() );
569
+		return add_query_arg(array('e_reg_url_link' => $this->reg_url_link(), 'step' => 'payment_options', 'revisit' => TRUE), EE_Registry::instance()->CFG->core->reg_page_url());
570 570
 	}
571 571
 
572 572
 
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 	 * @return string
578 578
 	 */
579 579
 	public function edit_attendee_information_url() {
580
-		return add_query_arg( array( 'e_reg_url_link' => $this->reg_url_link(), 'step' => 'attendee_information', 'revisit' => TRUE ), EE_Registry::instance()->CFG->core->reg_page_url() );
580
+		return add_query_arg(array('e_reg_url_link' => $this->reg_url_link(), 'step' => 'attendee_information', 'revisit' => TRUE), EE_Registry::instance()->CFG->core->reg_page_url());
581 581
 	}
582 582
 
583 583
 
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 	 * @return string
588 588
 	 */
589 589
 	public function get_admin_edit_url() {
590
-		return EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_registrations', 'action' => 'view_registration', '_REG_ID' => $this->ID() ), admin_url( 'admin.php' ) );
590
+		return EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_registrations', 'action' => 'view_registration', '_REG_ID' => $this->ID()), admin_url('admin.php'));
591 591
 	}
592 592
 
593 593
 
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 * @access        public
598 598
 	 */
599 599
 	public function is_primary_registrant() {
600
-		return $this->get( 'REG_count' ) == 1 ? TRUE : FALSE;
600
+		return $this->get('REG_count') == 1 ? TRUE : FALSE;
601 601
 	}
602 602
 
603 603
 
@@ -606,12 +606,12 @@  discard block
 block discarded – undo
606 606
 	 * This returns the primary registration object for this registration group (which may be this object).
607 607
 	 * @return EE_Registration
608 608
 	 */
609
-	public function get_primary_registration()  {
610
-		if ( $this->is_primary_registrant() )
609
+	public function get_primary_registration() {
610
+		if ($this->is_primary_registrant())
611 611
 			return $this;
612 612
 
613 613
 		//k reg_count !== 1 so let's get the EE_Registration object matching this txn_id and reg_count == 1
614
-		$primary_registrant = EEM_Registration::instance()->get_one( array( array('TXN_ID' => $this->transaction_ID(), 'REG_count' => 1 ) ) );
614
+		$primary_registrant = EEM_Registration::instance()->get_one(array(array('TXN_ID' => $this->transaction_ID(), 'REG_count' => 1)));
615 615
 		return $primary_registrant;
616 616
 	}
617 617
 
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 	* 		@access		public
623 623
 	*/
624 624
 	public function count() {
625
-		return $this->get( 'REG_count' );
625
+		return $this->get('REG_count');
626 626
 	}
627 627
 
628 628
 
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
 	 * @access        public
633 633
 	 */
634 634
 	public function group_size() {
635
-		return $this->get( 'REG_group_size' );
635
+		return $this->get('REG_group_size');
636 636
 	}
637 637
 
638 638
 
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 	 * @access        public
643 643
 	 */
644 644
 	public function date() {
645
-		return $this->get( 'REG_date' );
645
+		return $this->get('REG_date');
646 646
 	}
647 647
 
648 648
 
@@ -653,8 +653,8 @@  discard block
 block discarded – undo
653 653
 	 * @param string $time_format
654 654
 	 * @return string
655 655
 	 */
656
-	public function pretty_date( $date_format = NULL, $time_format = NULL ) {
657
-		return $this->get_datetime( 'REG_date', $date_format, $time_format );
656
+	public function pretty_date($date_format = NULL, $time_format = NULL) {
657
+		return $this->get_datetime('REG_date', $date_format, $time_format);
658 658
 	}
659 659
 
660 660
 
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
 	 * @return    float
668 668
 	 */
669 669
 	public function final_price() {
670
-		return $this->get( 'REG_final_price' );
670
+		return $this->get('REG_final_price');
671 671
 	}
672 672
 
673 673
 
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 	 * @return string
679 679
 	 */
680 680
 	public function pretty_final_price() {
681
-		return $this->get_pretty( 'REG_final_price' );
681
+		return $this->get_pretty('REG_final_price');
682 682
 	}
683 683
 
684 684
 
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
 	 * @return 	float
690 690
 	 */
691 691
 	public function paid() {
692
-		return $this->get( 'REG_paid' );
692
+		return $this->get('REG_paid');
693 693
 	}
694 694
 
695 695
 
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 	 * @return 	float
701 701
 	 */
702 702
 	public function pretty_paid() {
703
-		return $this->get_pretty( 'REG_paid' );
703
+		return $this->get_pretty('REG_paid');
704 704
 	}
705 705
 
706 706
 
@@ -712,11 +712,11 @@  discard block
 block discarded – undo
712 712
 	 * @param array $requires_payment
713 713
 	 * @return bool
714 714
 	 */
715
-	public function owes_monies_and_can_pay( $requires_payment = array()) {
715
+	public function owes_monies_and_can_pay($requires_payment = array()) {
716 716
 		// these reg statuses require payment (if event is not free)
717
-		$requires_payment = ! empty( $requires_payment ) ? $requires_payment : EEM_Registration::reg_statuses_that_allow_payment();
717
+		$requires_payment = ! empty($requires_payment) ? $requires_payment : EEM_Registration::reg_statuses_that_allow_payment();
718 718
 		if (
719
-			in_array( $this->status_ID(), $requires_payment ) &&
719
+			in_array($this->status_ID(), $requires_payment) &&
720 720
 			$this->final_price() != 0 &&
721 721
 			$this->final_price() != $this->paid()
722 722
 		) {
@@ -733,8 +733,8 @@  discard block
 block discarded – undo
733 733
 	 * @param bool $show_icons
734 734
 	 * @return void
735 735
 	 */
736
-	public function e_pretty_status( $show_icons = FALSE ) {
737
-		echo $this->pretty_status( $show_icons );
736
+	public function e_pretty_status($show_icons = FALSE) {
737
+		echo $this->pretty_status($show_icons);
738 738
 	}
739 739
 
740 740
 
@@ -745,10 +745,10 @@  discard block
 block discarded – undo
745 745
 	 * @param bool $show_icons
746 746
 	 * @return string
747 747
 	 */
748
-	public function pretty_status( $show_icons = FALSE ) {
749
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
748
+	public function pretty_status($show_icons = FALSE) {
749
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
750 750
 		$icon = '';
751
-		switch ( $this->status_ID() ) {
751
+		switch ($this->status_ID()) {
752 752
 			case EEM_Registration::status_id_approved:
753 753
 				$icon = $show_icons ? '<span class="dashicons dashicons-star-filled ee-icon-size-16 green-text"></span>' : '';
754 754
 				break;
@@ -768,7 +768,7 @@  discard block
 block discarded – undo
768 768
 				$icon = $show_icons ? '<span class="dashicons dashicons-no ee-icon-size-16 red-text"></span>' : '';
769 769
 				break;
770 770
 		}
771
-		return $icon . $status[ $this->status_ID() ];
771
+		return $icon.$status[$this->status_ID()];
772 772
 	}
773 773
 
774 774
 
@@ -778,7 +778,7 @@  discard block
 block discarded – undo
778 778
 	 * @access        public
779 779
 	 */
780 780
 	public function att_is_going() {
781
-		return $this->get( 'REG_att_is_going' );
781
+		return $this->get('REG_att_is_going');
782 782
 	}
783 783
 
784 784
 
@@ -788,8 +788,8 @@  discard block
 block discarded – undo
788 788
 	 * @param array $query_params like EEM_Base::get_all
789 789
 	 * @return EE_Answer[]
790 790
 	 */
791
-	public function answers( $query_params = NULL ) {
792
-		return $this->get_many_related( 'Answer', $query_params );
791
+	public function answers($query_params = NULL) {
792
+		return $this->get_many_related('Answer', $query_params);
793 793
 	}
794 794
 
795 795
 
@@ -803,9 +803,9 @@  discard block
 block discarded – undo
803 803
 	 * (because the answer might be an array of answer values, so passing pretty_value=true
804 804
 	 * will convert it into some kind of string)
805 805
 	 */
806
-	public function answer_value_to_question( $question, $pretty_value=true ) {
806
+	public function answer_value_to_question($question, $pretty_value = true) {
807 807
 		$question_id = EEM_Question::instance()->ensure_is_ID($question);
808
-		return EEM_Answer::instance()->get_answer_value_to_question($this,$question_id,$pretty_value);
808
+		return EEM_Answer::instance()->get_answer_value_to_question($this, $question_id, $pretty_value);
809 809
 	}
810 810
 
811 811
 
@@ -818,13 +818,13 @@  discard block
 block discarded – undo
818 818
 	 */
819 819
 	public function question_groups() {
820 820
 		$question_groups = array();
821
-		if ( $this->event() instanceof EE_Event ) {
821
+		if ($this->event() instanceof EE_Event) {
822 822
 			$question_groups = $this->event()->question_groups(
823 823
 				array(
824 824
 					array(
825 825
 						'Event_Question_Group.EQG_primary' => $this->count() == 1 ? true : false
826 826
 					),
827
-					'order_by' => array( 'QSG_order' => 'ASC' )
827
+					'order_by' => array('QSG_order' => 'ASC')
828 828
 				)
829 829
 			);
830 830
 		}
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 	 */
842 842
 	public function count_question_groups() {
843 843
 		$qg_count = 0;
844
-		if ( $this->event() instanceof EE_Event ) {
844
+		if ($this->event() instanceof EE_Event) {
845 845
 			$qg_count = $this->event()->count_related(
846 846
 				'Question_Group',
847 847
 				array(
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
 	 * @return string
863 863
 	 */
864 864
 	public function reg_date() {
865
-		return $this->get_datetime( 'REG_date' );
865
+		return $this->get_datetime('REG_date');
866 866
 	}
867 867
 
868 868
 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 	 * @return EE_Datetime_Ticket
875 875
 	 */
876 876
 	public function datetime_ticket() {
877
-		return $this->get_first_related( 'Datetime_Ticket' );
877
+		return $this->get_first_related('Datetime_Ticket');
878 878
 	}
879 879
 
880 880
 
@@ -884,15 +884,15 @@  discard block
 block discarded – undo
884 884
 	 * @param EE_Datetime_Ticket $datetime_ticket
885 885
 	 * @return EE_Datetime_Ticket
886 886
 	 */
887
-	public function set_datetime_ticket( $datetime_ticket ) {
888
-		return $this->_add_relation_to( $datetime_ticket, 'Datetime_Ticket' );
887
+	public function set_datetime_ticket($datetime_ticket) {
888
+		return $this->_add_relation_to($datetime_ticket, 'Datetime_Ticket');
889 889
 	}
890 890
 	/**
891 891
 	 * Gets deleted
892 892
 	 * @return boolean
893 893
 	 */
894 894
 	public function deleted() {
895
-		return $this->get( 'REG_deleted' );
895
+		return $this->get('REG_deleted');
896 896
 	}
897 897
 
898 898
 	/**
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 	 * @return boolean
902 902
 	 */
903 903
 	public function set_deleted($deleted) {
904
-		$this->set( 'REG_deleted', $deleted );
904
+		$this->set('REG_deleted', $deleted);
905 905
 	}
906 906
 
907 907
 
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 	 * @return EE_Status
912 912
 	 */
913 913
 	public function status_obj() {
914
-		return $this->get_first_related( 'Status' );
914
+		return $this->get_first_related('Status');
915 915
 	}
916 916
 
917 917
 
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
922 922
 	 * @return int
923 923
 	 */
924 924
 	public function count_checkins() {
925
-		return $this->get_model()->count_related( $this, 'Checkin' );
925
+		return $this->get_model()->count_related($this, 'Checkin');
926 926
 	}
927 927
 
928 928
 
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
 	 * @return int
933 933
 	 */
934 934
 	public function count_checkins_not_checkedout() {
935
-		return $this->get_model()->count_related( $this, 'Checkin', array( array( 'CHK_in' => 1 ) ) );
935
+		return $this->get_model()->count_related($this, 'Checkin', array(array('CHK_in' => 1)));
936 936
 	}
937 937
 
938 938
 
@@ -945,20 +945,20 @@  discard block
 block discarded – undo
945 945
 	 *
946 946
 	 * @return bool
947 947
 	 */
948
-	public function can_checkin( $DTT_OR_ID, $check_approved = TRUE ) {
949
-		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID( $DTT_OR_ID );
948
+	public function can_checkin($DTT_OR_ID, $check_approved = TRUE) {
949
+		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID($DTT_OR_ID);
950 950
 
951 951
 		//first check registration status
952
-		if (  ( $check_approved && ! $this->is_approved() ) || ! $DTT_ID ) {
952
+		if (($check_approved && ! $this->is_approved()) || ! $DTT_ID) {
953 953
 			return false;
954 954
 		}
955 955
 		//is there a datetime ticket that matches this dtt_ID?
956
-		if ( ! ( EEM_Datetime_Ticket::instance()->exists( array( array( 'TKT_ID' => $this->get('TKT_ID' ), 'DTT_ID' => $DTT_ID ) ) ) ) ) {
956
+		if ( ! (EEM_Datetime_Ticket::instance()->exists(array(array('TKT_ID' => $this->get('TKT_ID'), 'DTT_ID' => $DTT_ID))))) {
957 957
 			return false;
958 958
 		}
959 959
 
960 960
 		//final check is against TKT_uses
961
-		return $this->verify_can_checkin_against_TKT_uses( $DTT_ID );
961
+		return $this->verify_can_checkin_against_TKT_uses($DTT_ID);
962 962
 	}
963 963
 
964 964
 
@@ -971,10 +971,10 @@  discard block
 block discarded – undo
971 971
 	 * @param int | EE_Datetime  $DTT_OR_ID  The datetime the registration is being checked against
972 972
 	 * @return bool   true means can checkin.  false means cannot checkin.
973 973
 	 */
974
-	public function verify_can_checkin_against_TKT_uses( $DTT_OR_ID ) {
975
-		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID( $DTT_OR_ID );
974
+	public function verify_can_checkin_against_TKT_uses($DTT_OR_ID) {
975
+		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID($DTT_OR_ID);
976 976
 
977
-		if ( ! $DTT_ID ) {
977
+		if ( ! $DTT_ID) {
978 978
 			return false;
979 979
 		}
980 980
 
@@ -982,23 +982,23 @@  discard block
 block discarded – undo
982 982
 
983 983
 		// if max uses is not set or equals infinity then return true cause its not a factor for whether user can check-in
984 984
 		// or not.
985
-		if ( ! $max_uses || $max_uses === EE_INF ) {
985
+		if ( ! $max_uses || $max_uses === EE_INF) {
986 986
 			return true;
987 987
 		}
988 988
 
989 989
 		//does this datetime have a checkin record?  If so, then the dtt count has already been verified so we can just
990 990
 		//go ahead and toggle.
991
-		if ( EEM_Checkin::instance()->exists( array( array( 'REG_ID' => $this->ID(), 'DTT_ID' => $DTT_ID ) ) ) ) {
991
+		if (EEM_Checkin::instance()->exists(array(array('REG_ID' => $this->ID(), 'DTT_ID' => $DTT_ID)))) {
992 992
 			return true;
993 993
 		}
994 994
 
995 995
 		//made it here so the last check is whether the number of checkins per unique datetime on this registration
996 996
 		//disallows further check-ins.
997
-		$count_unique_dtt_checkins = EEM_Checkin::instance()->count( array( array( 'REG_ID' => $this->ID(), 'CHK_in' => true ) ), 'DTT_ID', true );
997
+		$count_unique_dtt_checkins = EEM_Checkin::instance()->count(array(array('REG_ID' => $this->ID(), 'CHK_in' => true)), 'DTT_ID', true);
998 998
 		// checkins have already reached their max number of uses
999 999
 		// so registrant can NOT checkin
1000
-		if ( $count_unique_dtt_checkins >= $max_uses ) {
1001
-			EE_Error::add_error( __( 'Check-in denied because number of datetime uses for the ticket has been reached or exceeded.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
1000
+		if ($count_unique_dtt_checkins >= $max_uses) {
1001
+			EE_Error::add_error(__('Check-in denied because number of datetime uses for the ticket has been reached or exceeded.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
1002 1002
 			return false;
1003 1003
 		}
1004 1004
 		return true;
@@ -1019,15 +1019,15 @@  discard block
 block discarded – undo
1019 1019
 	 * @param  bool $verify  If true then can_checkin() is used to verify whether the person can be checked in or not.  Otherwise this forces change in checkin status.
1020 1020
 	 * @return int|BOOL            the chk_in status toggled to OR false if nothing got changed.
1021 1021
 	 */
1022
-	public function toggle_checkin_status( $DTT_ID = null, $verify = false ) {
1023
-		if ( empty( $DTT_ID ) ) {
1022
+	public function toggle_checkin_status($DTT_ID = null, $verify = false) {
1023
+		if (empty($DTT_ID)) {
1024 1024
 			$datetime = $this->get_related_primary_datetime();
1025 1025
 			$DTT_ID = $datetime->ID();
1026 1026
 		// verify the registration can checkin for the given DTT_ID
1027
-		} elseif ( ! $this->can_checkin( $DTT_ID, $verify ) ) {
1027
+		} elseif ( ! $this->can_checkin($DTT_ID, $verify)) {
1028 1028
 			EE_Error::add_error(
1029 1029
 					sprintf(
1030
-						__( 'The given registration (ID:%1$d) can not be checked in to the given DTT_ID (%2$d), because the registration does not have access', 'event_espresso'),
1030
+						__('The given registration (ID:%1$d) can not be checked in to the given DTT_ID (%2$d), because the registration does not have access', 'event_espresso'),
1031 1031
 						$this->ID(),
1032 1032
 						$DTT_ID
1033 1033
 					),
@@ -1041,8 +1041,8 @@  discard block
 block discarded – undo
1041 1041
 			EE_Registration::checkin_status_out => EE_Registration::checkin_status_in
1042 1042
 		);
1043 1043
 		//start by getting the current status so we know what status we'll be changing to.
1044
-		$cur_status = $this->check_in_status_for_datetime( $DTT_ID, NULL );
1045
-		$status_to = $status_paths[ $cur_status ];
1044
+		$cur_status = $this->check_in_status_for_datetime($DTT_ID, NULL);
1045
+		$status_to = $status_paths[$cur_status];
1046 1046
 		// database only records true for checked IN or false for checked OUT
1047 1047
 		// no record ( null ) means checked in NEVER, but we obviously don't save that
1048 1048
 		$new_status = $status_to == EE_Registration::checkin_status_in ? true : false;
@@ -1050,24 +1050,24 @@  discard block
 block discarded – undo
1050 1050
 		// because we are keeping track of Check-ins over time.
1051 1051
 		// Eventually we'll probably want to show a list table
1052 1052
 		// for the individual Check-ins so that they can be managed.
1053
-		$checkin = EE_Checkin::new_instance( array(
1053
+		$checkin = EE_Checkin::new_instance(array(
1054 1054
 				'REG_ID' => $this->ID(),
1055 1055
 				'DTT_ID' => $DTT_ID,
1056 1056
 				'CHK_in' => $new_status
1057
-		) );
1057
+		));
1058 1058
 		// if the record could not be saved then return false
1059
-		if ( $checkin->save() === 0 ) {
1060
-			if ( WP_DEBUG ) {
1059
+		if ($checkin->save() === 0) {
1060
+			if (WP_DEBUG) {
1061 1061
 				global $wpdb;
1062 1062
 				$error = sprintf(
1063
-					__( 'Registration check in update failed because of the following database error: %1$s%2$s', 'event_espresso' ),
1063
+					__('Registration check in update failed because of the following database error: %1$s%2$s', 'event_espresso'),
1064 1064
 					'<br />',
1065 1065
 					$wpdb->last_error
1066 1066
 				);
1067 1067
 			} else {
1068
-				$error = __( 'Registration check in update failed because of an unknown database error', 'event_espresso' );
1068
+				$error = __('Registration check in update failed because of an unknown database error', 'event_espresso');
1069 1069
 			}
1070
-			EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
1070
+			EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
1071 1071
 			return false;
1072 1072
 		}
1073 1073
 		return $status_to;
@@ -1091,19 +1091,19 @@  discard block
 block discarded – undo
1091 1091
 	 * @param EE_Checkin $checkin If present, we use the given checkin object rather than the dtt_id.
1092 1092
 	 * @return int            Integer representing Check-in status.
1093 1093
 	 */
1094
-	public function check_in_status_for_datetime( $DTT_ID = 0, $checkin = NULL ) {
1095
-		if ( empty( $DTT_ID ) && ! $checkin instanceof EE_Checkin ) {
1094
+	public function check_in_status_for_datetime($DTT_ID = 0, $checkin = NULL) {
1095
+		if (empty($DTT_ID) && ! $checkin instanceof EE_Checkin) {
1096 1096
 			$datetime = $this->get_related_primary_datetime();
1097
-			if ( ! $datetime instanceof EE_Datetime ) {
1097
+			if ( ! $datetime instanceof EE_Datetime) {
1098 1098
 				return 0;
1099 1099
 			}
1100 1100
 			$DTT_ID = $datetime->ID();
1101 1101
 		//verify the registration can checkin for the given DTT_ID
1102 1102
 		}
1103 1103
 		//get checkin object (if exists)
1104
-		$checkin = $checkin instanceof EE_Checkin ? $checkin : $this->get_first_related( 'Checkin', array( array( 'DTT_ID' => $DTT_ID ), 'order_by' => array( 'CHK_timestamp' => 'DESC' ) ) );
1105
-		if ( $checkin instanceof EE_Checkin ) {
1106
-			if ( $checkin->get( 'CHK_in' ) ) {
1104
+		$checkin = $checkin instanceof EE_Checkin ? $checkin : $this->get_first_related('Checkin', array(array('DTT_ID' => $DTT_ID), 'order_by' => array('CHK_timestamp' => 'DESC')));
1105
+		if ($checkin instanceof EE_Checkin) {
1106
+			if ($checkin->get('CHK_in')) {
1107 1107
 				return EE_Registration::checkin_status_in; //checked in
1108 1108
 			} else {
1109 1109
 				return EE_Registration::checkin_status_out; //had checked in but is now checked out.
@@ -1121,28 +1121,28 @@  discard block
 block discarded – undo
1121 1121
 	 * @param bool $error  This just flags that you want an error message returned. This is put in so that the error message can be customized with the attendee name.
1122 1122
 	 * @return string         internationalized message
1123 1123
 	 */
1124
-	public function get_checkin_msg( $DTT_ID, $error = FALSE ) {
1124
+	public function get_checkin_msg($DTT_ID, $error = FALSE) {
1125 1125
 		//let's get the attendee first so we can include the name of the attendee
1126
-		$attendee = $this->get_first_related( 'Attendee' );
1127
-		if ( $attendee instanceof EE_Attendee ) {
1128
-			if ( $error ) {
1129
-				return sprintf( __( "%s's check-in status was not changed.", "event_espresso" ), $attendee->full_name() );
1126
+		$attendee = $this->get_first_related('Attendee');
1127
+		if ($attendee instanceof EE_Attendee) {
1128
+			if ($error) {
1129
+				return sprintf(__("%s's check-in status was not changed.", "event_espresso"), $attendee->full_name());
1130 1130
 			}
1131
-			$cur_status = $this->check_in_status_for_datetime( $DTT_ID );
1131
+			$cur_status = $this->check_in_status_for_datetime($DTT_ID);
1132 1132
 			//what is the status message going to be?
1133
-			switch ( $cur_status ) {
1133
+			switch ($cur_status) {
1134 1134
 				case EE_Registration::checkin_status_never :
1135
-					return sprintf( __( "%s has been removed from Check-in records", "event_espresso" ), $attendee->full_name() );
1135
+					return sprintf(__("%s has been removed from Check-in records", "event_espresso"), $attendee->full_name());
1136 1136
 					break;
1137 1137
 				case EE_Registration::checkin_status_in :
1138
-					return sprintf( __( '%s has been checked in', 'event_espresso' ), $attendee->full_name() );
1138
+					return sprintf(__('%s has been checked in', 'event_espresso'), $attendee->full_name());
1139 1139
 					break;
1140 1140
 				case EE_Registration::checkin_status_out :
1141
-					return sprintf( __( '%s has been checked out', 'event_espresso' ), $attendee->full_name() );
1141
+					return sprintf(__('%s has been checked out', 'event_espresso'), $attendee->full_name());
1142 1142
 					break;
1143 1143
 			}
1144 1144
 		}
1145
-		return __( "The check-in status could not be determined.", "event_espresso" );
1145
+		return __("The check-in status could not be determined.", "event_espresso");
1146 1146
 	}
1147 1147
 
1148 1148
 
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
 	 * @return EE_Transaction
1153 1153
 	 */
1154 1154
 	public function transaction() {
1155
-		return $this->get_first_related( 'Transaction' );
1155
+		return $this->get_first_related('Transaction');
1156 1156
 	}
1157 1157
 
1158 1158
 
@@ -1163,7 +1163,7 @@  discard block
 block discarded – undo
1163 1163
 	 * @access        public
1164 1164
 	 */
1165 1165
 	public function reg_code() {
1166
-		return $this->get( 'REG_code' );
1166
+		return $this->get('REG_code');
1167 1167
 	}
1168 1168
 
1169 1169
 
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
1173 1173
 	 * @access        public
1174 1174
 	 */
1175 1175
 	public function transaction_ID() {
1176
-		return $this->get( 'TXN_ID' );
1176
+		return $this->get('TXN_ID');
1177 1177
 	}
1178 1178
 
1179 1179
 
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
 	 * @return int
1183 1183
 	 */
1184 1184
 	public function ticket_ID() {
1185
-		return $this->get( 'TKT_ID' );
1185
+		return $this->get('TKT_ID');
1186 1186
 	}
1187 1187
 
1188 1188
 
@@ -1194,17 +1194,17 @@  discard block
 block discarded – undo
1194 1194
 	 * @param    string $REG_code Registration Code
1195 1195
 	 * @param	boolean $use_default
1196 1196
 	 */
1197
-	public function set_reg_code( $REG_code, $use_default = FALSE ) {
1198
-		if ( empty( $REG_code )) {
1199
-			EE_Error::add_error( __( 'REG_code can not be empty.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
1197
+	public function set_reg_code($REG_code, $use_default = FALSE) {
1198
+		if (empty($REG_code)) {
1199
+			EE_Error::add_error(__('REG_code can not be empty.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
1200 1200
 			return;
1201 1201
 		}
1202
-		if ( ! $this->reg_code() ) {
1203
-			parent::set( 'REG_code', $REG_code, $use_default );
1202
+		if ( ! $this->reg_code()) {
1203
+			parent::set('REG_code', $REG_code, $use_default);
1204 1204
 		} else {
1205 1205
 			EE_Error::doing_it_wrong(
1206
-				__CLASS__ . '::' . __FUNCTION__,
1207
-				__( 'Can not change a registration REG_code once it has been set.', 'event_espresso' ),
1206
+				__CLASS__.'::'.__FUNCTION__,
1207
+				__('Can not change a registration REG_code once it has been set.', 'event_espresso'),
1208 1208
 				'4.6.0'
1209 1209
 			);
1210 1210
 		}
@@ -1224,17 +1224,17 @@  discard block
 block discarded – undo
1224 1224
 	 * @return EE_Registration[]  or empty array if this isn't a group registration.
1225 1225
 	 */
1226 1226
 	public function get_all_other_registrations_in_group() {
1227
-		if ( $this->group_size() < 2 ) {
1227
+		if ($this->group_size() < 2) {
1228 1228
 			return array();
1229 1229
 		}
1230 1230
 
1231 1231
 		$query[0] = array(
1232 1232
 			'TXN_ID' => $this->transaction_ID(),
1233
-			'REG_ID' => array( '!=', $this->ID() ),
1233
+			'REG_ID' => array('!=', $this->ID()),
1234 1234
 			'TKT_ID' => $this->ticket_ID()
1235 1235
 			);
1236 1236
 
1237
-		$registrations = $this->get_model()->get_all( $query );
1237
+		$registrations = $this->get_model()->get_all($query);
1238 1238
 		return $registrations;
1239 1239
 	}
1240 1240
 
@@ -1243,14 +1243,14 @@  discard block
 block discarded – undo
1243 1243
 	 * @return string
1244 1244
 	 */
1245 1245
 	public function get_admin_details_link() {
1246
-		EE_Registry::instance()->load_helper( 'URL' );
1246
+		EE_Registry::instance()->load_helper('URL');
1247 1247
 		return EEH_URL::add_query_args_and_nonce(
1248 1248
 			array(
1249 1249
 				'page' => 'espresso_registrations',
1250 1250
 				'action' => 'view_registration',
1251 1251
 				'_REG_ID' => $this->ID()
1252 1252
 			),
1253
-			admin_url( 'admin.php' )
1253
+			admin_url('admin.php')
1254 1254
 		);
1255 1255
 	}
1256 1256
 
@@ -1275,12 +1275,12 @@  discard block
 block discarded – undo
1275 1275
 	 * @return string
1276 1276
 	 */
1277 1277
 	public function get_admin_overview_link() {
1278
-		EE_Registry::instance()->load_helper( 'URL' );
1278
+		EE_Registry::instance()->load_helper('URL');
1279 1279
 		return EEH_URL::add_query_args_and_nonce(
1280 1280
 			array(
1281 1281
 				'page' => 'espresso_registrations'
1282 1282
 			),
1283
-			admin_url( 'admin.php' )
1283
+			admin_url('admin.php')
1284 1284
 		);
1285 1285
 	}
1286 1286
 
@@ -1289,8 +1289,8 @@  discard block
 block discarded – undo
1289 1289
 	 * @param array $query_params
1290 1290
 	 * @return \EE_Registration[]
1291 1291
 	 */
1292
-	public function payments( $query_params = array() ) {
1293
-		return $this->get_many_related( 'Payment', $query_params );
1292
+	public function payments($query_params = array()) {
1293
+		return $this->get_many_related('Payment', $query_params);
1294 1294
 	}
1295 1295
 
1296 1296
 
@@ -1299,8 +1299,8 @@  discard block
 block discarded – undo
1299 1299
 	 * @param array $query_params
1300 1300
 	 * @return \EE_Registration[]
1301 1301
 	 */
1302
-	public function registration_payments( $query_params = array() ) {
1303
-		return $this->get_many_related( 'Registration_Payment', $query_params );
1302
+	public function registration_payments($query_params = array()) {
1303
+		return $this->get_many_related('Registration_Payment', $query_params);
1304 1304
 	}
1305 1305
 
1306 1306
 
@@ -1311,7 +1311,7 @@  discard block
 block discarded – undo
1311 1311
 	 * @access 	public
1312 1312
 	 */
1313 1313
 	public function price_paid() {
1314
-		EE_Error::doing_it_wrong( 'EE_Registration::price_paid()', __( 'This method is deprecated, please use EE_Registration::final_price() instead.', 'event_espresso' ), '4.7.0' );
1314
+		EE_Error::doing_it_wrong('EE_Registration::price_paid()', __('This method is deprecated, please use EE_Registration::final_price() instead.', 'event_espresso'), '4.7.0');
1315 1315
 		return $this->final_price();
1316 1316
 	}
1317 1317
 
@@ -1323,9 +1323,9 @@  discard block
 block discarded – undo
1323 1323
 	 * @access    public
1324 1324
 	 * @param    float $REG_final_price
1325 1325
 	 */
1326
-	public function set_price_paid( $REG_final_price = 0.00 ) {
1327
-		EE_Error::doing_it_wrong( 'EE_Registration::set_price_paid()', __( 'This method is deprecated, please use EE_Registration::set_final_price() instead.', 'event_espresso' ), '4.7.0' );
1328
-		$this->set_final_price( $REG_final_price );
1326
+	public function set_price_paid($REG_final_price = 0.00) {
1327
+		EE_Error::doing_it_wrong('EE_Registration::set_price_paid()', __('This method is deprecated, please use EE_Registration::set_final_price() instead.', 'event_espresso'), '4.7.0');
1328
+		$this->set_final_price($REG_final_price);
1329 1329
 	}
1330 1330
 
1331 1331
 
@@ -1336,7 +1336,7 @@  discard block
 block discarded – undo
1336 1336
 	 * @return string
1337 1337
 	 */
1338 1338
 	public function pretty_price_paid() {
1339
-		EE_Error::doing_it_wrong( 'EE_Registration::pretty_price_paid()', __( 'This method is deprecated, please use EE_Registration::pretty_final_price() instead.', 'event_espresso' ), '4.7.0' );
1339
+		EE_Error::doing_it_wrong('EE_Registration::pretty_price_paid()', __('This method is deprecated, please use EE_Registration::pretty_final_price() instead.', 'event_espresso'), '4.7.0');
1340 1340
 		return $this->pretty_final_price();
1341 1341
 	}
1342 1342
 
@@ -1350,7 +1350,7 @@  discard block
 block discarded – undo
1350 1350
 	 * @return EE_Payment_Method|null
1351 1351
 	 */
1352 1352
 	public function payment_method() {
1353
-		return EEM_Payment_Method::instance()->get_last_used_for_registration( $this );
1353
+		return EEM_Payment_Method::instance()->get_last_used_for_registration($this);
1354 1354
 	}
1355 1355
 
1356 1356
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
 	/**
899 899
 	 * Sets deleted
900 900
 	 * @param boolean $deleted
901
-	 * @return boolean
901
+	 * @return boolean|null
902 902
 	 */
903 903
 	public function set_deleted($deleted) {
904 904
 		$this->set( 'REG_deleted', $deleted );
@@ -942,6 +942,7 @@  discard block
 block discarded – undo
942 942
 	 *
943 943
 	 * @param int | EE_Datetime $DTT_OR_ID The datetime the registration is being checked against
944 944
 	 * @param bool   $check_approved   This is used to indicate whether the caller wants can_checkin to also consider registration status as well as datetime access.
945
+	 * @param integer $DTT_OR_ID
945 946
 	 *
946 947
 	 * @return bool
947 948
 	 */
@@ -1347,7 +1348,7 @@  discard block
 block discarded – undo
1347 1348
 	 * This grabs the payment method corresponding to the last payment made for the amount owing on the registration.
1348 1349
 	 * Note: if there are no payments on the registration there will be no payment method returned.
1349 1350
 	 *
1350
-	 * @return EE_Payment_Method|null
1351
+	 * @return EE_Base_Class|null
1351 1352
 	 */
1352 1353
 	public function payment_method() {
1353 1354
 		return EEM_Payment_Method::instance()->get_last_used_for_registration( $this );
Please login to merge, or discard this patch.
core/EE_Cart.core.php 2 patches
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
+do_action('AHEE_log', __FILE__, __FUNCTION__, ''); /**
3 3
  *
4 4
  * Event Espresso
5 5
  *
@@ -67,24 +67,24 @@  discard block
 block discarded – undo
67 67
 	  * @param EE_Session $session
68 68
 	  * @return \EE_Cart
69 69
 	  */
70
-	 public static function instance( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
71
-		if ( ! empty( $grand_total ) ){
72
-			self::$_instance = new self( $grand_total, $session );
70
+	 public static function instance(EE_Line_Item $grand_total = null, EE_Session $session = null) {
71
+		if ( ! empty($grand_total)) {
72
+			self::$_instance = new self($grand_total, $session);
73 73
 		}
74 74
 		// or maybe retrieve an existing one ?
75
-		if ( ! self::$_instance instanceof EE_Cart ) {
75
+		if ( ! self::$_instance instanceof EE_Cart) {
76 76
 			// try getting the cart out of the session
77 77
 			$saved_cart = $session instanceof EE_Session ? $session->cart() : null;
78
-			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self( $grand_total, $session );
79
-			unset( $saved_cart );
78
+			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
79
+			unset($saved_cart);
80 80
 		}
81 81
 		// verify that cart is ok and grand total line item exists
82
-		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item ) {
83
-			self::$_instance = new self( $grand_total, $session );
82
+		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
83
+			self::$_instance = new self($grand_total, $session);
84 84
 		}
85 85
 		self::$_instance->get_grand_total();
86 86
 		 // once everything is all said and done, save the cart to the EE_Session
87
-		add_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
87
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
88 88
 		return self::$_instance;
89 89
 	}
90 90
 
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 	  * @param EE_Session $session
99 99
 	  * @return \EE_Cart
100 100
 	  */
101
-	 private function __construct( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
102
-		 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
103
-		 $this->set_session( $session );
104
-		 if ( $grand_total instanceof EE_Line_Item ) {
105
-			 $this->set_grand_total_line_item( $grand_total );
101
+	 private function __construct(EE_Line_Item $grand_total = null, EE_Session $session = null) {
102
+		 do_action('AHEE_log', __FILE__, __FUNCTION__, '');
103
+		 $this->set_session($session);
104
+		 if ($grand_total instanceof EE_Line_Item) {
105
+			 $this->set_grand_total_line_item($grand_total);
106 106
 		 }
107 107
 	 }
108 108
 
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 	  * @param EE_Session $session
115 115
 	  * @return EE_Cart
116 116
 	  */
117
-	 public static function reset( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
118
-		 remove_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
119
-		 if ( $session instanceof EE_Session ) {
117
+	 public static function reset(EE_Line_Item $grand_total = null, EE_Session $session = null) {
118
+		 remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
119
+		 if ($session instanceof EE_Session) {
120 120
 			 $session->reset_cart();
121 121
 		 }
122 122
 		 self::$_instance = null;
123
-		 return self::instance( $grand_total, $session );
123
+		 return self::instance($grand_total, $session);
124 124
 	 }
125 125
 
126 126
 
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 	 /**
129 129
 	  * @param EE_Session $session
130 130
 	  */
131
-	 public function set_session( EE_Session $session = null ) {
132
-		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core( 'Session' );
131
+	 public function set_session(EE_Session $session = null) {
132
+		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core('Session');
133 133
 	 }
134 134
 
135 135
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	  *  know the grand total line item on it
140 140
 	  * @param EE_Line_Item $line_item
141 141
 	  */
142
-	 public function set_grand_total_line_item( EE_Line_Item $line_item ) {
142
+	 public function set_grand_total_line_item(EE_Line_Item $line_item) {
143 143
 		 $this->_grand_total = $line_item;
144 144
 	 }
145 145
 
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
152 152
 	  * @param EE_Session $session
153 153
 	  * @return \EE_Cart
154 154
 	  */
155
-	public static function get_cart_from_txn( EE_Transaction $transaction, EE_Session $session = null ) {
155
+	public static function get_cart_from_txn(EE_Transaction $transaction, EE_Session $session = null) {
156 156
 		$grand_total = $transaction->total_line_item();
157 157
 		$grand_total->get_items();
158 158
 		$grand_total->tax_descendants();
159
-		return EE_Cart::instance( $grand_total, $session );
159
+		return EE_Cart::instance($grand_total, $session);
160 160
 	}
161 161
 
162 162
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
166 166
 	 * @return EE_Line_Item
167 167
 	 */
168
-	private function _create_grand_total(){
168
+	private function _create_grand_total() {
169 169
 		$this->_grand_total = EEH_Line_Item::create_total_line_item();
170 170
 		return $this->_grand_total;
171 171
 	}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 *	@return \EE_Line_Item[]
179 179
 	 */
180 180
 	public function get_tickets() {
181
-		return EEH_Line_Item::get_ticket_line_items( $this->_grand_total );
181
+		return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
182 182
 	}
183 183
 
184 184
 
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
 	 */
192 192
 	public function all_ticket_quantity_count() {
193 193
 		$tickets = $this->get_tickets();
194
-		if ( empty( $tickets )) {
194
+		if (empty($tickets)) {
195 195
 			return 0;
196 196
 		}
197 197
 		$count = 0;
198
-		foreach ( $tickets as $ticket ) {
198
+		foreach ($tickets as $ticket) {
199 199
 			$count = $count + $ticket->get('LIN_quantity');
200 200
 		}
201 201
 		return $count;
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
 	 *  Gets all the tax line items
208 208
 	 * @return \EE_Line_Item[]
209 209
 	 */
210
-	public function get_taxes(){
211
-		return EEH_Line_Item::get_taxes_subtotal( $this->_grand_total )->children();
210
+	public function get_taxes() {
211
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
212 212
 	}
213 213
 
214 214
 
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	 * Gets the total line item (which is a parent of all other line items) on this cart
218 218
 	 * @return EE_Line_Item
219 219
 	 */
220
-	public function get_grand_total(){
220
+	public function get_grand_total() {
221 221
 		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
222 222
 	}
223 223
 
@@ -230,8 +230,8 @@  discard block
 block discarded – undo
230 230
 	 *	@param int $qty
231 231
 	 *	@return TRUE on success, FALSE on fail
232 232
 	 */
233
-	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
234
-		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
233
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1) {
234
+		EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
235 235
 		return $this->save_cart() ? TRUE : FALSE;
236 236
 	}
237 237
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 	 *	@return float
255 255
 	 */
256 256
 	public function get_applied_taxes() {
257
-		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
257
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
258 258
 	}
259 259
 
260 260
 
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 	 *	@return float
266 266
 	 */
267 267
 	public function get_cart_grand_total() {
268
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
268
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
269 269
 		return $this->get_grand_total()->total();
270 270
 	}
271 271
 
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 	 */
279 279
 	public function recalculate_all_cart_totals() {
280 280
 		$pre_tax_total = $this->get_cart_total_before_tax();
281
-		$taxes_total = EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
282
-		$this->_grand_total->set_total( $pre_tax_total + $taxes_total );
281
+		$taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
282
+		$this->_grand_total->set_total($pre_tax_total + $taxes_total);
283 283
 		$this->_grand_total->save_this_and_descendants_to_txn();
284 284
 		return $this->get_grand_total()->total();
285 285
 	}
@@ -292,9 +292,9 @@  discard block
 block discarded – undo
292 292
 	 *	@param array|bool|string $line_item_codes
293 293
 	 *	@return int on success, FALSE on fail
294 294
 	 */
295
-	public function delete_items( $line_item_codes = FALSE ) {
296
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
297
-		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes );
295
+	public function delete_items($line_item_codes = FALSE) {
296
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
297
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
298 298
 	}
299 299
 
300 300
 
@@ -305,9 +305,9 @@  discard block
 block discarded – undo
305 305
 	 *	@return bool
306 306
 	 */
307 307
 	public function empty_cart() {
308
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
308
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
309 309
 		$this->_grand_total = $this->_create_grand_total();
310
-		return $this->save_cart( TRUE );
310
+		return $this->save_cart(TRUE);
311 311
 	}
312 312
 
313 313
 
@@ -318,8 +318,8 @@  discard block
 block discarded – undo
318 318
 	 *	@return bool
319 319
 	 */
320 320
 	public function delete_cart() {
321
-		$deleted = EEH_Line_Item::delete_all_child_items( $this->_grand_total );
322
-		if ( $deleted ) {
321
+		$deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
322
+		if ($deleted) {
323 323
 			$deleted += $this->_grand_total->delete();
324 324
 			$this->_grand_total = null;
325 325
 		}
@@ -334,17 +334,17 @@  discard block
 block discarded – undo
334 334
 	  * @param bool $apply_taxes
335 335
 	  * @return TRUE on success, FALSE on fail
336 336
 	  */
337
-	public function save_cart( $apply_taxes = TRUE ) {
338
-		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {
339
-			EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
337
+	public function save_cart($apply_taxes = TRUE) {
338
+		if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
339
+			EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
340 340
 			//make sure we don't cache the transaction because it can get stale
341
-			if( $this->_grand_total->get_one_from_cache( 'Transaction' ) instanceof EE_Transaction &&
342
-				$this->_grand_total->get_one_from_cache( 'Transaction' )->ID()) {
343
-				$this->_grand_total->clear_cache( 'Transaction', null, true );
341
+			if ($this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction &&
342
+				$this->_grand_total->get_one_from_cache('Transaction')->ID()) {
343
+				$this->_grand_total->clear_cache('Transaction', null, true);
344 344
 			}
345 345
 		}
346
-		if ( $this->_session instanceof EE_Session ) {
347
-			return $this->_session->set_cart( $this );
346
+		if ($this->_session instanceof EE_Session) {
347
+			return $this->_session->set_cart($this);
348 348
 		} else {
349 349
 			return false;
350 350
 		}
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	 *	@access public
229 229
 	 *	@param EE_Ticket $ticket
230 230
 	 *	@param int $qty
231
-	 *	@return TRUE on success, FALSE on fail
231
+	 *	@return boolean on success, FALSE on fail
232 232
 	 */
233 233
 	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
234 234
 		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	  * @save cart to session
333 333
 	  * @access public
334 334
 	  * @param bool $apply_taxes
335
-	  * @return TRUE on success, FALSE on fail
335
+	  * @return boolean on success, FALSE on fail
336 336
 	  */
337 337
 	public function save_cart( $apply_taxes = TRUE ) {
338 338
 		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {
Please login to merge, or discard this patch.
admin_pages/messages/Messages_Template_List_Table.class.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 
42 42
 
43 43
 	protected function _setup_data() {
44
-		$this->_data = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, FALSE);
45
-		$this->_all_data_count = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE );
44
+		$this->_data = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, FALSE);
45
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE);
46 46
 	}
47 47
 
48 48
 
@@ -51,21 +51,21 @@  discard block
 block discarded – undo
51 51
 
52 52
 	protected function _set_properties() {
53 53
 		$this->_wp_list_args = array(
54
-			'singular' => __('Message Template Group', 'event_espresso' ),
55
-			'plural' => __('Message Template', 'event_espresso' ),
54
+			'singular' => __('Message Template Group', 'event_espresso'),
55
+			'plural' => __('Message Template', 'event_espresso'),
56 56
 			'ajax' => TRUE, //for now,
57 57
 			'screen' => $this->get_admin_page()->get_current_screen()->id
58 58
 			);
59 59
 		$this->_columns = array(
60 60
 			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
61 61
 			'message_type' => __('Message Type', 'event_espresso'),
62
-			'messenger' => __( 'Messenger', 'event_espresso'),
63
-			'description' => __( 'Description', 'event_espresso' ),
62
+			'messenger' => __('Messenger', 'event_espresso'),
63
+			'description' => __('Description', 'event_espresso'),
64 64
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
65 65
 			);
66 66
 
67 67
 		$this->_sortable_columns = array(
68
-			'messenger' => array( 'MTP_messenger' => TRUE ),
68
+			'messenger' => array('MTP_messenger' => TRUE),
69 69
 			//'message_type' => array( 'MTP_message_type' => FALSE )
70 70
 			);
71 71
 
@@ -84,16 +84,16 @@  discard block
 block discarded – undo
84 84
 	 *
85 85
 	 * @return string
86 86
 	 */
87
-	public function single_row( $item ) {
87
+	public function single_row($item) {
88 88
 		$message_type = $item->message_type_obj();
89 89
 		$messenger = $item->messenger_obj();
90 90
 
91
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
91
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
92 92
 			echo '';
93 93
 			return;
94 94
 		}
95 95
 
96
-		parent::single_row( $item );
96
+		parent::single_row($item);
97 97
 	}
98 98
 
99 99
 
@@ -109,33 +109,33 @@  discard block
 block discarded – undo
109 109
 
110 110
 		$msgr_default[0] = array(
111 111
 			'id' => 'none_selected',
112
-			'text' => __( 'Show All Messengers', 'event_espresso' )
112
+			'text' => __('Show All Messengers', 'event_espresso')
113 113
 			);
114 114
 
115 115
 		$mt_default[0] = array(
116 116
 			'id' => 'none_selected',
117
-			'text' => __( 'Show All Message Types', 'event_espresso' )
117
+			'text' => __('Show All Message Types', 'event_espresso')
118 118
 			);
119 119
 
120
-		$msgr_filters = ! empty( $m_values ) ? array_merge( $msgr_default, $m_values ) : array();
121
-		$mt_filters = ! empty( $mt_values ) ? array_merge( $mt_default, $mt_values ) : array();
120
+		$msgr_filters = ! empty($m_values) ? array_merge($msgr_default, $m_values) : array();
121
+		$mt_filters = ! empty($mt_values) ? array_merge($mt_default, $mt_values) : array();
122 122
 
123
-		if ( empty( $m_values ) ) {
123
+		if (empty($m_values)) {
124 124
 			$msgr_filters[0] = array(
125 125
 				'id'   => 'no_messenger_options',
126
-				'text' => __( 'No Messengers active', 'event_espresso' )
126
+				'text' => __('No Messengers active', 'event_espresso')
127 127
 			);
128 128
 		}
129 129
 
130
-		if ( empty( $mt_values ) ) {
130
+		if (empty($mt_values)) {
131 131
 			$mt_filters[0] = array(
132 132
 				'id'   => 'no_message_type_options',
133
-				'text' => __( 'No Message Types active', 'event_espresso' )
133
+				'text' => __('No Message Types active', 'event_espresso')
134 134
 			);
135 135
 		}
136 136
 
137
-		$filters[] = EEH_Form_Fields::select_input( 'ee_messenger_filter_by', $msgr_filters, isset( $this->_req_data['ee_messenger_filter_by'] ) ? sanitize_key( $this->_req_data['ee_messenger_filter_by'] ) : '' );
138
-		$filters[] = EEH_Form_Fields::select_input( 'ee_message_type_filter_by', $mt_filters, isset( $this->_req_data['ee_message_type_filter_by'] ) ? sanitize_key( $this->_req_data['ee_message_type_filter_by'] ) : '' );
137
+		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key($this->_req_data['ee_messenger_filter_by']) : '');
138
+		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key($this->_req_data['ee_message_type_filter_by']) : '');
139 139
 		return $filters;
140 140
 	}
141 141
 
@@ -143,20 +143,20 @@  discard block
 block discarded – undo
143 143
 	 * we're just removing the search box for message templates, not needed.
144 144
 	 * @return string (empty);
145 145
 	 */
146
-	function search_box( $text, $input_id ) {
146
+	function search_box($text, $input_id) {
147 147
 		return '';
148 148
 	}
149 149
 
150 150
 
151 151
 	protected function _add_view_counts() {
152
-		foreach ( $this->_views as $view => $args )  {
153
-			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates( $this->_per_page, $view, TRUE, TRUE );
152
+		foreach ($this->_views as $view => $args) {
153
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates($this->_per_page, $view, TRUE, TRUE);
154 154
 		}
155 155
 	}
156 156
 
157 157
 
158 158
 
159
-	public function column_cb( $item ) {
159
+	public function column_cb($item) {
160 160
 		return '';
161 161
 	}
162 162
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 
165 165
 
166 166
 
167
-	function column_description( $item ) {
168
-		return '<p>' . $item->message_type_obj()->description . '</p>';
167
+	function column_description($item) {
168
+		return '<p>'.$item->message_type_obj()->description.'</p>';
169 169
 	}
170 170
 
171 171
 
@@ -180,27 +180,27 @@  discard block
 block discarded – undo
180 180
 		$actions = array();
181 181
 
182 182
 		// edit link but only if item isn't trashed.
183
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
184
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
185
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
183
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
184
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
185
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
186 186
 		}
187 187
 
188
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
188
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
189 189
 
190 190
 		//we want to display the contexts in here so we need to set them up
191 191
 		$c_label = $item->context_label();
192 192
 		$c_configs = $item->contexts_config();
193 193
 		$ctxt = array();
194 194
 		$context_templates = $item->context_templates();
195
-		foreach ( $context_templates as $context => $template_fields ) {
196
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
197
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
195
+		foreach ($context_templates as $context => $template_fields) {
196
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
197
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
198 198
 			$context_title = ucwords($c_configs[$context]['label']);
199
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
200
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
199
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
200
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
201 201
 		}
202 202
 
203
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
203
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
204 204
 
205 205
 
206 206
 		//Return the name contents
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 										/* $1%s */ $name_link,
209 209
 										/* $2%s */ $item->GRP_ID(),
210 210
 										/* %4$s */ $ctx_content,
211
-										/* $3%s */ $this->row_actions( $actions )
211
+										/* $3%s */ $this->row_actions($actions)
212 212
 		);
213 213
 	}
214 214
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @return string       message_type name
219 219
 	 */
220 220
 	function column_message_type($item) {
221
-		return ucwords($item->message_type_obj()->label['singular'] );
221
+		return ucwords($item->message_type_obj()->label['singular']);
222 222
 	}
223 223
 
224 224
 
Please login to merge, or discard this patch.
shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.php 1 patch
Spacing   +135 added lines, -135 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 
5 5
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return    void
92 92
 	 */
93 93
 	public static function set_hooks() {
94
-		add_action( 'wp_loaded', array( 'EES_Espresso_Thank_You', 'set_definitions' ), 2 );
94
+		add_action('wp_loaded', array('EES_Espresso_Thank_You', 'set_definitions'), 2);
95 95
 	}
96 96
 
97 97
 
@@ -104,22 +104,22 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public static function set_hooks_admin() {
106 106
 		// AJAX for IPN monitoring
107
-		add_filter( 'heartbeat_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
107
+		add_filter('heartbeat_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
108 108
 		add_filter(
109 109
 			'heartbeat_nopriv_received',
110
-			array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ),
110
+			array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'),
111 111
 			10,
112 112
 			3
113 113
 		);
114 114
 		add_action(
115 115
 			'wp_ajax_espresso_resend_reg_confirmation_email',
116
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
116
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
117 117
 			10,
118 118
 			2
119 119
 		);
120 120
 		add_action(
121 121
 			'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
122
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
122
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
123 123
 			10,
124 124
 			2
125 125
 		);
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 	 * @return    void
135 135
 	 */
136 136
 	public static function set_definitions() {
137
-		define( 'THANK_YOU_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
138
-		define( 'THANK_YOU_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ ) ) . 'templates' . DS );
137
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
138
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
139 139
 	}
140 140
 
141 141
 
@@ -147,13 +147,13 @@  discard block
 block discarded – undo
147 147
 	 * @return    EE_Transaction
148 148
 	 */
149 149
 	public function get_txn() {
150
-		if ( $this->_current_txn instanceof EE_Transaction ) {
150
+		if ($this->_current_txn instanceof EE_Transaction) {
151 151
 			return $this->_current_txn;
152 152
 		}
153
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
154
-		if ( ! $TXN_model instanceof EEM_Transaction ) {
153
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
154
+		if ( ! $TXN_model instanceof EEM_Transaction) {
155 155
 			EE_Error::add_error(
156
-				__( 'The transaction model could not be established.', 'event_espresso' ),
156
+				__('The transaction model could not be established.', 'event_espresso'),
157 157
 				__FILE__,
158 158
 				__FUNCTION__,
159 159
 				__LINE__
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 			return null;
162 162
 		}
163 163
 		//get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
164
-		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link( $this->_reg_url_link );
164
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
165 165
 		// verify TXN
166
-		if ( WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction ) {
166
+		if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
167 167
 			EE_Error::add_error(
168 168
 				__(
169 169
 					'No transaction information could be retrieved or the transaction data is not of the correct type.',
@@ -187,16 +187,16 @@  discard block
 block discarded – undo
187 187
 	 * @param int $since
188 188
 	 * @return    mixed array of EE_Payment || FALSE
189 189
 	 */
190
-	public function get_txn_payments( $since = 0 ) {
191
-		if ( ! $this->get_txn() ) {
190
+	public function get_txn_payments($since = 0) {
191
+		if ( ! $this->get_txn()) {
192 192
 			return false;
193 193
 		}
194
-		$args = array( 'order_by' => array( 'PAY_timestamp' => 'ASC' ) );
195
-		if ( $since > 0 ) {
196
-			$args[0] = array( 'PAY_timestamp' => array( '>', $since ) );
194
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
195
+		if ($since > 0) {
196
+			$args[0] = array('PAY_timestamp' => array('>', $since));
197 197
 		}
198 198
 		// get array of payments with most recent first
199
-		return $this->_current_txn->payments( $args );
199
+		return $this->_current_txn->payments($args);
200 200
 	}
201 201
 
202 202
 
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
 	 * @return    void
209 209
 	 */
210 210
 	private function _get_reg_url_link() {
211
-		if ( ! empty( $this->_reg_url_link ) ) {
211
+		if ( ! empty($this->_reg_url_link)) {
212 212
 			return;
213 213
 		}
214 214
 		// only do thank you page stuff if we have a REG_url_link in the url
215
-		if ( WP_DEBUG && ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' ) ) {
215
+		if (WP_DEBUG && ! EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
216 216
 			EE_Error::add_error(
217 217
 				__(
218 218
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 			return;
226 226
 		}
227 227
 		// check for reg_url_link
228
-		$this->_reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link' );
228
+		$this->_reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link');
229 229
 	}
230 230
 
231 231
 
@@ -237,8 +237,8 @@  discard block
 block discarded – undo
237 237
 	 * @param    string $reg_url_link
238 238
 	 * @return    string
239 239
 	 */
240
-	public function set_reg_url_link( $reg_url_link = null ) {
241
-		$this->_reg_url_link = ! empty( $reg_url_link ) ? $reg_url_link : $this->_reg_url_link;
240
+	public function set_reg_url_link($reg_url_link = null) {
241
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
242 242
 	}
243 243
 
244 244
 
@@ -251,28 +251,28 @@  discard block
 block discarded – undo
251 251
 	 * @param    WP $WP
252 252
 	 * @return    void
253 253
 	 */
254
-	public function run( WP $WP ) {
254
+	public function run(WP $WP) {
255 255
 		// remove site_url() from thank you page URL
256
-		$thank_you_page_URL = substr( EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen( home_url() ) );
256
+		$thank_you_page_URL = substr(EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen(home_url()));
257 257
 		// remove other non-essential details from URL
258
-		$thank_you_page_URL = trim( parse_url( $thank_you_page_URL, PHP_URL_PATH ), '/' );
258
+		$thank_you_page_URL = trim(parse_url($thank_you_page_URL, PHP_URL_PATH), '/');
259 259
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
260
-		if ( isset( $WP->request ) && trim( $WP->request, '/' ) !== $thank_you_page_URL ) {
260
+		if (isset($WP->request) && trim($WP->request, '/') !== $thank_you_page_URL) {
261 261
 			return;
262 262
 		} else if (
263
-			isset( $WP->query_vars['page_id'] )
264
-			&& (int)$WP->query_vars['page_id'] !== (int)EE_Registry::instance()->CFG->core->thank_you_page_id
263
+			isset($WP->query_vars['page_id'])
264
+			&& (int) $WP->query_vars['page_id'] !== (int) EE_Registry::instance()->CFG->core->thank_you_page_id
265 265
 		) {
266 266
 			return;
267 267
 		}
268 268
 		$this->_get_reg_url_link();
269 269
 		// resend_reg_confirmation_email ?
270
-		if ( EE_Registry::instance()->REQ->is_set( 'resend' ) ) {
270
+		if (EE_Registry::instance()->REQ->is_set('resend')) {
271 271
 			EES_Espresso_Thank_You::resend_reg_confirmation_email();
272 272
 		}
273 273
 		// load assets
274
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_js' ), 10 );
275
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
274
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
275
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
276 276
 		$this->_translate_strings();
277 277
 	}
278 278
 
@@ -326,12 +326,12 @@  discard block
 block discarded – undo
326 326
 	public function load_js() {
327 327
 		wp_register_script(
328 328
 			'thank_you_page',
329
-			THANK_YOU_ASSETS_URL . 'thank_you_page.js',
330
-			array( 'espresso_core', 'heartbeat' ),
329
+			THANK_YOU_ASSETS_URL.'thank_you_page.js',
330
+			array('espresso_core', 'heartbeat'),
331 331
 			EVENT_ESPRESSO_VERSION,
332 332
 			true
333 333
 		);
334
-		wp_enqueue_script( 'thank_you_page' );
334
+		wp_enqueue_script('thank_you_page');
335 335
 	}
336 336
 
337 337
 
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
 	 */
346 346
 	public function init() {
347 347
 		$this->_get_reg_url_link();
348
-		if ( ! $this->get_txn() ) {
348
+		if ( ! $this->get_txn()) {
349 349
 			echo EEH_HTML::div(
350
-				EEH_HTML::h4( __( 'We\'re sorry...', 'event_espresso' ), '', '' ) .
350
+				EEH_HTML::h4(__('We\'re sorry...', 'event_espresso'), '', '').
351 351
 				sprintf(
352 352
 					__(
353 353
 						'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
@@ -361,8 +361,8 @@  discard block
 block discarded – undo
361 361
 			return null;
362 362
 		}
363 363
 		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
364
-		if ( $this->_current_txn->status_ID() === EEM_Transaction::failed_status_code ) {
365
-			$this->_current_txn->set_status( EEM_Transaction::incomplete_status_code );
364
+		if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
365
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
366 366
 			$this->_current_txn->save();
367 367
 		}
368 368
 		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
@@ -375,15 +375,15 @@  discard block
 block discarded – undo
375 375
 		);
376 376
 		$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
377 377
 		// txn status ?
378
-		if ( $this->_current_txn->is_completed() ) {
378
+		if ($this->_current_txn->is_completed()) {
379 379
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
380 380
 		} else if (
381 381
 			$this->_current_txn->is_incomplete()
382
-			&& ( $this->_primary_registrant->is_approved()
383
-			|| $this->_primary_registrant->is_pending_payment() )
382
+			&& ($this->_primary_registrant->is_approved()
383
+			|| $this->_primary_registrant->is_pending_payment())
384 384
 		) {
385 385
 			$this->_show_try_pay_again_link = true;
386
-		} else if ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() ) {
386
+		} else if ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
387 387
 			// its pending
388 388
 			$this->_show_try_pay_again_link = isset(
389 389
 				EE_Registry::instance()->CFG->registration->show_pending_payment_options
@@ -409,21 +409,21 @@  discard block
 block discarded – undo
409 409
 		}
410 410
 		// link to SPCO
411 411
 		$revisit_spco_url = add_query_arg(
412
-			array( 'ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link ),
412
+			array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
413 413
 			EE_Registry::instance()->CFG->core->reg_page_url()
414 414
 		);
415 415
 		// link to SPCO payment_options
416 416
 		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
417 417
 			? $this->_primary_registrant->payment_overview_url()
418 418
 			: add_query_arg(
419
-				array( 'step' => 'payment_options' ),
419
+				array('step' => 'payment_options'),
420 420
 				$revisit_spco_url
421 421
 			);
422 422
 		// link to SPCO attendee_information
423 423
 		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
424 424
 			? $this->_primary_registrant->edit_attendee_information_url()
425 425
 			: false;
426
-		do_action( 'AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn );
426
+		do_action('AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn);
427 427
 		// set no cache headers and constants
428 428
 		EE_System::do_not_cache();
429 429
 	}
@@ -438,15 +438,15 @@  discard block
 block discarded – undo
438 438
 	 * @return    string
439 439
 	 * @throws \EE_Error
440 440
 	 */
441
-	public function process_shortcode( $attributes = array() ) {
441
+	public function process_shortcode($attributes = array()) {
442 442
 		$this->init();
443
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
443
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
444 444
 			return EE_Error::get_notices();
445 445
 		}
446 446
 		//EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $this->_current_txn ), true, 	'EE_Transaction: ' . $this->_current_txn->ID() );
447 447
 		// link to receipt
448
-		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url( 'html' );
449
-		if ( ! empty( $template_args['TXN_receipt_url'] ) ) {
448
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url('html');
449
+		if ( ! empty($template_args['TXN_receipt_url'])) {
450 450
 			$template_args['order_conf_desc'] = __(
451 451
 				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
452 452
 				'event_espresso'
@@ -458,13 +458,13 @@  discard block
 block discarded – undo
458 458
 			);
459 459
 		}
460 460
 		$template_args['transaction'] = $this->_current_txn;
461
-		$template_args['revisit'] = EE_Registry::instance()->REQ->get( 'revisit', false );
462
-		add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_registration_details' ) );
463
-		if ( $this->_is_primary && ! $this->_current_txn->is_free() ) {
464
-			add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_ajax_content' ) );
461
+		$template_args['revisit'] = EE_Registry::instance()->REQ->get('revisit', false);
462
+		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
463
+		if ($this->_is_primary && ! $this->_current_txn->is_free()) {
464
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
465 465
 		}
466 466
 		return EEH_Template::locate_template(
467
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
467
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
468 468
 			$template_args,
469 469
 			true,
470 470
 			true
@@ -485,15 +485,15 @@  discard block
 block discarded – undo
485 485
 	 * @return    array
486 486
 	 * @throws \EE_Error
487 487
 	 */
488
-	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
488
+	public static function thank_you_page_IPN_monitor($response = array(), $data = array()) {
489 489
 		// does this heartbeat contain our data ?
490
-		if ( ! isset( $data['espresso_thank_you_page'] ) ) {
490
+		if ( ! isset($data['espresso_thank_you_page'])) {
491 491
 			return $response;
492 492
 		}
493 493
 		// check for reg_url_link in the incoming heartbeat data
494
-		if ( ! isset( $data['espresso_thank_you_page']['e_reg_url_link'] ) ) {
494
+		if ( ! isset($data['espresso_thank_you_page']['e_reg_url_link'])) {
495 495
 			$response['espresso_thank_you_page'] = array(
496
-			'errors' => ! empty( $notices['errors'] )
496
+			'errors' => ! empty($notices['errors'])
497 497
 				? $notices['errors']
498 498
 				: __(
499 499
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -508,15 +508,15 @@  discard block
 block discarded – undo
508 508
 		EES_Espresso_Thank_You::set_definitions();
509 509
 		/** @var $espresso_thank_you_page EES_Espresso_Thank_You */
510 510
 		$espresso_thank_you_page = EES_Espresso_Thank_You::instance();
511
-		$espresso_thank_you_page->set_reg_url_link( $data['espresso_thank_you_page']['e_reg_url_link'] );
511
+		$espresso_thank_you_page->set_reg_url_link($data['espresso_thank_you_page']['e_reg_url_link']);
512 512
 		$espresso_thank_you_page->init();
513 513
 		//get TXN
514 514
 		$TXN = $espresso_thank_you_page->get_txn();
515 515
 		// no TXN? then get out
516
-		if ( ! $TXN instanceof EE_Transaction ) {
516
+		if ( ! $TXN instanceof EE_Transaction) {
517 517
 			$notices = EE_Error::get_notices();
518 518
 			$response['espresso_thank_you_page'] = array(
519
-			'errors' => ! empty( $notices['errors'] )
519
+			'errors' => ! empty($notices['errors'])
520 520
 				? $notices['errors']
521 521
 				: sprintf(
522 522
 					__(
@@ -529,13 +529,13 @@  discard block
 block discarded – undo
529 529
 			return $response;
530 530
 		}
531 531
 		// grab transient of TXN's status
532
-		$txn_status = isset( $data['espresso_thank_you_page']['txn_status'] )
532
+		$txn_status = isset($data['espresso_thank_you_page']['txn_status'])
533 533
 			? $data['espresso_thank_you_page']['txn_status']
534 534
 			: null;
535 535
 		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
536
-		if ( $txn_status !== $TXN->status_ID() ) {
536
+		if ($txn_status !== $TXN->status_ID()) {
537 537
 			// switch between two possible basic outcomes
538
-			switch ( $TXN->status_ID() ) {
538
+			switch ($TXN->status_ID()) {
539 539
 				// TXN has been updated in some way
540 540
 				case EEM_Transaction::overpaid_status_code:
541 541
 				case EEM_Transaction::complete_status_code:
@@ -550,25 +550,25 @@  discard block
 block discarded – undo
550 550
 				case EEM_Transaction::failed_status_code:
551 551
 				default:
552 552
 					// keep on waiting...
553
-					return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
553
+					return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
554 554
 			}
555 555
 			// or is the TXN still failed (never been updated) ???
556
-		} else if ( $TXN->failed() ) {
556
+		} else if ($TXN->failed()) {
557 557
 			// keep on waiting...
558
-			return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
558
+			return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
559 559
 		}
560 560
 		// TXN is happening so let's get the payments now
561 561
 		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
562
-		$since = isset( $data['espresso_thank_you_page']['get_payments_since'] )
562
+		$since = isset($data['espresso_thank_you_page']['get_payments_since'])
563 563
 			? $data['espresso_thank_you_page']['get_payments_since']
564 564
 			: 0;
565 565
 		// then check for payments
566
-		$payments = $espresso_thank_you_page->get_txn_payments( $since );
566
+		$payments = $espresso_thank_you_page->get_txn_payments($since);
567 567
 		// has a payment been processed ?
568
-		if ( ! empty( $payments ) || $espresso_thank_you_page->_is_offline_payment_method ) {
569
-			if ( $since ) {
568
+		if ( ! empty($payments) || $espresso_thank_you_page->_is_offline_payment_method) {
569
+			if ($since) {
570 570
 				$response['espresso_thank_you_page'] = array(
571
-					'new_payments'        => $espresso_thank_you_page->get_new_payments( $payments ),
571
+					'new_payments'        => $espresso_thank_you_page->get_new_payments($payments),
572 572
 					'transaction_details' => $espresso_thank_you_page->get_transaction_details(),
573 573
 					'txn_status'          => $TXN->status_ID()
574 574
 				);
@@ -594,9 +594,9 @@  discard block
 block discarded – undo
594 594
 	 * @param    array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
595 595
 	 * @return    array
596 596
 	 */
597
-	private function _update_server_wait_time( $thank_you_page_data = array() ) {
597
+	private function _update_server_wait_time($thank_you_page_data = array()) {
598 598
 		$response['espresso_thank_you_page'] = array(
599
-			'still_waiting' => isset( $thank_you_page_data['initial_access'] )
599
+			'still_waiting' => isset($thank_you_page_data['initial_access'])
600 600
 				? time() - $thank_you_page_data['initial_access']
601 601
 				: 0,
602 602
 			'txn_status'    => $this->_current_txn->status_ID()
@@ -621,17 +621,17 @@  discard block
 block discarded – undo
621 621
 		$template_args['is_primary'] = $this->_is_primary;
622 622
 		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
623 623
 		$template_args['resend_reg_confirmation_url'] = add_query_arg(
624
-			array( 'token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true' ),
624
+			array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
625 625
 			EE_Registry::instance()->CFG->core->thank_you_page_url()
626 626
 		);
627 627
 		// verify template arguments
628
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
628
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
629 629
 		EEH_Template_Validator::verify_isnt_null(
630 630
 			$template_args['SPCO_attendee_information_url'],
631 631
 			'$SPCO_attendee_information_url'
632 632
 		);
633 633
 		echo EEH_Template::locate_template(
634
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
634
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
635 635
 			$template_args,
636 636
 			true,
637 637
 			true
@@ -644,16 +644,16 @@  discard block
 block discarded – undo
644 644
 	 *    resend_reg_confirmation_email
645 645
 	 */
646 646
 	public static function resend_reg_confirmation_email() {
647
-		EE_Registry::instance()->load_core( 'Request_Handler' );
648
-		$reg_url_link = EE_Registry::instance()->REQ->get( 'token' );
647
+		EE_Registry::instance()->load_core('Request_Handler');
648
+		$reg_url_link = EE_Registry::instance()->REQ->get('token');
649 649
 		// was a REG_ID passed ?
650
-		if ( $reg_url_link ) {
651
-			$registration = EE_Registry::instance()->load_model( 'Registration' )->get_one(
652
-				array( array( 'REG_url_link' => $reg_url_link ) )
650
+		if ($reg_url_link) {
651
+			$registration = EE_Registry::instance()->load_model('Registration')->get_one(
652
+				array(array('REG_url_link' => $reg_url_link))
653 653
 			);
654
-			if ( $registration instanceof EE_Registration ) {
654
+			if ($registration instanceof EE_Registration) {
655 655
 				// resend email
656
-				EED_Messages::process_resend( array( '_REG_ID' => $registration->ID() ) );
656
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
657 657
 			} else {
658 658
 				EE_Error::add_error(
659 659
 					__(
@@ -677,16 +677,16 @@  discard block
 block discarded – undo
677 677
 			);
678 678
 		}
679 679
 		// request sent via AJAX ?
680
-		if ( EE_FRONT_AJAX ) {
681
-			echo json_encode( EE_Error::get_notices( false ) );
680
+		if (EE_FRONT_AJAX) {
681
+			echo json_encode(EE_Error::get_notices(false));
682 682
 			die();
683 683
 			// or was JS disabled ?
684 684
 		} else {
685 685
 			// save errors so that they get picked up on the next request
686
-			EE_Error::get_notices( true, true );
686
+			EE_Error::get_notices(true, true);
687 687
 			wp_safe_redirect(
688 688
 				add_query_arg(
689
-					array( 'e_reg_url_link' => $reg_url_link ),
689
+					array('e_reg_url_link' => $reg_url_link),
690 690
 					EE_Registry::instance()->CFG->core->thank_you_page_url()
691 691
 				)
692 692
 			);
@@ -702,26 +702,26 @@  discard block
 block discarded – undo
702 702
 	 * @return    void
703 703
 	 */
704 704
 	public function get_ajax_content() {
705
-		if ( ! $this->get_txn() ) {
705
+		if ( ! $this->get_txn()) {
706 706
 			return;
707 707
 		}
708 708
 		// first determine which event(s) require pre-approval or not
709 709
 		$events = array();
710 710
 		$events_requiring_pre_approval = array();
711
-		foreach ( $this->_current_txn->registrations() as $registration ) {
712
-			if ( $registration instanceof EE_Registration ) {
711
+		foreach ($this->_current_txn->registrations() as $registration) {
712
+			if ($registration instanceof EE_Registration) {
713 713
 				$event = $registration->event();
714
-				if ( $event instanceof EE_Event ) {
715
-					if ( $registration->is_not_approved() && $registration->event() instanceof EE_Event ) {
716
-						$events_requiring_pre_approval[ $event->ID() ] = $event;
714
+				if ($event instanceof EE_Event) {
715
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
716
+						$events_requiring_pre_approval[$event->ID()] = $event;
717 717
 					} else {
718
-						$events[ $event->ID() ] = $event;
718
+						$events[$event->ID()] = $event;
719 719
 					}
720 720
 				}
721 721
 			}
722 722
 		}
723
-		$this->display_details_for_events_requiring_pre_approval( $events_requiring_pre_approval );
724
-		$this->display_details_for_events( $events );
723
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
724
+		$this->display_details_for_events($events);
725 725
 	}
726 726
 
727 727
 
@@ -733,8 +733,8 @@  discard block
 block discarded – undo
733 733
 	 * @param EE_Event[] $events
734 734
 	 * @return string
735 735
 	 */
736
-	public function display_details_for_events( $events = array() ) {
737
-		if ( ! empty( $events ) ) {
736
+	public function display_details_for_events($events = array()) {
737
+		if ( ! empty($events)) {
738 738
 			?>
739 739
 			<div id="espresso-thank-you-page-ajax-content-dv">
740 740
 				<div id="espresso-thank-you-page-ajax-transaction-dv"></div>
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 							'event_espresso'
747 747
 							); ?></span>
748 748
 					</div>
749
-					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed ) : ?>
749
+					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
750 750
 						<p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
751 751
 							<?php echo apply_filters(
752 752
 								'EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg',
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 							); ?>
758 758
 							<br/>
759 759
 							<span class="jst-rght ee-block small-text lt-grey-text">
760
-								<?php _e( 'current wait time ', 'event_espresso' ); ?>
760
+								<?php _e('current wait time ', 'event_espresso'); ?>
761 761
 							<span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
762 762
 						</p>
763 763
 					<?php endif; ?>
@@ -777,11 +777,11 @@  discard block
 block discarded – undo
777 777
 	 * @param EE_Event[] $events
778 778
 	 * @return string
779 779
 	 */
780
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
781
-		if ( ! empty( $events ) ) {
780
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
781
+		if ( ! empty($events)) {
782 782
 			?>
783 783
 			<div id="espresso-thank-you-page-not-approved-message-dv">
784
-				<h4 class="orange-text"><?php _e( 'Important Notice:', 'event_espresso' ); ?></h4>
784
+				<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
785 785
 				<p id="events-requiring-pre-approval-pg" class="small-text">
786 786
 					<?php echo apply_filters(
787 787
 						'AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message',
@@ -792,8 +792,8 @@  discard block
 block discarded – undo
792 792
 					); ?>
793 793
 				</p>
794 794
 				<ul class="events-requiring-pre-approval-ul">
795
-					<?php foreach ( $events as $event ) {
796
-						if ( $event instanceof EE_Event ) {
795
+					<?php foreach ($events as $event) {
796
+						if ($event instanceof EE_Event) {
797 797
 							echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
798 798
 								$event->name(),
799 799
 								'</li>';
@@ -820,12 +820,12 @@  discard block
 block discarded – undo
820 820
 		$template_args = array();
821 821
 		$template_args['transaction'] = $this->_current_txn;
822 822
 		$template_args['reg_url_link'] = $this->_reg_url_link;
823
-		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name( true );
823
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
824 824
 		// link to SPCO payment_options
825 825
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
826 826
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
827 827
 		// verify template arguments
828
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
828
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
829 829
 		EEH_Template_Validator::verify_isnt_null(
830 830
 			$template_args['show_try_pay_again_link'],
831 831
 			'$show_try_pay_again_link'
@@ -835,7 +835,7 @@  discard block
 block discarded – undo
835 835
 			'$SPCO_payment_options_url'
836 836
 		);
837 837
 		return EEH_Template::locate_template(
838
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
838
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php',
839 839
 			$template_args,
840 840
 			true,
841 841
 			true
@@ -852,9 +852,9 @@  discard block
 block discarded – undo
852 852
 	 * @return    string
853 853
 	 * @throws \EE_Error
854 854
 	 */
855
-	public function get_payment_row_html( $payment = null ) {
855
+	public function get_payment_row_html($payment = null) {
856 856
 		$html = '';
857
-		if ( $payment instanceof EE_Payment ) {
857
+		if ($payment instanceof EE_Payment) {
858 858
 			if (
859 859
 				$payment->payment_method() instanceof EE_Payment_Method
860 860
 				&& $payment->status() === EEM_Payment::status_id_failed
@@ -863,31 +863,31 @@  discard block
 block discarded – undo
863 863
 				// considering the registrant has made it to the Thank You page,
864 864
 				// any failed payments may actually be pending and the IPN is just slow
865 865
 				// so let's
866
-				$payment->set_status( EEM_Payment::status_id_pending );
866
+				$payment->set_status(EEM_Payment::status_id_pending);
867 867
 			}
868 868
 			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
869
-				? '<br /><span class="small-text">' . $payment->gateway_response() . '</span>'
869
+				? '<br /><span class="small-text">'.$payment->gateway_response().'</span>'
870 870
 				: '';
871 871
 			$html .= '
872 872
 				<tr>
873 873
 					<td>
874
-						' . $payment->timestamp() . '
874
+						' . $payment->timestamp().'
875 875
 					</td>
876 876
 					<td>
877 877
 						' . (
878 878
 								$payment->payment_method() instanceof EE_Payment_Method
879 879
 									? $payment->payment_method()->name()
880
-									: __( 'Unknown', 'event_espresso' )
881
-							) . '
880
+									: __('Unknown', 'event_espresso')
881
+							).'
882 882
 					</td>
883 883
 					<td class="jst-rght">
884
-						' . EEH_Template::format_currency( $payment->amount() ) . '
884
+						' . EEH_Template::format_currency($payment->amount()).'
885 885
 					</td>
886 886
 					<td class="jst-rght" style="line-height:1;">
887
-						' . $payment->pretty_status( true ) . $payment_declined_msg . '
887
+						' . $payment->pretty_status(true).$payment_declined_msg.'
888 888
 					</td>
889 889
 				</tr>';
890
-			do_action( 'AHEE__thank_you_page_payment_details_template__after_each_payment', $payment );
890
+			do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
891 891
 		}
892 892
 		return $html;
893 893
 	}
@@ -902,14 +902,14 @@  discard block
 block discarded – undo
902 902
 	 * @return    string
903 903
 	 * @throws \EE_Error
904 904
 	 */
905
-	public function get_payment_details( $payments = array() ) {
905
+	public function get_payment_details($payments = array()) {
906 906
 		//prepare variables for displaying
907 907
 		$template_args = array();
908 908
 		$template_args['transaction'] = $this->_current_txn;
909 909
 		$template_args['reg_url_link'] = $this->_reg_url_link;
910 910
 		$template_args['payments'] = array();
911
-		foreach ( $payments as $payment ) {
912
-			$template_args['payments'][] = $this->get_payment_row_html( $payment );
911
+		foreach ($payments as $payment) {
912
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
913 913
 		}
914 914
 		//create a hacky payment object, but dont save it
915 915
 		$payment = EE_Payment::new_instance(
@@ -922,8 +922,8 @@  discard block
 block discarded – undo
922 922
 			)
923 923
 		);
924 924
 		$payment_method = $this->_current_txn->payment_method();
925
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base ) {
926
-			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content( $payment );
925
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
926
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
927 927
 		} else {
928 928
 			$template_args['gateway_content'] = '';
929 929
 		}
@@ -931,19 +931,19 @@  discard block
 block discarded – undo
931 931
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
932 932
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
933 933
 		// verify template arguments
934
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
935
-		EEH_Template_Validator::verify_isnt_null( $template_args['payments'], '$payments' );
934
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
935
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
936 936
 		EEH_Template_Validator::verify_isnt_null(
937 937
 			$template_args['show_try_pay_again_link'],
938 938
 			'$show_try_pay_again_link'
939 939
 		);
940
-		EEH_Template_Validator::verify_isnt_null( $template_args['gateway_content'], '$gateway_content' );
940
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
941 941
 		EEH_Template_Validator::verify_isnt_null(
942 942
 			$template_args['SPCO_payment_options_url'],
943 943
 			'$SPCO_payment_options_url'
944 944
 		);
945 945
 		return EEH_Template::locate_template(
946
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
946
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
947 947
 			$template_args,
948 948
 			true,
949 949
 			true
@@ -960,11 +960,11 @@  discard block
 block discarded – undo
960 960
 	 * @return    string
961 961
 	 * @throws \EE_Error
962 962
 	 */
963
-	public function get_new_payments( $payments = array() ) {
963
+	public function get_new_payments($payments = array()) {
964 964
 		$payments_html = '';
965 965
 		//prepare variables for displaying
966
-		foreach ( $payments as $payment ) {
967
-			$payments_html .= $this->get_payment_row_html( $payment );
966
+		foreach ($payments as $payment) {
967
+			$payments_html .= $this->get_payment_row_html($payment);
968 968
 		}
969 969
 		return $payments_html;
970 970
 	}
Please login to merge, or discard this patch.
modules/add_new_state/EED_Add_New_State.module.php 1 patch
Spacing   +164 added lines, -164 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	 * @return EED_Add_New_State
17 17
 	 */
18 18
 	public static function instance() {
19
-		return parent::get_instance( __CLASS__ );
19
+		return parent::get_instance(__CLASS__);
20 20
 	}
21 21
 
22 22
 
@@ -27,16 +27,16 @@  discard block
 block discarded – undo
27 27
 	 *  	@return 		void
28 28
 	 */
29 29
 	public static function set_hooks() {
30
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
31
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'translate_js_strings' ), 0 );
32
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'wp_enqueue_scripts' ), 10 );
33
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
34
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
35
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
36
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
37
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
38
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
39
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
30
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
31
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
32
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
33
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
34
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
35
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
36
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
37
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
38
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
39
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
40 40
 	}
41 41
 
42 42
 	/**
@@ -46,20 +46,20 @@  discard block
 block discarded – undo
46 46
 	 *  	@return 		void
47 47
 	 */
48 48
 	public static function set_hooks_admin() {
49
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
50
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
51
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
52
-		add_action( 'wp_ajax_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
53
-		add_action( 'wp_ajax_nopriv_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
54
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
55
-		add_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
56
-		add_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
57
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
58
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
49
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
50
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
51
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
52
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
53
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
54
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
55
+		add_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
56
+		add_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
57
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
58
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
59 59
 		//add_filter( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
60
-		add_filter( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
61
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
62
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
60
+		add_filter('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array('EED_Add_New_State', 'filter_checkout_request_params'), 10, 1);
61
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
62
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
63 63
 	}
64 64
 
65 65
 
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 	 *  	@return 		void
72 72
 	 */
73 73
 	public static function set_definitions() {
74
-		define( 'ANS_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
75
-		define( 'ANS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
74
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
75
+		define('ANS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
76 76
 	}
77 77
 
78 78
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	 * @param \WP $WP
85 85
 	 * @return        void
86 86
 	 */
87
-	public function run( $WP ) {
87
+	public function run($WP) {
88 88
 	}
89 89
 
90 90
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 	 * 	@return 		void
113 113
 	 */
114 114
 	public static function wp_enqueue_scripts() {
115
-		if ( apply_filters( 'EED_Single_Page_Checkout__SPCO_active', false ) ) {
116
-			wp_register_script( 'add_new_state', ANS_ASSETS_URL . 'add_new_state.js', array( 'espresso_core', 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, true );
117
-			wp_enqueue_script( 'add_new_state' );
115
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
116
+			wp_register_script('add_new_state', ANS_ASSETS_URL.'add_new_state.js', array('espresso_core', 'single_page_checkout'), EVENT_ESPRESSO_VERSION, true);
117
+			wp_enqueue_script('add_new_state');
118 118
 		}
119 119
 	}
120 120
 
@@ -128,28 +128,28 @@  discard block
 block discarded – undo
128 128
 	 * @return 	string
129 129
 	 */
130 130
 //	public static function display_add_new_state_micro_form( $html, EE_Form_Input_With_Options_Base $input ){
131
-	public static function display_add_new_state_micro_form( EE_Form_Section_Proper $question_group_reg_form ){
131
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form) {
132 132
 		// only add the 'new_state_micro_form' when displaying reg forms,
133 133
 		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
134
-		$action = EE_Registry::instance()->REQ->get( 'action', '' );
135
-		if ( $action === 'process_reg_step' || $action === 'update_reg_step' ) {
134
+		$action = EE_Registry::instance()->REQ->get('action', '');
135
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
136 136
 			return $question_group_reg_form;
137 137
 		}
138 138
 		// is the "state" question in this form section?
139
-		$input = $question_group_reg_form->get_subsection( 'state' );
139
+		$input = $question_group_reg_form->get_subsection('state');
140 140
 		// we're only doing this for state select inputs
141
-		if ( $input instanceof EE_State_Select_Input ) {
141
+		if ($input instanceof EE_State_Select_Input) {
142 142
 			// grab any set values from the request
143
-			$country_name = str_replace( 'state', 'nsmf_new_state_country', $input->html_name() );
144
-			$state_name = str_replace( 'state', 'nsmf_new_state_name', $input->html_name() );
145
-			$abbrv_name = str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_name() );
146
-			$new_state_submit_id = str_replace( 'state', 'new_state', $input->html_id() );
143
+			$country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
144
+			$state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
145
+			$abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
146
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
147 147
 			$country_options = array();
148 148
 			$countries = EEM_Country::instance()->get_all_countries();
149
-			if ( ! empty( $countries )) {
150
-				foreach( $countries as $country ){
151
-					if ( $country instanceof EE_Country ) {
152
-						$country_options[ $country->ID() ] = $country->name();
149
+			if ( ! empty($countries)) {
150
+				foreach ($countries as $country) {
151
+					if ($country instanceof EE_Country) {
152
+						$country_options[$country->ID()] = $country->name();
153 153
 					}
154 154
 				}
155 155
 			}
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
 						// add hidden input to indicate that a new state is being added
163 163
 						'add_new_state' 	=> new EE_Hidden_Input(
164 164
 							array(
165
-								'html_name' 	=> str_replace( 'state', 'nsmf_add_new_state', $input->html_name() ),
166
-								'html_id' 			=> str_replace( 'state', 'nsmf_add_new_state', $input->html_id() ),
165
+								'html_name' 	=> str_replace('state', 'nsmf_add_new_state', $input->html_name()),
166
+								'html_id' 			=> str_replace('state', 'nsmf_add_new_state', $input->html_id()),
167 167
 								'default'			=> 0
168 168
 							)
169 169
 						),
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 									'',
176 176
 									__('click here to add a new state/province', 'event_espresso'),
177 177
 									'',
178
-									'display-' . $input->html_id(),
178
+									'display-'.$input->html_id(),
179 179
 									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
180 180
 									'',
181
-									'data-target="' . $input->html_id() . '"'
181
+									'data-target="'.$input->html_id().'"'
182 182
 								)
183 183
 							)
184 184
 						),
@@ -186,13 +186,13 @@  discard block
 block discarded – undo
186 186
 						'add_new_state_micro_form' =>new EE_Form_Section_HTML(
187 187
 							apply_filters(
188 188
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
189
-								EEH_HTML::div( '', $input->html_id() . '-dv', 'ee-form-add-new-state-dv', 'display: none;' ) .
190
-								EEH_HTML::h6( __('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')) .
191
-								EEH_HTML::ul() .
192
-								EEH_HTML::li( __('first select the Country that your State/Province belongs to', 'event_espresso') ) .
193
-								EEH_HTML::li( __('enter the name of your State/Province', 'event_espresso') ) .
194
-								EEH_HTML::li( __('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso') ) .
195
-								EEH_HTML::li( __('click the ADD button', 'event_espresso') ) .
189
+								EEH_HTML::div('', $input->html_id().'-dv', 'ee-form-add-new-state-dv', 'display: none;').
190
+								EEH_HTML::h6(__('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')).
191
+								EEH_HTML::ul().
192
+								EEH_HTML::li(__('first select the Country that your State/Province belongs to', 'event_espresso')).
193
+								EEH_HTML::li(__('enter the name of your State/Province', 'event_espresso')).
194
+								EEH_HTML::li(__('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso')).
195
+								EEH_HTML::li(__('click the ADD button', 'event_espresso')).
196 196
 								EEH_HTML::ulx()
197 197
 							)
198 198
 						),
@@ -201,10 +201,10 @@  discard block
 block discarded – undo
201 201
 							$country_options,
202 202
 							array(
203 203
 								'html_name' 			=> $country_name,
204
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_country', $input->html_id() ),
205
-								'html_class' 			=> $input->html_class() . ' new-state-country',
204
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_country', $input->html_id()),
205
+								'html_class' 			=> $input->html_class().' new-state-country',
206 206
 								'html_label_text'		=> __('New State/Province Country', 'event_espresso'),
207
-								'default'					=> EE_Registry::instance()->REQ->get( $country_name, '' ),
207
+								'default'					=> EE_Registry::instance()->REQ->get($country_name, ''),
208 208
 								'required' 				=> false
209 209
 							)
210 210
 						),
@@ -212,23 +212,23 @@  discard block
 block discarded – undo
212 212
 						'new_state_name' => new EE_Text_Input(
213 213
 							array(
214 214
 								'html_name' 			=> $state_name,
215
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_name', $input->html_id() ),
216
-								'html_class' 			=> $input->html_class() . ' new-state-state',
215
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_name', $input->html_id()),
216
+								'html_class' 			=> $input->html_class().' new-state-state',
217 217
 								'html_label_text'		=> __('New State/Province Name', 'event_espresso'),
218
-								'default'					=> EE_Registry::instance()->REQ->get( $state_name, '' ),
218
+								'default'					=> EE_Registry::instance()->REQ->get($state_name, ''),
219 219
 								'required' 				=> false
220 220
 							)
221 221
 						),
222
-						'spacer' => new EE_Form_Section_HTML( EEH_HTML::br() ),
222
+						'spacer' => new EE_Form_Section_HTML(EEH_HTML::br()),
223 223
 						// NEW STATE NAME
224 224
 						'new_state_abbrv' => new EE_Text_Input(
225 225
 							array(
226 226
 								'html_name' 					=> $abbrv_name,
227
-								'html_id' 							=> str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_id() ),
228
-								'html_class' 					=> $input->html_class() . ' new-state-abbrv',
227
+								'html_id' 							=> str_replace('state', 'nsmf_new_state_abbrv', $input->html_id()),
228
+								'html_class' 					=> $input->html_class().' new-state-abbrv',
229 229
 								'html_label_text'				=> __('New State/Province Abbreviation', 'event_espresso'),
230 230
 								'html_other_attributes'	=> 'size="24"',
231
-								'default'							=> EE_Registry::instance()->REQ->get( $abbrv_name, '' ),
231
+								'default'							=> EE_Registry::instance()->REQ->get($abbrv_name, ''),
232 232
 								'required' 						=> false
233 233
 							)
234 234
 						),
@@ -236,15 +236,15 @@  discard block
 block discarded – undo
236 236
 						'add_new_state_submit_button' => new EE_Form_Section_HTML(
237 237
 							apply_filters(
238 238
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
239
-								EEH_HTML::nbsp(3) .
239
+								EEH_HTML::nbsp(3).
240 240
 								EEH_HTML::link(
241 241
 									'',
242 242
 									__('ADD', 'event_espresso'),
243 243
 									'',
244
-									'submit-' . $new_state_submit_id,
244
+									'submit-'.$new_state_submit_id,
245 245
 									'ee-form-add-new-state-submit button button-secondary',
246 246
 									'',
247
-									'data-target="' . $new_state_submit_id . '"'
247
+									'data-target="'.$new_state_submit_id.'"'
248 248
 								)
249 249
 							)
250 250
 						),
@@ -252,18 +252,18 @@  discard block
 block discarded – undo
252 252
 						'add_new_state_extra' => new EE_Form_Section_HTML(
253 253
 							apply_filters(
254 254
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
255
-								EEH_HTML::br(2) .
256
-								EEH_HTML::div( '', '', 'small-text' ) .
257
-								EEH_HTML::strong( __('Don\'t know your State/Province Abbreviation?', 'event_espresso') ) .
258
-								EEH_HTML::br() .
255
+								EEH_HTML::br(2).
256
+								EEH_HTML::div('', '', 'small-text').
257
+								EEH_HTML::strong(__('Don\'t know your State/Province Abbreviation?', 'event_espresso')).
258
+								EEH_HTML::br().
259 259
 								sprintf(
260 260
 									__('You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).', 'event_espresso'),
261
-									EEH_HTML::link( 'http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk' )
262
-								) .
263
-								EEH_HTML::divx() .
264
-								EEH_HTML::br() .
265
-								EEH_HTML::link( '', __('cancel new state/province', 'event_espresso'), '', 'hide-' . $input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="' . $input->html_id() . '"' ) .
266
-								EEH_HTML::divx() .
261
+									EEH_HTML::link('http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk')
262
+								).
263
+								EEH_HTML::divx().
264
+								EEH_HTML::br().
265
+								EEH_HTML::link('', __('cancel new state/province', 'event_espresso'), '', 'hide-'.$input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="'.$input->html_id().'"').
266
+								EEH_HTML::divx().
267 267
 								EEH_HTML::br()
268 268
 							)
269 269
 						)
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 					)
272 272
 				)
273 273
 			);
274
-			$question_group_reg_form->add_subsections( array( 'new_state_micro_form' => $new_state_micro_form ), 'state', false );
274
+			$question_group_reg_form->add_subsections(array('new_state_micro_form' => $new_state_micro_form), 'state', false);
275 275
 		}
276 276
 		return $question_group_reg_form;
277 277
 	}
@@ -289,50 +289,50 @@  discard block
 block discarded – undo
289 289
 	public static function add_new_state() {
290 290
 		$REQ = EE_Registry::instance()->load_core('Request_Handler');
291 291
 		if (
292
-			$REQ->is_set( 'nsmf_add_new_state' )
293
-			&& $REQ->get( 'nsmf_add_new_state' ) == 1
292
+			$REQ->is_set('nsmf_add_new_state')
293
+			&& $REQ->get('nsmf_add_new_state') == 1
294 294
 		) {
295 295
 			EE_Registry::instance()->load_model('State');
296 296
 			// grab country ISO code, new state name, and new state abbreviation
297
-			$state_country = $REQ->is_set( 'nsmf_new_state_country' )
298
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_country' ) )
297
+			$state_country = $REQ->is_set('nsmf_new_state_country')
298
+				? sanitize_text_field($REQ->get('nsmf_new_state_country'))
299 299
 				: false;
300
-			$state_name = $REQ->is_set( 'nsmf_new_state_name' )
301
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_name' ) )
300
+			$state_name = $REQ->is_set('nsmf_new_state_name')
301
+				? sanitize_text_field($REQ->get('nsmf_new_state_name'))
302 302
 				: false;
303
-			$state_abbr = $REQ->is_set( 'nsmf_new_state_abbrv' )
304
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_abbrv' ) )
303
+			$state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
304
+				? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
305 305
 				: false;
306 306
 //echo '<h4>$state_country : ' . $state_country . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
307 307
 //echo '<h4>$state_name : ' . $state_name . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
308 308
 //echo '<h4>$state_abbr : ' . $state_abbr . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
309 309
 
310
-			if ( $state_country && $state_name && $state_abbr ) {
311
-				$new_state = EED_Add_New_State::save_new_state_to_db( array(
312
-					'CNT_ISO'=> strtoupper( $state_country ),
313
-					'STA_abbrev' => strtoupper( $state_abbr ),
314
-					'STA_name' => ucwords( $state_name ),
310
+			if ($state_country && $state_name && $state_abbr) {
311
+				$new_state = EED_Add_New_State::save_new_state_to_db(array(
312
+					'CNT_ISO'=> strtoupper($state_country),
313
+					'STA_abbrev' => strtoupper($state_abbr),
314
+					'STA_name' => ucwords($state_name),
315 315
 					'STA_active' => FALSE
316 316
 				));
317 317
 
318
-				if ( $new_state instanceof EE_State ) {
318
+				if ($new_state instanceof EE_State) {
319 319
 					// clean house
320
-					EE_Registry::instance()->REQ->un_set( 'nsmf_add_new_state' );
321
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_country' );
322
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_name' );
323
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_abbrv' );
320
+					EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
321
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
322
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
323
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
324 324
 
325 325
 					// get any existing new states
326 326
 					$new_states = EE_Registry::instance()->SSN->get_session_data(
327 327
 						'nsmf_new_states'
328 328
 					);
329
-					$new_states[ $new_state->ID() ] = $new_state;
329
+					$new_states[$new_state->ID()] = $new_state;
330 330
 					EE_Registry::instance()->SSN->set_session_data(
331
-						array( 'nsmf_new_states' => $new_states )
331
+						array('nsmf_new_states' => $new_states)
332 332
 					);
333 333
 
334
-					if ( EE_Registry::instance()->REQ->ajax ) {
335
-						echo json_encode( array(
334
+					if (EE_Registry::instance()->REQ->ajax) {
335
+						echo json_encode(array(
336 336
 							'success' => TRUE,
337 337
 							'id' => $new_state->ID(),
338 338
 							'name' => $new_state->name(),
@@ -347,12 +347,12 @@  discard block
 block discarded – undo
347 347
 				}
348 348
 
349 349
 			} else {
350
-				$error = __( 'A new State/Province could not be added because invalid or missing data was received.', 'event_espresso' );
351
-				if ( EE_Registry::instance()->REQ->ajax ) {
352
-					echo json_encode( array( 'error' => $error ));
350
+				$error = __('A new State/Province could not be added because invalid or missing data was received.', 'event_espresso');
351
+				if (EE_Registry::instance()->REQ->ajax) {
352
+					echo json_encode(array('error' => $error));
353 353
 					exit();
354 354
 				} else {
355
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
355
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
356 356
 				}
357 357
 			}
358 358
 		}
@@ -370,11 +370,11 @@  discard block
 block discarded – undo
370 370
 	 * @param array $request_params
371 371
 	 * @return array
372 372
 	 */
373
-	public static function filter_checkout_request_params ( $request_params ) {
374
-		foreach ( $request_params as $form_section ) {
375
-			if ( is_array( $form_section )) {
376
-				EED_Add_New_State::unset_new_state_request_params( $form_section );
377
-				EED_Add_New_State::filter_checkout_request_params( $form_section );
373
+	public static function filter_checkout_request_params($request_params) {
374
+		foreach ($request_params as $form_section) {
375
+			if (is_array($form_section)) {
376
+				EED_Add_New_State::unset_new_state_request_params($form_section);
377
+				EED_Add_New_State::filter_checkout_request_params($form_section);
378 378
 			}
379 379
 		}
380 380
 		return $request_params;
@@ -389,12 +389,12 @@  discard block
 block discarded – undo
389 389
 	 * @param array $request_params
390 390
 	 * @return        boolean
391 391
 	 */
392
-	public static function unset_new_state_request_params ( $request_params ) {
393
-		unset( $request_params[ 'new_state_micro_form' ] );
394
-		unset( $request_params[ 'new_state_micro_add_new_state' ] );
395
-		unset( $request_params[ 'new_state_micro_new_state_country' ] );
396
-		unset( $request_params[ 'new_state_micro_new_state_name' ] );
397
-		unset( $request_params[ 'new_state_micro_new_state_abbrv' ] );
392
+	public static function unset_new_state_request_params($request_params) {
393
+		unset($request_params['new_state_micro_form']);
394
+		unset($request_params['new_state_micro_add_new_state']);
395
+		unset($request_params['new_state_micro_new_state_country']);
396
+		unset($request_params['new_state_micro_new_state_name']);
397
+		unset($request_params['new_state_micro_new_state_abbrv']);
398 398
 		return $request_params;
399 399
 	}
400 400
 
@@ -407,25 +407,25 @@  discard block
 block discarded – undo
407 407
 	 * @param array $props_n_values
408 408
 	 * @return        boolean
409 409
 	 */
410
-	public static function save_new_state_to_db ( $props_n_values = array() ) {
410
+	public static function save_new_state_to_db($props_n_values = array()) {
411 411
 //		EEH_Debug_Tools::printr( $props_n_values, '$props_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
412
-		$existing_state = EEM_State::instance()->get_all( array( $props_n_values, 'limit' => 1 ));
413
-		if ( ! empty( $existing_state )) {
414
-			return array_pop( $existing_state );
412
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
413
+		if ( ! empty($existing_state)) {
414
+			return array_pop($existing_state);
415 415
 		}
416
-		$new_state = EE_State::new_instance( $props_n_values );
417
-		if ( $new_state instanceof EE_State ) {
416
+		$new_state = EE_State::new_instance($props_n_values);
417
+		if ($new_state instanceof EE_State) {
418 418
 			// if not non-ajax admin
419
-			$new_state_key = 'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev();
419
+			$new_state_key = 'new-state-added-'.$new_state->country_iso().'-'.$new_state->abbrev();
420 420
 			$new_state_notice = sprintf(
421
-					__( 'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso' ),
422
-					'<b>' . $new_state->name() . '</b>',
423
-					'<b>' . $new_state->abbrev() . '</b>',
424
-					'<b>' . $new_state->country()->name() . '</b>',
425
-					'<a href="' . add_query_arg( array( 'page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso() ), admin_url( 'admin.php' )) . '">' . __( 'Event Espresso - General Settings > Countries Tab', 'event_espresso' ) . '</a>',
421
+					__('A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso'),
422
+					'<b>'.$new_state->name().'</b>',
423
+					'<b>'.$new_state->abbrev().'</b>',
424
+					'<b>'.$new_state->country()->name().'</b>',
425
+					'<a href="'.add_query_arg(array('page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso()), admin_url('admin.php')).'">'.__('Event Espresso - General Settings > Countries Tab', 'event_espresso').'</a>',
426 426
 					'<br />'
427 427
 			);
428
-			EE_Error::add_persistent_admin_notice( $new_state_key, $new_state_notice );
428
+			EE_Error::add_persistent_admin_notice($new_state_key, $new_state_notice);
429 429
 			$new_state->save();
430 430
 			EEM_State::instance()->reset_cached_states();
431 431
 			return $new_state;
@@ -444,22 +444,22 @@  discard block
 block discarded – undo
444 444
 	 * @param array  $cols_n_values
445 445
 	 * @return        boolean
446 446
 	 */
447
-	public static function update_country_settings( $CNT_ISO = '', $STA_ID = '', $cols_n_values = array() ) {
448
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : FALSE;
449
-		if ( ! $CNT_ISO ) {
450
-			EE_Error::add_error( __( 'An invalid or missing Country ISO Code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
447
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array()) {
448
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : FALSE;
449
+		if ( ! $CNT_ISO) {
450
+			EE_Error::add_error(__('An invalid or missing Country ISO Code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
451 451
 		}
452
-		$STA_abbrev = is_array( $cols_n_values ) && isset( $cols_n_values['STA_abbrev'] ) ? $cols_n_values['STA_abbrev'] : FALSE;
453
-		if (  ! $STA_abbrev && ! empty( $STA_ID )) {
454
-			$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
455
-			if ( $state instanceof EE_State ) {
452
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev'] : FALSE;
453
+		if ( ! $STA_abbrev && ! empty($STA_ID)) {
454
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
455
+			if ($state instanceof EE_State) {
456 456
 				$STA_abbrev = $state->abbrev();
457 457
 			}
458 458
 		}
459
-		if ( ! $STA_abbrev ) {
460
-			EE_Error::add_error( __( 'An invalid or missing State Abbreviation was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
459
+		if ( ! $STA_abbrev) {
460
+			EE_Error::add_error(__('An invalid or missing State Abbreviation was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
461 461
 		}
462
-		EE_Error::dismiss_persistent_admin_notice( $CNT_ISO . '-' . $STA_abbrev, TRUE, TRUE );
462
+		EE_Error::dismiss_persistent_admin_notice($CNT_ISO.'-'.$STA_abbrev, TRUE, TRUE);
463 463
 	}
464 464
 
465 465
 
@@ -475,19 +475,19 @@  discard block
 block discarded – undo
475 475
 	 * @param $answer
476 476
 	 * @return bool
477 477
 	 */
478
-	public static function inject_new_reg_state_into_options( $state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
479
-		if ( $answer instanceof EE_Answer  && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state ) {
478
+	public static function inject_new_reg_state_into_options($state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
479
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state) {
480 480
 			$STA_ID = $answer->value();
481
-			if ( ! empty( $STA_ID ) ) {
482
-				$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
483
-				if ( $state instanceof EE_State ) {
481
+			if ( ! empty($STA_ID)) {
482
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
483
+				if ($state instanceof EE_State) {
484 484
 					$country = $state->country();
485
-					if ( $country instanceof EE_Country ) {
486
-						if ( ! isset( $state_options[ $country->name() ] )) {
487
-							$state_options[ $country->name() ] = array();
485
+					if ($country instanceof EE_Country) {
486
+						if ( ! isset($state_options[$country->name()])) {
487
+							$state_options[$country->name()] = array();
488 488
 						}
489
-						if ( ! isset( $state_options[ $country->name() ][ $STA_ID ] )) {
490
-							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
489
+						if ( ! isset($state_options[$country->name()][$STA_ID])) {
490
+							$state_options[$country->name()][$STA_ID] = $state->name();
491 491
 						}
492 492
 					}
493 493
 				}
@@ -509,14 +509,14 @@  discard block
 block discarded – undo
509 509
 	 * @param $answer
510 510
 	 * @return bool
511 511
 	 */
512
-	public static function inject_new_reg_country_into_options( $country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
513
-		if ( $answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country ) {
512
+	public static function inject_new_reg_country_into_options($country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
513
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country) {
514 514
 			$CNT_ISO = $answer->value();
515
-			if ( ! empty( $CNT_ISO ) ) {
516
-				$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
517
-				if ( $country instanceof EE_Country ) {
518
-					if ( ! isset( $country_options[ $CNT_ISO ] ) ) {
519
-						$country_options[ $CNT_ISO ] = $country->name();
515
+			if ( ! empty($CNT_ISO)) {
516
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
517
+				if ($country instanceof EE_Country) {
518
+					if ( ! isset($country_options[$CNT_ISO])) {
519
+						$country_options[$CNT_ISO] = $country->name();
520 520
 					}
521 521
 				}
522 522
 			}
@@ -533,14 +533,14 @@  discard block
 block discarded – undo
533 533
 	 * @param EE_State[]  $state_options
534 534
 	 * @return        boolean
535 535
 	 */
536
-	public static function state_options( $state_options = array() ) {
536
+	public static function state_options($state_options = array()) {
537 537
 		$new_states = EED_Add_New_State::_get_new_states();
538
-		foreach ( $new_states as $new_state ) {
538
+		foreach ($new_states as $new_state) {
539 539
 			if (
540 540
 				$new_state instanceof EE_State
541 541
 				&& $new_state->country() instanceof EE_Country
542 542
 			) {
543
-				$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
543
+				$state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
544 544
 			}
545 545
 		}
546 546
 		return $state_options;
@@ -556,12 +556,12 @@  discard block
 block discarded – undo
556 556
 	 */
557 557
 	protected static function _get_new_states() {
558 558
 		$new_states = array();
559
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
559
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
560 560
 			$new_states = EE_Registry::instance()->SSN->get_session_data(
561 561
 				'nsmf_new_states'
562 562
 			);
563 563
 		}
564
-		return is_array( $new_states ) ? $new_states : array();
564
+		return is_array($new_states) ? $new_states : array();
565 565
 	}
566 566
 
567 567
 
@@ -573,14 +573,14 @@  discard block
 block discarded – undo
573 573
 	 * @param EE_Country[]  $country_options
574 574
 	 * @return        boolean
575 575
 	 */
576
-	public static function country_options( $country_options = array() ) {
576
+	public static function country_options($country_options = array()) {
577 577
 		$new_states = EED_Add_New_State::_get_new_states();
578
-		foreach ( $new_states as $new_state ) {
578
+		foreach ($new_states as $new_state) {
579 579
 			if (
580 580
 				$new_state instanceof EE_State
581 581
 				&& $new_state->country() instanceof EE_Country
582 582
 			) {
583
-				$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
583
+				$country_options[$new_state->country()->ID()] = $new_state->country()->name();
584 584
 			}
585 585
 		}
586 586
 		return $country_options;
Please login to merge, or discard this patch.
modules/events_archive/EED_Events_Archive.module.php 1 patch
Spacing   +173 added lines, -173 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @return EED_Events_Archive
44 44
 	 */
45 45
 	public static function instance() {
46
-		return parent::get_instance( __CLASS__ );
46
+		return parent::get_instance(__CLASS__);
47 47
 	}
48 48
 
49 49
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 *  @return 	void
56 56
 	 */
57 57
 	public static function set_hooks() {
58
-		EE_Config::register_route( EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run' );
59
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
60
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
58
+		EE_Config::register_route(EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run');
59
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
60
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
61 61
 	}
62 62
 
63 63
 	/**
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 *  @return 	void
68 68
 	 */
69 69
 	public static function set_hooks_admin() {
70
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
70
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
71 71
 	}
72 72
 
73 73
 
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
 	 *  @return 	void
81 81
 	 */
82 82
 	public static function set_definitions() {
83
-		define( 'EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
84
-		define( 'EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
83
+		define('EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
84
+		define('EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
85 85
 	}
86 86
 
87 87
 
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
 	 *
92 92
 	 * @return \EE_Events_Archive_Config
93 93
 	 */
94
-	protected function set_config(){
95
-		$this->set_config_section( 'template_settings' );
96
-		$this->set_config_class( 'EE_Events_Archive_Config' );
97
-		$this->set_config_name( 'EED_Events_Archive' );
94
+	protected function set_config() {
95
+		$this->set_config_section('template_settings');
96
+		$this->set_config_class('EE_Events_Archive_Config');
97
+		$this->set_config_name('EED_Events_Archive');
98 98
 	}
99 99
 
100 100
 
@@ -106,35 +106,35 @@  discard block
 block discarded – undo
106 106
 	 * @param \EE_Events_Archive_Config $config
107 107
 	 * @return \EE_Template_Part_Manager
108 108
 	 */
109
-	public function initialize_template_parts( EE_Events_Archive_Config $config = null ) {
109
+	public function initialize_template_parts(EE_Events_Archive_Config $config = null) {
110 110
 		$config = $config instanceof EE_Events_Archive_Config ? $config : $this->config();
111 111
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
112 112
 		$template_parts = new EE_Template_Part_Manager();
113 113
 		$template_parts->add_template_part(
114 114
 			'tickets',
115
-			__( 'Ticket Selector', 'event_espresso' ),
115
+			__('Ticket Selector', 'event_espresso'),
116 116
 			'content-espresso_events-tickets.php',
117 117
 			$config->display_order_tickets
118 118
 		);
119 119
 		$template_parts->add_template_part(
120 120
 			'datetimes',
121
-			__( 'Dates and Times', 'event_espresso' ),
121
+			__('Dates and Times', 'event_espresso'),
122 122
 			'content-espresso_events-datetimes.php',
123 123
 			$config->display_order_datetimes
124 124
 		);
125 125
 		$template_parts->add_template_part(
126 126
 			'event',
127
-			__( 'Event Description', 'event_espresso' ),
127
+			__('Event Description', 'event_espresso'),
128 128
 			'content-espresso_events-details.php',
129 129
 			$config->display_order_event
130 130
 		);
131 131
 		$template_parts->add_template_part(
132 132
 			'venue',
133
-			__( 'Venue Information', 'event_espresso' ),
133
+			__('Venue Information', 'event_espresso'),
134 134
 			'content-espresso_events-venues.php',
135 135
 			$config->display_order_venue
136 136
 		);
137
-		do_action( 'AHEE__EED_Event_Archive__initialize_template_parts', $template_parts );
137
+		do_action('AHEE__EED_Event_Archive__initialize_template_parts', $template_parts);
138 138
 		return $template_parts;
139 139
 	}
140 140
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @param WP $WP
148 148
 	 * @return    void
149 149
 	 */
150
-	public function run( $WP ) {
151
-		do_action( 'AHEE__EED_Events_Archive__before_run' );
150
+	public function run($WP) {
151
+		do_action('AHEE__EED_Events_Archive__before_run');
152 152
 		// ensure valid EE_Events_Archive_Config() object exists
153 153
 		$this->set_config();
154 154
 		/** @type EE_Events_Archive_Config $config */
@@ -160,14 +160,14 @@  discard block
 block discarded – undo
160 160
 		EEH_Event_Query::add_query_filters();
161 161
 		// set params that will get used by the filters
162 162
 		EEH_Event_Query::set_query_params(
163
-			'', 	// month
164
-			'', 	// category
165
-			$config->display_expired_events, 	// show_expired
166
-			'start_date', 	// orderby
163
+			'', // month
164
+			'', // category
165
+			$config->display_expired_events, // show_expired
166
+			'start_date', // orderby
167 167
 			'ASC' 	// sort
168 168
 		);
169 169
 		// check what template is loaded
170
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
170
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
171 171
 	}
172 172
 
173 173
 
@@ -199,32 +199,32 @@  discard block
 block discarded – undo
199 199
 	 * @param string $template
200 200
 	 * @return    string
201 201
 	 */
202
-	public function template_include( $template = '' ) {
202
+	public function template_include($template = '') {
203 203
 		// don't add content filter for dedicated EE child themes or private posts
204
-		if ( ! EEH_Template::is_espresso_theme() ) {
204
+		if ( ! EEH_Template::is_espresso_theme()) {
205 205
 			/** @type EE_Events_Archive_Config $config */
206 206
 			$config = $this->config();
207 207
 			// add status banner ?
208
-			if ( $config->display_status_banner ) {
209
-				add_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100, 2 );
208
+			if ($config->display_status_banner) {
209
+				add_filter('the_title', array('EED_Events_Archive', 'the_title'), 100, 2);
210 210
 			}
211 211
 			// if NOT a custom template
212 212
 			if (
213
-				EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php'
214
-				|| apply_filters( 'FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE )
213
+				EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php'
214
+				|| apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE)
215 215
 			) {
216 216
 				// don't display entry meta because the existing theme will take care of that
217
-				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
217
+				add_filter('FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true');
218 218
 			// load functions.php file for the theme (loaded by WP if using child theme)
219 219
 				EEH_Template::load_espresso_theme_functions();
220 220
 				// because we don't know if the theme is using the_excerpt()
221
-				add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
221
+				add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
222 222
 				// or the_content
223
-				add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
223
+				add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
224 224
 				// and just in case they are running get_the_excerpt() which DESTROYS things
225
-				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
225
+				add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
226 226
 				// don't display entry meta because the existing theme will take care of that
227
-				add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
227
+				add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
228 228
 			}
229 229
 		}
230 230
 		return $template;
@@ -239,17 +239,17 @@  discard block
 block discarded – undo
239 239
 	 * 	@param		string 	$excerpt
240 240
 	 * 	@return 		string
241 241
 	 */
242
-	public static function get_the_excerpt( $excerpt = '' ) {
243
-		if ( post_password_required() ) {
242
+	public static function get_the_excerpt($excerpt = '') {
243
+		if (post_password_required()) {
244 244
 			return $excerpt;
245 245
 		}
246
-		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
247
-			remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
248
-			remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
249
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
246
+		if (apply_filters('FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false)) {
247
+			remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
248
+			remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
249
+			$excerpt = EED_Events_Archive::event_details($excerpt);
250 250
 		} else {
251 251
 			EED_Events_Archive::$using_get_the_excerpt = true;
252
-			add_filter( 'wp_trim_excerpt', array( 'EED_Events_Archive', 'end_get_the_excerpt' ), 999, 1 );
252
+			add_filter('wp_trim_excerpt', array('EED_Events_Archive', 'end_get_the_excerpt'), 999, 1);
253 253
 		}
254 254
 		return $excerpt;
255 255
 	}
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 	 * @param  string $text
264 264
 	 * @return string
265 265
 	 */
266
-	public static function end_get_the_excerpt( $text = '' ) {
266
+	public static function end_get_the_excerpt($text = '') {
267 267
 		EED_Events_Archive::$using_get_the_excerpt = false;
268 268
 		return $text;
269 269
 	}
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 	 * @param 		string 		$id
279 279
 	 * @return 		string
280 280
 	 */
281
-	public static function the_title( $title = '', $id = '' ) {
281
+	public static function the_title($title = '', $id = '') {
282 282
 	global $post;
283
-	if ( $post instanceof WP_Post ) {
284
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID  ) . $title :  $title;
283
+	if ($post instanceof WP_Post) {
284
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
285 285
 	}
286 286
 	return $title;
287 287
 }
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 	 * 	@param		string 	$content
296 296
 	 * 	@return 		string
297 297
 	 */
298
-	public static function event_details( $content ) {
298
+	public static function event_details($content) {
299 299
 		global $post;
300 300
 		static $current_post_ID = 0;
301 301
 		if (
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
 			&& ! EED_Events_Archive::$using_get_the_excerpt
305 305
 			&& ! post_password_required()
306 306
 			&& (
307
-				apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', false )
308
-				|| ! apply_filters( 'FHEE__content_espresso_events__template_loaded', false )
307
+				apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', false)
308
+				|| ! apply_filters('FHEE__content_espresso_events__template_loaded', false)
309 309
 			)
310 310
 		) {
311 311
 			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
315 315
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
316 316
 			// so the following allows this filter to be applied multiple times, but only once for real
317
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
318
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order ) {
317
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
318
+			if (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order) {
319 319
 				$content = \EED_Events_Archive::use_sortable_display_order();
320 320
 			} else {
321 321
 				$content = \EED_Events_Archive::use_filterable_display_order();
@@ -334,20 +334,20 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	protected static function use_sortable_display_order() {
336 336
 		// no further password checks required atm
337
-		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
337
+		add_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
338 338
 		// we need to first remove this callback from being applied to the_content() or the_excerpt() (otherwise it will recurse and blow up the interweb)
339
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
340
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
341
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
339
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
340
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
341
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
342 342
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
343 343
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
344
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
345
-		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
344
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
345
+		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters($content);
346 346
 		// re-add our main filters (or else the next event won't have them)
347
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
348
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
349
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
350
-		remove_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
347
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
348
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
349
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
350
+		remove_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
351 351
 		return $content;
352 352
 	}
353 353
 
@@ -362,22 +362,22 @@  discard block
 block discarded – undo
362 362
 	protected static function use_filterable_display_order() {
363 363
 		// we need to first remove this callback from being applied to the_content()
364 364
 		// (otherwise it will recurse and blow up the interweb)
365
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
366
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
367
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
365
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
366
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
367
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
368 368
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
369 369
 		EED_Events_Archive::_add_additional_excerpt_filters();
370 370
 		EED_Events_Archive::_add_additional_content_filters();
371
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters' );
371
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters');
372 372
 		// now load our template
373
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
373
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
374 374
 		// re-add our main filters (or else the next event won't have them)
375
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
376
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
377
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
375
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
376
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
377
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
378 378
 		// but remove the other filters so that they don't get applied to the next post
379 379
 		EED_Events_Archive::_remove_additional_events_archive_filters();
380
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters' );
380
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters');
381 381
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
382 382
 		//return ! empty( $template ) ? $template : $content;
383 383
 		return $content;
@@ -392,11 +392,11 @@  discard block
 block discarded – undo
392 392
 	 * 	@param		string 	$content
393 393
 	 *  	@return 		string
394 394
 	 */
395
-	public static function event_datetimes( $content ) {
396
-		if ( post_password_required() ) {
395
+	public static function event_datetimes($content) {
396
+		if (post_password_required()) {
397 397
 			return $content;
398 398
 		}
399
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
399
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
400 400
 	}
401 401
 
402 402
 	/**
@@ -406,11 +406,11 @@  discard block
 block discarded – undo
406 406
 	 * 	@param		string 	$content
407 407
 	 *  	@return 		string
408 408
 	 */
409
-	public static function event_tickets( $content ) {
410
-		if ( post_password_required() ) {
409
+	public static function event_tickets($content) {
410
+		if (post_password_required()) {
411 411
 			return $content;
412 412
 		}
413
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
413
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
414 414
 	}
415 415
 
416 416
 
@@ -422,8 +422,8 @@  discard block
 block discarded – undo
422 422
 	 * @param    string $content
423 423
 	 * @return    string
424 424
 	 */
425
-	public static function event_venue( $content ) {
426
-		return EED_Events_Archive::event_venues( $content );
425
+	public static function event_venue($content) {
426
+		return EED_Events_Archive::event_venues($content);
427 427
 	}
428 428
 
429 429
 	/**
@@ -433,11 +433,11 @@  discard block
 block discarded – undo
433 433
 	 * 	@param		string 	$content
434 434
 	 *  	@return 		string
435 435
 	 */
436
-	public static function event_venues( $content ) {
437
-		if ( post_password_required() ) {
436
+	public static function event_venues($content) {
437
+		if (post_password_required()) {
438 438
 			return $content;
439 439
 		}
440
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
440
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
441 441
 	}
442 442
 
443 443
 
@@ -449,9 +449,9 @@  discard block
 block discarded – undo
449 449
 	 * @return        void
450 450
 	 */
451 451
 	private static function _add_additional_excerpt_filters() {
452
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
453
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
454
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
452
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
453
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120, 1);
454
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130, 1);
455 455
 	}
456 456
 
457 457
 
@@ -463,9 +463,9 @@  discard block
 block discarded – undo
463 463
 	 * @return        void
464 464
 	 */
465 465
 	private static function _add_additional_content_filters() {
466
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
467
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
468
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
466
+		add_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
467
+		add_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120, 1);
468
+		add_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130, 1);
469 469
 	}
470 470
 
471 471
 
@@ -477,12 +477,12 @@  discard block
 block discarded – undo
477 477
 	 * @return        void
478 478
 	 */
479 479
 	private static function _remove_additional_events_archive_filters() {
480
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
481
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
482
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
483
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
484
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
485
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
480
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
481
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
482
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
483
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
484
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
485
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
486 486
 	}
487 487
 
488 488
 
@@ -495,17 +495,17 @@  discard block
 block discarded – undo
495 495
 	 */
496 496
 	public static function remove_all_events_archive_filters() {
497 497
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
498
-		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100 );
499
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
500
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
501
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
502
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
503
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
504
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
505
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
506
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
498
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 100);
499
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
500
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
501
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
502
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
503
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
504
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
505
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
506
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
507 507
 		// don't display entry meta because the existing theme will take care of that
508
-		remove_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
508
+		remove_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
509 509
 	}
510 510
 
511 511
 
@@ -520,12 +520,12 @@  discard block
 block discarded – undo
520 520
 	 *  @return 	void
521 521
 	 */
522 522
 	public function load_event_list_assets() {
523
-		do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
524
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
525
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
526
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
527
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
528
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
523
+		do_action('AHEE__EED_Events_Archive__before_load_assets');
524
+		add_filter('FHEE_load_EE_Session', '__return_true');
525
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
526
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
527
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
528
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
529 529
 		}
530 530
 	}
531 531
 
@@ -542,13 +542,13 @@  discard block
 block discarded – undo
542 542
 	 */
543 543
 	public function wp_enqueue_scripts() {
544 544
 		// get some style
545
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
545
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
546 546
 			// first check uploads folder
547
-			if ( EEH_File::is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
548
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
547
+			if (EEH_File::is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
548
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
549 549
 			} else {
550 550
 		}
551
-		wp_enqueue_style( $this->theme );
551
+		wp_enqueue_style($this->theme);
552 552
 
553 553
 	}
554 554
 }
@@ -566,8 +566,8 @@  discard block
 block discarded – undo
566 566
 	 */
567 567
 	public static function template_settings_form() {
568 568
 	$template_settings = EE_Registry::instance()->CFG->template_settings;
569
-	$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
570
-	$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
569
+	$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
570
+	$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
571 571
 	$events_archive_settings = array(
572 572
 		'display_status_banner' => 0,
573 573
 		'display_description' => 1,
@@ -576,8 +576,8 @@  discard block
 block discarded – undo
576 576
 		'display_venue' => 0,
577 577
 		'display_expired_events' => 0
578 578
 	);
579
-	$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
580
-	EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
579
+	$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
580
+	EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
581 581
 }
582 582
 
583 583
 
@@ -593,16 +593,16 @@  discard block
 block discarded – undo
593 593
 	 *  @param 	EE_Request_Handler $REQ
594 594
 	 *  @return 	EE_Template_Config
595 595
 	 */
596
-	public static function update_template_settings( $CFG, $REQ ) {
596
+	public static function update_template_settings($CFG, $REQ) {
597 597
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
598 598
 		// unless we are resetting the config...
599
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
600
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
601
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
602
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
603
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
604
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
605
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
599
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
600
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
601
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
602
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
603
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
604
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
605
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
606 606
 		return $CFG;
607 607
 	}
608 608
 
@@ -615,10 +615,10 @@  discard block
 block discarded – undo
615 615
 	 * @param string $extra_class
616 616
 	 * @return    string
617 617
 	 */
618
-	public static function event_list_css( $extra_class = '' ) {
619
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
618
+	public static function event_list_css($extra_class = '') {
619
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
620 620
 		$event_list_css[] = 'espresso-event-list-event';
621
-		return implode( ' ', $event_list_css );
621
+		return implode(' ', $event_list_css);
622 622
 	}
623 623
 
624 624
 
@@ -645,9 +645,9 @@  discard block
 block discarded – undo
645 645
 	 * @param $value
646 646
 	 * @return    bool
647 647
 	 */
648
-	public static function display_description( $value ) {
648
+	public static function display_description($value) {
649 649
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
650
-		$display_description= isset( $config->display_description ) ? $config->display_description : 1;
650
+		$display_description = isset($config->display_description) ? $config->display_description : 1;
651 651
 		return $display_description === $value ? TRUE : FALSE;
652 652
 	}
653 653
 
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 	 */
661 661
 	public static function display_ticket_selector() {
662 662
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
663
-		return isset( $config->display_ticket_selector ) && $config->display_ticket_selector ? TRUE : FALSE;
663
+		return isset($config->display_ticket_selector) && $config->display_ticket_selector ? TRUE : FALSE;
664 664
 	}
665 665
 
666 666
 
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 	 */
674 674
 	public static function display_venue() {
675 675
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
676
-		return isset( $config->display_venue ) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
676
+		return isset($config->display_venue) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
677 677
 	}
678 678
 
679 679
 
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 	 */
686 686
 	public static function display_datetimes() {
687 687
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
688
-		return isset( $config->display_datetimes ) && $config->display_datetimes ? TRUE : FALSE;
688
+		return isset($config->display_datetimes) && $config->display_datetimes ? TRUE : FALSE;
689 689
 }
690 690
 
691 691
 
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 	 *  @return 	string
701 701
 	 */
702 702
 	public static function event_list_title() {
703
-		return apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
703
+		return apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
704 704
 	}
705 705
 
706 706
 
@@ -709,11 +709,11 @@  discard block
 block discarded – undo
709 709
 	/**
710 710
 	 * 	@since 4.4.0
711 711
 	 */
712
-	public static function _doing_it_wrong_notice( $function = '' ) {
712
+	public static function _doing_it_wrong_notice($function = '') {
713 713
 		EE_Error::doing_it_wrong(
714 714
 			__FUNCTION__,
715 715
 			sprintf(
716
-				__( 'EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso' ),
716
+				__('EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso'),
717 717
 				$function,
718 718
 				'<br />',
719 719
 				'4.6.0'
@@ -735,89 +735,89 @@  discard block
 block discarded – undo
735 735
 	 * 	@deprecated
736 736
 	 * 	@since 4.4.0
737 737
 	 */
738
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
739
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
740
-		return EEH_Event_Query::posts_fields( $SQL, $wp_query );
738
+	public function posts_fields($SQL, WP_Query $wp_query) {
739
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
740
+		return EEH_Event_Query::posts_fields($SQL, $wp_query);
741 741
 	}
742 742
 	/**
743 743
 	 * 	@deprecated
744 744
 	 * 	@since 4.4.0
745 745
 	 */
746
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
747
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
748
-		return EEH_Event_Query::posts_fields_sql_for_orderby( $orderby_params );
746
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
747
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
748
+		return EEH_Event_Query::posts_fields_sql_for_orderby($orderby_params);
749 749
 	}
750 750
 	/**
751 751
 	 * 	@deprecated
752 752
 	 * 	@since 4.4.0
753 753
 	 */
754
-	public function posts_join( $SQL, WP_Query $wp_query ) {
755
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
756
-		return EEH_Event_Query::posts_join( $SQL, $wp_query );
754
+	public function posts_join($SQL, WP_Query $wp_query) {
755
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
756
+		return EEH_Event_Query::posts_join($SQL, $wp_query);
757 757
 	}
758 758
 	/**
759 759
 	 * 	@deprecated
760 760
 	 * 	@since 4.4.0
761 761
 	 */
762
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
763
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
764
-		return EEH_Event_Query::posts_join_sql_for_terms( $join_terms );
762
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
763
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
764
+		return EEH_Event_Query::posts_join_sql_for_terms($join_terms);
765 765
 	}
766 766
 	/**
767 767
 	 * 	@deprecated
768 768
 	 * 	@since 4.4.0
769 769
 	 */
770
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
771
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
772
-		return EEH_Event_Query::posts_join_for_orderby( $orderby_params );
770
+	public static function posts_join_for_orderby($orderby_params = array()) {
771
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
772
+		return EEH_Event_Query::posts_join_for_orderby($orderby_params);
773 773
 	}
774 774
 	/**
775 775
 	 * 	@deprecated
776 776
 	 * 	@since 4.4.0
777 777
 	 */
778
-	public function posts_where( $SQL, WP_Query $wp_query ) {
779
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
780
-		return EEH_Event_Query::posts_where( $SQL, $wp_query );
778
+	public function posts_where($SQL, WP_Query $wp_query) {
779
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
780
+		return EEH_Event_Query::posts_where($SQL, $wp_query);
781 781
 	}
782 782
 	/**
783 783
 	 * 	@deprecated
784 784
 	 * 	@since 4.4.0
785 785
 	 */
786
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
787
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
788
-		return EEH_Event_Query::posts_where_sql_for_show_expired( $show_expired );
786
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
787
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
788
+		return EEH_Event_Query::posts_where_sql_for_show_expired($show_expired);
789 789
 	}
790 790
 	/**
791 791
 	 * 	@deprecated
792 792
 	 * 	@since 4.4.0
793 793
 	 */
794
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
795
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
796
-		return EEH_Event_Query::posts_where_sql_for_event_category_slug( $event_category_slug );
794
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
795
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
796
+		return EEH_Event_Query::posts_where_sql_for_event_category_slug($event_category_slug);
797 797
 	}
798 798
 	/**
799 799
 	 * 	@deprecated
800 800
 	 * 	@since 4.4.0
801 801
 	 */
802
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
803
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
804
-		return EEH_Event_Query::posts_where_sql_for_event_list_month( $month );
802
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
803
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
804
+		return EEH_Event_Query::posts_where_sql_for_event_list_month($month);
805 805
 	}
806 806
 	/**
807 807
 	 * 	@deprecated
808 808
 	 * 	@since 4.4.0
809 809
 	 */
810
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
811
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
812
-		return EEH_Event_Query::posts_orderby( $SQL, $wp_query );
810
+	public function posts_orderby($SQL, WP_Query $wp_query) {
811
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
812
+		return EEH_Event_Query::posts_orderby($SQL, $wp_query);
813 813
 	}
814 814
 	/**
815 815
 	 * 	@deprecated
816 816
 	 * 	@since 4.4.0
817 817
 	 */
818
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
819
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
820
-		return EEH_Event_Query::posts_orderby_sql( $orderby_params, $sort );
818
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
819
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
820
+		return EEH_Event_Query::posts_orderby_sql($orderby_params, $sort);
821 821
 	}
822 822
 
823 823
 
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
848 848
  * @param string $extra_class
849 849
  * @return string
850 850
  */
851
-function espresso_event_list_css( $extra_class = '' ) {
852
-	return EED_Events_Archive::event_list_css( $extra_class );
851
+function espresso_event_list_css($extra_class = '') {
852
+	return EED_Events_Archive::event_list_css($extra_class);
853 853
 }
854 854
 
855 855
 /**
@@ -863,14 +863,14 @@  discard block
 block discarded – undo
863 863
  * @return bool
864 864
  */
865 865
 function espresso_display_full_description_in_event_list() {
866
-	return EED_Events_Archive::display_description( 2 );
866
+	return EED_Events_Archive::display_description(2);
867 867
 }
868 868
 
869 869
 /**
870 870
  * @return bool
871 871
  */
872 872
 function espresso_display_excerpt_in_event_list() {
873
-	return EED_Events_Archive::display_description( 1 );
873
+	return EED_Events_Archive::display_description(1);
874 874
 }
875 875
 
876 876
 /**
Please login to merge, or discard this patch.
modules/event_single/EED_Event_Single.module.php 1 patch
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @return EED_Event_Single
41 41
 	 */
42 42
 	public static function instance() {
43
-		return parent::get_instance( __CLASS__ );
43
+		return parent::get_instance(__CLASS__);
44 44
 	}
45 45
 
46 46
 
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	 *  @return 	void
53 53
 	 */
54 54
 	public static function set_hooks() {
55
-		add_filter( 'FHEE_run_EE_wp', '__return_true' );
56
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
57
-		EE_Config::register_route( __( 'event', 'event_espresso' ), 'Event_Single', 'run' );
55
+		add_filter('FHEE_run_EE_wp', '__return_true');
56
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
57
+		EE_Config::register_route(__('event', 'event_espresso'), 'Event_Single', 'run');
58 58
 	}
59 59
 
60 60
 	/**
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 *  @return 	void
65 65
 	 */
66 66
 	public static function set_hooks_admin() {
67
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
67
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
68 68
 	}
69 69
 
70 70
 
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
 	 * @return void
79 79
 	 */
80 80
 	public static function set_definitions() {
81
-		define( 'EVENT_SINGLE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
82
-		define( 'EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
81
+		define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
82
+		define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
83 83
 	}
84 84
 
85 85
 
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
 	 *
90 90
 	 * @void
91 91
 	 */
92
-	protected function set_config(){
93
-		$this->set_config_section( 'template_settings' );
94
-		$this->set_config_class( 'EE_Event_Single_Config' );
95
-		$this->set_config_name( 'EED_Event_Single' );
92
+	protected function set_config() {
93
+		$this->set_config_section('template_settings');
94
+		$this->set_config_class('EE_Event_Single_Config');
95
+		$this->set_config_name('EED_Event_Single');
96 96
 	}
97 97
 
98 98
 
@@ -105,35 +105,35 @@  discard block
 block discarded – undo
105 105
 	 * @param \EE_Event_Single_Config $config
106 106
 	 * @return \EE_Template_Part_Manager
107 107
 	 */
108
-	public function initialize_template_parts( EE_Event_Single_Config $config = null ) {
108
+	public function initialize_template_parts(EE_Event_Single_Config $config = null) {
109 109
 		$config = $config instanceof EE_Event_Single_Config ? $config : $this->config();
110 110
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
111 111
 		$template_parts = new EE_Template_Part_Manager();
112 112
 		$template_parts->add_template_part(
113 113
 			'tickets',
114
-			__( 'Ticket Selector', 'event_espresso' ),
114
+			__('Ticket Selector', 'event_espresso'),
115 115
 			'content-espresso_events-tickets.php',
116 116
 			$config->display_order_tickets
117 117
 		);
118 118
 		$template_parts->add_template_part(
119 119
 			'datetimes',
120
-			__( 'Dates and Times', 'event_espresso' ),
120
+			__('Dates and Times', 'event_espresso'),
121 121
 			'content-espresso_events-datetimes.php',
122 122
 			$config->display_order_datetimes
123 123
 		);
124 124
 		$template_parts->add_template_part(
125 125
 			'event',
126
-			__( 'Event Description', 'event_espresso' ),
126
+			__('Event Description', 'event_espresso'),
127 127
 			'content-espresso_events-details.php',
128 128
 			$config->display_order_event
129 129
 		);
130 130
 		$template_parts->add_template_part(
131 131
 			'venue',
132
-			__( 'Venue Information', 'event_espresso' ),
132
+			__('Venue Information', 'event_espresso'),
133 133
 			'content-espresso_events-venues.php',
134 134
 			$config->display_order_venue
135 135
 		);
136
-		do_action( 'AHEE__EED_Event_Single__initialize_template_parts', $template_parts );
136
+		do_action('AHEE__EED_Event_Single__initialize_template_parts', $template_parts);
137 137
 		return $template_parts;
138 138
 	}
139 139
 
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 	 * @param WP $WP
148 148
 	 * @return    void
149 149
 	 */
150
-	public function run( $WP ) {
150
+	public function run($WP) {
151 151
 		// ensure valid EE_Events_Single_Config() object exists
152 152
 		$this->set_config();
153 153
 		// check what template is loaded
154
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
155
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
154
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
155
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
156 156
 		// load css
157
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
157
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
158 158
 	}
159 159
 
160 160
 
@@ -166,27 +166,27 @@  discard block
 block discarded – undo
166 166
 	 * @param 	string $template
167 167
 	 * @return 	string
168 168
 	 */
169
-	public function template_include( $template ) {
169
+	public function template_include($template) {
170 170
 		global $post;
171 171
 		/** @type EE_Event_Single_Config $config */
172 172
 		$config = $this->config();
173
-		if ( $config->display_status_banner_single ) {
174
-			add_filter( 'the_title', array( 'EED_Event_Single', 'the_title' ), 100, 2 );
173
+		if ($config->display_status_banner_single) {
174
+			add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
175 175
 		}
176 176
 		// not a custom template?
177 177
 		if (
178
-			EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'single-espresso_events.php'
179
-			|| apply_filters( 'FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE )
180
-			&& ! post_password_required( $post )
178
+			EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'single-espresso_events.php'
179
+			|| apply_filters('FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE)
180
+			&& ! post_password_required($post)
181 181
 		) {
182 182
 			EEH_Template::load_espresso_theme_functions();
183 183
 			// then add extra event data via hooks
184
-			add_action( 'loop_start', array( 'EED_Event_Single', 'loop_start' ));
185
-			add_filter( 'get_the_excerpt', array( 'EED_Event_Single', 'get_the_excerpt' ), 1, 1 );
186
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
187
-			add_action( 'loop_end', array( 'EED_Event_Single', 'loop_end' ));
184
+			add_action('loop_start', array('EED_Event_Single', 'loop_start'));
185
+			add_filter('get_the_excerpt', array('EED_Event_Single', 'get_the_excerpt'), 1, 1);
186
+			add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
187
+			add_action('loop_end', array('EED_Event_Single', 'loop_end'));
188 188
 			// don't display entry meta because the existing theme will take car of that
189
-			add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
189
+			add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
190 190
 		}
191 191
 		return $template;
192 192
 	}
@@ -200,9 +200,9 @@  discard block
 block discarded – undo
200 200
 	 * @param 	array $wp_query_array an array containing the WP_Query object
201 201
 	 * @return 	void
202 202
 	 */
203
-	public static function loop_start( $wp_query_array ) {
203
+	public static function loop_start($wp_query_array) {
204 204
 		global $post;
205
-		do_action( 'AHEE_event_details_before_post', $post, $wp_query_array );
205
+		do_action('AHEE_event_details_before_post', $post, $wp_query_array);
206 206
 	}
207 207
 
208 208
 
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
 	 * @param 	int 	$id
216 216
 	 * @return 	string
217 217
 	 */
218
-	public static function the_title( $title = '', $id = 0 ) {
218
+	public static function the_title($title = '', $id = 0) {
219 219
 		global $post;
220
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID ) . $title :  $title;
220
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
221 221
 	}
222 222
 
223 223
 
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
 	 * @param        string $excerpt
230 230
 	 * @return        string
231 231
 	 */
232
-	public static function get_the_excerpt( $excerpt = '' ) {
232
+	public static function get_the_excerpt($excerpt = '') {
233 233
 		EED_Event_Single::$using_get_the_excerpt = true;
234
-		add_filter( 'wp_trim_excerpt', array( 'EED_Event_Single', 'end_get_the_excerpt' ), 999, 1 );
234
+		add_filter('wp_trim_excerpt', array('EED_Event_Single', 'end_get_the_excerpt'), 999, 1);
235 235
 		return $excerpt;
236 236
 	}
237 237
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * @param  string $text
245 245
 	 * @return string
246 246
 	 */
247
-	public static function end_get_the_excerpt( $text = '' ) {
247
+	public static function end_get_the_excerpt($text = '') {
248 248
 		EED_Event_Single::$using_get_the_excerpt = false;
249 249
 		return $text;
250 250
 	}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 * @param 	string 	$content
259 259
 	 * @return 	string
260 260
 	 */
261
-	public static function event_details( $content ) {
261
+	public static function event_details($content) {
262 262
 		global $post;
263 263
 		static $current_post_ID = 0;
264 264
 		if (
@@ -273,15 +273,15 @@  discard block
 block discarded – undo
273 273
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
274 274
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
275 275
 			// so the following allows this filter to be applied multiple times, but only once for real
276
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
277
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order ) {
276
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
277
+			if (EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order) {
278 278
 				// we need to first remove this callback from being applied to the_content()
279 279
 				// (otherwise it will recurse and blow up the interweb)
280
-				remove_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
280
+				remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
281 281
 				EED_Event_Single::instance()->template_parts = EED_Event_Single::instance()->initialize_template_parts();
282
-				$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
283
-				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters( $content );
284
-				add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
282
+				$content = EEH_Template::locate_template('content-espresso_events-details.php');
283
+				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters($content);
284
+				add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
285 285
 			} else {
286 286
 				$content = EED_Event_Single::use_filterable_display_order();
287 287
 			}
@@ -302,19 +302,19 @@  discard block
 block discarded – undo
302 302
 		// it uses the_content() for displaying the $post->post_content
303 303
 		// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
304 304
 		// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
305
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
305
+		remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
306 306
 		//now add additional content
307
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110, 1 );
308
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120, 1 );
309
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130, 1 );
310
-		do_action( 'AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters' );
307
+		add_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110, 1);
308
+		add_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120, 1);
309
+		add_filter('the_content', array('EED_Event_Single', 'event_venues'), 130, 1);
310
+		do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters');
311 311
 		// now load our template
312
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
312
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
313 313
 		//now add our filter back in, plus some others
314
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
315
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110 );
316
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120 );
317
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130 );
314
+		add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
315
+		remove_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110);
316
+		remove_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120);
317
+		remove_filter('the_content', array('EED_Event_Single', 'event_venues'), 130);
318 318
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
319 319
 		return $content;
320 320
 	}
@@ -328,8 +328,8 @@  discard block
 block discarded – undo
328 328
 	 * @param        string $content
329 329
 	 * @return        string
330 330
 	 */
331
-	public static function event_datetimes( $content ) {
332
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
331
+	public static function event_datetimes($content) {
332
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
333 333
 	}
334 334
 
335 335
 
@@ -341,8 +341,8 @@  discard block
 block discarded – undo
341 341
 	 * @param        string $content
342 342
 	 * @return        string
343 343
 	 */
344
-	public static function event_tickets( $content ) {
345
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
344
+	public static function event_tickets($content) {
345
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
346 346
 	}
347 347
 
348 348
 
@@ -354,8 +354,8 @@  discard block
 block discarded – undo
354 354
 	 * @param 	string $content
355 355
 	 * @return 	string
356 356
 	 */
357
-	public static function event_venue( $content ) {
358
-		return EED_Event_Single::event_venues( $content );
357
+	public static function event_venue($content) {
358
+		return EED_Event_Single::event_venues($content);
359 359
 	}
360 360
 
361 361
 
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
 	 * @param        string $content
368 368
 	 * @return        string
369 369
 	 */
370
-	public static function event_venues( $content ) {
371
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
370
+	public static function event_venues($content) {
371
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
372 372
 	}
373 373
 
374 374
 
@@ -380,9 +380,9 @@  discard block
 block discarded – undo
380 380
 	 * 	@param		array 	$wp_query_array an array containing the WP_Query object
381 381
 	 *  	@return 		void
382 382
 	 */
383
-	public static function loop_end( $wp_query_array ) {
383
+	public static function loop_end($wp_query_array) {
384 384
 		global $post;
385
-		do_action( 'AHEE_event_details_after_post', $post, $wp_query_array );
385
+		do_action('AHEE_event_details_after_post', $post, $wp_query_array);
386 386
 	}
387 387
 
388 388
 
@@ -395,16 +395,16 @@  discard block
 block discarded – undo
395 395
 	 */
396 396
 	public function wp_enqueue_scripts() {
397 397
 		// get some style
398
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && apply_filters( 'FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE )) {
398
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)) {
399 399
 			// first check uploads folder
400
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
401
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
400
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
401
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
402 402
 			} else {
403
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
403
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
404 404
 			}
405
-			wp_enqueue_script( $this->theme );
406
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
407
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
405
+			wp_enqueue_script($this->theme);
406
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
407
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
408 408
 			}
409 409
 		}
410 410
 	}
@@ -425,9 +425,9 @@  discard block
 block discarded – undo
425 425
 	public static function display_venue() {
426 426
 		/** @type EE_Event_Single_Config $config */
427 427
 		$config = EED_Event_Single::instance()->config();
428
-		$display_venue= isset( $config->display_venue ) ? $config->display_venue : TRUE;
428
+		$display_venue = isset($config->display_venue) ? $config->display_venue : TRUE;
429 429
 		$venue_name = EEH_Venue_View::venue_name();
430
-		return $display_venue && ! empty( $venue_name ) ? TRUE : FALSE;
430
+		return $display_venue && ! empty($venue_name) ? TRUE : FALSE;
431 431
 	}
432 432
 
433 433
 
Please login to merge, or discard this patch.
modules/events_archive_filters/EED_Events_Archive_Filters.module.php 1 patch
Spacing   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @return EED_Events_Archive_Filters
30 30
 	 */
31 31
 	public static function instance() {
32
-		return parent::get_instance( __CLASS__ );
32
+		return parent::get_instance(__CLASS__);
33 33
 	}
34 34
 
35 35
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 *	@var 	$_types
72 72
 	 * 	@access 	protected
73 73
 	 */
74
-	protected static $_types = array( 'grid', 'text', 'dates' );
74
+	protected static $_types = array('grid', 'text', 'dates');
75 75
 
76 76
 
77 77
 //	public static $espresso_event_list_ID = 0;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 *  @access 	public
126 126
 	 *  @return 	void
127 127
 	 */
128
-	public function run( $WP ) {
128
+	public function run($WP) {
129 129
 //		do_action( 'AHEE__EED_Events_Archive_Filters__before_run' );
130 130
 //		// set config
131 131
 //		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters instanceof EE_Events_Archive_Config ) {
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
 	 */
171 171
 	private function _filter_query_parts() {
172 172
 		// build event list query
173
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
174
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 1, 2 );
175
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
173
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
174
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
175
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
176 176
 	}
177 177
 
178 178
 	/**
@@ -182,13 +182,13 @@  discard block
 block discarded – undo
182 182
 	 *  @return 	string
183 183
 	 */
184 184
 	public static function set_type() {
185
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_set_type' );
186
-		EED_Events_Archive_Filters::$_types = apply_filters( 'EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types );
187
-		$view = isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
188
-		$elf_type = EE_Registry::instance()->REQ->is_set( 'elf_type' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_type' )) : '';
189
-		$view = ! empty( $elf_type ) ? $elf_type : $view;
190
-		$view = apply_filters( 'EED_Events_Archive_Filters__set_type__type', $view );
191
-		if ( ! empty( $view ) && in_array( $view, EED_Events_Archive_Filters::$_types )) {
185
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
186
+		EED_Events_Archive_Filters::$_types = apply_filters('EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types);
187
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
188
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_type')) : '';
189
+		$view = ! empty($elf_type) ? $elf_type : $view;
190
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
191
+		if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
192 192
 			self::$_type = $view;
193 193
 		}
194 194
 	}
@@ -200,11 +200,11 @@  discard block
 block discarded – undo
200 200
 	 *  @param	boolean	$req_only if TRUE, then ignore defaults and only return $_POST value
201 201
 	 *  @return 	boolean
202 202
 	 */
203
-	private static function _show_expired( $req_only = FALSE ) {
203
+	private static function _show_expired($req_only = FALSE) {
204 204
 		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
205
-		$show_expired = ! $req_only && isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
205
+		$show_expired = ! $req_only && isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
206 206
 		// override default expired option if set via filter
207
-		$show_expired = EE_Registry::instance()->REQ->is_set( 'elf_expired_chk' ) ? absint( EE_Registry::instance()->REQ->get( 'elf_expired_chk' )) : $show_expired;
207
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(EE_Registry::instance()->REQ->get('elf_expired_chk')) : $show_expired;
208 208
 		return $show_expired ? TRUE : FALSE;
209 209
 	}
210 210
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 *  @return 	string
216 216
 	 */
217 217
 	private static function _event_category_slug() {
218
-		return EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
218
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_category_dd')) : '';
219 219
 	}
220 220
 
221 221
 	/**
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 *  @return 	string
226 226
 	 */
227 227
 	private static function _display_month() {
228
-		return EE_Registry::instance()->REQ->is_set( 'elf_month_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_month_dd' )) : '';
228
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_month_dd')) : '';
229 229
 	}
230 230
 
231 231
 
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	public function get_post_data() {
240 240
 		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
241 241
 		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
242
-		$this->_show_expired = EED_Events_Archive_Filters::_show_expired( TRUE );
242
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(TRUE);
243 243
 //		EEH_Debug_Tools::printr( EE_Registry::instance()->REQ, 'EE_Registry::instance()->REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
244 244
 //		echo '<h4>$this->_elf_month : ' . $this->_elf_month . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
245 245
 //		echo '<h4>$this->_elf_category : ' . $this->_elf_category . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
@@ -256,11 +256,11 @@  discard block
 block discarded – undo
256 256
 	 *  @access 	public
257 257
 	 *  @return 	void
258 258
 	 */
259
-	public function posts_join( $SQL, WP_Query $wp_query ) {
260
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
259
+	public function posts_join($SQL, WP_Query $wp_query) {
260
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
261 261
 			// Category
262 262
 //			$elf_category = EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
263
-			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms( EED_Events_Archive_Filters::_event_category_slug() );
263
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(EED_Events_Archive_Filters::_event_category_slug());
264 264
 		}
265 265
 		return $SQL;
266 266
 	}
@@ -273,9 +273,9 @@  discard block
 block discarded – undo
273 273
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
274 274
 	 *  @return 	string
275 275
 	 */
276
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
277
-		$SQL= '';
278
-		if ( ! empty( $join_terms )) {
276
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
277
+		$SQL = '';
278
+		if ( ! empty($join_terms)) {
279 279
 			global $wpdb;
280 280
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
281 281
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -293,28 +293,28 @@  discard block
 block discarded – undo
293 293
 	 *  @param	array	$orderby_params
294 294
 	 *  @return 	string
295 295
 	 */
296
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
296
+	public static function posts_join_for_orderby($orderby_params = array()) {
297 297
 		global $wpdb;
298
-		$SQL= '';
299
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
300
-		foreach( $orderby_params as $orderby ) {
301
-			switch ( $orderby ) {
298
+		$SQL = '';
299
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
300
+		foreach ($orderby_params as $orderby) {
301
+			switch ($orderby) {
302 302
 
303 303
 				case 'ticket_start' :
304 304
 				case 'ticket_end' :
305
-					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON (' . EEM_Datetime::instance()->table() . '.DTT_ID = ' . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
306
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = ' . EEM_Ticket::instance()->table() . '.TKT_ID )';
305
+					$SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('.EEM_Datetime::instance()->table().'.DTT_ID = '.EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
306
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '.EEM_Ticket::instance()->table().'.TKT_ID )';
307 307
 					break;
308 308
 
309 309
 				case 'venue_title' :
310 310
 				case 'city' :
311
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
312
-					$SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Venue::instance()->table() . '.VNU_ID )';
311
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
312
+					$SQL .= ' LEFT JOIN '.EEM_Venue::instance()->table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Venue::instance()->table().'.VNU_ID )';
313 313
 					break;
314 314
 
315 315
 				case 'state' :
316
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
317
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
316
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
317
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->second_table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Event_Venue::instance()->second_table().'.VNU_ID )';
318 318
 					break;
319 319
 
320 320
 				break;
@@ -331,16 +331,16 @@  discard block
 block discarded – undo
331 331
 	 *  @access 	public
332 332
 	 *  @return 	void
333 333
 	 */
334
-	public function posts_where( $SQL, WP_Query $wp_query ) {
335
-		if ( isset( $wp_query->query_vars ) && isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'espresso_events'  ) {
334
+	public function posts_where($SQL, WP_Query $wp_query) {
335
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
336 336
 			// Show Expired ?
337
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired( EED_Events_Archive_Filters::_show_expired() );
337
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(EED_Events_Archive_Filters::_show_expired());
338 338
 			// Category
339 339
 			//$elf_category = EED_Events_Archive_Filters::_event_category_slug();
340
-			$SQL .=  EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug( EED_Events_Archive_Filters::_event_category_slug() );
340
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(EED_Events_Archive_Filters::_event_category_slug());
341 341
 			// Start Date
342 342
 			//$elf_month = EED_Events_Archive_Filters::_display_month();
343
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month( EED_Events_Archive_Filters::_display_month() );
343
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(EED_Events_Archive_Filters::_display_month());
344 344
 		}
345 345
 		return $SQL;
346 346
 	}
@@ -353,8 +353,8 @@  discard block
 block discarded – undo
353 353
 	 *  @param	boolean	$show_expired if TRUE, then displayed past events
354 354
 	 *  @return 	string
355 355
 	 */
356
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
357
-		return  ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" ' : '';
356
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
357
+		return  ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" ' : '';
358 358
 	}
359 359
 
360 360
 
@@ -365,9 +365,9 @@  discard block
 block discarded – undo
365 365
 	 *  @param	boolean	$event_category_slug
366 366
 	 *  @return 	string
367 367
 	 */
368
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
368
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
369 369
 		global $wpdb;
370
-		return  ! empty( $event_category_slug ) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
370
+		return  ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
371 371
 	}
372 372
 
373 373
 	/**
@@ -377,13 +377,13 @@  discard block
 block discarded – undo
377 377
 	 *  @param	boolean	$month
378 378
 	 *  @return 	string
379 379
 	 */
380
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
381
-		$SQL= '';
382
-		if ( ! empty( $month )) {
380
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
381
+		$SQL = '';
382
+		if ( ! empty($month)) {
383 383
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
384
-			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start <= "' . date('Y-m-t 23:59:59', strtotime( $month )) . '"';
384
+			$SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start <= "'.date('Y-m-t 23:59:59', strtotime($month)).'"';
385 385
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
386
-			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end >= "' . date('Y-m-d 0:0:00', strtotime( $month )) . '" ';
386
+			$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end >= "'.date('Y-m-d 0:0:00', strtotime($month)).'" ';
387 387
 		}
388 388
 		return $SQL;
389 389
 	}
@@ -395,9 +395,9 @@  discard block
 block discarded – undo
395 395
 	 *  @access 	public
396 396
 	 *  @return 	void
397 397
 	 */
398
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
399
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
400
-			$SQL = EED_Events_Archive_Filters::posts_orderby_sql( array( 'start_date' ));
398
+	public function posts_orderby($SQL, WP_Query $wp_query) {
399
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
400
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
401 401
 		}
402 402
 		return $SQL;
403 403
 	}
@@ -426,54 +426,54 @@  discard block
 block discarded – undo
426 426
 	 *  @param	boolean	$orderby_params
427 427
 	 *  @return 	string
428 428
 	 */
429
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
429
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
430 430
 		global $wpdb;
431 431
 		$SQL = '';
432 432
 		$cntr = 1;
433
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
434
-		foreach( $orderby_params as $orderby ) {
435
-			$glue = $cntr == 1 || $cntr == count( $orderby_params ) ? ' ' : ', ';
436
-			switch ( $orderby ) {
433
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
434
+		foreach ($orderby_params as $orderby) {
435
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
436
+			switch ($orderby) {
437 437
 
438 438
 				case 'id' :
439 439
 				case 'ID' :
440
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
440
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
441 441
 					break;
442 442
 
443 443
 				case 'start_date' :
444
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
444
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
445 445
 					break;
446 446
 
447 447
 				case 'end_date' :
448
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
448
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
449 449
 					break;
450 450
 
451 451
 				case 'event_name' :
452
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
452
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
453 453
 					break;
454 454
 
455 455
 				case 'category_slug' :
456
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
456
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
457 457
 					break;
458 458
 
459 459
 				case 'ticket_start' :
460
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
460
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
461 461
 					break;
462 462
 
463 463
 				case 'ticket_end' :
464
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
464
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
465 465
 					break;
466 466
 
467 467
 				case 'venue_title' :
468
-					$SQL .= $glue . 'venue_title ' . $sort;
468
+					$SQL .= $glue.'venue_title '.$sort;
469 469
 					break;
470 470
 
471 471
 				case 'city' :
472
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
472
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
473 473
 				break;
474 474
 
475 475
 				case 'state' :
476
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
476
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
477 477
 				break;
478 478
 
479 479
 			}
@@ -493,26 +493,26 @@  discard block
 block discarded – undo
493 493
 	 */
494 494
 	public function template_redirect() {
495 495
 		// add event list filters
496
-		add_action( 'loop_start', array( $this, 'event_list_template_filters' ));
496
+		add_action('loop_start', array($this, 'event_list_template_filters'));
497 497
 		// and pagination
498
-		add_action( 'loop_start', array( $this, 'event_list_pagination' ));
499
-		add_action( 'loop_end', array( $this, 'event_list_pagination' ));
498
+		add_action('loop_start', array($this, 'event_list_pagination'));
499
+		add_action('loop_end', array($this, 'event_list_pagination'));
500 500
 		// if NOT a custom template
501
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php' ) {
501
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php') {
502 502
 			// don't know if theme uses the_excerpt
503
-			add_filter( 'the_excerpt', array( $this, 'event_details' ), 100 );
504
-			add_filter( 'the_excerpt', array( $this, 'event_tickets' ), 110 );
505
-			add_filter( 'the_excerpt', array( $this, 'event_datetimes' ), 120 );
506
-			add_filter( 'the_excerpt', array( $this, 'event_venues' ), 130 );
503
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
504
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
505
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
506
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
507 507
 			// or the_content
508
-			add_filter( 'the_content', array( $this, 'event_details' ), 100 );
509
-			add_filter( 'the_content', array( $this, 'event_tickets' ), 110 );
510
-			add_filter( 'the_content', array( $this, 'event_datetimes' ), 120 );
511
-			add_filter( 'the_content', array( $this, 'event_venues' ), 130 );
508
+			add_filter('the_content', array($this, 'event_details'), 100);
509
+			add_filter('the_content', array($this, 'event_tickets'), 110);
510
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
511
+			add_filter('the_content', array($this, 'event_venues'), 130);
512 512
 		} else {
513
-			remove_all_filters( 'excerpt_length' );
514
-			add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10 );
515
-			add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10 );
513
+			remove_all_filters('excerpt_length');
514
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
515
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
516 516
 		}
517 517
 	}
518 518
 
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 	 *  	@return 		void
526 526
 	 */
527 527
 	public function event_list_pagination() {
528
-		echo '<div class="ee-pagination-dv clear">' . espresso_event_list_pagination() . '</div>';
528
+		echo '<div class="ee-pagination-dv clear">'.espresso_event_list_pagination().'</div>';
529 529
 	}
530 530
 
531 531
 
@@ -536,8 +536,8 @@  discard block
 block discarded – undo
536 536
 	 * 	@param		string 	$content
537 537
 	 *  	@return 		void
538 538
 	 */
539
-	public function event_details( $content ) {
540
-		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
539
+	public function event_details($content) {
540
+		return EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-details.php', array('the_content' => $content), TRUE);
541 541
 	}
542 542
 
543 543
 
@@ -548,8 +548,8 @@  discard block
 block discarded – undo
548 548
 	 * 	@param		string 	$content
549 549
 	 *  	@return 		void
550 550
 	 */
551
-	public function event_tickets( $content ) {
552
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
551
+	public function event_tickets($content) {
552
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-tickets.php', array(), TRUE);
553 553
 	}
554 554
 
555 555
 	/**
@@ -559,8 +559,8 @@  discard block
 block discarded – undo
559 559
 	 * 	@param		string 	$content
560 560
 	 *  	@return 		void
561 561
 	 */
562
-	public function event_datetimes( $content ) {
563
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
562
+	public function event_datetimes($content) {
563
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-datetimes.php', array(), TRUE);
564 564
 	}
565 565
 
566 566
 	/**
@@ -570,8 +570,8 @@  discard block
 block discarded – undo
570 570
 	 * 	@param		string 	$content
571 571
 	 *  	@return 		void
572 572
 	 */
573
-	public function event_venues( $content ) {
574
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
573
+	public function event_venues($content) {
574
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-venues.php', array(), TRUE);
575 575
 	}
576 576
 
577 577
 
@@ -586,12 +586,12 @@  discard block
 block discarded – undo
586 586
 	 *  @return 	void
587 587
 	 */
588 588
 	private function _load_assests() {
589
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_load_assests' );
590
-		add_filter( 'FHEE_load_css', '__return_true' );
591
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
592
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
593
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
594
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
589
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
590
+		add_filter('FHEE_load_css', '__return_true');
591
+		add_filter('FHEE_load_EE_Session', '__return_true');
592
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
593
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
594
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
595 595
 		}
596 596
 		//add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
597 597
 	}
@@ -606,8 +606,8 @@  discard block
 block discarded – undo
606 606
 	 *  @access 	private
607 607
 	 *  @return 	string
608 608
 	 */
609
-	private function _get_template( $which = 'part' ) {
610
-		return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
609
+	private function _get_template($which = 'part') {
610
+		return EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
611 611
 	}
612 612
 
613 613
 
@@ -618,13 +618,13 @@  discard block
 block discarded – undo
618 618
 	 *  @access 	public
619 619
 	 *  @return 	void
620 620
 	 */
621
-	public function excerpt_length( $length ) {
621
+	public function excerpt_length($length) {
622 622
 
623
-		if ( self::$_type == 'grid' ) {
623
+		if (self::$_type == 'grid') {
624 624
 			return 36;
625 625
 		}
626 626
 
627
-		switch ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) {
627
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
628 628
 			case 'tiny' :
629 629
 				return 12;
630 630
 				break;
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 	 *  @access 	public
649 649
 	 *  @return 	void
650 650
 	 */
651
-	public function excerpt_more( $more ) {
651
+	public function excerpt_more($more) {
652 652
 		return '&hellip;';
653 653
 	}
654 654
 
@@ -678,22 +678,22 @@  discard block
 block discarded – undo
678 678
 	 */
679 679
 	public function wp_enqueue_scripts() {
680 680
 		// get some style
681
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
681
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
682 682
 			// first check uploads folder
683
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css' )) {
684
-				wp_register_style( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
683
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.css')) {
684
+				wp_register_style('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
685 685
 			} else {
686
-				wp_register_style( 'archive-espresso_events', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
686
+				wp_register_style('archive-espresso_events', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
687 687
 			}
688
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js' )) {
689
-				wp_register_script( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE  );
688
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.js')) {
689
+				wp_register_script('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
690 690
 			} else {
691
-				wp_register_script( 'archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE );
691
+				wp_register_script('archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
692 692
 			}
693
-			wp_enqueue_style( 'archive-espresso_events' );
694
-			wp_enqueue_script( 'jquery-masonry' );
695
-			wp_enqueue_script( 'archive-espresso_events' );
696
-			add_action( 'wp_footer', array( 'EED_Events_Archive_Filters', 'localize_grid_event_lists' ), 1 );
693
+			wp_enqueue_style('archive-espresso_events');
694
+			wp_enqueue_script('jquery-masonry');
695
+			wp_enqueue_script('archive-espresso_events');
696
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
697 697
 		}
698 698
 	}
699 699
 
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 	 *  @return 	void
709 709
 	 */
710 710
 	public static function localize_grid_event_lists() {
711
-		wp_localize_script( 'archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists );
711
+		wp_localize_script('archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists);
712 712
 	}
713 713
 
714 714
 
@@ -723,9 +723,9 @@  discard block
 block discarded – undo
723 723
 	 */
724 724
 	public static function template_settings_form() {
725 725
 		$EE = EE_Registry::instance();
726
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
727
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters( 'FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters );
728
-		EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters );
726
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
727
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters('FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters);
728
+		EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters);
729 729
 	}
730 730
 
731 731
 
@@ -739,16 +739,16 @@  discard block
 block discarded – undo
739 739
 	 *  @static
740 740
 	 *  @return 	void
741 741
 	 */
742
-	public static function set_default_settings( $CFG ) {
742
+	public static function set_default_settings($CFG) {
743 743
 		//EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
744
-		$CFG->display_description = isset( $CFG->display_description ) && ! empty( $CFG->display_description ) ? $CFG->display_description : 1;
745
-		$CFG->display_address = isset( $CFG->display_address ) && ! empty( $CFG->display_address ) ? $CFG->display_address : TRUE;
746
-		$CFG->display_venue_details = isset( $CFG->display_venue_details ) && ! empty( $CFG->display_venue_details ) ? $CFG->display_venue_details : TRUE;
747
-		$CFG->display_expired_events = isset( $CFG->display_expired_events ) && ! empty( $CFG->display_expired_events ) ? $CFG->display_expired_events : FALSE;
748
-		$CFG->default_type = isset( $CFG->default_type ) && ! empty( $CFG->default_type ) ? $CFG->default_type : 'grid';
749
-		$CFG->event_list_grid_size = isset( $CFG->event_list_grid_size ) && ! empty( $CFG->event_list_grid_size ) ? $CFG->event_list_grid_size : 'medium';
750
-		$CFG->templates['full'] = isset( $CFG->templates['full'] ) && ! empty( $CFG->templates['full'] ) ? $CFG->templates['full'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
751
-		$CFG->templates['part'] = isset( $CFG->templates['part'] ) && ! empty( $CFG->templates['part'] ) ? $CFG->templates['part'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
744
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description) ? $CFG->display_description : 1;
745
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address : TRUE;
746
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details) ? $CFG->display_venue_details : TRUE;
747
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events) ? $CFG->display_expired_events : FALSE;
748
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
749
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size) ? $CFG->event_list_grid_size : 'medium';
750
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full']) ? $CFG->templates['full'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
751
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part']) ? $CFG->templates['part'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
752 752
 		return $CFG;
753 753
 	}
754 754
 
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
760 760
 	 *  @access 	public
761 761
 	 *  @return 	void
762 762
 	 */
763
-	public function filter_config( $CFG ) {
763
+	public function filter_config($CFG) {
764 764
 		return $CFG;
765 765
 	}
766 766
 
@@ -773,32 +773,32 @@  discard block
 block discarded – undo
773 773
 	 *  @access 	public
774 774
 	 *  @return 	void
775 775
 	 */
776
-	public static function update_template_settings( $CFG, $REQ ) {
776
+	public static function update_template_settings($CFG, $REQ) {
777 777
 //		EEH_Debug_Tools::printr( $REQ, '$REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
778 778
 //		EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
779 779
 		//$CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
780
-		$CFG->EED_Events_Archive_Filters->display_description = isset( $REQ['display_description_in_event_list'] ) ? absint( $REQ['display_description_in_event_list'] ) : 1;
781
-		$CFG->EED_Events_Archive_Filters->display_address = isset( $REQ['display_address_in_event_list'] ) ? absint( $REQ['display_address_in_event_list'] ) : TRUE;
782
-		$CFG->EED_Events_Archive_Filters->display_venue_details = isset( $REQ['display_venue_details_in_event_list'] ) ? absint( $REQ['display_venue_details_in_event_list'] ) : TRUE;
783
-		$CFG->EED_Events_Archive_Filters->display_expired_events = isset( $REQ['display_expired_events'] ) ? absint( $REQ['display_expired_events'] ) : FALSE;
784
-		$CFG->EED_Events_Archive_Filters->default_type = isset( $REQ['default_type'] ) ? sanitize_text_field( $REQ['default_type'] ) : 'grid';
785
-		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset( $REQ['event_list_grid_size'] ) ? sanitize_text_field( $REQ['event_list_grid_size'] ) : 'medium';
780
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list']) ? absint($REQ['display_description_in_event_list']) : 1;
781
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint($REQ['display_address_in_event_list']) : TRUE;
782
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list']) ? absint($REQ['display_venue_details_in_event_list']) : TRUE;
783
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint($REQ['display_expired_events']) : FALSE;
784
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field($REQ['default_type']) : 'grid';
785
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size']) ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
786 786
 		$CFG->EED_Events_Archive_Filters->templates = array(
787
-				'full'  => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php'
787
+				'full'  => EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php'
788 788
 			);
789 789
 
790
-		switch ( $CFG->EED_Events_Archive_Filters->default_type ) {
790
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
791 791
 			case 'dates' :
792
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-dates-view.php';
792
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-dates-view.php';
793 793
 				break;
794 794
 			case 'text' :
795
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-text-view.php';
795
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-text-view.php';
796 796
 				break;
797 797
 			default :
798
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
798
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
799 799
 		}
800 800
 
801
-		$CFG->EED_Events_Archive_Filters = isset( $REQ['reset_event_list_settings'] ) && absint( $REQ['reset_event_list_settings'] ) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
801
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings']) && absint($REQ['reset_event_list_settings']) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
802 802
 		return $CFG;
803 803
 	}
804 804
 
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
 	 *  @return 	void
814 814
 	 */
815 815
 	public static function get_template_part() {
816
-		switch ( self::$_type ) {
816
+		switch (self::$_type) {
817 817
 			case 'dates' :
818 818
 					return 'archive-espresso_events-dates-view.php';
819 819
 				break;
@@ -837,13 +837,13 @@  discard block
 block discarded – undo
837 837
 	 */
838 838
 	public function event_list_template_filters() {
839 839
 		$args = array(
840
-			'form_url' => get_post_type_archive_link( 'espresso_events' ), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
840
+			'form_url' => get_post_type_archive_link('espresso_events'), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
841 841
 			'elf_month' => EED_Events_Archive_Filters::_display_month(),
842 842
 			'elf_category' => EED_Events_Archive_Filters::_event_category_slug(),
843 843
 			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
844 844
 			'elf_type' => self::$_type
845 845
 		);
846
-		EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php', $args );
846
+		EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-filters.php', $args);
847 847
 	}
848 848
 
849 849
 
@@ -856,16 +856,16 @@  discard block
 block discarded – undo
856 856
 	 *  @access 	public
857 857
 	 *  @return 	void
858 858
 	 */
859
-	public static function event_list_css( $extra_class = '' ) {
859
+	public static function event_list_css($extra_class = '') {
860 860
 		$EE = EE_Registry::instance();
861
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
861
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
862 862
 		$event_list_css[] = 'espresso-event-list-event';
863
-		if ( self::$_type == 'grid' ) {
864
-			$event_list_grid_size = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
865
-			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
863
+		if (self::$_type == 'grid') {
864
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
865
+			$event_list_css[] = $event_list_grid_size.'-event-list-grid';
866 866
 		}
867
-		$event_list_css = apply_filters( 'EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css );
868
-		return implode( ' ', $event_list_css );
867
+		$event_list_css = apply_filters('EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css);
868
+		return implode(' ', $event_list_css);
869 869
 	}
870 870
 
871 871
 
@@ -891,9 +891,9 @@  discard block
 block discarded – undo
891 891
 	 *  @access 	public
892 892
 	 *  @return 	void
893 893
 	 */
894
-	public static function display_description( $value ) {
894
+	public static function display_description($value) {
895 895
 		$EE = EE_Registry::instance();
896
-		$display_description= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
896
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
897 897
 		return $display_description === $value ? TRUE : FALSE;
898 898
 	}
899 899
 
@@ -907,9 +907,9 @@  discard block
 block discarded – undo
907 907
 	 */
908 908
 	public static function display_venue_details() {
909 909
 		$EE = EE_Registry::instance();
910
-		$display_venue_details= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
910
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
911 911
 		$venue_name = EEH_Venue_View::venue_name();
912
-		return $display_venue_details && ! empty( $venue_name ) ? TRUE : FALSE;
912
+		return $display_venue_details && ! empty($venue_name) ? TRUE : FALSE;
913 913
 	}
914 914
 
915 915
 
@@ -921,9 +921,9 @@  discard block
 block discarded – undo
921 921
 	 */
922 922
 	public static function display_address() {
923 923
 		$EE = EE_Registry::instance();
924
-		$display_address= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
924
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
925 925
 		$venue_name = EEH_Venue_View::venue_name();
926
-		return $display_address && ! empty( $venue_name ) ? TRUE : FALSE;
926
+		return $display_address && ! empty($venue_name) ? TRUE : FALSE;
927 927
 	}
928 928
 
929 929
 
@@ -937,22 +937,22 @@  discard block
 block discarded – undo
937 937
 	public static function pagination() {
938 938
 		global $wp_query;
939 939
 		$big = 999999999; // need an unlikely integer
940
-		$pagination = paginate_links( array(
941
-			'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
940
+		$pagination = paginate_links(array(
941
+			'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
942 942
 			'format' => '?paged=%#%',
943
-			'current' => max( 1, get_query_var('paged') ),
943
+			'current' => max(1, get_query_var('paged')),
944 944
 			'total' => $wp_query->max_num_pages,
945 945
 			'show_all'     => TRUE,
946 946
 			'end_size'     => 10,
947 947
 			'mid_size'     => 6,
948 948
 			'prev_next'    => TRUE,
949
-			'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
950
-			'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
949
+			'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
950
+			'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
951 951
 			'type'         => 'plain',
952 952
 			'add_args'     => FALSE,
953 953
 			'add_fragment' => ''
954 954
 		));
955
-		return ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
955
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
956 956
 	}
957 957
 
958 958
 
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
 	 *  @return 	void
967 967
 	 */
968 968
 	public static function event_list_title() {
969
-		return apply_filters( 'EED_Events_Archive_Filters__event_list_title__event_list_title', __( 'Upcoming Events', 'event_espresso' ));
969
+		return apply_filters('EED_Events_Archive_Filters__event_list_title__event_list_title', __('Upcoming Events', 'event_espresso'));
970 970
 	}
971 971
 
972 972
 
Please login to merge, or discard this patch.