Merge branch 'master' into feature/html-template-import

Author: rask

.travis.yml

@@ -14,12 +14,8 @@ before_install:
   # Update Composer
   - composer self-update
 
-  # Install phpcs with wp-coding-standards
-  - composer create-project wp-coding-standards/wpcs:dev-master --no-dev $HOME/wpcs
-
 script:
-  # Check project with phps
-  - ~/wpcs/vendor/bin/phpcs --extensions=php --standard=./phpcs.xml -n -p .
-
-  # Check that composer is valid and installs correctly
   - composer install -o --prefer-dist --no-interaction
+
+  # Check project with phps
+  - ./vendor/bin/phpcs -n -p .

CONTRIBUTING.md

@@ -14,15 +14,17 @@ This project comes with a phpcs configuration (`phpcs.xml`) you can use to check
 Run phpcs in the project root directory:
 
 ```
-phpcs --extensions=php --standard=./phpcs.xml -n -p .
+./vendor/bin/phpcs ./
 ```
 
-Before you can run phpcs, you need to install PHP Codesniffer and WordPress coding standards like so:
+You need to install the plugin's development dependencies before you can run the PHPCS checks. A regular
 
 ```
-composer create-project wp-coding-standards/wpcs:dev-master --no-dev $HOME/wpcs
+composer install
 ```
 
-Or read the official installation instructions here:
+should install all the required packages.
+
+You can read the official WPCS installation instructions here:
 
 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards

README.md

@@ -1,5 +1,5 @@
 # WP Libre Form
-[![Build Status](https://travis-ci.org/anttiviljami/wp-libre-form.svg?branch=master)](https://travis-ci.org/anttiviljami/wp-libre-form) [![Latest Stable Version](https://poser.pugx.org/anttiviljami/wp-libre-form/v/stable)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![Total Downloads](https://poser.pugx.org/anttiviljami/wp-libre-form/downloads)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![Latest Unstable Version](https://poser.pugx.org/anttiviljami/wp-libre-form/v/unstable)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![License](https://poser.pugx.org/anttiviljami/wp-libre-form/license)](https://packagist.org/packages/anttiviljami/wp-libre-form)
+[![Build Status](https://travis-ci.org/libreform/wp-libre-form.svg?branch=master)](https://travis-ci.org/libreform/wp-libre-form) [![Latest Stable Version](https://poser.pugx.org/anttiviljami/wp-libre-form/v/stable)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![Total Downloads](https://poser.pugx.org/anttiviljami/wp-libre-form/downloads)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![Latest Unstable Version](https://poser.pugx.org/anttiviljami/wp-libre-form/v/unstable)](https://packagist.org/packages/anttiviljami/wp-libre-form) [![License](https://poser.pugx.org/anttiviljami/wp-libre-form/license)](https://packagist.org/packages/anttiviljami/wp-libre-form)
 
 Use standard HTML5 markup to create fully functional forms for WordPress
 

classes/class-cpt-wplf-form.php

@@ -726,8 +726,9 @@ function strip_form_tags( $content ) {
    */
   function wplf_form( $id, $content = '', $xclass = '', $attributes = [] ) {
     global $post;
+    $preview = ! empty( $_GET['preview'] ) ? $_GET['preview'] : false;
 
-    if ( 'publish' === get_post_status( $id ) || 'true' === $_GET['preview'] ) {
+    if ( 'publish' === get_post_status( $id ) || $preview ) {
       $form = get_post( $id );
       if ( empty( $content ) ) {
         // you can override the content via parameter

classes/class-cpt-wplf-submission.php

@@ -143,7 +143,7 @@ function form_filter_dropdown() {
     <option
       value="<?php echo intval( $form->ID ); ?>"
       <?php echo isset( $_REQUEST['form'] ) && intval( $_REQUEST['form'] ) === $form->ID ? 'selected' : ''; ?>
-    ><?php esc_html( $form->post_title ); ?></option>
+    ><?php echo esc_html( $form->post_title ); ?></option>
   <?php endforeach; ?>
 </select>
 <?php

composer.json

@@ -12,5 +12,9 @@
   ],
   "require": {
     "php": ">=5.3.0"
+  },
+  "require-dev": {
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+    "wp-coding-standards/wpcs": "0.12.0"
   }
 }

composer.lock

@@ -22,6 +22,7 @@ function wplf_ajax_submit_handler() {
 
     // form-specific validation
     $return->slug = $form->post_name;
+    $return->title = $form->post_title;
     $return = apply_filters( "wplf_{$form->post_name}_validate_submission", $return );
     $return = apply_filters( "wplf_{$form->ID}_validate_submission", $return );
   }

inc/wplf-ajax.php

@@ -2,11 +2,15 @@
 <ruleset name="anttiviljami-wordpress">
   <description>For nicer WordPress and PHP development</description>
 
-  <!-- Don't check composer dependencies -->
-  <exclude-pattern>/vendor/</exclude-pattern>
-
-  <!-- Exclude language files -->
-  <exclude-pattern>/lang/</exclude-pattern>
+  <!-- Files and directories to parse -->
+  <file>./classes/</file>
+  <file>./inc/</file>
+  <file>./wp-libre-form.php</file>
+
+  <!-- Excluded directories and files -->
+  <exclude-pattern>*/vendor/*</exclude-pattern>
+  <exclude-pattern>*/lang/*</exclude-pattern>
+  <exclude-pattern>*/assets/*</exclude-pattern>
 
   <!-- Disallow tabs altogether -->
   <rule ref="Generic.WhiteSpace.DisallowTabIndent.TabsUsed"/>

phpcs.xml

@@ -36,7 +36,7 @@ Required field validation, email notifications, file uploads to WP gallery and l
 
 Please contribute to this project on Github. Pull requests welcome!
 
-https://github.com/anttiviljami/wp-libre-form
+[https://github.com/anttiviljami/wp-libre-form](https://github.com/anttiviljami/wp-libre-form)
 
 == Installation ==