Merge pull request #13 from k1sul1/master

File upload features

Author: Antti Kuosmanen

assets/scripts/wplf-form.js

@@ -384,7 +384,25 @@ function save_cpt( $post_id ) {
 
     // save email copy
     if ( isset( $_POST['wplf_email_copy_to'] ) ) {
-      update_post_meta( $post_id, '_wplf_email_copy_to', sanitize_email( $_POST['wplf_email_copy_to'] ) );
+      $emailField = $_POST['wplf_email_copy_to'];
+      $to = '';
+
+      if( strpos( $emailField, "," ) > 0 ) {
+        // Intentional. Makes no sense if the first character is a comma, so pass it along as a single address.
+        // sanitize_email() should take care of the rest.
+        $emailArray = explode( ",", $emailField );
+        foreach($emailArray as $email){
+          $email = trim($email);
+          $email = sanitize_email( trim( $email ) ) . ", ";
+          $to .= $email;
+        }
+        $to = rtrim( $to, ", " );
+      }
+      else {
+        $to = sanitize_email( $emailField );
+      }
+
+      update_post_meta( $post_id, '_wplf_email_copy_to', $to );
     }
 
     // save title format

classes/class-cpt-wplf-form.php

@@ -106,15 +106,29 @@ function custom_columns_cpt( $columns ) {
   function form_filter_dropdown() {
     global $pagenow;
 
-    if( 'edit.php' != $pagenow ) {
+    $allowed = array("wplf-submission"); // show filter on these post types (currently only one?)
+    $allowed = apply_filters("wplf-dropdown-filter", $allowed);
+    $post_type = get_query_var("post_type");
+
+    if( 'edit.php' != $pagenow || !in_array($post_type, $allowed)) {
       return;
     }
 
-    // TODO: put this in a transient
-    $forms = get_posts( array(
-      'post_per_page' => '-1',
-      'post_type' => 'wplf-form',
-    ) );
+    $transient = get_transient("wplf-form-filter");
+
+    if($transient){
+      $forms = $transient;
+    }
+
+    else{
+      $forms = get_posts( array(
+        'post_per_page' => '-1',
+        'post_type' => 'wplf-form',
+      ) );
+
+      set_transient("wplf-form-filter", $forms, 15 *  MINUTE_IN_SECONDS);
+    }
+
 ?>
 <label for="filter-by-form" class="screen-reader-text">Filter by form</label>
 <select name="form" id="filter-by-form">
@@ -170,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">
@@ -182,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 : ?>
@@ -201,4 +233,3 @@ function metabox_submission() {
 }
 
 endif;
-

classes/class-cpt-wplf-submission.php

@@ -59,13 +59,15 @@ function wplf_ajax_submit_handler() {
       // 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, $attach_id);
+      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 ) );

inc/wplf-ajax.php

@@ -89,6 +89,22 @@ wp_enqueue_script('wplf-form-js');
 wp_localize_script( 'wplf-form-js', 'ajax_object', array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 ```
 
+### 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 own css classes to form output
 
 You can use the attribute xclass inside the shortcode to set own extra css classes.