From 797143ef266062b087e9934540e36b5b93b5a2cb Mon Sep 17 00:00:00 2001
From: Moutushi <mmandal@trewknowledge.com>
Date: Thu, 4 Jun 2020 16:32:07 -0400
Subject: [PATCH 1/3] Admin email added as reply email

---
 includes/class-gdpr-email.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/class-gdpr-email.php b/includes/class-gdpr-email.php
index 066555c0..c5488212 100644
--- a/includes/class-gdpr-email.php
+++ b/includes/class-gdpr-email.php
@@ -50,7 +50,9 @@ private static function get_do_not_reply_address() {
 			$sitename = substr( $sitename, 4 );
 		}
 
-		return apply_filters( 'gdpr_do_not_reply_address', 'noreply@' . $sitename );
+		$reply_email = get_option( 'admin_email', 'noreply@' . $sitename );
+
+		return apply_filters( 'gdpr_do_not_reply_address', $reply_email );
 	}
 
 	/**

From da891568feaf7a94dd77a9253ddba6d2795590ba Mon Sep 17 00:00:00 2001
From: Moutushi <mmandal@trewknowledge.com>
Date: Tue, 23 Jun 2020 14:42:50 -0400
Subject: [PATCH 2/3] Moved privacy policy popup to header

---
 includes/class-gdpr.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/class-gdpr.php b/includes/class-gdpr.php
index a19d2ca5..5e0fb475 100755
--- a/includes/class-gdpr.php
+++ b/includes/class-gdpr.php
@@ -254,11 +254,11 @@ private function define_public_hooks() {
 		add_action( 'wp_enqueue_scripts', array( $plugin_public, 'enqueue_styles' ) );
 		add_action( 'wp_enqueue_scripts', array( $plugin_public, 'enqueue_scripts' ) );
 		add_action( 'init', array( $plugin_public, 'set_plugin_cookies' ) );
-		add_action( 'wp_footer', array( $plugin_public, 'overlay' ) );
-		add_action( 'wp_footer', array( $plugin_public, 'privacy_bar' ) );
-		add_action( 'wp_footer', array( $plugin_public, 'is_consent_needed' ) );
-		add_action( 'wp_footer', array( $plugin_public, 'privacy_preferences_modal' ) );
-		add_action( 'wp_footer', array( $plugin_public, 'confirmation_screens' ) );
+		add_action( 'wp_head', array( $plugin_public, 'overlay' ) );
+		add_action( 'wp_head', array( $plugin_public, 'privacy_bar' ) );
+		add_action( 'wp_head', array( $plugin_public, 'is_consent_needed' ) );
+		add_action( 'wp_head', array( $plugin_public, 'privacy_preferences_modal' ) );
+		add_action( 'wp_head', array( $plugin_public, 'confirmation_screens' ) );
 		add_action( 'wp_ajax_disagree_with_terms', array( $plugin_public, 'logout' ) );
 		add_action( 'wp_ajax_agree_with_terms', array( $plugin_public, 'agree_with_terms' ) );
 		add_action( 'wp_ajax_gdpr_update_privacy_preferences', array( $plugin_public, 'update_privacy_preferences' ) );

From de70a012eb8b62d3201d194fc867897b83417260 Mon Sep 17 00:00:00 2001
From: Moutushi <mmandal@trewknowledge.com>
Date: Tue, 23 Jun 2020 15:03:09 -0400
Subject: [PATCH 3/3] Added dynamic no-reply email

---
 admin/class-gdpr-admin.php    |  1 +
 admin/partials/settings.php   | 19 +++++++++++++++++++
 includes/class-gdpr-email.php |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/admin/class-gdpr-admin.php b/admin/class-gdpr-admin.php
index 87011773..c5d571c8 100755
--- a/admin/class-gdpr-admin.php
+++ b/admin/class-gdpr-admin.php
@@ -201,6 +201,7 @@ public function register_settings() {
 			'gdpr_display_cookie_categories_in_bar'    => 'boolval',
 			'gdpr_hide_from_bots'                      => 'boolval',
 			'gdpr_reconsent_template'                  => 'sanitize_text_field',
+			'gdpr_no_reply_email'                      => 'sanitize_text_field',
 		);
 		foreach ( $settings as $option_name => $sanitize_callback ) {
 			register_setting( 'gdpr', $option_name, array( 'sanitize_callback' => $sanitize_callback ) );
diff --git a/admin/partials/settings.php b/admin/partials/settings.php
index 38247013..1eac5c6a 100755
--- a/admin/partials/settings.php
+++ b/admin/partials/settings.php
@@ -9,6 +9,25 @@
 
 		<table class="form-table">
 			<tbody>
+				<tr>
+					<th scope="row">
+						<label for="gdpr_no_reply_email"><?php esc_html_e( 'No-Reply email', 'gdpr' ); ?>:</label>
+						<span class="screen-reader-text"><?php esc_attr_e( 'This is the do not reply email address.', 'gdpr' ); ?></span>
+						<span data-gdprtooltip="<?php esc_attr_e( 'This is the do not reply email address.', 'gdpr' ); ?>">
+							<span class="dashicons dashicons-info"></span>
+						</span>
+					</th>
+					<td>
+						<?php 
+							$sitename = isset( $_SERVER['SERVER_NAME'] ) ? strtolower( sanitize_text_field( wp_unslash( $_SERVER['SERVER_NAME'] ) ) ) : ''; // WPCS: input var ok.
+							if ( substr( $sitename, 0, 4 ) === 'www.' ) {
+								$sitename = substr( $sitename, 4 );
+							}
+							$no_reply_email = get_option( 'gdpr_no_reply_email', 'noreply@' . $sitename ); 
+						?>
+						<input type="text" name="gdpr_no_reply_email" id="gdpr_no_reply_email" value="<?php echo esc_attr( $no_reply_email ); ?>">
+					</td>
+				</tr>
 				<tr>
 					<th scope="row">
 						<label for="gdpr_email_limit"><?php esc_html_e( 'Outgoing email limit', 'gdpr' ); ?>:</label>
diff --git a/includes/class-gdpr-email.php b/includes/class-gdpr-email.php
index c5488212..a3c2ded1 100644
--- a/includes/class-gdpr-email.php
+++ b/includes/class-gdpr-email.php
@@ -50,7 +50,7 @@ private static function get_do_not_reply_address() {
 			$sitename = substr( $sitename, 4 );
 		}
 
-		$reply_email = get_option( 'admin_email', 'noreply@' . $sitename );
+		$reply_email = get_option( 'gdpr_no_reply_email', 'noreply@' . $sitename );
 
 		return apply_filters( 'gdpr_do_not_reply_address', $reply_email );
 	}