← All changes | classes/models/fields/FrmFieldUserID.php +23 -38 6.27 → 5.4 View file →

		@@ -9,9 +9,8 @@
9	9	class FrmFieldUserID extends FrmFieldType {
10	10
11	11	/**
12	12	* @var string
13		- *
14	13	* @since 3.0
15	14	*/
16	15	protected $type = 'user_id';
17	16
		@@ -16,9 +15,8 @@
16	15	protected $type = 'user_id';
17	16
18	17	/**
19	18	* @var bool
20		- *
21	19	* @since 3.0
22	20	*/
23	21	protected $has_input = false;
24	22
		@@ -23,9 +21,8 @@
23	21	protected $has_input = false;
24	22
25	23	/**
26	24	* @var bool
27		- *
28	25	* @since 3.0
29	26	*/
30	27	protected $has_html = false;
31	28
		@@ -30,19 +27,13 @@
30	27	protected $has_html = false;
31	28
32	29	/**
33	30	* @var bool
34		- *
35	31	* @since 3.0
36	32	*/
37	33	protected $holds_email_values = true;
38	34
39	35	/**
40		- * @var bool
41		- */
42		- protected $array_allowed = false;
43		-
44		- /**
45	36	* @return string
46	37	*/
47	38	protected function include_form_builder_file() {
48	39	return FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/field-user-id.php';
		@@ -51,40 +42,35 @@
51	42	public function prepare_field_html( $args ) {
52	43	$args = $this->fill_display_field_values( $args );
53	44	$value = $this->get_field_value( $args );
54	45
55		- echo '<input type="hidden" name="' . esc_attr( $args['field_name'] ) . '" id="' . esc_attr( $args['html_id'] ) . '" value="' . esc_attr( $value ) . '" data-frmval="' . esc_attr( $value ) . '"/>' . "\n"; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	46	+ echo '<input type="hidden" name="' . esc_attr( $args['field_name'] ) . '" id="' . esc_attr( $args['html_id'] ) . '" value="' . esc_attr( $value ) . '" data-frmval="' . esc_attr( $value ) . '"/>' . "\n";
56	47	}
57	48
58	49	/**
59	50	* @since 4.03.06
60		- *
61		- * @param array $args Field display arguments.
62		- *
63		- * @return int|string
64	51	*/
65	52	protected function get_field_value( $args ) {
66	53	$user_ID = get_current_user_id();
67		- $user_ID = $user_ID ? $user_ID : '';
68		- $posted_value = FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][ $this->field['id'] ] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
69		- $action = $args['action'] ?? $args['form_action'] ?? '';
70		- $updating = $action === 'update';
71		- return is_numeric( $this->field['value'] ) || $posted_value || $updating ? $this->field['value'] : $user_ID;
	54	+ $user_ID = ( $user_ID ? $user_ID : '' );
	55	+ $posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][ $this->field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	56	+ $action = ( isset( $args['action'] ) ? $args['action'] : ( isset( $args['form_action'] ) ? $args['form_action'] : '' ) );
	57	+ $updating = $action == 'update';
	58	+ return ( is_numeric( $this->field['value'] ) || $posted_value || $updating ) ? $this->field['value'] : $user_ID;
72	59	}
73	60
74	61	public function validate( $args ) {
75		- // phpcs:ignore Universal.Operators.StrictComparisons
76	62	if ( '' == $args['value'] ) {
77	63	return array();
78	64	}
79	65
80		- // Make sure we have a user ID.
	66	+ // make sure we have a user ID
81	67	if ( ! is_numeric( $args['value'] ) ) {
82	68	$args['value'] = FrmAppHelper::get_user_id_param( $args['value'] );
83	69	FrmEntriesHelper::set_posted_value( $this->field, $args['value'], $args );
84	70	}
85	71
86		- // Add user id to post variables to be saved with entry.
	72	+ //add user id to post variables to be saved with entry
87	73	$_POST['frm_user_id'] = $args['value'];
88	74
89	75	return array();
90	76	}
		@@ -89,15 +75,16 @@
89	75	return array();
90	76	}
91	77
92	78	/**
93		- * @param array|string $value
94		- * @param array $atts
	79	+ * @param $value
	80	+ * @param $atts array
95	81	*
96		- * @return array|string A string is returned, but the return signature should match FrmFieldType.
	82	+ * @return false|mixed|string
97	83	*/
98	84	protected function prepare_display_value( $value, $atts ) {
99	85	$user_info = $this->prepare_user_info_attribute( $atts );
	86	+
100	87	return FrmFieldsHelper::get_user_display_name( $value, $user_info, $atts );
101	88	}
102	89
103	90	/**
		@@ -106,23 +93,29 @@
106	93	* From the get_display_name() function
107	94	*
108	95	* @since 3.0
109	96	*
110		- * @param array $atts
	97	+ * @param $atts
111	98	*
112	99	* @return string
113	100	*/
114	101	private function prepare_user_info_attribute( $atts ) {
115	102	if ( isset( $atts['show'] ) ) {
116		- return $atts['show'] === 'id' ? 'ID' : $atts['show'];
	103	+ if ( $atts['show'] === 'id' ) {
	104	+ $user_info = 'ID';
	105	+ } else {
	106	+ $user_info = $atts['show'];
	107	+ }
	108	+ } else {
	109	+ $user_info = apply_filters( 'frm_user_id_display', 'display_name' );
117	110	}
118	111
119		- return apply_filters( 'frm_user_id_display', 'display_name' );
	112	+ return $user_info;
120	113	}
121	114
122	115	/**
123		- * @param string $value
124		- * @param array $atts
	116	+ * @param $value
	117	+ * @param $atts
125	118	*
126	119	* @return int
127	120	*/
128	121	protected function prepare_import_value( $value, $atts ) {
		@@ -130,17 +123,9 @@
130	123	}
131	124
132	125	/**
133	126	* @since 4.0.04
134		- *
135		- * @param mixed $value Field value passed by reference.
136		- *
137		- * @return void
138	127	*/
139	128	public function sanitize_value( &$value ) {
140		- if ( '' === $value ) {
141		- // Allow for an empty User ID. Return early to prevent it from getting set to 0.
142		- return;
143		- }
144	129	FrmAppHelper::sanitize_value( 'intval', $value );
145	130	}
146	131	}