diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index 1ac932aea392716d66bddd0d232e95a68632450a..6ea6f4f9705818712067a9a6d5ac49b419d284f2 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -39,6 +39,7 @@ web_php_options=no,fast-cgi,mod,php-fpm show_aps_menu=n client_protection=y ssh_authentication= +le_caa_autocreate_options=y [tools] diff --git a/interface/lib/plugins/system_config_dns_ca_plugin.inc.php b/interface/lib/plugins/system_config_dns_ca_plugin.inc.php index c35934e5bfa542b9d5540802100eec148306f74c..ba28ca0641e04a0d1d95bd275ef796cba01c86e3 100644 --- a/interface/lib/plugins/system_config_dns_ca_plugin.inc.php +++ b/interface/lib/plugins/system_config_dns_ca_plugin.inc.php @@ -65,9 +65,11 @@ class system_config_dns_ca_plugin { } function web_vhost_domain_edit($event_name, $page_form) { - global $app; + global $app, $conf; + + $global_config = $app->getconf->get_global_config('sites'); - if($page_form->dataRecord['ssl_letsencrypt'] == 'y') { + if(($page_form->dataRecord['ssl_letsencrypt'] == 'y') && ($global_config['le_caa_autocreate_options'] != 'n')) { $domain = $page_form->dataRecord['domain']; $subdomain = $page_form->dataRecord['subdomain']; $temp=$app->db->queryAllRecords("SELECT * FROM dns_rr WHERE type = 'CAA' AND (name = ? OR name = ?) AND data like ?", $domain.'.', $subdomain.'.'.$domain.'.', '%letsencrypt%'); diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index bce858b5221a274487ec81b03b0d778b6474c8c5..22212b8b749eedb6fd492a21139ed3cdce10f3b6 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -246,7 +246,13 @@ $form["tabs"]['sites'] = array ( 'formtype' => 'SELECT', 'default' => '', 'value' => array('' => 'ssh_authentication_password_key', 'password' => 'ssh_authentication_password', 'key' => 'ssh_authentication_key') - ) + ), + 'le_caa_autocreate_options' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), //################################# // END Datatable fields //################################# diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index a10274c670519674f336c0406f855cec6df4eb87..4ae8ad3416b7d0a084dd880830c7ab17797145ee 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index 898020365f07503859375268e1d0d7940c72e513..2029f38ed2299bdc44dda1fca784414558e9be5a 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index 1fb510ace046206ee404107ca32e9eef74068469..1128081d2de44f5f1d2767aa8f700e330093973d 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -107,3 +107,4 @@ $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['monitor_key_txt'] = 'Senha do Monitor'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng index 68ca245f3dd26e85b9d45701d86f5de19d3de13e..0c025306087190f150de459d187a808d4b0e1461 100644 --- a/interface/web/admin/lib/lang/ca_system_config.lng +++ b/interface/web/admin/lib/lang/ca_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index c6f45e7d46319e764172fd4081017c5b71b9892e..fb0e65d5e7cdc4fc1d8276d1a1a23c54212e61fd 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -107,3 +107,4 @@ $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['monitor_key_txt'] = 'Monitor keyword'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 328124f6e72e33c0a0cadb6ab3d0a3b9546ef885..ed4c26f61de5a9b9ac276afc12d1c9c109f150bb 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Automatische Erstellung des CAA-Records bei LE Ausstellung aktivieren'; ?> diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng index 71533e77d0469e26624c1fd33b9c09e1028163dd..971253aae773517e8cd56f0a0fbd1503e5508d88 100644 --- a/interface/web/admin/lib/lang/dk_system_config.lng +++ b/interface/web/admin/lib/lang/dk_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index f64df47bc949ca1bb6ca3e571994878e3f79dd51..8bfe8012de1d9c98b30a55ebdd1cc051480b31a7 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 2f32d4feaaf743d705907aeaa3b3cf8b15027820..9cf04103bbec468911d70dcf98f79eadcd743010 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -107,4 +107,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index 471975be4330c60dee4291ae405b35df501e82ac..844c19db5884f2efbbd62eb6fc8ed40338d775f9 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index 30dd462a2955f13f0dae5234697d1dd71e8950dc..4b4bf32cc03589a7f93bf697bbe51af1e618d5e7 100644 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index ac606922a05896fd791d5aa7b85abbde0bfe34ca..801c27b5dfdc71104a4ed7dc09a070967b08f9bf 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 0f29ae0c0c5ad6c90d8c8fb7355ad51f7ecfe4e2..87fcfff64580e1243f284a794e102e625b15a513 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index 1258e6acfe878a90df09079f58d7f995ea93ab6c..cdb31136622768878f44c3055f435975dd6be2aa 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index 60eff076d378caabe62bd41685391a509a484e51..f9b3f87a00f2945e355f155f7c5332a799a43438 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index d58e1d1d22f481647a73175938358d02486c193b..2f8950d7a31245434fb140b4dfb53f02d6364490 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -107,4 +107,5 @@ $wb['show_aps_menu_note_txt'] = 'APS saranno rimosse dal pannello in un prossimo $wb['show_aps_menu_note_url_txt'] = 'Clicca qui per maggiori informazioni.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index b5601ea8009d3c3032dfb493b0de4c9b95466f1b..744d83a705615f40c5e43c8e29fb3975bddf0eee 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 107c42395ecf2420d7f2f3f0a00a9e30cc96b033..b40ce962851776e9c6a918ee5fcc65c82ed9d68b 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 1bb20987655cb6a7e836797904aa0258b4285c35..54312139770491061be918d60e0ab8b43ad5aec3 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index 41becdf5cbb95f563a2816bb7e5c4aa7d7c222c2..8c995047b4f00b45eab26d1b8d85ba810c87e977 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index 2fc1a00b5699762a99e3a2d165c45644fd62042e..9fd8e4d587774a0cddee588a167634ed9f3267cb 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index d829d1ca97d642054958057b433a1b45132a0ac7..55c87315158fe9aab11d24c8608829b9db1040cf 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index fa67bc2bc9265801ba2deb04cafd3bac98cb6137..d3de89aa55885efa8990e9caf4c095acaf7c20d7 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index 317b435eae569d8a3ba79e707d3ba33276d80b4f..1e85adca8c12ef1437dc598ef610d33c526436ab 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index a6e6299375f1820031bb7181429ab0d52358b992..6054bebc888c57cb47e6d49c0fb83ba73271ead0 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['dns_show_zoneexport_txt'] = 'Show zone export.'; +$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE'; ?> diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index c0db318d0128a62a626b04c1f5383ee41bf222cb..9a36e3275ee2dcf9348cc559f76e89c63171f1e3 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -96,14 +96,19 @@
-
- -
+
+ +
+
+
+
+ +
+ {tmpl_var name='le_caa_autocreate_options'} +
-
-