← All changes | includes/DefaultOptions.php +36 -32 3.0.76 → 3.0.2 View file →

		@@ -10,52 +10,56 @@
10	10	class DefaultOptions {
11	11	/**
12	12	* @return void
13	13	*/
14		- public function add_options(): void {
15		- $this->configure_security_settings();
	14	+ public function add_options(): void {
	15	+ $this->install_bypass_code();
16	16
17		- foreach ( $this->options() as $key => $option ) {
18		- update_option( $key, $option );
19		- }
20		- }
	17	+ foreach ( $this->options() as $key => $option ) {
	18	+ update_option( $key, $option );
	19	+ }
	20	+ }
21	21
22		- public function configure_security_settings(): void {
23		- $hostinger_plugin_settings = get_option( HOSTINGER_PLUGIN_SETTINGS_OPTION, array() );
	22	+ /**
	23	+ * @return void
	24	+ */
	25	+ public function install_bypass_code(): void {
	26	+ // Generate initial bypass code when plugin is first installed.
	27	+ $hostinger_plugin_settings = get_option( HOSTINGER_PLUGIN_SETTINGS_OPTION, false );
24	28
25		- if ( empty( $hostinger_plugin_settings['bypass_code'] ) ) {
26		- $hostinger_plugin_settings['bypass_code'] = Helper::generate_bypass_code( 16 );
27		- $this->update_plugin_settings( $hostinger_plugin_settings );
	29	+ if( $hostinger_plugin_settings === false ) {
	30	+ $options = array(
	31	+ 'bypass_code' => Helper::generate_bypass_code( 16 )
	32	+ );
	33	+
	34	+ $plugin_options = new PluginOptions( $options );
	35	+
	36	+ update_option( HOSTINGER_PLUGIN_SETTINGS_OPTION, $plugin_options->to_array(), false );
28	37	}
29	38	}
30	39
31		- private function update_plugin_settings( array $settings ): void {
32		- $plugin_options = new PluginOptions( $settings );
33		- update_option( HOSTINGER_PLUGIN_SETTINGS_OPTION, $plugin_options->to_array(), false );
34		- }
35		-
36	40	/**
37	41	* @return string[]
38	42	*/
39		- private function options(): array {
40		- $options = array(
41		- 'optin_monster_api_activation_redirect_disabled' => 'true',
42		- 'wpforms_activation_redirect' => 'true',
43		- 'aioseo_activation_redirect' => 'false',
44		- );
	43	+ private function options(): array {
	44	+ $options = array(
	45	+ 'optin_monster_api_activation_redirect_disabled' => 'true',
	46	+ 'wpforms_activation_redirect' => 'true',
	47	+ 'aioseo_activation_redirect' => 'false',
	48	+ );
45	49
46		- if ( Helper::is_plugin_active( 'astra-sites' ) ) {
47		- $options = array_merge( $options, $this->get_astra_options() );
48		- }
	50	+ if ( Helper::is_plugin_active( 'astra-sites' ) ) {
	51	+ $options = array_merge( $options, $this->get_astra_options() );
	52	+ }
49	53
50		- return $options;
51		- }
	54	+ return $options;
	55	+ }
52	56
53	57	/**
54	58	* @return string[]
55	59	*/
56		- private function get_astra_options(): array {
57		- return array(
58		- 'astra_sites_settings' => 'gutenberg',
59		- );
60		- }
	60	+ private function get_astra_options(): array {
	61	+ return array(
	62	+ 'astra_sites_settings' => 'gutenberg',
	63	+ );
	64	+ }
61	65	}