← All changes | class/easy-basic-authentication-form-class.php +70 -70 1.6 → 2 View file →

		@@ -1,54 +1,54 @@
1	1	<?php
2	2
3	3	class easy_basic_authentication_form_class {
4	4
5		- const FORM_FIELD = array(
6		- '0' => array(
7		- 'id' => 'basic-auth-plugin-admin-enable',
8		- 'title' => 'Enable for wp-admin',
9		- 'callback' => 'basic_auth_plugin_admin_enable_cb',
10		- ),
11		- '1' => array(
12		- 'id' => 'basic-auth-plugin-enable',
13		- 'title' => 'Enable for the entire site (only if wp-admin is enabled)',
14		- 'callback' => 'basic_auth_plugin_enable_cb',
15		- ),
16		- '2' => array(
17		- 'id' => 'basic-auth-plugin-username',
18		- 'title' => 'Username',
19		- 'callback' => 'basic_auth_plugin_username_cb',
20		- ),
21		- '3' => array(
22		- 'id' => 'basic-auth-plugin-password',
23		- 'title' => 'Password',
24		- 'callback' => 'basic_auth_plugin_password_cb',
25		- ),
26		- '4' => array(
27		- 'id' => 'basic-auth-plugin-admin-log-enable',
28		- 'title' => 'Enable access logs',
29		- 'callback' => 'basic_auth_plugin_admin_log_enable_cb',
30		- ),
31		- '5' => array(
32		- 'id' => 'basic-auth-plugin-alert-enable',
33		- 'title' => 'Enable email alert',
34		- 'callback' => 'basic_auth_plugin_alert_enable_cb',
35		- ),
36		- '6' => array(
37		- 'id' => 'basic-auth-plugin-email-alert',
38		- 'title' => 'Email for alert',
39		- 'callback' => 'basic_auth_plugin_alertemail_cb',
40		- ),
41		- '7' => array(
42		- 'id' => 'basic-auth-plugin-white-list',
43		- 'title' => 'Ip White list',
44		- 'callback' => 'basic_auth_plugin_whitelist_cb',
45		- )
46		- );
	5	+ public $form_field = [];
47	6
48	7	public function __construct()
49		- {
50		-
	8	+ {
	9	+ $this->form_field = array(
	10	+ '0' => array(
	11	+ 'id' => 'basic-auth-plugin-admin-enable',
	12	+ 'title' => __('Enable for wp-admin', 'easy-basic-authentication'),
	13	+ 'callback' => 'basic_auth_plugin_admin_enable_cb',
	14	+ ),
	15	+ '1' => array(
	16	+ 'id' => 'basic-auth-plugin-enable',
	17	+ 'title' => __('Enable for the entire site (only if wp-admin is enabled)', 'easy-basic-authentication'),
	18	+ 'callback' => 'basic_auth_plugin_enable_cb',
	19	+ ),
	20	+ '2' => array(
	21	+ 'id' => 'basic-auth-plugin-username',
	22	+ 'title' => __('Username', 'easy-basic-authentication'),
	23	+ 'callback' => 'basic_auth_plugin_username_cb',
	24	+ ),
	25	+ '3' => array(
	26	+ 'id' => 'basic-auth-plugin-password',
	27	+ 'title' => __('Password', 'easy-basic-authentication'),
	28	+ 'callback' => 'basic_auth_plugin_password_cb',
	29	+ ),
	30	+ '4' => array(
	31	+ 'id' => 'basic-auth-plugin-admin-log-enable',
	32	+ 'title' => __('Enable access logs', 'easy-basic-authentication'),
	33	+ 'callback' => 'basic_auth_plugin_admin_log_enable_cb',
	34	+ ),
	35	+ '5' => array(
	36	+ 'id' => 'basic-auth-plugin-alert-enable',
	37	+ 'title' => __('Enable email alert', 'easy-basic-authentication'),
	38	+ 'callback' => 'basic_auth_plugin_alert_enable_cb',
	39	+ ),
	40	+ '6' => array(
	41	+ 'id' => 'basic-auth-plugin-email-alert',
	42	+ 'title' => __('Email for alert', 'easy-basic-authentication'),
	43	+ 'callback' => 'basic_auth_plugin_alertemail_cb',
	44	+ ),
	45	+ '7' => array(
	46	+ 'id' => 'basic-auth-plugin-white-list',
	47	+ 'title' => __('Ip White list', 'easy-basic-authentication'),
	48	+ 'callback' => 'basic_auth_plugin_whitelist_cb',
	49	+ )
	50	+ );
51	51	}
52	52
53	53	public function basic_auth_plugin_settings_init() {
54	54	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable' );
		@@ -54,9 +54,8 @@
54	54	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable' );
55	55	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_enable' );
56	56	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_username' );
57	57	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_log_enable' );
58		- register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_whitelist' );
59	58
60	59	add_settings_section(
61	60	'basic-auth-plugin-section',
62	61	__('Configurations for Easy Basic Authentication', 'easy-basic-authentication'),
		@@ -63,12 +62,12 @@
63	62	array($this,'basic_auth_plugin_section_cb'),
64	63	'basic-auth-plugin-settings'
65	64	);
66	65
67		- foreach(self::FORM_FIELD as $field) {
	66	+ foreach($this->form_field as $field) {
68	67	add_settings_field(
69	68	$field['id'],
70		- __($field['title'], 'easy-basic-authentication'),
	69	+ esc_html($field['title']),
71	70	array($this,$field['callback']),
72	71	'basic-auth-plugin-settings',
73	72	'basic-auth-plugin-section'
74	73	);
		@@ -76,9 +75,9 @@
76	75
77	76	}
78	77
79	78	public function basic_auth_plugin_section_cb() {
80		- echo __('Configure basic authentication', 'easy-basic-authentication');
	79	+ echo esc_html__('Configure basic authentication', 'easy-basic-authentication');
81	80	}
82	81
83	82	public function basic_auth_plugin_enable_cb() {
84	83	$admin_enable = get_option( 'basic_auth_plugin_admin_enable' );
		@@ -131,9 +130,9 @@
131	130	$this->printInputText("text","basic_auth_plugin_whitelist",esc_attr( $white_list ),__('White list, separated by comma', 'easy-basic-authentication'));
132	131	}
133	132
134	133	public function printInputText($tipe, $name, $value='', $placeholder = '') {
135		- echo "<input type='$tipe' name='$name' value='$value' placeholder='$placeholder'>";
	134	+ echo "<input type='" . esc_attr($tipe) . "' name='" . esc_attr($name) . "' value='" . esc_attr($value) . "' placeholder='" . esc_attr($placeholder) . "'>";
136	135	}
137	136
138	137	public function basic_auth_plugin_save_settings($param) {
139	138	if ( isset( $param['eba_submit'] ) ) {
		@@ -145,9 +144,11 @@
145	144	$alert_enable = isset( $param['basic_auth_plugin_alert_enable'] ) ? 1 : 0;
146	145	$alert_email = sanitize_text_field( $param['basic_auth_plugin_alertemail'] );
147	146	$white_list = sanitize_text_field( $param['basic_auth_plugin_whitelist'] );
148	147
149		- if ( !is_email( $alert_email ) ) {
	148	+ if ( is_email( $alert_email ) || (!$alert_enable && $alert_email=='' ) ) {
	149	+ update_option( 'basic_auth_plugin_alertemail', $alert_email );
	150	+ } else {
150	151	add_settings_error(
151	152	'basic_auth_plugin_alertemail',
152	153	'basic_auth_plugin_alertemail_error',
153	154	__('Invalid email address', 'easy-basic-authentication'),
		@@ -152,10 +153,9 @@
152	153	'basic_auth_plugin_alertemail_error',
153	154	__('Invalid email address', 'easy-basic-authentication'),
154	155	'error'
155	156	);
156		- } else {
157		- update_option( 'basic_auth_plugin_alertemail', $alert_email );
	157	+ return;
158	158	}
159	159
160	160	update_option( 'basic_auth_plugin_admin_enable', $admin_enable );
161	161	update_option( 'basic_auth_plugin_enable', $enable );
		@@ -161,22 +161,21 @@
161	161	update_option( 'basic_auth_plugin_enable', $enable );
162	162	update_option( 'basic_auth_plugin_username', $username );
163	163	update_option( 'basic_auth_plugin_admin_log_enable', $log_enable );
164	164	update_option( 'basic_auth_plugin_alert_enable', $alert_enable );
165		-
166	165
167		- if (strlen($white_list)) {
168		- if( $this->validateIpList( $white_list ) ) {
169		- update_option( 'basic_auth_plugin_whitelist', $white_list );
170		- } else {
171		- add_settings_error(
172		- 'basic_auth_plugin_whitelist',
173		- 'basic_auth_plugin_whitelist_error',
174		- __('Invalid whitelist format. Please enter valid ip addresses separated by commas.', 'easy-basic-authentication'),
175		- 'error'
176		- );
177		- }
	166	+ if( $this->validateIpList( $white_list ) || strlen($white_list) == 0 ) {
	167	+ update_option( 'basic_auth_plugin_whitelist', $white_list );
	168	+ } else {
	169	+ add_settings_error(
	170	+ 'basic_auth_plugin_whitelist',
	171	+ 'basic_auth_plugin_whitelist_error',
	172	+ __('Invalid IP list format. Please enter valid IP addresses separated by commas.', 'easy-basic-authentication'),
	173	+ 'error'
	174	+ );
	175	+ return;
178	176	}
	177	+
179	178	if ( ! empty( $password ) ) {
180	179	$hashed_password = wp_hash_password( $password );
181	180	update_option( 'basic_auth_plugin_password', $hashed_password );
182	181	}
		@@ -187,13 +186,14 @@
187	186	include plugin_dir_path( __FILE__ ) . '../template/settings_page.php';
188	187	}
189	188
190	189	public function validateIpList($white_list) {
191		- $pattern = '/^(\s*(?:\d{1,3}\.){3}\d{1,3}\s*(?:,\s*|$))+$/';
192		-
193		- if ( preg_match( $pattern, $white_list ) ) {
194		- return true;
	190	+ $ips = explode(',', $white_list);
	191	+ foreach ($ips as $ip) {
	192	+ $ip = trim($ip);
	193	+ if (!filter_var($ip, FILTER_VALIDATE_IP)) {
	194	+ return false;
	195	+ }
195	196	}
196		- return false;
197		-
	197	+ return true;
198	198	}
199	199	}