Completed
Branch BUG/11214/move-command-handler... (de017e)
by
unknown
02:44 queued 29s
created
core/admin/EE_Admin_Page_Menu_Map.core.php 2 patches
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * @package 		Event Espresso
16 16
  * @subpackage 	admin
17 17
  */
18
-abstract class EE_Admin_Page_Menu_Map  {
18
+abstract class EE_Admin_Page_Menu_Map {
19 19
 
20 20
 
21 21
 	/**
@@ -155,28 +155,28 @@  discard block
 block discarded – undo
155 155
 	 *                            		are present.
156 156
 	 * @return void
157 157
 	 */
158
-	public function __construct( $menu_args, $required ) {
158
+	public function __construct($menu_args, $required) {
159 159
 		//filter all args before processing so plugins can manipulate various settings for menus.
160
-		$menu_args = apply_filters( 'FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class( $this ) );
160
+		$menu_args = apply_filters('FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class($this));
161 161
 
162 162
 
163 163
 		//verify that required keys are present in the incoming array.
164
-		$missing = array_diff( (array) $required, array_keys( (array) $menu_args ) );
164
+		$missing = array_diff((array) $required, array_keys((array) $menu_args));
165 165
 
166
-		if ( !empty( $missing ) ) {
167
-			throw new EE_Error( sprintf( __('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class( $this ), implode(', ', $missing ) ) );
166
+		if ( ! empty($missing)) {
167
+			throw new EE_Error(sprintf(__('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class($this), implode(', ', $missing)));
168 168
 		}
169 169
 
170 170
 		//made it here okay, so let's set the properties!
171
-		foreach ( $menu_args as $prop => $value ) {
171
+		foreach ($menu_args as $prop => $value) {
172 172
 
173
-			switch ( $prop ) {
173
+			switch ($prop) {
174 174
 				case 'show_on_menu' :
175 175
 					$value = (int) $value;
176 176
 					break;
177 177
 				case 'admin_init_page' :
178
-					if ( in_array( 'admin_init_page', $required ) && ! $value instanceof EE_Admin_Page_Init ) {
179
-						throw new EE_Error( sprintf( __('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE) ) );
178
+					if (in_array('admin_init_page', $required) && ! $value instanceof EE_Admin_Page_Init) {
179
+						throw new EE_Error(sprintf(__('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE)));
180 180
 					}
181 181
 					break;
182 182
 				case 'menu_callback' :
@@ -187,24 +187,24 @@  discard block
 block discarded – undo
187 187
 					break;
188 188
 
189 189
 			}
190
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
191
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
190
+			if ( ! EEH_Class_Tools::has_property($this, $prop))
191
+				throw new EE_Error(sprintf(__('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class($this), $prop));
192 192
 			$this->{$prop} = $value;
193 193
 
194 194
 		}
195 195
 
196 196
 		//filter capabilities (both static and dynamic)
197
-		$this->capability = apply_filters( 'FHEE_management_capability', $this->capability, NULL );
198
-		$this->capability = apply_filters( 'FHEE_' . $this->menu_slug . '_capability', $this->capability, NULL );
197
+		$this->capability = apply_filters('FHEE_management_capability', $this->capability, NULL);
198
+		$this->capability = apply_filters('FHEE_'.$this->menu_slug.'_capability', $this->capability, NULL);
199 199
 
200 200
 		//Might need to change parent slug depending on maintenance mode.
201
-		if ( ! empty( $this->maintenance_mode_parent ) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance )  {
201
+		if ( ! empty($this->maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
202 202
 			$this->parent_slug = $this->maintenance_mode_parent;
203 203
 		}
204 204
 
205 205
 		//if empty menu_callback let's set default (but only if we have admin page init object)
206
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
207
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
206
+		if (empty($this->menu_callback) && $this->admin_init_page instanceof EE_Admin_Page_Init)
207
+			$this->menu_callback = array($this->admin_init_page, 'initialize_admin_page');
208 208
 
209 209
 	}
210 210
 
@@ -226,21 +226,21 @@  discard block
 block discarded – undo
226 226
 	 * @param boolean $network_admin whether this is being added to the network admin page or not
227 227
 	 * @since  4.4.0
228 228
 	 */
229
-	public function add_menu_page( $network_admin = FALSE ) {
229
+	public function add_menu_page($network_admin = FALSE) {
230 230
 
231 231
 		$show_on_menu_int = (int) $this->show_on_menu;
232
-		if( ( $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY ), TRUE ) )
232
+		if (($network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY), TRUE))
233 233
 				||
234
-			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
234
+			( ! $network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY), TRUE))) {
235 235
 			$wp_page_slug = $this->_add_menu_page();
236
-		}else{
236
+		} else {
237 237
 			$wp_page_slug = '';
238 238
 		}
239 239
 
240
-		if ( !empty( $wp_page_slug ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
240
+		if ( ! empty($wp_page_slug) && $this->admin_init_page instanceof EE_Admin_Page_Init) {
241 241
 			try {
242
-				$this->admin_init_page->set_page_dependencies( $wp_page_slug );
243
-			} catch( EE_Error $e ) {
242
+				$this->admin_init_page->set_page_dependencies($wp_page_slug);
243
+			} catch (EE_Error $e) {
244 244
 				$e->get_error();
245 245
 			}
246 246
 		}
@@ -293,12 +293,12 @@  discard block
 block discarded – undo
293 293
 	public $position;
294 294
 
295 295
 
296
-	public function __construct( $menu_args ) {
297
-		$required = array( 'menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
296
+	public function __construct($menu_args) {
297
+		$required = array('menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
298 298
 
299
-		parent::__construct( $menu_args, $required );
299
+		parent::__construct($menu_args, $required);
300 300
 
301
-		$this->position = ! empty( $this->position ) ? (int) $this->position : $this->position;
301
+		$this->position = ! empty($this->position) ? (int) $this->position : $this->position;
302 302
 	}
303 303
 
304 304
 
@@ -306,9 +306,9 @@  discard block
 block discarded – undo
306 306
 	 * Uses the proper WP utility for registering a menu page for the main WP pages.
307 307
 	 */
308 308
 	protected function _add_menu_page() {
309
-		$main =  add_menu_page( $this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position );
310
-		if ( ! empty( $this->subtitle ) ) {
311
-			add_submenu_page( $this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback );
309
+		$main = add_menu_page($this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position);
310
+		if ( ! empty($this->subtitle)) {
311
+			add_submenu_page($this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback);
312 312
 		}
313 313
 		return $main;
314 314
 	}
@@ -325,13 +325,13 @@  discard block
 block discarded – undo
325 325
  */
326 326
 class EE_Admin_Page_Sub_Menu extends EE_Admin_Page_Main_Menu {
327 327
 
328
-	public function __construct( $menu_args ) {
329
-		parent::__construct( $menu_args );
328
+	public function __construct($menu_args) {
329
+		parent::__construct($menu_args);
330 330
 	}
331 331
 
332 332
 
333 333
 	protected function _add_menu_page() {
334
-		return add_submenu_page( $this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback );
334
+		return add_submenu_page($this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback);
335 335
 	}
336 336
 
337 337
 } //end class EE_Admin_Page_Menu_Map
@@ -352,18 +352,18 @@  discard block
 block discarded – undo
352 352
 
353 353
 
354 354
 
355
-	public function __construct( $menu_args = array() ) {
356
-		$required = array( 'menu_label', 'menu_slug', 'menu_order', 'parent_slug' );
357
-		parent::__construct( $menu_args, $required );
355
+	public function __construct($menu_args = array()) {
356
+		$required = array('menu_label', 'menu_slug', 'menu_order', 'parent_slug');
357
+		parent::__construct($menu_args, $required);
358 358
 	}
359 359
 
360 360
 
361 361
 	protected function _add_menu_page() {
362
-		return add_submenu_page( $this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false' );
362
+		return add_submenu_page($this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false');
363 363
 	}
364 364
 
365 365
 
366 366
 	private function _group_link() {
367
-		return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
367
+		return '<span class="ee_menu_group"  onclick="return false;">'.$this->menu_label.'</span>';
368 368
 	}
369 369
 } //end EE_Admin_Page_Menu_Group
Please login to merge, or discard this patch.
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -187,8 +187,9 @@  discard block
 block discarded – undo
187 187
 					break;
188 188
 
189 189
 			}
190
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
191
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
190
+			if ( ! EEH_Class_Tools::has_property( $this, $prop ) ) {
191
+							throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
192
+			}
192 193
 			$this->{$prop} = $value;
193 194
 
194 195
 		}
@@ -203,8 +204,9 @@  discard block
 block discarded – undo
203 204
 		}
204 205
 
205 206
 		//if empty menu_callback let's set default (but only if we have admin page init object)
206
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
207
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
207
+		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
208
+					$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
209
+		}
208 210
 
209 211
 	}
210 212
 
@@ -233,7 +235,7 @@  discard block
 block discarded – undo
233 235
 				||
234 236
 			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
235 237
 			$wp_page_slug = $this->_add_menu_page();
236
-		}else{
238
+		} else{
237 239
 			$wp_page_slug = '';
238 240
 		}
239 241
 
Please login to merge, or discard this patch.
core/admin/EE_Help_Tour.core.php 2 patches
Spacing   +35 added lines, -35 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
 /**
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 */
116 116
 	public function __construct($caf = FALSE) {
117 117
 		$this->_is_caf = $caf;
118
-		$this->_req_data = array_merge( $_GET, $_POST );
118
+		$this->_req_data = array_merge($_GET, $_POST);
119 119
 		$this->_set_tour_properties();
120 120
 		$this->_set_tour_stops();
121 121
 		$this->_set_tour_options();
@@ -158,36 +158,36 @@  discard block
 block discarded – undo
158 158
 	 * @access protected
159 159
 	 * @return void
160 160
 	 */
161
-	protected function _set_tour_options( $options = array() ) {
161
+	protected function _set_tour_options($options = array()) {
162 162
 		$defaults = array(
163
-			'tipLocation' => 'bottom',         // 'top', 'bottom', 'right', 'left' in relation to parent
164
-		  	'nubPosition' => 'auto',           // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
165
-		  	'tipAdjustmentY' => 0, 			//allow for adjustment of tip
166
-		  	'tipAdjustmentX' => 0,			//allow for adjustment of tip
163
+			'tipLocation' => 'bottom', // 'top', 'bottom', 'right', 'left' in relation to parent
164
+		  	'nubPosition' => 'auto', // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
165
+		  	'tipAdjustmentY' => 0, //allow for adjustment of tip
166
+		  	'tipAdjustmentX' => 0, //allow for adjustment of tip
167 167
 		  	'scroll' => true, //whether to scrollTo the next step or not
168
-		  	'scrollSpeed' => 300,              // Page scrolling speed in ms
169
-		  	'timer' => 0,	                // 0 = off, all other numbers = time(ms)
170
-		  	'autoStart' => true,			// true or false - false tour starts when restart called
171
-		  	'startTimerOnClick' => true,       // true/false to start timer on first click
172
-		  	'nextButton' => true,              // true/false for next button visibility
168
+		  	'scrollSpeed' => 300, // Page scrolling speed in ms
169
+		  	'timer' => 0, // 0 = off, all other numbers = time(ms)
170
+		  	'autoStart' => true, // true or false - false tour starts when restart called
171
+		  	'startTimerOnClick' => true, // true/false to start timer on first click
172
+		  	'nextButton' => true, // true/false for next button visibility
173 173
 		  	'button_text' => __('Next', 'event_espresso'),
174
-		  	'tipAnimation' => 'fade',           // 'pop' or 'fade' in each tip
175
-		  	'pauseAfter' => array(),                // array of indexes where to pause the tour after
176
-		  	'tipAnimationFadeSpeed' => 300,    // if 'fade'- speed in ms of transition
177
-		  	'cookieMonster' => true,           // true/false for whether cookies are used
178
-		  	'cookieName' => $this->get_slug(),         // choose your own cookie name (setup will add the prefix for the specific page joyride)
179
-	  		'cookieDomain' => false,           // set to false or yoursite.com
174
+		  	'tipAnimation' => 'fade', // 'pop' or 'fade' in each tip
175
+		  	'pauseAfter' => array(), // array of indexes where to pause the tour after
176
+		  	'tipAnimationFadeSpeed' => 300, // if 'fade'- speed in ms of transition
177
+		  	'cookieMonster' => true, // true/false for whether cookies are used
178
+		  	'cookieName' => $this->get_slug(), // choose your own cookie name (setup will add the prefix for the specific page joyride)
179
+	  		'cookieDomain' => false, // set to false or yoursite.com
180 180
 		  	//'tipContainer' => 'body',            // Where the tip be attached if not inline
181
-		  	'modal' => false, 					// Whether to cover page with modal during the tour
182
-		  	'expose' => false,					// Whether to expose the elements at each step in the tour (requires modal:true),
183
-		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback',    // A method to call after an element has been exposed
184
-		  	'preRideCallback' => 'EEHelpTour_preRideCallback',    // A method to call before the tour starts (passed index, tip, and cloned exposed element)
185
-		  	'postRideCallback' => 'EEHelpTour_postRideCallback',       // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
186
-		  	'preStepCallback' => 'EEHelpTour_preStepCallback',    // A method to call before each step
187
-		  	'postStepCallback' => 'EEHelpTour_postStepCallback',        // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
181
+		  	'modal' => false, // Whether to cover page with modal during the tour
182
+		  	'expose' => false, // Whether to expose the elements at each step in the tour (requires modal:true),
183
+		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback', // A method to call after an element has been exposed
184
+		  	'preRideCallback' => 'EEHelpTour_preRideCallback', // A method to call before the tour starts (passed index, tip, and cloned exposed element)
185
+		  	'postRideCallback' => 'EEHelpTour_postRideCallback', // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
186
+		  	'preStepCallback' => 'EEHelpTour_preStepCallback', // A method to call before each step
187
+		  	'postStepCallback' => 'EEHelpTour_postStepCallback', // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
188 188
 			);
189 189
 
190
-		$options = !empty( $options ) && is_array($options)  ? array_merge( $defaults, $options ) : $defaults;
190
+		$options = ! empty($options) && is_array($options) ? array_merge($defaults, $options) : $defaults;
191 191
 		$this->_options = $options;
192 192
 	}
193 193
 
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 * @return string slug for the tour
203 203
 	 */
204 204
 	public function get_slug() {
205
-		if ( empty( $this->_slug ) )
206
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
205
+		if (empty($this->_slug))
206
+			throw new EE_Error(sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this)));
207 207
 		return $this->_slug;
208 208
 	}
209 209
 
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 	 * @return string
216 216
 	 */
217 217
 	public function get_label() {
218
-		if ( empty( $this->_label ) )
219
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
218
+		if (empty($this->_label))
219
+			throw new EE_Error(sprintf(__('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this)));
220 220
 		return $this->_label;
221 221
 	}
222 222
 
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 	 * @return array
228 228
 	 */
229 229
 	public function get_stops() {
230
-		foreach( $this->_stops as $ind => $stop ) {
231
-			if ( ! isset( $stop['button_text'] ) ) {
230
+		foreach ($this->_stops as $ind => $stop) {
231
+			if ( ! isset($stop['button_text'])) {
232 232
 				$this->_stops[$ind]['button_text'] = $this->_options['button_text'];
233 233
 			}
234 234
 		}
@@ -243,12 +243,12 @@  discard block
 block discarded – undo
243 243
 	 */
244 244
 	public function get_options() {
245 245
 		//let's make sure there are not pauses set
246
-		foreach ( $this->_stops as $ind => $stop ) {
247
-			if ( isset( $stop['pause_after'] ) && $stop['pause_after'] ) {
246
+		foreach ($this->_stops as $ind => $stop) {
247
+			if (isset($stop['pause_after']) && $stop['pause_after']) {
248 248
 				$this->_options['pauseAfter'][] = $ind;
249 249
 			}
250 250
 		}
251
-		return apply_filters( 'FHEE__' . get_class($this) . '__get_options', $this->_options, $this );
251
+		return apply_filters('FHEE__'.get_class($this).'__get_options', $this->_options, $this);
252 252
 	}
253 253
 
254 254
 }
Please login to merge, or discard this patch.
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if (!defined('EVENT_ESPRESSO_VERSION')) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
@@ -202,8 +203,9 @@  discard block
 block discarded – undo
202 203
 	 * @return string slug for the tour
203 204
 	 */
204 205
 	public function get_slug() {
205
-		if ( empty( $this->_slug ) )
206
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
206
+		if ( empty( $this->_slug ) ) {
207
+					throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
208
+		}
207 209
 		return $this->_slug;
208 210
 	}
209 211
 
@@ -215,8 +217,9 @@  discard block
 block discarded – undo
215 217
 	 * @return string
216 218
 	 */
217 219
 	public function get_label() {
218
-		if ( empty( $this->_label ) )
219
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
220
+		if ( empty( $this->_label ) ) {
221
+					throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
222
+		}
220 223
 		return $this->_label;
221 224
 	}
222 225
 
Please login to merge, or discard this patch.
core/admin/EE_Help_Tour_final_stop.class.php 2 patches
Spacing   +2 added lines, -2 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
 /**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 			'action' => 'admin_option_settings',
61 61
 			'page' => 'espresso_general_settings'
62 62
 			);
63
-		return '<p>' . sprintf( __('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php') ) . '">', '</a>' ) . '</p>';
63
+		return '<p>'.sprintf(__('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="'.EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')).'">', '</a>').'</p>';
64 64
 	}
65 65
 
66 66
 }
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
core/admin/templates/about_admin_wrapper.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <div class="wrap espresso-admin about-wrap">
2 2
 
3 3
 	<h1><?php  echo $admin_page_title; ?></h1>
4
-	<div class="about-text"><?php echo !empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
5
-	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf( esc_attr__( '%s Logo', 'event_espresso' ), 'Event Espresso' ); ?>"/><br /><?php printf( __('Version %s', 'event_espresso' ),  EVENT_ESPRESSO_VERSION ); ?></div>
4
+	<div class="about-text"><?php echo ! empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
5
+	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf(esc_attr__('%s Logo', 'event_espresso'), 'Event Espresso'); ?>"/><br /><?php printf(__('Version %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); ?></div>
6 6
 
7 7
 	<?php echo $nav_tabs; ?>
8 8
 
9 9
 
10 10
 <?php
11
-	do_action( 'AHEE__admin_wrapper__template__before_about_admin_page_content' );
11
+	do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
12 12
 	echo $about_admin_page_content;
13
-	do_action( 'AHEE__admin_wrapper__template__after_about_admin_page_content' );
13
+	do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
14 14
 ?>
15 15
 
16 16
 </div>
Please login to merge, or discard this patch.
core/admin/templates/admin_details_metabox_column_wrapper.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@
 block discarded – undo
10 10
 
11 11
 		<?php
12 12
 		//let's loop through the columns
13
-		 for ( $i = 1; $i <= $num_columns; $i++ ) {
14
-		 	$metaref = ( $i === 1 ) ? 'normal' : 'side';
15
-		 	$metaref = ( $i > 2 ) ? 'column'.$i : $metaref;
13
+		 for ($i = 1; $i <= $num_columns; $i++) {
14
+		 	$metaref = ($i === 1) ? 'normal' : 'side';
15
+		 	$metaref = ($i > 2) ? 'column'.$i : $metaref;
16 16
 		 ?>
17 17
 
18 18
 			<div id='postbox-container-<?php echo $i; ?>' class='postbox-container'>
19
-				<?php do_meta_boxes( $current_page, $metaref, NULL ); ?>
19
+				<?php do_meta_boxes($current_page, $metaref, NULL); ?>
20 20
 			</div>
21 21
 		<?php }// end column loop ?>
22 22
 	</div> <!-- post-body -->
Please login to merge, or discard this patch.
core/admin/templates/admin_details_publish_metabox.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if ( $publish_box_extra_content ) : ?>
1
+<?php if ($publish_box_extra_content) : ?>
2 2
 <div id="minor-publishing">
3 3
 <?php echo $publish_box_extra_content; ?>
4 4
 </div>
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	<div id="espresso_major_buttons_wrapper">
15 15
 	
16
-		<?php if ( $publish_delete_link ) : ?>
16
+		<?php if ($publish_delete_link) : ?>
17 17
 		<div id="delete-action">
18 18
 			<?php echo $publish_delete_link; ?>
19 19
 		</div>
Please login to merge, or discard this patch.
admin/templates/admin_general_metabox_contents_espresso_links.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <div class="padding">
2 2
 	   	<ul class="infolinks">
3 3
 	   		<li>
4
-	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso') . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">' . __('Usage Guide').'</a>'; ?>
4
+	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso').'</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'.__('Usage Guide').'</a>'; ?>
5 5
 	   		</li>
6 6
 	   		<li>
7 7
 		   		<a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	   			</a>
31 31
 	   		</li>
32 32
 	   		<li>
33
-	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso'). '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">' .__('Add-ons', 'event_espresso').'</a>'; ?><br />
33
+	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso').'</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'.__('Add-ons', 'event_espresso').'</a>'; ?><br />
34 34
 	   			<br />
35 35
 	   			<ol>
36 36
 	   				<li>
Please login to merge, or discard this patch.
core/admin/templates/admin_reports.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php //EEH_Debug_Tools::printr( $admin_reports, '$admin_reports' ); ?>
2 2
 
3
-<?php foreach ( $admin_reports as $report) : ?>
3
+<?php foreach ($admin_reports as $report) : ?>
4 4
 
5 5
 	<div id="<?php echo $report; ?>" class="admin-report-chart-dv" style="width:95%; min-height:420px; margin:20px 4% 40px 1%;"></div>
6 6
 
Please login to merge, or discard this patch.
core/admin/templates/status_dropdown.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 	<span id="localized_status_save"><?php echo $localized_status_save; ?></span>
4 4
 	<span id="cur_stat_id"><?php echo $cur_status; ?></span>
5 5
 	<select name='ee_post_status' id='ee_post_status'>
6
- 	<?php foreach ( $statuses as $status => $label ) : ?>
7
-		<option<?php selected( $cur_status, $status ); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
6
+ 	<?php foreach ($statuses as $status => $label) : ?>
7
+		<option<?php selected($cur_status, $status); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
8 8
 	<?php
9 9
 	endforeach;
10 10
 	?>
Please login to merge, or discard this patch.