Inspection of "Daily Inspection: remove debug code; [touch:10381]" - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — BUG-10381-asset-loading (f91422)

unknown

created 2017-01-18 21:12 UTC

Status

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,9 +21,12 @@
 block discarded – undo
 	<title><?php echo $title; ?></title>
 <?php if ( $enqueue_wp_assets ) : ?>
 	<?php wp_head(); ?>
-<?php else : ?>
+<?php else {
+	: ?>
 	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<link rel="stylesheet" type="text/css" href="<?php echo $url;
+}
+?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -19,16 +19,16 @@  discard block
 block discarded – undo
 <html>
 <head>
 	<title><?php echo $title; ?></title>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_head(); ?>
 <?php else : ?>
-	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<?php foreach ($css as $url) : ?>
+	<link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>
 	</script>
-	<?php foreach ( $header_js as $url ) : ?>
+	<?php foreach ($header_js as $url) : ?>
 		<script type="text/javascript" src="<?php echo $url; ?>"></script>
 	<?php endforeach; ?>
 <?php endif; ?>
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
     <div style="padding: 1em;">
         <?php echo $content; ?>
     </div>
-    <?php foreach ( $footer_js as $url ) : ?>
+    <?php foreach ($footer_js as $url) : ?>
 		<script type="text/javascript" src="<?php echo $url; ?>"></script>
 	<?php endforeach; ?>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_footer(); ?>
 <?php endif; ?>
 </body>

Please login to merge, or discard this patch.

core/helpers/EEH_Inflector.helper.php 3 patches

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -52,7 +52,7 @@  discard block
 block discarded – undo
 
     /**
      * @param string $word
-     * @return mixed
+     * @return string
      */
     public static function singularize_and_upper( $word ) {
 		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
 
 
     /**
-     * @param $string
+     * @param string $string
      * @return string
      */
     public static function add_indefinite_article($string) {

Please login to merge, or discard this patch.

Indentation +334 added lines, -334 removed lines patch added patch discarded remove patch

@@ -35,357 +35,357 @@
 block discarded – undo
  * @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
 	 * @param string $word
 	 * @return string
 	 */
-    public static function pluralize_and_lower( $word ){
+	public static function pluralize_and_lower( $word ){
 		return strtolower( self::pluralize( $word ) );
 	}
 
 
 
-    /**
-     * @param string $word
-     * @return mixed
-     */
-    public static function singularize_and_upper( $word ) {
+	/**
+	 * @param string $word
+	 * @return mixed
+	 */
+	public 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
-     */
-    public 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
+	 */
+	public 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.
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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.
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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.
-     */
-    public 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;
-            }
-        }
-    }
-
-
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public static function add_indefinite_article($string) {
-        if (strtolower($string) === 'null') {
-            return $string;
-        }
-        return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
-    }
+		$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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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.
+	 */
+	public 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;
+			}
+		}
+	}
+
+
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public static function add_indefinite_article($string) {
+		if (strtolower($string) === 'null') {
+			return $string;
+		}
+		return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
  * @since 0.1
  * @version $Revision 0.1 $
  */
-class EEH_Inflector{
+class EEH_Inflector {
     // ------ CLASS METHODS ------ //
     // ---- Public methods ---- //
     // {{{ pluralize()
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
 	 * @param string $word
 	 * @return string
 	 */
-    public static function pluralize_and_lower( $word ){
-		return strtolower( self::pluralize( $word ) );
+    public static function pluralize_and_lower($word) {
+		return strtolower(self::pluralize($word));
 	}
 
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
      * @param string $word
      * @return mixed
      */
-    public static function singularize_and_upper( $word ) {
-		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
+    public static function singularize_and_upper($word) {
+		return str_replace(' ', '_', self::humanize(self::singularize($word), 'all'));
 	}
 
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
      * @param    string    $word    English noun to pluralize
      * @return string Plural noun
      */
-    public static function pluralize($word){
+    public static function pluralize($word) {
         $plural = array(
             '/(quiz)$/i'               => '\1zes',
             '/^(ox)$/i'                => '\1en',
@@ -100,21 +100,21 @@  discard block
 block discarded – undo
 
         $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);
             }
         }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
      * @param    string    $word    English noun to singularize
      * @return string Singular noun.
      */
-    public static function singularize($word){
+    public static function singularize($word) {
         $singular = array(
             '/(quiz)zes$/i'                                                    => '\1',
             '/(matr)ices$/i'                                                   => '\1ix',
@@ -170,20 +170,20 @@  discard block
 block discarded – undo
             '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);
             }
         }
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
      * the words in the title.
      * @return string Text formatted as title
      */
-    public static function titleize($word, $uppercase = ''){
+    public static function titleize($word, $uppercase = '') {
         $uppercase = $uppercase === 'first' ? 'ucfirst' : 'ucwords';
         return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
     }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
      * @param    string    $word    Word to convert to camel case
      * @return string UpperCamelCasedWord
      */
-    public static function camelize($word){
+    public static function camelize($word) {
         return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
     }
 
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
      * @param    string    $word    Word to underscore
      * @return string Underscored word
      */
-    public static function underscore($word){
+    public 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))));
     }
 
@@ -277,9 +277,9 @@  discard block
 block discarded – undo
      * instead of just the first one.
      * @return string Human-readable word
      */
-    public static function humanize($word, $uppercase = ''){
+    public 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)));
     }
@@ -300,9 +300,9 @@  discard block
 block discarded – undo
      * @param    string    $word    Word to lowerCamelCase
      * @return string Returns a lowerCamelCasedWord
      */
-    public static function variablize($word){
+    public static function variablize($word) {
         $word = EEH_Inflector::camelize($word);
-        return strtolower($word[0]) . substr($word, 1);
+        return strtolower($word[0]).substr($word, 1);
     }
 
     // }}}
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
      * @param    string    $class_name    Class name for getting related table_name.
      * @return string plural_table_name
      */
-    public static function tableize($class_name){
+    public static function tableize($class_name) {
         return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
     }
 
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
      * @param    string    $table_name    Table name for getting related ClassName.
      * @return string SingularClassName
      */
-    public static function classify($table_name){
+    public static function classify($table_name) {
         return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
     }
 
@@ -356,21 +356,21 @@  discard block
 block discarded – undo
      * @param    integer    $number    Number to get its ordinal value
      * @return string Ordinal representation of given string.
      */
-    public static function ordinalize($number){
-        if(in_array(($number % 100), range(11, 13))){
-            return $number . 'th';
-        }else{
-            switch(($number % 10)){
+    public 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;
             }
         }
@@ -386,6 +386,6 @@  discard block
 block discarded – undo
         if (strtolower($string) === 'null') {
             return $string;
         }
-        return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
+        return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ').$string;
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

modules/events_archive/EED_Events_Archive.module.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,8 @@
 block discarded – undo
 <?php use EventEspresso\core\interfaces\ResettableInterface;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Please login to merge, or discard this patch.

Spacing +178 added lines, -178 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 use EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton;
 use EventEspresso\modules\events_archive\EventsArchiveIframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * Event Espresso
  *
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 	 * @return EED_Events_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run' );
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
-		EE_Config::register_route( 'iframe', 'Events_Archive', 'event_list_iframe', 'event_list' );
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		EE_Config::register_route(EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run');
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
+		EE_Config::register_route('iframe', 'Events_Archive', 'event_list_iframe', 'event_list');
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 	/**
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 		// hook into the end of the \EE_Admin_Page::_load_page_dependencies()
 		// to load assets for "espresso_events" page on the "default" route (action)
 		add_action(
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__default',
-			array( 'EED_Events_Archive', 'event_list_iframe_embed_button' ),
+			array('EED_Events_Archive', 'event_list_iframe_embed_button'),
 			10
 		);
 	}
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -107,10 +107,10 @@  discard block
 block discarded – undo
 	/**
 	 * set up EE_Events_Archive_Config
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Events_Archive_Config' );
-		$this->set_config_name( 'EED_Events_Archive' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Events_Archive_Config');
+		$this->set_config_name('EED_Events_Archive');
 	}
 
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 	 * @return EventListIframeEmbedButton
 	 */
 	public static function get_iframe_embed_button() {
-		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton ) {
+		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton) {
 			self::$_iframe_embed_button = new EventListIframeEmbedButton();
 		}
 		return self::$_iframe_embed_button;
@@ -145,35 +145,35 @@  discard block
 block discarded – undo
 	 * @param \EE_Events_Archive_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Events_Archive_Config $config = null ) {
+	public function initialize_template_parts(EE_Events_Archive_Config $config = null) {
 		$config = $config instanceof EE_Events_Archive_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Archive__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Archive__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
-		do_action( 'AHEE__EED_Events_Archive__before_run' );
+	public function run($WP) {
+		do_action('AHEE__EED_Events_Archive__before_run');
 		// ensure valid EE_Events_Archive_Config() object exists
 		$this->set_config();
 		/** @type EE_Events_Archive_Config $config */
@@ -199,14 +199,14 @@  discard block
 block discarded – undo
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
 		EEH_Event_Query::set_query_params(
-			'', 	// month
-			'', 	// category
-			$config->display_expired_events, 	// show_expired
-			'start_date', 	// orderby
+			'', // month
+			'', // category
+			$config->display_expired_events, // show_expired
+			'start_date', // orderby
 			'ASC' 	// sort
 		);
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
 	}
 
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
 	 * @throws \EE_Error
 	 */
 	public function event_list_iframe() {
-		$event_list_iframe = new EventsArchiveIframe( $this );
+		$event_list_iframe = new EventsArchiveIframe($this);
 		$event_list_iframe->display();
 	}
 
@@ -250,32 +250,32 @@  discard block
 block discarded – undo
 	 * @param string $template
 	 * @return    string
 	 */
-	public function template_include( $template = '' ) {
+	public function template_include($template = '') {
 		// don't add content filter for dedicated EE child themes or private posts
-		if ( ! EEH_Template::is_espresso_theme() ) {
+		if ( ! EEH_Template::is_espresso_theme()) {
 			/** @type EE_Events_Archive_Config $config */
 			$config = $this->config();
 			// add status banner ?
-			if ( $config->display_status_banner ) {
-				add_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100, 2 );
+			if ($config->display_status_banner) {
+				add_filter('the_title', array('EED_Events_Archive', 'the_title'), 100, 2);
 			}
 			// if NOT a custom template
 			if (
-				EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php'
-				|| apply_filters( 'FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE )
+				EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php'
+				|| apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE)
 			) {
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
+				add_filter('FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true');
 			// load functions.php file for the theme (loaded by WP if using child theme)
 				EEH_Template::load_espresso_theme_functions();
 				// because we don't know if the theme is using the_excerpt()
-				add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// or the_content
-				add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// and just in case they are running get_the_excerpt() which DESTROYS things
-				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+				add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+				add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 			}
 		}
 		return $template;
@@ -290,17 +290,17 @@  discard block
 block discarded – undo
 	 * 	@param		string 	$excerpt
 	 * 	@return 		string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
-		if ( post_password_required() ) {
+	public static function get_the_excerpt($excerpt = '') {
+		if (post_password_required()) {
 			return $excerpt;
 		}
-		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
-			remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
+		if (apply_filters('FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false)) {
+			remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+			remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+			$excerpt = EED_Events_Archive::event_details($excerpt);
 		} else {
 			EED_Events_Archive::$using_get_the_excerpt = true;
-			add_filter( 'wp_trim_excerpt', array( 'EED_Events_Archive', 'end_get_the_excerpt' ), 999, 1 );
+			add_filter('wp_trim_excerpt', array('EED_Events_Archive', 'end_get_the_excerpt'), 999, 1);
 		}
 		return $excerpt;
 	}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Events_Archive::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
 	 * @param 		string 		$id
 	 * @return 		string
 	 */
-	public static function the_title( $title = '', $id = '' ) {
+	public static function the_title($title = '', $id = '') {
 	global $post;
-	if ( $post instanceof WP_Post ) {
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID  ) . $title :  $title;
+	if ($post instanceof WP_Post) {
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 	return $title;
 }
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
 	 * 	@param		string 	$content
 	 * 	@return 		string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -355,8 +355,8 @@  discard block
 block discarded – undo
 			&& ! EED_Events_Archive::$using_get_the_excerpt
 			&& ! post_password_required()
 			&& (
-				apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', false )
-				|| ! apply_filters( 'FHEE__content_espresso_events__template_loaded', false )
+				apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', false)
+				|| ! apply_filters('FHEE__content_espresso_events__template_loaded', false)
 			)
 		) {
 			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
@@ -365,8 +365,8 @@  discard block
 block discarded – undo
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order) {
 				$content = \EED_Events_Archive::use_sortable_display_order();
 			} else {
 				$content = \EED_Events_Archive::use_filterable_display_order();
@@ -385,20 +385,20 @@  discard block
 block discarded – undo
 	 */
 	protected static function use_sortable_display_order() {
 		// no further password checks required atm
-		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		// we need to first remove this callback from being applied to the_content() or the_excerpt() (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
+		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters($content);
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
-		remove_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
+		remove_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		return $content;
 	}
 
@@ -413,22 +413,22 @@  discard block
 block discarded – undo
 	protected static function use_filterable_display_order() {
 		// we need to first remove this callback from being applied to the_content()
 		// (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::_add_additional_excerpt_filters();
 		EED_Events_Archive::_add_additional_content_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 		// but remove the other filters so that they don't get applied to the next post
 		EED_Events_Archive::_remove_additional_events_archive_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters');
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		//return ! empty( $template ) ? $template : $content;
 		return $content;
@@ -443,11 +443,11 @@  discard block
 block discarded – undo
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_datetimes( $content ) {
-		if ( post_password_required() ) {
+	public static function event_datetimes($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 	/**
@@ -457,11 +457,11 @@  discard block
 block discarded – undo
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_tickets( $content ) {
-		if ( post_password_required() ) {
+	public static function event_tickets($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -473,8 +473,8 @@  discard block
 block discarded – undo
 	 * @param    string $content
 	 * @return    string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Events_Archive::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Events_Archive::event_venues($content);
 	}
 
 	/**
@@ -484,11 +484,11 @@  discard block
 block discarded – undo
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_venues( $content ) {
-		if ( post_password_required() ) {
+	public static function event_venues($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -500,9 +500,9 @@  discard block
 block discarded – undo
 	 * @return        void
 	 */
 	private static function _add_additional_excerpt_filters() {
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -514,9 +514,9 @@  discard block
 block discarded – undo
 	 * @return        void
 	 */
 	private static function _add_additional_content_filters() {
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -528,12 +528,12 @@  discard block
 block discarded – undo
 	 * @return        void
 	 */
 	private static function _remove_additional_events_archive_filters() {
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 	}
 
 
@@ -546,17 +546,17 @@  discard block
 block discarded – undo
 	 */
 	public static function remove_all_events_archive_filters() {
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
-		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 		// don't display entry meta because the existing theme will take care of that
-		remove_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+		remove_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 	}
 
 
@@ -571,12 +571,12 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public function load_event_list_assets() {
-		do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive__before_load_assets');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
 	}
 
@@ -593,13 +593,13 @@  discard block
 block discarded – undo
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			if ( EEH_File::is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+			if (EEH_File::is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			} else {
 		}
-		wp_enqueue_style( $this->theme );
+		wp_enqueue_style($this->theme);
 
 	}
 }
@@ -617,8 +617,8 @@  discard block
 block discarded – undo
 	 */
 	public static function template_settings_form() {
 	$template_settings = EE_Registry::instance()->CFG->template_settings;
-	$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
-	$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
+	$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
+	$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
 	$events_archive_settings = array(
 		'display_status_banner' => 0,
 		'display_description' => 1,
@@ -627,8 +627,8 @@  discard block
 block discarded – undo
 		'display_venue' => 0,
 		'display_expired_events' => 0
 	);
-	$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
-	EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
+	$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
+	EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
 }
 
 
@@ -644,16 +644,16 @@  discard block
 block discarded – undo
 	 *  @param 	EE_Request_Handler $REQ
 	 *  @return 	EE_Template_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
 		return $CFG;
 	}
 
@@ -666,10 +666,10 @@  discard block
 block discarded – undo
 	 * @param string $extra_class
 	 * @return    string
 	 */
-	public static function event_list_css( $extra_class = '' ) {
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+	public static function event_list_css($extra_class = '') {
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		return implode( ' ', $event_list_css );
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -696,9 +696,9 @@  discard block
 block discarded – undo
 	 * @param $value
 	 * @return    bool
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		$display_description= isset( $config->display_description ) ? $config->display_description : 1;
+		$display_description = isset($config->display_description) ? $config->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
 	 */
 	public static function display_ticket_selector() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_ticket_selector ) && $config->display_ticket_selector ? TRUE : FALSE;
+		return isset($config->display_ticket_selector) && $config->display_ticket_selector ? TRUE : FALSE;
 	}
 
 
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
 	 */
 	public static function display_venue() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_venue ) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
+		return isset($config->display_venue) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
 	}
 
 
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
 	 */
 	public static function display_datetimes() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_datetimes ) && $config->display_datetimes ? TRUE : FALSE;
+		return isset($config->display_datetimes) && $config->display_datetimes ? TRUE : FALSE;
 }
 
 
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
 	 *  @return 	string
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
 	}
 
 
@@ -760,11 +760,11 @@  discard block
 block discarded – undo
 	/**
 	 * 	@since 4.4.0
 	 */
-	public static function _doing_it_wrong_notice( $function = '' ) {
+	public static function _doing_it_wrong_notice($function = '') {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				__( 'EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso' ),
+				__('EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso'),
 				$function,
 				'<br />',
 				'4.6.0'
@@ -786,89 +786,89 @@  discard block
 block discarded – undo
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields( $SQL, $wp_query );
+	public function posts_fields($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields_sql_for_orderby( $orderby_params );
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields_sql_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join( $SQL, $wp_query );
+	public function posts_join($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_sql_for_terms( $join_terms );
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_sql_for_terms($join_terms);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	public static function posts_join_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where( $SQL, $wp_query );
+	public function posts_where($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_show_expired( $show_expired );
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_show_expired($show_expired);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_category_slug( $event_category_slug );
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_category_slug($event_category_slug);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_list_month( $month );
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_list_month($month);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby( $SQL, $wp_query );
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby_sql( $orderby_params, $sort );
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby_sql($orderby_params, $sort);
 	}
 
 
@@ -899,8 +899,8 @@  discard block
 block discarded – undo
  * @param string $extra_class
  * @return string
  */
-function espresso_event_list_css( $extra_class = '' ) {
-	return EED_Events_Archive::event_list_css( $extra_class );
+function espresso_event_list_css($extra_class = '') {
+	return EED_Events_Archive::event_list_css($extra_class);
 }
 
 /**
@@ -914,14 +914,14 @@  discard block
 block discarded – undo
  * @return bool
  */
 function espresso_display_full_description_in_event_list() {
-	return EED_Events_Archive::display_description( 2 );
+	return EED_Events_Archive::display_description(2);
 }
 
 /**
  * @return bool
  */
 function espresso_display_excerpt_in_event_list() {
-	return EED_Events_Archive::display_description( 1 );
+	return EED_Events_Archive::display_description(1);
 }
 
 /**

Please login to merge, or discard this patch.

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -37,19 +37,19 @@  discard block
 block discarded – undo
 	 */
 	protected static $using_get_the_excerpt = false;
 
-    /**
-     * Used to flag when the event list is being called from an external iframe.
-     *
-     * @var bool $iframe
-     */
-    protected static $iframe = false;
-
-    /**
+	/**
+	 * Used to flag when the event list is being called from an external iframe.
+	 *
+	 * @var bool $iframe
+	 */
+	protected static $iframe = false;
+
+	/**
 	 * @var \EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton $_iframe_embed_button
 	 */
 	private static $_iframe_embed_button;
 
-    /**
+	/**
 	 * @type EE_Template_Part_Manager $template_parts
 	 */
 	protected $template_parts;
@@ -233,26 +233,26 @@  discard block
 block discarded – undo
 
 
 
-    /**
-     * @access    public
-     * @return    void
-     * @throws \EE_Error
-     * @throws \DomainException
-     */
+	/**
+	 * @access    public
+	 * @return    void
+	 * @throws \EE_Error
+	 * @throws \DomainException
+	 */
 	public function event_list_iframe() {
-        \EED_Events_Archive::$iframe = true;
+		\EED_Events_Archive::$iframe = true;
 		$event_list_iframe = new EventsArchiveIframe( $this );
 		$event_list_iframe->display();
 	}
 
 
 
-    /**
-     * @access public
-     * @return string
-     */
+	/**
+	 * @access public
+	 * @return string
+	 */
 	public static function link_target() {
-        return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
+		return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
 	}
 
 

Please login to merge, or discard this patch.

core/EE_Load_Espresso_Core.core.php 1 patch

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
 	 */
 	public function __construct() {
 		// deprecated functions
-		espresso_load_required( 'EventEspresso\core\Factory', EE_CORE . 'Factory.php' );
+		espresso_load_required('EventEspresso\core\Factory', EE_CORE.'Factory.php');
 	}
 
 
@@ -68,16 +68,16 @@  discard block
 block discarded – undo
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// info about how to load classes required by other classes
 		$this->dependency_map = $this->_load_dependency_map();
 		// central repository for classes
 		$this->registry = $this->_load_registry();
-		do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading' );
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
 		// PSR4 Autoloaders
-		$this->registry->load_core( 'EE_Psr4AutoloaderInit' );
+		$this->registry->load_core('EE_Psr4AutoloaderInit');
 		// build DI container
 		$OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
 		$OpenCoffeeShop->addRecipes();
@@ -87,20 +87,20 @@  discard block
 block discarded – undo
 			'CommandBusInterface',
 			array(
 				null,
-				$this->registry->create( 'CapChecker' )
+				$this->registry->create('CapChecker')
 			),
 			true
 		);
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// WP cron jobs
-		$this->registry->load_core( 'Cron_Tasks' );
-		$this->registry->load_core( 'EE_Request_Handler' );
-		$this->registry->load_core( 'EE_System' );
+		$this->registry->load_core('Cron_Tasks');
+		$this->registry->load_core('EE_Request_Handler');
+		$this->registry->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -148,11 +148,11 @@  discard block
 block discarded – undo
 	 * @throws \EE_Error
 	 */
 	public function registry() {
-		if ( ! $this->registry instanceof EE_Registry ) {
+		if ( ! $this->registry instanceof EE_Registry) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
-					print_r( $this->registry, true )
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
 				)
 			);
 		}
@@ -168,15 +168,15 @@  discard block
 block discarded – undo
 	 * 	@return EE_Dependency_Map
 	 */
 	private function _load_dependency_map() {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
-		return EE_Dependency_Map::instance( $this->request, $this->response );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($this->request, $this->response);
 	}
 
 
@@ -188,15 +188,15 @@  discard block
 block discarded – undo
 	 * 	@return EE_Registry
 	 */
 	private function _load_registry() {
-		if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
+		if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Registry.core.php' );
-		return EE_Registry::instance( $this->dependency_map );
+		require_once(EE_CORE.'EE_Registry.core.php');
+		return EE_Registry::instance($this->dependency_map);
 	}
 
 
@@ -207,13 +207,13 @@  discard block
 block discarded – undo
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
+		if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 	}
 
 
@@ -227,13 +227,13 @@  discard block
 block discarded – undo
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

Please login to merge, or discard this patch.

caffeinated/modules/recaptcha/EED_Recaptcha.module.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -102,8 +102,8 @@
 block discarded – undo
 		// use_captcha ?
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
-            && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
-            && ! (
+			&& EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
+			&& ! (
 				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
 				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
 			)

Please login to merge, or discard this patch.

Spacing +131 added lines, -132 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 	 * @return EED_Recaptcha
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -59,32 +59,32 @@  discard block
 block discarded – undo
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
 			&& ! (
-				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
-				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
+				EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
+				&& (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
 			)
 		) {
 			EED_Recaptcha::set_definitions();
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_action( 'wp', array( 'EED_Recaptcha', 'set_late_hooks' ), 1, 0 );
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
 			add_action(
 				'AHEE__before_spco_whats_next_buttons',
-				array( 'EED_Recaptcha', 'display_recaptcha' ), 10, 0
+				array('EED_Recaptcha', 'display_recaptcha'), 10, 0
 			);
 			add_filter(
 				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-				array( 'EED_Recaptcha', 'not_a_robot' ), 10
+				array('EED_Recaptcha', 'not_a_robot'), 10
 			);
 			add_filter(
 				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-				array( 'EED_Recaptcha', 'not_a_robot' ), 10
+				array('EED_Recaptcha', 'not_a_robot'), 10
 			);
 			add_filter(
 				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-				array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1
+				array('EED_Recaptcha', 'recaptcha_response'), 10, 1
 			);
 			add_filter(
 				'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-				array( 'EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method' ), 10, 1
+				array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method'), 10, 1
 			);
 		}
 	}
@@ -102,20 +102,20 @@  discard block
 block discarded – undo
 		// use_captcha ?
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
-            && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
+            && EE_Registry::instance()->REQ->get('step', '') !== ''
             && ! (
-				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
-				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
+				EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
+				&& (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
 			)
 		) {
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
 		}
 		// admin settings
-		add_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array( 'EED_Recaptcha', 'admin_settings' ), 10, 1 );
-		add_filter( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array( 'EED_Recaptcha', 'update_admin_settings' ), 10, 1 );
+		add_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array('EED_Recaptcha', 'admin_settings'), 10, 1);
+		add_filter('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array('EED_Recaptcha', 'update_admin_settings'), 10, 1);
 	}
 
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			EED_Recaptcha::$_not_a_robot = true;
 		}
-		define( 'RECAPTCHA_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'RECAPTCHA_BASE_URL', plugin_dir_url( __FILE__ ));
+		define('RECAPTCHA_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
 	}
 
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 	public static function set_late_hooks() {
 		add_filter(
 			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
-			array( 'EED_Recaptcha', 'not_a_robot' )
+			array('EED_Recaptcha', 'not_a_robot')
 		);
 	}
 
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function enqueue_styles_and_scripts() {
-		wp_register_script( 'espresso_recaptcha', RECAPTCHA_BASE_URL . 'scripts' . DS . 'espresso_recaptcha.js', array( 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl=' . EE_Registry::instance()->CFG->registration->recaptcha_language, array( 'espresso_recaptcha' ), EVENT_ESPRESSO_VERSION, TRUE );
-		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __( 'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __( 'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __( 'Please complete the anti-spam test before proceeding.', 'event_espresso' );
+		wp_register_script('espresso_recaptcha', RECAPTCHA_BASE_URL.'scripts'.DS.'espresso_recaptcha.js', array('single_page_checkout'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl='.EE_Registry::instance()->CFG->registration->recaptcha_language, array('espresso_recaptcha'), EVENT_ESPRESSO_VERSION, TRUE);
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __('It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __('There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __('Please complete the anti-spam test before proceeding.', 'event_espresso');
 	}
 
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -183,8 +183,7 @@  discard block
 block discarded – undo
 	 *  @return boolean
 	 */
 	public static function not_a_robot() {
-		$not_a_robot = is_bool( EED_Recaptcha::$_not_a_robot ) ? EED_Recaptcha::$_not_a_robot :
-			EED_Recaptcha::recaptcha_passed();
+		$not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot) ? EED_Recaptcha::$_not_a_robot : EED_Recaptcha::recaptcha_passed();
 		return $not_a_robot;
 	}
 
@@ -200,22 +199,22 @@  discard block
 block discarded – undo
 	 */
 	public static function display_recaptcha() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return;
 		}
 		// don't display if not using recaptcha or user is logged in
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
 			// only display if they have NOT passed the test yet
-			if ( ! EED_Recaptcha::$_not_a_robot ) {
+			if ( ! EED_Recaptcha::$_not_a_robot) {
 				EEH_Template::display_template(
-					RECAPTCHA_BASE_PATH . DS . 'templates' . DS . 'recaptcha.template.php',
+					RECAPTCHA_BASE_PATH.DS.'templates'.DS.'recaptcha.template.php',
 					array(
 						'recaptcha_publickey' 	=> EE_Registry::instance()->CFG->registration->recaptcha_publickey,
 						'recaptcha_theme' 		=> EE_Registry::instance()->CFG->registration->recaptcha_theme,
 						'recaptcha_type' 			=> EE_Registry::instance()->CFG->registration->recaptcha_type
 					)
 				);
-				wp_enqueue_script( 'google_recaptcha' );
+				wp_enqueue_script('google_recaptcha');
 			}
 		}
 	}
@@ -246,17 +245,17 @@  discard block
 block discarded – undo
 	 */
 	public static function recaptcha_passed() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha() ) {
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
 			return TRUE;
 		}
 		// was test already passed?
-		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data( 'recaptcha_passed' );
-		$recaptcha_passed = filter_var( $recaptcha_passed, FILTER_VALIDATE_BOOLEAN );
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
 		// verify recaptcha
 		EED_Recaptcha::_get_recaptcha_response();
-		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response ) {
+		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
 			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
-			EE_Registry::instance()->SSN->set_session_data( array( 'recaptcha_passed' => $recaptcha_passed ));
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
 			EE_Registry::instance()->SSN->update();
 		}
 		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
@@ -272,8 +271,8 @@  discard block
 block discarded – undo
 	 * @param array $recaptcha_response
 	 * @return boolean
 	 */
-	public static function recaptcha_response( $recaptcha_response = array() ) {
-		if ( EED_Recaptcha::_bypass_recaptcha() ) {
+	public static function recaptcha_response($recaptcha_response = array()) {
+		if (EED_Recaptcha::_bypass_recaptcha()) {
 			$recaptcha_response['bypass_recaptcha'] = TRUE;
 			$recaptcha_response['recaptcha_passed'] = TRUE;
 		} else {
@@ -293,16 +292,16 @@  discard block
 block discarded – undo
 	 */
 	private static function _bypass_recaptcha() {
 		// an array of key value pairs that must match exactly with the incoming request, in order to bypass recaptcha for the current request ONLY
-		$bypass_request_params_array = apply_filters( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array() );
+		$bypass_request_params_array = apply_filters('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array());
 		// does $bypass_request_params_array have any values ?
-		if ( empty( $bypass_request_params_array )) {
+		if (empty($bypass_request_params_array)) {
 			return FALSE;
 		}
 		// initially set bypass to TRUE
 		$bypass_recaptcha = TRUE;
-		foreach ( $bypass_request_params_array as $key => $value ) {
+		foreach ($bypass_request_params_array as $key => $value) {
 			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE, otherwise carry over it's value. This way, one missed setting results in no bypass
-			$bypass_recaptcha = isset( $_REQUEST[ $key ] ) && $_REQUEST[ $key ] === $value ? $bypass_recaptcha : FALSE;
+			$bypass_recaptcha = isset($_REQUEST[$key]) && $_REQUEST[$key] === $value ? $bypass_recaptcha : FALSE;
 		}
 		return $bypass_recaptcha;
 	}
@@ -317,7 +316,7 @@  discard block
 block discarded – undo
 	 * 	@return 	boolean
 	 */
 	private static function _get_recaptcha_response() {
-		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
+		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get('g-recaptcha-response', false);
 	}
 
 
@@ -331,26 +330,26 @@  discard block
 block discarded – undo
 	 */
 	private static function _process_recaptcha_response() {
 		// verify library is loaded
-		if ( ! class_exists( '\\ReCaptcha\\ReCaptcha' )) {
-			require_once( RECAPTCHA_BASE_PATH . DS . 'autoload.php' );
+		if ( ! class_exists('\\ReCaptcha\\ReCaptcha')) {
+			require_once(RECAPTCHA_BASE_PATH.DS.'autoload.php');
 		}
 		// The response from reCAPTCHA
 		EED_Recaptcha::_get_recaptcha_response();
 		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
 		// Was there a reCAPTCHA response?
-		if ( $recaptcha_response ) {
+		if ($recaptcha_response) {
 			// if allow_url_fopen is Off, then set a different request method
-			$request_method = ! ini_get( 'allow_url_fopen' ) ? new \ReCaptcha\RequestMethod\SocketPost() : null;
+			$request_method = ! ini_get('allow_url_fopen') ? new \ReCaptcha\RequestMethod\SocketPost() : null;
 			$recaptcha = new \ReCaptcha\ReCaptcha(
 				EE_Registry::instance()->CFG->registration->recaptcha_privatekey,
 				$request_method
 			);
 			$recaptcha_response = $recaptcha->verify(
 				EED_Recaptcha::$_recaptcha_response,
-				$_SERVER[ 'REMOTE_ADDR' ]
+				$_SERVER['REMOTE_ADDR']
 			);
 		}
-		if ( $recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess() ) {
+		if ($recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess()) {
 			return TRUE;
 		}
 		// sorry... it appears you can't don't know what soup or hamburgers are !!!
@@ -394,12 +393,12 @@  discard block
 block discarded – undo
 				'subsections' 			=> apply_filters(
 					'FHEE__EED_Recaptcha___recaptcha_settings_form__form_subsections',
 					array(
-						'main_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Anti-spam Settings', 'event_espresso' ) . EEH_Template::get_help_tab_link( 'recaptcha_info' ))),
+						'main_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Anti-spam Settings', 'event_espresso').EEH_Template::get_help_tab_link('recaptcha_info'))),
 						'main_settings' 						=> EED_Recaptcha::_recaptcha_main_settings(),
-						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Appearance', 'event_espresso' ) )),
+						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Appearance', 'event_espresso'))),
 						'appearance_settings' 			=> EED_Recaptcha::_recaptcha_appearance_settings(),
 						// 'recaptcha_example' 				=> new EE_Form_Section_HTML( EED_Recaptcha::display_recaptcha() ),
-						'required_fields_note' 			=> new EE_Form_Section_HTML( EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' ))
+						'required_fields_note' 			=> new EE_Form_Section_HTML(EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text'))
 					)
 				)
 			)
@@ -426,28 +425,28 @@  discard block
 block discarded – undo
 					array(
 						'use_captcha' 				=> new EE_Yes_No_Input(
 							array(
-								'html_label_text'	 	=> __( 'Use reCAPTCHA', 'event_espresso' ),
+								'html_label_text'	 	=> __('Use reCAPTCHA', 'event_espresso'),
 								'html_help_text' 		=> sprintf(
-									__( 'reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso' ),
+									__('reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso'),
 									'<a href="https://www.google.com/recaptcha/intro/index.html">',
 									'</a>'
 								),
-								'default' 								=> isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
+								'default' 								=> isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
 								'display_html_label_text' 	=> FALSE
 							)
 						),
 						'recaptcha_publickey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Site Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The site key is used to display the widget on your site.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : ''
+								'html_label_text'	 	=> __('Site Key', 'event_espresso'),
+								'html_help_text' 		=> __('The site key is used to display the widget on your site.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : ''
 							)
 						),
 						'recaptcha_privatekey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Secret Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : ''
+								'html_label_text'	 	=> __('Secret Key', 'event_espresso'),
+								'html_help_text' 		=> __('The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : ''
 							)
 						)
 					)
@@ -479,81 +478,81 @@  discard block
 block discarded – undo
 					array(
 						'recaptcha_theme' 		=> new EE_Radio_Button_Input(
 							array(
-								'light' => __( 'Light', 'event_espresso' ),
-								'dark' => __( 'Dark', 'event_espresso' )
+								'light' => __('Light', 'event_espresso'),
+								'dark' => __('Dark', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Theme', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The color theme of the widget.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
+								'html_label_text'	 	=> __('Theme', 'event_espresso'),
+								'html_help_text' 		=> __('The color theme of the widget.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
 								'display_html_label_text' => FALSE
 							)
 						),
 						'recaptcha_type' 		=> new EE_Radio_Button_Input(
 							array(
-								'image' => __( 'Image', 'event_espresso' ),
-								'audio' => __( 'Audio', 'event_espresso' )
+								'image' => __('Image', 'event_espresso'),
+								'audio' => __('Audio', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Type', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The type of CAPTCHA to serve.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_type ) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
+								'html_label_text'	 	=> __('Type', 'event_espresso'),
+								'html_help_text' 		=> __('The type of CAPTCHA to serve.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_type) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
 								'display_html_label_text' =>FALSE
 							)
 						),
 						'recaptcha_language' 		=> new EE_Select_Input(
 							array(
-								 'ar' 			=> __( 'Arabic', 'event_espresso' ),
-								 'bg' 		=> __( 'Bulgarian', 'event_espresso' ),
-								 'ca' 			=> __( 'Catalan', 'event_espresso' ),
-								 'zh-CN' 	=>  __( 'Chinese (Simplified)', 'event_espresso' ),
-								 'zh-TW' 	=>  __( 'Chinese (Traditional)	', 'event_espresso' ),
-								 'hr' 			=> __( 'Croatian', 'event_espresso' ),
-								 'cs' 			=> __( 'Czech', 'event_espresso' ),
-								 'da' 			=> __( 'Danish', 'event_espresso' ),
-								 'nl' 			=> __( 'Dutch', 'event_espresso' ),
-								 'en-GB' 	=>  __( 'English (UK)', 'event_espresso' ),
-								 'en' 			=> __( 'English (US)', 'event_espresso' ),
-								 'fil' 			=> __( 'Filipino', 'event_espresso' ),
-								 'fi' 			=> __( 'Finnish', 'event_espresso' ),
-								 'fr' 			=> __( 'French', 'event_espresso' ),
-								 'fr-CA' 	=>  __( 'French (Canadian)', 'event_espresso' ),
-								 'de' 			=> __( 'German', 'event_espresso' ),
-								 'de-AT' 	=>  __( 'German (Austria)', 'event_espresso' ),
-								 'de-CH' 	=>  __( 'German (Switzerland)', 'event_espresso' ),
-								 'el' 			=> __( 'Greek', 'event_espresso' ),
-								 'iw' 			=> __( 'Hebrew', 'event_espresso' ),
-								 'hi' 			=> __( 'Hindi', 'event_espresso' ),
-								 'hu' 		=> __( 'Hungarian', 'event_espresso' ),
-								 'id' 			=> __( 'Indonesian', 'event_espresso' ),
-								 'it' 			=> __( 'Italian', 'event_espresso' ),
-								 'ja' 			=> __( 'Japanese', 'event_espresso' ),
-								 'ko' 			=> __( 'Korean', 'event_espresso' ),
-								 'lv' 			=> __( 'Latvian', 'event_espresso' ),
-								 'lt' 			=> __( 'Lithuanian', 'event_espresso' ),
-								 'no' 		=> __( 'Norwegian', 'event_espresso' ),
-								 'fa' 			=> __( 'Persian', 'event_espresso' ),
-								 'pl' 			=> __( 'Polish', 'event_espresso' ),
-								 'pt' 			=> __( 'Portuguese', 'event_espresso' ),
-								 'pt-BR' 	=>  __( 'Portuguese (Brazil)', 'event_espresso' ),
-								 'pt-PT' 	=>  __( 'Portuguese (Portugal)', 'event_espresso' ),
-								 'ro' 			=> __( 'Romanian', 'event_espresso' ),
-								 'ru' 			=> __( 'Russian', 'event_espresso' ),
-								 'sr' 			=> __( 'Serbian', 'event_espresso' ),
-								 'sk' 			=> __( 'Slovak', 'event_espresso' ),
-								 'sl' 			=> __( 'Slovenian', 'event_espresso' ),
-								 'es' 			=> __( 'Spanish', 'event_espresso' ),
-								 'es-419' 	=>  __( 'Spanish (Latin America)', 'event_espresso' ),
-								 'sv' 			=> __( 'Swedish', 'event_espresso' ),
-								 'th' 			=> __( 'Thai', 'event_espresso' ),
-								 'tr' 			=> __( 'Turkish', 'event_espresso' ),
-								 'uk' 			=> __( 'Ukrainian', 'event_espresso' ),
-								 'vi' 			=> __( 'Vietnamese', 'event_espresso')
+								 'ar' 			=> __('Arabic', 'event_espresso'),
+								 'bg' 		=> __('Bulgarian', 'event_espresso'),
+								 'ca' 			=> __('Catalan', 'event_espresso'),
+								 'zh-CN' 	=>  __('Chinese (Simplified)', 'event_espresso'),
+								 'zh-TW' 	=>  __('Chinese (Traditional)	', 'event_espresso'),
+								 'hr' 			=> __('Croatian', 'event_espresso'),
+								 'cs' 			=> __('Czech', 'event_espresso'),
+								 'da' 			=> __('Danish', 'event_espresso'),
+								 'nl' 			=> __('Dutch', 'event_espresso'),
+								 'en-GB' 	=>  __('English (UK)', 'event_espresso'),
+								 'en' 			=> __('English (US)', 'event_espresso'),
+								 'fil' 			=> __('Filipino', 'event_espresso'),
+								 'fi' 			=> __('Finnish', 'event_espresso'),
+								 'fr' 			=> __('French', 'event_espresso'),
+								 'fr-CA' 	=>  __('French (Canadian)', 'event_espresso'),
+								 'de' 			=> __('German', 'event_espresso'),
+								 'de-AT' 	=>  __('German (Austria)', 'event_espresso'),
+								 'de-CH' 	=>  __('German (Switzerland)', 'event_espresso'),
+								 'el' 			=> __('Greek', 'event_espresso'),
+								 'iw' 			=> __('Hebrew', 'event_espresso'),
+								 'hi' 			=> __('Hindi', 'event_espresso'),
+								 'hu' 		=> __('Hungarian', 'event_espresso'),
+								 'id' 			=> __('Indonesian', 'event_espresso'),
+								 'it' 			=> __('Italian', 'event_espresso'),
+								 'ja' 			=> __('Japanese', 'event_espresso'),
+								 'ko' 			=> __('Korean', 'event_espresso'),
+								 'lv' 			=> __('Latvian', 'event_espresso'),
+								 'lt' 			=> __('Lithuanian', 'event_espresso'),
+								 'no' 		=> __('Norwegian', 'event_espresso'),
+								 'fa' 			=> __('Persian', 'event_espresso'),
+								 'pl' 			=> __('Polish', 'event_espresso'),
+								 'pt' 			=> __('Portuguese', 'event_espresso'),
+								 'pt-BR' 	=>  __('Portuguese (Brazil)', 'event_espresso'),
+								 'pt-PT' 	=>  __('Portuguese (Portugal)', 'event_espresso'),
+								 'ro' 			=> __('Romanian', 'event_espresso'),
+								 'ru' 			=> __('Russian', 'event_espresso'),
+								 'sr' 			=> __('Serbian', 'event_espresso'),
+								 'sk' 			=> __('Slovak', 'event_espresso'),
+								 'sl' 			=> __('Slovenian', 'event_espresso'),
+								 'es' 			=> __('Spanish', 'event_espresso'),
+								 'es-419' 	=>  __('Spanish (Latin America)', 'event_espresso'),
+								 'sv' 			=> __('Swedish', 'event_espresso'),
+								 'th' 			=> __('Thai', 'event_espresso'),
+								 'tr' 			=> __('Turkish', 'event_espresso'),
+								 'uk' 			=> __('Ukrainian', 'event_espresso'),
+								 'vi' 			=> __('Vietnamese', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Language', 'event_espresso' ),
-								'html_help_text' 		=> __( 'Forces the widget to render in a specific language.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
+								'html_label_text'	 	=> __('Language', 'event_espresso'),
+								'html_help_text' 		=> __('Forces the widget to render in a specific language.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
 							)
 						)
 					)
@@ -601,25 +600,25 @@  discard block
 block discarded – undo
 	 * @param EE_Registration_Config $EE_Registration_Config
 	 * @return array
 	 */
-	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_admin_settings(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$recaptcha_settings_form = EED_Recaptcha::_recaptcha_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $recaptcha_settings_form->was_submitted() ) {
+			if ($recaptcha_settings_form->was_submitted()) {
 				// capture form data
 				$recaptcha_settings_form->receive_form_submission();
 				// validate form data
-				if ( $recaptcha_settings_form->is_valid() ) {
+				if ($recaptcha_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $recaptcha_settings_form->valid_data();
 					// user proofing recaptcha:  If Use reCAPTCHA is set to yes but we dont' have site or secret keys then set Use reCAPTCHA to FALSE and give error message.
 					if (
-						apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config )
+						apply_filters('FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config)
 						&& $valid_data['main_settings']['use_captcha']
-						&& ( ! $EE_Registration_Config->use_captcha && ( empty( $valid_data['main_settings']['recaptcha_publickey'] ) || empty( $valid_data['main_settings']['recaptcha_privatekey'] )))
+						&& ( ! $EE_Registration_Config->use_captcha && (empty($valid_data['main_settings']['recaptcha_publickey']) || empty($valid_data['main_settings']['recaptcha_privatekey'])))
 					) {
 						$valid_data['main_settings']['use_captcha'] = FALSE;
-						EE_Error::add_error( __('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(__('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$EE_Registration_Config->use_captcha = $valid_data['main_settings']['use_captcha'];
 					$EE_Registration_Config->recaptcha_publickey = $valid_data['main_settings']['recaptcha_publickey'];
@@ -628,12 +627,12 @@  discard block
 block discarded – undo
 					$EE_Registration_Config->recaptcha_theme = $valid_data['appearance_settings']['recaptcha_theme'];
 					$EE_Registration_Config->recaptcha_language = $valid_data['appearance_settings']['recaptcha_language'];
 				} else {
-					if ( $recaptcha_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($recaptcha_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

Please login to merge, or discard this patch.

modules/events_archive/EventsArchiveIframe.php 2 patches

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+    exit('No direct script access allowed');
 }
 
 
@@ -27,25 +27,25 @@  discard block
 block discarded – undo
      * @param \EED_Events_Archive $EED_Events_Archive
      * @throws \EE_Error
      */
-    public function __construct( $EED_Events_Archive )
+    public function __construct($EED_Events_Archive)
     {
-        \EE_Registry::instance()->REQ->set_espresso_page( true );
+        \EE_Registry::instance()->REQ->set_espresso_page(true);
         $EED_Events_Archive->event_list();
         $event_list = new \EES_Espresso_Events();
         parent::__construct(
-            esc_html__( 'Event List', 'event_espresso' ),
+            esc_html__('Event List', 'event_espresso'),
             $event_list->process_shortcode()
         );
         $this->addStylesheets(
             apply_filters(
                 'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
                 array(
-                    'espresso_default'           => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
-                        ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
-                        : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
+                    'espresso_default'           => is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')
+                        ? EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION
+                        : EE_GLOBAL_ASSETS_URL.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION,
                     $EED_Events_Archive->theme() => get_stylesheet_directory_uri()
-                                                    . $EED_Events_Archive->theme() . DS
-                                                    . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
+                                                    . $EED_Events_Archive->theme().DS
+                                                    . 'style.css?ver='.EVENT_ESPRESSO_VERSION,
                 )
             )
         );
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
                             \EE_Registry::instance()->CFG->map_settings->google_map_api_key
                         )
                     ),
-                    'ee_gmap'  => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
+                    'ee_gmap'  => EE_HELPERS_ASSETS.'ee_gmap.js?ver=1.0',
                 )
             )
         );

Please login to merge, or discard this patch.

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
 if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+	exit( 'No direct script access allowed' );
 }
 
 
@@ -21,59 +21,59 @@  discard block
 block discarded – undo
 
 
 
-    /**
-     * EventsArchiveIframe constructor.
-     *
-     * @param \EED_Events_Archive $EED_Events_Archive
-     * @throws \DomainException
-     */
-    public function __construct( $EED_Events_Archive )
-    {
-        \EE_Registry::instance()->REQ->set_espresso_page( true );
-        add_filter('FHEE__EED_Events_Archive__event_list_iframe', '__return_true');
-        $EED_Events_Archive->event_list();
-        $event_list = new \EES_Espresso_Events();
-        parent::__construct(
-            esc_html__( 'Event List', 'event_espresso' ),
-            $event_list->process_shortcode()
-        );
-        $this->addStylesheets(
-            apply_filters(
-                'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
-                array(
-                    'espresso_default'           => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
-                        ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
-                        : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
-                    $EED_Events_Archive->theme() => get_stylesheet_directory_uri()
-                                                    . $EED_Events_Archive->theme() . DS
-                                                    . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
-                ),
-                $this
-            )
-        );
-        $this->addScripts(
-            apply_filters(
-                'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
-                array(
-                    'gmap_api' => sprintf(
-                        'https://maps.googleapis.com/maps/api/js?key=%s',
-                        apply_filters(
-                            'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
-                            \EE_Registry::instance()->CFG->map_settings->google_map_api_key
-                        )
-                    ),
-                    'ee_gmap'  => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
-                ),
-                $this
-            )
-        );
-        $this->addLocalizedVars(
-            array(
-                'ee_gmap' => \EEH_Maps::$gmap_vars,
-            ),
-            'ee_gmap_vars'
-        );
-    }
+	/**
+	 * EventsArchiveIframe constructor.
+	 *
+	 * @param \EED_Events_Archive $EED_Events_Archive
+	 * @throws \DomainException
+	 */
+	public function __construct( $EED_Events_Archive )
+	{
+		\EE_Registry::instance()->REQ->set_espresso_page( true );
+		add_filter('FHEE__EED_Events_Archive__event_list_iframe', '__return_true');
+		$EED_Events_Archive->event_list();
+		$event_list = new \EES_Espresso_Events();
+		parent::__construct(
+			esc_html__( 'Event List', 'event_espresso' ),
+			$event_list->process_shortcode()
+		);
+		$this->addStylesheets(
+			apply_filters(
+				'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
+				array(
+					'espresso_default'           => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
+						? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
+						: EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
+					$EED_Events_Archive->theme() => get_stylesheet_directory_uri()
+													. $EED_Events_Archive->theme() . DS
+													. 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
+				),
+				$this
+			)
+		);
+		$this->addScripts(
+			apply_filters(
+				'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
+				array(
+					'gmap_api' => sprintf(
+						'https://maps.googleapis.com/maps/api/js?key=%s',
+						apply_filters(
+							'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
+							\EE_Registry::instance()->CFG->map_settings->google_map_api_key
+						)
+					),
+					'ee_gmap'  => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
+				),
+				$this
+			)
+		);
+		$this->addLocalizedVars(
+			array(
+				'ee_gmap' => \EEH_Maps::$gmap_vars,
+			),
+			'ee_gmap_vars'
+		);
+	}
 
 
 

Please login to merge, or discard this patch.

modules/ticket_selector/TicketSelectorIframe.php 2 patches

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+    exit('No direct script access allowed');
 }
 
 
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
      */
     public function __construct()
     {
-        \EE_Registry::instance()->REQ->set_espresso_page( true );
+        \EE_Registry::instance()->REQ->set_espresso_page(true);
         /** @type \EEM_Event $EEM_Event */
-        $EEM_Event = \EE_Registry::instance()->load_model( 'Event' );
+        $EEM_Event = \EE_Registry::instance()->load_model('Event');
         $event = $EEM_Event->get_one_by_ID(
-            \EE_Registry::instance()->REQ->get( 'event', 0 )
+            \EE_Registry::instance()->REQ->get('event', 0)
         );
         $ticket_selector = new DisplayTicketSelector();
-        $ticket_selector->setIframe( true );
+        $ticket_selector->setIframe(true);
         parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
-            $ticket_selector->display( $event )
+            esc_html__('Ticket Selector', 'event_espresso'),
+            $ticket_selector->display($event)
         );
         $this->addStylesheets(
             apply_filters(

Please login to merge, or discard this patch.

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
 if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+	exit( 'No direct script access allowed' );
 }
 
 
@@ -21,61 +21,61 @@  discard block
 block discarded – undo
 class TicketSelectorIframe extends Iframe
 {
 
-    /**
-     * TicketSelectorIframe constructor.
-     *
-     * @throws \DomainException
-     * @throws \EE_Error
-     */
-    public function __construct()
-    {
-        \EE_Registry::instance()->REQ->set_espresso_page( true );
-        /** @type \EEM_Event $EEM_Event */
-        $EEM_Event = \EE_Registry::instance()->load_model( 'Event' );
-        $event = $EEM_Event->get_one_by_ID(
-            \EE_Registry::instance()->REQ->get( 'event', 0 )
-        );
-        $ticket_selector = new DisplayTicketSelector();
-        $ticket_selector->setIframe( true );
-        parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
-            $ticket_selector->display( $event )
-        );
-        $this->addStylesheets(
-            apply_filters(
-                'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
-                array(
-                    'ticket_selector_embed' => TICKET_SELECTOR_ASSETS_URL
-                                               . 'ticket_selector_embed.css?ver='
-                                               . EVENT_ESPRESSO_VERSION,
-                    'ticket_selector'       => TICKET_SELECTOR_ASSETS_URL
-                                               . 'ticket_selector.css?ver='
-                                               . EVENT_ESPRESSO_VERSION,
-                ),
-                $this
-            )
-        );
-        $this->addScripts(
-            apply_filters(
-                'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-                array(
-                    'ticket_selector_iframe_embed' => TICKET_SELECTOR_ASSETS_URL
-                                                      . 'ticket_selector_iframe_embed.js?ver='
-                                                      . EVENT_ESPRESSO_VERSION,
-                ),
-                $this
-            )
-        );
-        $this->addLocalizedVars(
-            array(
-                'ticket_selector_iframe' => true,
-                'EEDTicketSelectorMsg'   => __(
-                    'Please choose at least one ticket before continuing.',
-                    'event_espresso'
-                ),
-            )
-        );
-    }
+	/**
+	 * TicketSelectorIframe constructor.
+	 *
+	 * @throws \DomainException
+	 * @throws \EE_Error
+	 */
+	public function __construct()
+	{
+		\EE_Registry::instance()->REQ->set_espresso_page( true );
+		/** @type \EEM_Event $EEM_Event */
+		$EEM_Event = \EE_Registry::instance()->load_model( 'Event' );
+		$event = $EEM_Event->get_one_by_ID(
+			\EE_Registry::instance()->REQ->get( 'event', 0 )
+		);
+		$ticket_selector = new DisplayTicketSelector();
+		$ticket_selector->setIframe( true );
+		parent::__construct(
+			esc_html__( 'Ticket Selector', 'event_espresso' ),
+			$ticket_selector->display( $event )
+		);
+		$this->addStylesheets(
+			apply_filters(
+				'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
+				array(
+					'ticket_selector_embed' => TICKET_SELECTOR_ASSETS_URL
+											   . 'ticket_selector_embed.css?ver='
+											   . EVENT_ESPRESSO_VERSION,
+					'ticket_selector'       => TICKET_SELECTOR_ASSETS_URL
+											   . 'ticket_selector.css?ver='
+											   . EVENT_ESPRESSO_VERSION,
+				),
+				$this
+			)
+		);
+		$this->addScripts(
+			apply_filters(
+				'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+				array(
+					'ticket_selector_iframe_embed' => TICKET_SELECTOR_ASSETS_URL
+													  . 'ticket_selector_iframe_embed.js?ver='
+													  . EVENT_ESPRESSO_VERSION,
+				),
+				$this
+			)
+		);
+		$this->addLocalizedVars(
+			array(
+				'ticket_selector_iframe' => true,
+				'EEDTicketSelectorMsg'   => __(
+					'Please choose at least one ticket before continuing.',
+					'event_espresso'
+				),
+			)
+		);
+	}
 
 }
 // End of file TicketSelectorIframe.php

Please login to merge, or discard this patch.

modules/ticket_selector/TicketSelectorIframeEmbedButton.php 2 patches

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -17,27 +17,27 @@
 block discarded – undo
 class TicketSelectorIframeEmbedButton extends IframeEmbedButton
 {
 
-    /**
-     * TicketSelectorIframeEmbedButton constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
-            'ticket_selector'
-        );
-    }
-
-
-
-    /**
-     * Adds an iframe embed code button to the Event editor.
-     */
-    public function addEventEditorIframeEmbedButton()
-    {
-        // add button for iframe code to event editor.
-        $this->addEventEditorIframeEmbedButtonFilter();
-    }
+	/**
+	 * TicketSelectorIframeEmbedButton constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			esc_html__( 'Ticket Selector', 'event_espresso' ),
+			'ticket_selector'
+		);
+	}
+
+
+
+	/**
+	 * Adds an iframe embed code button to the Event editor.
+	 */
+	public function addEventEditorIframeEmbedButton()
+	{
+		// add button for iframe code to event editor.
+		$this->addEventEditorIframeEmbedButtonFilter();
+	}
 
 
 

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 
 use EventEspresso\core\libraries\iframe_display\IframeEmbedButton;
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
     public function __construct()
     {
         parent::__construct(
-            esc_html__( 'Ticket Selector', 'event_espresso' ),
+            esc_html__('Ticket Selector', 'event_espresso'),
             'ticket_selector'
         );
     }

Please login to merge, or discard this patch.

core/Factory.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 
 use EventEspresso\core\libraries\iframe_display\Iframe;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public static function create( $class_name, $arguments = array() ) {
-		if ( empty( $class_name ) ) {
+	public static function create($class_name, $arguments = array()) {
+		if (empty($class_name)) {
 			throw new \EE_Error(
-				__( 'You must provide a class name in order to instantiate it.', 'event_espresso' )
+				__('You must provide a class name in order to instantiate it.', 'event_espresso')
 			);
 		}
 		// if ( ! class_exists( $class_name ) ) {
@@ -41,20 +41,20 @@  discard block
 block discarded – undo
 		// 	);
 		// }
 		$object = null;
-		switch ( $class_name ) {
+		switch ($class_name) {
 
 			case 'EE_Request' :
-				$object = new \EE_Request( $_GET, $_POST, $_COOKIE );
+				$object = new \EE_Request($_GET, $_POST, $_COOKIE);
 				break;
 
 			case 'Iframe' :
-				$title = isset( $arguments['title'] ) ? $arguments['title'] : null;
-				$content = isset( $arguments['content'] ) ? $arguments['content'] : null;
-				$object = new Iframe( $title, $content );
+				$title = isset($arguments['title']) ? $arguments['title'] : null;
+				$content = isset($arguments['content']) ? $arguments['content'] : null;
+				$object = new Iframe($title, $content);
 				break;
 
 			default :
-				$object = new $class_name( $arguments );
+				$object = new $class_name($arguments);
 
 		}
 

Please login to merge, or discard this patch.

		@@ -21,9 +21,12 @@
		block discarded – undo
21	21	<title><?php echo $title; ?></title>
22	22	<?php if ( $enqueue_wp_assets ) : ?>
23	23	<?php wp_head(); ?>
24		-<?php else : ?>
	24	+<?php else {
	25	+ : ?>
25	26	<?php foreach ( $css as $url ) : ?>
26		- <link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
	27	+ <link rel="stylesheet" type="text/css" href="<?php echo $url;
	28	+}
	29	+?>">
27	30	<?php endforeach; ?>
28	31	<script type="text/javascript">
29	32	<?php echo $eei18n; ?>

		@@ -19,16 +19,16 @@ discard block
		block discarded – undo
19	19	<html>
20	20	<head>
21	21	<title><?php echo $title; ?></title>
22		-<?php if ( $enqueue_wp_assets ) : ?>
	22	+<?php if ($enqueue_wp_assets) : ?>
23	23	<?php wp_head(); ?>
24	24	<?php else : ?>
25		- <?php foreach ( $css as $url ) : ?>
26		- <link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
	25	+ <?php foreach ($css as $url) : ?>
	26	+ <link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
27	27	<?php endforeach; ?>
28	28	<script type="text/javascript">
29	29	<?php echo $eei18n; ?>
30	30	</script>
31		- <?php foreach ( $header_js as $url ) : ?>
	31	+ <?php foreach ($header_js as $url) : ?>
32	32	<script type="text/javascript" src="<?php echo $url; ?>"></script>
33	33	<?php endforeach; ?>
34	34	<?php endif; ?>
		@@ -38,10 +38,10 @@ discard block
		block discarded – undo
38	38	<div style="padding: 1em;">
39	39	<?php echo $content; ?>
40	40	</div>
41		- <?php foreach ( $footer_js as $url ) : ?>
	41	+ <?php foreach ($footer_js as $url) : ?>
42	42	<script type="text/javascript" src="<?php echo $url; ?>"></script>
43	43	<?php endforeach; ?>
44		-<?php if ( $enqueue_wp_assets ) : ?>
	44	+<?php if ($enqueue_wp_assets) : ?>
45	45	<?php wp_footer(); ?>
46	46	<?php endif; ?>
47	47	</body>

		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52
53	53	/**
54	54	* @param string $word
55		- * @return mixed
	55	+ * @return string
56	56	*/
57	57	public static function singularize_and_upper( $word ) {
58	58	return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
		@@ -379,7 +379,7 @@ discard block
		block discarded – undo
379	379
380	380
381	381	/**
382		- * @param $string
	382	+ * @param string $string
383	383	* @return string
384	384	*/
385	385	public static function add_indefinite_article($string) {

		@@ -35,357 +35,357 @@
		block discarded – undo
35	35	* @version $Revision 0.1 $
36	36	*/
37	37	class EEH_Inflector{
38		- // ------ CLASS METHODS ------ //
39		- // ---- Public methods ---- //
40		- // {{{ pluralize()
	38	+ // ------ CLASS METHODS ------ //
	39	+ // ---- Public methods ---- //
	40	+ // {{{ pluralize()
41	41
42	42	/**
43	43	* Just calls self::pluralize and strtolower on $word and returns it
44	44	* @param string $word
45	45	* @return string
46	46	*/
47		- public static function pluralize_and_lower( $word ){
	47	+ public static function pluralize_and_lower( $word ){
48	48	return strtolower( self::pluralize( $word ) );
49	49	}
50	50
51	51
52	52
53		- /**
54		- * @param string $word
55		- * @return mixed
56		- */
57		- public static function singularize_and_upper( $word ) {
	53	+ /**
	54	+ * @param string $word
	55	+ * @return mixed
	56	+ */
	57	+ public static function singularize_and_upper( $word ) {
58	58	return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
59	59	}
60	60
61	61
62	62
63		- /**
64		- * Pluralizes English nouns.
65		- *
66		- * @access public
67		- * @static
68		- * @param string $word English noun to pluralize
69		- * @return string Plural noun
70		- */
71		- public static function pluralize($word){
72		- $plural = array(
73		- '/(quiz)$/i' => '\1zes',
74		- '/^(ox)$/i' => '\1en',
75		- '/([m\|l])ouse$/i' => '\1ice',
76		- '/(matr\|vert\|ind)ix\|ex$/i' => '\1ices',
77		- '/(x\|ch\|ss\|sh)$/i' => '\1es',
78		- '/([^aeiouy]\|qu)ies$/i' => '\1y',
79		- '/([^aeiouy]\|qu)y$/i' => '\1ies',
80		- '/(hive)$/i' => '\1s',
81		- '/(?:([^f])fe\|([lr])f)$/i' => '\1\2ves',
82		- '/sis$/i' => 'ses',
83		- '/([ti])um$/i' => '\1a',
84		- '/(buffal\|tomat)o$/i' => '\1oes',
85		- '/(bu)s$/i' => '\1ses',
86		- '/(alias\|status)/i' => '\1es',
87		- '/(octop\|vir)us$/i' => '\1i',
88		- '/(ax\|test)is$/i' => '\1es',
89		- '/s$/i' => 's',
90		- '/$/' => 's');
91		-
92		- $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
93		-
94		- $irregular = array(
95		- 'person' => 'people',
96		- 'man' => 'men',
97		- 'child' => 'children',
98		- 'sex' => 'sexes',
99		- 'move' => 'moves');
100		-
101		- $lowercased_word = strtolower($word);
102		-
103		- foreach($uncountable as $_uncountable){
104		- 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
	63	+ /**
	64	+ * Pluralizes English nouns.
	65	+ *
	66	+ * @access public
	67	+ * @static
	68	+ * @param string $word English noun to pluralize
	69	+ * @return string Plural noun
	70	+ */
	71	+ public static function pluralize($word){
	72	+ $plural = array(
	73	+ '/(quiz)$/i' => '\1zes',
	74	+ '/^(ox)$/i' => '\1en',
	75	+ '/([m\|l])ouse$/i' => '\1ice',
	76	+ '/(matr\|vert\|ind)ix\|ex$/i' => '\1ices',
	77	+ '/(x\|ch\|ss\|sh)$/i' => '\1es',
	78	+ '/([^aeiouy]\|qu)ies$/i' => '\1y',
	79	+ '/([^aeiouy]\|qu)y$/i' => '\1ies',
	80	+ '/(hive)$/i' => '\1s',
	81	+ '/(?:([^f])fe\|([lr])f)$/i' => '\1\2ves',
	82	+ '/sis$/i' => 'ses',
	83	+ '/([ti])um$/i' => '\1a',
	84	+ '/(buffal\|tomat)o$/i' => '\1oes',
	85	+ '/(bu)s$/i' => '\1ses',
	86	+ '/(alias\|status)/i' => '\1es',
	87	+ '/(octop\|vir)us$/i' => '\1i',
	88	+ '/(ax\|test)is$/i' => '\1es',
	89	+ '/s$/i' => 's',
	90	+ '/$/' => 's');
	91	+
	92	+ $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
	93	+
	94	+ $irregular = array(
	95	+ 'person' => 'people',
	96	+ 'man' => 'men',
	97	+ 'child' => 'children',
	98	+ 'sex' => 'sexes',
	99	+ 'move' => 'moves');
	100	+
	101	+ $lowercased_word = strtolower($word);
	102	+
	103	+ foreach($uncountable as $_uncountable){
	104	+ 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
105	105	! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
106		- return $word;
107		- }
108		- }
109		-
110		- foreach($irregular as $_plural => $_singular){
111		- if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
112		- return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
113		- }
114		- }
115		-
116		- foreach($plural as $rule => $replacement){
117		- if(preg_match($rule, $word)){
118		- return preg_replace($rule, $replacement, $word);
119		- }
120		- }
121		- return false;
122		- }
123		-
124		- // }}}
125		- // {{{ singularize()
126		-
127		- /**
128		- * Singularizes English nouns.
129		- *
130		- * @access public
131		- * @static
132		- * @param string $word English noun to singularize
133		- * @return string Singular noun.
134		- */
135		- public static function singularize($word){
136		- $singular = array(
137		- '/(quiz)zes$/i' => '\1',
138		- '/(matr)ices$/i' => '\1ix',
139		- '/(vert\|ind)ices$/i' => '\1ex',
140		- '/^(ox)en/i' => '\1',
141		- '/(alias\|status)es$/i' => '\1',
142		- '/([octop\|vir])i$/i' => '\1us',
143		- '/(cris\|ax\|test)es$/i' => '\1is',
144		- '/(shoe)s$/i' => '\1',
145		- '/(o)es$/i' => '\1',
146		- '/(bus)es$/i' => '\1',
147		- '/([m\|l])ice$/i' => '\1ouse',
148		- '/(x\|ch\|ss\|sh)es$/i' => '\1',
149		- '/(m)ovies$/i' => '\1ovie',
150		- '/(s)eries$/i' => '\1eries',
151		- '/([^aeiouy]\|qu)ies$/i' => '\1y',
152		- '/([lr])ves$/i' => '\1f',
153		- '/(tive)s$/i' => '\1',
154		- '/(hive)s$/i' => '\1',
155		- '/([^f])ves$/i' => '\1fe',
156		- '/(^analy)ses$/i' => '\1sis',
157		- '/((a)naly\|(b)a\|(d)iagno\|(p)arenthe\|(p)rogno\|(s)ynop\|(t)he)ses$/i' => '\1\2sis',
158		- '/([ti])a$/i' => '\1um',
159		- '/(n)ews$/i' => '\1ews',
160		- '/s$/i' => '',
161		- );
162		-
163		- $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
164		-
165		- $irregular = array(
166		- 'person' => 'people',
167		- 'man' => 'men',
168		- 'child' => 'children',
169		- 'sex' => 'sexes',
170		- 'move' => 'moves');
171		-
172		- $lowercased_word = strtolower($word);
173		- foreach($uncountable as $_uncountable){
174		- if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
175		- return $word;
176		- }
177		- }
178		-
179		- foreach($irregular as $_plural => $_singular){
180		- if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
181		- return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
182		- }
183		- }
184		-
185		- foreach($singular as $rule => $replacement){
186		- if(preg_match($rule, $word)){
187		- return preg_replace($rule, $replacement, $word);
188		- }
189		- }
190		-
191		- return $word;
192		- }
193		-
194		- // }}}
195		- // {{{ titleize()
196		-
197		- /**
198		- * Converts an underscored or CamelCase word into a English
199		- * sentence.
200		- *
201		- * The titleize static function converts text like "WelcomePage",
202		- * "welcome_page" or "welcome page" to this "Welcome
203		- * Page".
204		- * If second parameter is set to 'first' it will only
205		- * capitalize the first character of the title.
206		- *
207		- * @access public
208		- * @static
209		- * @param string $word Word to format as tile
210		- * @param string $uppercase If set to 'first' it will only uppercase the
211		- * first character. Otherwise it will uppercase all
212		- * the words in the title.
213		- * @return string Text formatted as title
214		- */
215		- public static function titleize($word, $uppercase = ''){
216		- $uppercase = $uppercase === 'first' ? 'ucfirst' : 'ucwords';
217		- return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
218		- }
219		-
220		- // }}}
221		- // {{{ camelize()
222		-
223		- /**
224		- * Returns given word as CamelCased
225		- *
226		- * Converts a word like "send_email" to "SendEmail". It
227		- * will remove non alphanumeric character from the word, so
228		- * "who's online" will be converted to "WhoSOnline"
229		- *
230		- * @access public
231		- * @static
232		- * @see variablize
233		- * @param string $word Word to convert to camel case
234		- * @return string UpperCamelCasedWord
235		- */
236		- public static function camelize($word){
237		- return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
238		- }
239		-
240		- // }}}
241		- // {{{ underscore()
242		-
243		- /**
244		- * Converts a word "into_it_s_underscored_version"
245		- *
246		- * Convert any "CamelCased" or "ordinary Word" into an
247		- * "underscored_word".
248		- *
249		- * This can be really useful for creating friendly URLs.
250		- *
251		- * @access public
252		- * @static
253		- * @param string $word Word to underscore
254		- * @return string Underscored word
255		- */
256		- public static function underscore($word){
257		- 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))));
258		- }
259		-
260		- // }}}
261		- // {{{ humanize()
262		-
263		- /**
264		- * Returns a human-readable string from $word
265		- *
266		- * Returns a human-readable string from $word, by replacing
267		- * underscores with a space, and by upper-casing the initial
268		- * character by default.
269		- *
270		- * If you need to uppercase all the words you just have to
271		- * pass 'all' as a second parameter.
272		- *
273		- * @access public
274		- * @static
275		- * @param string $word String to "humanize"
276		- * @param string $uppercase If set to 'all' it will uppercase all the words
277		- * instead of just the first one.
278		- * @return string Human-readable word
279		- */
280		- public static function humanize($word, $uppercase = ''){
	106	+ return $word;
	107	+ }
	108	+ }
	109	+
	110	+ foreach($irregular as $_plural => $_singular){
	111	+ if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
	112	+ return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
	113	+ }
	114	+ }
	115	+
	116	+ foreach($plural as $rule => $replacement){
	117	+ if(preg_match($rule, $word)){
	118	+ return preg_replace($rule, $replacement, $word);
	119	+ }
	120	+ }
	121	+ return false;
	122	+ }
	123	+
	124	+ // }}}
	125	+ // {{{ singularize()
	126	+
	127	+ /**
	128	+ * Singularizes English nouns.
	129	+ *
	130	+ * @access public
	131	+ * @static
	132	+ * @param string $word English noun to singularize
	133	+ * @return string Singular noun.
	134	+ */
	135	+ public static function singularize($word){
	136	+ $singular = array(
	137	+ '/(quiz)zes$/i' => '\1',
	138	+ '/(matr)ices$/i' => '\1ix',
	139	+ '/(vert\|ind)ices$/i' => '\1ex',
	140	+ '/^(ox)en/i' => '\1',
	141	+ '/(alias\|status)es$/i' => '\1',
	142	+ '/([octop\|vir])i$/i' => '\1us',
	143	+ '/(cris\|ax\|test)es$/i' => '\1is',
	144	+ '/(shoe)s$/i' => '\1',
	145	+ '/(o)es$/i' => '\1',
	146	+ '/(bus)es$/i' => '\1',
	147	+ '/([m\|l])ice$/i' => '\1ouse',
	148	+ '/(x\|ch\|ss\|sh)es$/i' => '\1',
	149	+ '/(m)ovies$/i' => '\1ovie',
	150	+ '/(s)eries$/i' => '\1eries',
	151	+ '/([^aeiouy]\|qu)ies$/i' => '\1y',
	152	+ '/([lr])ves$/i' => '\1f',
	153	+ '/(tive)s$/i' => '\1',
	154	+ '/(hive)s$/i' => '\1',
	155	+ '/([^f])ves$/i' => '\1fe',
	156	+ '/(^analy)ses$/i' => '\1sis',
	157	+ '/((a)naly\|(b)a\|(d)iagno\|(p)arenthe\|(p)rogno\|(s)ynop\|(t)he)ses$/i' => '\1\2sis',
	158	+ '/([ti])a$/i' => '\1um',
	159	+ '/(n)ews$/i' => '\1ews',
	160	+ '/s$/i' => '',
	161	+ );
	162	+
	163	+ $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
	164	+
	165	+ $irregular = array(
	166	+ 'person' => 'people',
	167	+ 'man' => 'men',
	168	+ 'child' => 'children',
	169	+ 'sex' => 'sexes',
	170	+ 'move' => 'moves');
	171	+
	172	+ $lowercased_word = strtolower($word);
	173	+ foreach($uncountable as $_uncountable){
	174	+ if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
	175	+ return $word;
	176	+ }
	177	+ }
	178	+
	179	+ foreach($irregular as $_plural => $_singular){
	180	+ if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
	181	+ return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
	182	+ }
	183	+ }
	184	+
	185	+ foreach($singular as $rule => $replacement){
	186	+ if(preg_match($rule, $word)){
	187	+ return preg_replace($rule, $replacement, $word);
	188	+ }
	189	+ }
	190	+
	191	+ return $word;
	192	+ }
	193	+
	194	+ // }}}
	195	+ // {{{ titleize()
	196	+
	197	+ /**
	198	+ * Converts an underscored or CamelCase word into a English
	199	+ * sentence.
	200	+ *
	201	+ * The titleize static function converts text like "WelcomePage",
	202	+ * "welcome_page" or "welcome page" to this "Welcome
	203	+ * Page".
	204	+ * If second parameter is set to 'first' it will only
	205	+ * capitalize the first character of the title.
	206	+ *
	207	+ * @access public
	208	+ * @static
	209	+ * @param string $word Word to format as tile
	210	+ * @param string $uppercase If set to 'first' it will only uppercase the
	211	+ * first character. Otherwise it will uppercase all
	212	+ * the words in the title.
	213	+ * @return string Text formatted as title
	214	+ */
	215	+ public static function titleize($word, $uppercase = ''){
	216	+ $uppercase = $uppercase === 'first' ? 'ucfirst' : 'ucwords';
	217	+ return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
	218	+ }
	219	+
	220	+ // }}}
	221	+ // {{{ camelize()
	222	+
	223	+ /**
	224	+ * Returns given word as CamelCased
	225	+ *
	226	+ * Converts a word like "send_email" to "SendEmail". It
	227	+ * will remove non alphanumeric character from the word, so
	228	+ * "who's online" will be converted to "WhoSOnline"
	229	+ *
	230	+ * @access public
	231	+ * @static
	232	+ * @see variablize
	233	+ * @param string $word Word to convert to camel case
	234	+ * @return string UpperCamelCasedWord
	235	+ */
	236	+ public static function camelize($word){
	237	+ return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
	238	+ }
	239	+
	240	+ // }}}
	241	+ // {{{ underscore()
	242	+
	243	+ /**
	244	+ * Converts a word "into_it_s_underscored_version"
	245	+ *
	246	+ * Convert any "CamelCased" or "ordinary Word" into an
	247	+ * "underscored_word".
	248	+ *
	249	+ * This can be really useful for creating friendly URLs.
	250	+ *
	251	+ * @access public
	252	+ * @static
	253	+ * @param string $word Word to underscore
	254	+ * @return string Underscored word
	255	+ */
	256	+ public static function underscore($word){
	257	+ 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))));
	258	+ }
	259	+
	260	+ // }}}
	261	+ // {{{ humanize()
	262	+
	263	+ /**
	264	+ * Returns a human-readable string from $word
	265	+ *
	266	+ * Returns a human-readable string from $word, by replacing
	267	+ * underscores with a space, and by upper-casing the initial
	268	+ * character by default.
	269	+ *
	270	+ * If you need to uppercase all the words you just have to
	271	+ * pass 'all' as a second parameter.
	272	+ *
	273	+ * @access public
	274	+ * @static
	275	+ * @param string $word String to "humanize"
	276	+ * @param string $uppercase If set to 'all' it will uppercase all the words
	277	+ * instead of just the first one.
	278	+ * @return string Human-readable word
	279	+ */
	280	+ public static function humanize($word, $uppercase = ''){
281	281	//make special exceptions for acronyms
282	282	$word = str_replace('wp_', 'WP_', $word );
283		- $uppercase = $uppercase === 'all' ? 'ucwords' : 'ucfirst';
284		- return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
285		- }
286		-
287		- // }}}
288		- // {{{ variablize()
289		-
290		- /**
291		- * Same as camelize but first char is underscored
292		- *
293		- * Converts a word like "send_email" to "sendEmail". It
294		- * will remove non alphanumeric character from the word, so
295		- * "who's online" will be converted to "whoSOnline"
296		- *
297		- * @access public
298		- * @static
299		- * @see camelize
300		- * @param string $word Word to lowerCamelCase
301		- * @return string Returns a lowerCamelCasedWord
302		- */
303		- public static function variablize($word){
304		- $word = EEH_Inflector::camelize($word);
305		- return strtolower($word[0]) . substr($word, 1);
306		- }
307		-
308		- // }}}
309		- // {{{ tableize()
310		-
311		- /**
312		- * Converts a class name to its table name according to rails
313		- * naming conventions.
314		- *
315		- * Converts "Person" to "people"
316		- *
317		- * @access public
318		- * @static
319		- * @see classify
320		- * @param string $class_name Class name for getting related table_name.
321		- * @return string plural_table_name
322		- */
323		- public static function tableize($class_name){
324		- return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
325		- }
326		-
327		- // }}}
328		- // {{{ classify()
329		-
330		- /**
331		- * Converts a table name to its class name according to rails
332		- * naming conventions.
333		- *
334		- * Converts "people" to "Person"
335		- *
336		- * @access public
337		- * @static
338		- * @see tableize
339		- * @param string $table_name Table name for getting related ClassName.
340		- * @return string SingularClassName
341		- */
342		- public static function classify($table_name){
343		- return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
344		- }
345		-
346		- // }}}
347		- // {{{ ordinalize()
348		-
349		- /**
350		- * Converts number to its ordinal English form.
351		- *
352		- * This method converts 13 to 13th, 2 to 2nd ...
353		- *
354		- * @access public
355		- * @static
356		- * @param integer $number Number to get its ordinal value
357		- * @return string Ordinal representation of given string.
358		- */
359		- public static function ordinalize($number){
360		- if(in_array(($number % 100), range(11, 13))){
361		- return $number . 'th';
362		- }else{
363		- switch(($number % 10)){
364		- case 1:
365		- return $number . 'st';
366		- break;
367		- case 2:
368		- return $number . 'nd';
369		- break;
370		- case 3:
371		- return $number . 'rd';
372		- default:
373		- return $number . 'th';
374		- break;
375		- }
376		- }
377		- }
378		-
379		-
380		-
381		- /**
382		- * @param $string
383		- * @return string
384		- */
385		- public static function add_indefinite_article($string) {
386		- if (strtolower($string) === 'null') {
387		- return $string;
388		- }
389		- return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
390		- }
	283	+ $uppercase = $uppercase === 'all' ? 'ucwords' : 'ucfirst';
	284	+ return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
	285	+ }
	286	+
	287	+ // }}}
	288	+ // {{{ variablize()
	289	+
	290	+ /**
	291	+ * Same as camelize but first char is underscored
	292	+ *
	293	+ * Converts a word like "send_email" to "sendEmail". It
	294	+ * will remove non alphanumeric character from the word, so
	295	+ * "who's online" will be converted to "whoSOnline"
	296	+ *
	297	+ * @access public
	298	+ * @static
	299	+ * @see camelize
	300	+ * @param string $word Word to lowerCamelCase
	301	+ * @return string Returns a lowerCamelCasedWord
	302	+ */
	303	+ public static function variablize($word){
	304	+ $word = EEH_Inflector::camelize($word);
	305	+ return strtolower($word[0]) . substr($word, 1);
	306	+ }
	307	+
	308	+ // }}}
	309	+ // {{{ tableize()
	310	+
	311	+ /**
	312	+ * Converts a class name to its table name according to rails
	313	+ * naming conventions.
	314	+ *
	315	+ * Converts "Person" to "people"
	316	+ *
	317	+ * @access public
	318	+ * @static
	319	+ * @see classify
	320	+ * @param string $class_name Class name for getting related table_name.
	321	+ * @return string plural_table_name
	322	+ */
	323	+ public static function tableize($class_name){
	324	+ return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
	325	+ }
	326	+
	327	+ // }}}
	328	+ // {{{ classify()
	329	+
	330	+ /**
	331	+ * Converts a table name to its class name according to rails
	332	+ * naming conventions.
	333	+ *
	334	+ * Converts "people" to "Person"
	335	+ *
	336	+ * @access public
	337	+ * @static
	338	+ * @see tableize
	339	+ * @param string $table_name Table name for getting related ClassName.
	340	+ * @return string SingularClassName
	341	+ */
	342	+ public static function classify($table_name){
	343	+ return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
	344	+ }
	345	+
	346	+ // }}}
	347	+ // {{{ ordinalize()
	348	+
	349	+ /**
	350	+ * Converts number to its ordinal English form.
	351	+ *
	352	+ * This method converts 13 to 13th, 2 to 2nd ...
	353	+ *
	354	+ * @access public
	355	+ * @static
	356	+ * @param integer $number Number to get its ordinal value
	357	+ * @return string Ordinal representation of given string.
	358	+ */
	359	+ public static function ordinalize($number){
	360	+ if(in_array(($number % 100), range(11, 13))){
	361	+ return $number . 'th';
	362	+ }else{
	363	+ switch(($number % 10)){
	364	+ case 1:
	365	+ return $number . 'st';
	366	+ break;
	367	+ case 2:
	368	+ return $number . 'nd';
	369	+ break;
	370	+ case 3:
	371	+ return $number . 'rd';
	372	+ default:
	373	+ return $number . 'th';
	374	+ break;
	375	+ }
	376	+ }
	377	+ }
	378	+
	379	+
	380	+
	381	+ /**
	382	+ * @param $string
	383	+ * @return string
	384	+ */
	385	+ public static function add_indefinite_article($string) {
	386	+ if (strtolower($string) === 'null') {
	387	+ return $string;
	388	+ }
	389	+ return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
	390	+ }
391	391	}
392	392	\ No newline at end of file

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3		- exit( 'No direct script access allowed' );
	2	+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	3	+ exit('No direct script access allowed');
4	4	}
5	5
6	6	// +----------------------------------------------------------------------+
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	* @since 0.1
35	35	* @version $Revision 0.1 $
36	36	*/
37		-class EEH_Inflector{
	37	+class EEH_Inflector {
38	38	// ------ CLASS METHODS ------ //
39	39	// ---- Public methods ---- //
40	40	// {{{ pluralize()
		@@ -44,8 +44,8 @@ discard block
		block discarded – undo
44	44	* @param string $word
45	45	* @return string
46	46	*/
47		- public static function pluralize_and_lower( $word ){
48		- return strtolower( self::pluralize( $word ) );
	47	+ public static function pluralize_and_lower($word) {
	48	+ return strtolower(self::pluralize($word));
49	49	}
50	50
51	51
		@@ -54,8 +54,8 @@ discard block
		block discarded – undo
54	54	* @param string $word
55	55	* @return mixed
56	56	*/
57		- public static function singularize_and_upper( $word ) {
58		- return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
	57	+ public static function singularize_and_upper($word) {
	58	+ return str_replace(' ', '_', self::humanize(self::singularize($word), 'all'));
59	59	}
60	60
61	61
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	* @param string $word English noun to pluralize
69	69	* @return string Plural noun
70	70	*/
71		- public static function pluralize($word){
	71	+ public static function pluralize($word) {
72	72	$plural = array(
73	73	'/(quiz)$/i' => '\1zes',
74	74	'/^(ox)$/i' => '\1en',
		@@ -100,21 +100,21 @@ discard block
		block discarded – undo
100	100
101	101	$lowercased_word = strtolower($word);
102	102
103		- foreach($uncountable as $_uncountable){
104		- 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
105		- ! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
	103	+ foreach ($uncountable as $_uncountable) {
	104	+ 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
	105	+ ! ctype_alpha($lowercased_word[strlen($lowercased_word) - strlen($_uncountable)])) {
106	106	return $word;
107	107	}
108	108	}
109	109
110		- foreach($irregular as $_plural => $_singular){
111		- if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
112		- return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
	110	+ foreach ($irregular as $_plural => $_singular) {
	111	+ if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
	112	+ return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word);
113	113	}
114	114	}
115	115
116		- foreach($plural as $rule => $replacement){
117		- if(preg_match($rule, $word)){
	116	+ foreach ($plural as $rule => $replacement) {
	117	+ if (preg_match($rule, $word)) {
118	118	return preg_replace($rule, $replacement, $word);
119	119	}
120	120	}
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	* @param string $word English noun to singularize
133	133	* @return string Singular noun.
134	134	*/
135		- public static function singularize($word){
	135	+ public static function singularize($word) {
136	136	$singular = array(
137	137	'/(quiz)zes$/i' => '\1',
138	138	'/(matr)ices$/i' => '\1ix',
		@@ -170,20 +170,20 @@ discard block
		block discarded – undo
170	170	'move' => 'moves');
171	171
172	172	$lowercased_word = strtolower($word);
173		- foreach($uncountable as $_uncountable){
174		- if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
	173	+ foreach ($uncountable as $_uncountable) {
	174	+ if (substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable) {
175	175	return $word;
176	176	}
177	177	}
178	178
179		- foreach($irregular as $_plural => $_singular){
180		- if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
181		- return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
	179	+ foreach ($irregular as $_plural => $_singular) {
	180	+ if (preg_match('/('.$_singular.')$/i', $word, $arr)) {
	181	+ return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word);
182	182	}
183	183	}
184	184
185		- foreach($singular as $rule => $replacement){
186		- if(preg_match($rule, $word)){
	185	+ foreach ($singular as $rule => $replacement) {
	186	+ if (preg_match($rule, $word)) {
187	187	return preg_replace($rule, $replacement, $word);
188	188	}
189	189	}
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	* the words in the title.
213	213	* @return string Text formatted as title
214	214	*/
215		- public static function titleize($word, $uppercase = ''){
	215	+ public static function titleize($word, $uppercase = '') {
216	216	$uppercase = $uppercase === 'first' ? 'ucfirst' : 'ucwords';
217	217	return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
218	218	}
		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233	* @param string $word Word to convert to camel case
234	234	* @return string UpperCamelCasedWord
235	235	*/
236		- public static function camelize($word){
	236	+ public static function camelize($word) {
237	237	return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
238	238	}
239	239
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	* @param string $word Word to underscore
254	254	* @return string Underscored word
255	255	*/
256		- public static function underscore($word){
	256	+ public static function underscore($word) {
257	257	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))));
258	258	}
259	259
		@@ -277,9 +277,9 @@ discard block
		block discarded – undo
277	277	* instead of just the first one.
278	278	* @return string Human-readable word
279	279	*/
280		- public static function humanize($word, $uppercase = ''){
	280	+ public static function humanize($word, $uppercase = '') {
281	281	//make special exceptions for acronyms
282		- $word = str_replace('wp_', 'WP_', $word );
	282	+ $word = str_replace('wp_', 'WP_', $word);
283	283	$uppercase = $uppercase === 'all' ? 'ucwords' : 'ucfirst';
284	284	return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
285	285	}
		@@ -300,9 +300,9 @@ discard block
		block discarded – undo
300	300	* @param string $word Word to lowerCamelCase
301	301	* @return string Returns a lowerCamelCasedWord
302	302	*/
303		- public static function variablize($word){
	303	+ public static function variablize($word) {
304	304	$word = EEH_Inflector::camelize($word);
305		- return strtolower($word[0]) . substr($word, 1);
	305	+ return strtolower($word[0]).substr($word, 1);
306	306	}
307	307
308	308	// }}}
		@@ -320,7 +320,7 @@ discard block
		block discarded – undo
320	320	* @param string $class_name Class name for getting related table_name.
321	321	* @return string plural_table_name
322	322	*/
323		- public static function tableize($class_name){
	323	+ public static function tableize($class_name) {
324	324	return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
325	325	}
326	326
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	* @param string $table_name Table name for getting related ClassName.
340	340	* @return string SingularClassName
341	341	*/
342		- public static function classify($table_name){
	342	+ public static function classify($table_name) {
343	343	return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
344	344	}
345	345
		@@ -356,21 +356,21 @@ discard block
		block discarded – undo
356	356	* @param integer $number Number to get its ordinal value
357	357	* @return string Ordinal representation of given string.
358	358	*/
359		- public static function ordinalize($number){
360		- if(in_array(($number % 100), range(11, 13))){
361		- return $number . 'th';
362		- }else{
363		- switch(($number % 10)){
	359	+ public static function ordinalize($number) {
	360	+ if (in_array(($number % 100), range(11, 13))) {
	361	+ return $number.'th';
	362	+ } else {
	363	+ switch (($number % 10)) {
364	364	case 1:
365		- return $number . 'st';
	365	+ return $number.'st';
366	366	break;
367	367	case 2:
368		- return $number . 'nd';
	368	+ return $number.'nd';
369	369	break;
370	370	case 3:
371		- return $number . 'rd';
	371	+ return $number.'rd';
372	372	default:
373		- return $number . 'th';
	373	+ return $number.'th';
374	374	break;
375	375	}
376	376	}
		@@ -386,6 +386,6 @@ discard block
		block discarded – undo
386	386	if (strtolower($string) === 'null') {
387	387	return $string;
388	388	}
389		- return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ') . $string;
	389	+ return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ').$string;
390	390	}
391	391	}
392	392	\ No newline at end of file

		@@ -1,6 +1,8 @@
		block discarded – undo
1	1	<?php use EventEspresso\core\interfaces\ResettableInterface;
2	2
3		-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
	3	+if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
	4	+ exit('No direct script access allowed');
	5	+}
4	6	/**
5	7	* Event Espresso
6	8	*

		@@ -37,19 +37,19 @@ discard block
		block discarded – undo
37	37	*/
38	38	protected static $using_get_the_excerpt = false;
39	39
40		- /**
41		- * Used to flag when the event list is being called from an external iframe.
42		- *
43		- * @var bool $iframe
44		- */
45		- protected static $iframe = false;
46		-
47		- /**
	40	+ /**
	41	+ * Used to flag when the event list is being called from an external iframe.
	42	+ *
	43	+ * @var bool $iframe
	44	+ */
	45	+ protected static $iframe = false;
	46	+
	47	+ /**
48	48	* @var \EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton $_iframe_embed_button
49	49	*/
50	50	private static $_iframe_embed_button;
51	51
52		- /**
	52	+ /**
53	53	* @type EE_Template_Part_Manager $template_parts
54	54	*/
55	55	protected $template_parts;
		@@ -233,26 +233,26 @@ discard block
		block discarded – undo
233	233
234	234
235	235
236		- /**
237		- * @access public
238		- * @return void
239		- * @throws \EE_Error
240		- * @throws \DomainException
241		- */
	236	+ /**
	237	+ * @access public
	238	+ * @return void
	239	+ * @throws \EE_Error
	240	+ * @throws \DomainException
	241	+ */
242	242	public function event_list_iframe() {
243		- \EED_Events_Archive::$iframe = true;
	243	+ \EED_Events_Archive::$iframe = true;
244	244	$event_list_iframe = new EventsArchiveIframe( $this );
245	245	$event_list_iframe->display();
246	246	}
247	247
248	248
249	249
250		- /**
251		- * @access public
252		- * @return string
253		- */
	250	+ /**
	251	+ * @access public
	252	+ * @return string
	253	+ */
254	254	public static function link_target() {
255		- return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
	255	+ return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
256	256	}
257	257
258	258

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
4		- exit( 'No direct script access allowed' );
	3	+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	4	+ exit('No direct script access allowed');
5	5	}
6	6	/**
7	7	*
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	*/
53	53	public function __construct() {
54	54	// deprecated functions
55		- espresso_load_required( 'EventEspresso\core\Factory', EE_CORE . 'Factory.php' );
	55	+ espresso_load_required('EventEspresso\core\Factory', EE_CORE.'Factory.php');
56	56	}
57	57
58	58
		@@ -68,16 +68,16 @@ discard block
		block discarded – undo
68	68	* @param EE_Response $response
69	69	* @return EE_Response
70	70	*/
71		- public function handle_request( EE_Request $request, EE_Response $response ) {
	71	+ public function handle_request(EE_Request $request, EE_Response $response) {
72	72	$this->request = $request;
73	73	$this->response = $response;
74	74	// info about how to load classes required by other classes
75	75	$this->dependency_map = $this->_load_dependency_map();
76	76	// central repository for classes
77	77	$this->registry = $this->_load_registry();
78		- do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading' );
	78	+ do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
79	79	// PSR4 Autoloaders
80		- $this->registry->load_core( 'EE_Psr4AutoloaderInit' );
	80	+ $this->registry->load_core('EE_Psr4AutoloaderInit');
81	81	// build DI container
82	82	$OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
83	83	$OpenCoffeeShop->addRecipes();
		@@ -87,20 +87,20 @@ discard block
		block discarded – undo
87	87	'CommandBusInterface',
88	88	array(
89	89	null,
90		- $this->registry->create( 'CapChecker' )
	90	+ $this->registry->create('CapChecker')
91	91	),
92	92	true
93	93	);
94	94	// workarounds for PHP < 5.3
95	95	$this->_load_class_tools();
96	96	// load interfaces
97		- espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
	97	+ espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
98	98	// deprecated functions
99		- espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
	99	+ espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
100	100	// WP cron jobs
101		- $this->registry->load_core( 'Cron_Tasks' );
102		- $this->registry->load_core( 'EE_Request_Handler' );
103		- $this->registry->load_core( 'EE_System' );
	101	+ $this->registry->load_core('Cron_Tasks');
	102	+ $this->registry->load_core('EE_Request_Handler');
	103	+ $this->registry->load_core('EE_System');
104	104
105	105	return $this->response;
106	106	}
		@@ -130,11 +130,11 @@ discard block
		block discarded – undo
130	130	* @throws \EE_Error
131	131	*/
132	132	public function dependency_map() {
133		- if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
	133	+ if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
134	134	throw new EE_Error(
135	135	sprintf(
136		- __( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
137		- print_r( $this->dependency_map, true )
	136	+ __('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
	137	+ print_r($this->dependency_map, true)
138	138	)
139	139	);
140	140	}
		@@ -148,11 +148,11 @@ discard block
		block discarded – undo
148	148	* @throws \EE_Error
149	149	*/
150	150	public function registry() {
151		- if ( ! $this->registry instanceof EE_Registry ) {
	151	+ if ( ! $this->registry instanceof EE_Registry) {
152	152	throw new EE_Error(
153	153	sprintf(
154		- __( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
155		- print_r( $this->registry, true )
	154	+ __('Invalid EE_Registry: "%1$s"', 'event_espresso'),
	155	+ print_r($this->registry, true)
156	156	)
157	157	);
158	158	}
		@@ -168,15 +168,15 @@ discard block
		block discarded – undo
168	168	* @return EE_Dependency_Map
169	169	*/
170	170	private function _load_dependency_map() {
171		- if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
	171	+ if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
172	172	EE_Error::add_error(
173		- __( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
	173	+ __('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
174	174	__FILE__, __FUNCTION__, __LINE__
175	175	);
176		- wp_die( EE_Error::get_notices() );
	176	+ wp_die(EE_Error::get_notices());
177	177	}
178		- require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
179		- return EE_Dependency_Map::instance( $this->request, $this->response );
	178	+ require_once(EE_CORE.'EE_Dependency_Map.core.php');
	179	+ return EE_Dependency_Map::instance($this->request, $this->response);
180	180	}
181	181
182	182
		@@ -188,15 +188,15 @@ discard block
		block discarded – undo
188	188	* @return EE_Registry
189	189	*/
190	190	private function _load_registry() {
191		- if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
	191	+ if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
192	192	EE_Error::add_error(
193		- __( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
	193	+ __('The EE_Registry core class could not be loaded.', 'event_espresso'),
194	194	__FILE__, __FUNCTION__, __LINE__
195	195	);
196		- wp_die( EE_Error::get_notices() );
	196	+ wp_die(EE_Error::get_notices());
197	197	}
198		- require_once( EE_CORE . 'EE_Registry.core.php' );
199		- return EE_Registry::instance( $this->dependency_map );
	198	+ require_once(EE_CORE.'EE_Registry.core.php');
	199	+ return EE_Registry::instance($this->dependency_map);
200	200	}
201	201
202	202
		@@ -207,13 +207,13 @@ discard block
		block discarded – undo
207	207	* @return void
208	208	*/
209	209	private function _load_class_tools() {
210		- if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
	210	+ if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
211	211	EE_Error::add_error(
212		- __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
	212	+ __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
213	213	__FILE__, __FUNCTION__, __LINE__
214	214	);
215	215	}
216		- require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
	216	+ require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
217	217	}
218	218
219	219
		@@ -227,13 +227,13 @@ discard block
		block discarded – undo
227	227	* @param \EE_Request $request
228	228	* @param \EE_Response $response
229	229	*/
230		- public function handle_response( EE_Request $request, EE_Response $response ) {
	230	+ public function handle_response(EE_Request $request, EE_Response $response) {
231	231	//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
232	232	//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
233	233	//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
234	234	//die();
235		- if ( $response->plugin_deactivated() ) {
236		- espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
	235	+ if ($response->plugin_deactivated()) {
	236	+ espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
237	237	}
238	238	}
239	239

		@@ -102,8 +102,8 @@
		block discarded – undo
102	102	// use_captcha ?
103	103	if (
104	104	EE_Registry::instance()->CFG->registration->use_captcha
105		- && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
106		- && ! (
	105	+ && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
	106	+ && ! (
107	107	EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
108	108	&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
109	109	)

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3
4	4	use EventEspresso\core\libraries\iframe_display\Iframe;
5	5
6		-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
7		- exit( 'No direct script access allowed' );
	6	+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	7	+ exit('No direct script access allowed');
8	8	}
9	9
10	10
		@@ -27,25 +27,25 @@ discard block
		block discarded – undo
27	27	* @param \EED_Events_Archive $EED_Events_Archive
28	28	* @throws \EE_Error
29	29	*/
30		- public function __construct( $EED_Events_Archive )
	30	+ public function __construct($EED_Events_Archive)
31	31	{
32		- \EE_Registry::instance()->REQ->set_espresso_page( true );
	32	+ \EE_Registry::instance()->REQ->set_espresso_page(true);
33	33	$EED_Events_Archive->event_list();
34	34	$event_list = new \EES_Espresso_Events();
35	35	parent::__construct(
36		- esc_html__( 'Event List', 'event_espresso' ),
	36	+ esc_html__('Event List', 'event_espresso'),
37	37	$event_list->process_shortcode()
38	38	);
39	39	$this->addStylesheets(
40	40	apply_filters(
41	41	'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
42	42	array(
43		- 'espresso_default' => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
44		- ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
45		- : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
	43	+ 'espresso_default' => is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')
	44	+ ? EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION
	45	+ : EE_GLOBAL_ASSETS_URL.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION,
46	46	$EED_Events_Archive->theme() => get_stylesheet_directory_uri()
47		- . $EED_Events_Archive->theme() . DS
48		- . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
	47	+ . $EED_Events_Archive->theme().DS
	48	+ . 'style.css?ver='.EVENT_ESPRESSO_VERSION,
49	49	)
50	50	)
51	51	);
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	\EE_Registry::instance()->CFG->map_settings->google_map_api_key
61	61	)
62	62	),
63		- 'ee_gmap' => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
	63	+ 'ee_gmap' => EE_HELPERS_ASSETS.'ee_gmap.js?ver=1.0',
64	64	)
65	65	)
66	66	);

		@@ -4,7 +4,7 @@ discard block
		block discarded – undo
4	4	use EventEspresso\core\libraries\iframe_display\Iframe;
5	5
6	6	if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
7		- exit( 'No direct script access allowed' );
	7	+ exit( 'No direct script access allowed' );
8	8	}
9	9
10	10
		@@ -21,59 +21,59 @@ discard block
		block discarded – undo
21	21
22	22
23	23
24		- /**
25		- * EventsArchiveIframe constructor.
26		- *
27		- * @param \EED_Events_Archive $EED_Events_Archive
28		- * @throws \DomainException
29		- */
30		- public function __construct( $EED_Events_Archive )
31		- {
32		- \EE_Registry::instance()->REQ->set_espresso_page( true );
33		- add_filter('FHEE__EED_Events_Archive__event_list_iframe', '__return_true');
34		- $EED_Events_Archive->event_list();
35		- $event_list = new \EES_Espresso_Events();
36		- parent::__construct(
37		- esc_html__( 'Event List', 'event_espresso' ),
38		- $event_list->process_shortcode()
39		- );
40		- $this->addStylesheets(
41		- apply_filters(
42		- 'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
43		- array(
44		- 'espresso_default' => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
45		- ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
46		- : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
47		- $EED_Events_Archive->theme() => get_stylesheet_directory_uri()
48		- . $EED_Events_Archive->theme() . DS
49		- . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
50		- ),
51		- $this
52		- )
53		- );
54		- $this->addScripts(
55		- apply_filters(
56		- 'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
57		- array(
58		- 'gmap_api' => sprintf(
59		- 'https://maps.googleapis.com/maps/api/js?key=%s',
60		- apply_filters(
61		- 'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
62		- \EE_Registry::instance()->CFG->map_settings->google_map_api_key
63		- )
64		- ),
65		- 'ee_gmap' => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
66		- ),
67		- $this
68		- )
69		- );
70		- $this->addLocalizedVars(
71		- array(
72		- 'ee_gmap' => \EEH_Maps::$gmap_vars,
73		- ),
74		- 'ee_gmap_vars'
75		- );
76		- }
	24	+ /**
	25	+ * EventsArchiveIframe constructor.
	26	+ *
	27	+ * @param \EED_Events_Archive $EED_Events_Archive
	28	+ * @throws \DomainException
	29	+ */
	30	+ public function __construct( $EED_Events_Archive )
	31	+ {
	32	+ \EE_Registry::instance()->REQ->set_espresso_page( true );
	33	+ add_filter('FHEE__EED_Events_Archive__event_list_iframe', '__return_true');
	34	+ $EED_Events_Archive->event_list();
	35	+ $event_list = new \EES_Espresso_Events();
	36	+ parent::__construct(
	37	+ esc_html__( 'Event List', 'event_espresso' ),
	38	+ $event_list->process_shortcode()
	39	+ );
	40	+ $this->addStylesheets(
	41	+ apply_filters(
	42	+ 'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
	43	+ array(
	44	+ 'espresso_default' => is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )
	45	+ ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
	46	+ : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
	47	+ $EED_Events_Archive->theme() => get_stylesheet_directory_uri()
	48	+ . $EED_Events_Archive->theme() . DS
	49	+ . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
	50	+ ),
	51	+ $this
	52	+ )
	53	+ );
	54	+ $this->addScripts(
	55	+ apply_filters(
	56	+ 'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
	57	+ array(
	58	+ 'gmap_api' => sprintf(
	59	+ 'https://maps.googleapis.com/maps/api/js?key=%s',
	60	+ apply_filters(
	61	+ 'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
	62	+ \EE_Registry::instance()->CFG->map_settings->google_map_api_key
	63	+ )
	64	+ ),
	65	+ 'ee_gmap' => EE_HELPERS_ASSETS . 'ee_gmap.js?ver=1.0',
	66	+ ),
	67	+ $this
	68	+ )
	69	+ );
	70	+ $this->addLocalizedVars(
	71	+ array(
	72	+ 'ee_gmap' => \EEH_Maps::$gmap_vars,
	73	+ ),
	74	+ 'ee_gmap_vars'
	75	+ );
	76	+ }
77	77
78	78
79	79

		@@ -17,27 +17,27 @@
		block discarded – undo
17	17	class TicketSelectorIframeEmbedButton extends IframeEmbedButton
18	18	{
19	19
20		- /**
21		- * TicketSelectorIframeEmbedButton constructor.
22		- */
23		- public function __construct()
24		- {
25		- parent::__construct(
26		- esc_html__( 'Ticket Selector', 'event_espresso' ),
27		- 'ticket_selector'
28		- );
29		- }
30		-
31		-
32		-
33		- /**
34		- * Adds an iframe embed code button to the Event editor.
35		- */
36		- public function addEventEditorIframeEmbedButton()
37		- {
38		- // add button for iframe code to event editor.
39		- $this->addEventEditorIframeEmbedButtonFilter();
40		- }
	20	+ /**
	21	+ * TicketSelectorIframeEmbedButton constructor.
	22	+ */
	23	+ public function __construct()
	24	+ {
	25	+ parent::__construct(
	26	+ esc_html__( 'Ticket Selector', 'event_espresso' ),
	27	+ 'ticket_selector'
	28	+ );
	29	+ }
	30	+
	31	+
	32	+
	33	+ /**
	34	+ * Adds an iframe embed code button to the Event editor.
	35	+ */
	36	+ public function addEventEditorIframeEmbedButton()
	37	+ {
	38	+ // add button for iframe code to event editor.
	39	+ $this->addEventEditorIframeEmbedButtonFilter();
	40	+ }
41	41
42	42
43	43

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3
4	4	use EventEspresso\core\libraries\iframe_display\IframeEmbedButton;
5	5
6		-defined( 'ABSPATH' ) \|\| exit;
	6	+defined('ABSPATH') \|\| exit;
7	7
8	8
9	9
		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	public function __construct()
24	24	{
25	25	parent::__construct(
26		- esc_html__( 'Ticket Selector', 'event_espresso' ),
	26	+ esc_html__('Ticket Selector', 'event_espresso'),
27	27	'ticket_selector'
28	28	);
29	29	}

eventespresso / event-espresso-core

Branch — BUG-10381-asset-loading (f91422)

Status

Category

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +334 added lines, -334 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +178 added lines, -178 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +131 added lines, -132 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch