Optional media files (#103)

* Files upload into current upload folder
* Added removal of uploads, in case they were not added to library conventionally
* Made 'add files to library' on by default, so to keep functionality consistent after update

Author: hencca

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 /vendor/
 !/lang/.gitkeep
+/uploads/

classes/class-cpt-wplf-form.php

@@ -56,6 +56,9 @@ public function __construct() {
     // Removing wpautop isn't enough if form is used inside a ACF field or so.
     // Fitting the output to one line prevents <br> tags from appearing.
     add_filter( 'wplf_form', array( $this, 'minify_html' ) );
+
+    // before delete, remove the possible uploads
+    add_action( 'before_delete_post', array( $this, 'clean_up_entry' ) );
   }
 
   public static function register_cpt() {
@@ -127,10 +130,30 @@ public function disable_tinymce( $default ) {
     if ( 'wplf-form' === get_post_type( $post ) ) {
       return false;
     }
-
     return $default;
   }
 
+  /**
+   * Berore permanently deleting form entry, remove attachments
+   * in the case they were not added to media library
+   */
+  public function clean_up_entry( $id ) {
+      $type = get_post_type( $id );
+      if ( 'wplf-submission' === $type ) {
+        $postmeta = get_post_meta( $id );
+
+        foreach ( $postmeta as $key => $meta ) {
+            $m = $meta[0];
+              if ( strpos( $key, 'attachment' ) !== false ) {
+                  $path = str_replace( WP_HOME . '/', get_home_path(), $m );
+                  unlink( $path );
+
+              }
+          }
+      }
+
+  }
+
   /**
    * Include custom JS and CSS on the edit screen
    */
@@ -274,6 +297,15 @@ public function add_meta_boxes_cpt() {
       'high'
     );
 
+    // Media library meta box
+    add_meta_box(
+      'wplf-media',
+      __( 'Files', 'wp-libre-form' ),
+      array( $this, 'metabox_media_library' ),
+      'wplf-form',
+      'side'
+    );
+
     // Form Fields meta box
     add_meta_box(
       'wplf-fields',
@@ -320,7 +352,8 @@ function metabox_thank_you( $post ) {
     // get post meta
     $meta = get_post_meta( $post->ID );
     $message = isset( $meta['_wplf_thank_you'] ) ?
-      $meta['_wplf_thank_you'][0] : _x( 'Success!', 'Default success message', 'wp-libre-form' );
+      $meta['_wplf_thank_you'][0]
+      : _x( 'Success!', 'Default success message', 'wp-libre-form' );
 ?>
 <p>
 <?php wp_editor( esc_textarea( $message ), 'wplf_thank_you', array(
@@ -329,12 +362,28 @@ function metabox_thank_you( $post ) {
   'textarea_name' => 'wplf_thank_you',
   'textarea_rows' => 6,
   'teeny' => true,
-  )); ?>
+  ) ); ?>
 </p>
 <?php
     wp_nonce_field( 'wplf_form_meta', 'wplf_form_meta_nonce' );
   }
 
+  /**
+   * Meta box callback for should files end up in media library
+   */
+  public function metabox_media_library( $post ) {
+      $meta    = get_post_meta( $post->ID );
+      $checked = 'checked';
+
+      if ( isset( $meta['_wplf_media_library'] ) && empty( $meta['_wplf_media_library'][0] ) ) {
+          $checked = '';
+      }
+
+      echo "<input type='checkbox' " . esc_html( $checked ) . " name='wplf_media_library'>" ;
+      ?>
+      <label><?php esc_attr_e( 'Add files to media library', 'wp-libre-form' ); ?></label>
+      <?php
+  }
 
   /**
    * Meta box callback for form fields meta box
@@ -585,10 +634,12 @@ protected function maybe_persist_override_template( $template, $form_id, $force
     // Safe-guard to prevent accidental infinite loops.
     remove_action( 'save_post', array( $this, 'save_cpt' ) );
 
-    $updated = wp_update_post( array(
+    $updated = wp_update_post(
+         array(
       'ID' => (int) $form_id,
       'post_content' => $template,
-    ) );
+    )
+        );
 
     add_action( 'save_post', array( $this, 'save_cpt' ) );
 
@@ -619,6 +670,13 @@ public function save_cpt( $post_id ) {
       return;
     }
 
+    // save media checkbox
+    if ( isset( $_POST['wplf_media_library'] ) ) {
+      update_post_meta( $post_id, '_wplf_media_library', $_POST['wplf_media_library'] );
+    } else {
+      update_post_meta( $post_id, '_wplf_media_library', '' );
+      }
+
     // save success message
     if ( isset( $_POST['wplf_thank_you'] ) ) {
       $success = wp_kses_post( $_POST['wplf_thank_you'] );
@@ -815,7 +873,7 @@ public function maybe_enqueue_frontend_script() {
     );
 
     // add dynamic variables to the script's scope
-    wp_localize_script( 'wplf-form-js', 'ajax_object', apply_filters( 'wplf_ajax_object', array(
+    wp_localize_script('wplf-form-js', 'ajax_object', apply_filters( 'wplf_ajax_object', array(
       'ajax_url' => admin_url( 'admin-ajax.php' ),
       'ajax_credentials' => apply_filters( 'wplf_ajax_fetch_credentials_mode', 'same-origin' ),
       'wplf_assets_dir' => plugin_dir_url( realpath( __DIR__ . '/../wp-libre-form.php' ) ) . 'assets',

classes/class-cpt-wplf-submission.php

@@ -34,8 +34,7 @@ public function __construct() {
     // add custom bulk actions
     add_action( 'admin_notices', array( $this, 'wplf_submission_bulk_action_admin_notice' ) );
     add_filter( 'bulk_actions-edit-wplf-submission', array( $this, 'register_wplf_submission_bulk_actions' ) );
-    add_filter( 'handle_bulk_actions-edit-wplf-submission',
-      array( $this, 'wplf_submission_bulk_action_handler' ), 10, 3 );
+    add_filter( 'handle_bulk_actions-edit-wplf-submission', array( $this, 'wplf_submission_bulk_action_handler' ), 10, 3 );
   }
 
   public static function register_cpt() {
@@ -199,14 +198,16 @@ public function wplf_submission_bulk_action_admin_notice() {
         '<div id="wplf-submission-bulk-resend-message" class="notice notice-success"><p>' .
           esc_html(
              // translators: %s is number of submissions
-             _n( 'Resent email copy of %s submission.',
-                 'Resent email copy of %s submissions.',
-                 $count,
+            _n(
+              'Resent email copy of %s submission.',
+              'Resent email copy of %s submissions.',
+              $count,
              'wp-libre-form'
-             )
+            )
           ) .
           '</p></div>',
-        intval( $count ) );
+        intval( $count )
+      );
     }
   }
 

inc/wplf-ajax.php

@@ -6,6 +6,7 @@
 add_action( 'wp_ajax_wplf_submit', 'wplf_ajax_submit_handler' );
 add_action( 'wp_ajax_nopriv_wplf_submit', 'wplf_ajax_submit_handler' );
 function wplf_ajax_submit_handler() {
+
   $return = new stdClass();
   $return->ok = 1;
 
@@ -48,7 +49,7 @@ function wplf_ajax_submit_handler() {
       'post_title'     => $post_title,
       'post_status'    => 'publish',
       'post_type'      => 'wplf-submission',
-    ));
+    ) );
 
     // add submission data as meta values
     foreach ( $_POST as $key => $value ) {
@@ -60,16 +61,27 @@ function wplf_ajax_submit_handler() {
     }
 
     // handle files
+    $uploads_path = wp_upload_dir();
+    $should_store_images_in_medialibrary = get_post_meta( $form->ID, '_wplf_media_library', true );
+    $counter = 0;
     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,
-      ) );
+      if ( $should_store_images_in_medialibrary ) {
+        $attach_id = media_handle_upload( $key, 0, array(), array(
+          'test_form' => false,
+        ) );
+
+        if ( ! is_wp_error( $attach_id ) ) {
+          add_post_meta( $post_id, $key, wp_get_attachment_url( $attach_id ) );
+          add_post_meta( $post_id, $key . '_attachment', $attach_id );
+        }
+      } else {
+          $name = 'lf_' . date( 'ymdhs' ) . '-' . $counter . '-' . sanitize_file_name( $file['name'] );
 
-      if ( ! is_wp_error( $attach_id ) ) {
-        add_post_meta( $post_id, $key, wp_get_attachment_url( $attach_id ) );
-        add_post_meta( $post_id, $key . '_attachment', $attach_id );
+          move_uploaded_file( $file['tmp_name'], $uploads_path['path'] . '/' . $name );
+          add_post_meta( $post_id, $key . '_attachment', $uploads_path['url'] . '/' . $name );
+          $counter++;
       }
     }
 

inc/wplf-form-actions.php

@@ -119,10 +119,14 @@ function wplf_email_copy_replace_tags( $content, $form = null, $submission_id =
 
   $defaults_store = array(
     'submission-id' => $submission_id,
-    'referrer'      => esc_url_raw( ( null !== $submission_id ) ? get_post_meta( $submission_id, 'referrer', true ) : $_POST['referrer'] ),
+    'referrer'      => esc_url_raw( ( null !== $submission_id )
+      ? get_post_meta( $submission_id, 'referrer', true )
+      : $_POST['referrer'] ),
     'form-title'    => esc_html( get_the_title( $form ) ),
     'form-id'       => $form->ID,
-    'user-id'       => ( null !== get_current_user_id() ) ? wp_get_current_user()->display_name . ' (ID ' . get_current_user_id() . ')' : __( 'No user logged in', 'wp-libre-form' ),
+    'user-id'       => ( null !== get_current_user_id() )
+      ? wp_get_current_user()->display_name . ' (ID ' . get_current_user_id() . ')'
+      : __( 'No user logged in', 'wp-libre-form' ),
     'timestamp'     => current_time( 'mysql' ),
     'datetime'      => current_time( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ),
     'language'      => ( function_exists( 'pll_current_language' ) ) ? pll_current_language( 'locale' ) : get_locale(),
@@ -141,7 +145,7 @@ function wplf_email_copy_replace_tags( $content, $form = null, $submission_id =
 
     if ( isset( $fields[ $string ] ) ) {
       $value = $fields[ $string ][0];
-    } else if ( isset( $defaults_store[ $string ] ) ) {
+    } elseif ( isset( $defaults_store[ $string ] ) ) {
       $value = $defaults_store[ $string ];
     }
 

lang/wp-libre-form-fi.mo

@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WP Libre Form\n"
 "POT-Creation-Date: 2017-10-25 12:40+0300\n"
-"PO-Revision-Date: 2017-10-25 12:46+0300\n"
+"PO-Revision-Date: 2018-03-14 09:47+0200\n"
 "Last-Translator: Timi Wahalahti <timi@dude.fi>\n"
 "Language-Team: Antti Kuosmanen <antti@seravo.fi>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-WPHeader: wp-libre-form.php\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -138,6 +138,10 @@ msgstr "Onnistumisviesti"
 msgid "Form Fields Detected"
 msgstr "Lomakekentät"
 
+#: classes/class-cpt-wplf-form.php:279
+msgid "Files"
+msgstr "Tiedostot"
+
 #: classes/class-cpt-wplf-form.php:283
 msgid "Emails"
 msgstr "Sähköpostit"
@@ -155,6 +159,10 @@ msgstr "Kiitos!"
 msgid "Fields marked with * are required"
 msgstr "Tähdelliset * kentät on pakollisia"
 
+#: classes/class-cpt-wplf-form.php:355
+msgid "Add files to media library"
+msgstr "Lisää tiedostoja mediakirjastoon"
+
 #: classes/class-cpt-wplf-form.php:374
 msgid "Send an email copy when a form is submitted?"
 msgstr "Lähetä kopio sähköpostiin kun lomake lähetetään?"

lang/wp-libre-form-fi.po

@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin name: WP Libre Form
- * Plugin URI: https://github.com/anttiviljami/wp-libre-form
+ * Plugin URI: https://github.com/hencca/wp-libre-form
  * Description: A minimal HTML form builder for WordPress; made for developers
  * Version: 1.4.3
  * Author: @anttiviljami
@@ -29,6 +29,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
 if ( ! class_exists( 'WP_Libre_Form' ) ) :
 
 define( 'WPLF_VERSION', '1.4.3' );