← All changes | class/easy-basic-authentication-form-class.php +88 -55 1.5 → 2 View file →

		@@ -1,49 +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		- );
	5	+ public $form_field = [];
42	6
43	7	public function __construct()
44		- {
45		-
	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	+ );
46	51	}
47	52
48	53	public function basic_auth_plugin_settings_init() {
49	54	register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable' );
		@@ -57,12 +62,12 @@
57	62	array($this,'basic_auth_plugin_section_cb'),
58	63	'basic-auth-plugin-settings'
59	64	);
60	65
61		- foreach(self::FORM_FIELD as $field) {
	66	+ foreach($this->form_field as $field) {
62	67	add_settings_field(
63	68	$field['id'],
64		- __($field['title'], 'easy-basic-authentication'),
	69	+ esc_html($field['title']),
65	70	array($this,$field['callback']),
66	71	'basic-auth-plugin-settings',
67	72	'basic-auth-plugin-section'
68	73	);
		@@ -70,9 +75,9 @@
70	75
71	76	}
72	77
73	78	public function basic_auth_plugin_section_cb() {
74		- echo __('Configure basic authentication', 'easy-basic-authentication');
	79	+ echo esc_html__('Configure basic authentication', 'easy-basic-authentication');
75	80	}
76	81
77	82	public function basic_auth_plugin_enable_cb() {
78	83	$admin_enable = get_option( 'basic_auth_plugin_admin_enable' );
		@@ -90,11 +95,9 @@
90	95	}
91	96
92	97	public function basic_auth_plugin_username_cb() {
93	98	$username = get_option( 'basic_auth_plugin_username' );
94		- ?>
95		- <input type="text" name="basic_auth_plugin_username" value="<?php echo esc_attr( $username ); ?>">
96		- <?php
	99	+ $this->printInputText("text","basic_auth_plugin_username",esc_attr( $username ));
97	100	}
98	101
99	102	public function basic_auth_plugin_password_cb() {
100	103	$password = get_option( 'basic_auth_plugin_password' )
		@@ -99,11 +102,9 @@
99	102	public function basic_auth_plugin_password_cb() {
100	103	$password = get_option( 'basic_auth_plugin_password' )
101	104	? __('Password entered', 'easy-basic-authentication')
102	105	: __('Enter the password', 'easy-basic-authentication');
103		- ?>
104		- <input type="password" name="basic_auth_plugin_password" value="" placeholder="<?php echo $password; ?>">
105		- <?php
	106	+ $this->printInputText("password","basic_auth_plugin_password",'',$password);
106	107	}
107	108
108	109	public function basic_auth_plugin_admin_log_enable_cb() {
109	110	$enable = get_option( 'basic_auth_plugin_admin_log_enable' );
		@@ -120,13 +121,20 @@
120	121	}
121	122
122	123	public function basic_auth_plugin_alertemail_cb() {
123	124	$email_alert = get_option( 'basic_auth_plugin_alertemail' );
124		- ?>
125		- <input type="text" name="basic_auth_plugin_alertemail" value="<?php echo esc_attr( $email_alert ); ?>" placeholder="<?php echo __('Enter the email', 'easy-basic-authentication'); ?>">
126		- <?php
	125	+ $this->printInputText("text","basic_auth_plugin_alertemail",esc_attr( $email_alert ),__('Enter the email', 'easy-basic-authentication'));
127	126	}
	127	+
	128	+ public function basic_auth_plugin_whitelist_cb() {
	129	+ $white_list = get_option( 'basic_auth_plugin_whitelist' );
	130	+ $this->printInputText("text","basic_auth_plugin_whitelist",esc_attr( $white_list ),__('White list, separated by comma', 'easy-basic-authentication'));
	131	+ }
128	132
	133	+ public function printInputText($tipe, $name, $value='', $placeholder = '') {
	134	+ echo "<input type='" . esc_attr($tipe) . "' name='" . esc_attr($name) . "' value='" . esc_attr($value) . "' placeholder='" . esc_attr($placeholder) . "'>";
	135	+ }
	136	+
129	137	public function basic_auth_plugin_save_settings($param) {
130	138	if ( isset( $param['eba_submit'] ) ) {
131	139	$admin_enable = isset( $param['basic_auth_plugin_admin_enable'] ) ? 1 : 0;
132	140	$enable = isset( $param['basic_auth_plugin_enable'] ) ? 1 : 0;
		@@ -134,10 +142,13 @@
134	142	$password = sanitize_text_field( $param['basic_auth_plugin_password'] );
135	143	$log_enable = isset( $param['basic_auth_plugin_admin_log_enable'] ) ? 1 : 0;
136	144	$alert_enable = isset( $param['basic_auth_plugin_alert_enable'] ) ? 1 : 0;
137	145	$alert_email = sanitize_text_field( $param['basic_auth_plugin_alertemail'] );
	146	+ $white_list = sanitize_text_field( $param['basic_auth_plugin_whitelist'] );
138	147
139		- 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 {
140	151	add_settings_error(
141	152	'basic_auth_plugin_alertemail',
142	153	'basic_auth_plugin_alertemail_error',
143	154	__('Invalid email address', 'easy-basic-authentication'),
		@@ -142,10 +153,9 @@
142	153	'basic_auth_plugin_alertemail_error',
143	154	__('Invalid email address', 'easy-basic-authentication'),
144	155	'error'
145	156	);
146		- } else {
147		- update_option( 'basic_auth_plugin_alertemail', $alert_email );
	157	+ return;
148	158	}
149	159
150	160	update_option( 'basic_auth_plugin_admin_enable', $admin_enable );
151	161	update_option( 'basic_auth_plugin_enable', $enable );
		@@ -151,9 +161,21 @@
151	161	update_option( 'basic_auth_plugin_enable', $enable );
152	162	update_option( 'basic_auth_plugin_username', $username );
153	163	update_option( 'basic_auth_plugin_admin_log_enable', $log_enable );
154	164	update_option( 'basic_auth_plugin_alert_enable', $alert_enable );
155		-
	165	+
	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;
	176	+ }
	177	+
156	178	if ( ! empty( $password ) ) {
157	179	$hashed_password = wp_hash_password( $password );
158	180	update_option( 'basic_auth_plugin_password', $hashed_password );
159	181	}
		@@ -162,5 +184,16 @@
162	184
163	185	public function basic_auth_plugin_settings_page() {
164	186	include plugin_dir_path( __FILE__ ) . '../template/settings_page.php';
165	187	}
	188	+
	189	+ public function validateIpList($white_list) {
	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	+ }
	196	+ }
	197	+ return true;
	198	+ }
166	199	}