Merge branch 'feature-fileuploads'

Author: Antti Kuosmanen

assets/scripts/wplf-form.js

@@ -440,9 +440,16 @@ function wplf_form( $id , $content = '', $xclass = '' ) {
         // you can override the content via a parameter
         $content = get_post( $id )->post_content;
       }
+
+      $multipart = "";
+      // check if form contains file inputs
+      if(strpos($content, "type='file'") > -1 || strpos($content, "type=\"file\"") > -1){
+        $multipart = "enctype='multipart/form-data'";
+      }
+
       ob_start();
 ?>
-<form class="libre-form libre-form-<?php echo $id . ' ' . $xclass; ?>">
+<form class="libre-form libre-form-<?php echo $id . ' ' . $xclass; ?>" <?php echo $multipart; ?>>
   <?php echo apply_filters( 'wplf_form', $content ); ?>
   <input type="hidden" name="referrer" value="<?php the_permalink(); ?>">
   <input type="hidden" name="_form_id" value="<?php esc_attr_e( $id ); ?>">
@@ -464,7 +471,7 @@ function maybe_enqueue_frontend_script() {
     global $post;
 
     // register the script, but only enqueue it if the current post contains a form in it
-    wp_register_script( 'wplf-form-js', plugins_url( 'assets/scripts/wplf-form.js', dirname(__FILE__) ), array( 'jquery' ) );
+    wp_register_script( 'wplf-form-js', plugins_url( 'assets/scripts/wplf-form.js', dirname(__FILE__) ), array() );
 
     if( is_a( $post, 'WP_Post' ) && ( has_shortcode( $post->post_content, 'libre-form') || $post->post_type === 'wplf-form') ) {
       wp_enqueue_script( 'wplf-form-js' );

classes/class-cpt-wplf-form.php

@@ -184,6 +184,7 @@ function metabox_submission() {
     global $post;
     $postmeta = get_post_meta( $post->ID );
     $fields = array_keys( $postmeta );
+    $home_path = get_home_path();
 ?>
 <p>
   <table class="wp-list-table widefat striped">
@@ -196,9 +197,26 @@ function metabox_submission() {
     <tbody>
       <?php foreach( $fields as $field ) : ?>
         <?php if( '_' != $field[0]  ) : ?>
-        <?php $value = $postmeta[ $field ][0]; ?>
+        <?php
+        $value = $postmeta[ $field ][0];
+        $possible_link = '';
+        $attachment_url = wp_get_attachment_url( $value ); // get_edit_post_link returns something awkward.
+
+        // Maybe add a filter for target="_blank"? Wouldn't enable by default.
+
+        if ( $attachment_url ) {
+          // If this is true, $value was a valid attachment_id.
+          // Caveat: if user enters a numeric value here, it could be interpreted as attachment.
+          $attachment_url = get_edit_post_link($value);
+          $possible_link = "<a href='$attachment_url' style='float: right;'>Edit attachment</a>";
+        } elseif ( file_exists( $home_path . substr( $value, 1 ) ) ) {
+          // This is bit less ambiguous. Check if there's a file, and if there is, get link for it.
+          $attachment_url = get_home_url() . $value;
+          $possible_link = "<a href='$attachment_url' style='float: right;'>Open file</a>";
+        }
+        ?>
         <tr>
-          <th><strong><?php echo $field; ?></strong></th>
+          <th><strong><?php echo $field; ?></strong> <?php echo $possible_link; ?></th>
           <?php if( strlen( $value ) > 60 || strpos( $value, "\n" ) ) : ?>
           <td><textarea style="width:100%" readonly><?php echo esc_textarea( $value ); ?></textarea></td>
           <?php else : ?>

classes/class-cpt-wplf-submission.php

@@ -18,6 +18,8 @@ function wplf_ajax_submit_handler() {
 
   if( $return->ok ) {
     // form existence has already been validated via filters
+
+
     $form = get_post( intval( $_POST['_form_id'] ) );
 
     // the title is the value of whatever the first field was in the form
@@ -52,8 +54,20 @@ function wplf_ajax_submit_handler() {
       }
     }
 
+    // handle files
+    foreach( $_FILES as $key => $file) {
+      // Is this enough security wise?
+      // Currenly only supports 1 file per input
+      $attach_id = media_handle_upload( $key, 0, array(), array( "test_form" => false ) );
+      add_post_meta( $post_id, $key, wp_get_attachment_url($attach_id) );
+      add_post_meta( $post_id, $key . "_attachment", $attach_id );
+    }
+
+
+
     $return->submission_id = $post_id;
     $return->submission_title = $post_title;
+    $return->form_id = $form->ID;
 
     // return the success message for the form
     $return->success = apply_filters( 'the_content', get_post_meta( $form->ID, '_wplf_thank_you', true ) );
@@ -68,4 +82,3 @@ function wplf_ajax_submit_handler() {
   wp_send_json( $return );
   wp_die();
 }
-

inc/wplf-ajax.php

@@ -89,7 +89,23 @@ wp_enqueue_script('wplf-form-js');
 wp_localize_script( 'wplf-form-js', 'ajax_object', array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 ```
 
-### Add your own css classes to the form element
+### Client side callbacks
+
+WP Libre Form supports client side callbacks after form submission using window.wplf object. Example usage:
+
+```
+window.wplf.successCallbacks.push(function(response){
+  alert("You succesfully submitted form " + response.form_id);
+});
+
+window.wplf.errorCallbacks.push(function(response){
+  alert("Form submission failed!");
+});
+```
+
+These callbacks are executed in the order they appear.
+
+### Add CSS classes to form output
 
 You can use the xclass attribute inside the shortcode to add your own extra classes.