Fix #161

inc2734 · Jan 19, 2024 · c8c55d2 · c8c55d2
1 parent 70dacbf
commit c8c55d2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/App/Model/Meta.php b/App/Model/Meta.php
@@ -34,6 +34,11 @@ class Meta {
 	 */
 	protected static $method;
 
+	/**
+	 * @var WP_User
+	 */
+	protected static $sender;
+
 	/**
 	 * Constructor.
 	 *
@@ -133,7 +138,7 @@ public static function the_meta_button( $action, $label ) {
 	}
 
 	/**
-	 * Return set form ID.
+	 * Return form ID.
 	 *
 	 * @return int
 	 */
@@ -167,7 +172,7 @@ public static function the_token() {
 	}
 
 	/**
-	 * Return set method.
+	 * Return method.
 	 *
 	 * @return string
 	 */
@@ -194,4 +199,13 @@ public static function set_method( $value ) {
 	public static function the_method( $value ) {
 		static::_the_meta( 'method', $value );
 	}
+
+	/**
+	 * Return sender.
+	 *
+	 * @return WP_User
+	 */
+	public static function get_sender() {
+		return static::$sender;
+	}
 }
diff --git a/App/Model/Responser.php b/App/Model/Responser.php
@@ -7,6 +7,8 @@
 
 namespace Snow_Monkey\Plugin\Forms\App\Model;
 
+use Snow_Monkey\Plugin\Forms\App\Model\Meta;
+
 class Responser {
 
 	/**
@@ -89,4 +91,13 @@ public function get_all() {
 	public function update( $name, $value ) {
 		$this->data[ $name ] = $value;
 	}
+
+	/**
+	 * Return form meta data.
+	 *
+	 * @return Snow_Monkey\Plugin\Forms\App\Model\Meta|null
+	 */
+	public function get_meta() {
+		return $this->get( Meta::get_key() ) ? $this->get( Meta::get_key() ) : null;
+	}
 }
diff --git a/App/Rest/Route/View.php b/App/Rest/Route/View.php
@@ -44,8 +44,7 @@ class View {
 	public function __construct( array $data ) {
 		// Set form meta data and remove from post data.
 		if ( isset( $data[ Meta::get_key() ] ) ) {
-			Meta::init( $data[ Meta::get_key() ] );
-			unset( $data[ Meta::get_key() ] );
+			$data[ Meta::get_key() ] = Meta::init( $data[ Meta::get_key() ] );
 		}
 
 		$this->setting   = DataStore::get( Meta::get_formid() );

diff --git a/snow-monkey-forms.php b/snow-monkey-forms.php
@@ -18,6 +18,7 @@
 
 use Snow_Monkey\Plugin\Forms\App\Model\Csrf;
 use Snow_Monkey\Plugin\Forms\App\Model\Directory;
+use Snow_Monkey\Plugin\Forms\App\Model\Meta;
 use Snow_Monkey\Plugin\Forms\App\Rest;
 use Snow_Monkey\Plugin\Forms\App\Service\Admin\Admin;
 use Snow_Monkey\Plugin\Forms\App\Service\ReCaptcha\ReCaptcha;
@@ -164,12 +165,14 @@ public function _enqueue_block_editor_assets() {
 	 * Register endpoint. This endpoint returns the form view.
 	 */
 	public function _endpoint() {
+		$user = wp_get_current_user();
+
 		register_rest_route(
 			'snow-monkey-form/v1',
 			'/view',
 			array(
 				'methods'             => 'POST',
-				'callback'            => function() {
+				'callback'            => function() use ( $user ) {
 					$referer = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : false;
 					$homeurl = untrailingslashit( home_url( '/' ) );
 					if ( 0 !== strpos( $referer, $homeurl ) ) {
@@ -179,6 +182,10 @@ public function _endpoint() {
 					$data = filter_input_array( INPUT_POST );
 					$data = $data ? $data : array();
 
+					if ( isset( $data[ Meta::get_key() ] ) ) {
+						$data[ Meta::get_key() ]['sender'] = $user;
+					}
+
 					$route = new Rest\Route\View( $data );
 					return $route->send();
 				},