eventespresso / event-espresso-core

core/services/address/formatters/InlineAddressFormatter.php

Indentation +35 added lines, -35 removed lines

@@ -14,39 +14,39 @@
 class InlineAddressFormatter extends AddressFormatter implements \EEI_Address_Formatter
 {
 
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return string
-     */
-    public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO)
-    {
-        $address_formats = apply_filters(
-            'FHEE__EE_Inline_Address_Formatter__address_formats',
-            array(
-                'CA'  => "{address}%{address2}%{city}%{state}%{country}%{zip}",
-                'GB'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'US'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'ZZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-            )
-        );
-        // if the incoming country has a set format, use that, else use the default
-        $formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ]
-            : $address_formats['ZZZ'];
-        return $this->parse_formatted_address(
-            $address,
-            $address2,
-            $city,
-            $state,
-            $zip,
-            $country,
-            $formatted_address,
-            ', '
-        );
-    }
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 * @return string
+	 */
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO)
+	{
+		$address_formats = apply_filters(
+			'FHEE__EE_Inline_Address_Formatter__address_formats',
+			array(
+				'CA'  => "{address}%{address2}%{city}%{state}%{country}%{zip}",
+				'GB'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'US'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'ZZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+			)
+		);
+		// if the incoming country has a set format, use that, else use the default
+		$formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ]
+			: $address_formats['ZZZ'];
+		return $this->parse_formatted_address(
+			$address,
+			$address2,
+			$city,
+			$state,
+			$zip,
+			$country,
+			$formatted_address,
+			', '
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
             )
         );
         // if the incoming country has a set format, use that, else use the default
-        $formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ]
+        $formatted_address = isset($address_formats[$CNT_ISO]) ? $address_formats[$CNT_ISO]
             : $address_formats['ZZZ'];
         return $this->parse_formatted_address(
             $address,

core/services/locators/FileLocator.php

Indentation +73 added lines, -73 removed lines

@@ -17,88 +17,88 @@
 class FileLocator extends Locator
 {
 
-    /**
-     * @var string $file_mask
-     */
-    protected $file_mask = '*.php';
+	/**
+	 * @var string $file_mask
+	 */
+	protected $file_mask = '*.php';
 
-    /**
-     * @var array $filepaths
-     */
-    protected $filepaths = array();
+	/**
+	 * @var array $filepaths
+	 */
+	protected $filepaths = array();
 
 
-    /**
-     * @param string $file_mask
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function setFileMask($file_mask)
-    {
-        if (! is_string($file_mask)) {
-            throw new InvalidDataTypeException('$file_mask', $file_mask, 'string');
-        }
-        $this->file_mask = $file_mask;
-    }
+	/**
+	 * @param string $file_mask
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function setFileMask($file_mask)
+	{
+		if (! is_string($file_mask)) {
+			throw new InvalidDataTypeException('$file_mask', $file_mask, 'string');
+		}
+		$this->file_mask = $file_mask;
+	}
 
 
-    /**
-     * @access public
-     * @return array
-     */
-    public function getFilePaths()
-    {
-        return $this->filepaths;
-    }
+	/**
+	 * @access public
+	 * @return array
+	 */
+	public function getFilePaths()
+	{
+		return $this->filepaths;
+	}
 
 
-    /**
-     * @access public
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->filepaths);
-    }
+	/**
+	 * @access public
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->filepaths);
+	}
 
 
-    /**
-     * given a path to a valid directory, or an array of valid paths,
-     * will find all files that match the provided mask
-     *
-     * @access public
-     * @param array|string $directory_paths
-     * @return \FilesystemIterator
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function locate($directory_paths)
-    {
-        if (! (is_string($directory_paths) || is_array($directory_paths))) {
-            throw new InvalidDataTypeException('$directory_paths', $directory_paths, 'string or array');
-        }
-        foreach ((array) $directory_paths as $directory_path) {
-            foreach ($this->findFilesByPath($directory_path) as $key => $file) {
-                $this->filepaths[ $key ] = \EEH_File::standardise_directory_separators($file);
-            }
-        }
-        return $this->filepaths;
-    }
+	/**
+	 * given a path to a valid directory, or an array of valid paths,
+	 * will find all files that match the provided mask
+	 *
+	 * @access public
+	 * @param array|string $directory_paths
+	 * @return \FilesystemIterator
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function locate($directory_paths)
+	{
+		if (! (is_string($directory_paths) || is_array($directory_paths))) {
+			throw new InvalidDataTypeException('$directory_paths', $directory_paths, 'string or array');
+		}
+		foreach ((array) $directory_paths as $directory_path) {
+			foreach ($this->findFilesByPath($directory_path) as $key => $file) {
+				$this->filepaths[ $key ] = \EEH_File::standardise_directory_separators($file);
+			}
+		}
+		return $this->filepaths;
+	}
 
 
-    /**
-     * given a path to a valid directory, will find all files that match the provided mask
-     *
-     * @access protected
-     * @param string $directory_path
-     * @return \FilesystemIterator
-     */
-    protected function findFilesByPath($directory_path = '')
-    {
-        $iterator = new GlobIterator(
-            \EEH_File::end_with_directory_separator($directory_path) . $this->file_mask
-        );
-        foreach ($this->flags as $flag) {
-            $iterator->setFlags($flag);
-        }
-        return $iterator;
-    }
+	/**
+	 * given a path to a valid directory, will find all files that match the provided mask
+	 *
+	 * @access protected
+	 * @param string $directory_path
+	 * @return \FilesystemIterator
+	 */
+	protected function findFilesByPath($directory_path = '')
+	{
+		$iterator = new GlobIterator(
+			\EEH_File::end_with_directory_separator($directory_path) . $this->file_mask
+		);
+		foreach ($this->flags as $flag) {
+			$iterator->setFlags($flag);
+		}
+		return $iterator;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function setFileMask($file_mask)
     {
-        if (! is_string($file_mask)) {
+        if ( ! is_string($file_mask)) {
             throw new InvalidDataTypeException('$file_mask', $file_mask, 'string');
         }
         $this->file_mask = $file_mask;
@@ -72,12 +72,12 @@ 
      */
     public function locate($directory_paths)
     {
-        if (! (is_string($directory_paths) || is_array($directory_paths))) {
+        if ( ! (is_string($directory_paths) || is_array($directory_paths))) {
             throw new InvalidDataTypeException('$directory_paths', $directory_paths, 'string or array');
         }
         foreach ((array) $directory_paths as $directory_path) {
             foreach ($this->findFilesByPath($directory_path) as $key => $file) {
-                $this->filepaths[ $key ] = \EEH_File::standardise_directory_separators($file);
+                $this->filepaths[$key] = \EEH_File::standardise_directory_separators($file);
             }
         }
         return $this->filepaths;
@@ -94,7 +94,7 @@ 
     protected function findFilesByPath($directory_path = '')
     {
         $iterator = new GlobIterator(
-            \EEH_File::end_with_directory_separator($directory_path) . $this->file_mask
+            \EEH_File::end_with_directory_separator($directory_path).$this->file_mask
         );
         foreach ($this->flags as $flag) {
             $iterator->setFlags($flag);

core/services/database/TableManager.php

Indentation +225 added lines, -225 removed lines

@@ -13,248 +13,248 @@
 class TableManager extends \EE_Base
 {
 
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    private $table_analysis;
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	private $table_analysis;
 
 
-    /**
-     * TableManager constructor.
-     *
-     * @param TableAnalysis $TableAnalysis
-     */
-    public function __construct(TableAnalysis $TableAnalysis)
-    {
-        $this->table_analysis = $TableAnalysis;
-    }
+	/**
+	 * TableManager constructor.
+	 *
+	 * @param TableAnalysis $TableAnalysis
+	 */
+	public function __construct(TableAnalysis $TableAnalysis)
+	{
+		$this->table_analysis = $TableAnalysis;
+	}
 
 
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function getTableAnalysis()
-    {
-        if ($this->table_analysis instanceof TableAnalysis) {
-            return $this->table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function getTableAnalysis()
+	{
+		if ($this->table_analysis instanceof TableAnalysis) {
+			return $this->table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 
 
-    /**
-     * @param string $table_name which can optionally start with $wpdb->prefix or not
-     * @param string $column_name
-     * @param string $column_info
-     * @return bool|false|int
-     */
-    public function addColumn($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL')
-    {
-        if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', false)) {
-            return false;
-        }
-        global $wpdb;
-        $full_table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $columns = $this->getTableColumns($table_name);
-        if (! in_array($column_name, $columns)) {
-            $alter_query = "ALTER TABLE {$full_table_name} ADD {$column_name} {$column_info}";
-            return $wpdb->query($alter_query);
-        }
-        return true;
-    }
+	/**
+	 * @param string $table_name which can optionally start with $wpdb->prefix or not
+	 * @param string $column_name
+	 * @param string $column_info
+	 * @return bool|false|int
+	 */
+	public function addColumn($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL')
+	{
+		if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', false)) {
+			return false;
+		}
+		global $wpdb;
+		$full_table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$columns = $this->getTableColumns($table_name);
+		if (! in_array($column_name, $columns)) {
+			$alter_query = "ALTER TABLE {$full_table_name} ADD {$column_name} {$column_info}";
+			return $wpdb->query($alter_query);
+		}
+		return true;
+	}
 
 
-    /**
-     * Gets the name of all columns on the  table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @return array
-     */
-    public function getTableColumns($table_name)
-    {
-        global $wpdb;
-        $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $field_array = array();
-        if (! empty($table_name)) {
-            $columns = $wpdb->get_results("SHOW COLUMNS FROM {$table_name} ");
-            if ($columns !== false) {
-                foreach ($columns as $column) {
-                    $field_array[] = $column->Field;
-                }
-            }
-        }
-        return $field_array;
-    }
+	/**
+	 * Gets the name of all columns on the  table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @return array
+	 */
+	public function getTableColumns($table_name)
+	{
+		global $wpdb;
+		$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$field_array = array();
+		if (! empty($table_name)) {
+			$columns = $wpdb->get_results("SHOW COLUMNS FROM {$table_name} ");
+			if ($columns !== false) {
+				foreach ($columns as $column) {
+					$field_array[] = $column->Field;
+				}
+			}
+		}
+		return $field_array;
+	}
 
 
-    /**
-     * Drops the specified table from the database. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @return int
-     */
-    public function dropTable($table_name)
-    {
-        global $wpdb;
-        if ($this->getTableAnalysis()->tableExists($table_name)) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            return $wpdb->query("DROP TABLE IF EXISTS {$table_name}");
-        }
-        return 0;
-    }
+	/**
+	 * Drops the specified table from the database. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @return int
+	 */
+	public function dropTable($table_name)
+	{
+		global $wpdb;
+		if ($this->getTableAnalysis()->tableExists($table_name)) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			return $wpdb->query("DROP TABLE IF EXISTS {$table_name}");
+		}
+		return 0;
+	}
 
 
-    /**
-     * Drops all the tables mentioned in a single MYSQL query. Double-checks
-     * each table name provided has a wpdb prefix attached, and that it exists.
-     * Returns the list actually deleted
-     *
-     * @global WPDB $wpdb
-     * @param array $table_names
-     * @return array of table names which we deleted
-     */
-    public function dropTables($table_names)
-    {
-        $tables_to_delete = array();
-        foreach ($table_names as $table_name) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            if ($this->getTableAnalysis()->tableExists($table_name)) {
-                $tables_to_delete[ $table_name ] = $table_name;
-            }
-        }
-        if (! empty($tables_to_delete)) {
-            global $wpdb;
-            // make sure we only have a unique strings in the array.
-            $tables_to_delete = array_unique($tables_to_delete);
-            $wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
-        }
-        return $tables_to_delete;
-    }
+	/**
+	 * Drops all the tables mentioned in a single MYSQL query. Double-checks
+	 * each table name provided has a wpdb prefix attached, and that it exists.
+	 * Returns the list actually deleted
+	 *
+	 * @global WPDB $wpdb
+	 * @param array $table_names
+	 * @return array of table names which we deleted
+	 */
+	public function dropTables($table_names)
+	{
+		$tables_to_delete = array();
+		foreach ($table_names as $table_name) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			if ($this->getTableAnalysis()->tableExists($table_name)) {
+				$tables_to_delete[ $table_name ] = $table_name;
+			}
+		}
+		if (! empty($tables_to_delete)) {
+			global $wpdb;
+			// make sure we only have a unique strings in the array.
+			$tables_to_delete = array_unique($tables_to_delete);
+			$wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
+		}
+		return $tables_to_delete;
+	}
 
 
-    /**
-     * Drops the specified index from the specified table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @param string $index_name
-     * @return int the number of indexes dropped. False if there was a datbase error
-     */
-    public function dropIndex($table_name, $index_name)
-    {
-        if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', false)) {
-            return 0;
-        }
-        global $wpdb;
-        $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $index_exists_query = "SHOW INDEX FROM {$table_name} WHERE key_name = '{$index_name}'";
-        if ($this->getTableAnalysis()->tableExists($table_name)
-            && $wpdb->get_var($index_exists_query)
-               === $table_name // using get_var with the $index_exists_query returns the table's name
-        ) {
-            return $wpdb->query("ALTER TABLE {$table_name} DROP INDEX {$index_name}");
-        }
-        return 0;
-    }
+	/**
+	 * Drops the specified index from the specified table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @param string $index_name
+	 * @return int the number of indexes dropped. False if there was a datbase error
+	 */
+	public function dropIndex($table_name, $index_name)
+	{
+		if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', false)) {
+			return 0;
+		}
+		global $wpdb;
+		$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$index_exists_query = "SHOW INDEX FROM {$table_name} WHERE key_name = '{$index_name}'";
+		if ($this->getTableAnalysis()->tableExists($table_name)
+			&& $wpdb->get_var($index_exists_query)
+			   === $table_name // using get_var with the $index_exists_query returns the table's name
+		) {
+			return $wpdb->query("ALTER TABLE {$table_name} DROP INDEX {$index_name}");
+		}
+		return 0;
+	}
 
 
-    /**
-     * Just creates the requested table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @param string $table_name
-     * @param string $create_sql defining the table's columns and indexes
-     * @param string $engine     (no need to specify "ENGINE=", that's implied)
-     * @return void
-     * @throws \EE_Error
-     */
-    public function createTable($table_name, $create_sql, $engine = 'MyISAM')
-    {
-        // does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
-        if (preg_match('((((.*?))(,\s))+)', $create_sql, $valid_column_data)) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            /** @var \wpdb $wpdb */
-            global $wpdb;
-            $SQL = "CREATE TABLE {$table_name} ( {$create_sql} ) ENGINE={$engine} " . $wpdb->get_charset_collate();
+	/**
+	 * Just creates the requested table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @param string $table_name
+	 * @param string $create_sql defining the table's columns and indexes
+	 * @param string $engine     (no need to specify "ENGINE=", that's implied)
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function createTable($table_name, $create_sql, $engine = 'MyISAM')
+	{
+		// does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
+		if (preg_match('((((.*?))(,\s))+)', $create_sql, $valid_column_data)) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			/** @var \wpdb $wpdb */
+			global $wpdb;
+			$SQL = "CREATE TABLE {$table_name} ( {$create_sql} ) ENGINE={$engine} " . $wpdb->get_charset_collate();
 
-            // get $wpdb to echo errors, but buffer them. This way at least WE know an error
-            // happened. And then we can choose to tell the end user
-            $old_show_errors_policy = $wpdb->show_errors(true);
-            $old_error_suppression_policy = $wpdb->suppress_errors(false);
-            ob_start();
-            dbDelta($SQL);
-            $output = ob_get_contents();
-            ob_end_clean();
-            $wpdb->show_errors($old_show_errors_policy);
-            $wpdb->suppress_errors($old_error_suppression_policy);
-            if (! empty($output)) {
-                throw new \EE_Error($output);
-            }
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __(
-                        'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s',
-                        'event_espresso'
-                    ),
-                    '<br />',
-                    $create_sql
-                )
-            );
-        }
-    }
+			// get $wpdb to echo errors, but buffer them. This way at least WE know an error
+			// happened. And then we can choose to tell the end user
+			$old_show_errors_policy = $wpdb->show_errors(true);
+			$old_error_suppression_policy = $wpdb->suppress_errors(false);
+			ob_start();
+			dbDelta($SQL);
+			$output = ob_get_contents();
+			ob_end_clean();
+			$wpdb->show_errors($old_show_errors_policy);
+			$wpdb->suppress_errors($old_error_suppression_policy);
+			if (! empty($output)) {
+				throw new \EE_Error($output);
+			}
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__(
+						'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s',
+						'event_espresso'
+					),
+					'<br />',
+					$create_sql
+				)
+			);
+		}
+	}
 
 
-    /**
-     * Drops the specified index if it's size differs from $desired_index_size.
-     * WordPress' dbdelta method doesn't automatically change index sizes, so this
-     * method can be used to only drop the index if needed, and afterwards dbdelta can be used as normal.
-     * If the table doesn't exist, or it exists but the index does not, or returns false
-     *
-     * @param string     $table_name
-     * @param string     $index_name
-     * @param string     $column_name        if none is provided, we assume the column name matches the index (often
-     *                                       true in EE)
-     * @param string|int $desired_index_size defaults to TableAnalysis::index_col_size, the max for utf8mb4.
-     * @return bool whether an index was dropped or not
-     * @throws /EE_Error if table analysis object isn't defined
-     */
-    public function dropIndexIfSizeNot(
-        $table_name,
-        $index_name,
-        $column_name = null,
-        $desired_index_size = TableAnalysis::INDEX_COLUMN_SIZE
-    ) {
-        if ($column_name === null) {
-            $column_name = $index_name;
-        }
-        if (! $this->getTableAnalysis()->tableExists($table_name)) {
-            return false;
-        }
-        $index_entries = $this->getTableAnalysis()->showIndexes($table_name, $index_name);
-        if (empty($index_entries)) {
-            return false;
-        }
-        foreach ($index_entries as $index_entry) {
-            if ($column_name === $index_entry->Column_name
-                && (string) $desired_index_size !== $index_entry->Sub_part) {
-                return $this->dropIndex($table_name, $index_name);
-            }
-        }
-        return false;
-    }
+	/**
+	 * Drops the specified index if it's size differs from $desired_index_size.
+	 * WordPress' dbdelta method doesn't automatically change index sizes, so this
+	 * method can be used to only drop the index if needed, and afterwards dbdelta can be used as normal.
+	 * If the table doesn't exist, or it exists but the index does not, or returns false
+	 *
+	 * @param string     $table_name
+	 * @param string     $index_name
+	 * @param string     $column_name        if none is provided, we assume the column name matches the index (often
+	 *                                       true in EE)
+	 * @param string|int $desired_index_size defaults to TableAnalysis::index_col_size, the max for utf8mb4.
+	 * @return bool whether an index was dropped or not
+	 * @throws /EE_Error if table analysis object isn't defined
+	 */
+	public function dropIndexIfSizeNot(
+		$table_name,
+		$index_name,
+		$column_name = null,
+		$desired_index_size = TableAnalysis::INDEX_COLUMN_SIZE
+	) {
+		if ($column_name === null) {
+			$column_name = $index_name;
+		}
+		if (! $this->getTableAnalysis()->tableExists($table_name)) {
+			return false;
+		}
+		$index_entries = $this->getTableAnalysis()->showIndexes($table_name, $index_name);
+		if (empty($index_entries)) {
+			return false;
+		}
+		foreach ($index_entries as $index_entry) {
+			if ($column_name === $index_entry->Column_name
+				&& (string) $desired_index_size !== $index_entry->Sub_part) {
+				return $this->dropIndex($table_name, $index_name);
+			}
+		}
+		return false;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -65,7 +65,7 @@ 
         global $wpdb;
         $full_table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
         $columns = $this->getTableColumns($table_name);
-        if (! in_array($column_name, $columns)) {
+        if ( ! in_array($column_name, $columns)) {
             $alter_query = "ALTER TABLE {$full_table_name} ADD {$column_name} {$column_info}";
             return $wpdb->query($alter_query);
         }
@@ -86,7 +86,7 @@ 
         global $wpdb;
         $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
         $field_array = array();
-        if (! empty($table_name)) {
+        if ( ! empty($table_name)) {
             $columns = $wpdb->get_results("SHOW COLUMNS FROM {$table_name} ");
             if ($columns !== false) {
                 foreach ($columns as $column) {
@@ -132,14 +132,14 @@ 
         foreach ($table_names as $table_name) {
             $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
             if ($this->getTableAnalysis()->tableExists($table_name)) {
-                $tables_to_delete[ $table_name ] = $table_name;
+                $tables_to_delete[$table_name] = $table_name;
             }
         }
-        if (! empty($tables_to_delete)) {
+        if ( ! empty($tables_to_delete)) {
             global $wpdb;
             // make sure we only have a unique strings in the array.
             $tables_to_delete = array_unique($tables_to_delete);
-            $wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
+            $wpdb->query('DROP TABLE '.implode(', ', $tables_to_delete));
         }
         return $tables_to_delete;
     }
@@ -189,7 +189,7 @@ 
             $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
             /** @var \wpdb $wpdb */
             global $wpdb;
-            $SQL = "CREATE TABLE {$table_name} ( {$create_sql} ) ENGINE={$engine} " . $wpdb->get_charset_collate();
+            $SQL = "CREATE TABLE {$table_name} ( {$create_sql} ) ENGINE={$engine} ".$wpdb->get_charset_collate();
 
             // get $wpdb to echo errors, but buffer them. This way at least WE know an error
             // happened. And then we can choose to tell the end user
@@ -201,7 +201,7 @@ 
             ob_end_clean();
             $wpdb->show_errors($old_show_errors_policy);
             $wpdb->suppress_errors($old_error_suppression_policy);
-            if (! empty($output)) {
+            if ( ! empty($output)) {
                 throw new \EE_Error($output);
             }
         } else {
@@ -242,7 +242,7 @@ 
         if ($column_name === null) {
             $column_name = $index_name;
         }
-        if (! $this->getTableAnalysis()->tableExists($table_name)) {
+        if ( ! $this->getTableAnalysis()->tableExists($table_name)) {
             return false;
         }
         $index_entries = $this->getTableAnalysis()->showIndexes($table_name, $index_name);

core/services/commands/CommandHandlerManager.php

Indentation +93 added lines, -93 removed lines

@@ -18,104 +18,104 @@
 class CommandHandlerManager implements CommandHandlerManagerInterface
 {
 
-    /**
-     * @var CommandHandlerInterface[] $command_handlers
-     */
-    protected $command_handlers;
+	/**
+	 * @var CommandHandlerInterface[] $command_handlers
+	 */
+	protected $command_handlers;
 
-    /**
-     * @type LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * CommandHandlerManager constructor
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * CommandHandlerManager constructor
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * By default, Commands and CommandHandlers would normally
-     * reside in the same folder under the same namespace,
-     * and the names of the two classes would only differ in that
-     * one ends in "Command" and the other ends in "CommandHandler".
-     * However, if you wanted to utilize a CommandHandler from somewhere else,
-     * then this method allows you to add that CommandHandler and specify the FQCN
-     * (Fully Qualified ClassName) for the Command class that it should be used for.
-     * For example:
-     *      by default the "Vendor\some\namespace\DoSomethingCommand"
-     *      would resolve to using "Vendor\some\namespace\DoSomethingCommandHandler"
-     *      but if you wanted to instead process that commend using:
-     *      "Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler"
-     *      then the following code:
-     *      $CommandHandlerManager = $this->loader->getShared( 'CommandHandlerManagerInterface' );
-     *      $CommandHandlerManager->addCommandHandler(
-     *          new Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler(),
-     *          'Vendor\some\namespace\DoSomethingCommand'
-     *      );
-     *      would result in the alternate CommandHandler being used to process that Command
-     *
-     * @param CommandHandlerInterface $command_handler
-     * @param string                  $fqcn_for_command Fully Qualified ClassName for Command
-     * @return void
-     * @throws InvalidCommandHandlerException
-     */
-    public function addCommandHandler(CommandHandlerInterface $command_handler, $fqcn_for_command = '')
-    {
-        $command = ! empty($fqcn_for_command)
-            ? $fqcn_for_command
-            : str_replace('CommandHandler', 'Command', get_class($command_handler));
-        if (empty($command)) {
-            throw new InvalidCommandHandlerException($command);
-        }
-        $this->command_handlers[ $command ] = $command_handler;
-    }
+	/**
+	 * By default, Commands and CommandHandlers would normally
+	 * reside in the same folder under the same namespace,
+	 * and the names of the two classes would only differ in that
+	 * one ends in "Command" and the other ends in "CommandHandler".
+	 * However, if you wanted to utilize a CommandHandler from somewhere else,
+	 * then this method allows you to add that CommandHandler and specify the FQCN
+	 * (Fully Qualified ClassName) for the Command class that it should be used for.
+	 * For example:
+	 *      by default the "Vendor\some\namespace\DoSomethingCommand"
+	 *      would resolve to using "Vendor\some\namespace\DoSomethingCommandHandler"
+	 *      but if you wanted to instead process that commend using:
+	 *      "Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler"
+	 *      then the following code:
+	 *      $CommandHandlerManager = $this->loader->getShared( 'CommandHandlerManagerInterface' );
+	 *      $CommandHandlerManager->addCommandHandler(
+	 *          new Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler(),
+	 *          'Vendor\some\namespace\DoSomethingCommand'
+	 *      );
+	 *      would result in the alternate CommandHandler being used to process that Command
+	 *
+	 * @param CommandHandlerInterface $command_handler
+	 * @param string                  $fqcn_for_command Fully Qualified ClassName for Command
+	 * @return void
+	 * @throws InvalidCommandHandlerException
+	 */
+	public function addCommandHandler(CommandHandlerInterface $command_handler, $fqcn_for_command = '')
+	{
+		$command = ! empty($fqcn_for_command)
+			? $fqcn_for_command
+			: str_replace('CommandHandler', 'Command', get_class($command_handler));
+		if (empty($command)) {
+			throw new InvalidCommandHandlerException($command);
+		}
+		$this->command_handlers[ $command ] = $command_handler;
+	}
 
 
-    /**
-     * @param CommandInterface    $command
-     * @param CommandBusInterface $command_bus
-     * @return mixed
-     * @throws DomainException
-     * @throws CommandHandlerNotFoundException
-     */
-    public function getCommandHandler(CommandInterface $command, CommandBusInterface $command_bus = null)
-    {
-        $command_name = get_class($command);
-        $command_handler = apply_filters(
-            'FHEE__EventEspresso_core_services_commands_CommandHandlerManager__getCommandHandler__command_handler',
-            str_replace('Command', 'CommandHandler', $command_name),
-            $command
-        );
-        $handler = null;
-        // has a command handler already been set for this class ?
-        // if not, can we find one via the FQCN ?
-        if (isset($this->command_handlers[ $command_name ])) {
-            $handler = $this->command_handlers[ $command_name ];
-        } elseif (class_exists($command_handler)) {
-            $handler = $this->loader->getShared($command_handler);
-        }
-        // if Handler requires an instance of the CommandBus, but that has not yet been set
-        if ($handler instanceof CompositeCommandHandler && ! $handler->commandBus() instanceof CommandBusInterface) {
-            if (! $command_bus instanceof CommandBusInterface) {
-                throw new DomainException(
-                    esc_html__(
-                        'CompositeCommandHandler classes require an instance of the CommandBus.',
-                        'event_espresso'
-                    )
-                );
-            }
-            $handler->setCommandBus($command_bus);
-        }
-        if ($handler instanceof CommandHandlerInterface) {
-            return $handler;
-        }
-        throw new CommandHandlerNotFoundException($command_handler);
-    }
+	/**
+	 * @param CommandInterface    $command
+	 * @param CommandBusInterface $command_bus
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws CommandHandlerNotFoundException
+	 */
+	public function getCommandHandler(CommandInterface $command, CommandBusInterface $command_bus = null)
+	{
+		$command_name = get_class($command);
+		$command_handler = apply_filters(
+			'FHEE__EventEspresso_core_services_commands_CommandHandlerManager__getCommandHandler__command_handler',
+			str_replace('Command', 'CommandHandler', $command_name),
+			$command
+		);
+		$handler = null;
+		// has a command handler already been set for this class ?
+		// if not, can we find one via the FQCN ?
+		if (isset($this->command_handlers[ $command_name ])) {
+			$handler = $this->command_handlers[ $command_name ];
+		} elseif (class_exists($command_handler)) {
+			$handler = $this->loader->getShared($command_handler);
+		}
+		// if Handler requires an instance of the CommandBus, but that has not yet been set
+		if ($handler instanceof CompositeCommandHandler && ! $handler->commandBus() instanceof CommandBusInterface) {
+			if (! $command_bus instanceof CommandBusInterface) {
+				throw new DomainException(
+					esc_html__(
+						'CompositeCommandHandler classes require an instance of the CommandBus.',
+						'event_espresso'
+					)
+				);
+			}
+			$handler->setCommandBus($command_bus);
+		}
+		if ($handler instanceof CommandHandlerInterface) {
+			return $handler;
+		}
+		throw new CommandHandlerNotFoundException($command_handler);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
         if (empty($command)) {
             throw new InvalidCommandHandlerException($command);
         }
-        $this->command_handlers[ $command ] = $command_handler;
+        $this->command_handlers[$command] = $command_handler;
     }
 
 
@@ -96,14 +96,14 @@ 
         $handler = null;
         // has a command handler already been set for this class ?
         // if not, can we find one via the FQCN ?
-        if (isset($this->command_handlers[ $command_name ])) {
-            $handler = $this->command_handlers[ $command_name ];
+        if (isset($this->command_handlers[$command_name])) {
+            $handler = $this->command_handlers[$command_name];
         } elseif (class_exists($command_handler)) {
             $handler = $this->loader->getShared($command_handler);
         }
         // if Handler requires an instance of the CommandBus, but that has not yet been set
         if ($handler instanceof CompositeCommandHandler && ! $handler->commandBus() instanceof CommandBusInterface) {
-            if (! $command_bus instanceof CommandBusInterface) {
+            if ( ! $command_bus instanceof CommandBusInterface) {
                 throw new DomainException(
                     esc_html__(
                         'CompositeCommandHandler classes require an instance of the CommandBus.',

core/services/notices/Notice.php

Indentation +249 added lines, -249 removed lines

@@ -14,253 +14,253 @@
 class Notice implements NoticeInterface
 {
 
-    const ERROR = 'error';
-
-    const SUCCESS = 'success';
-
-    const ATTENTION = 'attention'; // alias for warning
-
-    const INFORMATION = 'information';
-
-    /**
-     * @var string $type
-     */
-    private $type;
-
-
-    /**
-     * @var string $message
-     */
-    private $message;
-
-
-    /**
-     * @var string $file
-     */
-    private $file;
-
-
-    /**
-     * @var string $func
-     */
-    private $func;
-
-
-    /**
-     * @var string $line
-     */
-    private $line;
-
-
-    /**
-     * @var boolean $dismissible
-     */
-    private $dismissible;
-
-
-    /**
-     * Notice constructor.
-     *
-     * @param string $type
-     * @param string $message
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($type, $message, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->setType($type);
-        $this->setMessage($message);
-        $this->setDismissible($dismissible);
-        $this->setFile($file);
-        $this->setFunc($func);
-        $this->setLine($line);
-    }
-
-
-    /**
-     * @return array
-     */
-    private function types()
-    {
-        return (array) apply_filters(
-            'FHEE__EventEspresso_core_services_notices_Notice__types',
-            array(
-                Notice::ERROR,
-                Notice::SUCCESS,
-                Notice::ATTENTION,
-                Notice::INFORMATION,
-            )
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return $this->type;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function message()
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function file()
-    {
-        return $this->file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function func()
-    {
-        return $this->func;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function line()
-    {
-        return $this->line;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isDismissible()
-    {
-        return $this->dismissible;
-    }
-
-
-    /**
-     * @param string $type
-     * @throws InvalidDataTypeException
-     */
-    private function setType($type)
-    {
-        if (! in_array($type, $this->types(), true)) {
-            throw new InvalidDataTypeException(
-                '$type',
-                $type,
-                $this->invalidTypeMessage()
-            );
-        }
-        $this->type = $type;
-    }
-
-
-    /**
-     * gets the $invalid_type_message string
-     */
-    private function invalidTypeMessage()
-    {
-        return apply_filters(
-            'FHEE__EventEspresso_core_services_notices_Notice__invalidTypeMessage',
-            sprintf(
-                esc_html__(
-                    ' one of the following notice types was expected: %1$s %2$s',
-                    'event_espresso'
-                ),
-                '<br />',
-                var_export($this->types(), true)
-            )
-        );
-    }
-
-
-    /**
-     * @param string $message
-     * @throws InvalidDataTypeException
-     */
-    private function setMessage($message)
-    {
-        if (empty($message) || ! is_string($message)) {
-            throw new InvalidDataTypeException(
-                '$message',
-                $message,
-                esc_html__('non empty string', 'event_espresso')
-            );
-        }
-        $this->message = $message;
-    }
-
-
-    /**
-     * @param string $file
-     * @throws InvalidDataTypeException
-     */
-    private function setFile($file)
-    {
-        if ($this->type === Notice::ERROR && (empty($file) || ! is_string($file))) {
-            throw new InvalidDataTypeException(
-                '$file',
-                $file,
-                esc_html__('non empty string', 'event_espresso')
-            );
-        }
-        $this->file = $file;
-    }
-
-
-    /**
-     * @param string $func
-     * @throws InvalidDataTypeException
-     */
-    private function setFunc($func)
-    {
-        if ($this->type === Notice::ERROR && (empty($func) || ! is_string($func))) {
-            throw new InvalidDataTypeException(
-                '$func',
-                $func,
-                esc_html__('non empty string', 'event_espresso')
-            );
-        }
-        $this->func = $func;
-    }
-
-
-    /**
-     * @param int $line
-     * @throws InvalidDataTypeException
-     */
-    private function setLine($line)
-    {
-        $line = absint($line);
-        if ($this->type === Notice::ERROR && $line === 0) {
-            throw new InvalidDataTypeException(
-                '$line',
-                $line,
-                esc_html__('integer', 'event_espresso')
-            );
-        }
-        $this->line = $line;
-    }
-
-
-    /**
-     * @param boolean $dismissible
-     */
-    private function setDismissible($dismissible = true)
-    {
-        $this->dismissible = filter_var($dismissible, FILTER_VALIDATE_BOOLEAN);
-    }
+	const ERROR = 'error';
+
+	const SUCCESS = 'success';
+
+	const ATTENTION = 'attention'; // alias for warning
+
+	const INFORMATION = 'information';
+
+	/**
+	 * @var string $type
+	 */
+	private $type;
+
+
+	/**
+	 * @var string $message
+	 */
+	private $message;
+
+
+	/**
+	 * @var string $file
+	 */
+	private $file;
+
+
+	/**
+	 * @var string $func
+	 */
+	private $func;
+
+
+	/**
+	 * @var string $line
+	 */
+	private $line;
+
+
+	/**
+	 * @var boolean $dismissible
+	 */
+	private $dismissible;
+
+
+	/**
+	 * Notice constructor.
+	 *
+	 * @param string $type
+	 * @param string $message
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($type, $message, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->setType($type);
+		$this->setMessage($message);
+		$this->setDismissible($dismissible);
+		$this->setFile($file);
+		$this->setFunc($func);
+		$this->setLine($line);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	private function types()
+	{
+		return (array) apply_filters(
+			'FHEE__EventEspresso_core_services_notices_Notice__types',
+			array(
+				Notice::ERROR,
+				Notice::SUCCESS,
+				Notice::ATTENTION,
+				Notice::INFORMATION,
+			)
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return $this->type;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function message()
+	{
+		return $this->message;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function file()
+	{
+		return $this->file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function func()
+	{
+		return $this->func;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function line()
+	{
+		return $this->line;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isDismissible()
+	{
+		return $this->dismissible;
+	}
+
+
+	/**
+	 * @param string $type
+	 * @throws InvalidDataTypeException
+	 */
+	private function setType($type)
+	{
+		if (! in_array($type, $this->types(), true)) {
+			throw new InvalidDataTypeException(
+				'$type',
+				$type,
+				$this->invalidTypeMessage()
+			);
+		}
+		$this->type = $type;
+	}
+
+
+	/**
+	 * gets the $invalid_type_message string
+	 */
+	private function invalidTypeMessage()
+	{
+		return apply_filters(
+			'FHEE__EventEspresso_core_services_notices_Notice__invalidTypeMessage',
+			sprintf(
+				esc_html__(
+					' one of the following notice types was expected: %1$s %2$s',
+					'event_espresso'
+				),
+				'<br />',
+				var_export($this->types(), true)
+			)
+		);
+	}
+
+
+	/**
+	 * @param string $message
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMessage($message)
+	{
+		if (empty($message) || ! is_string($message)) {
+			throw new InvalidDataTypeException(
+				'$message',
+				$message,
+				esc_html__('non empty string', 'event_espresso')
+			);
+		}
+		$this->message = $message;
+	}
+
+
+	/**
+	 * @param string $file
+	 * @throws InvalidDataTypeException
+	 */
+	private function setFile($file)
+	{
+		if ($this->type === Notice::ERROR && (empty($file) || ! is_string($file))) {
+			throw new InvalidDataTypeException(
+				'$file',
+				$file,
+				esc_html__('non empty string', 'event_espresso')
+			);
+		}
+		$this->file = $file;
+	}
+
+
+	/**
+	 * @param string $func
+	 * @throws InvalidDataTypeException
+	 */
+	private function setFunc($func)
+	{
+		if ($this->type === Notice::ERROR && (empty($func) || ! is_string($func))) {
+			throw new InvalidDataTypeException(
+				'$func',
+				$func,
+				esc_html__('non empty string', 'event_espresso')
+			);
+		}
+		$this->func = $func;
+	}
+
+
+	/**
+	 * @param int $line
+	 * @throws InvalidDataTypeException
+	 */
+	private function setLine($line)
+	{
+		$line = absint($line);
+		if ($this->type === Notice::ERROR && $line === 0) {
+			throw new InvalidDataTypeException(
+				'$line',
+				$line,
+				esc_html__('integer', 'event_espresso')
+			);
+		}
+		$this->line = $line;
+	}
+
+
+	/**
+	 * @param boolean $dismissible
+	 */
+	private function setDismissible($dismissible = true)
+	{
+		$this->dismissible = filter_var($dismissible, FILTER_VALIDATE_BOOLEAN);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
      */
     private function setType($type)
     {
-        if (! in_array($type, $this->types(), true)) {
+        if ( ! in_array($type, $this->types(), true)) {
             throw new InvalidDataTypeException(
                 '$type',
                 $type,

core/libraries/iframe_display/Iframe.php

Indentation +332 added lines, -332 removed lines

@@ -18,371 +18,371 @@
 class Iframe
 {
 
-    /*
+	/*
     * HTML for notices and ajax gif
     * @var string $title
     */
-    protected $title = '';
+	protected $title = '';
 
-    /*
+	/*
     * HTML for the content being displayed
     * @var string $content
     */
-    protected $content = '';
+	protected $content = '';
 
-    /*
+	/*
     * whether or not to call wp_head() and wp_footer()
     * @var boolean $enqueue_wp_assets
     */
-    protected $enqueue_wp_assets = false;
+	protected $enqueue_wp_assets = false;
 
-    /*
+	/*
     * an array of CSS URLs
     * @var array $css
     */
-    protected $css = array();
+	protected $css = array();
 
-    /*
+	/*
     * an array of JS URLs to be set in the HTML header.
     * @var array $header_js
     */
-    protected $header_js = array();
+	protected $header_js = array();
 
-    /*
+	/*
     * an array of additional attributes to be added to <script> tags for header JS
     * @var array $footer_js
     */
-    protected $header_js_attributes = array();
+	protected $header_js_attributes = array();
 
-    /*
+	/*
     * an array of JS URLs to be displayed before the HTML </body> tag
     * @var array $footer_js
     */
-    protected $footer_js = array();
+	protected $footer_js = array();
 
-    /*
+	/*
     * an array of additional attributes to be added to <script> tags for footer JS
     * @var array $footer_js_attributes
     */
-    protected $footer_js_attributes = array();
+	protected $footer_js_attributes = array();
 
-    /*
+	/*
     * an array of JSON vars to be set in the HTML header.
     * @var array $localized_vars
     */
-    protected $localized_vars = array();
-
-
-    /**
-     * Iframe constructor
-     *
-     * @param string $title
-     * @param string $content
-     * @throws DomainException
-     */
-    public function __construct($title, $content)
-    {
-        global $wp_version;
-        if (! defined('EE_IFRAME_DIR_URL')) {
-            define('EE_IFRAME_DIR_URL', plugin_dir_url(__FILE__));
-        }
-        $this->setContent($content);
-        $this->setTitle($title);
-        $this->addStylesheets(
-            apply_filters(
-                'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_css',
-                array(
-                    'site_theme'       => get_stylesheet_directory_uri() . DS
-                                          . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
-                    'dashicons'        => includes_url('css/dashicons.min.css?ver=' . $wp_version),
-                    'espresso_default' => EE_GLOBAL_ASSETS_URL
-                                          . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
-                ),
-                $this
-            )
-        );
-        $this->addScripts(
-            apply_filters(
-                'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_js',
-                array(
-                    'jquery'        => includes_url('js/jquery/jquery.js?ver=' . $wp_version),
-                    'espresso_core' => EE_GLOBAL_ASSETS_URL
-                                       . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION,
-                ),
-                $this
-            )
-        );
-        if (apply_filters(
-            'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__load_default_theme_stylesheet',
-            false
-        )) {
-            $this->addStylesheets(
-                apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_theme_stylesheet',
-                    array('default_theme_stylesheet' => get_stylesheet_uri()),
-                    $this
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @param string $title
-     * @throws DomainException
-     */
-    public function setTitle($title)
-    {
-        if (empty($title)) {
-            throw new DomainException(
-                esc_html__('You must provide a page title in order to create an iframe.', 'event_espresso')
-            );
-        }
-        $this->title = $title;
-    }
-
-
-    /**
-     * @param string $content
-     * @throws DomainException
-     */
-    public function setContent($content)
-    {
-        if (empty($content)) {
-            throw new DomainException(
-                esc_html__('You must provide content in order to create an iframe.', 'event_espresso')
-            );
-        }
-        $this->content = $content;
-    }
-
-
-    /**
-     * @param boolean $enqueue_wp_assets
-     */
-    public function setEnqueueWpAssets($enqueue_wp_assets)
-    {
-        $this->enqueue_wp_assets = filter_var($enqueue_wp_assets, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param array $stylesheets
-     * @throws DomainException
-     */
-    public function addStylesheets(array $stylesheets)
-    {
-        if (empty($stylesheets)) {
-            throw new DomainException(
-                esc_html__(
-                    'A non-empty array of URLs, is required to add a CSS stylesheet to an iframe.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($stylesheets as $handle => $stylesheet) {
-            $this->css[ $handle ] = $stylesheet;
-        }
-    }
-
-
-    /**
-     * @param array $scripts
-     * @param bool  $add_to_header
-     * @throws DomainException
-     */
-    public function addScripts(array $scripts, $add_to_header = false)
-    {
-        if (empty($scripts)) {
-            throw new DomainException(
-                esc_html__(
-                    'A non-empty array of URLs, is required to add Javascript to an iframe.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($scripts as $handle => $script) {
-            if ($add_to_header) {
-                $this->header_js[ $handle ] = $script;
-            } else {
-                $this->footer_js[ $handle ] = $script;
-            }
-        }
-    }
-
-
-    /**
-     * @param array $script_attributes
-     * @param bool  $add_to_header
-     * @throws DomainException
-     */
-    public function addScriptAttributes(array $script_attributes, $add_to_header = false)
-    {
-        if (empty($script_attributes)) {
-            throw new DomainException(
-                esc_html__(
-                    'A non-empty array of strings, is required to add attributes to iframe Javascript.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($script_attributes as $handle => $script_attribute) {
-            if ($add_to_header) {
-                $this->header_js_attributes[ $handle ] = $script_attribute;
-            } else {
-                $this->footer_js_attributes[ $handle ] = $script_attribute;
-            }
-        }
-    }
-
-
-    /**
-     * @param array  $vars
-     * @param string $var_name
-     * @throws DomainException
-     */
-    public function addLocalizedVars(array $vars, $var_name = 'eei18n')
-    {
-        if (empty($vars)) {
-            throw new DomainException(
-                esc_html__(
-                    'A non-empty array of vars, is required to add localized Javascript vars to an iframe.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($vars as $handle => $var) {
-            if ($var_name === 'eei18n') {
-                EE_Registry::$i18n_js_strings[ $handle ] = $var;
-            } elseif ($var_name === 'eeCAL' && $handle === 'espresso_calendar') {
-                $this->localized_vars[ $var_name ] = $var;
-            } else {
-                if (! isset($this->localized_vars[ $var_name ])) {
-                    $this->localized_vars[ $var_name ] = array();
-                }
-                $this->localized_vars[ $var_name ][ $handle ] = $var;
-            }
-        }
-    }
-
-
-    /**
-     * @param string $utm_content
-     * @throws DomainException
-     */
-    public function display($utm_content = '')
-    {
-        $this->content .= EEH_Template::powered_by_event_espresso(
-            '',
-            '',
-            ! empty($utm_content) ? array('utm_content' => $utm_content) : array()
-        );
-        EE_System::do_not_cache();
-        echo $this->getTemplate();
-        exit;
-    }
-
-
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function getTemplate()
-    {
-        return EEH_Template::display_template(
-            __DIR__ . DIRECTORY_SEPARATOR . 'iframe_wrapper.template.php',
-            array(
-                'title'                => apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__title',
-                    $this->title,
-                    $this
-                ),
-                'content'              => apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__content',
-                    $this->content,
-                    $this
-                ),
-                'enqueue_wp_assets'    => apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__enqueue_wp_assets',
-                    $this->enqueue_wp_assets,
-                    $this
-                ),
-                'css'                  => (array) apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__css_urls',
-                    $this->css,
-                    $this
-                ),
-                'header_js'            => (array) apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__header_js_urls',
-                    $this->header_js,
-                    $this
-                ),
-                'header_js_attributes' => (array) apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__header_js_attributes',
-                    $this->header_js_attributes,
-                    $this
-                ),
-                'footer_js'            => (array) apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__footer_js_urls',
-                    $this->footer_js,
-                    $this
-                ),
-                'footer_js_attributes' => (array) apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__footer_js_attributes',
-                    $this->footer_js_attributes,
-                    $this
-                ),
-                'eei18n'               => apply_filters(
-                    'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__eei18n_js_strings',
-                    EE_Registry::localize_i18n_js_strings() . $this->localizeJsonVars(),
-                    $this
-                ),
-                'notices'              => EEH_Template::display_template(
-                    EE_TEMPLATES . 'espresso-ajax-notices.template.php',
-                    array(),
-                    true
-                ),
-            ),
-            true,
-            true
-        );
-    }
-
-
-    /**
-     * localizeJsonVars
-     *
-     * @return string
-     */
-    public function localizeJsonVars()
-    {
-        $JSON = '';
-        foreach ((array) $this->localized_vars as $var_name => $vars) {
-            $this->localized_vars[ $var_name ] = $this->encodeJsonVars($vars);
-            $JSON .= "/* <![CDATA[ */ var {$var_name} = ";
-            $JSON .= wp_json_encode($this->localized_vars[ $var_name ]);
-            $JSON .= '; /* ]]> */';
-        }
-        return $JSON;
-    }
-
-
-    /**
-     * @param bool|int|float|string|array $var
-     * @return array
-     */
-    public function encodeJsonVars($var)
-    {
-        if (is_array($var)) {
-            $localized_vars = array();
-            foreach ((array) $var as $key => $value) {
-                $localized_vars[ $key ] = $this->encodeJsonVars($value);
-            }
-            return $localized_vars;
-        }
-        if (is_scalar($var)) {
-            return html_entity_decode((string) $var, ENT_QUOTES, 'UTF-8');
-        }
-        return null;
-    }
+	protected $localized_vars = array();
+
+
+	/**
+	 * Iframe constructor
+	 *
+	 * @param string $title
+	 * @param string $content
+	 * @throws DomainException
+	 */
+	public function __construct($title, $content)
+	{
+		global $wp_version;
+		if (! defined('EE_IFRAME_DIR_URL')) {
+			define('EE_IFRAME_DIR_URL', plugin_dir_url(__FILE__));
+		}
+		$this->setContent($content);
+		$this->setTitle($title);
+		$this->addStylesheets(
+			apply_filters(
+				'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_css',
+				array(
+					'site_theme'       => get_stylesheet_directory_uri() . DS
+										  . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
+					'dashicons'        => includes_url('css/dashicons.min.css?ver=' . $wp_version),
+					'espresso_default' => EE_GLOBAL_ASSETS_URL
+										  . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
+				),
+				$this
+			)
+		);
+		$this->addScripts(
+			apply_filters(
+				'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_js',
+				array(
+					'jquery'        => includes_url('js/jquery/jquery.js?ver=' . $wp_version),
+					'espresso_core' => EE_GLOBAL_ASSETS_URL
+									   . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION,
+				),
+				$this
+			)
+		);
+		if (apply_filters(
+			'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__load_default_theme_stylesheet',
+			false
+		)) {
+			$this->addStylesheets(
+				apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_theme_stylesheet',
+					array('default_theme_stylesheet' => get_stylesheet_uri()),
+					$this
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @param string $title
+	 * @throws DomainException
+	 */
+	public function setTitle($title)
+	{
+		if (empty($title)) {
+			throw new DomainException(
+				esc_html__('You must provide a page title in order to create an iframe.', 'event_espresso')
+			);
+		}
+		$this->title = $title;
+	}
+
+
+	/**
+	 * @param string $content
+	 * @throws DomainException
+	 */
+	public function setContent($content)
+	{
+		if (empty($content)) {
+			throw new DomainException(
+				esc_html__('You must provide content in order to create an iframe.', 'event_espresso')
+			);
+		}
+		$this->content = $content;
+	}
+
+
+	/**
+	 * @param boolean $enqueue_wp_assets
+	 */
+	public function setEnqueueWpAssets($enqueue_wp_assets)
+	{
+		$this->enqueue_wp_assets = filter_var($enqueue_wp_assets, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param array $stylesheets
+	 * @throws DomainException
+	 */
+	public function addStylesheets(array $stylesheets)
+	{
+		if (empty($stylesheets)) {
+			throw new DomainException(
+				esc_html__(
+					'A non-empty array of URLs, is required to add a CSS stylesheet to an iframe.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($stylesheets as $handle => $stylesheet) {
+			$this->css[ $handle ] = $stylesheet;
+		}
+	}
+
+
+	/**
+	 * @param array $scripts
+	 * @param bool  $add_to_header
+	 * @throws DomainException
+	 */
+	public function addScripts(array $scripts, $add_to_header = false)
+	{
+		if (empty($scripts)) {
+			throw new DomainException(
+				esc_html__(
+					'A non-empty array of URLs, is required to add Javascript to an iframe.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($scripts as $handle => $script) {
+			if ($add_to_header) {
+				$this->header_js[ $handle ] = $script;
+			} else {
+				$this->footer_js[ $handle ] = $script;
+			}
+		}
+	}
+
+
+	/**
+	 * @param array $script_attributes
+	 * @param bool  $add_to_header
+	 * @throws DomainException
+	 */
+	public function addScriptAttributes(array $script_attributes, $add_to_header = false)
+	{
+		if (empty($script_attributes)) {
+			throw new DomainException(
+				esc_html__(
+					'A non-empty array of strings, is required to add attributes to iframe Javascript.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($script_attributes as $handle => $script_attribute) {
+			if ($add_to_header) {
+				$this->header_js_attributes[ $handle ] = $script_attribute;
+			} else {
+				$this->footer_js_attributes[ $handle ] = $script_attribute;
+			}
+		}
+	}
+
+
+	/**
+	 * @param array  $vars
+	 * @param string $var_name
+	 * @throws DomainException
+	 */
+	public function addLocalizedVars(array $vars, $var_name = 'eei18n')
+	{
+		if (empty($vars)) {
+			throw new DomainException(
+				esc_html__(
+					'A non-empty array of vars, is required to add localized Javascript vars to an iframe.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($vars as $handle => $var) {
+			if ($var_name === 'eei18n') {
+				EE_Registry::$i18n_js_strings[ $handle ] = $var;
+			} elseif ($var_name === 'eeCAL' && $handle === 'espresso_calendar') {
+				$this->localized_vars[ $var_name ] = $var;
+			} else {
+				if (! isset($this->localized_vars[ $var_name ])) {
+					$this->localized_vars[ $var_name ] = array();
+				}
+				$this->localized_vars[ $var_name ][ $handle ] = $var;
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $utm_content
+	 * @throws DomainException
+	 */
+	public function display($utm_content = '')
+	{
+		$this->content .= EEH_Template::powered_by_event_espresso(
+			'',
+			'',
+			! empty($utm_content) ? array('utm_content' => $utm_content) : array()
+		);
+		EE_System::do_not_cache();
+		echo $this->getTemplate();
+		exit;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function getTemplate()
+	{
+		return EEH_Template::display_template(
+			__DIR__ . DIRECTORY_SEPARATOR . 'iframe_wrapper.template.php',
+			array(
+				'title'                => apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__title',
+					$this->title,
+					$this
+				),
+				'content'              => apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__content',
+					$this->content,
+					$this
+				),
+				'enqueue_wp_assets'    => apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__enqueue_wp_assets',
+					$this->enqueue_wp_assets,
+					$this
+				),
+				'css'                  => (array) apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__css_urls',
+					$this->css,
+					$this
+				),
+				'header_js'            => (array) apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__header_js_urls',
+					$this->header_js,
+					$this
+				),
+				'header_js_attributes' => (array) apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__header_js_attributes',
+					$this->header_js_attributes,
+					$this
+				),
+				'footer_js'            => (array) apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__footer_js_urls',
+					$this->footer_js,
+					$this
+				),
+				'footer_js_attributes' => (array) apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__footer_js_attributes',
+					$this->footer_js_attributes,
+					$this
+				),
+				'eei18n'               => apply_filters(
+					'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__eei18n_js_strings',
+					EE_Registry::localize_i18n_js_strings() . $this->localizeJsonVars(),
+					$this
+				),
+				'notices'              => EEH_Template::display_template(
+					EE_TEMPLATES . 'espresso-ajax-notices.template.php',
+					array(),
+					true
+				),
+			),
+			true,
+			true
+		);
+	}
+
+
+	/**
+	 * localizeJsonVars
+	 *
+	 * @return string
+	 */
+	public function localizeJsonVars()
+	{
+		$JSON = '';
+		foreach ((array) $this->localized_vars as $var_name => $vars) {
+			$this->localized_vars[ $var_name ] = $this->encodeJsonVars($vars);
+			$JSON .= "/* <![CDATA[ */ var {$var_name} = ";
+			$JSON .= wp_json_encode($this->localized_vars[ $var_name ]);
+			$JSON .= '; /* ]]> */';
+		}
+		return $JSON;
+	}
+
+
+	/**
+	 * @param bool|int|float|string|array $var
+	 * @return array
+	 */
+	public function encodeJsonVars($var)
+	{
+		if (is_array($var)) {
+			$localized_vars = array();
+			foreach ((array) $var as $key => $value) {
+				$localized_vars[ $key ] = $this->encodeJsonVars($value);
+			}
+			return $localized_vars;
+		}
+		if (is_scalar($var)) {
+			return html_entity_decode((string) $var, ENT_QUOTES, 'UTF-8');
+		}
+		return null;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -83,7 +83,7 @@ 
     public function __construct($title, $content)
     {
         global $wp_version;
-        if (! defined('EE_IFRAME_DIR_URL')) {
+        if ( ! defined('EE_IFRAME_DIR_URL')) {
             define('EE_IFRAME_DIR_URL', plugin_dir_url(__FILE__));
         }
         $this->setContent($content);
@@ -92,11 +92,11 @@ 
             apply_filters(
                 'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_css',
                 array(
-                    'site_theme'       => get_stylesheet_directory_uri() . DS
-                                          . 'style.css?ver=' . EVENT_ESPRESSO_VERSION,
-                    'dashicons'        => includes_url('css/dashicons.min.css?ver=' . $wp_version),
+                    'site_theme'       => get_stylesheet_directory_uri().DS
+                                          . 'style.css?ver='.EVENT_ESPRESSO_VERSION,
+                    'dashicons'        => includes_url('css/dashicons.min.css?ver='.$wp_version),
                     'espresso_default' => EE_GLOBAL_ASSETS_URL
-                                          . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION,
+                                          . 'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION,
                 ),
                 $this
             )
@@ -105,9 +105,9 @@ 
             apply_filters(
                 'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__construct__default_js',
                 array(
-                    'jquery'        => includes_url('js/jquery/jquery.js?ver=' . $wp_version),
+                    'jquery'        => includes_url('js/jquery/jquery.js?ver='.$wp_version),
                     'espresso_core' => EE_GLOBAL_ASSETS_URL
-                                       . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION,
+                                       . 'scripts/espresso_core.js?ver='.EVENT_ESPRESSO_VERSION,
                 ),
                 $this
             )
@@ -181,7 +181,7 @@ 
             );
         }
         foreach ($stylesheets as $handle => $stylesheet) {
-            $this->css[ $handle ] = $stylesheet;
+            $this->css[$handle] = $stylesheet;
         }
     }
 
@@ -203,9 +203,9 @@ 
         }
         foreach ($scripts as $handle => $script) {
             if ($add_to_header) {
-                $this->header_js[ $handle ] = $script;
+                $this->header_js[$handle] = $script;
             } else {
-                $this->footer_js[ $handle ] = $script;
+                $this->footer_js[$handle] = $script;
             }
         }
     }
@@ -228,9 +228,9 @@ 
         }
         foreach ($script_attributes as $handle => $script_attribute) {
             if ($add_to_header) {
-                $this->header_js_attributes[ $handle ] = $script_attribute;
+                $this->header_js_attributes[$handle] = $script_attribute;
             } else {
-                $this->footer_js_attributes[ $handle ] = $script_attribute;
+                $this->footer_js_attributes[$handle] = $script_attribute;
             }
         }
     }
@@ -253,14 +253,14 @@ 
         }
         foreach ($vars as $handle => $var) {
             if ($var_name === 'eei18n') {
-                EE_Registry::$i18n_js_strings[ $handle ] = $var;
+                EE_Registry::$i18n_js_strings[$handle] = $var;
             } elseif ($var_name === 'eeCAL' && $handle === 'espresso_calendar') {
-                $this->localized_vars[ $var_name ] = $var;
+                $this->localized_vars[$var_name] = $var;
             } else {
-                if (! isset($this->localized_vars[ $var_name ])) {
-                    $this->localized_vars[ $var_name ] = array();
+                if ( ! isset($this->localized_vars[$var_name])) {
+                    $this->localized_vars[$var_name] = array();
                 }
-                $this->localized_vars[ $var_name ][ $handle ] = $var;
+                $this->localized_vars[$var_name][$handle] = $var;
             }
         }
     }
@@ -290,7 +290,7 @@ 
     public function getTemplate()
     {
         return EEH_Template::display_template(
-            __DIR__ . DIRECTORY_SEPARATOR . 'iframe_wrapper.template.php',
+            __DIR__.DIRECTORY_SEPARATOR.'iframe_wrapper.template.php',
             array(
                 'title'                => apply_filters(
                     'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__title',
@@ -334,11 +334,11 @@ 
                 ),
                 'eei18n'               => apply_filters(
                     'FHEE___EventEspresso_core_libraries_iframe_display_Iframe__getTemplate__eei18n_js_strings',
-                    EE_Registry::localize_i18n_js_strings() . $this->localizeJsonVars(),
+                    EE_Registry::localize_i18n_js_strings().$this->localizeJsonVars(),
                     $this
                 ),
                 'notices'              => EEH_Template::display_template(
-                    EE_TEMPLATES . 'espresso-ajax-notices.template.php',
+                    EE_TEMPLATES.'espresso-ajax-notices.template.php',
                     array(),
                     true
                 ),
@@ -358,9 +358,9 @@ 
     {
         $JSON = '';
         foreach ((array) $this->localized_vars as $var_name => $vars) {
-            $this->localized_vars[ $var_name ] = $this->encodeJsonVars($vars);
+            $this->localized_vars[$var_name] = $this->encodeJsonVars($vars);
             $JSON .= "/* <![CDATA[ */ var {$var_name} = ";
-            $JSON .= wp_json_encode($this->localized_vars[ $var_name ]);
+            $JSON .= wp_json_encode($this->localized_vars[$var_name]);
             $JSON .= '; /* ]]> */';
         }
         return $JSON;
@@ -376,7 +376,7 @@ 
         if (is_array($var)) {
             $localized_vars = array();
             foreach ((array) $var as $key => $value) {
-                $localized_vars[ $key ] = $this->encodeJsonVars($value);
+                $localized_vars[$key] = $this->encodeJsonVars($value);
             }
             return $localized_vars;
         }

core/libraries/iframe_display/IframeEmbedButton.php

Indentation +245 added lines, -245 removed lines

@@ -13,274 +13,274 @@
 {
 
 
-    /**
-     * @var string $iframe_name
-     */
-    private $iframe_name;
+	/**
+	 * @var string $iframe_name
+	 */
+	private $iframe_name;
 
-    /**
-     * @var string $route_name
-     */
-    private $route_name;
+	/**
+	 * @var string $route_name
+	 */
+	private $route_name;
 
-    /**
-     * @var string $slug
-     */
-    private $slug;
+	/**
+	 * @var string $slug
+	 */
+	private $slug;
 
-    /**
-     * @var boolean $append_filterable_content
-     */
-    private $append_filterable_content;
+	/**
+	 * @var boolean $append_filterable_content
+	 */
+	private $append_filterable_content;
 
 
-    /**
-     * IframeEmbedButton constructor.
-     *
-     * @param string $iframe_name i18n name for the iframe. This will be used in HTML
-     * @param string $route_name  the name of the registered route
-     * @param string $slug        URL slug used for the thing the iframe button is being embedded in.
-     *                            will most likely be "event" since that's the only usage atm
-     */
-    public function __construct($iframe_name, $route_name, $slug = 'event')
-    {
-        $this->iframe_name = $iframe_name;
-        $this->route_name = $route_name;
-        $this->slug = $slug;
-    }
+	/**
+	 * IframeEmbedButton constructor.
+	 *
+	 * @param string $iframe_name i18n name for the iframe. This will be used in HTML
+	 * @param string $route_name  the name of the registered route
+	 * @param string $slug        URL slug used for the thing the iframe button is being embedded in.
+	 *                            will most likely be "event" since that's the only usage atm
+	 */
+	public function __construct($iframe_name, $route_name, $slug = 'event')
+	{
+		$this->iframe_name = $iframe_name;
+		$this->route_name = $route_name;
+		$this->slug = $slug;
+	}
 
 
-    /**
-     * Adds an iframe embed code button to the Event editor.
-     */
-    public function addEventEditorIframeEmbedButtonFilter()
-    {
-        // add button for iframe code to event editor.
-        add_filter(
-            'get_sample_permalink_html',
-            array($this, 'appendIframeEmbedButtonToSamplePermalinkHtml'),
-            10,
-            2
-        );
-        add_action(
-            'admin_enqueue_scripts',
-            array($this, 'embedButtonAssets'),
-            10
-        );
-    }
+	/**
+	 * Adds an iframe embed code button to the Event editor.
+	 */
+	public function addEventEditorIframeEmbedButtonFilter()
+	{
+		// add button for iframe code to event editor.
+		add_filter(
+			'get_sample_permalink_html',
+			array($this, 'appendIframeEmbedButtonToSamplePermalinkHtml'),
+			10,
+			2
+		);
+		add_action(
+			'admin_enqueue_scripts',
+			array($this, 'embedButtonAssets'),
+			10
+		);
+	}
 
 
-    /**
-     * @param $permalink_string
-     * @param $id
-     * @return string
-     */
-    public function appendIframeEmbedButtonToSamplePermalinkHtml($permalink_string, $id)
-    {
-        return $this->eventEditorIframeEmbedButton(
-            $permalink_string,
-            $id
-        );
-    }
+	/**
+	 * @param $permalink_string
+	 * @param $id
+	 * @return string
+	 */
+	public function appendIframeEmbedButtonToSamplePermalinkHtml($permalink_string, $id)
+	{
+		return $this->eventEditorIframeEmbedButton(
+			$permalink_string,
+			$id
+		);
+	}
 
 
-    /**
-     * iframe embed code button to the Event editor.
-     *
-     * @param string $permalink_string
-     * @param int    $id
-     * @return string
-     */
-    public function eventEditorIframeEmbedButton(
-        $permalink_string,
-        $id
-    ) {
-        // make sure this is ONLY when editing and the event id has been set.
-        if (! empty($id)) {
-            $post = get_post($id);
-            // if NOT event then let's get out.
-            if ($post->post_type !== 'espresso_events') {
-                return $permalink_string;
-            }
-            $permalink_string .= $this->embedButtonHtml(
-                array($this->slug => $id),
-                'button-small'
-            );
-        }
-        return $permalink_string;
-    }
+	/**
+	 * iframe embed code button to the Event editor.
+	 *
+	 * @param string $permalink_string
+	 * @param int    $id
+	 * @return string
+	 */
+	public function eventEditorIframeEmbedButton(
+		$permalink_string,
+		$id
+	) {
+		// make sure this is ONLY when editing and the event id has been set.
+		if (! empty($id)) {
+			$post = get_post($id);
+			// if NOT event then let's get out.
+			if ($post->post_type !== 'espresso_events') {
+				return $permalink_string;
+			}
+			$permalink_string .= $this->embedButtonHtml(
+				array($this->slug => $id),
+				'button-small'
+			);
+		}
+		return $permalink_string;
+	}
 
 
-    /**
-     * Adds an iframe embed code button via a WP do_action() as determined by the first parameter
-     *
-     * @param string $action name of the WP do_action() to hook into
-     */
-    public function addActionIframeEmbedButton($action)
-    {
-        // add button for iframe code to event editor.
-        add_action(
-            $action,
-            array($this, 'addActionIframeEmbedButtonCallback'),
-            10,
-            2
-        );
-    }
+	/**
+	 * Adds an iframe embed code button via a WP do_action() as determined by the first parameter
+	 *
+	 * @param string $action name of the WP do_action() to hook into
+	 */
+	public function addActionIframeEmbedButton($action)
+	{
+		// add button for iframe code to event editor.
+		add_action(
+			$action,
+			array($this, 'addActionIframeEmbedButtonCallback'),
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * @return void
-     */
-    public function addActionIframeEmbedButtonCallback()
-    {
-        echo $this->embedButtonHtml();
-    }
+	/**
+	 * @return void
+	 */
+	public function addActionIframeEmbedButtonCallback()
+	{
+		echo $this->embedButtonHtml();
+	}
 
 
-    /**
-     * Adds an iframe embed code button via a WP apply_filters() as determined by the first parameter
-     *
-     * @param string $filter     name of the WP apply_filters() to hook into
-     * @param bool   $append     if true, will add iframe embed button to end of content,
-     *                           else if false, will add to the beginning of the content
-     */
-    public function addFilterIframeEmbedButton($filter, $append = true)
-    {
-        $this->append_filterable_content = $append;
-        // add button for iframe code to event editor.
-        add_filter(
-            $filter,
-            array($this, 'addFilterIframeEmbedButtonCallback'),
-            10
-        );
-    }
+	/**
+	 * Adds an iframe embed code button via a WP apply_filters() as determined by the first parameter
+	 *
+	 * @param string $filter     name of the WP apply_filters() to hook into
+	 * @param bool   $append     if true, will add iframe embed button to end of content,
+	 *                           else if false, will add to the beginning of the content
+	 */
+	public function addFilterIframeEmbedButton($filter, $append = true)
+	{
+		$this->append_filterable_content = $append;
+		// add button for iframe code to event editor.
+		add_filter(
+			$filter,
+			array($this, 'addFilterIframeEmbedButtonCallback'),
+			10
+		);
+	}
 
 
-    /**
-     * @param array|string $filterable_content
-     * @return array|string
-     */
-    public function addFilterIframeEmbedButtonCallback($filterable_content)
-    {
-        $embedButtonHtml = $this->embedButtonHtml();
-        if (is_array($filterable_content)) {
-            $filterable_content = $this->append_filterable_content
-                ? $filterable_content + array($this->route_name => $embedButtonHtml)
-                : array($this->route_name => $embedButtonHtml) + $filterable_content;
-        } else {
-            $filterable_content = $this->append_filterable_content
-                ? $filterable_content . $embedButtonHtml
-                : $embedButtonHtml . $filterable_content;
-        }
-        return $filterable_content;
-    }
+	/**
+	 * @param array|string $filterable_content
+	 * @return array|string
+	 */
+	public function addFilterIframeEmbedButtonCallback($filterable_content)
+	{
+		$embedButtonHtml = $this->embedButtonHtml();
+		if (is_array($filterable_content)) {
+			$filterable_content = $this->append_filterable_content
+				? $filterable_content + array($this->route_name => $embedButtonHtml)
+				: array($this->route_name => $embedButtonHtml) + $filterable_content;
+		} else {
+			$filterable_content = $this->append_filterable_content
+				? $filterable_content . $embedButtonHtml
+				: $embedButtonHtml . $filterable_content;
+		}
+		return $filterable_content;
+	}
 
 
-    /**
-     * iframe_embed_html
-     *
-     * @param array  $query_args
-     * @param string $button_class
-     * @return string
-     */
-    public function embedButtonHtml($query_args = array(), $button_class = '')
-    {
-        // incoming args will replace the defaults listed here in the second array (union preserves first array)
-        $query_args = (array) $query_args + array($this->route_name => 'iframe');
-        $query_args = (array) apply_filters(
-            'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__embedButtonHtml__query_args',
-            $query_args
-        );
-        // add this route to our localized vars
-        $iframe_module_routes = isset(\EE_Registry::$i18n_js_strings['iframe_module_routes'])
-            ? \EE_Registry::$i18n_js_strings['iframe_module_routes']
-            : array();
-        $iframe_module_routes[ $this->route_name ] = $this->route_name;
-        \EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
-        $iframe_embed_html = \EEH_HTML::link(
-            '#',
-            sprintf(esc_html__('Embed %1$s', 'event_espresso'), $this->iframe_name),
-            sprintf(
-                esc_html__(
-                    'click here to generate code for embedding %1$s iframe into another site.',
-                    'event_espresso'
-                ),
-                \EEH_Inflector::add_indefinite_article($this->iframe_name)
-            ),
-            "{$this->route_name}-iframe-embed-trigger-js",
-            'iframe-embed-trigger-js button ' . $button_class,
-            '',
-            ' data-iframe_embed_button="#' . $this->route_name . '-iframe-js" tabindex="-1"'
-        );
-        $iframe_embed_html .= \EEH_HTML::div(
-            '',
-            "{$this->route_name}-iframe-js",
-            'iframe-embed-wrapper-js',
-            'display:none;'
-        );
-        $iframe_embed_html .= esc_html(
-            \EEH_HTML::div(
-                '<iframe src="' . add_query_arg($query_args, site_url()) . '" width="100%" height="100%"></iframe>',
-                '',
-                '',
-                'width:100%; height: 500px;'
-            )
-        );
-        $iframe_embed_html .= \EEH_HTML::divx();
-        return $iframe_embed_html;
-    }
+	/**
+	 * iframe_embed_html
+	 *
+	 * @param array  $query_args
+	 * @param string $button_class
+	 * @return string
+	 */
+	public function embedButtonHtml($query_args = array(), $button_class = '')
+	{
+		// incoming args will replace the defaults listed here in the second array (union preserves first array)
+		$query_args = (array) $query_args + array($this->route_name => 'iframe');
+		$query_args = (array) apply_filters(
+			'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__embedButtonHtml__query_args',
+			$query_args
+		);
+		// add this route to our localized vars
+		$iframe_module_routes = isset(\EE_Registry::$i18n_js_strings['iframe_module_routes'])
+			? \EE_Registry::$i18n_js_strings['iframe_module_routes']
+			: array();
+		$iframe_module_routes[ $this->route_name ] = $this->route_name;
+		\EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
+		$iframe_embed_html = \EEH_HTML::link(
+			'#',
+			sprintf(esc_html__('Embed %1$s', 'event_espresso'), $this->iframe_name),
+			sprintf(
+				esc_html__(
+					'click here to generate code for embedding %1$s iframe into another site.',
+					'event_espresso'
+				),
+				\EEH_Inflector::add_indefinite_article($this->iframe_name)
+			),
+			"{$this->route_name}-iframe-embed-trigger-js",
+			'iframe-embed-trigger-js button ' . $button_class,
+			'',
+			' data-iframe_embed_button="#' . $this->route_name . '-iframe-js" tabindex="-1"'
+		);
+		$iframe_embed_html .= \EEH_HTML::div(
+			'',
+			"{$this->route_name}-iframe-js",
+			'iframe-embed-wrapper-js',
+			'display:none;'
+		);
+		$iframe_embed_html .= esc_html(
+			\EEH_HTML::div(
+				'<iframe src="' . add_query_arg($query_args, site_url()) . '" width="100%" height="100%"></iframe>',
+				'',
+				'',
+				'width:100%; height: 500px;'
+			)
+		);
+		$iframe_embed_html .= \EEH_HTML::divx();
+		return $iframe_embed_html;
+	}
 
 
-    /**
-     * enqueue iframe button js
-     */
-    public function embedButtonAssets()
-    {
-        \EE_Registry::$i18n_js_strings['iframe_embed_title'] = esc_html__(
-            'copy and paste the following into any other site\'s content to display this event:',
-            'event_espresso'
-        );
-        \EE_Registry::$i18n_js_strings['iframe_embed_close_msg'] = esc_html__(
-            'click anywhere outside of this window to close it.',
-            'event_espresso'
-        );
-        wp_register_script(
-            'iframe_embed_button',
-            plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
-            array('ee-dialog'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('iframe_embed_button');
-    }
+	/**
+	 * enqueue iframe button js
+	 */
+	public function embedButtonAssets()
+	{
+		\EE_Registry::$i18n_js_strings['iframe_embed_title'] = esc_html__(
+			'copy and paste the following into any other site\'s content to display this event:',
+			'event_espresso'
+		);
+		\EE_Registry::$i18n_js_strings['iframe_embed_close_msg'] = esc_html__(
+			'click anywhere outside of this window to close it.',
+			'event_espresso'
+		);
+		wp_register_script(
+			'iframe_embed_button',
+			plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
+			array('ee-dialog'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('iframe_embed_button');
+	}
 
 
-    /**
-     * generates embed button sections for admin pages
-     *
-     * @param array $embed_buttons
-     * @return string
-     */
-    public function addIframeEmbedButtonsSection(array $embed_buttons)
-    {
-        $embed_buttons = (array) apply_filters(
-            'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__addIframeEmbedButtonsSection__embed_buttons',
-            $embed_buttons
-        );
-        if (empty($embed_buttons)) {
-            return '';
-        }
-        // add button for iframe code to event editor.
-        $html = \EEH_HTML::br(2);
-        $html .= \EEH_HTML::h3(esc_html__('iFrame Embed Code', 'event_espresso'));
-        $html .= \EEH_HTML::p(
-            esc_html__(
-                'Click the following button(s) to generate iframe HTML that will allow you to embed your event content within the content of other websites.',
-                'event_espresso'
-            )
-        );
-        $html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
-        $html .= \EEH_HTML::br(2);
-        return $html;
-    }
+	/**
+	 * generates embed button sections for admin pages
+	 *
+	 * @param array $embed_buttons
+	 * @return string
+	 */
+	public function addIframeEmbedButtonsSection(array $embed_buttons)
+	{
+		$embed_buttons = (array) apply_filters(
+			'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__addIframeEmbedButtonsSection__embed_buttons',
+			$embed_buttons
+		);
+		if (empty($embed_buttons)) {
+			return '';
+		}
+		// add button for iframe code to event editor.
+		$html = \EEH_HTML::br(2);
+		$html .= \EEH_HTML::h3(esc_html__('iFrame Embed Code', 'event_espresso'));
+		$html .= \EEH_HTML::p(
+			esc_html__(
+				'Click the following button(s) to generate iframe HTML that will allow you to embed your event content within the content of other websites.',
+				'event_espresso'
+			)
+		);
+		$html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
+		$html .= \EEH_HTML::br(2);
+		return $html;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
         $id
     ) {
         // make sure this is ONLY when editing and the event id has been set.
-        if (! empty($id)) {
+        if ( ! empty($id)) {
             $post = get_post($id);
             // if NOT event then let's get out.
             if ($post->post_type !== 'espresso_events') {
@@ -169,8 +169,8 @@ 
                 : array($this->route_name => $embedButtonHtml) + $filterable_content;
         } else {
             $filterable_content = $this->append_filterable_content
-                ? $filterable_content . $embedButtonHtml
-                : $embedButtonHtml . $filterable_content;
+                ? $filterable_content.$embedButtonHtml
+                : $embedButtonHtml.$filterable_content;
         }
         return $filterable_content;
     }
@@ -195,7 +195,7 @@ 
         $iframe_module_routes = isset(\EE_Registry::$i18n_js_strings['iframe_module_routes'])
             ? \EE_Registry::$i18n_js_strings['iframe_module_routes']
             : array();
-        $iframe_module_routes[ $this->route_name ] = $this->route_name;
+        $iframe_module_routes[$this->route_name] = $this->route_name;
         \EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
         $iframe_embed_html = \EEH_HTML::link(
             '#',
@@ -208,9 +208,9 @@ 
                 \EEH_Inflector::add_indefinite_article($this->iframe_name)
             ),
             "{$this->route_name}-iframe-embed-trigger-js",
-            'iframe-embed-trigger-js button ' . $button_class,
+            'iframe-embed-trigger-js button '.$button_class,
             '',
-            ' data-iframe_embed_button="#' . $this->route_name . '-iframe-js" tabindex="-1"'
+            ' data-iframe_embed_button="#'.$this->route_name.'-iframe-js" tabindex="-1"'
         );
         $iframe_embed_html .= \EEH_HTML::div(
             '',
@@ -220,7 +220,7 @@ 
         );
         $iframe_embed_html .= esc_html(
             \EEH_HTML::div(
-                '<iframe src="' . add_query_arg($query_args, site_url()) . '" width="100%" height="100%"></iframe>',
+                '<iframe src="'.add_query_arg($query_args, site_url()).'" width="100%" height="100%"></iframe>',
                 '',
                 '',
                 'width:100%; height: 500px;'
@@ -246,7 +246,7 @@ 
         );
         wp_register_script(
             'iframe_embed_button',
-            plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
+            plugin_dir_url(__FILE__).'iframe-embed-button.js',
             array('ee-dialog'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -279,7 +279,7 @@ 
                 'event_espresso'
             )
         );
-        $html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
+        $html .= ' &nbsp; '.implode(' &nbsp; ', $embed_buttons).' ';
         $html .= \EEH_HTML::br(2);
         return $html;
     }

core/libraries/rest_api/controllers/config/Read.php

Indentation +77 added lines, -77 removed lines

@@ -20,85 +20,85 @@
 class Read
 {
 
-    /**
-     * @param WP_REST_Request $request
-     * @param string          $version
-     * @return EE_Config|WP_Error
-     */
-    public static function handleRequest(WP_REST_Request $request, $version)
-    {
-        $cap = EE_Restriction_Generator_Base::get_default_restrictions_cap();
-        if (EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
-            return EE_Config::instance();
-        } else {
-            return new WP_Error(
-                'cannot_read_config',
-                sprintf(
-                    __(
-                        'You do not have the necessary capabilities (%s) to read Event Espresso Configuration data',
-                        'event_espresso'
-                    ),
-                    $cap
-                ),
-                array('status' => 403)
-            );
-        }
-    }
+	/**
+	 * @param WP_REST_Request $request
+	 * @param string          $version
+	 * @return EE_Config|WP_Error
+	 */
+	public static function handleRequest(WP_REST_Request $request, $version)
+	{
+		$cap = EE_Restriction_Generator_Base::get_default_restrictions_cap();
+		if (EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
+			return EE_Config::instance();
+		} else {
+			return new WP_Error(
+				'cannot_read_config',
+				sprintf(
+					__(
+						'You do not have the necessary capabilities (%s) to read Event Espresso Configuration data',
+						'event_espresso'
+					),
+					$cap
+				),
+				array('status' => 403)
+			);
+		}
+	}
 
 
-    /**
-     * Handles the request for public site info
-     *
-     * @global                 $wp_json_basic_auth_success       boolean set by the basic auth plugin, indicates if the
-     *                                                           current user could be authenticated using basic auth
-     *                                                           data
-     * @global                 $wp_json_basic_auth_received_data boolean set by the basic auth plugin, indicates if
-     *                                                           basic auth data was somehow received
-     * @param WP_REST_Request  $request
-     * @param string           $version
-     * @return array|WP_Error
-     */
-    public static function handleRequestSiteInfo(WP_REST_Request $request, $version)
-    {
-        global $wp_json_basic_auth_success, $wp_json_basic_auth_received_data;
-        $insecure_usage_of_basic_auth = apply_filters(
-        // @codingStandardsIgnoreStart
-            'EventEspresso__core__libraries__rest_api__controllers__config__handle_request_site_info__insecure_usage_of_basic_auth',
-            // @codingStandardsIgnoreEnd
-            $wp_json_basic_auth_success && ! is_ssl(),
-            $request
-        );
-        if ($insecure_usage_of_basic_auth) {
-            $warning = sprintf(
-                esc_html__(
-                // @codingStandardsIgnoreStart
-                    'Notice: We strongly recommend installing an SSL Certificate on your website to keep your data secure. %1$sPlease see our recommendations.%2$s',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                ),
-                '<a href="https://eventespresso.com/wiki/rest-api-security-recommendations/">',
-                '</a>'
-            );
-        } else {
-            $warning = '';
-        }
-        return apply_filters(
-            'FHEE__EventEspresso_core_libraries_rest_api_controllers_config__handleRequestSiteInfo__return_val',
-            array(
-                'default_timezone' => array(
-                    'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
-                    'string' => get_option('timezone_string'),
-                    'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
-                ),
-                'default_currency' => EE_Config::instance()->currency,
-                'authentication'   => array(
-                    'received_basic_auth_data'     => (bool) $wp_json_basic_auth_received_data,
-                    'insecure_usage_of_basic_auth' => (bool) $insecure_usage_of_basic_auth,
-                    'warning'                      => $warning,
-                ),
-            )
-        );
-    }
+	/**
+	 * Handles the request for public site info
+	 *
+	 * @global                 $wp_json_basic_auth_success       boolean set by the basic auth plugin, indicates if the
+	 *                                                           current user could be authenticated using basic auth
+	 *                                                           data
+	 * @global                 $wp_json_basic_auth_received_data boolean set by the basic auth plugin, indicates if
+	 *                                                           basic auth data was somehow received
+	 * @param WP_REST_Request  $request
+	 * @param string           $version
+	 * @return array|WP_Error
+	 */
+	public static function handleRequestSiteInfo(WP_REST_Request $request, $version)
+	{
+		global $wp_json_basic_auth_success, $wp_json_basic_auth_received_data;
+		$insecure_usage_of_basic_auth = apply_filters(
+		// @codingStandardsIgnoreStart
+			'EventEspresso__core__libraries__rest_api__controllers__config__handle_request_site_info__insecure_usage_of_basic_auth',
+			// @codingStandardsIgnoreEnd
+			$wp_json_basic_auth_success && ! is_ssl(),
+			$request
+		);
+		if ($insecure_usage_of_basic_auth) {
+			$warning = sprintf(
+				esc_html__(
+				// @codingStandardsIgnoreStart
+					'Notice: We strongly recommend installing an SSL Certificate on your website to keep your data secure. %1$sPlease see our recommendations.%2$s',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				),
+				'<a href="https://eventespresso.com/wiki/rest-api-security-recommendations/">',
+				'</a>'
+			);
+		} else {
+			$warning = '';
+		}
+		return apply_filters(
+			'FHEE__EventEspresso_core_libraries_rest_api_controllers_config__handleRequestSiteInfo__return_val',
+			array(
+				'default_timezone' => array(
+					'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
+					'string' => get_option('timezone_string'),
+					'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
+				),
+				'default_currency' => EE_Config::instance()->currency,
+				'authentication'   => array(
+					'received_basic_auth_data'     => (bool) $wp_json_basic_auth_received_data,
+					'insecure_usage_of_basic_auth' => (bool) $insecure_usage_of_basic_auth,
+					'warning'                      => $warning,
+				),
+			)
+		);
+	}
 }
 
 // End of file Read.php

core/libraries/rest_api/controllers/model/Meta.php

Indentation +109 added lines, -109 removed lines

@@ -23,122 +23,122 @@
 {
 
 
-    /**
-     * @param \WP_REST_Request $request
-     * @param string           $version
-     * @return array|\WP_REST_Response
-     */
-    public static function handleRequestModelsMeta(\WP_REST_Request $request, $version)
-    {
-        $controller = new Meta();
-        try {
-            $controller->setRequestedVersion($version);
-            return $controller->sendResponse($controller->getModelsMetadataEntity());
-        } catch (Exception $e) {
-            return $controller->sendResponse($e);
-        }
-    }
+	/**
+	 * @param \WP_REST_Request $request
+	 * @param string           $version
+	 * @return array|\WP_REST_Response
+	 */
+	public static function handleRequestModelsMeta(\WP_REST_Request $request, $version)
+	{
+		$controller = new Meta();
+		try {
+			$controller->setRequestedVersion($version);
+			return $controller->sendResponse($controller->getModelsMetadataEntity());
+		} catch (Exception $e) {
+			return $controller->sendResponse($e);
+		}
+	}
 
 
-    /*
+	/*
      * Gets the model metadata resource entity
      * @return array for JSON response, describing all the models available in teh requested version
      */
-    protected function getModelsMetadataEntity()
-    {
-        $response = array();
-        foreach ($this->getModelVersionInfo()->modelsForRequestedVersion() as $model_name => $model_classname) {
-            $model = $this->getModelVersionInfo()->loadModel($model_name);
-            $fields_json = array();
-            foreach ($this->getModelVersionInfo()->fieldsOnModelInThisVersion($model) as $field_name => $field_obj) {
-                if ($this->getModelVersionInfo()->fieldIsIgnored($field_obj)) {
-                    continue;
-                }
-                if ($field_obj instanceof EE_Boolean_Field) {
-                    $datatype = 'Boolean';
-                } elseif ($field_obj->get_wpdb_data_type() == '%d') {
-                    $datatype = 'Number';
-                } elseif ($field_name instanceof EE_Serialized_Text_Field) {
-                    $datatype = 'Object';
-                } else {
-                    $datatype = 'String';
-                }
-                $default_value = ModelDataTranslator::prepareFieldValueForJson(
-                    $field_obj,
-                    $field_obj->get_default_value(),
-                    $this->getModelVersionInfo()->requestedVersion()
-                );
-                $field_json = array(
-                    'name'                => $field_name,
-                    'nicename'            => wp_specialchars_decode($field_obj->get_nicename(), ENT_QUOTES),
-                    'has_rendered_format' => $this->getModelVersionInfo()->fieldHasRenderedFormat($field_obj),
-                    'has_pretty_format'   => $this->getModelVersionInfo()->fieldHasPrettyFormat($field_obj),
-                    'type'                => str_replace('EE_', '', get_class($field_obj)),
-                    'datatype'            => $datatype,
-                    'nullable'            => $field_obj->is_nullable(),
-                    'default'             => $default_value,
-                    'table_alias'         => $field_obj->get_table_alias(),
-                    'table_column'        => $field_obj->get_table_column(),
-                );
-                $fields_json[ $field_json['name'] ] = $field_json;
-            }
-            $fields_json = array_merge(
-                $fields_json,
-                $this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
-            );
-            $response[ $model_name ]['fields'] = apply_filters(
-                'FHEE__Meta__handle_request_models_meta__fields',
-                $fields_json,
-                $model
-            );
-            $relations_json = array();
-            foreach ($model->relation_settings() as $relation_name => $relation_obj) {
-                $relation_json = array(
-                    'name'   => $relation_name,
-                    'type'   => str_replace('EE_', '', get_class($relation_obj)),
-                    'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
-                );
-                $relations_json[ $relation_name ] = $relation_json;
-            }
-            $response[ $model_name ]['relations'] = apply_filters(
-                'FHEE__Meta__handle_request_models_meta__relations',
-                $relations_json,
-                $model
-            );
-        }
-        return $response;
-    }
+	protected function getModelsMetadataEntity()
+	{
+		$response = array();
+		foreach ($this->getModelVersionInfo()->modelsForRequestedVersion() as $model_name => $model_classname) {
+			$model = $this->getModelVersionInfo()->loadModel($model_name);
+			$fields_json = array();
+			foreach ($this->getModelVersionInfo()->fieldsOnModelInThisVersion($model) as $field_name => $field_obj) {
+				if ($this->getModelVersionInfo()->fieldIsIgnored($field_obj)) {
+					continue;
+				}
+				if ($field_obj instanceof EE_Boolean_Field) {
+					$datatype = 'Boolean';
+				} elseif ($field_obj->get_wpdb_data_type() == '%d') {
+					$datatype = 'Number';
+				} elseif ($field_name instanceof EE_Serialized_Text_Field) {
+					$datatype = 'Object';
+				} else {
+					$datatype = 'String';
+				}
+				$default_value = ModelDataTranslator::prepareFieldValueForJson(
+					$field_obj,
+					$field_obj->get_default_value(),
+					$this->getModelVersionInfo()->requestedVersion()
+				);
+				$field_json = array(
+					'name'                => $field_name,
+					'nicename'            => wp_specialchars_decode($field_obj->get_nicename(), ENT_QUOTES),
+					'has_rendered_format' => $this->getModelVersionInfo()->fieldHasRenderedFormat($field_obj),
+					'has_pretty_format'   => $this->getModelVersionInfo()->fieldHasPrettyFormat($field_obj),
+					'type'                => str_replace('EE_', '', get_class($field_obj)),
+					'datatype'            => $datatype,
+					'nullable'            => $field_obj->is_nullable(),
+					'default'             => $default_value,
+					'table_alias'         => $field_obj->get_table_alias(),
+					'table_column'        => $field_obj->get_table_column(),
+				);
+				$fields_json[ $field_json['name'] ] = $field_json;
+			}
+			$fields_json = array_merge(
+				$fields_json,
+				$this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
+			);
+			$response[ $model_name ]['fields'] = apply_filters(
+				'FHEE__Meta__handle_request_models_meta__fields',
+				$fields_json,
+				$model
+			);
+			$relations_json = array();
+			foreach ($model->relation_settings() as $relation_name => $relation_obj) {
+				$relation_json = array(
+					'name'   => $relation_name,
+					'type'   => str_replace('EE_', '', get_class($relation_obj)),
+					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
+				);
+				$relations_json[ $relation_name ] = $relation_json;
+			}
+			$response[ $model_name ]['relations'] = apply_filters(
+				'FHEE__Meta__handle_request_models_meta__relations',
+				$relations_json,
+				$model
+			);
+		}
+		return $response;
+	}
 
 
-    /**
-     * Adds EE metadata to the index
-     *
-     * @param \WP_REST_Response $rest_response_obj
-     * @return \WP_REST_Response
-     */
-    public static function filterEeMetadataIntoIndex(\WP_REST_Response $rest_response_obj)
-    {
-        $response_data = $rest_response_obj->get_data();
-        $addons = array();
-        foreach (EE_Registry::instance()->addons as $addon) {
-            $addon_json = array(
-                'name'    => $addon->name(),
-                'version' => $addon->version(),
-            );
-            $addons[ $addon_json['name'] ] = $addon_json;
-        }
-        $response_data['ee'] = array(
-            'version'              => EEM_System_Status::instance()->get_ee_version(),
-            // @codingStandardsIgnoreStart
-            'documentation_url'    => 'https://github.com/eventespresso/event-espresso-core/tree/master/docs/C--REST-API',
-            // @codingStandardsIgnoreEnd
-            'addons'               => $addons,
-            'maintenance_mode'     => EE_Maintenance_Mode::instance()->real_level(),
-            'served_core_versions' => array_keys(EED_Core_Rest_Api::versions_served()),
-        );
-        $rest_response_obj->set_data($response_data);
-        return $rest_response_obj;
-    }
+	/**
+	 * Adds EE metadata to the index
+	 *
+	 * @param \WP_REST_Response $rest_response_obj
+	 * @return \WP_REST_Response
+	 */
+	public static function filterEeMetadataIntoIndex(\WP_REST_Response $rest_response_obj)
+	{
+		$response_data = $rest_response_obj->get_data();
+		$addons = array();
+		foreach (EE_Registry::instance()->addons as $addon) {
+			$addon_json = array(
+				'name'    => $addon->name(),
+				'version' => $addon->version(),
+			);
+			$addons[ $addon_json['name'] ] = $addon_json;
+		}
+		$response_data['ee'] = array(
+			'version'              => EEM_System_Status::instance()->get_ee_version(),
+			// @codingStandardsIgnoreStart
+			'documentation_url'    => 'https://github.com/eventespresso/event-espresso-core/tree/master/docs/C--REST-API',
+			// @codingStandardsIgnoreEnd
+			'addons'               => $addons,
+			'maintenance_mode'     => EE_Maintenance_Mode::instance()->real_level(),
+			'served_core_versions' => array_keys(EED_Core_Rest_Api::versions_served()),
+		);
+		$rest_response_obj->set_data($response_data);
+		return $rest_response_obj;
+	}
 }
 
 

Spacing +5 added lines, -5 removed lines

@@ -80,13 +80,13 @@ 
                     'table_alias'         => $field_obj->get_table_alias(),
                     'table_column'        => $field_obj->get_table_column(),
                 );
-                $fields_json[ $field_json['name'] ] = $field_json;
+                $fields_json[$field_json['name']] = $field_json;
             }
             $fields_json = array_merge(
                 $fields_json,
                 $this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
             );
-            $response[ $model_name ]['fields'] = apply_filters(
+            $response[$model_name]['fields'] = apply_filters(
                 'FHEE__Meta__handle_request_models_meta__fields',
                 $fields_json,
                 $model
@@ -98,9 +98,9 @@ 
                     'type'   => str_replace('EE_', '', get_class($relation_obj)),
                     'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
                 );
-                $relations_json[ $relation_name ] = $relation_json;
+                $relations_json[$relation_name] = $relation_json;
             }
-            $response[ $model_name ]['relations'] = apply_filters(
+            $response[$model_name]['relations'] = apply_filters(
                 'FHEE__Meta__handle_request_models_meta__relations',
                 $relations_json,
                 $model
@@ -125,7 +125,7 @@ 
                 'name'    => $addon->name(),
                 'version' => $addon->version(),
             );
-            $addons[ $addon_json['name'] ] = $addon_json;
+            $addons[$addon_json['name']] = $addon_json;
         }
         $response_data['ee'] = array(
             'version'              => EEM_System_Status::instance()->get_ee_version(),