Timiwahalahti feature archive referrer (#149)

* Add a bit different referrer fields if form is in archive
* Do not keep _referrer_archive_title as a additional field if posted from archive
* beautiful $current_url when permalink structure is not basic and correct if is
* fix phpcs

Author: timiwahalahti

classes/class-cpt-wplf-form.php

@@ -947,9 +947,20 @@ class="libre-form libre-form-<?php echo esc_attr( $id . ' ' . $xclass ); ?>"
     // @codingStandardsIgnoreStart
     echo $content;
     // @codingStandardsIgnoreEnd
-  ?>
-  <input type="hidden" name="referrer" value="<?php the_permalink(); ?>">
-  <input type="hidden" name="_referrer_id" value="<?php echo esc_attr( get_the_id() ); ?>">
+
+  if ( is_archive() ) :
+    global $wp;
+    $current_url = home_url( $wp->request );
+    if ( empty( get_option( 'permalink_structure' ) ) ) {
+      $current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
+    } ?>
+    <input type="hidden" name="referrer" value="<?php echo esc_attr( $current_url ); ?>">
+    <input type="hidden" name="_referrer_id" value="archive">
+    <input type="hidden" name="_referrer_archive_title" value="<?php echo esc_attr( get_the_archive_title() ); ?>">
+  <?php else : ?>
+    <input type="hidden" name="referrer" value="<?php the_permalink(); ?>">
+    <input type="hidden" name="_referrer_id" value="<?php echo esc_attr( get_the_id() ); ?>">
+  <?php endif; ?>
   <input type="hidden" name="_form_id" value="<?php echo esc_attr( $id ); ?>">
 </form>
 <?php

inc/wplf-form-validation.php

@@ -114,6 +114,11 @@ function wplf_validate_additional_fields( $return ) {
   }
   $additional_fields = array_filter( $additional_fields ); // get rid of the empty keys
 
+  // support archive referrer, do not keep field _referrer_archive_title as a additional field
+  if ( 'archive' === $all_fields['_referrer_id'] && array_key_exists( '_refererr_archive_title', $additional_fields ) ) {
+    unset( $additional_fields['_referrer_archive_title'] );
+  }
+
   if ( ! empty( $additional_fields ) ) {
     $return->ok = 0;
     $return->error = __( 'Additional fields are present.', 'wp-libre-form' );