Changeset 1522463

Timestamp:

10/26/2016 12:43:19 PM (9 years ago)

Author:

Zuige

Message:

Tagging 1.1.2

Location:

wp-libre-form

Files:

• tags/1.1.1 (copied) (copied from wp-libre-form/trunk)
• tags/1.1.1/classes/class-cpt-wplf-submission.php (modified) (1 diff)
• tags/1.1.2 (copied) (copied from wp-libre-form/trunk)
• tags/1.1.2/classes/class-cpt-wplf-submission.php (modified) (1 diff)
• tags/1.1.2/inc/wplf-form-validation.php (modified) (2 diffs)
• tags/1.1.2/readme.txt (modified) (1 diff)
• tags/1.1.2/wp-libre-form.php (modified) (2 diffs)
• trunk/classes/class-cpt-wplf-submission.php (modified) (1 diff)
• trunk/inc/wplf-form-validation.php (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/wp-libre-form.php (modified) (2 diffs)

wp-libre-form/tags/1.1.1/classes/class-cpt-wplf-submission.php

@@ -207 +207 @@
         $attachment_suffix = '_attachment';
         if ( substr( $field, -strlen( $attachment_suffix ) ) === $attachment_suffix && wp_get_attachment_url( $value ) ) {
-          $link_text = __( 'View Attachment' );
+          $link_text = __( 'View Attachment', 'wp-libre-form' );
           $possible_link = '<a target="_blank" href="' . get_edit_post_link( $value ) . '" style="float:right">' . $link_text . '</a>';
         }

wp-libre-form/tags/1.1.2/classes/class-cpt-wplf-submission.php

@@ -207 +207 @@
         $attachment_suffix = '_attachment';
         if ( substr( $field, -strlen( $attachment_suffix ) ) === $attachment_suffix && wp_get_attachment_url( $value ) ) {
-          $link_text = __( 'View Attachment' );
+          $link_text = __( 'View Attachment', 'wp-libre-form' );
           $possible_link = '<a target="_blank" href="' . get_edit_post_link( $value ) . '" style="float:right">' . $link_text . '</a>';
         }

wp-libre-form/tags/1.1.2/inc/wplf-form-validation.php

@@ -31 +31 @@
   // get required fields from form
   $required = explode( ',', get_post_meta( $_POST['_form_id'], '_wplf_required', true ) );
+
+  // make sure required form fields are submitted within $_POST or $_FILES arrays
   $fields_empty = array();
   foreach( $required as $key ) {
-    if( ! array_key_exists( $key, $_POST ) || empty( $_POST[$key] ) ) {
+    if(
+      ( !array_key_exists( $key, $_POST ) && !array_key_exists( $key, $_FILES ) ) ||
+      ( empty( $_POST[$key] ) && ! ( $_FILES[$key]['size'] > 0 ) )
+    ) {
+      // required field wasn't in $_POST or $_FILES
+      // we also don't accept files that are 0 bytes long
       $fields_empty[] = $key;
     }
@@ -39 +46 @@
   $fields_empty = array_filter( $fields_empty ); // get rid of the empty keys
 
-  if( ! empty( $fields_empty ) ) {
+  $return->debug = $_FILES;
+
+  if(! empty( $fields_empty ) ) {
     $return->ok = 0;
     $return->error = __('Required fields are missing.', 'wp-libre-form');

wp-libre-form/tags/1.1.2/readme.txt

@@ -5 +5 @@
 Requires at least: 4.2
 Tested up to: 4.6.1
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html

wp-libre-form/tags/1.1.2/wp-libre-form.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/anttiviljami/wp-libre-form
  * Description: A minimal HTML form builder for WordPress; made for developers
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: @anttiviljami
  * Author URI: https://github.com/anttiviljami/
@@ -32 +32 @@
 if ( ! class_exists( 'WP_Libre_Form' ) ) :
 
-define( 'WPLF_VERSION', '1.1.1' );
+define( 'WPLF_VERSION', '1.1.2' );
 
 class WP_Libre_Form {

wp-libre-form/trunk/classes/class-cpt-wplf-submission.php

@@ -207 +207 @@
         $attachment_suffix = '_attachment';
         if ( substr( $field, -strlen( $attachment_suffix ) ) === $attachment_suffix && wp_get_attachment_url( $value ) ) {
-          $link_text = __( 'View Attachment' );
+          $link_text = __( 'View Attachment', 'wp-libre-form' );
           $possible_link = '<a target="_blank" href="' . get_edit_post_link( $value ) . '" style="float:right">' . $link_text . '</a>';
         }

wp-libre-form/trunk/inc/wplf-form-validation.php

@@ -31 +31 @@
   // get required fields from form
   $required = explode( ',', get_post_meta( $_POST['_form_id'], '_wplf_required', true ) );
+
+  // make sure required form fields are submitted within $_POST or $_FILES arrays
   $fields_empty = array();
   foreach( $required as $key ) {
-    if( ! array_key_exists( $key, $_POST ) || empty( $_POST[$key] ) ) {
+    if(
+      ( !array_key_exists( $key, $_POST ) && !array_key_exists( $key, $_FILES ) ) ||
+      ( empty( $_POST[$key] ) && ! ( $_FILES[$key]['size'] > 0 ) )
+    ) {
+      // required field wasn't in $_POST or $_FILES
+      // we also don't accept files that are 0 bytes long
       $fields_empty[] = $key;
     }
@@ -39 +46 @@
   $fields_empty = array_filter( $fields_empty ); // get rid of the empty keys
 
-  if( ! empty( $fields_empty ) ) {
+  $return->debug = $_FILES;
+
+  if(! empty( $fields_empty ) ) {
     $return->ok = 0;
     $return->error = __('Required fields are missing.', 'wp-libre-form');

wp-libre-form/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.2
 Tested up to: 4.6.1
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html

wp-libre-form/trunk/wp-libre-form.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/anttiviljami/wp-libre-form
  * Description: A minimal HTML form builder for WordPress; made for developers
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: @anttiviljami
  * Author URI: https://github.com/anttiviljami/
@@ -32 +32 @@
 if ( ! class_exists( 'WP_Libre_Form' ) ) :
 
-define( 'WPLF_VERSION', '1.1.1' );
+define( 'WPLF_VERSION', '1.1.2' );
 
 class WP_Libre_Form {