← All changes | Libs/adminify-framework/functions/validate.php +46 -69 4.3.1 → 3.2.4.1 View file →

		@@ -1,5 +1,6 @@
1		-<?php if ( ! defined( 'ABSPATH' ) ) { die; } // Cannot access directly.
	1	+<?php if ( ! defined( 'ABSPATH' ) ) {
	2	+ die; } // Cannot access directly.
2	3	/**
3	4	*
4	5	* Email validate
5	6	*
		@@ -4,18 +5,15 @@
4	5	* Email validate
5	6	*
6	7	* @since 1.0.0
7	8	* @version 1.0.0
8		- *
9	9	*/
10	10	if ( ! function_exists( 'adminify_validate_email' ) ) {
11		- function adminify_validate_email( $value ) {
12		-
13		- if ( ! filter_var( $value, FILTER_VALIDATE_EMAIL ) ) {
14		- return esc_html__( 'Please enter a valid email address.', 'adminify' );
15		- }
16		-
17		- }
	11	+ function adminify_validate_email( $value ) {
	12	+ if ( ! filter_var( $value, FILTER_VALIDATE_EMAIL ) ) {
	13	+ return esc_html__( 'Please enter a valid email address.', 'adminify' );
	14	+ }
	15	+ }
18	16	}
19	17
20	18	/**
21	19	*
		@@ -22,18 +20,15 @@
22	20	* Numeric validate
23	21	*
24	22	* @since 1.0.0
25	23	* @version 1.0.0
26		- *
27	24	*/
28	25	if ( ! function_exists( 'adminify_validate_numeric' ) ) {
29		- function adminify_validate_numeric( $value ) {
30		-
31		- if ( ! is_numeric( $value ) ) {
32		- return esc_html__( 'Please enter a valid number.', 'adminify' );
33		- }
34		-
35		- }
	26	+ function adminify_validate_numeric( $value ) {
	27	+ if ( ! is_numeric( $value ) ) {
	28	+ return esc_html__( 'Please enter a valid number.', 'adminify' );
	29	+ }
	30	+ }
36	31	}
37	32
38	33	/**
39	34	*
		@@ -40,18 +35,15 @@
40	35	* Required validate
41	36	*
42	37	* @since 1.0.0
43	38	* @version 1.0.0
44		- *
45	39	*/
46	40	if ( ! function_exists( 'adminify_validate_required' ) ) {
47		- function adminify_validate_required( $value ) {
48		-
49		- if ( empty( $value ) ) {
50		- return esc_html__( 'This field is required.', 'adminify' );
51		- }
52		-
53		- }
	41	+ function adminify_validate_required( $value ) {
	42	+ if ( empty( $value ) ) {
	43	+ return esc_html__( 'This field is required.', 'adminify' );
	44	+ }
	45	+ }
54	46	}
55	47
56	48	/**
57	49	*
		@@ -58,18 +50,15 @@
58	50	* URL validate
59	51	*
60	52	* @since 1.0.0
61	53	* @version 1.0.0
62		- *
63	54	*/
64	55	if ( ! function_exists( 'adminify_validate_url' ) ) {
65		- function adminify_validate_url( $value ) {
66		-
67		- if ( ! filter_var( $value, FILTER_VALIDATE_URL ) ) {
68		- return esc_html__( 'Please enter a valid URL.', 'adminify' );
69		- }
70		-
71		- }
	56	+ function adminify_validate_url( $value ) {
	57	+ if ( ! filter_var( $value, FILTER_VALIDATE_URL ) ) {
	58	+ return esc_html__( 'Please enter a valid URL.', 'adminify' );
	59	+ }
	60	+ }
72	61	}
73	62
74	63	/**
75	64	*
		@@ -76,20 +65,17 @@
76	65	* Email validate for Customizer
77	66	*
78	67	* @since 1.0.0
79	68	* @version 1.0.0
80		- *
81	69	*/
82	70	if ( ! function_exists( 'adminify_customize_validate_email' ) ) {
83		- function adminify_customize_validate_email( $validity, $value, $wp_customize ) {
	71	+ function adminify_customize_validate_email( $validity, $value, $wp_customize ) {
	72	+ if ( ! sanitize_email( $value ) ) {
	73	+ $validity->add( 'required', esc_html__( 'Please enter a valid email address.', 'adminify' ) );
	74	+ }
84	75
85		- if ( ! sanitize_email( $value ) ) {
86		- $validity->add( 'required', esc_html__( 'Please enter a valid email address.', 'adminify' ) );
87		- }
88		-
89		- return $validity;
90		-
91		- }
	76	+ return $validity;
	77	+ }
92	78	}
93	79
94	80	/**
95	81	*
		@@ -96,20 +82,17 @@
96	82	* Numeric validate for Customizer
97	83	*
98	84	* @since 1.0.0
99	85	* @version 1.0.0
100		- *
101	86	*/
102	87	if ( ! function_exists( 'adminify_customize_validate_numeric' ) ) {
103		- function adminify_customize_validate_numeric( $validity, $value, $wp_customize ) {
	88	+ function adminify_customize_validate_numeric( $validity, $value, $wp_customize ) {
	89	+ if ( ! is_numeric( $value ) ) {
	90	+ $validity->add( 'required', esc_html__( 'Please enter a valid number.', 'adminify' ) );
	91	+ }
104	92
105		- if ( ! is_numeric( $value ) ) {
106		- $validity->add( 'required', esc_html__( 'Please enter a valid number.', 'adminify' ) );
107		- }
108		-
109		- return $validity;
110		-
111		- }
	93	+ return $validity;
	94	+ }
112	95	}
113	96
114	97	/**
115	98	*
		@@ -116,20 +99,17 @@
116	99	* Required validate for Customizer
117	100	*
118	101	* @since 1.0.0
119	102	* @version 1.0.0
120		- *
121	103	*/
122	104	if ( ! function_exists( 'adminify_customize_validate_required' ) ) {
123		- function adminify_customize_validate_required( $validity, $value, $wp_customize ) {
	105	+ function adminify_customize_validate_required( $validity, $value, $wp_customize ) {
	106	+ if ( empty( $value ) ) {
	107	+ $validity->add( 'required', esc_html__( 'This field is required.', 'adminify' ) );
	108	+ }
124	109
125		- if ( empty( $value ) ) {
126		- $validity->add( 'required', esc_html__( 'This field is required.', 'adminify' ) );
127		- }
128		-
129		- return $validity;
130		-
131		- }
	110	+ return $validity;
	111	+ }
132	112	}
133	113
134	114	/**
135	115	*
		@@ -136,17 +116,14 @@
136	116	* URL validate for Customizer
137	117	*
138	118	* @since 1.0.0
139	119	* @version 1.0.0
140		- *
141	120	*/
142	121	if ( ! function_exists( 'adminify_customize_validate_url' ) ) {
143		- function adminify_customize_validate_url( $validity, $value, $wp_customize ) {
	122	+ function adminify_customize_validate_url( $validity, $value, $wp_customize ) {
	123	+ if ( ! filter_var( $value, FILTER_VALIDATE_URL ) ) {
	124	+ $validity->add( 'required', esc_html__( 'Please enter a valid URL.', 'adminify' ) );
	125	+ }
144	126
145		- if ( ! filter_var( $value, FILTER_VALIDATE_URL ) ) {
146		- $validity->add( 'required', esc_html__( 'Please enter a valid URL.', 'adminify' ) );
147		- }
148		-
149		- return $validity;
150		-
151		- }
	127	+ return $validity;
	128	+ }
152	129	}