gravityview / GravityView

includes/extensions/edit-entry/class-edit-entry-render.php

Spacing +285 added lines, -285 removed lines

@@ -9,7 +9,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     die;
 }
 
@@ -84,30 +84,30 @@ 
      */
     var $is_valid = NULL;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
+    function __construct(GravityView_Edit_Entry $loader) {
         $this->loader = $loader;
     }
 
     function load() {
 
         /** @define "GRAVITYVIEW_DIR" "../../../" */
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+        include_once(GRAVITYVIEW_DIR.'includes/class-admin-approve-entries.php');
 
         // Stop Gravity Forms processing what is ours!
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+        add_filter('wp', array($this, 'prevent_maybe_process_form'), 8);
 
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+        add_filter('gravityview_is_edit_entry', array($this, 'is_edit_entry'));
 
-        add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
+        add_action('gravityview_edit_entry', array($this, 'init'));
 
         // Disable conditional logic if needed (since 1.9)
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
+        add_filter('gform_has_conditional_logic', array($this, 'manage_conditional_logic'), 10, 2);
 
         // Make sure GF doesn't validate max files (since 1.9)
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
+        add_filter('gform_plupload_settings', array($this, 'modify_fileupload_settings'), 10, 3);
 
         // Add fields expected by GFFormDisplay::validate()
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+        add_filter('gform_pre_validation', array($this, 'gform_pre_validation'));
 
     }
 
@@ -120,10 +120,10 @@ 
      */
     function prevent_maybe_process_form() {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
 
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+        if ($this->is_edit_entry_submission() && $this->verify_nonce()) {
+            remove_action('wp', array('RGForms', 'maybe_process_form'), 9);
         }
     }
 
@@ -133,9 +133,9 @@ 
      */
     public function is_edit_entry() {
 
-        $gf_page = ( 'entry' === RGForms::get( 'view' ) );
+        $gf_page = ('entry' === RGForms::get('view'));
 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
+        return ($gf_page && isset($_GET['edit']) || RGForms::post('action') === 'update');
     }
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return !empty($_POST[self::$nonce_field]);
 	}
 
     /**
@@ -162,7 +162,7 @@ 
         $this->form_id = $gravityview_view->getFormId();
         $this->view_id = $gravityview_view->getViewId();
 
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key($this->view_id, $this->form_id, $this->entry['id']);
     }
 
 
@@ -174,20 +174,20 @@ 
      * @param GravityView_View_Data $gv_data GravityView Data object
      * @return void
      */
-    function init( $gv_data ) {
+    function init($gv_data) {
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+        require_once(GFCommon::get_base_path().'/form_display.php');
+        require_once(GFCommon::get_base_path().'/entry_detail.php');
 
         $this->setup_vars();
 
         // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+        if ($gv_data->has_multiple_views() && !wp_verify_nonce($_GET['edit'], self::$nonce_key)) {
             return;
         }
 
         // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
+        if (false === $this->user_can_edit_entry(true)) {
             return;
         }
 
@@ -207,12 +207,12 @@ 
     function print_scripts() {
         $gravityview_view = GravityView_View::getInstance();
 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+        wp_register_script('gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array('jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view'));
 
         GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
 
         // Sack is required for images
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+        wp_print_scripts(array('sack', 'gform_gravityforms'));
     }
 
 
@@ -221,32 +221,32 @@ 
      */
     function process_save() {
 
-        if( empty( $_POST ) ) {
+        if (empty($_POST)) {
             return;
         }
 
         // Make sure the entry, view, and form IDs are all correct
         $valid = $this->verify_nonce();
 
-        if( !$valid ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+        if (!$valid) {
+            do_action('gravityview_log_error', __METHOD__.' Nonce validation failed.');
             return;
         }
 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+        if ($this->entry['id'] !== $_POST['lid']) {
+            do_action('gravityview_log_error', __METHOD__.' Entry ID did not match posted entry ID.');
             return;
         }
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
 
-        $this->process_save_process_files( $this->form_id );
+        $this->process_save_process_files($this->form_id);
 
         $this->validate();
 
-        if( $this->is_valid ) {
+        if ($this->is_valid) {
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.');
 
             /**
              * @hack This step is needed to unset the adminOnly from form fields
@@ -256,13 +256,13 @@ 
             /**
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
              */
-            unset( $_GET['page'] );
+            unset($_GET['page']);
 
-            GFFormsModel::save_lead( $form, $this->entry );
+            GFFormsModel::save_lead($form, $this->entry);
 
             // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
+            if (!empty($this->entry['post_id'])) {
+                $this->maybe_update_post_fields($form);
             }
 
             // Perform actions normally performed after updating a lead
@@ -273,7 +273,7 @@ 
              * @param array $form Gravity Forms form array
              * @param string $entry_id Numeric ID of the entry that was updated
              */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+            do_action('gravityview/edit_entry/after_update', $this->form, $this->entry['id']);
         }
 
     } // process_save
@@ -286,15 +286,15 @@ 
      *
      * @param int $form_id
      */
-    function process_save_process_files( $form_id ) {
+    function process_save_process_files($form_id) {
 
         //Loading files that have been uploaded to temp folder
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
-        if ( ! is_array( $files ) ) {
+        $files = GFCommon::json_decode(stripslashes(RGForms::post('gform_uploaded_files')));
+        if (!is_array($files)) {
             $files = array();
         }
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
+        RGFormsModel::$uploaded_files[$form_id] = $files;
     }
 
     /**
@@ -306,8 +306,8 @@ 
      * @param $instance
      * @return mixed
      */
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
+    public function modify_fileupload_settings($plupload_init, $form_id, $instance) {
+        if (!$this->is_edit_entry()) {
             return $plupload_init;
         }
 
@@ -324,13 +324,13 @@ 
     private function form_prepare_for_save() {
         $form = $this->form;
 
-        foreach( $form['fields'] as &$field ) {
+        foreach ($form['fields'] as &$field) {
 
             $field->adminOnly = false;
 
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-                foreach( $field->inputs as $key => $input ) {
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+            if (isset($field->inputs) && is_array($field->inputs)) {
+                foreach ($field->inputs as $key => $input) {
+                    $field->inputs[$key]['id'] = (string)$input['id'];
                 }
             }
         }
@@ -346,39 +346,39 @@ 
      *
      * @return void
      */
-    function maybe_update_post_fields( $form ) {
+    function maybe_update_post_fields($form) {
 
         $post_id = $this->entry['post_id'];
 
         // Security check
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
+        if (false === GVCommon::has_cap('edit_post', $post_id)) {
+            do_action('gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id);
             return;
         }
 
         $update_entry = false;
 
-        $updated_post = $original_post = get_post( $post_id );
+        $updated_post = $original_post = get_post($post_id);
 
-        foreach ( $this->entry as $field_id => $value ) {
+        foreach ($this->entry as $field_id => $value) {
 
             //todo: only run through the edit entry configured fields
 
-            $field = RGFormsModel::get_field( $form, $field_id );
+            $field = RGFormsModel::get_field($form, $field_id);
 
-            if( class_exists('GF_Fields') ) {
-                $field = GF_Fields::create( $field );
+            if (class_exists('GF_Fields')) {
+                $field = GF_Fields::create($field);
             }
 
-            if( GFCommon::is_post_field( $field ) ) {
+            if (GFCommon::is_post_field($field)) {
 
                 // Get the value of the field, including $_POSTed value
-                $value = RGFormsModel::get_field_value( $field );
+                $value = RGFormsModel::get_field_value($field);
 
                 // Convert the field object in 1.9 to an array for backward compatibility
-                $field_array = GVCommon::get_field_array( $field );
+                $field_array = GVCommon::get_field_array($field);
 
-                switch( $field_array['type'] ) {
+                switch ($field_array['type']) {
 
                     case 'post_title':
                     case 'post_content':
@@ -386,38 +386,38 @@ 
                         $updated_post->{$field_array['type']} = $value;
                         break;
                     case 'post_tags':
-                        wp_set_post_tags( $post_id, $value, false );
+                        wp_set_post_tags($post_id, $value, false);
                         break;
                     case 'post_category':
 
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
-                        $categories = array_filter( $categories );
+                        $categories = is_array($value) ? array_values($value) : (array)$value;
+                        $categories = array_filter($categories);
 
-                        wp_set_post_categories( $post_id, $categories, false );
+                        wp_set_post_categories($post_id, $categories, false);
 
                         // prepare value to be saved in the entry
-                        $field = GFCommon::add_categories_as_choices( $field, '' );
+                        $field = GFCommon::add_categories_as_choices($field, '');
 
                         // if post_category is type checkbox, then value is an array of inputs
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
-                            foreach( $value as $input_id => $val ) {
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
+                        if (isset($value[strval($field_id)])) {
+                            foreach ($value as $input_id => $val) {
+                                $input_name = 'input_'.str_replace('.', '_', $input_id);
+                                $this->entry[strval($input_id)] = RGFormsModel::prepare_value($form, $field, $val, $input_name, $this->entry['id']);
                             }
                         } else {
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+                            $input_name = 'input_'.str_replace('.', '_', $field_id);
+                            $this->entry[strval($field_id)] = RGFormsModel::prepare_value($form, $field, $value, $input_name, $this->entry['id']);
                         }
 
                         break;
                     case 'post_custom_field':
 
-                        $input_type = RGFormsModel::get_input_type( $field );
+                        $input_type = RGFormsModel::get_input_type($field);
                         $custom_field_name = $field_array['postCustomFieldName'];
 
                         // Only certain custom field types are supported
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
-                            update_post_meta( $post_id, $custom_field_name, $value );
+                        if (!in_array($input_type, array('list', 'fileupload'))) {
+                            update_post_meta($post_id, $custom_field_name, $value);
                         }
 
                         break;
@@ -430,13 +430,13 @@ 
                 }
 
                 //ignore fields that have not changed
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
+                if ($value === rgget((string)$field_id, $this->entry)) {
                     continue;
                 }
 
                 // update entry
-                if( 'post_category' !== $field->type ) {
-                    $this->entry[ strval( $field_id ) ] = $value;
+                if ('post_category' !== $field->type) {
+                    $this->entry[strval($field_id)] = $value;
                 }
 
                 $update_entry = true;
@@ -445,24 +445,24 @@ 
 
         }
 
-        if( $update_entry ) {
+        if ($update_entry) {
 
-            $return_entry = GFAPI::update_entry( $this->entry );
+            $return_entry = GFAPI::update_entry($this->entry);
 
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
+            if (is_wp_error($return_entry)) {
+                do_action('gravityview_log_error', 'Updating the entry post fields failed', $return_entry);
             } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+                do_action('gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded');
             }
 
         }
 
-        $return_post = wp_update_post( $updated_post, true );
+        $return_post = wp_update_post($updated_post, true);
 
-        if( is_wp_error( $return_post ) ) {
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
+        if (is_wp_error($return_post)) {
+            do_action('gravityview_log_error', 'Updating the post content failed', $return_post);
         } else {
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded' );
+            do_action('gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded');
         }
 
     }
@@ -478,18 +478,18 @@ 
      */
     function after_update() {
 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
+        do_action('gform_after_update_entry', $this->form, $this->entry['id']);
+        do_action("gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id']);
 
         // Re-define the entry now that we've updated it.
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
+        $entry = RGFormsModel::get_lead($this->entry['id']);
 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
+        $entry = GFFormsModel::set_entry_meta($entry, $this->form);
 
         // We need to clear the cache because Gravity Forms caches the field values, which
         // we have just updated.
         foreach ($this->form['fields'] as $key => $field) {
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+            GFFormsModel::refresh_lead_field_value($entry['id'], $field->id);
         }
 
         $this->entry = $entry;
@@ -503,19 +503,19 @@ 
      */
     public function edit_entry_form() {
 
-        $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
+        $back_link = esc_url(remove_query_arg(array('page', 'view', 'edit')));
 
         ?>
 
         <div class="gv-edit-entry-wrapper"><?php
 
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
+            $javascript = gravityview_ob_include(GravityView_Edit_Entry::$file.'/partials/inline-javascript.php', $this);
 
             /**
              * Fixes weird wpautop() issue
              * @see https://github.com/katzwebservices/GravityView/issues/451
              */
-            echo gravityview_strip_whitespace( $javascript );
+            echo gravityview_strip_whitespace($javascript);
 
             ?><h2 class="gv-edit-entry-title">
                 <span><?php
@@ -525,27 +525,27 @@ 
                      * @param string $edit_entry_title Modify the "Edit Entry" title
                      * @param GravityView_Edit_Entry_Render $this This object
                      */
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
+                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this);
 
-                    echo esc_attr( $edit_entry_title );
+                    echo esc_attr($edit_entry_title);
             ?></span>
             </h2>
 
             <?php
 
             // Display the success message
-            if( rgpost('action') === 'update' ) {
+            if (rgpost('action') === 'update') {
 
-                if( ! $this->is_valid ){
+                if (!$this->is_valid) {
 
                     // Keeping this compatible with Gravity Forms.
-                    $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
+                    $validation_message = "<div class='validation_error'>".__('There was a problem with your submission.', 'gravityview')." ".__('Errors have been highlighted below.', 'gravityview')."</div>";
                     $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
 
-                    echo GVCommon::generate_notice( $message , 'gv-error' );
+                    echo GVCommon::generate_notice($message, 'gv-error');
 
                 } else {
-                    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
+                    $entry_updated_message = sprintf(esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'.$back_link.'">', '</a>');
 
                     /**
                      * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -555,9 +555,9 @@ 
                      * @param array $entry Gravity Forms entry array
                      * @param string $back_link URL to return to the original entry. @since 1.6
                      */
-                    $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
+                    $message = apply_filters('gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link);
 
-                    echo GVCommon::generate_notice( $message );
+                    echo GVCommon::generate_notice($message);
                 }
 
             }
@@ -570,9 +570,9 @@ 
 
                 <?php
 
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
+                wp_nonce_field(self::$nonce_key, self::$nonce_key);
 
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
+                wp_nonce_field(self::$nonce_field, self::$nonce_field, false);
 
                 // Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
 
@@ -612,13 +612,13 @@ 
      */
     private function render_edit_form() {
 
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
-        add_filter( 'gform_disable_view_counter', '__return_true' );
-        add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
+        add_filter('gform_pre_render', array($this, 'filter_modify_form_fields'), 5000, 3);
+        add_filter('gform_submit_button', array($this, 'render_form_buttons'));
+        add_filter('gform_disable_view_counter', '__return_true');
+        add_filter('gform_field_input', array($this, 'modify_edit_field_input'), 10, 5);
 
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
+        unset($_GET['page']);
 
         // TODO: Make sure validation isn't handled by GF
         // TODO: Include CSS for file upload fields
@@ -626,12 +626,12 @@ 
         // TODO: Product fields are not editable
         // TODO: Check Updated and Error messages
 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+        $html = GFFormDisplay::get_form($this->form['id'], false, false, true, $this->entry);
 
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
-        remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
-        remove_filter( 'gform_disable_view_counter', '__return_true' );
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
+	    remove_filter('gform_pre_render', array($this, 'filter_modify_form_fields'), 5000);
+        remove_filter('gform_submit_button', array($this, 'render_form_buttons'));
+        remove_filter('gform_disable_view_counter', '__return_true');
+        remove_filter('gform_field_input', array($this, 'modify_edit_field_input'), 10);
 
         echo $html;
     }
@@ -642,7 +642,7 @@ 
      * @return string
      */
     public function render_form_buttons() {
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+        return gravityview_ob_include(GravityView_Edit_Entry::$file.'/partials/form-buttons.php', $this);
     }
 
 
@@ -659,20 +659,20 @@ 
      *
      * @return array Modified form array
      */
-    public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
+    public function filter_modify_form_fields($form, $ajax = false, $field_values = '') {
 
         // In case we have validated the form, use it to inject the validation results into the form render
-        if( isset( $this->form_after_validation ) ) {
+        if (isset($this->form_after_validation)) {
             $form = $this->form_after_validation;
         } else {
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+            $form['fields'] = $this->get_configured_edit_fields($form, $this->view_id);
         }
 
-        $form = $this->filter_conditional_logic( $form );
+        $form = $this->filter_conditional_logic($form);
 
         // for now we don't support Save and Continue feature.
-        if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+        if (!self::$supports_save_and_continue) {
+	        unset($form['save']);
         }
 
         return $form;
@@ -691,19 +691,19 @@ 
      *
      * @return mixed
      */
-    function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
+    function modify_edit_field_input($field_content = '', $field, $value, $lead_id = 0, $form_id) {
 
         // If the form has been submitted, then we don't need to pre-fill the values,
         // Except for fileupload type - run always!!
-        if(
+        if (
 	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
-        ||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
+        ||  GFCommon::is_product_field($field->type) // Prevent product fields from appearing editable
         ) {
 	        return $field_content;
         }
 
         // Turn on Admin-style display for file upload fields only
-        if( 'fileupload' === $field->type ) {
+        if ('fileupload' === $field->type) {
             $_GET['page'] = 'gf_entries';
         }
 
@@ -711,8 +711,8 @@ 
         $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
 
         // add categories as choices for Post Category field
-        if ( 'post_category' === $field->type ) {
-            $field = GFCommon::add_categories_as_choices( $field, $value );
+        if ('post_category' === $field->type) {
+            $field = GFCommon::add_categories_as_choices($field, $value);
         }
 
         /**
@@ -721,55 +721,55 @@ 
          * @param $field GF_Field object Gravity Forms field object
          * @since 1.13
          */
-        $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
+        $override_saved_value = apply_filters('gravityview/edit_entry/pre_populate/override', false, $field);
 
         // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
+        if (isset($field->inputs) && is_array($field->inputs) && !in_array($field->type, array('time', 'date'))) {
 
             $field_value = array();
 
             // only accept pre-populated values if the field doesn't have any choice selected.
             $allow_pre_populated = $field->allowsPrepopulate;
 
-	        foreach ( (array)$field->inputs as $input ) {
+	        foreach ((array)$field->inputs as $input) {
 
-	            $input_id = strval( $input['id'] );
+	            $input_id = strval($input['id']);
 
-                if ( ! empty( $this->entry[ $input_id ] ) ) {
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
+                if (!empty($this->entry[$input_id])) {
+                    $field_value[$input_id] = 'post_category' === $field->type ? GFCommon::format_post_category($this->entry[$input_id], true) : $this->entry[$input_id];
                     $allow_pre_populated = false;
                 }
 
             }
 
-            $pre_value = $field->get_value_submission( array(), false );
+            $pre_value = $field->get_value_submission(array(), false);
 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
+            $field_value = !$allow_pre_populated && !($override_saved_value && !empty($pre_value)) ? $field_value : $pre_value;
 
         } else {
 
-            $id = intval( $field->id );
+            $id = intval($field->id);
 
             // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value($field->inputName, array(), $field) : '';
 
             // saved field entry value (if empty, fallback to the pre-populated value, if exists)
             // or pre-populated value if not empty and set to override saved value
-            $field_value = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $this->entry[ $id ] : $pre_value;
+            $field_value = !empty($this->entry[$id]) && !($override_saved_value && !empty($pre_value)) ? $this->entry[$id] : $pre_value;
 
             // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-            if ( 'post_category' === $field->type && !empty( $field_value ) ) {
+            if ('post_category' === $field->type && !empty($field_value)) {
                 $categories = array();
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
+                foreach (explode(',', $field_value) as $cat_string) {
+                    $categories[] = GFCommon::format_post_category($cat_string, true);
                 }
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
+                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode('', $categories);
             }
 
         }
 
         // if value is empty get the default value if defined
-        $field_value = $field->get_value_default_if_empty( $field_value );
+        $field_value = $field->get_value_default_if_empty($field_value);
 
         /**
          * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
@@ -777,18 +777,18 @@ 
          * @param mixed $field_value field value used to populate the input
          * @param object $field Gravity Forms field object ( Class GF_Field )
          */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
+        $field_value = apply_filters('gravityview/edit_entry/field_value', $field_value, $field);
 
 	    // Prevent any PHP warnings, like undefined index
 	    ob_start();
 
-	    $return = $field->get_field_input( $this->form, $field_value, $this->entry );
+	    $return = $field->get_field_input($this->form, $field_value, $this->entry);
 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
+	    if (!empty($warnings)) {
+		    do_action('gravityview_log_error', __METHOD__.$warnings, $field_value);
 	    }
 
         /**
@@ -796,7 +796,7 @@ 
          * We need the fileupload html field to render with the proper id
          *  ( <li id="field_80_16" ... > )
          */
-        unset( $_GET['page'] );
+        unset($_GET['page']);
 
         return $return;
     }
@@ -812,14 +812,14 @@ 
      * @param  array $field Gravity Forms field array
      * @return string        [description]
      */
-    public function get_field_value( $value, $lead, $field ) {
+    public function get_field_value($value, $lead, $field) {
 
         // The form's not being edited; use the original value
-        if( ! $this->is_edit_entry_submission() ) {
+        if (!$this->is_edit_entry_submission()) {
             return $value;
         }
 
-        return GFFormsModel::get_field_value( $field, $lead, true );
+        return GFFormsModel::get_field_value($field, $lead, true);
     }
 
 
@@ -834,19 +834,19 @@ 
      * @param  array $form GF Form
      * @return array       Modified GF Form
      */
-    function gform_pre_validation( $form ) {
+    function gform_pre_validation($form) {
 
-        if( ! $this->verify_nonce() ) {
+        if (!$this->verify_nonce()) {
             return $form;
         }
 
         // Fix PHP warning regarding undefined index.
-        foreach ( $form['fields'] as &$field) {
+        foreach ($form['fields'] as &$field) {
 
             // This is because we're doing admin form pretending to be front-end, so Gravity Forms
             // expects certain field array items to be set.
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
+            foreach (array('noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions') as $key) {
+	            $field->{$key} = isset($field->{$key} ) ? $field->{$key} : NULL;
             }
 
             // unset emailConfirmEnabled for email type fields
@@ -854,7 +854,7 @@ 
                 $field['emailConfirmEnabled'] = '';
             }*/
 
-            switch( RGFormsModel::get_input_type( $field ) ) {
+            switch (RGFormsModel::get_input_type($field)) {
 
                 /**
                  * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -875,49 +875,49 @@ 
                     $value = NULL;
 
                     // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
-                        $value = $entry[ $field->id ];
+                    if (isset($entry[$field->id])) {
+                        $value = $entry[$field->id];
                     }
 
                     // If this is a single upload file
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
+                    if (!empty($_FILES[$input_name]) && !empty($_FILES[$input_name]['name'])) {
+                        $file_path = GFFormsModel::get_file_upload_path($form['id'], $_FILES[$input_name]['name']);
                         $value = $file_path['url'];
 
                     } else {
 
                         // Fix PHP warning on line 1498 of form_display.php for post_image fields
                         // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+                        $_FILES[$input_name] = array('name' => '', 'size' => '');
 
                     }
 
-                    if( rgar($field, "multipleFiles") ) {
+                    if (rgar($field, "multipleFiles")) {
 
                         // If there are fresh uploads, process and merge them.
                         // Otherwise, use the passed values, which should be json-encoded array of URLs
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
+                        if (isset(GFFormsModel::$uploaded_files[$form_id][$input_name])) {
 
-                            $value = empty( $value ) ? '[]' : $value;
-                            $value = stripslashes_deep( $value );
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+                            $value = empty($value) ? '[]' : $value;
+                            $value = stripslashes_deep($value);
+                            $value = GFFormsModel::prepare_value($form, $field, $value, $input_name, $entry['id'], array());
                         }
 
                     } else {
 
                         // A file already exists when editing an entry
                         // We set this to solve issue when file upload fields are required.
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
+                        GFFormsModel::$uploaded_files[$form_id][$input_name] = $value;
 
                     }
 
-                    $_POST[ $input_name ] = $value;
+                    $_POST[$input_name] = $value;
 
                     break;
                 case 'number':
                     // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
+                    if (!isset($_POST['input_'.$field->id])) {
+                        $_POST['input_'.$field->id] = NULL;
                     }
                     break;
                 case 'captcha':
@@ -943,8 +943,8 @@ 
     function validate() {
 
         // If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
-        if ( class_exists( 'GFUser' ) ) {
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+        if (class_exists('GFUser')) {
+            remove_filter('gform_validation', array('GFUser', 'user_registration_validation'));
         }
 
         /**
@@ -952,22 +952,22 @@ 
          * You can enter whatever you want!
          * We try validating, and customize the results using `self::custom_validation()`
          */
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+        add_filter('gform_validation_'.$this->form_id, array($this, 'custom_validation'), 10, 4);
 
         // Needed by the validate funtion
         $failed_validation_page = NULL;
-        $field_values = RGForms::post( 'gform_field_values' );
+        $field_values = RGForms::post('gform_field_values');
 
         // Prevent entry limit from running when editing an entry, also
         // prevent form scheduling from preventing editing
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+        unset($this->form['limitEntries'], $this->form['scheduleForm']);
 
         // Hide fields depending on Edit Entry settings
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+        $this->form['fields'] = $this->get_configured_edit_fields($this->form, $this->view_id);
 
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
+        $this->is_valid = GFFormDisplay::validate($this->form, $field_values, 1, $failed_validation_page);
 
-        remove_filter( 'gform_validation_'.$this->form_id, array( $this, 'custom_validation' ), 10 );
+        remove_filter('gform_validation_'.$this->form_id, array($this, 'custom_validation'), 10);
     }
 
 
@@ -982,55 +982,55 @@ 
      * @param  [type] $validation_results [description]
      * @return [type]                     [description]
      */
-    function custom_validation( $validation_results ) {
+    function custom_validation($validation_results) {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results);
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
 
         $gv_valid = true;
 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+        foreach ($validation_results['form']['fields'] as $key => &$field) {
 
-            $value = RGFormsModel::get_field_value( $field );
-            $field_type = RGFormsModel::get_input_type( $field );
+            $value = RGFormsModel::get_field_value($field);
+            $field_type = RGFormsModel::get_input_type($field);
 
             // Validate always
-            switch ( $field_type ) {
+            switch ($field_type) {
 
 
                 case 'fileupload' :
 
                     // in case nothing is uploaded but there are already files saved
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+                    if (!empty($field->failed_validation) && !empty($field->isRequired) && !empty($value)) {
                         $field->failed_validation = false;
-                        unset( $field->validation_message );
+                        unset($field->validation_message);
                     }
 
                     // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
+                    if (rgar($field, 'maxFiles') && rgar($field, 'multipleFiles')) {
 
-                        $input_name = 'input_' . $field->id;
+                        $input_name = 'input_'.$field->id;
                         //uploaded
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+                        $file_names = isset(GFFormsModel::$uploaded_files[$validation_results['form']['id']][$input_name]) ? GFFormsModel::$uploaded_files[$validation_results['form']['id']][$input_name] : array();
 
                         //existent
                         $entry = $this->get_entry();
                         $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
+                        if (isset($entry[$field->id])) {
+                            $value = json_decode($entry[$field->id], true);
                         }
 
                         // count uploaded files and existent entry files
-                        $count_files = count( $file_names ) + count( $value );
+                        $count_files = count($file_names) + count($value);
 
-                        if( $count_files > $field->maxFiles ) {
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
+                        if ($count_files > $field->maxFiles) {
+                            $field->validation_message = __('Maximum number of files reached', 'gravityview');
                             $field->failed_validation = 1;
                             $gv_valid = false;
 
                             // in case of error make sure the newest upload files are removed from the upload input
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+                            GFFormsModel::$uploaded_files[$validation_results['form']['id']] = null;
                         }
 
                     }
@@ -1041,11 +1041,11 @@ 
             }
 
             // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+            if (!empty($field->failed_validation)) {
 
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array('field' => $field, 'value' => $value));
 
-                switch ( $field_type ) {
+                switch ($field_type) {
 
                     // Captchas don't need to be re-entered.
                     case 'captcha':
@@ -1053,39 +1053,39 @@ 
                         // Post Image fields aren't editable, so we un-fail them.
                     case 'post_image':
                         $field->failed_validation = false;
-                        unset( $field->validation_message );
+                        unset($field->validation_message);
                         break;
 
                 }
 
                 // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
+                if (empty($field->failed_validation)) {
                     continue;
                 }
 
                 // checks if the No Duplicates option is not validating entry against itself, since
                 // we're editing a stored entry, it would also assume it's a duplicate.
-                if( !empty( $field->noDuplicates ) ) {
+                if (!empty($field->noDuplicates)) {
 
                     $entry = $this->get_entry();
 
                     // If the value of the entry is the same as the stored value
                     // Then we can assume it's not a duplicate, it's the same.
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+                    if (!empty($entry) && $value == $entry[$field->id]) {
                         //if value submitted was not changed, then don't validate
                         $field->failed_validation = false;
 
-                        unset( $field->validation_message );
+                        unset($field->validation_message);
 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry);
 
                         continue;
                     }
                 }
 
                 // if here then probably we are facing the validation 'At least one field must be filled out'
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
-                    unset( $field->validation_message );
+                if (GFFormDisplay::is_empty($field, $this->form_id) && empty($field->isRequired)) {
+                    unset($field->validation_message);
 	                $field->validation_message = false;
                     continue;
                 }
@@ -1098,7 +1098,7 @@ 
 
         $validation_results['is_valid'] = $gv_valid;
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results);
 
         // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
         $this->form_after_validation = $validation_results['form'];
@@ -1114,9 +1114,9 @@ 
      */
     private function get_entry() {
 
-        if( empty( $this->entry ) ) {
+        if (empty($this->entry)) {
             // Get the database value of the entry that's being edited
-            $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
+            $this->entry = gravityview_get_entry(GravityView_frontend::is_single_entry());
         }
 
         return $this->entry;
@@ -1135,22 +1135,22 @@ 
      *
      * @return array Array of fields that are configured in the Edit tab in the Admin
      */
-    private function get_configured_edit_fields( $form, $view_id ) {
+    private function get_configured_edit_fields($form, $view_id) {
 
         // Get all fields for form
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
+        $properties = GravityView_View_Data::getInstance()->get_fields($view_id);
 
         // If edit tab not yet configured, show all fields
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+        $edit_fields = !empty($properties['edit_edit-fields']) ? $properties['edit_edit-fields'] : NULL;
 
 	    // Show hidden fields as text fields
-	    $form = $this->fix_hidden_fields( $form );
+	    $form = $this->fix_hidden_fields($form);
 
         // Hide fields depending on admin settings
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
+        $fields = $this->filter_fields($form['fields'], $edit_fields);
 
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
+	    $fields = $this->filter_admin_only_fields($fields, $edit_fields, $form, $view_id);
 
         return $fields;
     }
@@ -1162,14 +1162,14 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function fix_hidden_fields( $form ) {
+	private function fix_hidden_fields($form) {
 
 		/** @var GF_Field $field */
-		foreach( $form['fields'] as $key => $field ) {
-			if( 'hidden' === $field->type ) {
-				$text_field = new GF_Field_Text( $field );
+		foreach ($form['fields'] as $key => $field) {
+			if ('hidden' === $field->type) {
+				$text_field = new GF_Field_Text($field);
 				$text_field->type = 'text';
-				$form['fields'][ $key ] = $text_field;
+				$form['fields'][$key] = $text_field;
 			}
 		}
 
@@ -1187,9 +1187,9 @@ 
      * @since  1.5
      * @return array $fields
      */
-    private function filter_fields( $fields, $configured_fields ) {
+    private function filter_fields($fields, $configured_fields) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if (empty($fields) || !is_array($fields)) {
             return $fields;
         }
 
@@ -1204,9 +1204,9 @@ 
 	     * @since 1.9.1
          * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
 	     */
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
+	    $hide_product_fields = apply_filters('gravityview/edit_entry/hide-product-fields', empty(self::$supports_product_fields));
 
-	    if( $hide_product_fields ) {
+	    if ($hide_product_fields) {
 		    $field_type_blacklist[] = 'option';
 		    $field_type_blacklist[] = 'quantity';
             $field_type_blacklist[] = 'product';
@@ -1216,25 +1216,25 @@ 
 	    }
 
         // First, remove blacklist
-        foreach ( $fields as $key => $field ) {
-            if( in_array( $field->type, $field_type_blacklist ) ) {
-                unset( $fields[ $key ] );
+        foreach ($fields as $key => $field) {
+            if (in_array($field->type, $field_type_blacklist)) {
+                unset($fields[$key]);
             }
         }
 
         // The Edit tab has not been configured, so we return all fields by default.
-        if( empty( $configured_fields ) ) {
+        if (empty($configured_fields)) {
             return $fields;
         }
 
         // The edit tab has been configured, so we loop through to configured settings
-        foreach ( $configured_fields as $configured_field ) {
+        foreach ($configured_fields as $configured_field) {
 
 	        /** @var GF_Field $field */
-	        foreach ( $fields as $field ) {
+	        foreach ($fields as $field) {
 
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+                if (intval($configured_field['id']) === intval($field->id) && $this->user_can_edit_field($configured_field, false)) {
+                    $edit_fields[] = $this->merge_field_properties($field, $configured_field);
                     break;
                 }
 
@@ -1253,18 +1253,18 @@ 
      * @since  1.5
      * @return array
      */
-    private function merge_field_properties( $field, $field_setting ) {
+    private function merge_field_properties($field, $field_setting) {
 
         $return_field = $field;
 
-        if( empty( $field_setting['show_label'] ) ) {
+        if (empty($field_setting['show_label'])) {
             $return_field->label = '';
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
+        } elseif (!empty($field_setting['custom_label'])) {
             $return_field->label = $field_setting['custom_label'];
         }
 
-        if( !empty( $field_setting['custom_class'] ) ) {
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+        if (!empty($field_setting['custom_class'])) {
+            $return_field->cssClass .= ' '.gravityview_sanitize_html_class($field_setting['custom_class']);
         }
 
         /**
@@ -1289,7 +1289,7 @@ 
      *
      * @return array Possibly modified form array
      */
-    function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
+    function filter_admin_only_fields($fields = array(), $edit_fields = null, $form = array(), $view_id = 0) {
 
 	    /**
          * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
@@ -1300,13 +1300,13 @@ 
 	     * @param array $form GF Form array
 	     * @param int $view_id View ID
 	     */
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
+	    $use_gf_adminonly_setting = apply_filters('gravityview/edit_entry/use_gf_admin_only_setting', empty($edit_fields), $form, $view_id);
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
+	    if ($use_gf_adminonly_setting && false === GVCommon::has_cap('gravityforms_edit_entries', $this->entry['id'])) {
             return $fields;
         }
 
-	    foreach( $fields as &$field ) {
+	    foreach ($fields as &$field) {
 		    $field->adminOnly = false;
         }
 
@@ -1323,7 +1323,7 @@ 
      * @param array $form Gravity Forms form
      * @return array Modified form, if not using Conditional Logic
      */
-    function filter_conditional_logic( $form ) {
+    function filter_conditional_logic($form) {
 
         /**
          * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -1331,18 +1331,18 @@ 
          * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
          * @param array $form Gravity Forms form
          */
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
+        $use_conditional_logic = apply_filters('gravityview/edit_entry/conditional_logic', true, $form);
 
-        if( $use_conditional_logic ) {
+        if ($use_conditional_logic) {
             return $form;
         }
 
-        foreach( $form['fields'] as &$field ) {
+        foreach ($form['fields'] as &$field) {
             /* @var GF_Field $field */
             $field->conditionalLogic = null;
         }
 
-        unset( $form['button']['conditionalLogic'] );
+        unset($form['button']['conditionalLogic']);
 
         return $form;
 
@@ -1357,13 +1357,13 @@ 
      * @param $form
      * @return mixed|void
      */
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
+    function manage_conditional_logic($has_conditional_logic, $form) {
 
-        if( ! $this->is_edit_entry() ) {
+        if (!$this->is_edit_entry()) {
             return $has_conditional_logic;
         }
 
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
+        return apply_filters('gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form);
 
     }
 
@@ -1382,7 +1382,7 @@ 
      * @param  boolean $echo Show error messages in the form?
      * @return boolean        True: can edit form. False: nope.
      */
-    function user_can_edit_entry( $echo = false ) {
+    function user_can_edit_entry($echo = false) {
 
         $error = NULL;
 
@@ -1391,58 +1391,58 @@ 
          *  2. There are two entries embedded using oEmbed
          *  3. One of the entries has just been saved
          */
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
+        if (!empty($_POST['lid']) && !empty($_GET['entry']) && ($_POST['lid'] !== $_GET['entry'])) {
 
             $error = true;
 
         }
 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+        if (!empty($_GET['entry']) && (string)$this->entry['id'] !== $_GET['entry']) {
 
             $error = true;
 
-        } elseif( ! $this->verify_nonce() ) {
+        } elseif (!$this->verify_nonce()) {
 
             /**
              * If the Entry is embedded, there may be two entries on the same page.
              * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
              */
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
+            if (GravityView_oEmbed::getInstance()->get_entry_id()) {
                 $error = true;
             } else {
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
+                $error = __('The link to edit this entry is not valid; it may have expired.', 'gravityview');
             }
 
         }
 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
+        if (!GravityView_Edit_Entry::check_user_cap_edit_entry($this->entry)) {
+            $error = __('You do not have permission to edit this entry.', 'gravityview');
         }
 
-        if( $this->entry['status'] === 'trash' ) {
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+        if ($this->entry['status'] === 'trash') {
+            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview');
         }
 
         // No errors; everything's fine here!
-        if( empty( $error ) ) {
+        if (empty($error)) {
             return true;
         }
 
-        if( $echo && $error !== true ) {
+        if ($echo && $error !== true) {
 
-	        $error = esc_html( $error );
+	        $error = esc_html($error);
 
 	        /**
 	         * @since 1.9
 	         */
-	        if ( ! empty( $this->entry ) ) {
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+	        if (!empty($this->entry)) {
+		        $error .= ' '.gravityview_get_link('#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview'), array('onclick' => "window.history.go(-1); return false;"));
 	        }
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+            echo GVCommon::generate_notice(wpautop($error), 'gv-error error');
         }
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]'.$error);
 
         return false;
     }
@@ -1455,24 +1455,24 @@ 
      * @param  boolean $echo  Whether to show error message telling user they aren't allowed
      * @return boolean         True: user can edit the current field; False: nope, they can't.
      */
-    private function user_can_edit_field( $field, $echo = false ) {
+    private function user_can_edit_field($field, $echo = false) {
 
         $error = NULL;
 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
+        if (!$this->check_user_cap_edit_field($field)) {
+            $error = __('You do not have permission to edit this field.', 'gravityview');
         }
 
         // No errors; everything's fine here!
-        if( empty( $error ) ) {
+        if (empty($error)) {
             return true;
         }
 
-        if( $echo ) {
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+        if ($echo) {
+            echo GVCommon::generate_notice(wpautop(esc_html($error)), 'gv-error error');
         }
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
+        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]'.$error);
 
         return false;
 
@@ -1487,18 +1487,18 @@ 
      * @param  [type] $field [description]
      * @return bool
      */
-    private function check_user_cap_edit_field( $field ) {
+    private function check_user_cap_edit_field($field) {
 
         // If they can edit any entries (as defined in Gravity Forms), we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+        if (GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_others_entries'))) {
             return true;
         }
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+        $field_cap = isset($field['allow_edit_cap']) ? $field['allow_edit_cap'] : false;
 
         // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
+        if ($field_cap) {
+            return GVCommon::has_cap($field['allow_edit_cap']);
         }
 
         return false;
@@ -1512,17 +1512,17 @@ 
     public function verify_nonce() {
 
         // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
+        if ($this->is_edit_entry_submission()) {
+            $valid = wp_verify_nonce($_POST[self::$nonce_field], self::$nonce_field);
         }
 
         // Verify
-        else if( ! $this->is_edit_entry() ) {
+        else if (!$this->is_edit_entry()) {
             $valid = false;
         }
 
         else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+            $valid = wp_verify_nonce($_GET['edit'], self::$nonce_key);
         }
 
         /**
@@ -1531,7 +1531,7 @@ 
          * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
          * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
          */
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+        $valid = apply_filters('gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field);
 
         return $valid;
     }

includes/extensions/edit-entry/class-edit-entry-user-registration.php

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
  * @copyright Copyright 2015, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     die;
 }
 
@@ -29,7 +29,7 @@ 
      */
     private $_user_before_update = null;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
+    function __construct(GravityView_Edit_Entry $loader) {
         $this->loader = $loader;
     }
 
@@ -43,11 +43,11 @@ 
 	     * @since 1.11
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
 	     */
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+        if (apply_filters('gravityview/edit_entry/user_registration/trigger_update', true)) {
+            add_action('gravityview/edit_entry/after_update', array($this, 'update_user'), 10, 2);
 
             // last resort in case the current user display name don't match any of the defaults
-            add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
+            add_action('gform_user_updated', array($this, 'restore_display_name'), 10, 4);
         }
     }
 
@@ -60,13 +60,13 @@ 
      * @param string $entry_id Gravity Forms entry ID
      * @return void
      */
-    public function update_user( $form = array(), $entry_id = 0 ) {
+    public function update_user($form = array(), $entry_id = 0) {
 
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
+        if (!class_exists('GFAPI') || !class_exists('GFUser') || empty($entry_id)) {
             return;
         }
 
-        $entry = GFAPI::get_entry( $entry_id );
+        $entry = GFAPI::get_entry($entry_id);
 
 	    /**
 	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
@@ -74,12 +74,12 @@ 
 	     * @param array $entry Gravity Forms entry
 	     * @param array $form Gravity Forms form
 	     */
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
+        $entry = apply_filters('gravityview/edit_entry/user_registration/entry', $entry, $form);
 
         /**
          * @since 1.14
          */
-        $config = GFUser::get_active_config( $form, $entry );
+        $config = GFUser::get_active_config($form, $entry);
 
         /**
          * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
@@ -89,9 +89,9 @@ 
          * @param[in] array $form Gravity Forms form array
          * @param[in] array $entry Gravity Forms entry being edited
          */
-        $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
+        $preserve_role = apply_filters('gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry);
 
-        if( $preserve_role ) {
+        if ($preserve_role) {
             $config['meta']['role'] = 'gfur_preserve_role';
         }
 
@@ -99,7 +99,7 @@ 
          * Make sure the current display name is not changed with the update user method.
          * @since 1.15
          */
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
+        $config['meta']['displayname'] = $this->match_current_display_name($entry['created_by']);
 
 
         /**
@@ -109,24 +109,24 @@ 
          * @param[in] array $form Gravity Forms form array
          * @param[in] array $entry Gravity Forms entry being edited
          */
-        $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
+        $config = apply_filters('gravityview/edit_entry/user_registration/config', $config, $form, $entry);
 
-        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
+        $is_create_feed = ($config && rgars($config, 'meta/feed_type') === 'create');
 
         // Only update if it's a create feed
-        if( ! $is_create_feed ) {
+        if (!$is_create_feed) {
             return;
         }
 
         // The priority is set to 3 so that default priority (10) will still override it
-        add_filter( 'send_password_change_email', '__return_false', 3 );
-        add_filter( 'send_email_change_email', '__return_false', 3 );
+        add_filter('send_password_change_email', '__return_false', 3);
+        add_filter('send_email_change_email', '__return_false', 3);
 
         // Trigger the User Registration update user method
-        GFUser::update_user( $entry, $form, $config );
+        GFUser::update_user($entry, $form, $config);
 
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
+        remove_filter('send_password_change_email', '__return_false', 3);
+        remove_filter('send_email_change_email', '__return_false', 3);
 
     }
 
@@ -138,17 +138,17 @@ 
      * @param int $user_id WP User ID
      * @return string Display name format as used inside Gravity Forms User Registration
      */
-    public function match_current_display_name( $user_id ) {
+    public function match_current_display_name($user_id) {
 
-        $user = get_userdata( $user_id );
+        $user = get_userdata($user_id);
 
-        $names = $this->generate_display_names( $user );
+        $names = $this->generate_display_names($user);
 
-        $format = array_search( $user->display_name, $names, true );
+        $format = array_search($user->display_name, $names, true);
 
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
         //   trigger last resort method at the 'gform_user_updated' hook
-        if( false === $format || 'nickname' === $format ) {
+        if (false === $format || 'nickname' === $format) {
             $this->_user_before_update = $user;
             $format = 'nickname';
         }
@@ -165,25 +165,25 @@ 
      * @param object $profileuser WP_User object
      * @return array List all the possible display names for a certain User object
      */
-    public function generate_display_names( $profileuser ) {
+    public function generate_display_names($profileuser) {
 
         $public_display = array();
         $public_display['nickname']  = $profileuser->nickname;
         $public_display['username']  = $profileuser->user_login;
 
-        if ( !empty($profileuser->first_name) )
+        if (!empty($profileuser->first_name))
             $public_display['firstname'] = $profileuser->first_name;
 
-        if ( !empty($profileuser->last_name) )
+        if (!empty($profileuser->last_name))
             $public_display['lastname'] = $profileuser->last_name;
 
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+        if (!empty($profileuser->first_name) && !empty($profileuser->last_name)) {
+            $public_display['firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+            $public_display['lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
         }
 
-        $public_display = array_map( 'trim', $public_display );
-        $public_display = array_unique( $public_display );
+        $public_display = array_map('trim', $public_display);
+        $public_display = array_unique($public_display);
 
         return $public_display;
     }
@@ -199,7 +199,7 @@ 
      * @param string $password User password
      * @return void
      */
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
+    public function restore_display_name($user_id = 0, $config = array(), $entry = array(), $password = '') {
 
         /**
          * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
@@ -207,9 +207,9 @@ 
          * @since 1.14.4
          * @param boolean $restore_display_name Restore Display Name? Default: true
          */
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
+        $restore_display_name = apply_filters('gravityview/edit_entry/restore_display_name', true);
 
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
+        $is_update_feed = ($config && rgars($config, 'meta/feed_type') === 'update');
 
         /**
          * Don't restore display name:
@@ -218,11 +218,11 @@ 
          *   - or we don't need as we found the correct format before updating user.
          * @since 1.14.4
          */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+        if (!$restore_display_name || $is_update_feed || is_null($this->_user_before_update)) {
             return;
         }
 
-        $user_after_update = get_userdata( $user_id );
+        $user_after_update = get_userdata($user_id);
 
         $restored_user = $user_after_update;
 
@@ -230,7 +230,7 @@ 
         $restored_user->display_name = $this->_user_before_update->display_name;
 
 	    // Don't have WP update the password.
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
+	    unset($restored_user->data->user_pass, $restored_user->user_pass);
 
         /**
          * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
@@ -240,19 +240,19 @@ 
          * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
          * @param array   $entry The Gravity Forms entry that was just updated
          */
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
+        $restored_user = apply_filters('gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry);
 
-        $updated = wp_update_user( $restored_user );
+        $updated = wp_update_user($restored_user);
 
-        if( is_wp_error( $updated ) ) {
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
+        if (is_wp_error($updated)) {
+            do_action('gravityview_log_error', __METHOD__.sprintf(' - There was an error updating user #%d details', $user_id), $updated);
         } else {
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
+            do_action('gravityview_log_debug', __METHOD__.sprintf(' - User #%d details restored', $user_id));
         }
 
         $this->_user_before_update = null;
 
-        unset( $updated, $restored_user, $user_after_update );
+        unset($updated, $restored_user, $user_after_update);
     }
 
 } //end class

includes/extensions/edit-entry/class-edit-entry.php

Spacing +50 added lines, -50 removed lines

@@ -11,7 +11,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -34,18 +34,18 @@ 
 
 	function __construct() {
 
-        self::$file = plugin_dir_path( __FILE__ );
+        self::$file = plugin_dir_path(__FILE__);
 
-        if( is_admin() ) {
-            $this->load_components( 'admin' );
+        if (is_admin()) {
+            $this->load_components('admin');
         }
 
 
-        $this->load_components( 'render' );
+        $this->load_components('render');
 
         // If GF User Registration Add-on exists
-        if( class_exists( 'GFUser' ) ) {
-            $this->load_components( 'user-registration' );
+        if (class_exists('GFUser')) {
+            $this->load_components('user-registration');
         }
 
         $this->add_hooks();
@@ -57,7 +57,7 @@ 
 
     static function getInstance() {
 
-        if( empty( self::$instance ) ) {
+        if (empty(self::$instance)) {
             self::$instance = new GravityView_Edit_Entry;
         }
 
@@ -65,33 +65,33 @@ 
     }
 
 
-    private function load_components( $component ) {
+    private function load_components($component) {
 
-        $dir = trailingslashit( self::$file );
+        $dir = trailingslashit(self::$file);
 
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
+        $filename  = $dir.'class-edit-entry-'.$component.'.php';
+        $classname = 'GravityView_Edit_Entry_'.str_replace(' ', '_', ucwords(str_replace('-', ' ', $component)));
 
         // Loads component and pass extension's instance so that component can
         // talk each other.
         require_once $filename;
-        $this->instances[ $component ] = new $classname( $this );
-        $this->instances[ $component ]->load();
+        $this->instances[$component] = new $classname($this);
+        $this->instances[$component]->load();
 
     }
 
     private function add_hooks() {
 
         // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file') );
+        add_action('wp_ajax_nopriv_rg_delete_file', array('RGForms', 'delete_file'));
 
         // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file') );
+        add_action('wp_ajax_rg_delete_file', array('RGForms', 'delete_file'));
 
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
+        add_filter('gravityview_blacklist_field_types', array($this, 'modify_field_blacklist'), 10, 2);
 
         // add template path to check for field
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+        add_filter('gravityview_template_paths', array($this, 'add_template_path'));
 
     }
 
@@ -101,8 +101,8 @@ 
 	 */
 	private function addon_specific_hooks() {
 
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
+		if (class_exists('GFSignature') && is_callable(array('GFSignature', 'get_instance'))) {
+			add_filter('gform_admin_pre_render', array(GFSignature::get_instance(), 'edit_lead_script'));
 		}
 
 	}
@@ -111,10 +111,10 @@ 
      * Include this extension templates path
      * @param array $file_paths List of template paths ordered
      */
-    public function add_template_path( $file_paths ) {
+    public function add_template_path($file_paths) {
 
         // Index 100 is the default GravityView template path.
-        $file_paths[ 110 ] = self::$file;
+        $file_paths[110] = self::$file;
 
         return $file_paths;
     }
@@ -128,8 +128,8 @@ 
      * @param $entry_id int Gravity Forms entry id
      * @return string
      */
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
+    public static function get_nonce_key($view_id, $form_id, $entry_id) {
+        return sprintf('edit_%d_%d_%d', $view_id, $form_id, $entry_id);
     }
 
 
@@ -146,32 +146,32 @@ 
      * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
      * @return string
      */
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
+    public static function get_edit_link($entry, $view_id, $post_id = null, $field_values = '') {
 
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+        $nonce_key = self::get_nonce_key($view_id, $entry['form_id'], $entry['id']);
 
-        $base = gv_entry_link( $entry, $post_id );
+        $base = gv_entry_link($entry, $post_id);
 
-        $url = add_query_arg( array(
+        $url = add_query_arg(array(
             'page' => 'gf_entries', // Needed for GFForms::get_page()
             'view' => 'entry', // Needed for GFForms::get_page()
-            'edit' => wp_create_nonce( $nonce_key )
-        ), $base );
+            'edit' => wp_create_nonce($nonce_key)
+        ), $base);
 
 	    /**
 	     * Allow passing params to dynamically populate entry with values
 	     * @since 1.9.2
 	     */
-	    if( !empty( $field_values ) ) {
+	    if (!empty($field_values)) {
 
-		    if( is_array( $field_values ) ) {
+		    if (is_array($field_values)) {
 			    // If already an array, no parse_str() needed
 			    $params = $field_values;
 		    } else {
-			    parse_str( $field_values, $params );
+			    parse_str($field_values, $params);
 		    }
 
-		    $url = add_query_arg( $params, $url );
+		    $url = add_query_arg($params, $url);
 	    }
 
         return $url;
@@ -184,9 +184,9 @@ 
 	 * @param  string|null $context Context
 	 * @return array          If not edit context, original field blacklist. Otherwise, blacklist including post fields.
 	 */
-	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
+	public function modify_field_blacklist($fields = array(), $context = NULL) {
 
-		if( empty( $context ) || $context !== 'edit' ) {
+		if (empty($context) || $context !== 'edit') {
 			return $fields;
 		}
 
@@ -207,7 +207,7 @@ 
 			// 'payment_method', This is editable in the admin, so allowing it here
 		);
 
-		return array_merge( $fields, $add_fields );
+		return array_merge($fields, $add_fields);
 	}
 
 
@@ -220,7 +220,7 @@ 
      * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}
      * @return bool
      */
-    public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
+    public static function check_user_cap_edit_entry($entry, $view_id = 0) {
 
         // No permission by default
         $user_can_edit = false;
@@ -228,13 +228,13 @@ 
         // If they can edit any entries (as defined in Gravity Forms)
         // Or if they can edit other people's entries
         // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+        if (GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_others_entries'), $entry['id'])) {
 
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
+            do_action('gravityview_log_debug', __METHOD__.' - User has ability to edit all entries.');
 
             $user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+        } else if (!isset($entry['created_by'])) {
 
             do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
 
@@ -243,34 +243,34 @@ 
         } else {
 
             // get user_edit setting
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
+            if (empty($view_id) || $view_id == GravityView_View::getInstance()->getViewId()) {
                 // if View ID not specified or is the current view
                 $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
             } else {
                 // in case is specified and not the current view
-                $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
+                $user_edit = GVCommon::get_template_setting($view_id, 'user_edit');
             }
 
             $current_user = wp_get_current_user();
 
             // User edit is disabled
-            if( empty( $user_edit ) ) {
+            if (empty($user_edit)) {
 
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.');
 
                 $user_can_edit = false;
             }
 
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+            else if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
 
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
+                do_action('gravityview_log_debug', sprintf('GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID));
 
                 $user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+            } else if (!is_user_logged_in()) {
 
-                do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
+                do_action('gravityview_log_debug', __METHOD__.' No user defined; edit entry requires logged in user');
             }
 
         }
@@ -282,7 +282,7 @@ 
          * @param[in] array $entry Gravity Forms entry array {@since 1.15}
          * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
          */
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
+        $user_can_edit = apply_filters('gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id);
 
         return (bool)$user_can_edit;
     }

includes/extensions/edit-entry/fields/edit_link.php

Spacing +7 added lines, -7 removed lines

@@ -4,19 +4,19 @@
 
 $view_id = $gravityview_view->getViewId();
 
-extract( $gravityview_view->getCurrentField() );
+extract($gravityview_view->getCurrentField());
 
 // Only show the link to logged-in users.
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
+if (!GravityView_Edit_Entry::check_user_cap_edit_entry($entry)) {
 	return;
 }
 
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
+$link_text = empty($field_settings['edit_link']) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
 
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
+$link_atts = empty($field_settings['new_window']) ? '' : 'target="_blank"';
 
-$output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
+$output = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
 
-$href = GravityView_Edit_Entry::get_edit_link( $entry, $view_id );
+$href = GravityView_Edit_Entry::get_edit_link($entry, $view_id);
 
-echo gravityview_get_link( $href, $output, $link_atts );
+echo gravityview_get_link($href, $output, $link_atts);

includes/extensions/edit-entry/partials/form-buttons.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
      * @param array $entry The Gravity Forms entry
      * @param int $view_id The current View ID
      */
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
+    $back_link = apply_filters('gravityview/edit_entry/cancel_link', remove_query_arg(array('page', 'view', 'edit')), $object->form, $object->entry, $object->view_id);
 
 	/**
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -24,12 +24,12 @@ 
 	 * @param array $entry The Gravity Forms entry
 	 * @param int $view_id The current View ID
 	 */
-	do_action( 'gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id );
+	do_action('gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id);
 
 	?>
-	<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e( 'Update', 'gravityview'); ?>" name="save" />
+	<input id="gform_submit_button_<?php echo esc_attr($object->form['id']); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e('Update', 'gravityview'); ?>" name="save" />
 
-	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url( $back_link ); ?>"><?php esc_attr_e( 'Cancel', 'gravityview' ); ?></a>
+	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url($back_link); ?>"><?php esc_attr_e('Cancel', 'gravityview'); ?></a>
 	<?php
 
 	/**
@@ -39,9 +39,9 @@ 
 	 * @param array $entry The Gravity Forms entry
 	 * @param int $view_id The current View ID
 	 */
-	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id );
+	do_action('gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id);
 
 	?>
 	<input type="hidden" name="action" value="update" />
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
+	<input type="hidden" name="lid" value="<?php echo esc_attr($object->entry['id']); ?>" />
 </div>

includes/extensions/edit-entry/partials/inline-javascript.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 ?><script type="text/javascript">
 
 	function DeleteFile(leadId, fieldId, deleteButton){
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
+		if(confirm('<?php echo esc_js(__("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview')); ?>')){
 			var fileIndex = jQuery(deleteButton).parent().index();
 			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
 			mysack.execute = 1;

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);
 	}
 }