eventespresso / event-espresso-core

core/helpers/EEH_HTML.helper.php

Indentation +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EEH_HTML
- *
+  *
+  * Class EEH_HTML
+  *
   * Sometimes when writing PHP you need to generate some standard HTML,
   * but either not enough to warrant creating a template file,
   * or the amount of PHP conditionals and/or loops peppered throughout the HTML
   * just make it really ugly and difficult to read.
   * This class simply adds a bunch of methods for generating basic HTML tags.
   * Most of the methods have the same name as the HTML tag they generate, and most have the same set of parameters.
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 
 class EEH_HTML {
 

Spacing +121 added lines, -121 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_HTML ) {
+		if ( ! self::$_instance instanceof EEH_HTML) {
 			self::$_instance = new EEH_HTML();
 		}
 		return self::$_instance;
@@ -102,14 +102,14 @@ 
 		$other_attributes = '',
 		$force_close = false
 	) {
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		$html = EEH_HTML::nl( 0, $tag ) . '<' . $tag . $attributes . '>';
-		$html .= ! empty( $content ) ? EEH_HTML::nl( 1, $tag  ) . $content : '';
-		$indent = ! empty( $content ) || $force_close ? TRUE : FALSE;
-		$html .= ! empty( $content ) || $force_close ? EEH_HTML::_close_tag( $tag, $id, $class, $indent ) : '';
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		$html = EEH_HTML::nl(0, $tag).'<'.$tag.$attributes.'>';
+		$html .= ! empty($content) ? EEH_HTML::nl(1, $tag).$content : '';
+		$indent = ! empty($content) || $force_close ? TRUE : FALSE;
+		$html .= ! empty($content) || $force_close ? EEH_HTML::_close_tag($tag, $id, $class, $indent) : '';
 		return $html;
 	}
 
@@ -126,15 +126,15 @@ 
 	 * @param bool   $indent
 	 * @return string
 	 */
-	protected static function _close_tag( $tag = 'div', $id = '', $class = '', $indent = TRUE ) {
+	protected static function _close_tag($tag = 'div', $id = '', $class = '', $indent = TRUE) {
 		$comment = '';
-		if ( $id ) {
-			$comment = EEH_HTML::comment( 'close ' . $id ) . EEH_HTML::nl( 0, $tag );
-		} else if ( $class ) {
-			$comment = EEH_HTML::comment( 'close ' . $class ) . EEH_HTML::nl( 0, $tag );
+		if ($id) {
+			$comment = EEH_HTML::comment('close '.$id).EEH_HTML::nl(0, $tag);
+		} else if ($class) {
+			$comment = EEH_HTML::comment('close '.$class).EEH_HTML::nl(0, $tag);
 		}
 		$html = $indent ? EEH_HTML::nl( -1, $tag ) : '';
-		$html .= '</' . $tag . '>' . $comment;
+		$html .= '</'.$tag.'>'.$comment;
 		return $html;
 	}
 
@@ -153,8 +153,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function div( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'div', $content, $id, $class, $style, $other_attributes );
+	public static function div($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('div', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function divx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'div', $id, $class );
+	public static function divx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('div', $id, $class);
 	}
 
 
@@ -184,8 +184,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h1( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h1', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h1($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h1', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -201,8 +201,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h2( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h2', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h2($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h2', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -218,8 +218,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h3( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h3', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h3($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h3', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -235,8 +235,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h4( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h4', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h4($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h4', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -252,8 +252,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h5( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h5', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h5($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h5', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -269,8 +269,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h6( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h6', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h6($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h6', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -286,8 +286,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function p( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'p', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function p($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('p', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -302,8 +302,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function ul( $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'ul', '', $id, $class, $style, $other_attributes );
+	public static function ul($id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('ul', '', $id, $class, $style, $other_attributes);
 	}
 
 
@@ -316,8 +316,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function ulx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'ul', $id, $class );
+	public static function ulx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('ul', $id, $class);
 	}
 
 
@@ -334,8 +334,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function li( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'li', $content, $id, $class, $style, $other_attributes );
+	public static function li($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('li', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -348,8 +348,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function lix( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'li', $id, $class );
+	public static function lix($id = '', $class = '') {
+		return EEH_HTML::_close_tag('li', $id, $class);
 	}
 
 
@@ -365,8 +365,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function table( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'table', $content, $id, $class, $style, $other_attributes );
+	public static function table($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('table', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -378,8 +378,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tablex( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'table', $id, $class );
+	public static function tablex($id = '', $class = '') {
+		return EEH_HTML::_close_tag('table', $id, $class);
 	}
 
 
@@ -395,8 +395,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function thead( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'thead', $content, $id, $class, $style, $other_attributes );
+	public static function thead($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('thead', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -408,8 +408,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function theadx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'thead', $id, $class );
+	public static function theadx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('thead', $id, $class);
 	}
 
 
@@ -425,8 +425,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function tbody( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'tbody', $content, $id, $class, $style, $other_attributes );
+	public static function tbody($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('tbody', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -438,8 +438,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tbodyx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'tbody', $id, $class );
+	public static function tbodyx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('tbody', $id, $class);
 	}
 
 
@@ -455,8 +455,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function tr( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'tr', $content, $id, $class, $style, $other_attributes );
+	public static function tr($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('tr', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -468,8 +468,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function trx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'tr', $id, $class );
+	public static function trx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('tr', $id, $class);
 	}
 
 
@@ -485,8 +485,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function th( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'th', $content, $id, $class, $style, $other_attributes );
+	public static function th($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('th', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -498,8 +498,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function thx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'th', $id, $class );
+	public static function thx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('th', $id, $class);
 	}
 
 
@@ -515,8 +515,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function td( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'td', $content, $id, $class, $style, $other_attributes );
+	public static function td($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('td', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -528,8 +528,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tdx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'td', $id, $class );
+	public static function tdx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('td', $id, $class);
 	}
 
 
@@ -543,10 +543,10 @@ 
 	 * @param int    $colspan
 	 * @return string
 	 */
-	public static function no_row( $content = '', $colspan = 2 ) {
+	public static function no_row($content = '', $colspan = 2) {
 		return EEH_HTML::tr(
-			EEH_HTML::td( $content, '', '',  'padding:0; border:none;', 'colspan="' . $colspan . '"' ),
-			'', '',  'padding:0; border:none;'
+			EEH_HTML::td($content, '', '', 'padding:0; border:none;', 'colspan="'.$colspan.'"'),
+			'', '', 'padding:0; border:none;'
 		);
 	}
 
@@ -566,14 +566,14 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function link( $href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$link_text = ! empty( $link_text ) ? $link_text : $href;
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $title ) ? ' title="' . esc_attr( $title ) . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<a href="' . $href . '" ' . $attributes . '>'  . $link_text  . '</a>';
+	public static function link($href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$link_text = ! empty($link_text) ? $link_text : $href;
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($title) ? ' title="'.esc_attr($title).'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<a href="'.$href.'" '.$attributes.'>'.$link_text.'</a>';
 	}
 
 
@@ -590,14 +590,14 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function img( $src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$attributes = ! empty( $src ) ? ' src="' . esc_url_raw( $src ) . '"' : '';
-		$attributes .= ! empty( $alt ) ? ' alt="' . esc_attr( $alt ) . '"' : '';
-		$attributes .= ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<img' . $attributes  . '/>';
+	public static function img($src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$attributes = ! empty($src) ? ' src="'.esc_url_raw($src).'"' : '';
+		$attributes .= ! empty($alt) ? ' alt="'.esc_attr($alt).'"' : '';
+		$attributes .= ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<img'.$attributes.'/>';
 	}
 
 
@@ -615,12 +615,12 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	protected static function _inline_tag( $tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<' . $tag . ' ' . $attributes . '>'  . $content  . '</' . $tag . '>';
+	protected static function _inline_tag($tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<'.$tag.' '.$attributes.'>'.$content.'</'.$tag.'>';
 	}
 
 
@@ -636,8 +636,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function label( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'label', $content, $id, $class, $style, $other_attributes );
+	public static function label($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('label', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -653,8 +653,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function span( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'span', $content, $id, $class, $style, $other_attributes );
+	public static function span($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('span', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -670,8 +670,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function strong( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'strong', $content, $id, $class, $style, $other_attributes );
+	public static function strong($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('strong', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -683,8 +683,8 @@ 
 	 * @param string $comment
 	 * @return string
 	 */
-	public static function comment( $comment = '' ) {
-		return ! empty( $comment ) ? EEH_HTML::nl() . '<!-- ' . $comment . ' -->' : '';
+	public static function comment($comment = '') {
+		return ! empty($comment) ? EEH_HTML::nl().'<!-- '.$comment.' -->' : '';
 	}
 
 
@@ -695,8 +695,8 @@ 
 	 * @param int $nmbr - the number of line breaks to return
 	 * @return string
 	 */
-	public static function br( $nmbr = 1 ) {
-		return str_repeat( '<br />', $nmbr );
+	public static function br($nmbr = 1) {
+		return str_repeat('<br />', $nmbr);
 	}
 
 
@@ -707,8 +707,8 @@ 
 	 * @param int $nmbr - the number of non-breaking spaces to return
 	 * @return string
 	 */
-	public static function nbsp( $nmbr = 1 ) {
-		return str_repeat( '&nbsp;', $nmbr );
+	public static function nbsp($nmbr = 1) {
+		return str_repeat('&nbsp;', $nmbr);
 	}
 
 
@@ -722,9 +722,9 @@ 
 	 * @param string $id
 	 * @return string
 	 */
-	public static function sanitize_id( $id = '' ) {
-		$key = str_replace( ' ', '-', trim( $id ) );
-		return preg_replace( '/[^a-zA-Z0-9_\-]/', '', $key );
+	public static function sanitize_id($id = '') {
+		$key = str_replace(' ', '-', trim($id));
+		return preg_replace('/[^a-zA-Z0-9_\-]/', '', $key);
 	}
 
 
@@ -736,10 +736,10 @@ 
 	 * @param string $tag
 	 * @return string - newline character plus # of indents passed (can be + or -)
 	 */
-	public static function nl( $indent = 0, $tag = 'none' ) {
+	public static function nl($indent = 0, $tag = 'none') {
 		$html = "\n";
-		EEH_HTML::indent( $indent, $tag );
-		for ( $x = 0; $x < EEH_HTML::$_indent[ $tag ]; $x++ ) {
+		EEH_HTML::indent($indent, $tag);
+		for ($x = 0; $x < EEH_HTML::$_indent[$tag]; $x++) {
 			$html .= "\t";
 		}
 		return $html;
@@ -754,17 +754,17 @@ 
 	 * @param int    $indent can be negative to decrease the indentation level
 	 * @param string $tag
 	 */
-	public static function indent( $indent, $tag = 'none' ){
+	public static function indent($indent, $tag = 'none') {
 		static $default_indentation = FALSE;
-		if ( ! $default_indentation ) {
+		if ( ! $default_indentation) {
 			EEH_HTML::_set_default_indentation();
 			$default_indentation = TRUE;
 		}
-		if ( ! isset( EEH_HTML::$_indent[ $tag ] )) {
-			EEH_HTML::$_indent[ $tag ] = 0;
+		if ( ! isset(EEH_HTML::$_indent[$tag])) {
+			EEH_HTML::$_indent[$tag] = 0;
 		}
-		EEH_HTML::$_indent[ $tag ] += (int)$indent;
-		EEH_HTML::$_indent[ $tag ] = EEH_HTML::$_indent[ $tag ] >= 0 ? EEH_HTML::$_indent[ $tag ] : 0;
+		EEH_HTML::$_indent[$tag] += (int) $indent;
+		EEH_HTML::$_indent[$tag] = EEH_HTML::$_indent[$tag] >= 0 ? EEH_HTML::$_indent[$tag] : 0;
 	}
 
 
@@ -810,15 +810,15 @@ 
 	 * @global array $allowedtags
 	 * @return array
 	 */
-	public static function get_simple_tags(){
+	public static function get_simple_tags() {
 		global $allowedtags;
 		$tags_we_allow = $allowedtags;
-		$tags_we_allow['ol']=array();
-		$tags_we_allow['ul']=array();
-		$tags_we_allow['li']=array();
-		$tags_we_allow['br']=array();
-		$tags_we_allow['p']=array();
-		return apply_filters( 'FHEE__EEH_HTML__get_simple_tags', $tags_we_allow );
+		$tags_we_allow['ol'] = array();
+		$tags_we_allow['ul'] = array();
+		$tags_we_allow['li'] = array();
+		$tags_we_allow['br'] = array();
+		$tags_we_allow['p'] = array();
+		return apply_filters('FHEE__EEH_HTML__get_simple_tags', $tags_we_allow);
 	}
 
 

core/helpers/EEH_Inflector.helper.php

Indentation +315 added lines, -315 removed lines

@@ -35,9 +35,9 @@ 
  * @version $Revision 0.1 $
  */
 class EEH_Inflector{
-    // ------ CLASS METHODS ------ //
-    // ---- Public methods ---- //
-    // {{{ pluralize()
+	// ------ CLASS METHODS ------ //
+	// ---- Public methods ---- //
+	// {{{ pluralize()
 
 	/**
 	 * Just calls self::pluralize and strtolower on $word and returns it
@@ -51,319 +51,319 @@ 
 	static function singularize_and_upper( $word ) {
 		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
 	}
-    /**
-     * Pluralizes English nouns.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    English noun to pluralize
-     * @return string Plural noun
-     */
-    static function pluralize($word){
-        $plural = array(
-            '/(quiz)$/i'               => '\1zes',
-            '/^(ox)$/i'                => '\1en',
-            '/([m|l])ouse$/i'          => '\1ice',
-            '/(matr|vert|ind)ix|ex$/i' => '\1ices',
-            '/(x|ch|ss|sh)$/i'         => '\1es',
-            '/([^aeiouy]|qu)ies$/i'    => '\1y',
-            '/([^aeiouy]|qu)y$/i'      => '\1ies',
-            '/(hive)$/i'               => '\1s',
-            '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-            '/sis$/i'                  => 'ses',
-            '/([ti])um$/i'             => '\1a',
-            '/(buffal|tomat)o$/i'      => '\1oes',
-            '/(bu)s$/i'                => '\1ses',
-            '/(alias|status)/i'        => '\1es',
-            '/(octop|vir)us$/i'        => '\1i',
-            '/(ax|test)is$/i'          => '\1es',
-            '/s$/i'                    => 's',
-            '/$/'                      => 's');
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man'    => 'men',
-            'child'  => 'children',
-            'sex'    => 'sexes',
-            'move'   => 'moves');
-
-        $lowercased_word = strtolower($word);
-
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
+	/**
+	 * Pluralizes English nouns.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    English noun to pluralize
+	 * @return string Plural noun
+	 */
+	static function pluralize($word){
+		$plural = array(
+			'/(quiz)$/i'               => '\1zes',
+			'/^(ox)$/i'                => '\1en',
+			'/([m|l])ouse$/i'          => '\1ice',
+			'/(matr|vert|ind)ix|ex$/i' => '\1ices',
+			'/(x|ch|ss|sh)$/i'         => '\1es',
+			'/([^aeiouy]|qu)ies$/i'    => '\1y',
+			'/([^aeiouy]|qu)y$/i'      => '\1ies',
+			'/(hive)$/i'               => '\1s',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/sis$/i'                  => 'ses',
+			'/([ti])um$/i'             => '\1a',
+			'/(buffal|tomat)o$/i'      => '\1oes',
+			'/(bu)s$/i'                => '\1ses',
+			'/(alias|status)/i'        => '\1es',
+			'/(octop|vir)us$/i'        => '\1i',
+			'/(ax|test)is$/i'          => '\1es',
+			'/s$/i'                    => 's',
+			'/$/'                      => 's');
+
+		$uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
+
+		$irregular = array(
+			'person' => 'people',
+			'man'    => 'men',
+			'child'  => 'children',
+			'sex'    => 'sexes',
+			'move'   => 'moves');
+
+		$lowercased_word = strtolower($word);
+
+		foreach($uncountable as $_uncountable){
+			if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
 					! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
-                return $word;
-            }
-        }
-
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
-            }
-        }
-
-        foreach($plural as $rule => $replacement){
-            if(preg_match($rule, $word)){
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ singularize()
-
-    /**
-     * Singularizes English nouns.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    English noun to singularize
-     * @return string Singular noun.
-     */
-    static function singularize($word){
-        $singular = array(
-            '/(quiz)zes$/i'                                                    => '\1',
-            '/(matr)ices$/i'                                                   => '\1ix',
-            '/(vert|ind)ices$/i'                                               => '\1ex',
-            '/^(ox)en/i'                                                       => '\1',
-            '/(alias|status)es$/i'                                             => '\1',
-            '/([octop|vir])i$/i'                                               => '\1us',
-            '/(cris|ax|test)es$/i'                                             => '\1is',
-            '/(shoe)s$/i'                                                      => '\1',
-            '/(o)es$/i'                                                        => '\1',
-            '/(bus)es$/i'                                                      => '\1',
-            '/([m|l])ice$/i'                                                   => '\1ouse',
-            '/(x|ch|ss|sh)es$/i'                                               => '\1',
-            '/(m)ovies$/i'                                                     => '\1ovie',
-            '/(s)eries$/i'                                                     => '\1eries',
-            '/([^aeiouy]|qu)ies$/i'                                            => '\1y',
-            '/([lr])ves$/i'                                                    => '\1f',
-            '/(tive)s$/i'                                                      => '\1',
-            '/(hive)s$/i'                                                      => '\1',
-            '/([^f])ves$/i'                                                    => '\1fe',
-            '/(^analy)ses$/i'                                                  => '\1sis',
-            '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
-            '/([ti])a$/i'                                                      => '\1um',
-            '/(n)ews$/i'                                                       => '\1ews',
-            '/s$/i'                                                            => '',
-        );
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man'    => 'men',
-            'child'  => 'children',
-            'sex'    => 'sexes',
-            'move'   => 'moves');
-
-        $lowercased_word = strtolower($word);
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
-                return $word;
-            }
-        }
-
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
-            }
-        }
-
-        foreach($singular as $rule => $replacement){
-            if(preg_match($rule, $word)){
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-
-        return $word;
-    }
-
-    // }}}
-    // {{{ titleize()
-
-    /**
-     * Converts an underscored or CamelCase word into a English
-     * sentence.
-     *
-     * The titleize static function converts text like "WelcomePage",
-     * "welcome_page" or  "welcome page" to this "Welcome
-     * Page".
-     * If second parameter is set to 'first' it will only
-     * capitalize the first character of the title.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    Word to format as tile
-     * @param    string    $uppercase    If set to 'first' it will only uppercase the
-     * first character. Otherwise it will uppercase all
-     * the words in the title.
-     * @return string Text formatted as title
-     */
-    static function titleize($word, $uppercase = ''){
-        $uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
-        return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
-    }
-
-    // }}}
-    // {{{ camelize()
-
-    /**
-     * Returns given word as CamelCased
-     *
-     * Converts a word like "send_email" to "SendEmail". It
-     * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "WhoSOnline"
-     *
-     * @access public
-     * @static
-     * @see variablize
-     * @param    string    $word    Word to convert to camel case
-     * @return string UpperCamelCasedWord
-     */
-    static function camelize($word){
-        return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
-    }
-
-    // }}}
-    // {{{ underscore()
-
-    /**
-     * Converts a word "into_it_s_underscored_version"
-     *
-     * Convert any "CamelCased" or "ordinary Word" into an
-     * "underscored_word".
-     *
-     * This can be really useful for creating friendly URLs.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    Word to underscore
-     * @return string Underscored word
-     */
-    static function underscore($word){
-        return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
-    }
-
-    // }}}
-    // {{{ humanize()
-
-    /**
-     * Returns a human-readable string from $word
-     *
-     * Returns a human-readable string from $word, by replacing
-     * underscores with a space, and by upper-casing the initial
-     * character by default.
-     *
-     * If you need to uppercase all the words you just have to
-     * pass 'all' as a second parameter.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    String to "humanize"
-     * @param    string    $uppercase    If set to 'all' it will uppercase all the words
-     * instead of just the first one.
-     * @return string Human-readable word
-     */
-    static function humanize($word, $uppercase = ''){
+				return $word;
+			}
+		}
+
+		foreach($irregular as $_plural => $_singular){
+			if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
+				return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+			}
+		}
+
+		foreach($plural as $rule => $replacement){
+			if(preg_match($rule, $word)){
+				return preg_replace($rule, $replacement, $word);
+			}
+		}
+		return false;
+	}
+
+	// }}}
+	// {{{ singularize()
+
+	/**
+	 * Singularizes English nouns.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    English noun to singularize
+	 * @return string Singular noun.
+	 */
+	static function singularize($word){
+		$singular = array(
+			'/(quiz)zes$/i'                                                    => '\1',
+			'/(matr)ices$/i'                                                   => '\1ix',
+			'/(vert|ind)ices$/i'                                               => '\1ex',
+			'/^(ox)en/i'                                                       => '\1',
+			'/(alias|status)es$/i'                                             => '\1',
+			'/([octop|vir])i$/i'                                               => '\1us',
+			'/(cris|ax|test)es$/i'                                             => '\1is',
+			'/(shoe)s$/i'                                                      => '\1',
+			'/(o)es$/i'                                                        => '\1',
+			'/(bus)es$/i'                                                      => '\1',
+			'/([m|l])ice$/i'                                                   => '\1ouse',
+			'/(x|ch|ss|sh)es$/i'                                               => '\1',
+			'/(m)ovies$/i'                                                     => '\1ovie',
+			'/(s)eries$/i'                                                     => '\1eries',
+			'/([^aeiouy]|qu)ies$/i'                                            => '\1y',
+			'/([lr])ves$/i'                                                    => '\1f',
+			'/(tive)s$/i'                                                      => '\1',
+			'/(hive)s$/i'                                                      => '\1',
+			'/([^f])ves$/i'                                                    => '\1fe',
+			'/(^analy)ses$/i'                                                  => '\1sis',
+			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/([ti])a$/i'                                                      => '\1um',
+			'/(n)ews$/i'                                                       => '\1ews',
+			'/s$/i'                                                            => '',
+		);
+
+		$uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
+
+		$irregular = array(
+			'person' => 'people',
+			'man'    => 'men',
+			'child'  => 'children',
+			'sex'    => 'sexes',
+			'move'   => 'moves');
+
+		$lowercased_word = strtolower($word);
+		foreach($uncountable as $_uncountable){
+			if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
+				return $word;
+			}
+		}
+
+		foreach($irregular as $_plural => $_singular){
+			if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
+				return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+			}
+		}
+
+		foreach($singular as $rule => $replacement){
+			if(preg_match($rule, $word)){
+				return preg_replace($rule, $replacement, $word);
+			}
+		}
+
+		return $word;
+	}
+
+	// }}}
+	// {{{ titleize()
+
+	/**
+	 * Converts an underscored or CamelCase word into a English
+	 * sentence.
+	 *
+	 * The titleize static function converts text like "WelcomePage",
+	 * "welcome_page" or  "welcome page" to this "Welcome
+	 * Page".
+	 * If second parameter is set to 'first' it will only
+	 * capitalize the first character of the title.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    Word to format as tile
+	 * @param    string    $uppercase    If set to 'first' it will only uppercase the
+	 * first character. Otherwise it will uppercase all
+	 * the words in the title.
+	 * @return string Text formatted as title
+	 */
+	static function titleize($word, $uppercase = ''){
+		$uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
+		return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
+	}
+
+	// }}}
+	// {{{ camelize()
+
+	/**
+	 * Returns given word as CamelCased
+	 *
+	 * Converts a word like "send_email" to "SendEmail". It
+	 * will remove non alphanumeric character from the word, so
+	 * "who's online" will be converted to "WhoSOnline"
+	 *
+	 * @access public
+	 * @static
+	 * @see variablize
+	 * @param    string    $word    Word to convert to camel case
+	 * @return string UpperCamelCasedWord
+	 */
+	static function camelize($word){
+		return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
+	}
+
+	// }}}
+	// {{{ underscore()
+
+	/**
+	 * Converts a word "into_it_s_underscored_version"
+	 *
+	 * Convert any "CamelCased" or "ordinary Word" into an
+	 * "underscored_word".
+	 *
+	 * This can be really useful for creating friendly URLs.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    Word to underscore
+	 * @return string Underscored word
+	 */
+	static function underscore($word){
+		return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
+	}
+
+	// }}}
+	// {{{ humanize()
+
+	/**
+	 * Returns a human-readable string from $word
+	 *
+	 * Returns a human-readable string from $word, by replacing
+	 * underscores with a space, and by upper-casing the initial
+	 * character by default.
+	 *
+	 * If you need to uppercase all the words you just have to
+	 * pass 'all' as a second parameter.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    String to "humanize"
+	 * @param    string    $uppercase    If set to 'all' it will uppercase all the words
+	 * instead of just the first one.
+	 * @return string Human-readable word
+	 */
+	static function humanize($word, $uppercase = ''){
 		//make special exceptions for acronyms
 		$word = str_replace('wp_', 'WP_', $word );
-        $uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
-        return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
-    }
-
-    // }}}
-    // {{{ variablize()
-
-    /**
-     * Same as camelize but first char is underscored
-     *
-     * Converts a word like "send_email" to "sendEmail". It
-     * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "whoSOnline"
-     *
-     * @access public
-     * @static
-     * @see camelize
-     * @param    string    $word    Word to lowerCamelCase
-     * @return string Returns a lowerCamelCasedWord
-     */
-    static function variablize($word){
-        $word = EEH_Inflector::camelize($word);
-        return strtolower($word[0]) . substr($word, 1);
-    }
-
-    // }}}
-    // {{{ tableize()
-
-    /**
-     * Converts a class name to its table name according to rails
-     * naming conventions.
-     *
-     * Converts "Person" to "people"
-     *
-     * @access public
-     * @static
-     * @see classify
-     * @param    string    $class_name    Class name for getting related table_name.
-     * @return string plural_table_name
-     */
-    static function tableize($class_name){
-        return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
-    }
-
-    // }}}
-    // {{{ classify()
-
-    /**
-     * Converts a table name to its class name according to rails
-     * naming conventions.
-     *
-     * Converts "people" to "Person"
-     *
-     * @access public
-     * @static
-     * @see tableize
-     * @param    string    $table_name    Table name for getting related ClassName.
-     * @return string SingularClassName
-     */
-    static function classify($table_name){
-        return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
-    }
-
-    // }}}
-    // {{{ ordinalize()
-
-    /**
-     * Converts number to its ordinal English form.
-     *
-     * This method converts 13 to 13th, 2 to 2nd ...
-     *
-     * @access public
-     * @static
-     * @param    integer    $number    Number to get its ordinal value
-     * @return string Ordinal representation of given string.
-     */
-    static function ordinalize($number){
-        if(in_array(($number % 100), range(11, 13))){
-            return $number . 'th';
-        }else{
-            switch(($number % 10)){
-                case 1:
-                    return $number . 'st';
-                    break;
-                case 2:
-                    return $number . 'nd';
-                    break;
-                case 3:
-                    return $number . 'rd';
-                default:
-                    return $number . 'th';
-                    break;
-            }
-        }
-    }
+		$uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
+		return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
+	}
+
+	// }}}
+	// {{{ variablize()
+
+	/**
+	 * Same as camelize but first char is underscored
+	 *
+	 * Converts a word like "send_email" to "sendEmail". It
+	 * will remove non alphanumeric character from the word, so
+	 * "who's online" will be converted to "whoSOnline"
+	 *
+	 * @access public
+	 * @static
+	 * @see camelize
+	 * @param    string    $word    Word to lowerCamelCase
+	 * @return string Returns a lowerCamelCasedWord
+	 */
+	static function variablize($word){
+		$word = EEH_Inflector::camelize($word);
+		return strtolower($word[0]) . substr($word, 1);
+	}
+
+	// }}}
+	// {{{ tableize()
+
+	/**
+	 * Converts a class name to its table name according to rails
+	 * naming conventions.
+	 *
+	 * Converts "Person" to "people"
+	 *
+	 * @access public
+	 * @static
+	 * @see classify
+	 * @param    string    $class_name    Class name for getting related table_name.
+	 * @return string plural_table_name
+	 */
+	static function tableize($class_name){
+		return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
+	}
+
+	// }}}
+	// {{{ classify()
+
+	/**
+	 * Converts a table name to its class name according to rails
+	 * naming conventions.
+	 *
+	 * Converts "people" to "Person"
+	 *
+	 * @access public
+	 * @static
+	 * @see tableize
+	 * @param    string    $table_name    Table name for getting related ClassName.
+	 * @return string SingularClassName
+	 */
+	static function classify($table_name){
+		return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
+	}
+
+	// }}}
+	// {{{ ordinalize()
+
+	/**
+	 * Converts number to its ordinal English form.
+	 *
+	 * This method converts 13 to 13th, 2 to 2nd ...
+	 *
+	 * @access public
+	 * @static
+	 * @param    integer    $number    Number to get its ordinal value
+	 * @return string Ordinal representation of given string.
+	 */
+	static function ordinalize($number){
+		if(in_array(($number % 100), range(11, 13))){
+			return $number . 'th';
+		}else{
+			switch(($number % 10)){
+				case 1:
+					return $number . 'st';
+					break;
+				case 2:
+					return $number . 'nd';
+					break;
+				case 3:
+					return $number . 'rd';
+				default:
+					return $number . 'th';
+					break;
+			}
+		}
+	}
 }
\ No newline at end of file

Spacing +42 added lines, -42 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 // +----------------------------------------------------------------------+
@@ -34,7 +34,7 @@ 
  * @since 0.1
  * @version $Revision 0.1 $
  */
-class EEH_Inflector{
+class EEH_Inflector {
     // ------ CLASS METHODS ------ //
     // ---- Public methods ---- //
     // {{{ pluralize()
@@ -44,12 +44,12 @@ 
 	 * @param string $word
 	 * @return string
 	 */
-	static function pluralize_and_lower( $word ){
-		return strtolower( self::pluralize( $word ) );
+	static function pluralize_and_lower($word) {
+		return strtolower(self::pluralize($word));
 	}
 
-	static function singularize_and_upper( $word ) {
-		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
+	static function singularize_and_upper($word) {
+		return str_replace(' ', '_', self::humanize(self::singularize($word), 'all'));
 	}
     /**
      * Pluralizes English nouns.
@@ -59,7 +59,7 @@ 
      * @param    string    $word    English noun to pluralize
      * @return string Plural noun
      */
-    static function pluralize($word){
+    static function pluralize($word) {
         $plural = array(
             '/(quiz)$/i'               => '\1zes',
             '/^(ox)$/i'                => '\1en',
@@ -91,21 +91,21 @@ 
 
         $lowercased_word = strtolower($word);
 
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
-					! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
+        foreach ($uncountable as $_uncountable) {
+            if (substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
+					! ctype_alpha($lowercased_word[strlen($lowercased_word) - strlen($_uncountable)])) {
                 return $word;
             }
         }
 
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+        foreach ($irregular as $_plural => $_singular) {
+            if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
+                return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word);
             }
         }
 
-        foreach($plural as $rule => $replacement){
-            if(preg_match($rule, $word)){
+        foreach ($plural as $rule => $replacement) {
+            if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
         }
@@ -123,7 +123,7 @@ 
      * @param    string    $word    English noun to singularize
      * @return string Singular noun.
      */
-    static function singularize($word){
+    static function singularize($word) {
         $singular = array(
             '/(quiz)zes$/i'                                                    => '\1',
             '/(matr)ices$/i'                                                   => '\1ix',
@@ -161,20 +161,20 @@ 
             'move'   => 'moves');
 
         $lowercased_word = strtolower($word);
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
+        foreach ($uncountable as $_uncountable) {
+            if (substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable) {
                 return $word;
             }
         }
 
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+        foreach ($irregular as $_plural => $_singular) {
+            if (preg_match('/('.$_singular.')$/i', $word, $arr)) {
+                return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word);
             }
         }
 
-        foreach($singular as $rule => $replacement){
-            if(preg_match($rule, $word)){
+        foreach ($singular as $rule => $replacement) {
+            if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
         }
@@ -203,7 +203,7 @@ 
      * the words in the title.
      * @return string Text formatted as title
      */
-    static function titleize($word, $uppercase = ''){
+    static function titleize($word, $uppercase = '') {
         $uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
         return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
     }
@@ -224,7 +224,7 @@ 
      * @param    string    $word    Word to convert to camel case
      * @return string UpperCamelCasedWord
      */
-    static function camelize($word){
+    static function camelize($word) {
         return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
     }
 
@@ -244,7 +244,7 @@ 
      * @param    string    $word    Word to underscore
      * @return string Underscored word
      */
-    static function underscore($word){
+    static function underscore($word) {
         return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
     }
 
@@ -268,9 +268,9 @@ 
      * instead of just the first one.
      * @return string Human-readable word
      */
-    static function humanize($word, $uppercase = ''){
+    static function humanize($word, $uppercase = '') {
 		//make special exceptions for acronyms
-		$word = str_replace('wp_', 'WP_', $word );
+		$word = str_replace('wp_', 'WP_', $word);
         $uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
         return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
     }
@@ -291,9 +291,9 @@ 
      * @param    string    $word    Word to lowerCamelCase
      * @return string Returns a lowerCamelCasedWord
      */
-    static function variablize($word){
+    static function variablize($word) {
         $word = EEH_Inflector::camelize($word);
-        return strtolower($word[0]) . substr($word, 1);
+        return strtolower($word[0]).substr($word, 1);
     }
 
     // }}}
@@ -311,7 +311,7 @@ 
      * @param    string    $class_name    Class name for getting related table_name.
      * @return string plural_table_name
      */
-    static function tableize($class_name){
+    static function tableize($class_name) {
         return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
     }
 
@@ -330,7 +330,7 @@ 
      * @param    string    $table_name    Table name for getting related ClassName.
      * @return string SingularClassName
      */
-    static function classify($table_name){
+    static function classify($table_name) {
         return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
     }
 
@@ -347,21 +347,21 @@ 
      * @param    integer    $number    Number to get its ordinal value
      * @return string Ordinal representation of given string.
      */
-    static function ordinalize($number){
-        if(in_array(($number % 100), range(11, 13))){
-            return $number . 'th';
-        }else{
-            switch(($number % 10)){
+    static function ordinalize($number) {
+        if (in_array(($number % 100), range(11, 13))) {
+            return $number.'th';
+        } else {
+            switch (($number % 10)) {
                 case 1:
-                    return $number . 'st';
+                    return $number.'st';
                     break;
                 case 2:
-                    return $number . 'nd';
+                    return $number.'nd';
                     break;
                 case 3:
-                    return $number . 'rd';
+                    return $number.'rd';
                 default:
-                    return $number . 'th';
+                    return $number.'th';
                     break;
             }
         }

Braces +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
     static function ordinalize($number){
         if(in_array(($number % 100), range(11, 13))){
             return $number . 'th';
-        }else{
+        } else{
             switch(($number % 10)){
                 case 1:
                     return $number . 'st';

core/helpers/EEH_Money.helper.php

Indentation +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@
  */
 if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
  /**
- *
- * Money helper class.
- * This class has helper methods that help with money related conversions and calculations.
- *
- * @since %VER%
- *
- * @package		Event Espresso
- * @subpackage	helpers
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+  *
+  * Money helper class.
+  * This class has helper methods that help with money related conversions and calculations.
+  *
+  * @since %VER%
+  *
+  * @package		Event Espresso
+  * @subpackage	helpers
+  * @author		Darren Ethier
+  *
+  * ------------------------------------------------------------------------
+  */
 class EEH_Money extends EEH_Base  {
 
 

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_Money extends EEH_Base  {
+class EEH_Money extends EEH_Base {
 
 
 	/**
@@ -29,15 +29,15 @@ 
 	 * @param int|string $incoming_value
 	 * @return float
 	 */
-	public static function convert_to_float_from_localized_money( $incoming_value ) {
+	public static function convert_to_float_from_localized_money($incoming_value) {
 		//remove thousands separator
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value);
 
 		//replace decimal place with standard decimal.
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value);
 
 		//float it! and round to three decimal places
-		$money_value = round ( (float) $money_value, 3 );
+		$money_value = round((float) $money_value, 3);
 		return $money_value;
 	}
 
@@ -57,12 +57,12 @@ 
 	 * @throws \EE_Error
 	 */
 
-	public static function compare_floats( $float1, $float2, $operator='=' ) {
+	public static function compare_floats($float1, $float2, $operator = '=') {
 		// Check numbers to 5 digits of precision
 		$epsilon = 0.00001;
 
-		$float1 = (float)$float1;
-		$float2 = (float)$float2;
+		$float1 = (float) $float1;
+		$float2 = (float) $float2;
 
 		switch ($operator) {
 			// equal
@@ -116,7 +116,7 @@ 
 				}
 				break;
 			default:
-				throw new EE_Error(__( "Unknown operator '" . $operator . "' in EEH_Money::compare_floats()", 'event_espresso' ) );
+				throw new EE_Error(__("Unknown operator '".$operator."' in EEH_Money::compare_floats()", 'event_espresso'));
 		}
 
 		return false;
@@ -131,21 +131,21 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_format_for_jqplot( $CNT_ISO = '') {
+	public static function get_format_for_jqplot($CNT_ISO = '') {
 		//default format
 		$format = 'f';
 		//if CNT_ISO passed lets try to get currency settings for it.
-		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : null;
+		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
 		//default currency settings for site if not set
-		if ( ! $currency_config instanceof EE_Currency_Config ) {
+		if ( ! $currency_config instanceof EE_Currency_Config) {
 			$currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 		}
 
 		//first get the decimal place and number of places
-		$format = "%'." . $currency_config->dec_plc . $format;
+		$format = "%'.".$currency_config->dec_plc.$format;
 
 		//currency symbol on right side.
-		$format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+		$format = $currency_config->sign_b4 ? $currency_config->sign.$format : $format.$currency_config->sign;
 		return $format;
 	}
 
@@ -160,27 +160,27 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_format_for_google_charts( $CNT_ISO = '' ) {
+	public static function get_format_for_google_charts($CNT_ISO = '') {
 		//if CNT_ISO passed lets try to get currency settings for it.
-		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : null;
+		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
 		//default currency settings for site if not set
-		if ( ! $currency_config instanceof EE_Currency_Config ) {
+		if ( ! $currency_config instanceof EE_Currency_Config) {
 			$currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 		}
 
-		$decimal_places_placeholder = str_pad( '', $currency_config->dec_plc, '0' );
+		$decimal_places_placeholder = str_pad('', $currency_config->dec_plc, '0');
 
 		//first get the decimal place and number of places
-		$format = '#,##0.' . $decimal_places_placeholder;
+		$format = '#,##0.'.$decimal_places_placeholder;
 
 		//currency symbol on right side.
-		$format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+		$format = $currency_config->sign_b4 ? $currency_config->sign.$format : $format.$currency_config->sign;
 		$formatterObject = array(
 			'decimalSymbol' => $currency_config->dec_mrk,
 			'groupingSymbol' => $currency_config->thsnds,
 			'fractionDigits' => $currency_config->dec_plc,
 		);
-		if ( $currency_config->sign_b4 ) {
+		if ($currency_config->sign_b4) {
 			$formatterObject['prefix'] = $currency_config->sign;
 		} else {
 			$formatterObject['suffix'] = $currency_config->sign;

core/helpers/EEH_Sideloader.helper.php

Spacing +37 added lines, -37 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 class EEH_Sideloader extends EEH_Base {
 
 	private $_upload_to;
@@ -43,8 +43,8 @@ 
 	 * @access public
 	 * @param array $init array fo initializing the sideloader if keys match the properties.
 	 */
-	public function __construct( $init = array() ) {
-		$this->_init( $init );
+	public function __construct($init = array()) {
+		$this->_init($init);
 	}
 
 
@@ -55,24 +55,24 @@ 
 	 * @param  array  $init array on init (keys match properties others ignored)
 	 * @return void
 	 */
-	private function _init( $init ) {
+	private function _init($init) {
 		$defaults = array(
 			'_upload_to' => $this->_get_wp_uploads_dir(),
 			'_upload_from' => '',
 			'_permissions' => 0644,
-			'_new_file_name' => 'EE_Sideloader_' . uniqid() . '.default'
+			'_new_file_name' => 'EE_Sideloader_'.uniqid().'.default'
 			);
 
-		$props = array_merge( $defaults, $init );
+		$props = array_merge($defaults, $init);
 
-		foreach ( $props as $key => $val ) {
-			if ( EEH_Class_Tools::has_property( $this, $key ) ) {
+		foreach ($props as $key => $val) {
+			if (EEH_Class_Tools::has_property($this, $key)) {
 				$this->$key = $val;
 			}
 		}
 
 		//make sure we include the required wp file for needed functions
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		require_once(ABSPATH.'wp-admin/includes/file.php');
 	}
 
 
@@ -80,16 +80,16 @@ 
 	private function _get_wp_uploads_dir() {}
 
 	//setters
-	public function set_upload_to( $upload_to_folder ) {
+	public function set_upload_to($upload_to_folder) {
 		$this->_upload_to = $upload_to_folder;
 	}
-	public function set_upload_from( $upload_from_folder ) {
+	public function set_upload_from($upload_from_folder) {
 		$this->_upload_from_folder = $upload_from_folder;
 	}
-	public function set_permissions( $permissions ) {
+	public function set_permissions($permissions) {
 		$this->_permissions = $permissions;
 	}
-	public function set_new_file_name( $new_file_name ) {
+	public function set_new_file_name($new_file_name) {
 		$this->_new_file_name = $new_file_name;
 	}
 
@@ -111,34 +111,34 @@ 
 	//upload methods
 	public function sideload() {
 		//setup temp dir
-		$temp_file = wp_tempnam( $this->_upload_from );
+		$temp_file = wp_tempnam($this->_upload_from);
 
-		if ( !$temp_file ) {
-			EE_Error::add_error( __('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $temp_file) {
+			EE_Error::add_error(__('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		do_action( 'AHEE__EEH_Sideloader__sideload__before', $this, $temp_file );
+		do_action('AHEE__EEH_Sideloader__sideload__before', $this, $temp_file);
 
-		$wp_remote_args = apply_filters( 'FHEE__EEH_Sideloader__sideload__wp_remote_args', array( 'timeout' => 500, 'stream' => true, 'filename' => $temp_file ), $this, $temp_file );
+		$wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array('timeout' => 500, 'stream' => true, 'filename' => $temp_file), $this, $temp_file);
 
-		$response = wp_safe_remote_get( $this->_upload_from, $wp_remote_args );
+		$response = wp_safe_remote_get($this->_upload_from, $wp_remote_args);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $temp_file );
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				EE_Error::add_error( sprintf( __('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export( $response, true ), $this->_upload_from ), __FILE__, __FUNCTION__, __LINE__ );
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
+			unlink($temp_file);
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				EE_Error::add_error(sprintf(__('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export($response, true), $this->_upload_from), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
 
 		//possible md5 check
-		$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-		if ( $content_md5 ) {
-			$md5_check = verify_file_md5( $temp_file, $content_md5 );
-			if ( is_wp_error( $md5_check ) ) {
-				unlink( $temp_file );
-				EE_Error::add_error( $md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+		$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+		if ($content_md5) {
+			$md5_check = verify_file_md5($temp_file, $content_md5);
+			if (is_wp_error($md5_check)) {
+				unlink($temp_file);
+				EE_Error::add_error($md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -146,24 +146,24 @@ 
 		$file = $temp_file;
 
 		//now we have the file, let's get it in the right directory with the right name.
-		$path = apply_filters( 'FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to . $this->_new_file_name, $this );
+		$path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to.$this->_new_file_name, $this);
 
 		//move file in
-		if ( false === @ rename( $file, $path ) ) {
-			unlink( $temp_file );
-			EE_Error::add_error(  sprintf( __('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso' ), $path ), __FILE__, __FUNCTION__, __LINE__ );
+		if (false === @ rename($file, $path)) {
+			unlink($temp_file);
+			EE_Error::add_error(sprintf(__('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso'), $path), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//set permissions
-		$permissions = apply_filters( 'FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this );
-		chmod( $path, $permissions );
+		$permissions = apply_filters('FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this);
+		chmod($path, $permissions);
 
 		//that's it.  let's allow for actions after file uploaded.
-		do_action( 'AHEE__EE_Sideloader__sideload_after', $this, $path );
+		do_action('AHEE__EE_Sideloader__sideload_after', $this, $path);
 
 		//unlink tempfile
-		@unlink( $temp_file );
+		@unlink($temp_file);
 		return true;
 	}
 

core/helpers/EEH_Tabbed_Content.helper.php

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -98,8 +99,9 @@ 
 	 * @param array $nav_tabs tab array for nav tabs
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if ( empty($nav_tabs) ) {
+					throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		}
 
 		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
 		foreach ( $nav_tabs as $slug => $tab ) {
@@ -165,8 +167,10 @@ 
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
 	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		if ( !is_array($item_array) || empty( $item_array ) )
-			return false; //get out we don't have even the basic thing we need!
+		if ( !is_array($item_array) || empty( $item_array ) ) {
+					return false;
+		}
+		//get out we don't have even the basic thing we need!
 
 
 		$defaults = array(
@@ -184,8 +188,9 @@ 
 			$item = wp_parse_args( $item, $defaults );
 			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
-				$list .= self::_text_link_item($sep);
+			if ( !empty($sep) && $ci != count($item_array) ) {
+							$list .= self::_text_link_item($sep);
+			}
 			$ci++;
 		}
 

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -46,22 +46,22 @@ 
 	 * @return string the assembled html string containing the tabbed content for display.
 	 * @throws \EE_Error
 	 */
-	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE ) {
+	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE) {
 
 		//first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-		if ( !empty( $tabs_names) && ( count( (array) $tabs_names) != count( (array) $tabs_content) ) ) {
-			throw new EE_Error( __('The count for $tabs_names and $tabs_content does not match.', 'event_espresso') );
+		if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
 		}
 
 		//make sure we've got incoming data setup properly
-		$tabs = !empty( $tabs_names ) ? (array) $tabs_names : array_keys( (array) $tabs_contents );
-		$tabs_content = !empty( $tabs_names ) ? array_combine( (array) $tabs_names, (array) $tabs_content ) : $tabs_contents;
+		$tabs = ! empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
 		$all_tabs_content = '';
 
 		$index = 0;
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$active = $index === 0 ? true : false;
 			$all_tabs .= self::tab($tab, $active);
 			$all_tabs_content .= self::tab_content($tab, $tabs_content[$tab], $active);
@@ -78,7 +78,7 @@ 
 
 		$tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
 
-		return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+		return '<div class="'.$tab_container_class.'">'."\n\t".$all_tabs.$all_tabs_content."\n".'</div>';
 	}
 
 
@@ -102,11 +102,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if (empty($nav_tabs))
+			throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-		foreach ( $nav_tabs as $slug => $tab ) {
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
+		foreach ($nav_tabs as $slug => $tab) {
 			$all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
 		}
 		$all_tabs .= '</h2>';
@@ -122,13 +122,13 @@ 
 	 * @param bool|string $css If string given then the generated tab will include that as the class.
 	 * @return string          html for tab
 	 */
-	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE ) {
+	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE) {
 		$name = str_replace(' ', '-', $name);
 		$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-		$class = $css ? $class . ' ' . $css : $class;
-		$nice_name = $nice_name ? $nice_name : ucwords( preg_replace('/(-|_)/', ' ', $name) );
-		$url = $url ? $url : '#' . $name;
-		$tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+		$class = $css ? $class.' '.$css : $class;
+		$nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
+		$url = $url ? $url : '#'.$name;
+		$tab = '<a class="'.$class.'" rel="ee-tab-'.$name.'" href="'.$url.'">'.$nice_name.'</a>'."\n\t";
 		return $tab;
 	}
 
@@ -144,9 +144,9 @@ 
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {
 		$class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
-		$name = str_replace( ' ', '-', $name);
-		$content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-		$content .= "\t" . $tab_content . "\n";
+		$name = str_replace(' ', '-', $name);
+		$content = "\t".'<div class="'.$class.'" id="ee-tab-'.$name.'">'."\n";
+		$content .= "\t".$tab_content."\n";
 		$content .= '<div style="clear:both"></div></div>';
 		return $content;
 	}
@@ -172,9 +172,9 @@ 
 	 * @param string $default 			You can include a string for the item that will receive the "item_display" class for the js.
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
-	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		$item_array = apply_filters( 'FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class );
-		if ( !is_array($item_array) || empty( $item_array ) )
+	public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '') {
+		$item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
+		if ( ! is_array($item_array) || empty($item_array))
 			return false; //get out we don't have even the basic thing we need!
 
 
@@ -185,15 +185,15 @@ 
 			'title' => esc_attr__('Link for Item', 'event_espresso'),
 			'slug' => 'item_slug'
 		);
-		$container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-		$list = '<ul class="' . $container_class . '">';
+		$container_class = ! empty($container_class) ? 'ee-text-links '.$container_class : 'ee-text-links';
+		$list = '<ul class="'.$container_class.'">';
 
 		$ci = 1;
-		foreach ( $item_array as $item ) {
-			$item = wp_parse_args( $item, $defaults );
-			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+		foreach ($item_array as $item) {
+			$item = wp_parse_args($item, $defaults);
+			$item['class'] = ! empty($default) && $default == $item['slug'] ? 'item_display '.$item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
+			if ( ! empty($sep) && $ci != count($item_array))
 				$list .= self::_text_link_item($sep);
 			$ci++;
 		}
@@ -204,9 +204,9 @@ 
 
 
 
-	private static function _text_link_item( $item ) {
+	private static function _text_link_item($item) {
 		//if this isn't an array then we're doing a separator
-		if ( !is_array( $item ) ) {
+		if ( ! is_array($item)) {
 			$label = $item;
 			$class = 'ee-text-link-sep';
 			$href = '';
@@ -215,12 +215,12 @@ 
 			extract($item);
 		}
 
-		$class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+		$class = $class != 'ee-text-link-sep' ? 'class="ee-text-link-li '.$class.'"' : 'class="ee-text-link-sep"';
 
-		$content = '<li ' . $class . '>';
-		$content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+		$content = '<li '.$class.'>';
+		$content .= ! empty($href) ? '<a class="ee-text-link" href="#'.$href.'" title="'.$title.'">' : '';
 		$content .= $label;
-		$content .= !empty($href) ? '</a>' : '';
+		$content .= ! empty($href) ? '</a>' : '';
 		$content .= '</li>';
 		return $content;
 	}

core/helpers/EEH_Template.helper.php

Braces +19 added lines, -16 removed lines

@@ -160,8 +160,9 @@ 
 		// first use WP locate_template to check for template in the current theme folder
 		$template_path = locate_template( $templates );
 
-		if ( $check_if_custom && !empty( $template_path ) )
-			return TRUE;
+		if ( $check_if_custom && !empty( $template_path ) ) {
+					return TRUE;
+		}
 
 		// not in the theme
 		if ( empty( $template_path )) {
@@ -364,11 +365,11 @@ 
 				if( $mny->sign_b4 ){
 					if( $amount >= 0 ){
 						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
+					} else{
 						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
 					}
 
-				}else{
+				} else{
 					$amount_formatted =  $amount_formatted . $mny->sign;
 				}
 
@@ -432,11 +433,13 @@ 
 	 */
 	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page ) {
+					$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		}
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action ) {
+					$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		}
 
 		$action = empty($action) ? 'default' : $action;
 
@@ -510,8 +513,9 @@ 
 	 * @return string               html structure for status.
 	 */
 	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+		if ( !is_array( $status_array ) ) {
+					throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+		}
 
 		$setup_array = array();
 		foreach ( $status_array as $item => $status ) {
@@ -572,8 +576,7 @@ 
 				</tbody>
 			</table>
 			<?php
-		}
-		else {
+		} else {
 			?>
 			<ul>
 				<?php
@@ -583,8 +586,7 @@ 
 			</ul>
 			<?php
 		}
-	}
-	else {
+	} else {
 		//simple value
 		echo $data;
 	}
@@ -664,8 +666,9 @@ 
 
 		$total_pages = ceil( $total_items / $per_page );
 
-		if ( $total_pages <= 1 )
-			return '';
+		if ( $total_pages <= 1 ) {
+					return '';
+		}
 
 		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
 

Doc Comments +2 added lines, -2 removed lines

@@ -282,7 +282,7 @@ 
 	 *
 	 * given two paths, this determines if there is a common base path between the two
 	 *
-	 * @param array $paths
+	 * @param string[] $paths
 	 * @return string
 	 */
 	protected static function _find_common_base_path( $paths ) {
@@ -309,7 +309,7 @@ 
 	 * @param bool|string $template_path server path to the file to be loaded, including file name and extension
 	 * @param  array      $template_args an array of arguments to be extracted for use in the template
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
-	 * @return mixed string
+	 * @return string string
 	 */
 	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
 		//require the template validator for verifying variables are set according to how the template requires

Indentation +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
 				return array();
 			}
 			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+				unset( $espresso_themes[ $key ] );
 			}
 			EEH_Template::$_espresso_themes = array();
 			foreach ( $espresso_themes as $espresso_theme ) {
@@ -709,9 +709,9 @@ 
 		);
 
 		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+			 || ! is_array( $items_label )
+			 || ! isset( $items_label['single'] )
+			 || ! isset( $items_label['plural'] ) ) {
 			$items_label = array(
 				'single' => __( '1 item', 'event_espresso' ),
 				'plural' => __( '%s items', 'event_espresso' )

Spacing +202 added lines, -202 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,81 +210,81 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					// hook that can be used to display the full template path that will be used
-					do_action( 'AHEE__EEH_Template__locate_template__full_template_path', $template_path );
+					do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -297,21 +297,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -323,7 +323,7 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -334,26 +334,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -371,27 +371,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -407,50 +407,50 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
 		$amount = (float) $amount;
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -465,11 +465,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -482,9 +482,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -501,21 +501,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -527,31 +527,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -559,7 +559,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -580,31 +580,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h3>' . __('Status Legend', 'event_espresso') . '</h3>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h3>'.__('Status Legend', 'event_espresso').'</h3>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -617,8 +617,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	ob_start();
 	if (is_array($data)) {
@@ -631,10 +631,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -648,7 +648,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -678,8 +678,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -703,13 +703,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -717,68 +717,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -787,29 +787,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 
@@ -825,7 +825,7 @@ 
 //add_filter( 'FHEE__EEH_Template__format_currency__amount', 'convert_zero_to_free', 10, 2 );
 
 
-if ( ! function_exists( 'espresso_pagination' ) ) {
+if ( ! function_exists('espresso_pagination')) {
 	/**
 	 *    espresso_pagination
 	 *
@@ -837,21 +837,21 @@ 
 		$big = 999999999; // need an unlikely integer
 		$pagination = paginate_links(
 		array(
-		'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 		'format'       => '?paged=%#%',
-		'current'      => max( 1, get_query_var( 'paged' ) ),
+		'current'      => max(1, get_query_var('paged')),
 		'total'        => $wp_query->max_num_pages,
 		'show_all'     => true,
 		'end_size'     => 10,
 		'mid_size'     => 6,
 		'prev_next'    => true,
-		'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-		'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+		'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+		'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 		'type'         => 'plain',
 		'add_args'     => false,
 		'add_fragment' => ''
 		)
 		);
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 }
\ No newline at end of file

core/interfaces/EEI_Collection.interface.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -25,7 +25,7 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null );
+	public function add($object, $info = null);
 
 
 
@@ -39,7 +39,7 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null );
+	public function set_info($object, $info = null);
 
 
 
@@ -52,7 +52,7 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info );
+	public function get_by_info($info);
 
 
 
@@ -65,7 +65,7 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object );
+	public function has($object);
 
 
 
@@ -78,7 +78,7 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function remove( $object );
+	public function remove($object);
 
 
 

core/interfaces/EEI_Repository.interface.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -30,7 +30,7 @@ 
 	 * @return bool | int
 	 * @throws \EE_Error
 	 */
-	public function persist( $persistence_callback = '', $persistence_arguments = array() );
+	public function persist($persistence_callback = '', $persistence_arguments = array());
 
 
 
@@ -43,7 +43,7 @@ 
 	 * @param string $persistence_callback name of method found on object that can be used for persisting it
 	 * @return bool | int
 	 */
-	public function persist_all( $persistence_callback = '' );
+	public function persist_all($persistence_callback = '');
 
 	}
 // End of file EEI_Repository.interface.php

core/interfaces/line_items/EEI_Line_Item.interface.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EEI_Line_Item
@@ -18,7 +18,7 @@ 
 	 * @param    mixed  $field_value
 	 * @param bool      $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = false );
+	public function set($field_name, $field_value, $use_default = false);
 
 
 
@@ -56,7 +56,7 @@ 
 	 * Sets quantity
 	 * @param int $quantity
 	 */
-	function set_quantity( $quantity );
+	function set_quantity($quantity);
 
 
 
@@ -115,7 +115,7 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	function save_this_and_descendants_to_txn( $txn_id = null );
+	function save_this_and_descendants_to_txn($txn_id = null);
 
 
 
@@ -142,7 +142,7 @@ 
 	 * @param bool         $set_order
 	 * @return bool true for success, false for fail
 	 */
-	function add_child_line_item( EEI_Line_Item $line_item, $set_order = true );
+	function add_child_line_item(EEI_Line_Item $line_item, $set_order = true);
 
 
 
@@ -197,14 +197,14 @@ 
 	 * @param float $total
 	 * @return boolean
 	 */
-	function set_total( $total );
+	function set_total($total);
 
 	/**
 	 * Sets unit_price
 	 * @param float $unit_price
 	 * @return boolean
 	 */
-	function set_unit_price( $unit_price );
+	function set_unit_price($unit_price);
 
 	/**
 	 * If this line item has been saved to the DB, deletes its child with LIN_code == $code. If this line
@@ -215,7 +215,7 @@ 
 	 * @param bool $stop_search_once_found
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	function delete_child_line_item( $code, $stop_search_once_found = true );
+	function delete_child_line_item($code, $stop_search_once_found = true);
 
 	/**
 	 * Forgets the cached model of the given relation Name. So the next time we request it,
@@ -238,7 +238,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	function set_allow_persist( $allow_persist );
+	function set_allow_persist($allow_persist);
 
 
 }