Changeset 1007570

Timestamp:

10/14/2014 10:26:08 PM (11 years ago)

Author:

joshcanhelp

Message:

Version 0.9.8.6: fixing math captcha getting cached and updated PhpFormBuilder library

Location:

proper-contact-form/trunk

Files:

• inc/PhpFormBuilder.php (modified) (3 diffs)
• proper-contact-form.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

proper-contact-form/trunk/inc/PhpFormBuilder.php

@@ -1 +1 @@
 <?php
 
-// v 0.8.5
+// v 0.8.6
 
 class PhpFormBuilder {
-    
+
     // Stores all form inputs
-    private $inputs = array(); 
-    
+    private $inputs = array();
+
     // Stores all form attributes
-    private $form = array(); 
-    
-    // Make sure a submit button is output
+    private $form = array();
+
+    // Does this form have a submit value?
     private $has_submit = false;
-    
-    // Constructor to set basic form attributes
-    function __construct($action = '', $args = false) {
-        
+
+    /**
+     * Constructor function to set form action and attributes
+     *
+     * @param string $action
+     * @param bool   $args
+     */
+    function __construct( $action = '', $args = false ) {
+
+        // Default form attributes
         $defaults = array(
-            'action' => $action,
-            'method' => 'post',
-            'enctype' => 'application/x-www-form-urlencoded',
-            'class' => array(),
-            'id' => '',
-            'markup' => 'html',
-            'novalidate' => false,
-            'add_nonce' => false,
+            'action'       => $action,
+            'method'       => 'post',
+            'enctype'      => 'application/x-www-form-urlencoded',
+            'class'        => array(),
+            'id'           => '',
+            'markup'       => 'html',
+            'novalidate'   => false,
+            'add_nonce'    => false,
             'add_honeypot' => true,
             'form_element' => true,
+            'add_submit'   => true
         );
-        
-        if ($args) {
-            $settings = array_merge($defaults, $args);
-        }
+
+        // Merge with arguments, if present
+        if ( $args ) {
+            $settings = array_merge( $defaults, $args );
+        } // Otherwise, use the defaults wholesale
         else {
             $settings = $defaults;
         }
-        
-        foreach ($settings as $key => $val) {
+
+        // Iterate through and save each option
+        foreach ( $settings as $key => $val ) {
             // Try setting with user-passed setting
             // If not, try the default with the same key name
-            if (!$this->set_att($key, $val)) {
-                $this->set_att($key, $defaults[$key]);
-            }
-        }
-    
-    }
-    
-    // Set attributes for the form and special fields
-    function set_att($key, $val) {
-    
-        switch ($key) :
-            
+            if ( ! $this->set_att( $key, $val ) ) {
+                $this->set_att( $key, $defaults[ $key ] );
+            }
+        }
+    }
+
+    /**
+     * Validate and set form
+     *
+     * @param string        $key A valid key; switch statement ensures validity
+     * @param string | bool $val A valid value; validated for each key
+     *
+     * @return bool
+     */
+    function set_att( $key, $val ) {
+
+        switch ( $key ) :
+
+            case 'action':
+                break;
+
             case 'method':
-                if (! in_array($val, array('post', 'get'))) return false;
-                break;
-            
+                if ( ! in_array( $val, array( 'post', 'get' ) ) ) {
+                    return false;
+                }
+                break;
+
             case 'enctype':
-                if (! in_array($val, array('application/x-www-form-urlencoded', 'multipart/form-data'))) return false;
-                break;
-            
+                if ( ! in_array( $val, array( 'application/x-www-form-urlencoded', 'multipart/form-data' ) ) ) {
+                    return false;
+                }
+                break;
+
             case 'markup':
-                if (! in_array($val, array('html', 'xhtml'))) return false;
-                break;
-            
+                if ( ! in_array( $val, array( 'html', 'xhtml' ) ) ) {
+                    return false;
+                }
+                break;
+
             case 'class':
             case 'id':
-                if (! $this->_check_valid_attr($val)) return false;
-                break;
-            
+                if ( ! $this->_check_valid_attr( $val ) ) {
+                    return false;
+                }
+                break;
+
             case 'novalidate':
             case 'add_honeypot':
             case 'form_element':
-                if (! is_bool($val)) return false;
-                break;
-            
+            case 'add_submit':
+                if ( ! is_bool( $val ) ) {
+                    return false;
+                }
+                break;
+
             case 'add_nonce':
-                if (! is_string($val) && !is_bool($val)) return false;
-                break;
-            
-            default: 
+                if ( ! is_string( $val ) && ! is_bool( $val ) ) {
+                    return false;
+                }
+                break;
+
+            default:
                 return false;
-            
+
         endswitch;
-        
-        $this->form[$key] = $val;
-        
+
+        $this->form[ $key ] = $val;
+
         return true;
-        
-    }
-    
-    // Add an input to the queue
-    function add_input($label, $args = '', $slug = '') {
-        
-        if (empty($args)) {
+
+    }
+
+    /**
+     * Add an input field to the form for outputting later
+     *
+     * @param string $label
+     * @param string $args
+     * @param string $slug
+     */
+    function add_input( $label, $args = '', $slug = '' ) {
+
+        if ( empty( $args ) ) {
             $args = array();
         }
 
-        if (empty($slug)) {
-            $slug = $this->_make_slug($label);
-        }
-        
+        // Create a valid id or class attribute
+        if ( empty( $slug ) ) {
+            $slug = $this->_make_slug( $label );
+        }
+
         $defaults = array(
-            'type' => 'text',
-            'name' => $slug,
-            'id' => $slug,
-            'label' => $label,
-            'value' => '',
-            'placeholder' => '',
-            'class' => array(),
-            'min' => '',
-            'max' => '',
-            'step' => '',
-            'autofocus' => false,
-            'checked' => false,
-            'required' => false,
-            'add_label' => true,
-            'options' => array(),
-            'wrap_tag' => 'div',
-            'wrap_class' => array('form_field_wrap'),
-            'wrap_id' => '',
-            'wrap_style' => ''
-        
+            'type'             => 'text',
+            'name'             => $slug,
+            'id'               => $slug,
+            'label'            => $label,
+            'value'            => '',
+            'placeholder'      => '',
+            'class'            => array(),
+            'min'              => '',
+            'max'              => '',
+            'step'             => '',
+            'autofocus'        => false,
+            'checked'          => false,
+            'selected'         => false,
+            'required'         => false,
+            'add_label'        => true,
+            'options'          => array(),
+            'wrap_tag'         => 'div',
+            'wrap_class'       => array( 'form_field_wrap' ),
+            'wrap_id'          => '',
+            'wrap_style'       => '',
+            'before_html'      => '',
+            'after_html'       => '',
+            'request_populate' => true
         );
-        
+
         // Combined defaults and arguments
         // Arguments override defaults
-        $args = array_merge($defaults, $args);
-        
-        $this->inputs[$slug] = $args;
-        
-    }
-    
-    // Add multiple inputs to the queue
-    function add_inputs($arr) {
-        
-        if (!is_array($arr)) return false;
-        
-        foreach ($arr as $field) :
-            $this->add_input($field[0], isset($field[1]) ? $field[1] : '', isset($field[2]) ? $field[2] : '');
-        endforeach;
-        
-    }
-    
-    // Parse the inputs and build the form HTML
-    function build_form($echo = true) {
+        $args                  = array_merge( $defaults, $args );
+        $this->inputs[ $slug ] = $args;
+
+    }
+
+    /**
+     * Add multiple inputs to the input queue
+     *
+     * @param $arr
+     *
+     * @return bool
+     */
+    function add_inputs( $arr ) {
+
+        if ( ! is_array( $arr ) ) {
+            return false;
+        }
+
+        foreach ( $arr as $field ) {
+            $this->add_input(
+                $field[0], isset( $field[1] ) ? $field[1] : '',
+                isset( $field[2] ) ? $field[2] : ''
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Build the HTML for the form based on the input queue
+     *
+     * @param bool $echo Should the HTML be echoed or returned?
+     *
+     * @return string
+     */
+    function build_form( $echo = true ) {
 
         $output = '';
@@ -151 +209 @@
             $output .= '<form method="' . $this->form['method'] . '"';
 
-            if (!empty($this->form['enctype'])) {
+            if ( ! empty( $this->form['enctype'] ) ) {
                 $output .= ' enctype="' . $this->form['enctype'] . '"';
             }
 
-            if (!empty($this->form['action'])) {
+            if ( ! empty( $this->form['action'] ) ) {
                 $output .= ' action="' . $this->form['action'] . '"';
             }
 
-            if (!empty($this->form['id'])) {
+            if ( ! empty( $this->form['id'] ) ) {
                 $output .= ' id="' . $this->form['id'] . '"';
             }
-            
-            if (count($this->form['class']) > 0) {
-                $output .= $this->_output_classes($this->form['class']);
-            }
-
-            if ($this->form['novalidate']) {
+
+            if ( count( $this->form['class'] ) > 0 ) {
+                $output .= $this->_output_classes( $this->form['class'] );
+            }
+
+            if ( $this->form['novalidate'] ) {
                 $output .= ' novalidate';
             }
@@ -173 +231 @@
             $output .= '>';
         }
-        
-        if ($this->form['add_honeypot']) 
-            $this->add_input('Leave blank to submit', array(
-                'name' => 'honeypot',
-                'slug' => 'honeypot',
-                'id' => 'form_honeypot',
-                'wrap_tag' => 'div',
-                'wrap_class' => array('form_field_wrap', 'hidden'),
-                'wrap_id' => '',
-                'wrap_style' => 'display: none'
-            ));
-        
-        if ($this->form['add_nonce'] && function_exists('wp_create_nonce')) 
-            $this->add_input('WordPress nonce', array(
-                'value' => wp_create_nonce($this->form['add_nonce']),
-                'add_label' => false,
-                'type' => 'hidden'
-            ));
-        
-        foreach ($this->inputs as $key => $val) :
-            
+
+        // Add honeypot anti-spam field
+        if ( $this->form['add_honeypot'] ) {
+            $this->add_input( 'Leave blank to submit', array(
+                'name'             => 'honeypot',
+                'slug'             => 'honeypot',
+                'id'               => 'form_honeypot',
+                'wrap_tag'         => 'div',
+                'wrap_class'       => array( 'form_field_wrap', 'hidden' ),
+                'wrap_id'          => '',
+                'wrap_style'       => 'display: none',
+                'request_populate' => false
+            ) );
+        }
+
+        // Add a WordPress nonce field
+        if ( $this->form['add_nonce'] && function_exists( 'wp_create_nonce' ) ) {
+            $this->add_input( 'WordPress nonce', array(
+                'value'            => wp_create_nonce( $this->form['add_nonce'] ),
+                'add_label'        => false,
+                'type'             => 'hidden',
+                'request_populate' => false
+            ) );
+        }
+
+        // Iterate through the input queue and add input HTML
+        foreach ( $this->inputs as $val ) :
+
             $min_max_range = $element = $end = $attr = $field = $label_html = '';
-            
-            // Set the field value to incoming
-            $val['value'] = isset($_REQUEST[$val['name']]) && !empty($_REQUEST[$val['name']]) ? 
-                $_REQUEST[$val['name']] : 
-                $val['value'];
-            
-            switch ($val['type']) :
-                
+
+            // Automatic population of values using $_REQUEST data
+            if ( $val['request_populate'] && isset( $_REQUEST[ $val['name'] ] ) ) {
+
+                // Can this field be populated directly?
+                if ( ! in_array( $val['type'], array( 'html', 'title', 'radio', 'checkbox', 'select', 'submit' ) ) ) {
+                    $val['value'] = $_REQUEST[ $val['name'] ];
+                }
+            }
+
+            // Automatic population for checkboxes and radios
+            if (
+                $val['request_populate'] &&
+                ( $val['type'] == 'radio' || $val['type'] == 'checkbox' ) &&
+                empty( $val['options'] )
+            ) {
+                $val['checked'] = isset( $_REQUEST[ $val['name'] ] ) ? true : $val['checked'];
+            }
+
+            switch ( $val['type'] ) {
+
                 case 'html':
                     $element = '';
-                    $end = $val['label'];
+                    $end     = $val['label'];
                     break;
-                
+
                 case 'title':
                     $element = '';
-                    $end = '
+                    $end     = '
                     <h3>' . $val['label'] . '</h3>';
                     break;
-                
+
                 case 'textarea':
                     $element = 'textarea';
-                    $end = '>' . $val['value'] . '</textarea>';
+                    $end     = '>' . $val['value'] . '</textarea>';
                     break;
-                    
+
                 case 'select':
                     $element = 'select';
-                    $end = '>' . $this->_output_options_select($val['options']) . '
-                    </select>';
+                    $end     .= '>';
+                    foreach ( $val['options'] as $key => $opt ) {
+                        $opt_insert = '';
+                        if (
+                            // Is this field set to automatically populate?
+                            $val['request_populate'] &&
+
+                            // Do we have $_REQUEST data to use?
+                            isset( $_REQUEST[ $val['name'] ] ) &&
+
+                            // Are we currently outputting the selected value?
+                            $_REQUEST[ $val['name'] ] === $key
+                        ) {
+                            $opt_insert = ' selected';
+
+                        // Does the field have a default selected value?
+                        } else if ( $val['selected'] === $key ) {
+                            $opt_insert = ' selected';
+                        }
+                        $end .= '<option value="' . $key . '"' . $opt_insert . '>' . $opt . '</option>';
+                    }
+                    $end .= '</select>';
                     break;
-                
+
+                case 'radio':
                 case 'checkbox':
-                    if (count($val['options']) > 0) :
+
+                    // Special case for multiple check boxes
+                    if ( count( $val['options'] ) > 0 ) :
                         $element = '';
-                        $end = $this->_output_options_checkbox($val['options'], $val['name']);
-                        $label_html = '<p class="checkbox_header">' . $val['label'] . '</p>';
+                        foreach ( $val['options'] as $key => $opt ) {
+                            $slug = $this->_make_slug( $opt );
+                            $end .= sprintf(
+                                '<input type="%s" name="%s[]" value="%s" id="%s"',
+                                $val['type'],
+                                $val['name'],
+                                $key,
+                                $slug
+                            );
+                            if (
+                                // Is this field set to automatically populate?
+                                $val['request_populate'] &&
+
+                                // Do we have $_REQUEST data to use?
+                                isset( $_REQUEST[ $val['name'] ] ) &&
+
+                                // Is the selected item(s) in the $_REQUEST data?
+                                in_array( $key, $_REQUEST[ $val['name'] ] )
+                            ) {
+                                $end .= ' checked';
+                            }
+                            $end .= $this->field_close();
+                            $end .= ' <label for="' . $slug . '">' . $opt . '</label>';
+                        }
+                        $label_html = '<div class="checkbox_header">' . $val['label'] . '</div>';
+                        break;
                     endif;
-                    break;
-                
-                case 'radio':
-                    if (count($val['options']) > 0) :
-                        $element = '';
-                        $end = $this->_output_options_radios($val['options'], $val['name']);
-                        $label_html = '<p class="checkbox_header">' . $val['label'] . '</p>';
-                    endif;
-                    break;
-                
-                case 'range':
-                case 'number':
-                    $min_max_range .= !empty($val['min']) ? ' min="' . $val['min'] . '"' : '';
-                    $min_max_range .= !empty($val['max']) ? ' max="' . $val['max'] . '"' : '';
-                    $min_max_range .= !empty($val['step']) ? ' step="' . $val['step'] . '"' : '';
-                
-                case 'submit':
-                    $this->has_submit = true;
-                
+
+                // Used for all text fields (text, email, url, etc), single radios, single checkboxes, and submit
                 default :
                     $element = 'input';
                     $end .= ' type="' . $val['type'] . '" value="' . $val['value'] . '"';
-                    $end .= $val['checked'] ? ' selected' : '';
+                    $end .= $val['checked'] ? ' checked' : '';
                     $end .= $this->field_close();
                     break;
-                
-            endswitch;
-            
-            $id = !empty($val['id']) ? ' id="' . $val['id'] . '"' : '';
-
-      $class =  $this->_output_classes($val['class']);
+
+            }
+
+            // Added a submit button, no need to auto-add one
+            if ( $val['type'] === 'submit' ) {
+                $this->has_submit = true;
+            }
+
+            // Special number values for range and number types
+            if ( $val['type'] === 'range' || $val['type'] === 'number' ) {
+                $min_max_range .= ! empty( $val['min'] ) ? ' min="' . $val['min'] . '"' : '';
+                $min_max_range .= ! empty( $val['max'] ) ? ' max="' . $val['max'] . '"' : '';
+                $min_max_range .= ! empty( $val['step'] ) ? ' step="' . $val['step'] . '"' : '';
+            }
+
+            // Add an ID field, if one is present
+            $id = ! empty( $val['id'] ) ? ' id="' . $val['id'] . '"' : '';
+
+            // Output classes
+            $class = $this->_output_classes( $val['class'] );
+
+            // Special HTML5 fields, if set
             $attr .= $val['autofocus'] ? ' autofocus' : '';
             $attr .= $val['checked'] ? ' checked' : '';
             $attr .= $val['required'] ? ' required' : '';
-            
+
             // Build the label
-            if (!empty($label_html)) :
+            if ( ! empty( $label_html ) ) {
                 $field .= $label_html;
-            elseif ($val['add_label'] && $val['type'] != 'hidden' && $val['type'] != 'submit' && $val['type'] != 'title' && $val['type'] != 'html') :
-                $val['label'] .= $val['required'] ? ' <strong>*</strong>' : '';
-                $field .= '
-                    <label for="' . $val['id'] . '">' . $val['label'] . '</label>';
-            endif;
-            
-            if (!empty($element))
-                $field .= '
-                    <' . $element . $id . ' name="' . $val['name'] . '"' . $min_max_range .$class. $attr . $end;
-            else 
+            } elseif ( $val['add_label'] && ! in_array( $val['type'], array( 'hidden', 'submit', 'title', 'html' ) ) ) {
+                if ( $val['required'] ) {
+                    $val['label'] .= ' <strong>*</strong>';
+                }
+                $field .= '<label for="' . $val['id'] . '">' . $val['label'] . '</label>';
+            }
+
+            // An $element was set in the $val['type'] switch statement above so use that
+            if ( ! empty( $element ) ) {
+                if ( $val['type'] === 'checkbox' ) {
+                    $field = '
+                    <' . $element . $id . ' name="' . $val['name'] . '"' . $min_max_range . $class . $attr . $end .
+                             $field;
+                } else {
+                    $field .= '
+                    <' . $element . $id . ' name="' . $val['name'] . '"' . $min_max_range . $class . $attr . $end;
+                }
+            // Not a form element
+            } else {
                 $field .= $end;
-            
+            }
+
             // Parse and create wrap, if needed
-            if ($val['type'] != 'hidden' && $val['type'] != 'html' && !empty($val['wrap_tag'])) :
-            
-                $wrap_before = '
-                <' . $val['wrap_tag'];
-                $wrap_before .= count($val['wrap_class']) > 0 ? $this->_output_classes($val['wrap_class']) : '';
-                $wrap_before .= !empty($val['wrap_style']) ? ' style="' . $val['wrap_style'] . '"' : '';
-                $wrap_before .= !empty($val['wrap_id']) ? ' id="' . $val['wrap_id'] . '"' : '';
-                $wrap_before .= '>';
-                
-                $wrap_after = '
-                </' . $val['wrap_tag'] . '>';
-                
+            if ( $val['type'] != 'hidden' && $val['type'] != 'html' ) :
+
+                $wrap_before = $val['before_html'];
+                if ( ! empty( $val['wrap_tag'] ) ) {
+                    $wrap_before .= '<' . $val['wrap_tag'];
+                    $wrap_before .= count( $val['wrap_class'] ) > 0 ? $this->_output_classes( $val['wrap_class'] ) : '';
+                    $wrap_before .= ! empty( $val['wrap_style'] ) ? ' style="' . $val['wrap_style'] . '"' : '';
+                    $wrap_before .= ! empty( $val['wrap_id'] ) ? ' id="' . $val['wrap_id'] . '"' : '';
+                    $wrap_before .= '>';
+                }
+
+                $wrap_after = $val['after_html'];
+                if ( ! empty( $val['wrap_tag'] ) ) {
+                    $wrap_after = '</' . $val['wrap_tag'] . '>' . $wrap_after;
+                }
+
                 $output .= $wrap_before . $field . $wrap_after;
-            else : 
+            else :
                 $output .= $field;
             endif;
-            
-        endforeach; 
-        
-        if (! $this->has_submit) $output .= '
-                <div class="form_field_wrap">
-                    <input type="submit" value="Submit" name="submit">
-                </div>';
-
+
+        endforeach;
+
+        // Auto-add submit button
+        if ( ! $this->has_submit && $this->form['add_submit'] ) {
+            $output .= '<div class="form_field_wrap"><input type="submit" value="Submit" name="submit"></div>';
+        }
+
+        // Close the form tag if one was added
         if ( $this->form['form_element'] ) {
             $output .= '</form>';
         }
-        
-        if ($echo) {
+
+        // Output or return?
+        if ( $echo ) {
             echo $output;
-        }
-        else {
+        } else {
             return $output;
         }
-        
-    }
-    
-    // :FIXIT: Add validation for classes and ids
-    private function _check_valid_attr($string) {
-        
+    }
+
+    // Easy way to auto-close fields, if necessary
+    function field_close() {
+        return $this->form['markup'] === 'xhtml' ? ' />' : '>';
+    }
+
+    // Validates id and class attributes
+    // TODO: actually validate these things
+    private function _check_valid_attr( $string ) {
+
         $result = true;
-        
+
         // Check $name for correct characters
         // "^[a-zA-Z0-9_-]*$"
+
+        return $result;
+
+    }
+
+    // Create a slug from a label name
+    private function _make_slug( $string ) {
+
+        $result = '';
+
+        $result = str_replace( '"', '', $string );
+        $result = str_replace( "'", '', $result );
+        $result = str_replace( '_', '-', $result );
+        $result = preg_replace( '~[\W\s]~', '-', $result );
+
+        $result = strtolower( $result );
+
+        return $result;
+
+    }
+
+    // Parses and builds the classes in multiple places
+    private function _output_classes( $classes ) {
+
+        $output = '';
+
         
-        return $result;
-        
-    }
-    
-    // Easy way to auto-close fields, if necessary
-    function field_close() {
-            
-            return $this->form['markup'] === 'xhtml' ? ' />' : '>';
-            
-    }
-    
-    
-    // Create a slug from a label name
-    private function _make_slug($string) {
-        
-        $result = '';
-        
-        $result = str_replace('"', '', $string);
-        $result = str_replace("'", '', $result);
-        $result = str_replace('_', '-', $result);
-        $result = preg_replace('~[\W\s]~', '-', $result);
-        
-        $result = strtolower($result);
-        
-        return $result;
-        
-    }
-    
-    // Parses and builds the classes in multiple places
-    private function _output_classes($arr) {
-        
-        $output = '';
-        
-        
+        if ( is_array( $classes ) && count( $classes ) > 0 ) {
             $output .= ' class="';
-            if(is_array($arr)) {  
-                
-                if (count($arr) > 0) : 
-                
-                    foreach ($arr as $class) :
-                        $output .= $class . ' ';
-                    endforeach; 
-                endif;
-            } 
-        
-            if(is_string($arr)) {
-                $output .= $arr . ' ';
-            }
-    
+            foreach ( $classes as $class ) {
+                $output .= $class . ' ';
+            }
             $output .= '"';
-        
+        } else if ( is_string( $classes ) ) {
+            $output .= ' class="' . $classes . '"';
+        }
+
         return $output;
-        
-    }
-    
-    // Builds the select input output
-    private function _output_options_select($arr) {
-        $output = '';
-        foreach ($arr as $val => $opt) :
-            $output .= '
-                        <option value="' . $val . '">' . $opt . '</option>';
-        endforeach;
-        return $output;
-    }
-    
-    // Builds the radio button output
-    private function _output_options_radios($arr, $name) {
-        $output = '';
-        foreach ($arr as $val => $opt) :
-            $slug = $this->_make_slug($opt);
-            $output .= '
-                        <input type="radio" name="' . $name . '[]" value="' . $val . '" id="' . $slug . '"';
-            $output .= $this->form['markup'] === 'xhtml' ? ' />' : '>';
-            $output .= '
-                        <label for="' . $slug . '">' . $opt . '</label>';
-        endforeach;
-        return $output;
-    }
-    
-    // Builds the multiple checkbox output
-    private function _output_options_checkbox($arr, $name) {
-        $output = '';
-        foreach ($arr as $val => $opt) :
-            $slug = $this->_make_slug($opt);
-            $output .= '
-                        <input type="checkbox" name="' . $name . '[]" value="' . $val . '" id="' . $slug . '"';
-            $output .= $this->form['markup'] === 'xhtml' ? ' />' : '>';
-            $output .= '
-                        <label for="' . $slug . '">' . $opt . '</label>';
-        endforeach;
-        return $output;
-    }
-    
+    }
 }

proper-contact-form/trunk/proper-contact-form.php

@@ -3 +3 @@
 /*
 Plugin Name: PROPER Contact Form
-Plugin URI: http://theproperweb.com/shipped/wp/proper-contact-form
+Plugin URI: http://theproperweb.com/product/proper-contact-form/
 Description: A better contact form processor
-Version: 0.9.8.5
+Version: 0.9.8.6
 Author: PROPER Web Development
 Author URI: http://theproperweb.com
@@ -18 +18 @@
 
 // Important constants
-define( 'PROPER_CONTACT_VERSION', '0.9.8.5' );
+define( 'PROPER_CONTACT_VERSION', '0.9.8.6' );
 define( 'PROPER_CONTACT_URL', plugin_dir_url( __FILE__ ) );
 
@@ -51 +51 @@
         require_once( dirname( __FILE__ ) . '/inc/PhpFormBuilder.php' );
     }
-    $form = new PhpFormBuilder;
+    $form = new PhpFormBuilder();
 
     // TODO: make a better ID system
@@ -185 +185 @@
         // Build the input with the correct label, options, and name
         $form->add_input(
-            stripslashes( sanitize_text_field( proper_contact_get_key( 'propercfp_label_math' ) ) ) . " $num_1 + $num_2",
+            stripslashes( sanitize_text_field( proper_contact_get_key( 'propercfp_label_math' ) ) ) .
+                " $num_1 + $num_2",
             array(
                 'required'    => TRUE,
                 'wrap_class'  => $wrap_classes,
-                'use_request' => false
+                'request_populate' => false
             ),
             'math-captcha'
@@ -199 +200 @@
                 'type'        => 'hidden',
                 'value'       => $sum,
-                'use_request' => FALSE
+                'request_populate' => false
             ),
             'math-captcha-sum'

proper-contact-form/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0
 Tested up to: 4.0
-Stable tag: 0.9.8.5
+Stable tag: 0.9.8.6
 
 Creates a flexible, secure contact form on your WP site
@@ -48 +48 @@
 
 == Changelog ==
+
+= 0.9.8.6 =
+* Fixed the math captcha bug that required page reload
+* Updated to latest PhpFormBuilder include (0.8.6)
 
 = 0.9.8.5 =