eventespresso / event-espresso-core

core/helpers/EEH_Autoloader.helper.php

Indentation +282 added lines, -282 removed lines

@@ -15,286 +15,286 @@
 {
 
 
-    /**
-     *    instance of the EE_System object
-     *
-     * @var    $_instance
-     * @access    private
-     */
-    private static $_instance = null;
-
-    /**
-    *   $_autoloaders
-    *   @var array $_autoloaders
-    *   @access     private
-    */
-    private static $_autoloaders;
-
-    /**
-     * set to "paths" to display autoloader class => path mappings
-     * set to "times" to display autoloader loading times
-     * set to "all" to display both
-     *
-     * @var string $debug
-     * @access    private
-     */
-    public static $debug = false;
-
-
-
-    /**
-     *    class constructor
-     *
-     * @access    private
-     * @return \EEH_Autoloader
-     */
-    private function __construct()
-    {
-        if (self::$_autoloaders === null) {
-            self::$_autoloaders = array();
-            $this->_register_custom_autoloaders();
-            spl_autoload_register(array( $this, 'espresso_autoloader' ));
-        }
-    }
-
-
-
-    /**
-     * @access public
-     * @return EEH_Autoloader
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated
-        if (! self::$_instance instanceof EEH_Autoloader) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-
-    /**
-     *    espresso_autoloader
-     *
-     * @access    public
-     * @param   $class_name
-     * @internal  param $className
-     * @internal  param string $class_name - simple class name ie: session
-     * @return  void
-     */
-    public static function espresso_autoloader($class_name)
-    {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            require_once(self::$_autoloaders[ $class_name ]);
-        }
-    }
-
-
-
-    /**
-     *    register_autoloader
-     *
-     * @access    public
-     * @param array | string $class_paths - array of key => value pairings between class names and paths
-     * @param bool           $read_check  true if we need to check whether the file is readable or not.
-     * @param bool           $debug **deprecated**
-     * @throws \EE_Error
-     */
-    public static function register_autoloader($class_paths, $read_check = true, $debug = false)
-    {
-        $class_paths = is_array($class_paths) ? $class_paths : array( $class_paths );
-        foreach ($class_paths as $class => $path) {
-            // don't give up! you gotta...
-            // get some class
-            if (empty($class)) {
-                throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
-            }
-            // one day you will find the path young grasshopper
-            if (empty($path)) {
-                throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
-            }
-            // is file readable ?
-            if ($read_check && ! is_readable($path)) {
-                throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
-            }
-            if (! isset(self::$_autoloaders[ $class ])) {
-                self::$_autoloaders[ $class ] = str_replace(array( '/', '\\' ), DS, $path);
-                if (EE_DEBUG && ( EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug )) {
-                    EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
-                }
-            }
-        }
-    }
-
-
-
-
-    /**
-     *  get_autoloaders
-     *
-     *  @access public
-     *  @return array
-     */
-    public static function get_autoloaders()
-    {
-        return self::$_autoloaders;
-    }
-
-
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     *  @access private
-     *  @return void
-     */
-    private function _register_custom_autoloaders()
-    {
-        EEH_Autoloader::$debug = '';
-        \EEH_Autoloader::register_helpers_autoloaders();
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            EEH_Debug_Tools::instance()->show_times();
-        }
-    }
-
-
-
-    /**
-     *    register core, model and class 'autoloaders'
-     *
-     * @access public
-     */
-    public static function register_helpers_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-    }
-
-
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     *  @access public
-     *  @return void
-     */
-    public static function register_form_sections_autoloaders()
-    {
-        // EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
-    }
-
-
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     *  @access public
-     *  @return void
-     */
-    public static function register_line_item_display_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
-    }
-
-
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     *  @access public
-     *  @return void
-     */
-    public static function register_line_item_filter_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
-    }
-
-
-
-
-    /**
-     *  register template part 'autoloaders'
-     *
-     *  @access public
-     *  @return void
-     */
-    public static function register_template_part_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
-    }
-
-
-
-    /**
-     * Assumes all the files in this folder have the normal naming scheme (namely that their classname
-     * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
-     * If that's not the case, you'll need to improve this function or just use EEH_File::get_classname_from_filepath_with_standard_filename() directly.
-     * Yes this has to scan the directory for files, but it only does it once -- not on EACH
-     * time the autoloader is used
-     *
-     * @param string $folder name, with or without trailing /, doesn't matter
-     * @param bool   $recursive
-     * @param bool   $debug  **deprecated**
-     * @throws \EE_Error
-     */
-    public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false)
-    {
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
-            EEH_Debug_Tools::instance()->start_timer(basename($folder));
-        }
-        // make sure last char is a /
-        $folder .= $folder[ strlen($folder)-1 ] !== DS ? DS : '';
-        $class_to_filepath_map = array();
-        $exclude = array( 'index' );
-        // get all the files in that folder that end in php
-        $filepaths = glob($folder.'*');
-
-        if (empty($filepaths)) {
-            return;
-        }
-
-        foreach ($filepaths as $filepath) {
-            if (substr($filepath, -4, 4) === '.php') {
-                $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
-                }
-            } elseif ($recursive) {
-                EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
-            }
-        }
-        // we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
-        self::register_autoloader($class_to_filepath_map, false, $debug);
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            EEH_Debug_Tools::instance()->stop_timer(basename($folder));
-        }
-    }
-
-
-
-    /**
-     * add_alias
-     * register additional autoloader based on variation of the classname for an existing autoloader
-     *
-     * @access    public
-     * @param string $class_name - simple class name ie: EE_Session
-     * @param string $alias - variation on class name ie: EE_session, session, etc
-     */
-    public static function add_alias($class_name, $alias)
-    {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
-        }
-    }
+	/**
+	 *    instance of the EE_System object
+	 *
+	 * @var    $_instance
+	 * @access    private
+	 */
+	private static $_instance = null;
+
+	/**
+	 *   $_autoloaders
+	 *   @var array $_autoloaders
+	 *   @access     private
+	 */
+	private static $_autoloaders;
+
+	/**
+	 * set to "paths" to display autoloader class => path mappings
+	 * set to "times" to display autoloader loading times
+	 * set to "all" to display both
+	 *
+	 * @var string $debug
+	 * @access    private
+	 */
+	public static $debug = false;
+
+
+
+	/**
+	 *    class constructor
+	 *
+	 * @access    private
+	 * @return \EEH_Autoloader
+	 */
+	private function __construct()
+	{
+		if (self::$_autoloaders === null) {
+			self::$_autoloaders = array();
+			$this->_register_custom_autoloaders();
+			spl_autoload_register(array( $this, 'espresso_autoloader' ));
+		}
+	}
+
+
+
+	/**
+	 * @access public
+	 * @return EEH_Autoloader
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated
+		if (! self::$_instance instanceof EEH_Autoloader) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+
+	/**
+	 *    espresso_autoloader
+	 *
+	 * @access    public
+	 * @param   $class_name
+	 * @internal  param $className
+	 * @internal  param string $class_name - simple class name ie: session
+	 * @return  void
+	 */
+	public static function espresso_autoloader($class_name)
+	{
+		if (isset(self::$_autoloaders[ $class_name ])) {
+			require_once(self::$_autoloaders[ $class_name ]);
+		}
+	}
+
+
+
+	/**
+	 *    register_autoloader
+	 *
+	 * @access    public
+	 * @param array | string $class_paths - array of key => value pairings between class names and paths
+	 * @param bool           $read_check  true if we need to check whether the file is readable or not.
+	 * @param bool           $debug **deprecated**
+	 * @throws \EE_Error
+	 */
+	public static function register_autoloader($class_paths, $read_check = true, $debug = false)
+	{
+		$class_paths = is_array($class_paths) ? $class_paths : array( $class_paths );
+		foreach ($class_paths as $class => $path) {
+			// don't give up! you gotta...
+			// get some class
+			if (empty($class)) {
+				throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
+			}
+			// one day you will find the path young grasshopper
+			if (empty($path)) {
+				throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
+			}
+			// is file readable ?
+			if ($read_check && ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
+			}
+			if (! isset(self::$_autoloaders[ $class ])) {
+				self::$_autoloaders[ $class ] = str_replace(array( '/', '\\' ), DS, $path);
+				if (EE_DEBUG && ( EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug )) {
+					EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+				}
+			}
+		}
+	}
+
+
+
+
+	/**
+	 *  get_autoloaders
+	 *
+	 *  @access public
+	 *  @return array
+	 */
+	public static function get_autoloaders()
+	{
+		return self::$_autoloaders;
+	}
+
+
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 *  @access private
+	 *  @return void
+	 */
+	private function _register_custom_autoloaders()
+	{
+		EEH_Autoloader::$debug = '';
+		\EEH_Autoloader::register_helpers_autoloaders();
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			EEH_Debug_Tools::instance()->show_times();
+		}
+	}
+
+
+
+	/**
+	 *    register core, model and class 'autoloaders'
+	 *
+	 * @access public
+	 */
+	public static function register_helpers_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+	}
+
+
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 *  @access public
+	 *  @return void
+	 */
+	public static function register_form_sections_autoloaders()
+	{
+		// EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
+	}
+
+
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 *  @access public
+	 *  @return void
+	 */
+	public static function register_line_item_display_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+	}
+
+
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 *  @access public
+	 *  @return void
+	 */
+	public static function register_line_item_filter_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+	}
+
+
+
+
+	/**
+	 *  register template part 'autoloaders'
+	 *
+	 *  @access public
+	 *  @return void
+	 */
+	public static function register_template_part_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+	}
+
+
+
+	/**
+	 * Assumes all the files in this folder have the normal naming scheme (namely that their classname
+	 * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
+	 * If that's not the case, you'll need to improve this function or just use EEH_File::get_classname_from_filepath_with_standard_filename() directly.
+	 * Yes this has to scan the directory for files, but it only does it once -- not on EACH
+	 * time the autoloader is used
+	 *
+	 * @param string $folder name, with or without trailing /, doesn't matter
+	 * @param bool   $recursive
+	 * @param bool   $debug  **deprecated**
+	 * @throws \EE_Error
+	 */
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false)
+	{
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
+			EEH_Debug_Tools::instance()->start_timer(basename($folder));
+		}
+		// make sure last char is a /
+		$folder .= $folder[ strlen($folder)-1 ] !== DS ? DS : '';
+		$class_to_filepath_map = array();
+		$exclude = array( 'index' );
+		// get all the files in that folder that end in php
+		$filepaths = glob($folder.'*');
+
+		if (empty($filepaths)) {
+			return;
+		}
+
+		foreach ($filepaths as $filepath) {
+			if (substr($filepath, -4, 4) === '.php') {
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
+				if (! in_array($class_name, $exclude)) {
+					$class_to_filepath_map [ $class_name ] = $filepath;
+				}
+			} elseif ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
+			}
+		}
+		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
+		self::register_autoloader($class_to_filepath_map, false, $debug);
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			EEH_Debug_Tools::instance()->stop_timer(basename($folder));
+		}
+	}
+
+
+
+	/**
+	 * add_alias
+	 * register additional autoloader based on variation of the classname for an existing autoloader
+	 *
+	 * @access    public
+	 * @param string $class_name - simple class name ie: EE_Session
+	 * @param string $alias - variation on class name ie: EE_session, session, etc
+	 */
+	public static function add_alias($class_name, $alias)
+	{
+		if (isset(self::$_autoloaders[ $class_name ])) {
+			self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
+		}
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -53,7 +53,7 @@ 
         if (self::$_autoloaders === null) {
             self::$_autoloaders = array();
             $this->_register_custom_autoloaders();
-            spl_autoload_register(array( $this, 'espresso_autoloader' ));
+            spl_autoload_register(array($this, 'espresso_autoloader'));
         }
     }
 
@@ -66,7 +66,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EEH_Autoloader) {
+        if ( ! self::$_instance instanceof EEH_Autoloader) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -85,8 +85,8 @@ 
      */
     public static function espresso_autoloader($class_name)
     {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            require_once(self::$_autoloaders[ $class_name ]);
+        if (isset(self::$_autoloaders[$class_name])) {
+            require_once(self::$_autoloaders[$class_name]);
         }
     }
 
@@ -103,7 +103,7 @@ 
      */
     public static function register_autoloader($class_paths, $read_check = true, $debug = false)
     {
-        $class_paths = is_array($class_paths) ? $class_paths : array( $class_paths );
+        $class_paths = is_array($class_paths) ? $class_paths : array($class_paths);
         foreach ($class_paths as $class => $path) {
             // don't give up! you gotta...
             // get some class
@@ -118,10 +118,10 @@ 
             if ($read_check && ! is_readable($path)) {
                 throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
             }
-            if (! isset(self::$_autoloaders[ $class ])) {
-                self::$_autoloaders[ $class ] = str_replace(array( '/', '\\' ), DS, $path);
-                if (EE_DEBUG && ( EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug )) {
-                    EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+            if ( ! isset(self::$_autoloaders[$class])) {
+                self::$_autoloaders[$class] = str_replace(array('/', '\\'), DS, $path);
+                if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
+                    EEH_Debug_Tools::printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
                 }
             }
         }
@@ -154,13 +154,13 @@ 
     {
         EEH_Autoloader::$debug = '';
         \EEH_Autoloader::register_helpers_autoloaders();
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces');
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'messages');
         if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
             EEH_Debug_Tools::instance()->show_times();
         }
@@ -203,7 +203,7 @@ 
      */
     public static function register_line_item_display_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
     }
 
 
@@ -217,7 +217,7 @@ 
      */
     public static function register_line_item_filter_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
     }
 
 
@@ -231,7 +231,7 @@ 
      */
     public static function register_template_part_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
     }
 
 
@@ -254,9 +254,9 @@ 
             EEH_Debug_Tools::instance()->start_timer(basename($folder));
         }
         // make sure last char is a /
-        $folder .= $folder[ strlen($folder)-1 ] !== DS ? DS : '';
+        $folder .= $folder[strlen($folder) - 1] !== DS ? DS : '';
         $class_to_filepath_map = array();
-        $exclude = array( 'index' );
+        $exclude = array('index');
         // get all the files in that folder that end in php
         $filepaths = glob($folder.'*');
 
@@ -267,8 +267,8 @@ 
         foreach ($filepaths as $filepath) {
             if (substr($filepath, -4, 4) === '.php') {
                 $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
+                if ( ! in_array($class_name, $exclude)) {
+                    $class_to_filepath_map [$class_name] = $filepath;
                 }
             } elseif ($recursive) {
                 EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
@@ -293,8 +293,8 @@ 
      */
     public static function add_alias($class_name, $alias)
     {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
+        if (isset(self::$_autoloaders[$class_name])) {
+            self::$_autoloaders[$alias] = self::$_autoloaders[$class_name];
         }
     }
 }

core/helpers/EEH_Class_Tools.helper.php

Indentation +114 added lines, -114 removed lines

@@ -11,131 +11,131 @@
 class EEH_Class_Tools
 {
 
-    public static $i = 0;
-    public static $file_line = null;
+	public static $i = 0;
+	public static $file_line = null;
 
-    /**
-     *  get_called_class - for PHP versions < 5.3
-     *
-     *  @access     public
-     *  @author origins:  http://stackoverflow.com/a/1542045
-     *  return string
-     */
-    public static function get_called_class()
-    {
-        $backtrace = debug_backtrace();
-        if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
-            return $backtrace[2]['class'];
-        } elseif (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
-            return $backtrace[3]['class'];
-        } elseif (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
-            if (self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line']) {
-                self::$i++;
-            } else {
-                self::$i = 0;
-                self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
-            }
-            // was  class method called via call_user_func ?
-            if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
-                if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
-                    $called_class = $backtrace[2]['args'][0][0];
-                    // is it an EE function ?
-                    if (strpos($called_class, 'EE') === 0) {
-                        $prefix_chars = strpos($called_class, '_') + 1;
-                        $prefix = substr($called_class, 0, $prefix_chars);
-                        $classname = substr($called_class, $prefix_chars, strlen($called_class));
-                        $classname = $prefix . str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
-                        return $classname;
-                    }
-                }
-            } else {
-                $lines = file($backtrace[2]['file']);
-                preg_match_all('/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[ $backtrace[2]['line']-1 ], $matches);
-                if (isset($matches[1]) && isset($matches[1][ self::$i ])) {
-                    return $matches[1][ self::$i ];
-                }
-            }
-        }
-        return false;
-    }
+	/**
+	 *  get_called_class - for PHP versions < 5.3
+	 *
+	 *  @access     public
+	 *  @author origins:  http://stackoverflow.com/a/1542045
+	 *  return string
+	 */
+	public static function get_called_class()
+	{
+		$backtrace = debug_backtrace();
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
+			return $backtrace[2]['class'];
+		} elseif (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
+			return $backtrace[3]['class'];
+		} elseif (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
+			if (self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line']) {
+				self::$i++;
+			} else {
+				self::$i = 0;
+				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+			}
+			// was  class method called via call_user_func ?
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
+					$called_class = $backtrace[2]['args'][0][0];
+					// is it an EE function ?
+					if (strpos($called_class, 'EE') === 0) {
+						$prefix_chars = strpos($called_class, '_') + 1;
+						$prefix = substr($called_class, 0, $prefix_chars);
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
+						$classname = $prefix . str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
+						return $classname;
+					}
+				}
+			} else {
+				$lines = file($backtrace[2]['file']);
+				preg_match_all('/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[ $backtrace[2]['line']-1 ], $matches);
+				if (isset($matches[1]) && isset($matches[1][ self::$i ])) {
+					return $matches[1][ self::$i ];
+				}
+			}
+		}
+		return false;
+	}
 
 
 
 
-    /**
-     *  get_class_names_for_all_callbacks_on_hook
-     * returns an array of names for all classes that have methods registered as callbacks for the given action or filter hook
-     *  @access     public
-     *  @param  string  $hook
-     *  @return     array
-     */
-    public static function get_class_names_for_all_callbacks_on_hook($hook = null)
-    {
-        global $wp_filter;
-        $class_names = array();
-        // are any callbacks registered for this hook ?
-        if (isset($wp_filter[ $hook ])) {
-            // loop thru all of the callbacks attached to the deprecated hookpoint
-            foreach ($wp_filter[ $hook ] as $priority) {
-                foreach ($priority as $callback) {
-                    // is the callback a non-static class method ?
-                    if (isset($callback['function']) && is_array($callback['function'])) {
-                        if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
-                            $class_names[] = get_class($callback['function'][0]);
-                        }
-                    // test for static method
-                    } elseif (strpos($callback['function'], '::') !== false) {
-                        $class = explode('::', $callback['function']);
-                        $class_names[] = $class[0];
-                    } else {
-                        // just a function
-                    }
-                }
-            }
-        }
-        return $class_names;
-    }
+	/**
+	 *  get_class_names_for_all_callbacks_on_hook
+	 * returns an array of names for all classes that have methods registered as callbacks for the given action or filter hook
+	 *  @access     public
+	 *  @param  string  $hook
+	 *  @return     array
+	 */
+	public static function get_class_names_for_all_callbacks_on_hook($hook = null)
+	{
+		global $wp_filter;
+		$class_names = array();
+		// are any callbacks registered for this hook ?
+		if (isset($wp_filter[ $hook ])) {
+			// loop thru all of the callbacks attached to the deprecated hookpoint
+			foreach ($wp_filter[ $hook ] as $priority) {
+				foreach ($priority as $callback) {
+					// is the callback a non-static class method ?
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
+						}
+					// test for static method
+					} elseif (strpos($callback['function'], '::') !== false) {
+						$class = explode('::', $callback['function']);
+						$class_names[] = $class[0];
+					} else {
+						// just a function
+					}
+				}
+			}
+		}
+		return $class_names;
+	}
 
 
 
 
-    /**
-     *  property_exists() with fallback for PHP versions < 5.3
-     *  @access     public
-     *  @param      mixed object | string   $class
-     *  @param      string  $property
-     *  @return         boolean
-     */
-    public static function has_property($class = null, $property = null)
-    {
-        // if $class or $property don't exist, then get out, cuz that would be like... fatal dude
-        if (empty($class) || empty($property)) {
-            return false;
-        }
-        // if your hosting company doesn't cut the mustard
-        if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-            // just in case $class is an actual instantiated object
-            if (is_object($class)) {
-                return isset($class->{$property}) ? true : false;
-            } else {
-                // use reflection for < PHP 5.3 to get details using just the class name
-                $reflector = new ReflectionClass($class);
-                return $reflector->hasProperty($property);
-            }
-        } else {
-            // or try regular property exists method which works as expected in PHP 5.3+
-            return property_exists($class, $property);
-        }
-    }
+	/**
+	 *  property_exists() with fallback for PHP versions < 5.3
+	 *  @access     public
+	 *  @param      mixed object | string   $class
+	 *  @param      string  $property
+	 *  @return         boolean
+	 */
+	public static function has_property($class = null, $property = null)
+	{
+		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
+		if (empty($class) || empty($property)) {
+			return false;
+		}
+		// if your hosting company doesn't cut the mustard
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+			// just in case $class is an actual instantiated object
+			if (is_object($class)) {
+				return isset($class->{$property}) ? true : false;
+			} else {
+				// use reflection for < PHP 5.3 to get details using just the class name
+				$reflector = new ReflectionClass($class);
+				return $reflector->hasProperty($property);
+			}
+		} else {
+			// or try regular property exists method which works as expected in PHP 5.3+
+			return property_exists($class, $property);
+		}
+	}
 }
 
 // if PHP version < 5.3
 if (! function_exists('get_called_class')) {
-    /**
-     * @return string
-     */
-    function get_called_class()
-    {
-        return EEH_Class_Tools::get_called_class();
-    }
+	/**
+	 * @return string
+	 */
+	function get_called_class()
+	{
+		return EEH_Class_Tools::get_called_class();
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -29,11 +29,11 @@ 
         } elseif (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
             return $backtrace[3]['class'];
         } elseif (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
-            if (self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line']) {
+            if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
                 self::$i++;
             } else {
                 self::$i = 0;
-                self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+                self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
             }
             // was  class method called via call_user_func ?
             if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
@@ -44,15 +44,15 @@ 
                         $prefix_chars = strpos($called_class, '_') + 1;
                         $prefix = substr($called_class, 0, $prefix_chars);
                         $classname = substr($called_class, $prefix_chars, strlen($called_class));
-                        $classname = $prefix . str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
+                        $classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
                         return $classname;
                     }
                 }
             } else {
                 $lines = file($backtrace[2]['file']);
-                preg_match_all('/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[ $backtrace[2]['line']-1 ], $matches);
-                if (isset($matches[1]) && isset($matches[1][ self::$i ])) {
-                    return $matches[1][ self::$i ];
+                preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
+                if (isset($matches[1]) && isset($matches[1][self::$i])) {
+                    return $matches[1][self::$i];
                 }
             }
         }
@@ -74,9 +74,9 @@ 
         global $wp_filter;
         $class_names = array();
         // are any callbacks registered for this hook ?
-        if (isset($wp_filter[ $hook ])) {
+        if (isset($wp_filter[$hook])) {
             // loop thru all of the callbacks attached to the deprecated hookpoint
-            foreach ($wp_filter[ $hook ] as $priority) {
+            foreach ($wp_filter[$hook] as $priority) {
                 foreach ($priority as $callback) {
                     // is the callback a non-static class method ?
                     if (isset($callback['function']) && is_array($callback['function'])) {
@@ -130,7 +130,7 @@ 
 }
 
 // if PHP version < 5.3
-if (! function_exists('get_called_class')) {
+if ( ! function_exists('get_called_class')) {
     /**
      * @return string
      */

core/helpers/EEH_Sideloader.helper.php

Indentation +148 added lines, -148 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
             '_upload_to' => $this->_get_wp_uploads_dir(),
             '_upload_from' => '',
             '_permissions' => 0644,
-            '_new_file_name' => 'EE_Sideloader_' . uniqid() . '.default'
+            '_new_file_name' => 'EE_Sideloader_'.uniqid().'.default'
             );
 
         $props = array_merge($defaults, $init);
@@ -57,7 +57,7 @@ 
         }
 
         // make sure we include the required wp file for needed functions
-        require_once(ABSPATH . 'wp-admin/includes/file.php');
+        require_once(ABSPATH.'wp-admin/includes/file.php');
     }
 
 
@@ -109,14 +109,14 @@ 
         // setup temp dir
         $temp_file = wp_tempnam($this->_upload_from);
 
-        if (!$temp_file) {
+        if ( ! $temp_file) {
             EE_Error::add_error(__('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
 
         do_action('AHEE__EEH_Sideloader__sideload__before', $this, $temp_file);
 
-        $wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array( 'timeout' => 500, 'stream' => true, 'filename' => $temp_file ), $this, $temp_file);
+        $wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array('timeout' => 500, 'stream' => true, 'filename' => $temp_file), $this, $temp_file);
 
         $response = wp_safe_remote_get($this->_upload_from, $wp_remote_args);
 
@@ -142,7 +142,7 @@ 
         $file = $temp_file;
 
         // now we have the file, let's get it in the right directory with the right name.
-        $path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to . $this->_new_file_name, $this);
+        $path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to.$this->_new_file_name, $this);
 
         // move file in
         if (false === @ rename($file, $path)) {

core/helpers/EEH_Tabbed_Content.helper.php

Indentation +192 added lines, -192 removed lines

@@ -21,202 +21,202 @@
 
 
 
-    /**
-     * assembles and returns the html structure for tabs
-     *
-     * @static
-     * @param  array $tabs_contents an array of the content for each tab [required]
-     * @param  array $tabs_names    an unassociative array of names for each tab [optional] - if this isn't included then we use the indexes for $tabs_content as the tab names)
-     * @param bool   $small_tabs
-     * @param bool   $tabs_content
-     * @return string the assembled html string containing the tabbed content for display.
-     * @throws \EE_Error
-     */
-    public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = true)
-    {
-
-        // first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-        if (!empty($tabs_names) && ( count((array) $tabs_names) != count((array) $tabs_content) )) {
-            throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
-        }
-
-        // make sure we've got incoming data setup properly
-        $tabs = !empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
-        $tabs_content = !empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
-
-        $all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-        $all_tabs_content = '';
-
-        $index = 0;
-        foreach ($tabs as $tab) {
-            $active = $index === 0 ? true : false;
-            $all_tabs .= self::tab($tab, $active);
-            $all_tabs_content .= self::tab_content($tab, $tabs_content[ $tab ], $active);
-            $index++;
-        }
-        /*
+	/**
+	 * assembles and returns the html structure for tabs
+	 *
+	 * @static
+	 * @param  array $tabs_contents an array of the content for each tab [required]
+	 * @param  array $tabs_names    an unassociative array of names for each tab [optional] - if this isn't included then we use the indexes for $tabs_content as the tab names)
+	 * @param bool   $small_tabs
+	 * @param bool   $tabs_content
+	 * @return string the assembled html string containing the tabbed content for display.
+	 * @throws \EE_Error
+	 */
+	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = true)
+	{
+
+		// first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
+		if (!empty($tabs_names) && ( count((array) $tabs_names) != count((array) $tabs_content) )) {
+			throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
+		}
+
+		// make sure we've got incoming data setup properly
+		$tabs = !empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+		$tabs_content = !empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
+
+		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		$all_tabs_content = '';
+
+		$index = 0;
+		foreach ($tabs as $tab) {
+			$active = $index === 0 ? true : false;
+			$all_tabs .= self::tab($tab, $active);
+			$all_tabs_content .= self::tab_content($tab, $tabs_content[ $tab ], $active);
+			$index++;
+		}
+		/*
         sample content for testing
 
         $all_tabs .= '<a class="nav-tab" rel="ee-tab-anothertab" href="#anothertab">Another Tab</a>';
         $all_tabs_content .= '<div class="nav-tab-content hidden" id="ee-tab-anothertab">This is just some sample content to show another tab<div style="clear:both"></div></div>';
         //end sample content /**/
 
-        $all_tabs .= '</h2>';
-
-        $tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
-
-        return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
-    }
-
-
-
-    /**
-     * display_admin_nav_tabs
-     * this returns the properly formatted tab html for EE_Admin_Pages.
-     * We are expecting an array of tabs in the following format
-     * array(
-     *    'nav_tab_name' => array(
-     *        'url' => 'url for tab',
-     *        'link_text' => 'tab text',
-     *        'css_class' => 'tab class' //including the nav-tab-active class if its active
-     *    )
-     * )
-     *
-     * @access public
-     * @static
-     * @param array $nav_tabs tab array for nav tabs
-     * @return string
-     * @throws \EE_Error
-     */
-    public static function display_admin_nav_tabs($nav_tabs = array())
-    {
-        if (empty($nav_tabs)) {
-            throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
-        }
-
-        $all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-        foreach ($nav_tabs as $slug => $tab) {
-            $all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
-        }
-        $all_tabs .= '</h2>';
-        return $all_tabs;
-    }
-
-    /**
-     * this simply returns a single tab given a tab name & content
-     * @param  string $name    name of tab
-     * @param bool $active true=tab active, false=tab not active
-     * @param bool|string $nice_name if string given then this value will be used for the tab link text.
-     * @param bool|string $url If url given then tabs will be generated linking to the url.
-     * @param bool|string $css If string given then the generated tab will include that as the class.
-     * @return string          html for tab
-     */
-    private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
-    {
-        $name = str_replace(' ', '-', $name);
-        $class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-        $class = $css ? $class . ' ' . $css : $class;
-        $nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
-        $url = $url ? $url : '#' . $name;
-        $tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
-        return $tab;
-    }
-
-
-
-    /**
-     * this just returns the properly formatted tab content for our tab box.
-     *
-     * @param  string $name        name of tab (used for selector)
-     * @param  string $tab_content content of tab
-     * @param  bool   $active
-     * @return string html for content area
-     */
-    private static function tab_content($name, $tab_content, $active = false)
-    {
-        $class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
-        $name = str_replace(' ', '-', $name);
-        $content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-        $content .= "\t" . $tab_content . "\n";
-        $content .= '<div style="clear:both"></div></div>';
-        return $content;
-    }
-
-
-
-    /** HORIZONTAL TEXT LINKS **/
-
-    /**
-     * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to items.
-     * There is a corresponding js file that can be loaded to dynamically display containers with the same id as the href -ref.
-     *
-     * @param  array $item_array      formatted array of items.  Format:
-     * array(
-     *      'label' => __('localized label displayed'),
-     *      'class' => 'class_for_item',
-     *      'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark the js will used this to show the container div.
-     *      'title' => __('localized text for the title attribute of the link'),
-     *      'slug' => 'slug_used_for_reference'
-     * )
-     * @param  string $container_class class used for main container
-     * @param  string $sep              you can add in what is used as a separator between each link (or leave blank for none)
-     * @param string $default           You can include a string for the item that will receive the "item_display" class for the js.
-     * @return string                  a html snippet of of all the formatted link elements.
-     */
-    public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '')
-    {
-        $item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
-        if (!is_array($item_array) || empty($item_array)) {
-            return false; // get out we don't have even the basic thing we need!
-        }
-
-
-        $defaults = array(
-            'label' => __('Item', 'event_espresso'),
-            'class' => '',
-            'href' => '',
-            'title' => esc_attr__('Link for Item', 'event_espresso'),
-            'slug' => 'item_slug'
-        );
-        $container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-        $list = '<ul class="' . $container_class . '">';
-
-        $ci = 1;
-        foreach ($item_array as $item) {
-            $item = wp_parse_args($item, $defaults);
-            $item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
-            $list .= self::_text_link_item($item);
-            if (!empty($sep) && $ci != count($item_array)) {
-                $list .= self::_text_link_item($sep);
-            }
-            $ci++;
-        }
-
-        $list .= '</ul>';
-        return $list;
-    }
-
-
-
-    private static function _text_link_item($item)
-    {
-        // if this isn't an array then we're doing a separator
-        if (!is_array($item)) {
-            $label = $item;
-            $class = 'ee-text-link-sep';
-            $href = '';
-            $title = '';
-        } else {
-            extract($item);
-        }
-
-        $class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
-
-        $content = '<li ' . $class . '>';
-        $content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
-        $content .= $label;
-        $content .= !empty($href) ? '</a>' : '';
-        $content .= '</li>';
-        return $content;
-    }
+		$all_tabs .= '</h2>';
+
+		$tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
+
+		return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+	}
+
+
+
+	/**
+	 * display_admin_nav_tabs
+	 * this returns the properly formatted tab html for EE_Admin_Pages.
+	 * We are expecting an array of tabs in the following format
+	 * array(
+	 *    'nav_tab_name' => array(
+	 *        'url' => 'url for tab',
+	 *        'link_text' => 'tab text',
+	 *        'css_class' => 'tab class' //including the nav-tab-active class if its active
+	 *    )
+	 * )
+	 *
+	 * @access public
+	 * @static
+	 * @param array $nav_tabs tab array for nav tabs
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public static function display_admin_nav_tabs($nav_tabs = array())
+	{
+		if (empty($nav_tabs)) {
+			throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
+		}
+
+		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		foreach ($nav_tabs as $slug => $tab) {
+			$all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
+		}
+		$all_tabs .= '</h2>';
+		return $all_tabs;
+	}
+
+	/**
+	 * this simply returns a single tab given a tab name & content
+	 * @param  string $name    name of tab
+	 * @param bool $active true=tab active, false=tab not active
+	 * @param bool|string $nice_name if string given then this value will be used for the tab link text.
+	 * @param bool|string $url If url given then tabs will be generated linking to the url.
+	 * @param bool|string $css If string given then the generated tab will include that as the class.
+	 * @return string          html for tab
+	 */
+	private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
+	{
+		$name = str_replace(' ', '-', $name);
+		$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
+		$class = $css ? $class . ' ' . $css : $class;
+		$nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
+		$url = $url ? $url : '#' . $name;
+		$tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+		return $tab;
+	}
+
+
+
+	/**
+	 * this just returns the properly formatted tab content for our tab box.
+	 *
+	 * @param  string $name        name of tab (used for selector)
+	 * @param  string $tab_content content of tab
+	 * @param  bool   $active
+	 * @return string html for content area
+	 */
+	private static function tab_content($name, $tab_content, $active = false)
+	{
+		$class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
+		$name = str_replace(' ', '-', $name);
+		$content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
+		$content .= "\t" . $tab_content . "\n";
+		$content .= '<div style="clear:both"></div></div>';
+		return $content;
+	}
+
+
+
+	/** HORIZONTAL TEXT LINKS **/
+
+	/**
+	 * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to items.
+	 * There is a corresponding js file that can be loaded to dynamically display containers with the same id as the href -ref.
+	 *
+	 * @param  array $item_array      formatted array of items.  Format:
+	 * array(
+	 *      'label' => __('localized label displayed'),
+	 *      'class' => 'class_for_item',
+	 *      'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark the js will used this to show the container div.
+	 *      'title' => __('localized text for the title attribute of the link'),
+	 *      'slug' => 'slug_used_for_reference'
+	 * )
+	 * @param  string $container_class class used for main container
+	 * @param  string $sep              you can add in what is used as a separator between each link (or leave blank for none)
+	 * @param string $default           You can include a string for the item that will receive the "item_display" class for the js.
+	 * @return string                  a html snippet of of all the formatted link elements.
+	 */
+	public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '')
+	{
+		$item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
+		if (!is_array($item_array) || empty($item_array)) {
+			return false; // get out we don't have even the basic thing we need!
+		}
+
+
+		$defaults = array(
+			'label' => __('Item', 'event_espresso'),
+			'class' => '',
+			'href' => '',
+			'title' => esc_attr__('Link for Item', 'event_espresso'),
+			'slug' => 'item_slug'
+		);
+		$container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
+		$list = '<ul class="' . $container_class . '">';
+
+		$ci = 1;
+		foreach ($item_array as $item) {
+			$item = wp_parse_args($item, $defaults);
+			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+			$list .= self::_text_link_item($item);
+			if (!empty($sep) && $ci != count($item_array)) {
+				$list .= self::_text_link_item($sep);
+			}
+			$ci++;
+		}
+
+		$list .= '</ul>';
+		return $list;
+	}
+
+
+
+	private static function _text_link_item($item)
+	{
+		// if this isn't an array then we're doing a separator
+		if (!is_array($item)) {
+			$label = $item;
+			$class = 'ee-text-link-sep';
+			$href = '';
+			$title = '';
+		} else {
+			extract($item);
+		}
+
+		$class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+
+		$content = '<li ' . $class . '>';
+		$content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+		$content .= $label;
+		$content .= !empty($href) ? '</a>' : '';
+		$content .= '</li>';
+		return $content;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -36,22 +36,22 @@ 
     {
 
         // first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-        if (!empty($tabs_names) && ( count((array) $tabs_names) != count((array) $tabs_content) )) {
+        if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
             throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
         }
 
         // make sure we've got incoming data setup properly
-        $tabs = !empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
-        $tabs_content = !empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
+        $tabs = ! empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+        $tabs_content = ! empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
 
-        $all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+        $all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
         $all_tabs_content = '';
 
         $index = 0;
         foreach ($tabs as $tab) {
             $active = $index === 0 ? true : false;
             $all_tabs .= self::tab($tab, $active);
-            $all_tabs_content .= self::tab_content($tab, $tabs_content[ $tab ], $active);
+            $all_tabs_content .= self::tab_content($tab, $tabs_content[$tab], $active);
             $index++;
         }
         /*
@@ -65,7 +65,7 @@ 
 
         $tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
 
-        return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+        return '<div class="'.$tab_container_class.'">'."\n\t".$all_tabs.$all_tabs_content."\n".'</div>';
     }
 
 
@@ -94,7 +94,7 @@ 
             throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
         }
 
-        $all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+        $all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
         foreach ($nav_tabs as $slug => $tab) {
             $all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
         }
@@ -115,10 +115,10 @@ 
     {
         $name = str_replace(' ', '-', $name);
         $class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-        $class = $css ? $class . ' ' . $css : $class;
+        $class = $css ? $class.' '.$css : $class;
         $nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
-        $url = $url ? $url : '#' . $name;
-        $tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+        $url = $url ? $url : '#'.$name;
+        $tab = '<a class="'.$class.'" rel="ee-tab-'.$name.'" href="'.$url.'">'.$nice_name.'</a>'."\n\t";
         return $tab;
     }
 
@@ -136,8 +136,8 @@ 
     {
         $class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
         $name = str_replace(' ', '-', $name);
-        $content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-        $content .= "\t" . $tab_content . "\n";
+        $content = "\t".'<div class="'.$class.'" id="ee-tab-'.$name.'">'."\n";
+        $content .= "\t".$tab_content."\n";
         $content .= '<div style="clear:both"></div></div>';
         return $content;
     }
@@ -166,7 +166,7 @@ 
     public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '')
     {
         $item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
-        if (!is_array($item_array) || empty($item_array)) {
+        if ( ! is_array($item_array) || empty($item_array)) {
             return false; // get out we don't have even the basic thing we need!
         }
 
@@ -178,15 +178,15 @@ 
             'title' => esc_attr__('Link for Item', 'event_espresso'),
             'slug' => 'item_slug'
         );
-        $container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-        $list = '<ul class="' . $container_class . '">';
+        $container_class = ! empty($container_class) ? 'ee-text-links '.$container_class : 'ee-text-links';
+        $list = '<ul class="'.$container_class.'">';
 
         $ci = 1;
         foreach ($item_array as $item) {
             $item = wp_parse_args($item, $defaults);
-            $item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+            $item['class'] = ! empty($default) && $default == $item['slug'] ? 'item_display '.$item['class'] : $item['class'];
             $list .= self::_text_link_item($item);
-            if (!empty($sep) && $ci != count($item_array)) {
+            if ( ! empty($sep) && $ci != count($item_array)) {
                 $list .= self::_text_link_item($sep);
             }
             $ci++;
@@ -201,7 +201,7 @@ 
     private static function _text_link_item($item)
     {
         // if this isn't an array then we're doing a separator
-        if (!is_array($item)) {
+        if ( ! is_array($item)) {
             $label = $item;
             $class = 'ee-text-link-sep';
             $href = '';
@@ -210,12 +210,12 @@ 
             extract($item);
         }
 
-        $class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+        $class = $class != 'ee-text-link-sep' ? 'class="ee-text-link-li '.$class.'"' : 'class="ee-text-link-sep"';
 
-        $content = '<li ' . $class . '>';
-        $content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+        $content = '<li '.$class.'>';
+        $content .= ! empty($href) ? '<a class="ee-text-link" href="#'.$href.'" title="'.$title.'">' : '';
         $content .= $label;
-        $content .= !empty($href) ? '</a>' : '';
+        $content .= ! empty($href) ? '</a>' : '';
         $content .= '</li>';
         return $content;
     }

core/helpers/EEH_Money.helper.php

Indentation +207 added lines, -207 removed lines

@@ -12,221 +12,221 @@
 class EEH_Money extends EEH_Base
 {
 
-    /**
-     * This removes all localized money formatting from the incoming value
-     * Note: uses this site's currency settings for deciding what is considered a
-     * "thousands separator" (usually the character "," )
-     * and what is a "decimal mark" (usually the character ".")
-     *
-     * @param int|float|string $money_value
-     * @param string           $CNT_ISO
-     * @return float
-     * @throws EE_Error
-     */
-    public static function strip_localized_money_formatting($money_value, $CNT_ISO = '')
-    {
-        $currency_config = EEH_Money::get_currency_config($CNT_ISO);
-        $money_value     = str_replace(
-            array(
-                $currency_config->thsnds,
-                $currency_config->dec_mrk,
-            ),
-            array(
-                '', // remove thousands separator
-                '.', // convert decimal mark to what PHP expects
-            ),
-            $money_value
-        );
-        $money_value     = filter_var(
-            $money_value,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        return $money_value;
-    }
+	/**
+	 * This removes all localized money formatting from the incoming value
+	 * Note: uses this site's currency settings for deciding what is considered a
+	 * "thousands separator" (usually the character "," )
+	 * and what is a "decimal mark" (usually the character ".")
+	 *
+	 * @param int|float|string $money_value
+	 * @param string           $CNT_ISO
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public static function strip_localized_money_formatting($money_value, $CNT_ISO = '')
+	{
+		$currency_config = EEH_Money::get_currency_config($CNT_ISO);
+		$money_value     = str_replace(
+			array(
+				$currency_config->thsnds,
+				$currency_config->dec_mrk,
+			),
+			array(
+				'', // remove thousands separator
+				'.', // convert decimal mark to what PHP expects
+			),
+			$money_value
+		);
+		$money_value     = filter_var(
+			$money_value,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		return $money_value;
+	}
 
 
-    /**
-     * This converts an incoming localized money value into a standard float item (to three decimal places)
-     * Only use this if you know the $money_value follows your currency configuration's
-     * settings. Note: this uses this site's currency settings for deciding what is considered a
-     * "thousands separator" (usually the character "," )
-     * and what is a "decimal mark" (usually the character ".")
-     *
-     * @param int|string $money_value
-     * @return float
-     * @throws EE_Error
-     */
-    public static function convert_to_float_from_localized_money($money_value)
-    {
-        // float it! and round to three decimal places
-        return round((float) EEH_Money::strip_localized_money_formatting($money_value), 3);
-    }
+	/**
+	 * This converts an incoming localized money value into a standard float item (to three decimal places)
+	 * Only use this if you know the $money_value follows your currency configuration's
+	 * settings. Note: this uses this site's currency settings for deciding what is considered a
+	 * "thousands separator" (usually the character "," )
+	 * and what is a "decimal mark" (usually the character ".")
+	 *
+	 * @param int|string $money_value
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public static function convert_to_float_from_localized_money($money_value)
+	{
+		// float it! and round to three decimal places
+		return round((float) EEH_Money::strip_localized_money_formatting($money_value), 3);
+	}
 
 
-    /**
-     * For comparing floats. Default operator is '=', but see the $operator below for all options.
-     * This should be used to compare floats instead of normal '==' because floats
-     * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
-     * but actually differ by 0.00000001.
-     *
-     * @see http://biostall.com/php-function-to-compare-floating-point-numbers
-     * @param float  $float1
-     * @param float  $float2
-     * @param string $operator The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
-     * @return bool whether the equation is true or false
-     * @throws EE_Error
-     */
-    public static function compare_floats($float1, $float2, $operator = '=')
-    {
-        // Check numbers to 5 digits of precision
-        $epsilon = 0.00001;
-        $float1 = (float) $float1;
-        $float2 = (float) $float2;
-        switch ($operator) {
-            // equal
-            case "=":
-            case "==":
-            case "===":
-            case "eq":
-                if (abs($float1 - $float2) < $epsilon) {
-                    return true;
-                }
-                break;
-            // less than
-            case "<":
-            case "lt":
-                if (abs($float1 - $float2) < $epsilon) {
-                    return false;
-                } else {
-                    if ($float1 < $float2) {
-                        return true;
-                    }
-                }
-                break;
-            // less than or equal
-            case "<=":
-            case "lte":
-                if (self::compare_floats($float1, $float2, '<') || self::compare_floats($float1, $float2, '=')) {
-                    return true;
-                }
-                break;
-            // greater than
-            case ">":
-            case "gt":
-                if (abs($float1 - $float2) < $epsilon) {
-                    return false;
-                } else {
-                    if ($float1 > $float2) {
-                        return true;
-                    }
-                }
-                break;
-            // greater than or equal
-            case ">=":
-            case "gte":
-                if (self::compare_floats($float1, $float2, '>') || self::compare_floats($float1, $float2, '=')) {
-                    return true;
-                }
-                break;
-            case "<>":
-            case "!=":
-            case "ne":
-                if (abs($float1 - $float2) > $epsilon) {
-                    return true;
-                }
-                break;
-            default:
-                throw new EE_Error(
-                    sprintf(
-                        __(
-                            "Unknown operator %s in EEH_Money::compare_floats()",
-                            'event_espresso'
-                        ),
-                        $operator
-                    )
-                );
-        }
-        return false;
-    }
+	/**
+	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
+	 * This should be used to compare floats instead of normal '==' because floats
+	 * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
+	 * but actually differ by 0.00000001.
+	 *
+	 * @see http://biostall.com/php-function-to-compare-floating-point-numbers
+	 * @param float  $float1
+	 * @param float  $float2
+	 * @param string $operator The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
+	 * @return bool whether the equation is true or false
+	 * @throws EE_Error
+	 */
+	public static function compare_floats($float1, $float2, $operator = '=')
+	{
+		// Check numbers to 5 digits of precision
+		$epsilon = 0.00001;
+		$float1 = (float) $float1;
+		$float2 = (float) $float2;
+		switch ($operator) {
+			// equal
+			case "=":
+			case "==":
+			case "===":
+			case "eq":
+				if (abs($float1 - $float2) < $epsilon) {
+					return true;
+				}
+				break;
+			// less than
+			case "<":
+			case "lt":
+				if (abs($float1 - $float2) < $epsilon) {
+					return false;
+				} else {
+					if ($float1 < $float2) {
+						return true;
+					}
+				}
+				break;
+			// less than or equal
+			case "<=":
+			case "lte":
+				if (self::compare_floats($float1, $float2, '<') || self::compare_floats($float1, $float2, '=')) {
+					return true;
+				}
+				break;
+			// greater than
+			case ">":
+			case "gt":
+				if (abs($float1 - $float2) < $epsilon) {
+					return false;
+				} else {
+					if ($float1 > $float2) {
+						return true;
+					}
+				}
+				break;
+			// greater than or equal
+			case ">=":
+			case "gte":
+				if (self::compare_floats($float1, $float2, '>') || self::compare_floats($float1, $float2, '=')) {
+					return true;
+				}
+				break;
+			case "<>":
+			case "!=":
+			case "ne":
+				if (abs($float1 - $float2) > $epsilon) {
+					return true;
+				}
+				break;
+			default:
+				throw new EE_Error(
+					sprintf(
+						__(
+							"Unknown operator %s in EEH_Money::compare_floats()",
+							'event_espresso'
+						),
+						$operator
+					)
+				);
+		}
+		return false;
+	}
 
 
-    /**
-     * This returns a localized format string suitable for jQplot.
-     *
-     * @param string $CNT_ISO  If this is provided, then will attempt to get the currency settings for the country.
-     *                         Otherwise will use currency settings for current active country on site.
-     * @return string
-     * @throws EE_Error
-     */
-    public static function get_format_for_jqplot($CNT_ISO = '')
-    {
-        // default format
-        $format          = 'f';
-        $currency_config = $currency_config = EEH_Money::get_currency_config($CNT_ISO);
-        // first get the decimal place and number of places
-        $format = "%'." . $currency_config->dec_plc . $format;
-        // currency symbol on right side.
-        $format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
-        return $format;
-    }
+	/**
+	 * This returns a localized format string suitable for jQplot.
+	 *
+	 * @param string $CNT_ISO  If this is provided, then will attempt to get the currency settings for the country.
+	 *                         Otherwise will use currency settings for current active country on site.
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function get_format_for_jqplot($CNT_ISO = '')
+	{
+		// default format
+		$format          = 'f';
+		$currency_config = $currency_config = EEH_Money::get_currency_config($CNT_ISO);
+		// first get the decimal place and number of places
+		$format = "%'." . $currency_config->dec_plc . $format;
+		// currency symbol on right side.
+		$format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+		return $format;
+	}
 
 
-    /**
-     * This returns a localized format string suitable for usage with the Google Charts API format param.
-     *
-     * @param string $CNT_ISO  If this is provided, then will attempt to get the currency settings for the country.
-     *                         Otherwise will use currency settings for current active country on site.
-     *                         Note: GoogleCharts uses ICU pattern set
-     *                         (@see http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details)
-     * @return string
-     * @throws EE_Error
-     */
-    public static function get_format_for_google_charts($CNT_ISO = '')
-    {
-        $currency_config            = EEH_Money::get_currency_config($CNT_ISO);
-        $decimal_places_placeholder = str_pad('', $currency_config->dec_plc, '0');
-        // first get the decimal place and number of places
-        $format = '#,##0.' . $decimal_places_placeholder;
-        // currency symbol on right side.
-        $format          = $currency_config->sign_b4
-            ? $currency_config->sign . $format
-            : $format
-              . $currency_config->sign;
-        $formatterObject = array(
-            'decimalSymbol'  => $currency_config->dec_mrk,
-            'groupingSymbol' => $currency_config->thsnds,
-            'fractionDigits' => $currency_config->dec_plc,
-        );
-        if ($currency_config->sign_b4) {
-            $formatterObject['prefix'] = $currency_config->sign;
-        } else {
-            $formatterObject['suffix'] = $currency_config->sign;
-        }
-        return array(
-            'format'          => $format,
-            'formatterObject' => $formatterObject,
-        );
-    }
+	/**
+	 * This returns a localized format string suitable for usage with the Google Charts API format param.
+	 *
+	 * @param string $CNT_ISO  If this is provided, then will attempt to get the currency settings for the country.
+	 *                         Otherwise will use currency settings for current active country on site.
+	 *                         Note: GoogleCharts uses ICU pattern set
+	 *                         (@see http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details)
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function get_format_for_google_charts($CNT_ISO = '')
+	{
+		$currency_config            = EEH_Money::get_currency_config($CNT_ISO);
+		$decimal_places_placeholder = str_pad('', $currency_config->dec_plc, '0');
+		// first get the decimal place and number of places
+		$format = '#,##0.' . $decimal_places_placeholder;
+		// currency symbol on right side.
+		$format          = $currency_config->sign_b4
+			? $currency_config->sign . $format
+			: $format
+			  . $currency_config->sign;
+		$formatterObject = array(
+			'decimalSymbol'  => $currency_config->dec_mrk,
+			'groupingSymbol' => $currency_config->thsnds,
+			'fractionDigits' => $currency_config->dec_plc,
+		);
+		if ($currency_config->sign_b4) {
+			$formatterObject['prefix'] = $currency_config->sign;
+		} else {
+			$formatterObject['suffix'] = $currency_config->sign;
+		}
+		return array(
+			'format'          => $format,
+			'formatterObject' => $formatterObject,
+		);
+	}
 
 
-    /**
-     * @param string $CNT_ISO
-     * @return EE_Currency_Config|null
-     * @throws EE_Error
-     */
-    public static function get_currency_config($CNT_ISO = '')
-    {
-        // if CNT_ISO passed lets try to get currency settings for it.
-        $currency_config = $CNT_ISO !== ''
-            ? new EE_Currency_Config($CNT_ISO)
-            : null;
-        // default currency settings for site if not set
-        if (! $currency_config instanceof EE_Currency_Config) {
-            $currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
-                ? EE_Registry::instance()->CFG->currency
-                : new EE_Currency_Config();
-        }
-        return $currency_config;
-    }
+	/**
+	 * @param string $CNT_ISO
+	 * @return EE_Currency_Config|null
+	 * @throws EE_Error
+	 */
+	public static function get_currency_config($CNT_ISO = '')
+	{
+		// if CNT_ISO passed lets try to get currency settings for it.
+		$currency_config = $CNT_ISO !== ''
+			? new EE_Currency_Config($CNT_ISO)
+			: null;
+		// default currency settings for site if not set
+		if (! $currency_config instanceof EE_Currency_Config) {
+			$currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
+				? EE_Registry::instance()->CFG->currency
+				: new EE_Currency_Config();
+		}
+		return $currency_config;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
             ),
             $money_value
         );
-        $money_value     = filter_var(
+        $money_value = filter_var(
             $money_value,
             FILTER_SANITIZE_NUMBER_FLOAT,
             FILTER_FLAG_ALLOW_FRACTION
@@ -165,9 +165,9 @@ 
         $format          = 'f';
         $currency_config = $currency_config = EEH_Money::get_currency_config($CNT_ISO);
         // first get the decimal place and number of places
-        $format = "%'." . $currency_config->dec_plc . $format;
+        $format = "%'.".$currency_config->dec_plc.$format;
         // currency symbol on right side.
-        $format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+        $format = $currency_config->sign_b4 ? $currency_config->sign.$format : $format.$currency_config->sign;
         return $format;
     }
 
@@ -187,10 +187,10 @@ 
         $currency_config            = EEH_Money::get_currency_config($CNT_ISO);
         $decimal_places_placeholder = str_pad('', $currency_config->dec_plc, '0');
         // first get the decimal place and number of places
-        $format = '#,##0.' . $decimal_places_placeholder;
+        $format = '#,##0.'.$decimal_places_placeholder;
         // currency symbol on right side.
-        $format          = $currency_config->sign_b4
-            ? $currency_config->sign . $format
+        $format = $currency_config->sign_b4
+            ? $currency_config->sign.$format
             : $format
               . $currency_config->sign;
         $formatterObject = array(
@@ -222,7 +222,7 @@ 
             ? new EE_Currency_Config($CNT_ISO)
             : null;
         // default currency settings for site if not set
-        if (! $currency_config instanceof EE_Currency_Config) {
+        if ( ! $currency_config instanceof EE_Currency_Config) {
             $currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
                 ? EE_Registry::instance()->CFG->currency
                 : new EE_Currency_Config();

core/helpers/EEH_Schema.helper.php

Indentation +258 added lines, -258 removed lines

@@ -12,262 +12,262 @@
 {
 
 
-    /**
-     * generates JSON-based linked data for an event
-     *
-     * @param EE_Event $event
-     * @throws EE_Error
-     */
-    public static function add_json_linked_data_for_event(EE_Event $event)
-    {
-        // Check we have a valid datetime for the event
-        if (! $event->primary_datetime() instanceof EE_Datetime) {
-            return;
-        }
-
-        $template_args = array(
-            'event_permalink' => '',
-            'event_name' => '',
-            'event_description' => '',
-            'event_start' => '',
-            'event_end' => '',
-            'currency' => '',
-            'event_tickets' => array(),
-            'venue_name' => '',
-            'venue_url' => '',
-            'venue_locality' => '',
-            'venue_region' => '',
-            'event_image' => '',
-        );
-        $template_args['event_permalink'] = $event->get_permalink();
-        $template_args['event_name'] = $event->name();
-        $template_args['event_description'] = wp_strip_all_tags($event->short_description(200));
-        // clone datetime so that date formats don't override those for the original datetime
-        $primary_datetime = clone $event->primary_datetime();
-        $template_args['event_start'] = $primary_datetime->start_date(DateTime::ATOM);
-        $template_args['event_end'] = $primary_datetime->end_date(DateTime::ATOM);
-        unset($primary_datetime);
-        $template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
-        foreach ($event->tickets() as $original_ticket) {
-            // clone tickets so that date formats don't override those for the original ticket
-            $ticket= clone $original_ticket;
-            $ID = $ticket->ID();
-            $template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['price'] = number_format(
-                $ticket->price(),
-                EE_Registry::instance()->CFG->currency->dec_plc,
-                EE_Registry::instance()->CFG->currency->dec_mrk,
-                EE_Registry::instance()->CFG->currency->thsnds
-            );
-            unset($ticket);
-        }
-        $VNU_ID = espresso_venue_id();
-        if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
-            $venue = EEH_Venue_View::get_venue($VNU_ID);
-            $template_args['venue_name'] = get_the_title($VNU_ID);
-            $template_args['venue_url'] = get_permalink($VNU_ID);
-            $template_args['venue_locality'] = $venue->city();
-            $template_args['venue_region'] = $venue->state_name();
-        }
-        $template_args['event_image'] = $event->feature_image_url();
-        $template_args = apply_filters(
-            'FHEE__EEH_Schema__add_json_linked_data_for_event__template_args',
-            $template_args,
-            $event,
-            $VNU_ID
-        );
-        extract($template_args, EXTR_OVERWRITE);
-        include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
-    }
-
-
-    /**
-     *    location
-     *    The location of the event, organization or action.
-     *    Should include the Venue name AND schema formatted address info
-     *
-     * @access public
-     * @param string $location
-     * @return string
-     */
-    public static function location($location = null)
-    {
-        return ! empty($location) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">'
-                                      . $location
-                                      . '</div>' : '';
-    }
-
-
-
-    /**
-     *    name
-     *    The name of the Event or Venue.
-     *
-     * @access public
-     * @param string $name
-     * @return string
-     */
-    public static function name($name = null)
-    {
-        return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
-    }
-
-
-
-    /**
-     *    streetAddress
-     *    The street address. For example, 1600 Amphitheatre Pkwy.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function streetAddress(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
-            ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
-    }
-
-
-
-    /**
-     *    postOfficeBoxNumber
-     *    The post office box number for PO box addresses.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function postOfficeBoxNumber(EEI_Address $obj_with_address = null)
-    {
-        // regex check for some form of PO Box or P.O. Box, etc, etc, etc
-        if (preg_match(
-            "/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
-            $obj_with_address->address2()
-        ) ) {
-            return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
-                ? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
-        } else {
-            return $obj_with_address->address2();
-        }
-    }
-
-
-
-    /**
-     *    addressLocality
-     *    The locality (city, town, etc). For example, Mountain View.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressLocality(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
-            ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
-    }
-
-
-
-    /**
-     *    addressRegion
-     *    The region (state, province, etc). For example, CA.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressRegion(EEI_Address $obj_with_address = null)
-    {
-        $state = $obj_with_address->state_name();
-        if (! empty($state)) {
-            return '<span itemprop="addressRegion">' . $state . '</span>';
-        } else {
-            return '';
-        }
-    }
-
-
-
-    /**
-     *    addressCountry
-     *    The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressCountry(EEI_Address $obj_with_address = null)
-    {
-        $country = $obj_with_address->country_name();
-        if (! empty($country)) {
-            return '<span itemprop="addressCountry">' . $country . '</span>';
-        } else {
-            return '';
-        }
-    }
-
-
-
-    /**
-     *    postalCode
-     *    The postal code. For example, 94043.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function postalCode(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->zip() !== null && $obj_with_address->zip() !== '' ? '<span itemprop="postalCode">'
-                                                                                      . $obj_with_address->zip()
-                                                                                      . '</span>' : '';
-    }
-
-
-
-    /**
-     *    telephone
-     *    The telephone number.
-     *
-     * @access public
-     * @param string $phone_nmbr
-     * @return string
-     */
-    public static function telephone($phone_nmbr = null)
-    {
-        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
-            : '';
-    }
-
-
-
-    /**
-     *    URL
-     *    URL of the item as a clickable link
-     *
-     * @access public
-     * @param string $url        - the URL that the link will resolve to
-     * @param string $text       - the text that will be used for the visible link
-     * @param array  $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
-     * @return string (link)
-     */
-    public static function url($url = null, $text = null, $attributes = array())
-    {
-        // Check the URL includes a scheme
-        $parsed_url = parse_url($url);
-        if (empty($parsed_url['scheme'])) {
-            $url = 'http://' . ltrim($url, '/');
-        }
-
-        $atts = '';
-        foreach ($attributes as $attribute => $value) {
-            $atts .= ' ' . $attribute . '="' . $value . '"';
-        }
-        $text = $text !== null && $text !== '' ? $text : $url;
-        return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
-            : '';
-    }
+	/**
+	 * generates JSON-based linked data for an event
+	 *
+	 * @param EE_Event $event
+	 * @throws EE_Error
+	 */
+	public static function add_json_linked_data_for_event(EE_Event $event)
+	{
+		// Check we have a valid datetime for the event
+		if (! $event->primary_datetime() instanceof EE_Datetime) {
+			return;
+		}
+
+		$template_args = array(
+			'event_permalink' => '',
+			'event_name' => '',
+			'event_description' => '',
+			'event_start' => '',
+			'event_end' => '',
+			'currency' => '',
+			'event_tickets' => array(),
+			'venue_name' => '',
+			'venue_url' => '',
+			'venue_locality' => '',
+			'venue_region' => '',
+			'event_image' => '',
+		);
+		$template_args['event_permalink'] = $event->get_permalink();
+		$template_args['event_name'] = $event->name();
+		$template_args['event_description'] = wp_strip_all_tags($event->short_description(200));
+		// clone datetime so that date formats don't override those for the original datetime
+		$primary_datetime = clone $event->primary_datetime();
+		$template_args['event_start'] = $primary_datetime->start_date(DateTime::ATOM);
+		$template_args['event_end'] = $primary_datetime->end_date(DateTime::ATOM);
+		unset($primary_datetime);
+		$template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
+		foreach ($event->tickets() as $original_ticket) {
+			// clone tickets so that date formats don't override those for the original ticket
+			$ticket= clone $original_ticket;
+			$ID = $ticket->ID();
+			$template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
+			$template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
+			$template_args['event_tickets'][ $ID ]['price'] = number_format(
+				$ticket->price(),
+				EE_Registry::instance()->CFG->currency->dec_plc,
+				EE_Registry::instance()->CFG->currency->dec_mrk,
+				EE_Registry::instance()->CFG->currency->thsnds
+			);
+			unset($ticket);
+		}
+		$VNU_ID = espresso_venue_id();
+		if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
+			$venue = EEH_Venue_View::get_venue($VNU_ID);
+			$template_args['venue_name'] = get_the_title($VNU_ID);
+			$template_args['venue_url'] = get_permalink($VNU_ID);
+			$template_args['venue_locality'] = $venue->city();
+			$template_args['venue_region'] = $venue->state_name();
+		}
+		$template_args['event_image'] = $event->feature_image_url();
+		$template_args = apply_filters(
+			'FHEE__EEH_Schema__add_json_linked_data_for_event__template_args',
+			$template_args,
+			$event,
+			$VNU_ID
+		);
+		extract($template_args, EXTR_OVERWRITE);
+		include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
+	}
+
+
+	/**
+	 *    location
+	 *    The location of the event, organization or action.
+	 *    Should include the Venue name AND schema formatted address info
+	 *
+	 * @access public
+	 * @param string $location
+	 * @return string
+	 */
+	public static function location($location = null)
+	{
+		return ! empty($location) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">'
+									  . $location
+									  . '</div>' : '';
+	}
+
+
+
+	/**
+	 *    name
+	 *    The name of the Event or Venue.
+	 *
+	 * @access public
+	 * @param string $name
+	 * @return string
+	 */
+	public static function name($name = null)
+	{
+		return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    streetAddress
+	 *    The street address. For example, 1600 Amphitheatre Pkwy.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function streetAddress(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
+			? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    postOfficeBoxNumber
+	 *    The post office box number for PO box addresses.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function postOfficeBoxNumber(EEI_Address $obj_with_address = null)
+	{
+		// regex check for some form of PO Box or P.O. Box, etc, etc, etc
+		if (preg_match(
+			"/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
+			$obj_with_address->address2()
+		) ) {
+			return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
+				? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
+		} else {
+			return $obj_with_address->address2();
+		}
+	}
+
+
+
+	/**
+	 *    addressLocality
+	 *    The locality (city, town, etc). For example, Mountain View.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressLocality(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
+			? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    addressRegion
+	 *    The region (state, province, etc). For example, CA.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressRegion(EEI_Address $obj_with_address = null)
+	{
+		$state = $obj_with_address->state_name();
+		if (! empty($state)) {
+			return '<span itemprop="addressRegion">' . $state . '</span>';
+		} else {
+			return '';
+		}
+	}
+
+
+
+	/**
+	 *    addressCountry
+	 *    The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressCountry(EEI_Address $obj_with_address = null)
+	{
+		$country = $obj_with_address->country_name();
+		if (! empty($country)) {
+			return '<span itemprop="addressCountry">' . $country . '</span>';
+		} else {
+			return '';
+		}
+	}
+
+
+
+	/**
+	 *    postalCode
+	 *    The postal code. For example, 94043.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function postalCode(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->zip() !== null && $obj_with_address->zip() !== '' ? '<span itemprop="postalCode">'
+																					  . $obj_with_address->zip()
+																					  . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    telephone
+	 *    The telephone number.
+	 *
+	 * @access public
+	 * @param string $phone_nmbr
+	 * @return string
+	 */
+	public static function telephone($phone_nmbr = null)
+	{
+		return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
+			: '';
+	}
+
+
+
+	/**
+	 *    URL
+	 *    URL of the item as a clickable link
+	 *
+	 * @access public
+	 * @param string $url        - the URL that the link will resolve to
+	 * @param string $text       - the text that will be used for the visible link
+	 * @param array  $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
+	 * @return string (link)
+	 */
+	public static function url($url = null, $text = null, $attributes = array())
+	{
+		// Check the URL includes a scheme
+		$parsed_url = parse_url($url);
+		if (empty($parsed_url['scheme'])) {
+			$url = 'http://' . ltrim($url, '/');
+		}
+
+		$atts = '';
+		foreach ($attributes as $attribute => $value) {
+			$atts .= ' ' . $attribute . '="' . $value . '"';
+		}
+		$text = $text !== null && $text !== '' ? $text : $url;
+		return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
+			: '';
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
     public static function add_json_linked_data_for_event(EE_Event $event)
     {
         // Check we have a valid datetime for the event
-        if (! $event->primary_datetime() instanceof EE_Datetime) {
+        if ( ! $event->primary_datetime() instanceof EE_Datetime) {
             return;
         }
 
@@ -50,11 +50,11 @@ 
         $template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
         foreach ($event->tickets() as $original_ticket) {
             // clone tickets so that date formats don't override those for the original ticket
-            $ticket= clone $original_ticket;
+            $ticket = clone $original_ticket;
             $ID = $ticket->ID();
-            $template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['price'] = number_format(
+            $template_args['event_tickets'][$ID]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
+            $template_args['event_tickets'][$ID]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
+            $template_args['event_tickets'][$ID]['price'] = number_format(
                 $ticket->price(),
                 EE_Registry::instance()->CFG->currency->dec_plc,
                 EE_Registry::instance()->CFG->currency->dec_mrk,
@@ -63,7 +63,7 @@ 
             unset($ticket);
         }
         $VNU_ID = espresso_venue_id();
-        if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
+        if ( ! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
             $venue = EEH_Venue_View::get_venue($VNU_ID);
             $template_args['venue_name'] = get_the_title($VNU_ID);
             $template_args['venue_url'] = get_permalink($VNU_ID);
@@ -78,7 +78,7 @@ 
             $VNU_ID
         );
         extract($template_args, EXTR_OVERWRITE);
-        include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
+        include EE_TEMPLATES.'json_linked_data_for_event.template.php';
     }
 
 
@@ -110,7 +110,7 @@ 
      */
     public static function name($name = null)
     {
-        return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
+        return ! empty($name) ? '<span itemprop="name">'.$name.'</span>' : '';
     }
 
 
@@ -126,7 +126,7 @@ 
     public static function streetAddress(EEI_Address $obj_with_address = null)
     {
         return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
-            ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
+            ? '<span itemprop="streetAddress">'.$obj_with_address->address().'</span>' : '';
     }
 
 
@@ -145,9 +145,9 @@ 
         if (preg_match(
             "/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
             $obj_with_address->address2()
-        ) ) {
+        )) {
             return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
-                ? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
+                ? '<span itemprop="postOfficeBoxNumber">'.$obj_with_address->address2().'</span>' : '';
         } else {
             return $obj_with_address->address2();
         }
@@ -166,7 +166,7 @@ 
     public static function addressLocality(EEI_Address $obj_with_address = null)
     {
         return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
-            ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
+            ? '<span itemprop="addressLocality">'.$obj_with_address->city().'</span>' : '';
     }
 
 
@@ -182,8 +182,8 @@ 
     public static function addressRegion(EEI_Address $obj_with_address = null)
     {
         $state = $obj_with_address->state_name();
-        if (! empty($state)) {
-            return '<span itemprop="addressRegion">' . $state . '</span>';
+        if ( ! empty($state)) {
+            return '<span itemprop="addressRegion">'.$state.'</span>';
         } else {
             return '';
         }
@@ -202,8 +202,8 @@ 
     public static function addressCountry(EEI_Address $obj_with_address = null)
     {
         $country = $obj_with_address->country_name();
-        if (! empty($country)) {
-            return '<span itemprop="addressCountry">' . $country . '</span>';
+        if ( ! empty($country)) {
+            return '<span itemprop="addressCountry">'.$country.'</span>';
         } else {
             return '';
         }
@@ -238,7 +238,7 @@ 
      */
     public static function telephone($phone_nmbr = null)
     {
-        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
+        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">'.$phone_nmbr.'</span>'
             : '';
     }
 
@@ -259,15 +259,15 @@ 
         // Check the URL includes a scheme
         $parsed_url = parse_url($url);
         if (empty($parsed_url['scheme'])) {
-            $url = 'http://' . ltrim($url, '/');
+            $url = 'http://'.ltrim($url, '/');
         }
 
         $atts = '';
         foreach ($attributes as $attribute => $value) {
-            $atts .= ' ' . $attribute . '="' . $value . '"';
+            $atts .= ' '.$attribute.'="'.$value.'"';
         }
         $text = $text !== null && $text !== '' ? $text : $url;
-        return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
+        return $url !== null && $url !== '' ? '<a itemprop="url" href="'.$url.'"'.$atts.'>'.$text.'</a>'
             : '';
     }
 }

core/CPTs/EE_CPT_Default_Strategy.core.php

Indentation +58 added lines, -58 removed lines

@@ -13,70 +13,70 @@
 {
 
 
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    object
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    object
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    private
-     * @param    array $arguments
-     * @return    \EE_CPT_Default_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    private
+	 * @param    array $arguments
+	 * @return    \EE_CPT_Default_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+	}
 
 
-    /**
-     *    pre_get_posts
-     *
-     * @access    public
-     * @param    \WP_Query $WP_Query
-     * @return    \WP_Query
-     */
-    public function pre_get_posts(WP_Query $WP_Query)
-    {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
-            return $WP_Query;
-        }
-        return $WP_Query;
-    }
+	/**
+	 *    pre_get_posts
+	 *
+	 * @access    public
+	 * @param    \WP_Query $WP_Query
+	 * @return    \WP_Query
+	 */
+	public function pre_get_posts(WP_Query $WP_Query)
+	{
+		if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+			return $WP_Query;
+		}
+		return $WP_Query;
+	}
 
 
-    /**
-     *    wp
-     *
-     * @access    public
-     * @param    \WP_Post[] $posts
-     * @param    \WP_Query  $WP_Query
-     * @return    \WP_Post[]
-     */
-    public function the_posts($posts, WP_Query $WP_Query)
-    {
-        return $posts;
-    }
+	/**
+	 *    wp
+	 *
+	 * @access    public
+	 * @param    \WP_Post[] $posts
+	 * @param    \WP_Query  $WP_Query
+	 * @return    \WP_Post[]
+	 */
+	public function the_posts($posts, WP_Query $WP_Query)
+	{
+		return $posts;
+	}
 
 
-    /**
-     *    get_EE_post_type_metadata
-     *
-     * @access    public
-     * @param mixed     $meta_value
-     * @param    int    $post_id
-     * @param    string $meta_key
-     * @param    string $single
-     * @return    mixed
-     */
-    public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
-    {
-        return $meta_value;
-    }
+	/**
+	 *    get_EE_post_type_metadata
+	 *
+	 * @access    public
+	 * @param mixed     $meta_value
+	 * @param    int    $post_id
+	 * @param    string $meta_key
+	 * @param    string $single
+	 * @return    mixed
+	 */
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
+	{
+		return $meta_value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function pre_get_posts(WP_Query $WP_Query)
     {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+        if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
             return $WP_Query;
         }
         return $WP_Query;

core/CPTs/EE_CPT_Attendee_Strategy.core.php

Indentation +31 added lines, -31 removed lines

@@ -24,39 +24,39 @@
 class EE_CPT_Attendee_Strategy
 {
 
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    array
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    array
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param    array $arguments
-     * @return \EE_CPT_Attendee_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-        $WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : null;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param    array $arguments
+	 * @return \EE_CPT_Attendee_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : null;
+	}
 
 
-    /**
-     *    the_posts
-     *
-     * @access    public
-     * @param          $posts
-     * @param WP_Query $wp_query
-     * @return    void
-     */
-    public function the_posts($posts, WP_Query $wp_query)
-    {
-        return $posts;
-    }
+	/**
+	 *    the_posts
+	 *
+	 * @access    public
+	 * @param          $posts
+	 * @param WP_Query $wp_query
+	 * @return    void
+	 */
+	public function the_posts($posts, WP_Query $wp_query)
+	{
+		return $posts;
+	}
 }

core/CPTs/EE_CPT_Venue_Strategy.core.php

Indentation +46 added lines, -46 removed lines

@@ -12,54 +12,54 @@
 class EE_CPT_Venue_Strategy
 {
 
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    array
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    array
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param    array $arguments
-     * @return \EE_CPT_Venue_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-        $WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : null;
-        if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
-            $WP_Query->is_espresso_venue_single = is_singular()
-                                                  && isset($WP_Query->query->post_type)
-                                                  && $WP_Query->query->post_type == 'espresso_venues';
-            $WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? true : false;
-            $WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? true : false;
-        }
-        add_filter('the_posts', array($this, 'the_posts'), 1, 2);
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param    array $arguments
+	 * @return \EE_CPT_Venue_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : null;
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
+			$WP_Query->is_espresso_venue_single = is_singular()
+												  && isset($WP_Query->query->post_type)
+												  && $WP_Query->query->post_type == 'espresso_venues';
+			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? true : false;
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? true : false;
+		}
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
+	}
 
 
-    /**
-     *    the_posts
-     *
-     * @access    public
-     * @param          $posts
-     * @param WP_Query $wp_query
-     * @return    void
-     */
-    public function the_posts($posts, WP_Query $wp_query)
-    {
-        // automagically load the EEH_Venue_View helper so that it's functions are available
-        if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
-            && EE_Registry::instance()->CFG->map_settings->use_google_maps
-        ) {
-            EEH_Maps::espresso_google_map_js();
-        }
-        remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
-        return $posts;
-    }
+	/**
+	 *    the_posts
+	 *
+	 * @access    public
+	 * @param          $posts
+	 * @param WP_Query $wp_query
+	 * @return    void
+	 */
+	public function the_posts($posts, WP_Query $wp_query)
+	{
+		// automagically load the EEH_Venue_View helper so that it's functions are available
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
+			&& EE_Registry::instance()->CFG->map_settings->use_google_maps
+		) {
+			EEH_Maps::espresso_google_map_js();
+		}
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
+		return $posts;
+	}
 }