gravityview / GravityView

includes/fields/section.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 	function __construct() {
 		parent::__construct();
 
-		add_filter( 'gravityview_field_entry_value_section', array( $this, 'prevent_empty_field' ) );
+		add_filter('gravityview_field_entry_value_section', array($this, 'prevent_empty_field'));
 	}
 
 	/**
@@ -22,13 +22,13 @@ 
 	 *
 	 * @return string If output was empty, return an empty HTML comment tag. Otherwise, return output.
 	 */
-	function prevent_empty_field( $output = '' ) {
-		return empty( $output ) ? '<!-- -->' : $output;
+	function prevent_empty_field($output = '') {
+		return empty($output) ? '<!-- -->' : $output;
 	}
 
-	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
+		unset ($field_options['search_filter'], $field_options['show_as_link']);
 
 		// Set the default CSS class to gv-section, which applies a border and top/bottom margin
 		$field_options['custom_class']['value'] = 'gv-section';

includes/fields/source-url.php

Spacing +5 added lines, -5 removed lines

@@ -7,26 +7,26 @@
 
 	var $name = 'source_url';
 
-	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
 		// Don't link to entry; doesn't make sense.
-		unset( $field_options['show_as_link'] );
+		unset($field_options['show_as_link']);
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
 		$add_options = array();
 		$add_options['link_to_source'] = array(
 			'type' => 'checkbox',
-			'label' => __( 'Link to URL:', 'gravityview' ),
+			'label' => __('Link to URL:', 'gravityview'),
 			'desc' => __('Display as a link to the Source URL', 'gravityview'),
 			'value' => false,
 			'merge_tags' => false,
 		);
 		$add_options['source_link_text'] = array(
 			'type' => 'text',
-			'label' => __( 'Link Text:', 'gravityview' ),
+			'label' => __('Link Text:', 'gravityview'),
 			'desc' => __('Customize the link text. If empty, the link text will be the the URL.', 'gravityview'),
 			'value' => NULL,
 			'merge_tags' => true,

includes/fields/textarea.php

Spacing +6 added lines, -6 removed lines

@@ -7,9 +7,9 @@ 
 
 	var $name = 'textarea';
 
-	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+	function field_options($field_options, $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
@@ -17,16 +17,16 @@ 
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
-			'label' => __( 'Maximum words shown', 'gravityview' ),
-			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
+			'label' => __('Maximum words shown', 'gravityview'),
+			'tooltip' => __('Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview'),
 		);
 
         $field_options['make_clickable'] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
+            'label' => __('Convert text URLs to HTML links', 'gravityview'),
+            'tooltip' => __('Converts URI, www, FTP, and email addresses in HTML links', 'gravityview'),
         );
 
 		return $field_options;

includes/fields/time.php

Spacing +40 added lines, -40 removed lines

@@ -38,9 +38,9 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
+		add_filter('gravityview/sorting/time', array($this, 'modify_sort_id'), 10, 2);
 
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
+		add_filter('gravityview_search_criteria', array($this, '_maybe_filter_gravity_forms_query'), 10, 4);
 	}
 
 	/**
@@ -54,14 +54,14 @@ 
 	 *
 	 * @return string Modified sort key imploded with $_sort_divider, like `5|:time:|12|:time:|h:i A`
 	 */
-	public function modify_sort_id( $sort_field_id, $form_id ) {
+	public function modify_sort_id($sort_field_id, $form_id) {
 
-		$time_format = self::_get_time_format_for_field( $sort_field_id, $form_id );
+		$time_format = self::_get_time_format_for_field($sort_field_id, $form_id);
 
-		$date_format = self::date_format( $time_format, $sort_field_id );
+		$date_format = self::date_format($time_format, $sort_field_id);
 
 		// Should look something like `5|:time:|12|:time:|h:i A`
-		$new_sort_field_id = implode( $this->_sort_divider, array( $sort_field_id, $time_format, $date_format ) );
+		$new_sort_field_id = implode($this->_sort_divider, array($sort_field_id, $time_format, $date_format));
 
 		return $new_sort_field_id;
 	}
@@ -78,25 +78,25 @@ 
 	 *
 	 * @return $criteria If a match, the sorting will be updated to set `is_numeric` to true and make sure the field ID is an int
 	 */
-	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
+	public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id) {
 
 		// If the search is being sorted
-		if( ! empty( $criteria['sorting']['key'] ) ) {
+		if (!empty($criteria['sorting']['key'])) {
 
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
+			$pieces = explode($this->_sort_divider, $criteria['sorting']['key']);
 
 			/**
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
 			 * @see modify_sort_id()
 			 */
-			if( ! empty( $pieces[1] ) ) {
+			if (!empty($pieces[1])) {
 
 				// Pass these to the _modify_query_sort_by_time_hack() method
 				$this->_time_format = $pieces[1];
 				$this->_date_format = $pieces[2];
 
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
-				$criteria['sorting']['key'] = floor( $pieces[0] );
+				$criteria['sorting']['key'] = floor($pieces[0]);
 
 				/**
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
@@ -105,7 +105,7 @@ 
 				$criteria['sorting']['is_numeric'] = true;
 
 				// Modify the Gravity Forms WP Query
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
+				add_filter('query', array($this, '_modify_query_sort_by_time_hack'));
 			}
 		}
 
@@ -121,22 +121,22 @@ 
 	 *
 	 * @return string Modified query, if the query matches the expected Gravity Forms SQL string used for sorting time fields. Otherwise, original query.
 	 */
-	function _modify_query_sort_by_time_hack( $query ) {
+	function _modify_query_sort_by_time_hack($query) {
 
 		/**
 		 * If this is a Gravity Forms entry selection sorting query, generated by sort_by_field_query(),
 		 * then we want to modify the query.
 		 * @see GFFormsModel::sort_by_field_query()
 		 */
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
+		if (strpos($query, self::GF_SORTING_SQL) > 0) {
 
-			if( $this->_time_format === '24' ) {
+			if ($this->_time_format === '24') {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
 			} else {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
 			}
 
-			switch ( $this->_date_format ) {
+			switch ($this->_date_format) {
 				case 'h':
 				case 'H':
 					$modification = "TIME_FORMAT( {$sql_str_to_date}, '%H' )";
@@ -154,40 +154,40 @@ 
 			 * Convert the time (12:30 pm) to the MySQL `TIME_TO_SEC()` value for that time (45000)
 			 * This way, Gravity Forms is able to sort numerically.
 			 */
-			$replacement_query = str_replace( 'value', "{$modification} as value", self::GF_SORTING_SQL );
+			$replacement_query = str_replace('value', "{$modification} as value", self::GF_SORTING_SQL);
 
 			/**
 			 * Replace it in the main query
 			 */
-			$query = str_replace( self::GF_SORTING_SQL, $replacement_query, $query );
+			$query = str_replace(self::GF_SORTING_SQL, $replacement_query, $query);
 
 			/**
 			 * REMOVE the Gravity Forms WP Query modifications!
 			 */
-			remove_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
+			remove_filter('query', array($this, '_modify_query_sort_by_time_hack'));
 		}
 
 		return $query;
 	}
 
 
-	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+	function field_options($field_options, $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
 		// Set variables
-		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
+		parent::field_options($field_options, $template_id, $field_id, $context, $input_type);
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
 		/**
 		 * Set default date format based on field ID and Form ID
 		 */
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		add_filter('gravityview_date_format', array($this, '_filter_date_display_date_format'));
 
-		$this->add_field_support('date_display', $field_options );
+		$this->add_field_support('date_display', $field_options);
 
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		remove_filter('gravityview_date_format', array($this, '_filter_date_display_date_format'));
 
 		return $field_options;
 	}
@@ -202,9 +202,9 @@ 
 	private function _get_time_format() {
 		global $post;
 
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
+		$current_form = isset($_POST['form_id']) ? intval($_POST['form_id']) : gravityview_get_form_id($post->ID);
 
-		return self::_get_time_format_for_field( $this->_field_id, $current_form );
+		return self::_get_time_format_for_field($this->_field_id, $current_form);
 	}
 
 	/**
@@ -216,17 +216,17 @@ 
 	 * @param int $form_id ID for Gravity Forms form
 	 * @return string Either "12" or "24". "12" is default.
 	 */
-	static public function _get_time_format_for_field( $field_id, $form_id = 0 ) {
+	static public function _get_time_format_for_field($field_id, $form_id = 0) {
 
 		// GF defaults to 12, so should we.
 		$time_format = '12';
 
-		if( $form_id ) {
-			$form = GFAPI::get_form( $form_id );
+		if ($form_id) {
+			$form = GFAPI::get_form($form_id);
 
-			if ( $form ) {
-				$field = GFFormsModel::get_field( $form, floor( $field_id ) );
-				if ( $field && $field instanceof GF_Field_Time ) {
+			if ($form) {
+				$field = GFFormsModel::get_field($form, floor($field_id));
+				if ($field && $field instanceof GF_Field_Time) {
 					$field->sanitize_settings(); // Make sure time is set
 					$time_format = $field->timeFormat;
 				}
@@ -248,7 +248,7 @@ 
 		$time_format = $this->_get_time_format();
 		$field_id = $this->_field_id;
 
-		return self::date_format( $time_format, $field_id );
+		return self::date_format($time_format, $field_id);
 	}
 
 	/**
@@ -261,19 +261,19 @@ 
 	 *
 	 * @return string PHP date format for the time
 	 */
-	static public function date_format( $time_format = '12', $field_id = 0 ) {
+	static public function date_format($time_format = '12', $field_id = 0) {
 
-		$field_id_array = explode( '.', $field_id );
+		$field_id_array = explode('.', $field_id);
 
-		$field_input_id = isset( $field_id_array[1] ) ? intval( $field_id_array[1] ) : 0;
+		$field_input_id = isset($field_id_array[1]) ? intval($field_id_array[1]) : 0;
 
 		$default = 'h:i A';
 
 		// This doesn't take into account 24-hour
-		switch( $field_input_id ) {
+		switch ($field_input_id) {
 			// Hours
 			case 1:
-				return ( $time_format === '12' ) ? 'h' : 'H';
+				return ($time_format === '12') ? 'h' : 'H';
 				break;
 			// Minutes
 			case 2:
@@ -285,7 +285,7 @@ 
 				break;
 			// Full time field
 			case 0:
-				return ( $time_format === '12' ) ? $default : 'H:i';
+				return ($time_format === '12') ? $default : 'H:i';
 				break;
 		}
 

includes/fields/website.php

Spacing +9 added lines, -9 removed lines

@@ -7,12 +7,12 @@ 
 
 	var $name = 'website';
 
-	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+	function field_options($field_options, $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
 		// It makes no sense to use this as the link.
-		unset( $field_options['show_as_link'] );
+		unset($field_options['show_as_link']);
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
@@ -21,8 +21,8 @@ 
 		 */
 		$field_options['anchor_text'] = array(
 			'type' => 'text',
-			'label' => __( 'Link Text:', 'gravityview' ),
-			'desc' => __( 'Define custom link text. Leave blank to display the URL', 'gravityview' ),
+			'label' => __('Link Text:', 'gravityview'),
+			'desc' => __('Define custom link text. Leave blank to display the URL', 'gravityview'),
 			'value' => '',
 			'merge_tags' => 'force',
 		);
@@ -30,15 +30,15 @@ 
 		$field_options['truncatelink'] = array(
 			'type' => 'checkbox',
 			'value' => true,
-			'label' => __( 'Shorten Link Display', 'gravityview' ),
-			'tooltip' => __( 'Only show the domain for a URL instead of the whole link.', 'gravityview' ),
-			'desc' => __( 'Don’t show the full URL, only show the domain.', 'gravityview' )
+			'label' => __('Shorten Link Display', 'gravityview'),
+			'tooltip' => __('Only show the domain for a URL instead of the whole link.', 'gravityview'),
+			'desc' => __('Don’t show the full URL, only show the domain.', 'gravityview')
 		);
 
 		$field_options['open_same_window'] = array(
 			'type' => 'checkbox',
 			'value' => false,
-			'label' => __( 'Open link in the same window?', 'gravityview' ),
+			'label' => __('Open link in the same window?', 'gravityview'),
 		);
 
 		return $field_options;

includes/helper-functions.php

Spacing +59 added lines, -59 removed lines

@@ -15,8 +15,8 @@ 
  *
  * @return bool true: $mixed is *not* an empty string; false: $mixed *is* an empty string
  */
-function gravityview_is_not_empty_string( $mixed = '' ) {
-	return ( $mixed !== '' );
+function gravityview_is_not_empty_string($mixed = '') {
+	return ($mixed !== '');
 }
 
 /**
@@ -32,22 +32,22 @@ 
  *
  * @return array URL args, if exists. Empty array if not.
  */
-function gravityview_get_permalink_query_args( $id = 0 ) {
+function gravityview_get_permalink_query_args($id = 0) {
 
-	$parsed_permalink = parse_url( get_permalink( $id ) );
+	$parsed_permalink = parse_url(get_permalink($id));
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset($parsed_permalink['query']) ? $parsed_permalink['query'] : false;
 
-	if( empty( $permalink_args ) ) {
+	if (empty($permalink_args)) {
 		return array();
 	}
 
-	parse_str( $permalink_args, $args );
+	parse_str($permalink_args, $args);
 
 	return $args;
 }
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if (!function_exists('gravityview_sanitize_html_class')) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -58,20 +58,20 @@ 
 	 *
 	 * @return string            Sanitized CSS string
 	 */
-	function gravityview_sanitize_html_class( $classes ) {
+	function gravityview_sanitize_html_class($classes) {
 
-		if ( is_string( $classes ) ) {
-			$classes = explode( ' ', $classes );
+		if (is_string($classes)) {
+			$classes = explode(' ', $classes);
 		}
 
 		// If someone passes something not string or array, we get outta here.
-		if ( ! is_array( $classes ) ) {
+		if (!is_array($classes)) {
 			return $classes;
 		}
 
-		$classes = array_map( 'sanitize_html_class', $classes );
+		$classes = array_map('sanitize_html_class', $classes);
 
-		return implode( ' ', $classes );
+		return implode(' ', $classes);
 	}
 }
 
@@ -89,9 +89,9 @@ 
  *
  * @return string Stripped string!
  */
-function gravityview_strip_whitespace( $string ) {
-	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+function gravityview_strip_whitespace($string) {
+	$string = normalize_whitespace($string);
+	return preg_replace('/[\r\n\t ]+/', ' ', $string);
 }
 
 /**
@@ -104,13 +104,13 @@ 
  * @param mixed $object Pass pseudo-global to the included file
  * @return string Included file contents
  */
-function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
-		do_action( 'gravityview_log_error', __FUNCTION__ . ': File path does not exist. ', $file_path );
+function gravityview_ob_include($file_path, $object = NULL) {
+	if (!file_exists($file_path)) {
+		do_action('gravityview_log_error', __FUNCTION__.': File path does not exist. ', $file_path);
 		return '';
 	}
 	ob_start();
-	include( $file_path );
+	include($file_path);
 	return ob_get_clean();
 }
 
@@ -121,7 +121,7 @@ 
  */
 function gravityview_get_floaty() {
 
-	if( function_exists('is_rtl') && is_rtl() ) {
+	if (function_exists('is_rtl') && is_rtl()) {
 		$style = 'margin:10px 10px 10px 0;';
 		$class = 'alignright';
 	} else {
@@ -129,7 +129,7 @@ 
 		$class = 'alignleft';
 	}
 
-	return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="87" width="66" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE).'" class="'.$class.'" height="87" width="66" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
 }
 
 /**
@@ -149,21 +149,21 @@ 
  *
  * @return string Converted number in string format.
  */
-function gravityview_number_format( $number, $decimals = '' ) {
+function gravityview_number_format($number, $decimals = '') {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ('' === $decimals) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset($wp_locale) ? $wp_locale->number_format['decimal_point'] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
 		 * @see http://stackoverflow.com/a/2430144/480856
 		 */
-		$decimals = strlen( substr( strrchr( $number, $decimal_point ), 1 ) );
+		$decimals = strlen(substr(strrchr($number, $decimal_point), 1));
 	}
 
-	$number = number_format_i18n( $number, (int)$decimals );
+	$number = number_format_i18n($number, (int)$decimals);
 
 	return $number;
 }
@@ -177,13 +177,13 @@ 
  * @param  string $value Existing URL
  * @return string        If parse_url doesn't find a 'host', returns original value. Otherwise, returns formatted link.
  */
-function gravityview_format_link( $value = null ) {
+function gravityview_format_link($value = null) {
 
 
-	$parts = parse_url( $value );
+	$parts = parse_url($value);
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if (empty($parts['host'])) {
 		return $value;
 	}
 
@@ -196,9 +196,9 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if (false === apply_filters('gravityview_anchor_text_striphttp', true)) {
 
-		if( isset( $parts['scheme'] ) ) {
+		if (isset($parts['scheme'])) {
 			$return .= $parts['scheme'];
 		}
 
@@ -213,10 +213,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true);
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ($strip_www) {
+		$domain = str_replace('www.', '', $domain);
 	}
 
 	/**
@@ -228,9 +228,9 @@ 
 	 */
 	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
 
-	if( $strip_subdomains ) {
+	if ($strip_subdomains) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain($parts['host']);
 
 	}
 
@@ -246,9 +246,9 @@ 
 	 */
 	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
 
-	if( empty( $root_only ) ) {
+	if (empty($root_only)) {
 
-		if( isset( $parts['path'] ) ) {
+		if (isset($parts['path'])) {
 			$return .= $parts['path'];
 		}
 	}
@@ -259,11 +259,11 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true);
 
-	if( empty( $strip_query_string ) ) {
+	if (empty($strip_query_string)) {
 
-		if( isset( $parts['query'] ) ) {
+		if (isset($parts['query'])) {
 			$return .= '?'.$parts['query'];
 		}
 
@@ -279,9 +279,9 @@ 
  * @param  string $domain Domain to check if it's a TLD or subdomain
  * @return string         Extracted domain if it has a subdomain
  */
-function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
+function _gravityview_strip_subdomain($string_maybe_has_subdomain) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+	if (preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches)) {
 		return $matches['domain'];
 	} else {
 		return $string_maybe_has_subdomain;
@@ -301,37 +301,37 @@ 
  * @param boolean $allow_string_booleans Whether to check if 'yes', 'true' => `true` and 'no', 'false' => `false`
  * @return boolean        True: empty; false: not empty
  */
-function gv_empty( $value, $zero_is_empty = true, $allow_string_booleans = true ) {
+function gv_empty($value, $zero_is_empty = true, $allow_string_booleans = true) {
 
-	if(
-		! isset( $value ) // If it's not set, it's empty!
+	if (
+		!isset($value) // If it's not set, it's empty!
 		|| false === $value
 		|| null === $value
 	    || '' === $value // Empty string
 		|| array() === $value // Empty array
-		|| ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object
+		|| (is_object($value) && !get_object_vars($value)) // Empty object
 	) {
 		return true;
 	}
 
-	if( is_string( $value ) && $allow_string_booleans ) {
+	if (is_string($value) && $allow_string_booleans) {
 
-		$value = trim( $value );
-		$value = strtolower( $value );
+		$value = trim($value);
+		$value = strtolower($value);
 
-		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
+		if (in_array($value, array('yes', 'true'), true)) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if (in_array($value, array('no', 'false'), true)) {
 			$value = false;
 		}
 	}
 
 	// If zero isn't empty, then if $value is a number and it's empty, it's zero. Thus, return false.
-	if( ! $zero_is_empty && is_numeric( $value ) && empty( $value ) ) {
+	if (!$zero_is_empty && is_numeric($value) && empty($value)) {
 		return false;
 	}
 
-	return empty( $value );
+	return empty($value);
 }
 
 /**
@@ -344,15 +344,15 @@ 
  *
  * @return bool True: it's a valid datetime, formatted as expected. False: it's not a date formatted as expected.
  */
-function gravityview_is_valid_datetime( $datetime, $expected_format = 'Y-m-d' ) {
+function gravityview_is_valid_datetime($datetime, $expected_format = 'Y-m-d') {
 
 	/**
 	 * @var bool|DateTime False if not a valid date, (like a relative date). DateTime if a date was created.
 	 */
-	$formatted_date = DateTime::createFromFormat( $expected_format, $datetime );
+	$formatted_date = DateTime::createFromFormat($expected_format, $datetime);
 
 	/**
 	 * @see http://stackoverflow.com/a/19271434/480856
 	 */
-	return ( $formatted_date && $formatted_date->format( $expected_format ) === $datetime );
+	return ($formatted_date && $formatted_date->format($expected_format) === $datetime);
 }
\ No newline at end of file

includes/lib/EDD_SL_Plugin_Updater.php

Spacing +83 added lines, -83 removed lines

@@ -4,7 +4,7 @@ 
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Allows plugins to use their own update API.
@@ -29,16 +29,16 @@ 
 	 * @param string  $_plugin_file Path to the plugin file.
 	 * @param array   $_api_data    Optional data to send with API calls.
 	 */
-	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-		$this->api_url  = trailingslashit( $_api_url );
+	function __construct($_api_url, $_plugin_file, $_api_data = null) {
+		$this->api_url  = trailingslashit($_api_url);
 		$this->api_data = $_api_data;
-		$this->name     = plugin_basename( $_plugin_file );
-		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->name     = plugin_basename($_plugin_file);
+		$this->slug     = basename($_plugin_file, '.php');
 		$this->version  = $_api_data['version'];
 
 		// Set up hooks.
 		$this->init();
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+		add_action('admin_init', array($this, 'show_changelog'));
 
 	}
 
@@ -50,11 +50,11 @@ 
 	 * @return void
 	 */
 	public function init() {
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
 
-		remove_action( 'after_plugin_row_' . $this->name, 'wp_plugin_update_row', 10, 2 );
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+		remove_action('after_plugin_row_'.$this->name, 'wp_plugin_update_row', 10, 2);
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
 	}
 
 	/**
@@ -70,32 +70,32 @@ 
 	 * @param array   $_transient_data Update array build by WordPress.
 	 * @return array Modified update array with custom plugin data.
 	 */
-	function check_update( $_transient_data ) {
+	function check_update($_transient_data) {
 
 		global $pagenow;
 
-		if( ! is_object( $_transient_data ) ) {
+		if (!is_object($_transient_data)) {
 			$_transient_data = new stdClass;
 		}
 
-		if( 'plugins.php' == $pagenow && is_multisite() ) {
+		if ('plugins.php' == $pagenow && is_multisite()) {
 			return $_transient_data;
 		}
 
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
-				if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if (version_compare($this->version, $version_info->new_version, '<')) {
 
-					$_transient_data->response[ $this->name ] = $version_info;
+					$_transient_data->response[$this->name] = $version_info;
 
 				}
 
 				$_transient_data->last_checked = time();
-				$_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->checked[$this->name] = $this->version;
 
 			}
 
@@ -110,86 +110,86 @@ 
 	 * @param string  $file
 	 * @param array   $plugin
 	 */
-	public function show_update_notification( $file, $plugin ) {
+	public function show_update_notification($file, $plugin) {
 
-		if( ! current_user_can( 'update_plugins' ) ) {
+		if (!current_user_can('update_plugins')) {
 			return;
 		}
 
-		if( ! is_multisite() ) {
+		if (!is_multisite()) {
 			return;
 		}
 
-		if ( $this->name != $file ) {
+		if ($this->name != $file) {
 			return;
 		}
 
 		// Remove our filter on the site transient
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-		$update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient('update_plugins');
 
-		$update_cache = is_object( $update_cache ) ? $update_cache : new stdClass();
+		$update_cache = is_object($update_cache) ? $update_cache : new stdClass();
 
-		if ( empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if (empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-			$version_info = get_transient( $cache_key );
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+			$version_info = get_transient($cache_key);
 
-			if( false === $version_info ) {
+			if (false === $version_info) {
 
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-				set_transient( $cache_key, $version_info, 3600 );
+				set_transient($cache_key, $version_info, 3600);
 			}
 
 
-			if( ! is_object( $version_info ) ) {
+			if (!is_object($version_info)) {
 				return;
 			}
 
-			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if (version_compare($this->version, $version_info->new_version, '<')) {
 
-				$update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[$this->name] = $version_info;
 
 			}
 
 			$update_cache->last_checked = time();
-			$update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->checked[$this->name] = $this->version;
 
-			set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient('update_plugins', $update_cache);
 
 		} else {
 
-			$version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[$this->name];
 
 		}
 
 		// Restore our filter
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if (!empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
 			// build a plugin list row, with update notification
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-			if ( empty( $version_info->download_link ) ) {
+			if (empty($version_info->download_link)) {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'gravityview' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'gravityview'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version)
 				);
 			} else {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'gravityview' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version ),
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'gravityview'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version),
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
 				);
 			}
 
@@ -208,16 +208,16 @@ 
 	 * @param object  $_args
 	 * @return object $_data
 	 */
-	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+	function plugins_api_filter($_data, $_action = '', $_args = null) {
 
 
-		if ( $_action != 'plugin_information' ) {
+		if ($_action != 'plugin_information') {
 
 			return $_data;
 
 		}
 
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if (!isset($_args->slug) || ($_args->slug != $this->slug)) {
 
 			return $_data;
 
@@ -232,9 +232,9 @@ 
 			)
 		);
 
-		$api_response = $this->api_request( 'plugin_information', $to_send );
+		$api_response = $this->api_request('plugin_information', $to_send);
 
-		if ( false !== $api_response ) {
+		if (false !== $api_response) {
 			$_data = $api_response;
 		}
 
@@ -249,9 +249,9 @@ 
 	 * @param string  $url
 	 * @return object $array
 	 */
-	function http_request_args( $args, $url ) {
+	function http_request_args($args, $url) {
 		// If it is an https request and we are performing a package download, disable ssl verification
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
 			$args['sslverify'] = false;
 		}
 		return $args;
@@ -268,43 +268,43 @@ 
 	 * @param array   $_data   Parameters for the API action.
 	 * @return false|object
 	 */
-	private function api_request( $_action, $_data ) {
+	private function api_request($_action, $_data) {
 
 		global $wp_version;
 
-		$data = array_merge( $this->api_data, $_data );
+		$data = array_merge($this->api_data, $_data);
 
-		if ( $data['slug'] != $this->slug ) {
+		if ($data['slug'] != $this->slug) {
 			return;
 		}
 
-		if( $this->api_url == home_url() ) {
+		if ($this->api_url == home_url()) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'license'    => !empty($data['license']) ? $data['license'] : '',
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url()
 		);
 
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-		if ( ! is_wp_error( $request ) ) {
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		if (!is_wp_error($request)) {
+			$request = json_decode(wp_remote_retrieve_body($request));
 		}
 
-		if ( $request ) {
-			if( isset( $request->sections ) ) {
-				$request->sections = maybe_unserialize( $request->sections );
+		if ($request) {
+			if (isset($request->sections)) {
+				$request->sections = maybe_unserialize($request->sections);
 			}
 
-			if( isset( $request->banners ) ) {
-				$request->banners = (array)maybe_unserialize( $request->banners );
+			if (isset($request->banners)) {
+				$request->banners = (array)maybe_unserialize($request->banners);
 			}
 		} else {
 			$request = false;
@@ -316,26 +316,26 @@ 
 	public function show_changelog() {
 
 
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
 			return;
 		}
 
-		if( empty( $_REQUEST['plugin'] ) ) {
+		if (empty($_REQUEST['plugin'])) {
 			return;
 		}
 
-		if( empty( $_REQUEST['slug'] ) ) {
+		if (empty($_REQUEST['slug'])) {
 			return;
 		}
 
-		if( ! current_user_can( 'update_plugins' ) ) {
-			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
+		if (!current_user_can('update_plugins')) {
+			wp_die(__('You do not have permission to install plugin updates', 'gravityview'), __('Error', 'gravityview'), array('response' => 403));
 		}
 
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-		if( $response && isset( $response->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		if ($response && isset($response->sections['changelog'])) {
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
 		}
 
 

includes/lib/class-gamajo-template-loader.php

Spacing +26 added lines, -26 removed lines

@@ -76,15 +76,15 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_template_part( $slug, $name = null, $load = true ) {
+	public function get_template_part($slug, $name = null, $load = true) {
 		// Execute code for this part
-		do_action( 'get_template_part_' . $slug, $slug, $name );
+		do_action('get_template_part_'.$slug, $slug, $name);
 
 		// Get files names of templates, for given slug and name.
-		$templates = $this->get_template_file_names( $slug, $name );
+		$templates = $this->get_template_file_names($slug, $name);
 
 		// Return the part that is found
-		return $this->locate_template( $templates, $load, false );
+		return $this->locate_template($templates, $load, false);
 	}
 
 	/**
@@ -97,12 +97,12 @@ 
 	 *
 	 * @return array
 	 */
-	protected function get_template_file_names( $slug, $name ) {
+	protected function get_template_file_names($slug, $name) {
 		$templates = array();
-		if ( isset( $name ) ) {
-			$templates[] = $slug . '-' . $name . '.php';
+		if (isset($name)) {
+			$templates[] = $slug.'-'.$name.'.php';
 		}
-		$templates[] = $slug . '.php';
+		$templates[] = $slug.'.php';
 
 		/**
 		 * Allow template choices to be filtered.
@@ -116,7 +116,7 @@ 
 		 * @param string $slug Template slug.
 		 * @param string $name Template name.
 		 */
-		return apply_filters( $this->filter_prefix . '_get_template_part', $templates, $slug, $name );
+		return apply_filters($this->filter_prefix.'_get_template_part', $templates, $slug, $name);
 	}
 
 	/**
@@ -137,30 +137,30 @@ 
 	 *
 	 * @return string The template filename if one is located.
 	 */
-	public function locate_template( $template_names, $load = false, $require_once = true ) {
+	public function locate_template($template_names, $load = false, $require_once = true) {
 		// No file found yet
 		$located = false;
 
 		// Remove empty entries
-		$template_names = array_filter( (array) $template_names );
+		$template_names = array_filter((array)$template_names);
 		$template_paths = $this->get_template_paths();
 
 		// Try to find a template file
-		foreach ( $template_names as $template_name ) {
+		foreach ($template_names as $template_name) {
 			// Trim off any slashes from the template name
-			$template_name = ltrim( $template_name, '/' );
+			$template_name = ltrim($template_name, '/');
 
 			// Try locating this template file by looping through the template paths
-			foreach ( $template_paths as $template_path ) {
-				if ( file_exists( $template_path . $template_name ) ) {
-					$located = $template_path . $template_name;
+			foreach ($template_paths as $template_path) {
+				if (file_exists($template_path.$template_name)) {
+					$located = $template_path.$template_name;
 					break 2;
 				}
 			}
 		}
 
-		if ( $load && $located ) {
-			load_template( $located, $require_once );
+		if ($load && $located) {
+			load_template($located, $require_once);
 		}
 
 		return $located;
@@ -178,16 +178,16 @@ 
 	 * @return mixed|void
 	 */
 	protected function get_template_paths() {
-		$theme_directory = trailingslashit( $this->theme_template_directory );
+		$theme_directory = trailingslashit($this->theme_template_directory);
 
 		$file_paths = array(
-			10  => trailingslashit( get_template_directory() ) . $theme_directory,
+			10  => trailingslashit(get_template_directory()).$theme_directory,
 			100 => $this->get_templates_dir()
 		);
 
 		// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
-		if ( is_child_theme() ) {
-			$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
+		if (is_child_theme()) {
+			$file_paths[1] = trailingslashit(get_stylesheet_directory()).$theme_directory;
 		}
 
 		/**
@@ -197,12 +197,12 @@ 
 		 *
 		 * @param array $var Default is directory in child theme at index 1, parent theme at 10, and plugin at 100.
 		 */
-		$file_paths = apply_filters( $this->filter_prefix . '_template_paths', $file_paths );
+		$file_paths = apply_filters($this->filter_prefix.'_template_paths', $file_paths);
 
 		// sort the file paths based on priority
-		ksort( $file_paths, SORT_NUMERIC );
+		ksort($file_paths, SORT_NUMERIC);
 
-		return array_map( 'trailingslashit', $file_paths );
+		return array_map('trailingslashit', $file_paths);
 	}
 
 	/**
@@ -215,6 +215,6 @@ 
 	 * @return string
 	 */
 	protected function get_templates_dir() {
-		return trailingslashit( $this->plugin_directory ) . $this->plugin_template_directory;
+		return trailingslashit($this->plugin_directory).$this->plugin_template_directory;
 	}
 }

includes/lib/xml-parsers/parsers.php

Spacing +299 added lines, -299 removed lines

@@ -10,42 +10,42 @@ 
  * WordPress Importer class for managing parsing of WXR files.
  */
 class WXR_Parser {
-	function parse( $file ) {
+	function parse($file) {
 		// Attempt to use proper XML parsers first
-		if ( extension_loaded( 'simplexml' ) ) {
+		if (extension_loaded('simplexml')) {
 			$parser = new WXR_Parser_SimpleXML;
-			$result = $parser->parse( $file );
+			$result = $parser->parse($file);
 
 			// If SimpleXML succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'SimpleXML_parse_error' != $result->get_error_code() )
+			if (!is_wp_error($result) || 'SimpleXML_parse_error' != $result->get_error_code())
 				return $result;
-		} else if ( extension_loaded( 'xml' ) ) {
+		} else if (extension_loaded('xml')) {
 			$parser = new WXR_Parser_XML;
-			$result = $parser->parse( $file );
+			$result = $parser->parse($file);
 
 			// If XMLParser succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'XML_parse_error' != $result->get_error_code() )
+			if (!is_wp_error($result) || 'XML_parse_error' != $result->get_error_code())
 				return $result;
 		}
 
 		// We have a malformed XML file, so display the error and fallthrough to regex
-		if ( isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+		if (isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 			echo '<pre>';
-			if ( 'SimpleXML_parse_error' == $result->get_error_code() ) {
-				foreach  ( $result->get_error_data() as $error )
-					echo $error->line . ':' . $error->column . ' ' . esc_html( $error->message ) . "\n";
-			} else if ( 'XML_parse_error' == $result->get_error_code() ) {
+			if ('SimpleXML_parse_error' == $result->get_error_code()) {
+				foreach ($result->get_error_data() as $error)
+					echo $error->line.':'.$error->column.' '.esc_html($error->message)."\n";
+			} else if ('XML_parse_error' == $result->get_error_code()) {
 				$error = $result->get_error_data();
-				echo $error[0] . ':' . $error[1] . ' ' . esc_html( $error[2] );
+				echo $error[0].':'.$error[1].' '.esc_html($error[2]);
 			}
 			echo '</pre>';
-			echo '<p><strong>' . __( 'There was an error when reading this WXR file', 'wordpress-importer' ) . '</strong><br />';
-			echo __( 'Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer' ) . '</p>';
+			echo '<p><strong>'.__('There was an error when reading this WXR file', 'wordpress-importer').'</strong><br />';
+			echo __('Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer').'</p>';
 		}
 
 		// use regular expressions if nothing else available or this is bad XML
 		$parser = new WXR_Parser_Regex;
-		return $parser->parse( $file );
+		return $parser->parse($file);
 	}
 }
 
@@ -53,171 +53,171 @@ 
  * WXR Parser that makes use of the SimpleXML PHP extension.
  */
 class WXR_Parser_SimpleXML {
-	function parse( $file ) {
+	function parse($file) {
 		$authors = $posts = $categories = $tags = $terms = array();
 
 		$internal_errors = libxml_use_internal_errors(true);
 
 		$dom = new DOMDocument;
 		$old_value = null;
-		if ( function_exists( 'libxml_disable_entity_loader' ) ) {
-			$old_value = libxml_disable_entity_loader( true );
+		if (function_exists('libxml_disable_entity_loader')) {
+			$old_value = libxml_disable_entity_loader(true);
 		}
-		$success = $dom->loadXML( file_get_contents( $file ) );
-		if ( ! is_null( $old_value ) ) {
-			libxml_disable_entity_loader( $old_value );
+		$success = $dom->loadXML(file_get_contents($file));
+		if (!is_null($old_value)) {
+			libxml_disable_entity_loader($old_value);
 		}
 
-		if ( ! $success || isset( $dom->doctype ) ) {
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+		if (!$success || isset($dom->doctype)) {
+			return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
 		}
 
-		$xml = simplexml_import_dom( $dom );
-		unset( $dom );
+		$xml = simplexml_import_dom($dom);
+		unset($dom);
 
 		// halt if loading produces an error
-		if ( ! $xml )
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+		if (!$xml)
+			return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
 
 		$wxr_version = $xml->xpath('/rss/channel/wp:wxr_version');
-		if ( ! $wxr_version )
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
+		if (!$wxr_version)
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
 
-		$wxr_version = (string) trim( $wxr_version[0] );
+		$wxr_version = (string)trim($wxr_version[0]);
 		// confirm that we are dealing with the correct file format
-		if ( ! preg_match( '/^\d+\.\d+$/', $wxr_version ) )
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
+		if (!preg_match('/^\d+\.\d+$/', $wxr_version))
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
 
 		$base_url = $xml->xpath('/rss/channel/wp:base_site_url');
-		$base_url = isset($base_url[0]) ? (string) trim( $base_url[0] ) : ''; // Modified by GravityView: Check if base_url exists; the GV import files may exclude them.
+		$base_url = isset($base_url[0]) ? (string)trim($base_url[0]) : ''; // Modified by GravityView: Check if base_url exists; the GV import files may exclude them.
 
 		$namespaces = $xml->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) )
+		if (!isset($namespaces['wp']))
 			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		if ( ! isset( $namespaces['excerpt'] ) )
+		if (!isset($namespaces['excerpt']))
 			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
 
 		// grab authors
-		foreach ( $xml->xpath('/rss/channel/wp:author') as $author_arr ) {
-			$a = $author_arr->children( $namespaces['wp'] );
-			$login = (string) $a->author_login;
+		foreach ($xml->xpath('/rss/channel/wp:author') as $author_arr) {
+			$a = $author_arr->children($namespaces['wp']);
+			$login = (string)$a->author_login;
 			$authors[$login] = array(
-				'author_id' => (int) $a->author_id,
+				'author_id' => (int)$a->author_id,
 				'author_login' => $login,
-				'author_email' => (string) $a->author_email,
-				'author_display_name' => (string) $a->author_display_name,
-				'author_first_name' => (string) $a->author_first_name,
-				'author_last_name' => (string) $a->author_last_name
+				'author_email' => (string)$a->author_email,
+				'author_display_name' => (string)$a->author_display_name,
+				'author_first_name' => (string)$a->author_first_name,
+				'author_last_name' => (string)$a->author_last_name
 			);
 		}
 
 		// grab cats, tags and terms
-		foreach ( $xml->xpath('/rss/channel/wp:category') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:category') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$categories[] = array(
-				'term_id' => (int) $t->term_id,
-				'category_nicename' => (string) $t->category_nicename,
-				'category_parent' => (string) $t->category_parent,
-				'cat_name' => (string) $t->cat_name,
-				'category_description' => (string) $t->category_description
+				'term_id' => (int)$t->term_id,
+				'category_nicename' => (string)$t->category_nicename,
+				'category_parent' => (string)$t->category_parent,
+				'cat_name' => (string)$t->cat_name,
+				'category_description' => (string)$t->category_description
 			);
 		}
 
-		foreach ( $xml->xpath('/rss/channel/wp:tag') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:tag') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$tags[] = array(
-				'term_id' => (int) $t->term_id,
-				'tag_slug' => (string) $t->tag_slug,
-				'tag_name' => (string) $t->tag_name,
-				'tag_description' => (string) $t->tag_description
+				'term_id' => (int)$t->term_id,
+				'tag_slug' => (string)$t->tag_slug,
+				'tag_name' => (string)$t->tag_name,
+				'tag_description' => (string)$t->tag_description
 			);
 		}
 
-		foreach ( $xml->xpath('/rss/channel/wp:term') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:term') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$terms[] = array(
-				'term_id' => (int) $t->term_id,
-				'term_taxonomy' => (string) $t->term_taxonomy,
-				'slug' => (string) $t->term_slug,
-				'term_parent' => (string) $t->term_parent,
-				'term_name' => (string) $t->term_name,
-				'term_description' => (string) $t->term_description
+				'term_id' => (int)$t->term_id,
+				'term_taxonomy' => (string)$t->term_taxonomy,
+				'slug' => (string)$t->term_slug,
+				'term_parent' => (string)$t->term_parent,
+				'term_name' => (string)$t->term_name,
+				'term_description' => (string)$t->term_description
 			);
 		}
 
 		// grab posts
-		foreach ( $xml->channel->item as $item ) {
+		foreach ($xml->channel->item as $item) {
 			$post = array(
-				'post_title' => (string) $item->title,
-				'guid' => (string) $item->guid,
+				'post_title' => (string)$item->title,
+				'guid' => (string)$item->guid,
 			);
 
-			$dc = $item->children( 'http://purl.org/dc/elements/1.1/' );
-			$post['post_author'] = (string) $dc->creator;
-
-			$content = $item->children( 'http://purl.org/rss/1.0/modules/content/' );
-			$excerpt = $item->children( $namespaces['excerpt'] );
-			$post['post_content'] = (string) $content->encoded;
-			$post['post_excerpt'] = (string) $excerpt->encoded;
-
-			$wp = $item->children( $namespaces['wp'] );
-			$post['post_id'] = (int) $wp->post_id;
-			$post['post_date'] = (string) $wp->post_date;
-			$post['post_date_gmt'] = (string) $wp->post_date_gmt;
-			$post['comment_status'] = (string) $wp->comment_status;
-			$post['ping_status'] = (string) $wp->ping_status;
-			$post['post_name'] = (string) $wp->post_name;
-			$post['status'] = (string) $wp->status;
-			$post['post_parent'] = (int) $wp->post_parent;
-			$post['menu_order'] = (int) $wp->menu_order;
-			$post['post_type'] = (string) $wp->post_type;
-			$post['post_password'] = (string) $wp->post_password;
-			$post['is_sticky'] = (int) $wp->is_sticky;
-
-			if ( isset($wp->attachment_url) )
-				$post['attachment_url'] = (string) $wp->attachment_url;
-
-			foreach ( $item->category as $c ) {
+			$dc = $item->children('http://purl.org/dc/elements/1.1/');
+			$post['post_author'] = (string)$dc->creator;
+
+			$content = $item->children('http://purl.org/rss/1.0/modules/content/');
+			$excerpt = $item->children($namespaces['excerpt']);
+			$post['post_content'] = (string)$content->encoded;
+			$post['post_excerpt'] = (string)$excerpt->encoded;
+
+			$wp = $item->children($namespaces['wp']);
+			$post['post_id'] = (int)$wp->post_id;
+			$post['post_date'] = (string)$wp->post_date;
+			$post['post_date_gmt'] = (string)$wp->post_date_gmt;
+			$post['comment_status'] = (string)$wp->comment_status;
+			$post['ping_status'] = (string)$wp->ping_status;
+			$post['post_name'] = (string)$wp->post_name;
+			$post['status'] = (string)$wp->status;
+			$post['post_parent'] = (int)$wp->post_parent;
+			$post['menu_order'] = (int)$wp->menu_order;
+			$post['post_type'] = (string)$wp->post_type;
+			$post['post_password'] = (string)$wp->post_password;
+			$post['is_sticky'] = (int)$wp->is_sticky;
+
+			if (isset($wp->attachment_url))
+				$post['attachment_url'] = (string)$wp->attachment_url;
+
+			foreach ($item->category as $c) {
 				$att = $c->attributes();
-				if ( isset( $att['nicename'] ) )
+				if (isset($att['nicename']))
 					$post['terms'][] = array(
-						'name' => (string) $c,
-						'slug' => (string) $att['nicename'],
-						'domain' => (string) $att['domain']
+						'name' => (string)$c,
+						'slug' => (string)$att['nicename'],
+						'domain' => (string)$att['domain']
 					);
 			}
 
-			foreach ( $wp->postmeta as $meta ) {
+			foreach ($wp->postmeta as $meta) {
 				$post['postmeta'][] = array(
-					'key' => (string) $meta->meta_key,
-					'value' => (string) $meta->meta_value
+					'key' => (string)$meta->meta_key,
+					'value' => (string)$meta->meta_value
 				);
 			}
 
-			foreach ( $wp->comment as $comment ) {
+			foreach ($wp->comment as $comment) {
 				$meta = array();
-				if ( isset( $comment->commentmeta ) ) {
-					foreach ( $comment->commentmeta as $m ) {
+				if (isset($comment->commentmeta)) {
+					foreach ($comment->commentmeta as $m) {
 						$meta[] = array(
-							'key' => (string) $m->meta_key,
-							'value' => (string) $m->meta_value
+							'key' => (string)$m->meta_key,
+							'value' => (string)$m->meta_value
 						);
 					}
 				}
 
 				$post['comments'][] = array(
-					'comment_id' => (int) $comment->comment_id,
-					'comment_author' => (string) $comment->comment_author,
-					'comment_author_email' => (string) $comment->comment_author_email,
-					'comment_author_IP' => (string) $comment->comment_author_IP,
-					'comment_author_url' => (string) $comment->comment_author_url,
-					'comment_date' => (string) $comment->comment_date,
-					'comment_date_gmt' => (string) $comment->comment_date_gmt,
-					'comment_content' => (string) $comment->comment_content,
-					'comment_approved' => (string) $comment->comment_approved,
-					'comment_type' => (string) $comment->comment_type,
-					'comment_parent' => (string) $comment->comment_parent,
-					'comment_user_id' => (int) $comment->comment_user_id,
+					'comment_id' => (int)$comment->comment_id,
+					'comment_author' => (string)$comment->comment_author,
+					'comment_author_email' => (string)$comment->comment_author_email,
+					'comment_author_IP' => (string)$comment->comment_author_IP,
+					'comment_author_url' => (string)$comment->comment_author_url,
+					'comment_date' => (string)$comment->comment_date,
+					'comment_date_gmt' => (string)$comment->comment_date_gmt,
+					'comment_content' => (string)$comment->comment_content,
+					'comment_approved' => (string)$comment->comment_approved,
+					'comment_type' => (string)$comment->comment_type,
+					'comment_parent' => (string)$comment->comment_parent,
+					'comment_user_id' => (int)$comment->comment_user_id,
 					'commentmeta' => $meta,
 				);
 			}
@@ -251,32 +251,32 @@ 
 	);
 	var $wp_sub_tags = array(
 		'wp:comment_id', 'wp:comment_author', 'wp:comment_author_email', 'wp:comment_author_url',
-		'wp:comment_author_IP',	'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
+		'wp:comment_author_IP', 'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
 		'wp:comment_approved', 'wp:comment_type', 'wp:comment_parent', 'wp:comment_user_id',
 	);
 
-	function parse( $file ) {
+	function parse($file) {
 		$this->wxr_version = $this->in_post = $this->cdata = $this->data = $this->sub_data = $this->in_tag = $this->in_sub_tag = false;
 		$this->authors = $this->posts = $this->term = $this->category = $this->tag = array();
 
-		$xml = xml_parser_create( 'UTF-8' );
-		xml_parser_set_option( $xml, XML_OPTION_SKIP_WHITE, 1 );
-		xml_parser_set_option( $xml, XML_OPTION_CASE_FOLDING, 0 );
-		xml_set_object( $xml, $this );
-		xml_set_character_data_handler( $xml, 'cdata' );
-		xml_set_element_handler( $xml, 'tag_open', 'tag_close' );
-
-		if ( ! xml_parse( $xml, file_get_contents( $file ), true ) ) {
-			$current_line = xml_get_current_line_number( $xml );
-			$current_column = xml_get_current_column_number( $xml );
-			$error_code = xml_get_error_code( $xml );
-			$error_string = xml_error_string( $error_code );
-			return new WP_Error( 'XML_parse_error', 'There was an error when reading this WXR file', array( $current_line, $current_column, $error_string ) );
+		$xml = xml_parser_create('UTF-8');
+		xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
+		xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
+		xml_set_object($xml, $this);
+		xml_set_character_data_handler($xml, 'cdata');
+		xml_set_element_handler($xml, 'tag_open', 'tag_close');
+
+		if (!xml_parse($xml, file_get_contents($file), true)) {
+			$current_line = xml_get_current_line_number($xml);
+			$current_column = xml_get_current_column_number($xml);
+			$error_code = xml_get_error_code($xml);
+			$error_string = xml_error_string($error_code);
+			return new WP_Error('XML_parse_error', 'There was an error when reading this WXR file', array($current_line, $current_column, $error_string));
 		}
-		xml_parser_free( $xml );
+		xml_parser_free($xml);
 
-		if ( ! preg_match( '/^\d+\.\d+$/', $this->wxr_version ) )
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
+		if (!preg_match('/^\d+\.\d+$/', $this->wxr_version))
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
 
 		return array(
 			'authors' => $this->authors,
@@ -289,26 +289,26 @@ 
 		);
 	}
 
-	function tag_open( $parse, $tag, $attr ) {
-		if ( in_array( $tag, $this->wp_tags ) ) {
-			$this->in_tag = substr( $tag, 3 );
+	function tag_open($parse, $tag, $attr) {
+		if (in_array($tag, $this->wp_tags)) {
+			$this->in_tag = substr($tag, 3);
 			return;
 		}
 
-		if ( in_array( $tag, $this->wp_sub_tags ) ) {
-			$this->in_sub_tag = substr( $tag, 3 );
+		if (in_array($tag, $this->wp_sub_tags)) {
+			$this->in_sub_tag = substr($tag, 3);
 			return;
 		}
 
-		switch ( $tag ) {
+		switch ($tag) {
 			case 'category':
-				if ( isset($attr['domain'], $attr['nicename']) ) {
+				if (isset($attr['domain'], $attr['nicename'])) {
 					$this->sub_data['domain'] = $attr['domain'];
 					$this->sub_data['slug'] = $attr['nicename'];
 				}
 				break;
 			case 'item': $this->in_post = true;
-			case 'title': if ( $this->in_post ) $this->in_tag = 'post_title'; break;
+			case 'title': if ($this->in_post) $this->in_tag = 'post_title'; break;
 			case 'guid': $this->in_tag = 'guid'; break;
 			case 'dc:creator': $this->in_tag = 'post_author'; break;
 			case 'content:encoded': $this->in_tag = 'post_content'; break;
@@ -320,18 +320,18 @@ 
 		}
 	}
 
-	function cdata( $parser, $cdata ) {
-		if ( ! trim( $cdata ) )
+	function cdata($parser, $cdata) {
+		if (!trim($cdata))
 			return;
 
-		$this->cdata .= trim( $cdata );
+		$this->cdata .= trim($cdata);
 	}
 
-	function tag_close( $parser, $tag ) {
-		switch ( $tag ) {
+	function tag_close($parser, $tag) {
+		switch ($tag) {
 			case 'wp:comment':
-				unset( $this->sub_data['key'], $this->sub_data['value'] ); // remove meta sub_data
-				if ( ! empty( $this->sub_data ) )
+				unset($this->sub_data['key'], $this->sub_data['value']); // remove meta sub_data
+				if (!empty($this->sub_data))
 					$this->data['comments'][] = $this->sub_data;
 				$this->sub_data = false;
 				break;
@@ -342,14 +342,14 @@ 
 				);
 				break;
 			case 'category':
-				if ( ! empty( $this->sub_data ) ) {
+				if (!empty($this->sub_data)) {
 					$this->sub_data['name'] = $this->cdata;
 					$this->data['terms'][] = $this->sub_data;
 				}
 				$this->sub_data = false;
 				break;
 			case 'wp:postmeta':
-				if ( ! empty( $this->sub_data ) )
+				if (!empty($this->sub_data))
 					$this->data['postmeta'][] = $this->sub_data;
 				$this->sub_data = false;
 				break;
@@ -360,12 +360,12 @@ 
 			case 'wp:category':
 			case 'wp:tag':
 			case 'wp:term':
-				$n = substr( $tag, 3 );
-				array_push( $this->$n, $this->data );
+				$n = substr($tag, 3);
+				array_push($this->$n, $this->data);
 				$this->data = false;
 				break;
 			case 'wp:author':
-				if ( ! empty($this->data['author_login']) )
+				if (!empty($this->data['author_login']))
 					$this->authors[$this->data['author_login']] = $this->data;
 				$this->data = false;
 				break;
@@ -377,11 +377,11 @@ 
 				break;
 
 			default:
-				if ( $this->in_sub_tag ) {
-					$this->sub_data[$this->in_sub_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+				if ($this->in_sub_tag) {
+					$this->sub_data[$this->in_sub_tag] = !empty($this->cdata) ? $this->cdata : '';
 					$this->in_sub_tag = false;
-				} else if ( $this->in_tag ) {
-					$this->data[$this->in_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+				} else if ($this->in_tag) {
+					$this->data[$this->in_tag] = !empty($this->cdata) ? $this->cdata : '';
 					$this->in_tag = false;
 				}
 		}
@@ -407,66 +407,66 @@ 
 	}*/
 
 	function __construct() {
-		$this->has_gzip = is_callable( 'gzopen' );
+		$this->has_gzip = is_callable('gzopen');
 	}
 
-	function parse( $file ) {
+	function parse($file) {
 		$wxr_version = $in_post = false;
 
-		$fp = $this->fopen( $file, 'r' );
-		if ( $fp ) {
-			while ( ! $this->feof( $fp ) ) {
-				$importline = rtrim( $this->fgets( $fp ) );
+		$fp = $this->fopen($file, 'r');
+		if ($fp) {
+			while (!$this->feof($fp)) {
+				$importline = rtrim($this->fgets($fp));
 
-				if ( ! $wxr_version && preg_match( '|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version ) )
+				if (!$wxr_version && preg_match('|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version))
 					$wxr_version = $version[1];
 
-				if ( false !== strpos( $importline, '<wp:base_site_url>' ) ) {
-					preg_match( '|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url );
+				if (false !== strpos($importline, '<wp:base_site_url>')) {
+					preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url);
 					$this->base_url = $url[1];
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:category>' ) ) {
-					preg_match( '|<wp:category>(.*?)</wp:category>|is', $importline, $category );
-					$this->categories[] = $this->process_category( $category[1] );
+				if (false !== strpos($importline, '<wp:category>')) {
+					preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
+					$this->categories[] = $this->process_category($category[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:tag>' ) ) {
-					preg_match( '|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag );
-					$this->tags[] = $this->process_tag( $tag[1] );
+				if (false !== strpos($importline, '<wp:tag>')) {
+					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
+					$this->tags[] = $this->process_tag($tag[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:term>' ) ) {
-					preg_match( '|<wp:term>(.*?)</wp:term>|is', $importline, $term );
-					$this->terms[] = $this->process_term( $term[1] );
+				if (false !== strpos($importline, '<wp:term>')) {
+					preg_match('|<wp:term>(.*?)</wp:term>|is', $importline, $term);
+					$this->terms[] = $this->process_term($term[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:author>' ) ) {
-					preg_match( '|<wp:author>(.*?)</wp:author>|is', $importline, $author );
-					$a = $this->process_author( $author[1] );
+				if (false !== strpos($importline, '<wp:author>')) {
+					preg_match('|<wp:author>(.*?)</wp:author>|is', $importline, $author);
+					$a = $this->process_author($author[1]);
 					$this->authors[$a['author_login']] = $a;
 					continue;
 				}
-				if ( false !== strpos( $importline, '<item>' ) ) {
+				if (false !== strpos($importline, '<item>')) {
 					$post = '';
 					$in_post = true;
 					continue;
 				}
-				if ( false !== strpos( $importline, '</item>' ) ) {
+				if (false !== strpos($importline, '</item>')) {
 					$in_post = false;
-					$this->posts[] = $this->process_post( $post );
+					$this->posts[] = $this->process_post($post);
 					continue;
 				}
-				if ( $in_post ) {
-					$post .= $importline . "\n";
+				if ($in_post) {
+					$post .= $importline."\n";
 				}
 			}
 
 			$this->fclose($fp);
 		}
 
-		if ( ! $wxr_version )
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
+		if (!$wxr_version)
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
 
 		return array(
 			'authors' => $this->authors,
@@ -479,17 +479,17 @@ 
 		);
 	}
 
-	function get_tag( $string, $tag ) {
-		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $return );
-		if ( isset( $return[1] ) ) {
-			if ( substr( $return[1], 0, 9 ) == '<![CDATA[' ) {
-				if ( strpos( $return[1], ']]]]><![CDATA[>' ) !== false ) {
-					preg_match_all( '|<!\[CDATA\[(.*?)\]\]>|s', $return[1], $matches );
+	function get_tag($string, $tag) {
+		preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
+		if (isset($return[1])) {
+			if (substr($return[1], 0, 9) == '<![CDATA[') {
+				if (strpos($return[1], ']]]]><![CDATA[>') !== false) {
+					preg_match_all('|<!\[CDATA\[(.*?)\]\]>|s', $return[1], $matches);
 					$return = '';
-					foreach( $matches[1] as $match )
+					foreach ($matches[1] as $match)
 						$return .= $match;
 				} else {
-					$return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
+					$return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
 				}
 			} else {
 				$return = $return[1];
@@ -500,166 +500,166 @@ 
 		return $return;
 	}
 
-	function process_category( $c ) {
+	function process_category($c) {
 		return array(
-			'term_id' => $this->get_tag( $c, 'wp:term_id' ),
-			'cat_name' => $this->get_tag( $c, 'wp:cat_name' ),
-			'category_nicename'	=> $this->get_tag( $c, 'wp:category_nicename' ),
-			'category_parent' => $this->get_tag( $c, 'wp:category_parent' ),
-			'category_description' => $this->get_tag( $c, 'wp:category_description' ),
+			'term_id' => $this->get_tag($c, 'wp:term_id'),
+			'cat_name' => $this->get_tag($c, 'wp:cat_name'),
+			'category_nicename'	=> $this->get_tag($c, 'wp:category_nicename'),
+			'category_parent' => $this->get_tag($c, 'wp:category_parent'),
+			'category_description' => $this->get_tag($c, 'wp:category_description'),
 		);
 	}
 
-	function process_tag( $t ) {
+	function process_tag($t) {
 		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'tag_name' => $this->get_tag( $t, 'wp:tag_name' ),
-			'tag_slug' => $this->get_tag( $t, 'wp:tag_slug' ),
-			'tag_description' => $this->get_tag( $t, 'wp:tag_description' ),
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
+			'tag_name' => $this->get_tag($t, 'wp:tag_name'),
+			'tag_slug' => $this->get_tag($t, 'wp:tag_slug'),
+			'tag_description' => $this->get_tag($t, 'wp:tag_description'),
 		);
 	}
 
-	function process_term( $t ) {
+	function process_term($t) {
 		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'term_taxonomy' => $this->get_tag( $t, 'wp:term_taxonomy' ),
-			'slug' => $this->get_tag( $t, 'wp:term_slug' ),
-			'term_parent' => $this->get_tag( $t, 'wp:term_parent' ),
-			'term_name' => $this->get_tag( $t, 'wp:term_name' ),
-			'term_description' => $this->get_tag( $t, 'wp:term_description' ),
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
+			'term_taxonomy' => $this->get_tag($t, 'wp:term_taxonomy'),
+			'slug' => $this->get_tag($t, 'wp:term_slug'),
+			'term_parent' => $this->get_tag($t, 'wp:term_parent'),
+			'term_name' => $this->get_tag($t, 'wp:term_name'),
+			'term_description' => $this->get_tag($t, 'wp:term_description'),
 		);
 	}
 
-	function process_author( $a ) {
+	function process_author($a) {
 		return array(
-			'author_id' => $this->get_tag( $a, 'wp:author_id' ),
-			'author_login' => $this->get_tag( $a, 'wp:author_login' ),
-			'author_email' => $this->get_tag( $a, 'wp:author_email' ),
-			'author_display_name' => $this->get_tag( $a, 'wp:author_display_name' ),
-			'author_first_name' => $this->get_tag( $a, 'wp:author_first_name' ),
-			'author_last_name' => $this->get_tag( $a, 'wp:author_last_name' ),
+			'author_id' => $this->get_tag($a, 'wp:author_id'),
+			'author_login' => $this->get_tag($a, 'wp:author_login'),
+			'author_email' => $this->get_tag($a, 'wp:author_email'),
+			'author_display_name' => $this->get_tag($a, 'wp:author_display_name'),
+			'author_first_name' => $this->get_tag($a, 'wp:author_first_name'),
+			'author_last_name' => $this->get_tag($a, 'wp:author_last_name'),
 		);
 	}
 
-	function process_post( $post ) {
-		$post_id        = $this->get_tag( $post, 'wp:post_id' );
-		$post_title     = $this->get_tag( $post, 'title' );
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
-		$status         = $this->get_tag( $post, 'wp:status' );
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
-		$post_password  = $this->get_tag( $post, 'wp:post_password' );
-		$is_sticky      = $this->get_tag( $post, 'wp:is_sticky' );
-		$guid           = $this->get_tag( $post, 'guid' );
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
-
-		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
-		$post_excerpt = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_excerpt );
-		$post_excerpt = str_replace( '<br>', '<br />', $post_excerpt );
-		$post_excerpt = str_replace( '<hr>', '<hr />', $post_excerpt );
-
-		$post_content = $this->get_tag( $post, 'content:encoded' );
-		$post_content = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content );
-		$post_content = str_replace( '<br>', '<br />', $post_content );
-		$post_content = str_replace( '<hr>', '<hr />', $post_content );
-
-		$postdata = compact( 'post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
+	function process_post($post) {
+		$post_id        = $this->get_tag($post, 'wp:post_id');
+		$post_title     = $this->get_tag($post, 'title');
+		$post_date      = $this->get_tag($post, 'wp:post_date');
+		$post_date_gmt  = $this->get_tag($post, 'wp:post_date_gmt');
+		$comment_status = $this->get_tag($post, 'wp:comment_status');
+		$ping_status    = $this->get_tag($post, 'wp:ping_status');
+		$status         = $this->get_tag($post, 'wp:status');
+		$post_name      = $this->get_tag($post, 'wp:post_name');
+		$post_parent    = $this->get_tag($post, 'wp:post_parent');
+		$menu_order     = $this->get_tag($post, 'wp:menu_order');
+		$post_type      = $this->get_tag($post, 'wp:post_type');
+		$post_password  = $this->get_tag($post, 'wp:post_password');
+		$is_sticky      = $this->get_tag($post, 'wp:is_sticky');
+		$guid           = $this->get_tag($post, 'guid');
+		$post_author    = $this->get_tag($post, 'dc:creator');
+
+		$post_excerpt = $this->get_tag($post, 'excerpt:encoded');
+		$post_excerpt = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_excerpt);
+		$post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
+		$post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
+
+		$post_content = $this->get_tag($post, 'content:encoded');
+		$post_content = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_content);
+		$post_content = str_replace('<br>', '<br />', $post_content);
+		$post_content = str_replace('<hr>', '<hr />', $post_content);
+
+		$postdata = compact('post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
 			'post_title', 'status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent',
 			'menu_order', 'post_type', 'post_password', 'is_sticky'
 		);
 
-		$attachment_url = $this->get_tag( $post, 'wp:attachment_url' );
-		if ( $attachment_url )
+		$attachment_url = $this->get_tag($post, 'wp:attachment_url');
+		if ($attachment_url)
 			$postdata['attachment_url'] = $attachment_url;
 
-		preg_match_all( '|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER );
-		foreach ( $terms as $t ) {
+		preg_match_all('|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER);
+		foreach ($terms as $t) {
 			$post_terms[] = array(
 				'slug' => $t[2],
 				'domain' => $t[1],
-				'name' => str_replace( array( '<![CDATA[', ']]>' ), '', $t[3] ),
+				'name' => str_replace(array('<![CDATA[', ']]>'), '', $t[3]),
 			);
 		}
-		if ( ! empty( $post_terms ) ) $postdata['terms'] = $post_terms;
+		if (!empty($post_terms)) $postdata['terms'] = $post_terms;
 
-		preg_match_all( '|<wp:comment>(.+?)</wp:comment>|is', $post, $comments );
+		preg_match_all('|<wp:comment>(.+?)</wp:comment>|is', $post, $comments);
 		$comments = $comments[1];
-		if ( $comments ) {
-			foreach ( $comments as $comment ) {
-				preg_match_all( '|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta );
+		if ($comments) {
+			foreach ($comments as $comment) {
+				preg_match_all('|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta);
 				$commentmeta = $commentmeta[1];
 				$c_meta = array();
-				foreach ( $commentmeta as $m ) {
+				foreach ($commentmeta as $m) {
 					$c_meta[] = array(
-						'key' => $this->get_tag( $m, 'wp:meta_key' ),
-						'value' => $this->get_tag( $m, 'wp:meta_value' ),
+						'key' => $this->get_tag($m, 'wp:meta_key'),
+						'value' => $this->get_tag($m, 'wp:meta_value'),
 					);
 				}
 
 				$post_comments[] = array(
-					'comment_id' => $this->get_tag( $comment, 'wp:comment_id' ),
-					'comment_author' => $this->get_tag( $comment, 'wp:comment_author' ),
-					'comment_author_email' => $this->get_tag( $comment, 'wp:comment_author_email' ),
-					'comment_author_IP' => $this->get_tag( $comment, 'wp:comment_author_IP' ),
-					'comment_author_url' => $this->get_tag( $comment, 'wp:comment_author_url' ),
-					'comment_date' => $this->get_tag( $comment, 'wp:comment_date' ),
-					'comment_date_gmt' => $this->get_tag( $comment, 'wp:comment_date_gmt' ),
-					'comment_content' => $this->get_tag( $comment, 'wp:comment_content' ),
-					'comment_approved' => $this->get_tag( $comment, 'wp:comment_approved' ),
-					'comment_type' => $this->get_tag( $comment, 'wp:comment_type' ),
-					'comment_parent' => $this->get_tag( $comment, 'wp:comment_parent' ),
-					'comment_user_id' => $this->get_tag( $comment, 'wp:comment_user_id' ),
+					'comment_id' => $this->get_tag($comment, 'wp:comment_id'),
+					'comment_author' => $this->get_tag($comment, 'wp:comment_author'),
+					'comment_author_email' => $this->get_tag($comment, 'wp:comment_author_email'),
+					'comment_author_IP' => $this->get_tag($comment, 'wp:comment_author_IP'),
+					'comment_author_url' => $this->get_tag($comment, 'wp:comment_author_url'),
+					'comment_date' => $this->get_tag($comment, 'wp:comment_date'),
+					'comment_date_gmt' => $this->get_tag($comment, 'wp:comment_date_gmt'),
+					'comment_content' => $this->get_tag($comment, 'wp:comment_content'),
+					'comment_approved' => $this->get_tag($comment, 'wp:comment_approved'),
+					'comment_type' => $this->get_tag($comment, 'wp:comment_type'),
+					'comment_parent' => $this->get_tag($comment, 'wp:comment_parent'),
+					'comment_user_id' => $this->get_tag($comment, 'wp:comment_user_id'),
 					'commentmeta' => $c_meta,
 				);
 			}
 		}
-		if ( ! empty( $post_comments ) ) $postdata['comments'] = $post_comments;
+		if (!empty($post_comments)) $postdata['comments'] = $post_comments;
 
-		preg_match_all( '|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta );
+		preg_match_all('|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta);
 		$postmeta = $postmeta[1];
-		if ( $postmeta ) {
-			foreach ( $postmeta as $p ) {
+		if ($postmeta) {
+			foreach ($postmeta as $p) {
 				$post_postmeta[] = array(
-					'key' => $this->get_tag( $p, 'wp:meta_key' ),
-					'value' => $this->get_tag( $p, 'wp:meta_value' ),
+					'key' => $this->get_tag($p, 'wp:meta_key'),
+					'value' => $this->get_tag($p, 'wp:meta_value'),
 				);
 			}
 		}
-		if ( ! empty( $post_postmeta ) ) $postdata['postmeta'] = $post_postmeta;
+		if (!empty($post_postmeta)) $postdata['postmeta'] = $post_postmeta;
 
 		return $postdata;
 	}
 
-	function _normalize_tag( $matches ) {
-		return '<' . strtolower( $matches[1] );
+	function _normalize_tag($matches) {
+		return '<'.strtolower($matches[1]);
 	}
 
-	function fopen( $filename, $mode = 'r' ) {
-		if ( $this->has_gzip )
-			return gzopen( $filename, $mode );
-		return fopen( $filename, $mode );
+	function fopen($filename, $mode = 'r') {
+		if ($this->has_gzip)
+			return gzopen($filename, $mode);
+		return fopen($filename, $mode);
 	}
 
-	function feof( $fp ) {
-		if ( $this->has_gzip )
-			return gzeof( $fp );
-		return feof( $fp );
+	function feof($fp) {
+		if ($this->has_gzip)
+			return gzeof($fp);
+		return feof($fp);
 	}
 
-	function fgets( $fp, $len = 8192 ) {
-		if ( $this->has_gzip )
-			return gzgets( $fp, $len );
-		return fgets( $fp, $len );
+	function fgets($fp, $len = 8192) {
+		if ($this->has_gzip)
+			return gzgets($fp, $len);
+		return fgets($fp, $len);
 	}
 
-	function fclose( $fp ) {
-		if ( $this->has_gzip )
-			return gzclose( $fp );
-		return fclose( $fp );
+	function fclose($fp) {
+		if ($this->has_gzip)
+			return gzclose($fp);
+		return fclose($fp);
 	}
 }