@@ -203,71 +203,6 @@ function spbc_settings__register()
203203 'ajax ' => true ,
204204 'after ' => 'spbc_settings_draw_save_button_bottom_block ' ,
205205 'sections ' => array (
206- 'section_top_banner ' => array (
207- 'type ' => 'section_banner ' ,
208- 'fields ' => array (
209- 'security_log ' => array (
210- 'type ' => 'field ' ,
211- ),
212- ),
213- ),
214- 'apikey ' => array (
215- 'type ' => 'section ' ,
216- 'title ' => __ ('Access Key ' , 'security-malware-firewall ' ),
217- 'anchor ' => 'apikey ' ,
218- 'fields ' => array (
219- 'apikey ' => array (
220- 'type ' => 'field ' ,
221- 'callback ' => 'spbc_field_key '
222- ),
223- 'ms__work_mode ' => array (
224- 'type ' => 'field ' ,
225- 'input_type ' => 'select ' ,
226- 'options ' => array (
227- array (
228- 'val ' => 1 ,
229- 'label ' => __ ('Mutual Account, Individual Access Keys ' , 'security-malware-firewall ' ),
230- 'children_enable ' => 1 ,
231- ),
232- array (
233- 'val ' => 2 ,
234- 'label ' => __ ('Mutual Account, Mutual Access Key ' , 'security-malware-firewall ' ),
235- 'children_enable ' => 0 ,
236- ),
237- array (
238- 'val ' => 3 ,
239- 'label ' => __ ('Individual accounts, individual Access keys ' , 'security-malware-firewall ' ),
240- 'children_enable ' => 0 ,
241- ),
242- ),
243- 'title ' => __ ('WordPress Multisite Work Mode ' , 'security-malware-firewall ' ),
244- 'description ' => __ ('You can choose the work mode here for the child blogs and how they will operate with the CleanTalk Cloud. Press "?" for the detailed description. ' , 'security-malware-firewall ' ),
245- 'long_description ' => true ,
246- 'display ' => $ spbc ->is_network && $ spbc ->is_mainsite ,
247- 'children ' => array ('ms__hoster_api_key ' ),
248- 'value_source ' => 'network_settings ' ,
249- ),
250- 'ms__hoster_api_key ' => array (
251- 'type ' => 'field ' ,
252- 'input_type ' => 'text ' ,
253- 'title ' => __ ('Hoster access key ' , 'security-malware-firewall ' ),
254- 'description ' => __ ('Another API allowing you to hold multiple blogs on on account. ' , 'security-malware-firewall ' ),
255- 'class ' => 'spbc_middle_text_field ' ,
256- 'title_first ' => true ,
257- 'long_description ' => true ,
258- 'display ' => $ spbc ->is_network && $ spbc ->is_mainsite ,
259- 'disabled ' => ! isset ($ spbc ->network_settings ['ms__work_mode ' ]) || $ spbc ->network_settings ['ms__work_mode ' ] != 1 ,
260- 'value_source ' => 'network_settings ' ,
261- 'parent_value_source ' => 'network_settings ' ,
262- 'parent ' => 'ms__work_mode ' ,
263- ),
264- 'ms__service_utilization ' => array (
265- 'type ' => 'field ' ,
266- 'callback ' => 'spbc_field_service_utilization ' ,
267- 'display ' => $ spbc ->is_network && $ spbc ->is_mainsite && $ spbc ->ms__work_mode == 1 ,
268- ),
269- ),
270- ),
271206 'auth ' => array (
272207 'type ' => 'section ' ,
273208 'title ' => __ ('Authentication and Logging In ' , 'security-malware-firewall ' ),
@@ -1395,32 +1330,7 @@ function spbct_settings__the_settings_tab_draw($elem)
13951330 $ settings_content = ob_get_clean ();
13961331 // End buffer
13971332
1398- $ template = '
1399- <div id="spbc-settings-general-wrapper" class="spbc-settings-general-wrapper">
1400- <div id="spbc-settings-general-wrapper-settings">
1401- %s
1402- </div>
1403- <div id="spbc-quicknav--bar_wrapper" class="spbc-quicknav--bar_wrapper">
1404- %s
1405- </div>
1406- </div>
1407- ' ;
1408-
1409- // Settings form elements here
1410- echo '<form id="spbc_settings_form" method="post" action="options.php" style="margin-right: 12px; margin-top: -9px;"> ' ;
1411-
1412- // Service fields
1413- echo "<input type='hidden' name='option_page' value=' " . esc_attr (SPBC_SETTINGS ) . "' /> " ;
1414- echo '<input type="hidden" name="action" value="update" /> ' ;
1415- wp_nonce_field (SPBC_SETTINGS . '-options ' , '_wpnonce ' , false );
1416-
1417- echo sprintf (
1418- $ template ,
1419- $ settings_content ,
1420- spbc_settings__get_quick_navbar_html ($ elem )
1421- );
1422-
1423- echo '</form> ' ;
1333+ echo $ settings_content ;
14241334}
14251335
14261336/**
@@ -2349,12 +2259,12 @@ function spbc_settings__create_notice_on_tab()
23492259 $ button_text = __ ('Request Malware removal ' , 'security-malware-firewall ' );
23502260 $ landing_page_link = LinkConstructor::buildCleanTalkLink (
23512261 'banner_link_for_treatment ' ,
2352- 'website -malware-removal ' ,
2262+ 'wordpress -malware-removal ' ,
23532263 array (
23542264 'email ' => esc_attr ($ email ),
23552265 'website ' => esc_attr ($ website ),
23562266 ),
2357- $ domain = 'https://l. cleantalk.org '
2267+ $ domain = 'https://cleantalk.org '
23582268 );
23592269 $ button_div = '<div style="align-content: center;margin: 0 30px;"> ' ;
23602270 $ button_div .= '
@@ -4312,9 +4222,11 @@ function spbc_field_debug()
43124222{
43134223 global $ spbc ;
43144224
4315- echo '<form id="debug_drop" method="POST"></form> '
4316- . '<form id="debug_check_connection" method="POST"></form> '
4317- . '<form id="debug__cron_set" method="POST"></form> ' ;
4225+ $ nonce_field = wp_nonce_field ('spbc_secret_nonce ' );
4226+
4227+ echo '<form id="debug_drop" method="POST"> ' . $ nonce_field . '</form> '
4228+ . '<form id="debug_check_connection" method="POST"> ' . $ nonce_field . '</form> '
4229+ . '<form id="debug__cron_set" method="POST"> ' . $ nonce_field . '</form> ' ;
43184230
43194231 if ($ spbc ->debug ) {
43204232 $ debug = get_option (SPBC_DEBUG );
@@ -4563,18 +4475,6 @@ function spbc_sanitize_settings($settings)
45634475 */
45644476 do_action ('spbc_before_returning_settings ' , $ settings );
45654477
4566- // Sync disallow file edit setting with FileEditorDisabler
4567- if (is_multisite ()) {
4568- if (is_network_admin ()) {
4569- // Do save for network admin
4570- update_site_option ('spbc_network_misc_disable_file_editor ' , $ settings ['misc_disable_file_editor ' ]);
4571- } else {
4572- // Always get from site option
4573- $ settings ['misc_disable_file_editor ' ] = get_site_option ('spbc_network_misc_disable_file_editor ' , 0 );
4574- }
4575- }
4576- FileEditorDisabler::syncDisallowFileEditBySettings ($ settings );
4577-
45784478 // Try to add|remove content to .htaccess file
45794479 if ($ settings ['wp__upload_dir_prevent_php_execution ' ] !== $ spbc ->settings ['wp__upload_dir_prevent_php_execution ' ]) {
45804480 SpbcCron::updateTask ('upload_dir_prevent_php_execution ' , 'spbc_upload_dir_prevent_php_execution ' , 86400 , time () + 60 );
@@ -5774,12 +5674,12 @@ function spbc__get_accordion_tab_info_block_html($for)
57745674 $ website = get_home_url ();
57755675 $ landing_page_link = LinkConstructor::buildCleanTalkLink (
57765676 'banner_link_for_treatment ' ,
5777- 'website -malware-removal ' ,
5677+ 'wordpress -malware-removal ' ,
57785678 array (
57795679 'email ' => esc_attr ($ email ),
57805680 'website ' => esc_attr ($ website ),
57815681 ),
5782- $ domain = 'https://l. cleantalk.org '
5682+ $ domain = 'https://cleantalk.org '
57835683 );
57845684
57855685 $ company_name = $ spbc ->default_data ['wl_company_name ' ];
0 commit comments