Changeset 2727061

Timestamp:

05/19/2022 07:34:43 PM (4 years ago)

Author:

mmuro

Message:

More PHPCS updates

Location:

visual-form-builder/trunk

Files:

• admin/class-admin-notices.php (modified) (1 diff)
• admin/class-ajax.php (modified) (4 diffs)
• admin/class-entries-detail.php (modified) (1 diff)
• admin/class-export.php (modified) (4 diffs)
• admin/class-page-settings.php (modified) (1 diff)
• admin/class-save.php (modified) (1 diff)
• public/class-confirmation.php (modified) (1 diff)
• public/class-email.php (modified) (25 diffs)
• public/class-form-display.php (modified) (42 diffs)
• public/class-load-css-js.php (modified) (4 diffs)
• public/class-security.php (modified) (5 diffs)
• visual-form-builder.php (modified) (10 diffs)

visual-form-builder/trunk/admin/class-admin-notices.php

@@ -28 +28 @@
             return;
         }
-        
         if ( 'create_form' !== $_POST['action'] ) {
             return;

visual-form-builder/trunk/admin/class-ajax.php

@@ -75 +75 @@
 
         $form_id    = absint( $data['form_id'] );
-        $field_key  = sanitize_title( $_POST['field_type'] );
-        $field_name = sanitize_text_field( $_POST['field_type'] );
-        $field_type = strtolower( sanitize_title( $_POST['field_type'] ) );
+        $field_key  = isset( $_POST['field_type'] ) ? sanitize_title( wp_unslash( $_POST['field_type'] ) ) : '';
+        $field_name = isset( $_POST['field_type'] ) ? sanitize_text_field( wp_unslash( $_POST['field_type'] ) ) : '';
+        $field_type = isset( $_POST['field_type'] ) ? strtolower( sanitize_title( wp_unslash( $_POST['field_type'] ) ) ) : '';
 
         // Set defaults for validation.
@@ -158 +158 @@
         global $wpdb;
 
-        if ( isset( $_POST['action'] ) && $_POST['action'] === 'visual_form_builder_delete_field' ) {
+        if ( isset( $_POST['action'] ) && 'visual_form_builder_delete_field' === $_POST['action'] ) {
             $form_id  = isset( $_POST['form'] ) ? absint( $_POST['form'] ) : 0;
             $field_id = isset( $_POST['field'] ) ? absint( $_POST['field'] ) : 0;
@@ -188 +188 @@
         $current_user = wp_get_current_user();
 
-        if ( isset( $_POST['action'] ) && $_POST['action'] === 'visual_form_builder_form_settings' ) {
+        if ( isset( $_POST['action'] ) && 'visual_form_builder_form_settings' === $_POST['action'] ) {
             $form_id   = isset( $_POST['form'] ) ? absint( $_POST['form'] ) : 0;
-            $status    = isset( $_POST['status'] ) ? sanitize_text_field( $_POST['status'] ) : 'opened';
-            $accordion = isset( $_POST['accordion'] ) ? sanitize_text_field( $_POST['accordion'] ) : 'general-settings';
+            $status    = isset( $_POST['status'] ) ? sanitize_text_field( wp_unslash( $_POST['status'] ) ) : 'opened';
+            $accordion = isset( $_POST['accordion'] ) ? sanitize_text_field( wp_unslash( $_POST['accordion'] ) ) : 'general-settings';
             $user_id   = $current_user instanceof WP_User ? $current_user->ID : 1;
 
@@ -202 +202 @@
 
             // Set defaults if meta key doesn't exist.
-            if ( ! $form_settings || $form_settings === '' ) {
+            if ( ! $form_settings || '' === $form_settings ) {
                 $meta_value[ $form_id ] = $array;
 

visual-form-builder/trunk/admin/class-entries-detail.php

@@ -77 +77 @@
                                                             wp_nonce_url( admin_url( 'admin.php?page=vfb-entries' ), 'vfb_trash_entry' ),
                                                             'trash',
-                                                            $entry_id
+                                                            absint( $entry_id )
                                                         );
                                                     ?>

visual-form-builder/trunk/admin/class-export.php

@@ -36 +36 @@
         // Setup our default columns.
         $this->default_cols = array(
-            'entries_id'     => __( 'Entries ID', 'visual-form-builder' ),
-            'date_submitted' => __( 'Date Submitted', 'visual-form-builder' ),
-            'ip_address'     => __( 'IP Address', 'visual-form-builder' ),
-            'subject'        => __( 'Subject', 'visual-form-builder' ),
-            'sender_name'    => __( 'Sender Name', 'visual-form-builder' ),
-            'sender_email'   => __( 'Sender Email', 'visual-form-builder' ),
-            'emails_to'      => __( 'Emailed To', 'visual-form-builder' ),
+            'entries_id'     => esc_html__( 'Entries ID', 'visual-form-builder' ),
+            'date_submitted' => esc_html__( 'Date Submitted', 'visual-form-builder' ),
+            'ip_address'     => esc_html__( 'IP Address', 'visual-form-builder' ),
+            'subject'        => esc_html__( 'Subject', 'visual-form-builder' ),
+            'sender_name'    => esc_html__( 'Sender Name', 'visual-form-builder' ),
+            'sender_email'   => esc_html__( 'Sender Email', 'visual-form-builder' ),
+            'emails_to'      => esc_html__( 'Emailed To', 'visual-form-builder' ),
         );
 
@@ -140 +140 @@
                 <?php
                 submit_button(
-                    __( 'Download Export File', 'visual-form-builder' ),
+                    esc_html__( 'Download Export File', 'visual-form-builder' ),
                     'primary',
                     '' // leave blank so "name" attribute will not be added.
@@ -169 +169 @@
         $data = array();
 
-        foreach ( sanitize_text_field( wp_unslash( $_POST['settings'] ) ) as $key => $val ) {
-            $data[ $key ] = $val;
+        if ( isset( $_POST['settings'] ) ) {
+            foreach ( sanitize_text_field( wp_unslash( $_POST['settings'] ) ) as $key => $val ) {
+                $data[ $key ] = $val;
+            }
         }
 
@@ -534 +536 @@
                 "<option value='%s'>%s</option>\n",
                 esc_attr( $arc_row->year . '-' . $month ),
-                sprintf( __( '%1$s %2$d' ), esc_html( $wp_locale->get_month( $month ) ), esc_html( $year ) )
+                sprintf( esc_html__( '%1$s %2$d' ), esc_html( $wp_locale->get_month( $month ) ), esc_html( $year ) )
             );
         }

visual-form-builder/trunk/admin/class-page-settings.php

@@ -112 +112 @@
                     // Get the site domain and get rid of www.
                     $sitename = isset( $_SERVER['SERVER_NAME'] ) ? strtolower( sanitize_text_field( wp_unslash( $_SERVER['SERVER_NAME'] ) ) ) : 'localhost';
-                    if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+                    if ( substr( $sitename, 0, 4 ) === 'www.' ) {
                             $sitename = substr( $sitename, 4 );
                     }

visual-form-builder/trunk/admin/class-save.php

@@ -433 +433 @@
         $data = array();
 
-        foreach ( wp_unslash( $_POST['vfb-settings'] ) as $key => $val ) {
-            $data[ $key ] = sanitize_text_field( $val );
+        if ( isset( $_POST['vfb-settings'] ) ) {
+            foreach ( wp_unslash( $_POST['vfb-settings'] ) as $key => $val ) {
+                $data[ $key ] = sanitize_text_field( $val );
+            }
         }
 

visual-form-builder/trunk/public/class-confirmation.php

@@ -160 +160 @@
         }
 
+        if ( ! isset( $_POST['form_id'] ) ) {
+            return;
+        }
+
         // If class form ID doesn't match $_POST form ID, exit.
         if ( $this->get_form_id() !== absint( $_POST['form_id'] ) ) {

visual-form-builder/trunk/public/class-email.php

@@ -5 +5 @@
 class Visual_Form_Builder_Email {
     /**
-     * form_id
+     * Form_id
      *
      * @var    mixed
@@ -18 +18 @@
      * @return void
      */
-    public function __construct() {     }
-
-    /**
-     * email function.
+    public function __construct() {}
+
+    /**
+     * Email function.
      *
      * @access public
@@ -32 +32 @@
         }
 
-        // Save Form ID to pass to phpmailer()
+        // Save Form ID to pass to phpmailer().
         $this->form_id = $form_id;
 
-        // Main Email
+        // Main Email.
         $this->notification( $form_id );
 
@@ -49 +49 @@
      * Send out main email
      *
-     * @param  [type] $form_id [description]
-     * @return [type]          [description]
+     * @param   [type] $form_id  [$form_id description].
+     *
+     * @return  void
      */
     public function notification( $form_id ) {
         global $wpdb;
 
-        // Query to get all forms
+        // Query to get all forms.
         $order = sanitize_sql_orderby( 'form_id DESC' );
         $form  = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . VFB_WP_FORMS_TABLE_NAME . " WHERE form_id = %d ORDER BY $order", $form_id ) );
 
         $form_settings = (object) array(
-            'form_title'                   => stripslashes( html_entity_decode( $form->form_title, ENT_QUOTES, 'UTF-8' ) ),
-            'form_subject'                 => stripslashes( html_entity_decode( $form->form_email_subject, ENT_QUOTES, 'UTF-8' ) ),
-            'form_to'                      => ( is_array( unserialize( $form->form_email_to ) ) ) ? unserialize( $form->form_email_to ) : explode( ',', unserialize( $form->form_email_to ) ),
-            'form_from'                    => stripslashes( $form->form_email_from ),
-            'form_from_name'               => stripslashes( $form->form_email_from_name ),
-            'form_notification_setting'    => stripslashes( $form->form_notification_setting ),
-            'form_notification_email_name' => stripslashes( $form->form_notification_email_name ),
-            'form_notification_email_from' => stripslashes( $form->form_notification_email_from ),
-            'form_notification_subject'    => stripslashes( html_entity_decode( $form->form_notification_subject, ENT_QUOTES, 'UTF-8' ) ),
-            'form_notification_message'    => stripslashes( $form->form_notification_message ),
-            'form_notification_entry'      => stripslashes( $form->form_notification_entry ),
+            'form_title'                   => wp_unslash( html_entity_decode( $form->form_title, ENT_QUOTES, 'UTF-8' ) ),
+            'form_subject'                 => wp_unslash( html_entity_decode( $form->form_email_subject, ENT_QUOTES, 'UTF-8' ) ),
+            'form_to'                      => is_array( unserialize( $form->form_email_to ) ) ? unserialize( $form->form_email_to ) : explode( ',', unserialize( $form->form_email_to ) ),
+            'form_from'                    => wp_unslash( $form->form_email_from ),
+            'form_from_name'               => wp_unslash( $form->form_email_from_name ),
+            'form_notification_setting'    => wp_unslash( $form->form_notification_setting ),
+            'form_notification_email_name' => wp_unslash( $form->form_notification_email_name ),
+            'form_notification_email_from' => wp_unslash( $form->form_notification_email_from ),
+            'form_notification_subject'    => wp_unslash( html_entity_decode( $form->form_notification_subject, ENT_QUOTES, 'UTF-8' ) ),
+            'form_notification_message'    => wp_unslash( $form->form_notification_message ),
+            'form_notification_entry'      => wp_unslash( $form->form_notification_entry ),
         );
-        // Allow the form settings to be filtered (ex: return $form_settings->'form_title' = 'Hello World';)
+        // Allow the form settings to be filtered (ex: return $form_settings->'form_title' = 'Hello World';).
         $form_settings = (object) apply_filters_ref_array( 'vfb_email_form_settings', array( $form_settings, $form_id ) );
 
-        // Get global settings
+        // Get global settings.
         $vfb_settings = get_option( 'vfb-settings' );
 
-        // Settings - Max Upload Size
+        // Settings - Max Upload Size.
         $settings_max_upload = isset( $vfb_settings['max-upload-size'] ) ? $vfb_settings['max-upload-size'] : 25;
 
-        // Settings - Spam word sensitivity
+        // Settings - Spam word sensitivity.
         $settings_spam_points = isset( $vfb_settings['spam-points'] ) ? $vfb_settings['spam-points'] : 4;
 
-        // Sender name field ID
+        // Sender name field ID.
         $sender = $form->form_email_from_name_override;
 
-        // Sender email field ID
+        // Sender email field ID.
         $email = $form->form_email_from_override;
 
-        // Notifcation email field ID
+        // Notifcation email field ID.
         $notify = $form->form_notification_email;
 
@@ -96 +97 @@
         $reply_to_email = $form_settings->form_from;
 
-        // Use field for sender name
+        // Use field for sender name.
         if ( ! empty( $sender ) && isset( $_POST[ 'vfb-' . $sender ] ) ) {
-            $form_settings->form_from_name = wp_kses_data( $_POST[ 'vfb-' . $sender ] );
+            $form_settings->form_from_name = wp_kses_data( wp_unslash( $_POST[ 'vfb-' . $sender ] ) );
             $reply_to_name                 = $form_settings->form_from_name;
         }
 
-        // Use field for sender email
+        // Use field for sender email.
         if ( ! empty( $email ) && isset( $_POST[ 'vfb-' . $email ] ) ) {
-            $form_settings->form_from = sanitize_email( $_POST[ 'vfb-' . $email ] );
+            $form_settings->form_from = sanitize_email( wp_unslash( $_POST[ 'vfb-' . $email ] ) );
             $reply_to_email           = $form_settings->form_from;
         }
 
-        // Use field for copy email
-        $copy_email = ( ! empty( $notify ) ) ? sanitize_email( $_POST[ 'vfb-' . $notify ] ) : '';
-
-        // Query to get all forms
+        // Use field for copy email.
+        $copy_email = ! empty( $notify ) && isset( $_POST[ 'vfb-' . $notify ] ) ? sanitize_email( wp_unslash( $_POST[ 'vfb-' . $notify ] ) ) : '';
+
+        // Query to get all forms.
         $order  = sanitize_sql_orderby( 'field_sequence ASC' );
         $fields = $wpdb->get_results( $wpdb->prepare( 'SELECT field_id, field_key, field_name, field_type, field_options, field_parent, field_required FROM ' . VFB_WP_FIELDS_TABLE_NAME . " WHERE form_id = %d ORDER BY $order", $form_id ) );
 
-        // Setup counter for alt rows
+        // Setup counter for alt rows.
         $i = $points = 0;
 
-        // Setup HTML email vars
+        // Setup HTML email vars.
         $header      = $body = $message = $footer = $html_email = $auto_response_email = '';
         $attachments = array();
 
-        // Prepare the beginning of the content
+        // Prepare the beginning of the content.
         $header = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
           <html>
@@ -131 +132 @@
           <body><table rules="all" style="border-color: #666;" cellpadding="10">' . "\n";
 
-        // Loop through each form field and build the body of the message
+        // Loop through each form field and build the body of the message.
         foreach ( $fields as $field ) {
-            // Handle attachments
-            if ( $field->field_type == 'file-upload' ) {
-                $value = ( isset( $_FILES[ 'vfb-' . $field->field_id ] ) ) ? $_FILES[ 'vfb-' . $field->field_id ] : '';
+            // Handle attachments.
+            if ( 'file-upload' === $field->field_type ) {
+                $value = ( isset( $_FILES[ 'vfb-' . $field->field_id ] ) ) ? wp_unslash( $_FILES[ 'vfb-' . $field->field_id ] ) : '';
 
                 if ( is_array( $value ) && $value['size'] > 0 ) {
-                    // 25MB is the max size allowed
+                    // 25MB is the max size allowed.
                     $size            = apply_filters( 'vfb_max_file_size', $settings_max_upload );
                     $max_attach_size = $size * 1048576;
 
-                    // Display error if file size has been exceeded
+                    // Display error if file size has been exceeded.
                     if ( $value['size'] > $max_attach_size ) {
-                        wp_die( sprintf( __( 'File size exceeds %dMB. Please decrease the file size and try again.', 'visual-form-builder' ), $size ), '', array( 'back_link' => true ) );
-                    }
-
-                    // Options array for the wp_handle_upload function. 'test_form' => false
+                        wp_die( sprintf( esc_html__( 'File size exceeds %dMB. Please decrease the file size and try again.', 'visual-form-builder' ), absint( $size ) ), '', array( 'back_link' => true ) );
+                    }
+
+                    // Options array for the wp_handle_upload function. 'test_form' => false.
                     $upload_overrides = array( 'test_form' => false );
 
-                    // We need to include the file that runs the wp_handle_upload function
+                    // We need to include the file that runs the wp_handle_upload function.
                     include_once ABSPATH . 'wp-admin/includes/file.php';
 
-                    // Handle the upload using WP's wp_handle_upload function. Takes the posted file and an options array
+                    // Handle the upload using WP's wp_handle_upload function. Takes the posted file and an options array.
                     $uploaded_file = wp_handle_upload( $value, $upload_overrides );
 
-                    // If the wp_handle_upload call returned a local path for the image
+                    // If the wp_handle_upload call returned a local path for the image.
                     if ( isset( $uploaded_file['file'] ) ) {
-                        // Retrieve the file type from the file name. Returns an array with extension and mime type
+                        // Retrieve the file type from the file name. Returns an array with extension and mime type.
                         $wp_filetype = wp_check_filetype( basename( $uploaded_file['file'] ), null );
 
-                        // Return the current upload directory location
+                        // Return the current upload directory location.
                         $wp_upload_dir = wp_upload_dir();
 
@@ -172 +173 @@
                         );
 
-                        // Insert attachment into Media Library and get attachment ID
+                        // Insert attachment into Media Library and get attachment ID.
                         $attach_id = wp_insert_attachment( $media_upload, $uploaded_file['file'] );
 
-                        // Include the file that runs wp_generate_attachment_metadata()
+                        // Include the file that runs wp_generate_attachment_metadata().
                         include_once ABSPATH . 'wp-admin/includes/image.php';
                         include_once ABSPATH . 'wp-admin/includes/media.php';
 
-                        // Setup attachment metadata
+                        // Setup attachment metadata.
                         $attach_data = wp_generate_attachment_metadata( $attach_id, $uploaded_file['file'] );
 
-                        // Update the attachment metadata
+                        // Update the attachment metadata.
                         wp_update_attachment_metadata( $attach_id, $attach_data );
 
@@ -199 +200 @@
                         $body .= sprintf(
                             '<tr>
-              <td><strong>%1$s: </strong></td>
-              <td><a href="%2$s">%2$s</a></td>
-              </tr>' . "\n",
-                            stripslashes( $field->field_name ),
+                            <td><strong>%1$s: </strong></td>
+                            <td><a href="%2$s">%2$s</a></td>
+                            </tr>' . "\n",
+                            esc_html( wp_unslash( $field->field_name ) ),
                             $uploaded_file['url']
                         );
                     }
                 } else {
-                    $value = ( isset( $_POST[ 'vfb-' . $field->field_id ] ) ) ? $_POST[ 'vfb-' . $field->field_id ] : '';
+                    $value = ( isset( $_POST[ 'vfb-' . $field->field_id ] ) ) ? sanitize_text_field( wp_unslash( $_POST[ 'vfb-' . $field->field_id ] ) ) : '';
                     $body .= sprintf(
                         '<tr>
-            <td><strong>%1$s: </strong></td>
-            <td>%2$s</td>
-            </tr>' . "\n",
-                        stripslashes( $field->field_name ),
+                        <td><strong>%1$s: </strong></td>
+                        <td>%2$s</td>
+                        </tr>' . "\n",
+                        esc_html( wp_unslash( $field->field_name ) ),
                         $value
                     );
                 }
-            }
-            // Everything else
-            else {
-                $value = ( isset( $_POST[ 'vfb-' . $field->field_id ] ) ) ? $_POST[ 'vfb-' . $field->field_id ] : '';
-
-                // If time field, build proper output
-                if ( is_array( $value ) && $field->field_type == 'time' ) {
+            } else {
+                $value = ( isset( $_POST[ 'vfb-' . $field->field_id ] ) ) ? sanitize_text_field( wp_unslash( $_POST[ 'vfb-' . $field->field_id ] ) ) : '';
+
+                // If time field, build proper output.
+                if ( is_array( $value ) && 'time' === $field->field_type ) {
                     $value = $this->format_field( $value, $field->field_type );
-                }
-                // If address field, build proper output
-                elseif ( is_array( $value ) && $field->field_type == 'address' ) {
+                } elseif ( is_array( $value ) && 'address' === $field->field_type ) {
+                    // If address field, build proper output.
                     $value = $this->format_field( $value, $field->field_type );
-                }
-                // If multiple values, build the list
-                elseif ( is_array( $value ) ) {
+                } elseif ( is_array( $value ) ) {
+                    // If multiple values, build the list.
                     $value = $this->format_field( $value, $field->field_type );
-                } elseif ( 'radio' == $field->field_type ) {
-                    $value = wp_specialchars_decode( stripslashes( esc_html( $value ) ), ENT_QUOTES );
-                }
-                // Lastly, handle single values
-                else {
-                    $value = html_entity_decode( stripslashes( esc_html( $value ) ), ENT_QUOTES, 'UTF-8' );
-                }
-
-                // Spam Words - Exploits
+                } elseif ( 'radio' === $field->field_type ) {
+                    $value = wp_specialchars_decode( wp_unslash( esc_html( $value ) ), ENT_QUOTES );
+                } else {
+                    $value = html_entity_decode( wp_unslash( esc_html( $value ) ), ENT_QUOTES, 'UTF-8' ); // Lastly, handle single values.
+                }
+
+                // Spam Words - Exploits.
                 $exploits = array( 'content-type', 'bcc:', 'cc:', 'document.cookie', 'onclick', 'onload', 'javascript', 'alert' );
                 $exploits = apply_filters( 'vfb_spam_words_exploits', $exploits, $form_id );
 
-                // Spam Words - Exploits
+                // Spam Words - Exploits.
                 $profanity = array( 'beastial', 'bestial', 'blowjob', 'clit', 'cock', 'cum', 'cunilingus', 'cunillingus', 'cunnilingus', 'cunt', 'ejaculate', 'fag', 'felatio', 'fellatio', 'fuck', 'fuk', 'fuks', 'gangbang', 'gangbanged', 'gangbangs', 'hotsex', 'jism', 'jiz', 'kock', 'kondum', 'kum', 'kunilingus', 'orgasim', 'orgasims', 'orgasm', 'orgasms', 'phonesex', 'phuk', 'phuq', 'porn', 'pussies', 'pussy', 'spunk', 'xxx' );
                 $profanity = apply_filters( 'vfb_spam_words_profanity', $profanity, $form_id );
 
-                // Spam Words - Misc
+                // Spam Words - Misc.
                 $spamwords = array( 'viagra', 'phentermine', 'tramadol', 'adipex', 'advai', 'alprazolam', 'ambien', 'ambian', 'amoxicillin', 'antivert', 'blackjack', 'backgammon', 'holdem', 'poker', 'carisoprodol', 'ciara', 'ciprofloxacin', 'debt', 'dating', 'porn' );
                 $spamwords = apply_filters( 'vfb_spam_words_misc', $spamwords, $form_id );
 
-                // Add up points for each spam hit
+                // Add up points for each spam hit.
                 if ( preg_match( '/(' . implode( '|', $exploits ) . ')/i', $value ) ) {
                     $points += 2;
                 } elseif ( preg_match( '/(' . implode( '|', $profanity ) . ')/i', $value ) ) {
-                    $points += 1;
+                    ++$points;
                 } elseif ( preg_match( '/(' . implode( '|', $spamwords ) . ')/i', $value ) ) {
-                    $points += 1;
-                }
-
-                // Sanitize input
+                    ++$points;
+                }
+
+                // Sanitize input.
                 $value = $this->sanitize_input( $value, $field->field_type );
-                // Validate input
+                // Validate input.
                 $this->validate_input( $value, $field->field_name, $field->field_type, $field->field_required );
 
                 $removed_field_types = array( 'verification', 'secret', 'submit' );
 
-                // Don't add certain fields to the email
+                // Don't add certain fields to the email.
                 if ( ! in_array( $field->field_type, $removed_field_types ) ) {
-                    if ( $field->field_type == 'fieldset' ) {
+                    if ( 'fieldset' === $field->field_type ) {
                         $body .= sprintf(
                             '<tr style="background-color:#393E40;color:white;font-size:14px;">
-              <td colspan="2">%1$s</td>
-              </tr>' . "\n",
-                            stripslashes( $field->field_name )
-                        );
-                    } elseif ( $field->field_type == 'section' ) {
+                            <td colspan="2">%1$s</td>
+                            </tr>' . "\n",
+                            wp_unslash( $field->field_name )
+                        ); } elseif ( 'section' === $field->field_type ) {
                         $body .= sprintf(
                             '<tr style="background-color:#6E7273;color:white;font-size:14px;">
-              <td colspan="2">%1$s</td>
-              </tr>' . "\n",
-                            stripslashes( $field->field_name )
-                        );
-                    } else {
-                        // Convert new lines to break tags for textarea in html
-                        $display_value = ( 'textarea' == $field->field_type ) ? nl2br( $value ) : $value;
-
-                        $body .= sprintf(
-                            '<tr>
-              <td><strong>%1$s: </strong></td>
-              <td>%2$s</td>
-              </tr>' . "\n",
-                            stripslashes( $field->field_name ),
-                            $display_value
-                        );
-                    }
+                            <td colspan="2">%1$s</td>
+                            </tr>' . "\n",
+                            wp_unslash( $field->field_name )
+                        ); } else {
+                            // Convert new lines to break tags for textarea in html.
+                            $display_value = ( 'textarea' == $field->field_type ) ? nl2br( $value ) : $value;
+
+                            $body .= sprintf(
+                                '<tr>
+                                <td><strong>%1$s: </strong></td>
+                                <td>%2$s</td>
+                                </tr>' . "\n",
+                                wp_unslash( $field->field_name ),
+                                $display_value
+                            );
+                        }
                 }
 
@@ -311 +304 @@
             }
 
-            // If the user accumulates more than 4 points, it might be spam
+            // If the user accumulates more than 4 points, it might be spam.
             if ( $points > $settings_spam_points ) {
-                wp_die( __( 'Your responses look too much like spam and could not be sent at this time.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
+                wp_die( esc_html__( 'Your responses look too much like spam and could not be sent at this time.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
             }
         }
 
-        // Setup our entries data
+        // Setup our entries data.
         $entry = array(
             'form_id'        => $form_id,
@@ -326 +319 @@
             'emails_to'      => serialize( $form_settings->form_to ),
             'date_submitted' => date_i18n( 'Y-m-d H:i:s' ),
-            'ip_address'     => esc_html( $_SERVER['REMOTE_ADDR'] ),
+            'ip_address'     => isset( $_SERVER['REMOTE_ADDR'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REMOTE_ADDR'] ) ) : '',
         );
 
-        // Settings - Disable Saving Entries
+        // Settings - Disable Saving Entries.
         $settings_disable_saving = isset( $vfb_settings['disable-saving-entries'] ) ? $vfb_settings['disable-saving-entries'] : '';
 
-        // Insert this data into the entries table if setting is not set
+        // Insert this data into the entries table if setting is not set.
         if ( empty( $settings_disable_saving ) ) {
             $wpdb->insert( VFB_WP_ENTRIES_TABLE_NAME, $entry );
         }
 
-        // Close out the content
+        // Close out the content.
         $footer .= '<tr>
-    <td class="footer" height="61" align="left" valign="middle" colspan="2">
-    <p style="font-size: 12px; font-weight: normal; margin: 0; line-height: 16px; padding: 0;">This email was built and sent using <a href="http://wordpress.org/extend/plugins/visual-form-builder/" style="font-size: 12px;">Visual Form Builder</a>.</p>
-    </td>
-    </tr>
-    </table>
-    </body>
-    </html>' . "\n";
-
-        // Build complete HTML email
+        <td class="footer" height="61" align="left" valign="middle" colspan="2">
+        <p style="font-size: 12px; font-weight: normal; margin: 0; line-height: 16px; padding: 0;">This email was built and sent using <a href="http://wordpress.org/extend/plugins/visual-form-builder/" style="font-size: 12px;">Visual Form Builder</a>.</p>
+        </td>
+        </tr>
+        </table>
+        </body>
+        </html>' . "\n";
+
+        // Build complete HTML email.
         $message = $header . $body . $footer;
 
-        // Wrap lines longer than 70 words to meet email standards
+        // Wrap lines longer than 70 words to meet email standards.
         $message = wordwrap( $message, 70 );
 
-        // Decode HTML for message so it outputs properly
-        $notify_message = ( $form_settings->form_notification_message !== '' ) ? html_entity_decode( $form_settings->form_notification_message ) : '';
-
-        // Initialize header filter vars
-        $header_from_name    = function_exists( 'mb_encode_mimeheader' ) ? mb_encode_mimeheader( stripslashes( $reply_to_name ) ) : stripslashes( $reply_to_name );
+        // Decode HTML for message so it outputs properly.
+        $notify_message = ! empty( $form_settings->form_notification_message ) ? html_entity_decode( $form_settings->form_notification_message ) : '';
+
+        // Initialize header filter vars.
+        $header_from_name    = function_exists( 'mb_encode_mimeheader' ) ? mb_encode_mimeheader( wp_unslash( $reply_to_name ) ) : wp_unslash( $reply_to_name );
         $header_from         = $reply_to_email;
         $header_content_type = 'text/html';
 
-        // Either prepend the notification message to the submitted entry, or send by itself
-        if ( $form_settings->form_notification_entry !== '' ) {
+        // Either prepend the notification message to the submitted entry, or send by itself.
+        if ( ! empty( $form_settings->form_notification_entry ) ) {
             $auto_response_email = $header . $notify_message . $body . $footer;
         } else {
@@ -373 +366 @@
         }
 
-        // Build email headers
-        $from_name = ( $header_from_name == '' ) ? 'WordPress' : $header_from_name;
-
-        // Use the admin_email as the From email
+        // Build email headers.
+        $from_name = empty( $header_from_name ) ? 'WordPress' : $header_from_name;
+
+        // Use the admin_email as the From email.
         $from_email = get_option( 'admin_email' );
 
         // Get the site domain and get rid of www.
-        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
-        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+        $sitename = isset( $_SERVER['SERVER_NAME'] ) ? strtolower( sanitize_text_field( wp_unslash( $_SERVER['SERVER_NAME'] ) ) ) : 'localhost';
+        if ( substr( $sitename, 0, 4 ) === 'www.' ) {
             $sitename = substr( $sitename, 4 );
         }
 
-        // Get the domain from the admin_email
+        // Get the domain from the admin_email.
         list( $user, $domain ) = explode( '@', $from_email );
 
-        // If site domain and admin_email domain match, use admin_email, otherwise a same domain email must be created
+        // If site domain and admin_email domain match, use admin_email, otherwise a same domain email must be created.
         $from_email = ( $sitename == $domain ) ? $from_email : "wordpress@$sitename";
 
-        // Settings - Sender Mail Header
+        // Settings - Sender Mail Header.
         $settings_sender_header = isset( $vfb_settings['sender-mail-header'] ) ? $vfb_settings['sender-mail-header'] : $from_email;
 
-        // Allow Sender email to be filtered
+        // Allow Sender email to be filtered.
         $from_email = apply_filters( 'vfb_sender_mail_header', $settings_sender_header, $form_id );
 
@@ -406 +399 @@
         $notify_subject = wp_specialchars_decode( $form_settings->form_notification_subject, ENT_QUOTES );
 
-        // Sanitize main emails_to
+        // Sanitize main emails_to.
         $emails_to = array_map( 'sanitize_email', $form_settings->form_to );
 
-        // Send the mail
+        // Send the mail.
         foreach ( $emails_to as $email ) {
             wp_mail( $email, $form_subject, $message, $headers, $attachments );
         }
 
-        // Send auto-responder email
-        if ( $form_settings->form_notification_setting !== '' ) {
-            $attachments = ( $form_settings->form_notification_entry !== '' ) ? $attachments : '';
-
-            // Reset headers for notification email
-            $reply_name  = function_exists( 'mb_encode_mimeheader' ) ? mb_encode_mimeheader( stripslashes( $form_settings->form_notification_email_name ) ) : stripslashes( $form_settings->form_notification_email_name );
+        // Send auto-responder email.
+        if ( ! empty( $form_settings->form_notification_setting ) ) {
+            $attachments = ! empty( $form_settings->form_notification_entry ) ? $attachments : '';
+
+            // Reset headers for notification email.
+            $reply_name  = function_exists( 'mb_encode_mimeheader' ) ? mb_encode_mimeheader( stripslashes( $form_settings->form_notification_email_name ) ) : wp_unslash( $form_settings->form_notification_email_name );
             $reply_email = $form_settings->form_notification_email_from;
             $reply_to    = "\"$reply_name\" <$reply_email>";
@@ -427 +420 @@
             $headers[]   = "Content-Type: $header_content_type; charset=\"" . get_option( 'blog_charset' ) . '"';
 
-            // Send the mail
+            // Send the mail.
             wp_mail( $copy_email, $notify_subject, $auto_response_email, $headers, $attachments );
         }
@@ -435 +428 @@
      * [format_field description]
      *
-     * @param  [type] $value [description]
-     * @param  string $type  [description]
+     * @param  [type] $value [description].
+     * @param  string $type  [description].
      * @return [type]        [description]
      */
@@ -442 +435 @@
         $output = '';
 
-        // Basic check for type when not set
+        // Basic check for type when not set.
         if ( empty( $type ) ) {
             if ( is_array( $value ) && array_key_exists( 'address', $value ) ) {
@@ -455 +448 @@
         }
 
-        // Build array'd form item output
+        // Build array'd form item output.
         switch ( $type ) {
 
@@ -510 +503 @@
 
             default:
-                $output = wp_specialchars_decode( stripslashes( esc_html( $value ) ), ENT_QUOTES );
+                $output = wp_specialchars_decode( wp_unslash( esc_html( $value ) ), ENT_QUOTES );
                 break;
         }
@@ -520 +513 @@
      * Validate the input
      *
-     * @since 2.2
+     * @param   [type] $data      [$data description].
+     * @param   [type] $name      [$name description].
+     * @param   [type] $type      [$type description].
+     * @param   [type] $required  [$required description].
+     *
+     * @return  [type]             [return description]
      */
     public function validate_input( $data, $name, $type, $required ) {
-        if ( 'yes' == $required && strlen( $data ) == 0 ) {
-            wp_die( "<h1>$name</h1><br>" . __( 'This field is required and cannot be empty.', 'visual-form-builder' ), $name, array( 'back_link' => true ) );
+        if ( 'yes' === $required && strlen( $data ) === 0 ) {
+            wp_die( esc_html( "<h1>$name</h1><br>" ) . esc_html__( 'This field is required and cannot be empty.', 'visual-form-builder' ), esc_html( $name ), array( 'back_link' => true ) );
         }
 
         if ( strlen( $data ) > 0 ) {
             switch ( $type ) {
-
                 case 'email':
                     if ( ! is_email( $data ) ) {
-                        wp_die( "<h1>$name</h1><br>" . __( 'Not a valid email address', 'visual-form-builder' ), '', array( 'back_link' => true ) );
+                        wp_die( esc_html( "<h1>$name</h1><br>" ) . esc_html__( 'Not a valid email address', 'visual-form-builder' ), '', array( 'back_link' => true ) );
                     }
 
@@ -540 +537 @@
                 case 'currency':
                     if ( ! is_numeric( $data ) ) {
-                        wp_die( "<h1>$name</h1><br>" . __( 'Not a valid number', 'visual-form-builder' ), '', array( 'back_link' => true ) );
+                        wp_die( esc_html( "<h1>$name</h1><br>" ) . esc_html__( 'Not a valid number', 'visual-form-builder' ), '', array( 'back_link' => true ) );
                     }
 
@@ -549 +546 @@
                         return true;
                     } else {
-                        wp_die( "<h1>$name</h1><br>" . __( 'Not a valid phone number. Most US/Canada and International formats accepted.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
+                        wp_die( esc_html( "<h1>$name</h1><br>" ) . esc_html__( 'Not a valid phone number. Most US/Canada and International formats accepted.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
                     }
 
@@ -556 +553 @@
                 case 'url':
                     if ( ! preg_match( '|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', $data ) ) {
-                        wp_die( "<h1>$name</h1><br>" . __( 'Not a valid URL.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
+                        wp_die( esc_html( "<h1>$name</h1><br>" ) . esc_html__( 'Not a valid URL.', 'visual-form-builder' ), '', array( 'back_link' => true ) );
                     }
 
                     break;
-
-                default:
-                    return true;
-                break;
-
             }
+
+            return true;
         }
     }
@@ -572 +566 @@
      * Sanitize the input
      *
-     * @since 2.5
+     * @param   [type] $data  [$data description].
+     * @param   [type] $type  [$type description].
+     *
+     * @return  [type]         [return description]
      */
     public function sanitize_input( $data, $type ) {
@@ -603 +600 @@
                     return wp_kses( $data, $allowed_html );
                 break;
-
-                default:
-                    return wp_kses_data( $data );
-                break;
             }
+
+            return wp_kses_data( $data );
         }
     }
@@ -615 +610 @@
      *
      * @access private
-     * @return void
+     * @return int
      */
     private function get_form_id() {
@@ -632 +627 @@
      */
     public function submit_check() {
-        // If form ID hasn't been submitted by $_POST, exit
+        // If form ID hasn't been submitted by $_POST, exit.
         if ( ! $this->get_form_id() ) {
             return;
         }
 
-        // If form ID hasn't been submitted by $_POST, exit
+        // If form ID hasn't been submitted by $_POST, exit.
         if ( ! isset( $_POST['vfb-submit'] ) ) {
             return;

visual-form-builder/trunk/public/class-form-display.php

@@ -19 +19 @@
      * @return void
      */
-    protected function __construct() {  }
+    protected function __construct() {}
 
     /**
@@ -26 +26 @@
      * @return void
      */
-    private function __clone() {    }
+    private function __clone() {}
 
     /**
@@ -33 +33 @@
      * @return void
      */
-    private function __wakeup() {   }
+    private function __wakeup() {}
 
     /**
@@ -66 +66 @@
      */
     public function css() {
-         $scripts = new Visual_Form_Builder_Scripts_Loader();
+        $scripts = new Visual_Form_Builder_Scripts_Loader();
         $scripts->add_css();
     }
@@ -93 +93 @@
         $security = new Visual_Form_Builder_Security();
 
-        // Secret check
+        // Secret check.
         if ( true !== $security->secret_check() ) {
             wp_die( $security->secret_check() );
         }
 
-        // Referer check
+        // Referer check.
         if ( true !== $security->referer_check() ) {
             wp_die( $security->referer_check() );
         }
 
-        // SPAM Bot check
+        // SPAM Bot check.
         if ( true !== $security->bot_check() ) {
             wp_die( $security->bot_check() );
         }
 
-        // Honeypot check
+        // Honeypot check.
         if ( true !== $security->honeypot_check() ) {
             wp_die( $security->honeypot_check() );
@@ -126 +126 @@
         $email = new Visual_Form_Builder_Email();
 
-        // If form hasn't been submitted, exit
+        // If form hasn't been submitted, exit.
         if ( null == $email->submit_check() ) {
             return;
         }
 
-        // Run security checks
+        // Run security checks.
         self::security_checks();
 
@@ -139 +139 @@
     /**
      * Handle the confirmation redirects
-     *
      * Must be hooked into 'init' so it works properly
      *
-     * @access public
-     * @return void
+     * @param   [type] $form_id  [$form_id description].
+     *
+     * @return  [type]            [return description]
      */
     public static function process_redirect( $form_id ) {
         $confirmation = new Visual_Form_Builder_Confirmation( $form_id );
 
-        // If form hasn't been submitted, exit
+        // If form hasn't been submitted, exit.
         if ( null == $confirmation->submit_check() ) {
             return;
         }
 
-        // WP Page
+        // WP Page.
         $confirmation->wp_page();
 
-        // Custom URL
+        // Custom URL.
         $confirmation->redirect();
     }
@@ -162 +162 @@
     /**
      * Handle the Text message confirmation action
-     *
      * Called directly from the display() function below
      *
-     * @access public
-     * @return void
+     * @param   [type] $form_id  [$form_id description].
+     *
+     * @return  [type]            [return description]
      */
     public static function process_confirmation( $form_id ) {
         $confirmation = new Visual_Form_Builder_Confirmation( $form_id );
 
-        // If form hasn't been submitted, exit
+        // If form hasn't been submitted, exit.
         if ( null == $confirmation->submit_check() ) {
             return;
         }
 
-        // Save entry ID to class instance
-        // self::$entry_id = $entry_id;
+        // Save entry ID to class instance.
+        // self::$entry_id = $entry_id;.
         $message = $confirmation->text();
 
@@ -184 +184 @@
 
     /**
-     * Display form
-     *
-     * @access public
-     * @param  mixed $atts
-     * @return void
+     * Display Form
+     *
+     * @param   [type] $atts    [$atts description].
+     * @param   [type] $output  [$output description].
+     *
+     * @return  [type]           [return description]
      */
     public static function display( $atts, $output = '' ) {
-         wp_enqueue_script( 'jquery-form-validation' );
+        wp_enqueue_script( 'jquery-form-validation' );
         wp_enqueue_script( 'visual-form-builder-validation' );
         wp_enqueue_script( 'visual-form-builder-metadata' );
@@ -206 +207 @@
         $form_id = absint( $atts['id'] );
 
-        // Text confirmation
+        // Text confirmation.
         $confirm_message = self::process_confirmation( $form_id );
 
-        // If text message is returned, output
+        // If text message is returned, output.
         if ( null !== $confirm_message ) {
             return $confirm_message;
@@ -217 +218 @@
         $fields = self::get_fields( $form_id );
 
-        // Setup default variables
+        // Setup default variables.
         $count         = 1;
         $open_fieldset = $open_section = false;
@@ -223 +224 @@
         $verification  = '';
 
-        $label_alignment = ( $form->form_label_alignment !== '' ) ? esc_attr( " $form->form_label_alignment" ) : '';
-
-        // Start form container
+        $label_alignment = ! empty( $form->form_label_alignment ) ? esc_attr( " $form->form_label_alignment" ) : '';
+
+        // Start form container.
         $output .= sprintf( '<div id="vfb-form-%d" class="visual-form-builder-container">', $form_id );
 
         $output .= sprintf(
             '<form id="%1$s-%2$d" class="visual-form-builder %3$s %4$s" method="post" enctype="multipart/form-data">
-      <input type="hidden" name="form_id" value="%5$d" />',
+        <input type="hidden" name="form_id" value="%5$d" />',
             esc_attr( $form->form_key ),
             $form_id,
@@ -241 +242 @@
             $field_id      = absint( $field->field_id );
             $field_type    = esc_html( $field->field_type );
-            $field_name    = esc_html( stripslashes( $field->field_name ) );
-            $required_span = ( ! empty( $field->field_required ) && $field->field_required === 'yes' ) ? ' <span class="vfb-required-asterisk">*</span>' : '';
-            $required      = ( ! empty( $field->field_required ) && $field->field_required === 'yes' ) ? esc_attr( ' required' ) : '';
-            $validation    = ( ! empty( $field->field_validation ) ) ? esc_attr( " $field->field_validation" ) : '';
-            $css           = ( ! empty( $field->field_css ) ) ? esc_attr( " $field->field_css" ) : '';
+            $field_name    = esc_html( wp_unslash( $field->field_name ) );
+            $required_span = ! empty( $field->field_required ) && 'yes' === $field->field_required ? ' <span class="vfb-required-asterisk">*</span>' : '';
+            $required      = ! empty( $field->field_required ) && 'yes' === $field->field_required ? esc_attr( ' required' ) : '';
+            $validation    = ! empty( $field->field_validation ) ? esc_attr( " $field->field_validation" ) : '';
+            $css           = ! empty( $field->field_css ) ? esc_attr( " $field->field_css" ) : '';
             $id_attr       = "vfb-{$field_id}";
-            $size          = ( ! empty( $field->field_size ) ) ? esc_attr( " vfb-$field->field_size" ) : '';
-            $layout        = ( ! empty( $field->field_layout ) ) ? esc_attr( " vfb-$field->field_layout" ) : '';
-            $default       = ( ! empty( $field->field_default ) ) ? wp_specialchars_decode( esc_html( stripslashes( $field->field_default ) ), ENT_QUOTES ) : '';
-            $description   = ( ! empty( $field->field_description ) ) ? wp_specialchars_decode( esc_html( stripslashes( $field->field_description ) ), ENT_QUOTES ) : '';
-
-            // Close each section
-            if ( $open_section == true ) {
-                // If this field's parent does NOT equal our section ID
-                if ( $sec_id && $sec_id !== absint( $field->field_parent ) ) {
+            $size          = ! empty( $field->field_size ) ? esc_attr( " vfb-$field->field_size" ) : '';
+            $layout        = ! empty( $field->field_layout ) ? esc_attr( " vfb-$field->field_layout" ) : '';
+            $default       = ! empty( $field->field_default ) ? wp_specialchars_decode( esc_html( wp_unslash( $field->field_default ) ), ENT_QUOTES ) : '';
+            $description   = ! empty( $field->field_description ) ? wp_specialchars_decode( esc_html( wp_unslash( $field->field_description ) ), ENT_QUOTES ) : '';
+
+            // Close each section.
+            if ( true === $open_section ) {
+                // If this field's parent does NOT equal our section ID.
+                $field_parent = absint( $field->field_parent );
+                if ( $sec_id && $sec_id !== $field_parent ) {
                     $output      .= '</div><div class="vfb-clear"></div>';
                     $open_section = false;
@@ -261 +263 @@
             }
 
-            // Force an initial fieldset and display an error message to strongly encourage user to add one
-            if ( $count === 1 && $field_type !== 'fieldset' ) {
+            // Force an initial fieldset and display an error message to strongly encourage user to add one.
+            if ( 1 === $count && 'fieldset' !== $field_type ) {
                 $output .= sprintf(
                     '<fieldset class="vfb-fieldset"><div class="vfb-legend" style="background-color:#FFEBE8;border:1px solid #CC0000;"><h3>%1$s</h3><p style="color:black;">%2$s</p></div><ul class="section section-%3$d">',
-                    __( 'Oops! Missing Fieldset', 'visual-form-builder' ),
-                    __( 'If you are seeing this message, it means you need to <strong>add a Fieldset to the beginning of your form</strong>. Your form may not function or display properly without one.', 'visual-form-builder' ),
+                    esc_html__( 'Oops! Missing Fieldset', 'visual-form-builder' ),
+                    esc_html__( 'If you are seeing this message, it means you need to <strong>add a Fieldset to the beginning of your form</strong>. Your form may not function or display properly without one.', 'visual-form-builder' ),
                     $count
                 );
@@ -273 +275 @@
             }
 
-            if ( $field_type == 'fieldset' ) {
-                // Close each fieldset
-                if ( $open_fieldset == true ) {
+            if ( 'fieldset' === $field_type ) {
+                // Close each fieldset.
+                if ( true === $open_fieldset ) {
                     $output .= '</ul>&nbsp;</fieldset>';
                 }
 
-                // Only display Legend if field name is not blank
+                // Only display Legend if field name is not blank.
                 $legend = ! empty( $field_name ) ? sprintf( '<div class="vfb-legend"><h3>%s</h3></div>', $field_name ) : '&nbsp;';
 
@@ -293 +295 @@
                 $open_fieldset = true;
                 $count++;
-            } elseif ( $field_type == 'section' ) {
+            } elseif ( 'section' === $field_type ) {
                 $output .= sprintf(
                     '<div id="item-%1$s" class="vfb-section-div %2$s"><h4>%3$s</h4>',
@@ -301 +303 @@
                 );
 
-                // Save section ID for future comparison
+                // Save section ID for future comparison.
                 $sec_id       = $field_id;
                 $open_section = true;
@@ -307 +309 @@
                 $columns_choice = ( ! empty( $field->field_size ) && in_array( $field_type, array( 'radio', 'checkbox' ) ) ) ? esc_attr( " vfb-$field->field_size" ) : '';
 
-                if ( $field_type !== 'hidden' ) {
-                    // Don't add for attribute for certain form items
+                if ( 'hidden' !== $field_type ) {
+                    // Don't add for attribute for certain form items.
                     $for = ! in_array( $field_type, array( 'checkbox', 'radio', 'time', 'address', 'instructions' ) ) ? ' for="%4$s"' : '';
 
@@ -323 +325 @@
             } elseif ( in_array( $field_type, array( 'verification', 'secret' ) ) ) {
 
-                if ( $field_type == 'verification' ) {
+                if ( 'verification' === $field_type ) {
                     $verification .= sprintf(
                         '<fieldset class="vfb-fieldset vfb-fieldset-%1$d %2$s %3$s" id="item-%4$s" style="display:block"><div class="vfb-legend"><h3>%5$s</h3></div><ul class="vfb-section vfb-section-%1$d">',
@@ -334 +336 @@
                 }
 
-                if ( $field_type == 'secret' ) {
-                    // Default logged in values
+                if ( 'secret' === $field_type ) {
+                    // Default logged in values.
                     $logged_in_display = $logged_in_value = '';
 
-                    // If the user is logged in, fill the field in for them
+                    // If the user is logged in, fill the field in for them.
                     if ( is_user_logged_in() ) {
-                        // Hide the secret field if logged in
+                        // Hide the secret field if logged in.
                         $logged_in_display = ' style="display:none;"';
                         $logged_in_value   = 14;
 
-                        // Get logged in user details
+                        // Get logged in user details.
                         $user          = wp_get_current_user();
                         $user_identity = ! empty( $user->ID ) ? $user->display_name : '';
 
-                        // Display a message for logged in users
-                        $logged_in_as = sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. Verification not required.', 'visual-form-builder' ), admin_url( 'profile.php' ), $user_identity );
+                        // Display a message for logged in users.
+                        $logged_in_as = sprintf( esc_html__( 'Logged in as <a href="%1$s">%2$s</a>. Verification not required.', 'visual-form-builder' ), admin_url( 'profile.php' ), $user_identity );
 
                         $verification .= sprintf(
@@ -367 +369 @@
                     );
 
-                    // Set variable for testing if required is Yes/No
-                    $verification .= ( empty( $required ) ) ? '<input type="hidden" name="_vfb-required-secret" value="0" />' : '';
-
-                    // Set hidden secret to matching input
+                    // Set variable for testing if required is Yes/No.
+                    $verification .= empty( $required ) ? '<input type="hidden" name="_vfb-required-secret" value="0" />' : '';
+
+                    // Set hidden secret to matching input.
                     $verification .= sprintf( '<input type="hidden" name="_vfb-secret" value="vfb-%d" />', $field_id );
 
@@ -397 +399 @@
                 case 'number':
                 case 'phone':
-                    // HTML5 types
+                    // HTML5 types.
                     if ( in_array( $field_type, array( 'email', 'url' ) ) ) {
                         $type = esc_attr( $field_type );
@@ -435 +437 @@
                     $output .= '<div>';
 
-                    $output .= ( ! empty( $description ) ) ? sprintf( '<span class="vfb-span"><label>%2$s</label></span>%1$s', $form_item, $description ) : $form_item;
+                    $output .= ! empty( $description ) ? sprintf( '<span class="vfb-span"><label>%2$s</label></span>%1$s', $form_item, $description ) : $form_item;
 
                     $output .= '</div>';
@@ -446 +448 @@
                     $options = '';
 
-                    // Loop through each option and output
+                    // Loop through each option and output.
                     foreach ( $field_options as $option => $value ) {
-                        $options .= sprintf( '<option value="%1$s"%2$s>%1$s</option>', esc_attr( trim( stripslashes( $value ) ) ), selected( $default, ++$option, 0 ) );
+                        $options .= sprintf( '<option value="%1$s"%2$s>%1$s</option>', esc_attr( trim( wp_unslash( $value ) ) ), selected( $default, ++$option, 0 ) );
                     }
 
@@ -470 +472 @@
                     $options = '';
 
-                    // Loop through each option and output
+                    // Loop through each option and output.
                     foreach ( $field_options as $option => $value ) {
                         $option++;
@@ -481 +483 @@
                             $required,
                             $css,
-                            esc_attr( trim( stripslashes( $value ) ) ),
-                            wp_specialchars_decode( stripslashes( $value ) ),
+                            esc_attr( trim( wp_unslash( $value ) ) ),
+                            wp_specialchars_decode( wp_unslash( $value ) ),
                             checked( $default, $option, 0 )
                         );
@@ -502 +504 @@
                     $options = '';
 
-                    // Loop through each option and output
+                    // Loop through each option and output.
                     foreach ( $field_options as $option => $value ) {
                         $options .= sprintf(
@@ -511 +513 @@
                             $required,
                             $css,
-                            esc_attr( trim( stripslashes( $value ) ) ),
-                            wp_specialchars_decode( stripslashes( $value ) ),
+                            esc_attr( trim( wp_unslash( $value ) ) ),
+                            wp_specialchars_decode( wp_unslash( $value ) ),
                             checked( $default, ++$option, 0 )
                         );
@@ -528 +530 @@
 
                 case 'address':
-                    // Get global settings
+                    // Get global settings.
                     $vfb_settings = get_option( 'vfb-settings' );
 
-                    // Settings - Place Address labels above fields
+                    // Settings - Place Address labels above fields.
                     $settings_address_labels = isset( $vfb_settings['address-labels'] ) ? false : true;
 
@@ -538 +540 @@
                     $address_parts = array(
                         'address'   => array(
-                            'label'  => __( 'Street Address', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'Street Address', 'visual-form-builder' ),
                             'layout' => 'full',
                         ),
                         'address-2' => array(
-                            'label'  => __( 'Apt, Suite, Bldg. (optional)', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'Apt, Suite, Bldg. (optional)', 'visual-form-builder' ),
                             'layout' => 'full',
                         ),
                         'city'      => array(
-                            'label'  => __( 'City', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'City', 'visual-form-builder' ),
                             'layout' => 'left',
                         ),
                         'state'     => array(
-                            'label'  => __( 'State / Province / Region', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'State / Province / Region', 'visual-form-builder' ),
                             'layout' => 'right',
                         ),
                         'zip'       => array(
-                            'label'  => __( 'Postal / Zip Code', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'Postal / Zip Code', 'visual-form-builder' ),
                             'layout' => 'left',
                         ),
                         'country'   => array(
-                            'label'  => __( 'Country', 'visual-form-builder' ),
+                            'label'  => esc_html__( 'Country', 'visual-form-builder' ),
                             'layout' => 'right',
                         ),
@@ -571 +573 @@
                     foreach ( $address_parts as $parts => $part ) {
 
-                        // Make sure the second address line is not required
+                        // Make sure the second address line is not required.
                         $addr_required = ( 'address-2' !== $parts ) ? $required : '';
 
@@ -617 +619 @@
 
                 case 'date':
-                    // Load jQuery UI datepicker library
+                    // Load jQuery UI datepicker library.
                     wp_enqueue_script( 'jquery-ui-datepicker' );
                     wp_enqueue_script( 'vfb-datepicker-i18n' );
 
                     $options    = maybe_unserialize( $field->field_options );
-                    $dateFormat = ( $options ) ? $options['dateFormat'] : '';
+                    $date_format = $options ? $options['dateFormat'] : '';
 
                     $form_item = sprintf(
@@ -632 +634 @@
                         $required,
                         $css,
-                        $dateFormat
+                        $date_format
                     );
 
@@ -642 +644 @@
                     $hour = $minute = $ampm = '';
 
-                    // Get the time format (12 or 24)
+                    // Get the time format (12 or 24).
                     $time_format = str_replace( 'time-', '', $validation );
 
@@ -649 +651 @@
                     $min_interval = apply_filters( 'vfb_time_min_interval', 5, $form_id );
 
-                    // Set whether we start with 0 or 1 and how many total hours
-                    $hour_start = ( $time_format == '12' ) ? 1 : 0;
-                    $hour_total = ( $time_format == '12' ) ? 12 : 23;
-
-                    // Hour
+                    // Set whether we start with 0 or 1 and how many total hours.
+                    $hour_start = '12' === $time_format ? 1 : 0;
+                    $hour_total = '12' === $time_format ? 12 : 23;
+
+                    // Hour.
                     for ( $i = $hour_start; $i <= $hour_total; $i++ ) {
                         $hour .= sprintf( '<option value="%1$02d">%1$02d</option>', $i );
                     }
 
-                    // Minute
+                    // Minute.
                     for ( $i = 0; $i <= $total_mins; $i += $min_interval ) {
                         $minute .= sprintf( '<option value="%1$02d">%1$02d</option>', $i );
                     }
 
-                    // AM/PM
-                    if ( $time_format == '12' ) {
+                    // AM/PM.
+                    if ( '12' === $time_format ) {
                         $ampm = sprintf(
                             '<span class="vfb-time"><select name="vfb-%1$d[ampm]" id="%2$s-ampm" class="vfb-select %5$s %6$s"><option value="AM">AM</option><option value="PM">PM</option></select><label for="%2$s-ampm">AM/PM</label></span>',
@@ -726 +728 @@
                     }
 
-                    // Use output buffering to capture wp_editor
+                    // Use output buffering to capture wp_editor.
                     ob_start();
 
@@ -739 +741 @@
                 case 'file-upload':
                     $options = maybe_unserialize( $field->field_options );
-                    $accept  = ( ! empty( $options[0] ) ) ? " {accept:'$options[0]'}" : '';
+                    $accept  = ! empty( $options[0] ) ? " {accept:'$options[0]'}" : '';
 
                     $form_item = sprintf(
@@ -753 +755 @@
                     );
 
-                    $output .= ( ! empty( $description ) ) ? sprintf( '<span class="vfb-span">%1$s<label>%2$s</label></span>', $form_item, $description ) : $form_item;
+                    $output .= ! empty( $description ) ? sprintf( '<span class="vfb-span">%1$s<label>%2$s</label></span>', $form_item, $description ) : $form_item;
 
                     break;
 
                 case 'instructions':
-                    $output .= wp_specialchars_decode( esc_html( stripslashes( $description ) ), ENT_QUOTES );
+                    $output .= wp_specialchars_decode( esc_html( wp_unslash( $description ) ), ENT_QUOTES );
 
                     break;
@@ -779 +781 @@
             }
 
-            // Closing </li>
-            $output .= ( ! in_array( $field_type, array( 'verification', 'secret', 'submit', 'fieldset', 'section' ) ) ) ? '</li>' : '';
-        }
-
-        // Close user-added fields
+            // Closing </li>.
+            $output .= ! in_array( $field_type, array( 'verification', 'secret', 'submit', 'fieldset', 'section' ) ) ? '</li>' : '';
+        }
+
+        // Close user-added fields.
         $output .= '</ul>&nbsp;</fieldset>';
 
-        // Make sure the verification displays even if they have not updated their form
+        // Make sure the verification displays even if they have not updated their form.
         if ( empty( $verification ) ) {
             $verification = sprintf(
                 '<fieldset class="vfb-fieldset vfb-verification" style="display:block">
-        <div class="vfb-legend"><h3>%1$s</h3></div>
-        <ul class="vfb-section vfb-section-%2$d">
-        <li class="vfb-item vfb-item-text" style="display:block">
-        <label for="vfb-secret" class="vfb-desc">%3$s<span>*</span></label>
-        <div><input type="text" name="vfb-secret" id="vfb-secret" class="vfb-text vfb-medium" style="display:block" /></div>
-        </li>',
-                __( 'Verification', 'visual-form-builder' ),
+                <div class="vfb-legend"><h3>%1$s</h3></div>
+                <ul class="vfb-section vfb-section-%2$d">
+                <li class="vfb-item vfb-item-text" style="display:block">
+                <label for="vfb-secret" class="vfb-desc">%3$s<span>*</span></label>
+                <div><input type="text" name="vfb-secret" id="vfb-secret" class="vfb-text vfb-medium" style="display:block" /></div>
+                </li>',
+                esc_html__( 'Verification', 'visual-form-builder' ),
                 $count,
-                __( 'Please enter any two digits with <strong>no</strong> spaces (Example: 12)', 'visual-form-builder' )
+                esc_html__( 'Please enter any two digits with <strong>no</strong> spaces (Example: 12)', 'visual-form-builder' )
             );
         }
 
-        // Output our security test
+        // Output our security test.
         $output .= sprintf(
             $verification .
             '<li style="display:none;"><label>%1$s:</label><div><input name="vfb-spam" /></div></li>
-      %2$s</ul>
-      </fieldset>',
-            __( 'This box is for spam protection - <strong>please leave it blank</strong>', 'visual-form-builder' ),
+            %2$s</ul>
+            </fieldset>',
+            esc_html__( 'This box is for spam protection - <strong>please leave it blank</strong>', 'visual-form-builder' ),
             $submit
         );
@@ -814 +816 @@
         $output .= wp_referer_field( false );
 
-        // Close the form out
+        // Close the form out.
         $output .= '</form>';
 
-        // Close form container
+        // Close form container.
         $output .= '</div> <!-- .visual-form-builder-container -->';
 
-        // Force tags to balance
+        // Force tags to balance.
         force_balance_tags( $output );
 
@@ -829 +831 @@
      * [get_form description]
      *
-     * @param  [type] $form_id [description]
+     * @param  [type] $form_id [description].
      * @return [type]          [description]
      */
@@ -848 +850 @@
      * [get_fields description]
      *
-     * @param  [type] $form_id [description]
+     * @param  [type] $form_id [description].
      * @return [type]          [description]
      */
     public static function get_fields( $form_id ) {
-         global $wpdb;
+        global $wpdb;
 
         $order_fields = sanitize_sql_orderby( 'field_sequence ASC' );

visual-form-builder/trunk/public/class-load-css-js.php

@@ -15 +15 @@
      */
     public function add_css() {
-         wp_register_style( 'vfb-jqueryui-css', apply_filters( 'vfb-date-picker-css', VFB_WP_PLUGIN_URL . 'public/assets/css/smoothness/jquery-ui-1.10.3.min.css' ), array(), '2013.12.03' );
+        wp_register_style( 'vfb-jqueryui-css', apply_filters( 'vfb-date-picker-css', VFB_WP_PLUGIN_URL . 'public/assets/css/smoothness/jquery-ui-1.10.3.min.css' ), array(), '2013.12.03' );
         wp_register_style( 'visual-form-builder-css', apply_filters( 'visual-form-builder-css', VFB_WP_PLUGIN_URL . 'public/assets/css/visual-form-builder.min.css' ), array(), '2014.04.12' );
 
         $vfb_settings = get_option( 'vfb-settings' );
 
-        // Settings - Always load CSS
+        // Settings - Always load CSS.
         if ( isset( $vfb_settings['always-load-css'] ) ) {
             wp_enqueue_style( 'visual-form-builder-css' );
@@ -28 +28 @@
         }
 
-        // Settings - Disable CSS
+        // Settings - Disable CSS.
         if ( isset( $vfb_settings['disable-css'] ) ) {
             return;
         }
 
-        // Get active widgets
+        // Get active widgets.
         $widget = is_active_widget( false, false, 'vfb_widget' );
 
-        // If no widget is found, test for shortcode
+        // If no widget is found, test for shortcode.
         if ( empty( $widget ) ) {
-            // If WordPress 3.6, use internal function. Otherwise, my own
+            // If WordPress 3.6, use internal function. Otherwise, my own.
             if ( function_exists( 'has_shortcode' ) ) {
                 global $post;
 
-                // If no post exists, exit
+                // If no post exists, exit.
                 if ( ! $post ) {
                     return;
@@ -72 +72 @@
         $locale       = get_locale();
         $translations = array(
-            'cs_CS',    // Czech
-            'de_DE',    // German
-            'el_GR',    // Greek
-            'en_US',    // English (US)
-            'en_AU',    // English (AU)
-            'en_GB',    // English (GB)
-            'es_ES',    // Spanish
-            'fr_FR',    // French
-            'he_IL',     // Hebrew
-            'hu_HU',    // Hungarian
-            'id_ID',    // Indonseian
-            'it_IT',    // Italian
-            'ja_JP',    // Japanese
-            'ko_KR',    // Korean
-            'nl_NL',    // Dutch
-            'pl_PL',    // Polish
-            'pt_BR',    // Portuguese (Brazilian)
-            'pt_PT',    // Portuguese (European)
-            'ro_RO',    // Romanian
-            'ru_RU',    // Russian
-            'sv_SE',    // Swedish
-            'tr_TR',     // Turkish
-            'zh_CN',    // Chinese
-            'zh_TW',    // Chinese (Taiwan)
+            'cs_CS',    // Czech.
+            'de_DE',    // German.
+            'el_GR',    // Greek.
+            'en_US',    // English (US).
+            'en_AU',    // English (AU).
+            'en_GB',    // English (GB).
+            'es_ES',    // Spanish.
+            'fr_FR',    // French.
+            'he_IL',    // Hebrew.
+            'hu_HU',    // Hungarian.
+            'id_ID',    // Indonseian.
+            'it_IT',    // Italian.
+            'ja_JP',    // Japanese.
+            'ko_KR',    // Korean.
+            'nl_NL',    // Dutch.
+            'pl_PL',    // Polish.
+            'pt_BR',    // Portuguese (Brazilian).
+            'pt_PT',    // Portuguese (European).
+            'ro_RO',    // Romanian.
+            'ru_RU',    // Russian.
+            'sv_SE',    // Swedish.
+            'tr_TR',    // Turkish.
+            'zh_CN',    // Chinese.
+            'zh_TW',    // Chinese (Taiwan).
         );
 
-        // Load localized vaidation and datepicker text, if translation files exist
+        // Load localized vaidation and datepicker text, if translation files exist.
         if ( in_array( $locale, $translations ) ) {
             wp_register_script( 'vfb-validation-i18n', VFB_WP_PLUGIN_URL . "public/assets/js/i18n/validate/messages-$locale.js", array( 'jquery-form-validation' ), '1.9.0', true );
             wp_register_script( 'vfb-datepicker-i18n', VFB_WP_PLUGIN_URL . "public/assets/js/i18n/datepicker/datepicker-$locale.js", array( 'jquery-ui-datepicker' ), '1.0', true );
-        }
-        // Otherwise, load English translations
-        else {
+        } else {
+            // Otherwise, load English translations.
             wp_register_script( 'vfb-validation-i18n', VFB_WP_PLUGIN_URL . 'public/assets/js/i18n/validate/messages-en_US.js', array( 'jquery-form-validation' ), '1.9.0', true );
             wp_register_script( 'vfb-datepicker-i18n', VFB_WP_PLUGIN_URL . 'public/assets/js/i18n/datepicker/datepicker-en_US.js', array( 'jquery-ui-datepicker' ), '1.0', true );
@@ -113 +112 @@
      * Check whether the content contains the specified shortcode
      *
-     * @access public
-     * @param  string $shortcode (default: '')
-     * @return void
+     * @param   [type] $shortcode  [$shortcode description].
+     *
+     * @return  shortcode
      */
     public function has_shortcode( $shortcode = '' ) {
         $post_to_check = get_post( get_the_ID() );
 
-        // false because we have to search through the post content first
+        // false because we have to search through the post content first.
         $found = false;
 
-        // if no short code was provided, return false
+        // if no short code was provided, return false.
         if ( ! $shortcode ) {
             return $found;
         }
 
-        // check the post content for the short code
+        // check the post content for the short code.
         if ( stripos( $post_to_check->post_content, '[' . $shortcode ) !== false ) {
-            // we have found the short code
+            // we have found the short code.
             $found = true;
         }
 
-        // return our final results
+        // return our final results.
         return $found;
     }

visual-form-builder/trunk/public/class-security.php

@@ -10 +10 @@
      * @return void
      */
-    public function __construct() {     }
+    public function __construct() {}
 
     /**
-     * honeypot_check function.
+     * Honeypot_check function.
      *
      * @access public
-     * @return void
+     * @return true
      */
     public function honeypot_check() {
@@ -31 +31 @@
 
     /**
-     * secret_check function.
+     * Secret_check function.
      *
      * @access public
-     * @return void
+     * @return true
      */
     public function secret_check() {
-        $required     = ( isset( $_POST['_vfb-required-secret'] ) && $_POST['_vfb-required-secret'] == '0' ) ? false : true;
-        $secret_field = ( isset( $_POST['_vfb-secret'] ) ) ? sanitize_text_field( $_POST['_vfb-secret'] ) : '';
+        $required     = isset( $_POST['_vfb-required-secret'] ) && '0' === $_POST['_vfb-required-secret'] ? false : true;
+        $secret_field = isset( $_POST['_vfb-secret'] ) ? sanitize_text_field( wp_unslash( $_POST['_vfb-secret'] ) ) : '';
 
-        // If the verification is set to required, run validation check
-        if ( true == $required && ! empty( $secret_field ) ) {
-            if ( ! is_numeric( $_POST[ $secret_field ] ) || strlen( $_POST[ $secret_field ] ) !== 2 ) {
-                return __( 'Security check: failed secret question. Please try again!', 'visual-form-builder' );
+        // If the verification is set to required, run validation check.
+        if ( true === $required && ! empty( $secret_field ) ) {
+            if ( isset( $_POST[ $secret_field ] ) ) {
+                $post_secret_field = sanitize_text_field( wp_unslash( $_POST[ $secret_field ] ) );
+                if ( ! is_numeric( $post_secret_field ) || strlen( $post_secret_field ) !== 2 ) {
+                    return esc_html__( 'Security check: failed secret question. Please try again!', 'visual-form-builder' );
+                }
             }
         }
@@ -56 +59 @@
      */
     public function referer_check() {
-        $referrer       = ( isset( $_POST['_wp_http_referer'] ) ) ? sanitize_text_field( $_POST['_wp_http_referer'] ) : false;
+        $referrer       = isset( $_POST['_wp_http_referer'] ) ? sanitize_text_field( wp_unslash( $_POST['_wp_http_referer'] ) ) : false;
         $wp_get_referer = wp_get_referer();
-        $form_id        = absint( $_POST['form_id'] );
+        $form_id        = isset( $_POST['form_id'] ) ? absint( $_POST['form_id'] ) : 0;
 
         $skip_referrer_check = apply_filters( 'vfb_skip_referrer_check', false, $form_id );
 
-        // Test if referral URL has been set
+        // Test if referral URL has been set.
         if ( ! $referrer ) {
-            return __( 'Security check: referal URL does not appear to be set.', 'visual-form-builder' );
+            return esc_html__( 'Security check: referal URL does not appear to be set.', 'visual-form-builder' );
         }
 
-        // Allow referrer check to be skipped
+        // Allow referrer check to be skipped.
         if ( ! $skip_referrer_check ) {
-            // Test if the referral URL matches what sent from WordPress
+            // Test if the referral URL matches what sent from WordPress.
             if ( $wp_get_referer ) {
-                return __( 'Security check: referal does not match this site.', 'visual-form-builder' );
+                return esc_html__( 'Security check: referal does not match this site.', 'visual-form-builder' );
             }
         }
@@ -84 +87 @@
      *
      * @access public
-     * @return void
+     * @return true
      */
     public function bot_check() {
@@ -120 +123 @@
         );
 
-        $user_agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? wp_kses_data( $_SERVER['HTTP_USER_AGENT'] ) : '';
+        $user_agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? wp_kses_data( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) : '';
 
-        do_action( 'vfb_isBot', $user_agent, $bots );
+        do_action( 'vfb_isbot', $user_agent, $bots );
 
         foreach ( $bots as $bot ) {
             if ( stripos( $user_agent, $bot ) !== false ) {
-                return __( 'Security check: looks like you are a SPAM bot. If you think this is an error, please email the site owner.', 'visual-form-builder' );
+                return esc_html__( 'Security check: looks like you are a SPAM bot. If you think this is an error, please email the site owner.', 'visual-form-builder' );
             }
         }

visual-form-builder/trunk/visual-form-builder.php

@@ -52 +52 @@
      * @return void
      */
-    protected function __construct() {  }
+    protected function __construct() {}
 
     /**
@@ -59 +59 @@
      * @return void
      */
-    private function __clone() {    }
+    private function __clone() {}
 
     /**
@@ -66 +66 @@
      * @return void
      */
-    private function __wakeup() {   }
+    private function __wakeup() {}
 
     /**
@@ -85 +85 @@
             self::$instance->autoload_classes();
 
-            // Setup Entries CPT
-            // self::$instance->entries_cpt = new VFB_Pro_Entries_CPT();
-
-            // Install DB
+            // Install DB.
             register_activation_hook( __FILE__, array( self::$instance, 'install' ) );
 
-            // Update DB
+            // Update DB.
             add_action( 'plugins_loaded', array( self::$instance, 'upgrade_db_check' ) );
 
-            // Load i18n
+            // Load i18n.
             add_action( 'plugins_loaded', array( self::$instance, 'lang' ) );
 
@@ -106 +103 @@
     /**
      * Setup constants
-     *
-     * @return [type] [description]
      */
     private function setup_constants() {
         global $wpdb;
 
-        // Database version
+        // Database version.
         if ( ! defined( 'VFB_WP_DB_VERSION' ) ) {
             define( 'VFB_WP_DB_VERSION', $this->db_version );
         }
 
-        // Plugin version
+        // Plugin version.
         if ( ! defined( 'VFB_WP_PLUGIN_VERSION' ) ) {
             define( 'VFB_WP_PLUGIN_VERSION', $this->version );
         }
 
-        // Plugin Folder Path
+        // Plugin Folder Path.
         if ( ! defined( 'VFB_WP_PLUGIN_DIR' ) ) {
             define( 'VFB_WP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
         }
 
-        // Plugin Folder URL
+        // Plugin Folder URL.
         if ( ! defined( 'VFB_WP_PLUGIN_URL' ) ) {
             define( 'VFB_WP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
         }
 
-        // Plugin Root File
+        // Plugin Root File.
         if ( ! defined( 'VFB_WP_PLUGIN_FILE' ) ) {
             define( 'VFB_WP_PLUGIN_FILE', __FILE__ );
         }
 
-        // Form table name
+        // Form table name.
         if ( ! defined( 'VFB_WP_FORMS_TABLE_NAME' ) ) {
             define( 'VFB_WP_FORMS_TABLE_NAME', $wpdb->prefix . 'visual_form_builder_forms' );
         }
 
-        // Field table name
+        // Field table name.
         if ( ! defined( 'VFB_WP_FIELDS_TABLE_NAME' ) ) {
             define( 'VFB_WP_FIELDS_TABLE_NAME', $wpdb->prefix . 'visual_form_builder_fields' );
         }
 
-        // Form meta table name
+        // Form meta table name.
         if ( ! defined( 'VFB_WP_ENTRIES_TABLE_NAME' ) ) {
             define( 'VFB_WP_ENTRIES_TABLE_NAME', $wpdb->prefix . 'visual_form_builder_entries' );
@@ -155 +150 @@
     /**
      * Include files
-     *
-     * @return [type] [description]
      */
     private function includes() {
@@ -191 +184 @@
     /**
      * Install DB
-     *
-     * @return [type] [description]
      */
     public function install() {
-         $install = new Visual_Form_Builder_Install();
+        $install = new Visual_Form_Builder_Install();
         $install->install();
     }
@@ -201 +192 @@
     /**
      * Check database version and run SQL install, if needed
-     *
-     * @return [type] [description]
      */
     public function upgrade_db_check() {
@@ -215 +204 @@
     /**
      * Load localization file
-     *
-     * @return [type] [description]
      */
     public function lang() {
@@ -227 +214 @@
     /**
      * Autoload some VFB classes that aren't loaded via other files.
-     *
-     * @return [type] [description]
      */
     public function autoload_classes() {