Merge branch 'master' into 'master'
Master
See merge request !150
7 files modified
1 files added
New file |
| | |
| | | UPDATE `dns_template` SET `fields` = 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM' WHERE `dns_template`.`template_id` =1; |
| | | UPDATE `dbispconfig`.`dns_template` SET `template` = '[ZONE] |
| | | origin={DOMAIN}. |
| | | ns={NS1}. |
| | | mbox={EMAIL}. |
| | | refresh=7200 |
| | | retry=540 |
| | | expire=604800 |
| | | minimum=86400 |
| | | ttl=3600 |
| | | |
| | | [DNS_RECORDS] |
| | | A|{DOMAIN}.|{IP}|0|3600 |
| | | A|www|{IP}|0|3600 |
| | | A|mail|{IP}|0|3600 |
| | | NS|{DOMAIN}.|{NS1}.|0|3600 |
| | | NS|{DOMAIN}.|{NS2}.|0|3600 |
| | | MX|{DOMAIN}.|mail.{DOMAIN}.|10|3600 |
| | | TXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600' WHERE `dns_template`.`template_id` = 1; |
| | |
| | | -- Dumping data for table `dns_template` |
| | | -- |
| | | |
| | | INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600', 'y'); |
| | | INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y'); |
| | | |
| | | |
| | | -- -------------------------------------------------------- |
| | | |
old mode 100644
new mode 100755
| | |
| | | |
| | | parent::onShowNew(); |
| | | |
| | | $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?'", $_GET['zone'], $app->tform->getAuthSQL('r')); |
| | | $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?", $_GET['zone'], $app->tform->getAuthSQL('r')); |
| | | $sql=$app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ?", substr_replace($soa['origin'],'',-1), $app->tform->getAuthSQL('r')); |
| | | $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']); |
| | | $app->tpl->setVar('public_key', $public_key); |
| | |
| | | $wb['btn_cancel_txt'] = 'Annuler'; |
| | | $wb['domain_txt'] = 'Domaine'; |
| | | $wb['email_txt'] = 'Email'; |
| | | $wb['dkim_txt'] = 'DKIM activé |
| | | $wb['dkim_txt'] = 'DKIM activé'; |
| | | $wb['ns1_txt'] = 'NS 1'; |
| | | $wb['ns2_txt'] = 'NS 2'; |
| | | $wb['ip_txt'] = 'Adresse IP'; |
| | |
| | | $wb['destination_error_isemail'] = 'No se ha seleccionado el destino.'; |
| | | $wb['source_server_error_regex'] = 'Servidor POP3/IMAP no es un nombre de dominio válido.'; |
| | | $wb['source_read_all_txt'] = 'Recoger todos los correos (incluído correos leídos)'; |
| | | $wb['error_delete_read_all_combination'] = 'Combinación de opciones no permitida. No puedes desactivar 'Borrar los correos después de recogerlos' y activar 'Recoger todos los correos''; |
| | | $wb['error_delete_read_all_combination'] = "Combinación de opciones no permitida. No puedes desactivar 'Borrar los correos después de recogerlos' y activar 'Recoger todos los correos'"; |
| | | $wb['source_delete_note_txt'] = 'Por favor compruebe primero si la recogida de correo funciona antes de activar esta opción.'; |
| | | ?> |
old mode 100644
new mode 100755
| | |
| | | //* validate post-values |
| | | if ( validate_domain($domain) && validate_selector($old_selector) ) { |
| | | //* get active selectors from dns |
| | | $soa_rec = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE active = 'Y' AND origin = ?"); |
| | | $soa_rec = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE active = 'Y' AND origin = ?", $domain.'.'); |
| | | if ( isset($soa_rec) && !empty($soa_rec) ) { |
| | | //* check for a dkim-record in the dns? |
| | | $dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y''", $old_selector.'._domainkey.'.$domain.'.'); |
| | | $dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y'", $old_selector.'._domainkey.'.$domain.'.'); |
| | | if ( !empty($dns_data) ){ |
| | | $selector = str_replace( '._domainkey.'.$domain.'.', '', $dns_data['name']); |
| | | } else { |
| | |
| | | $function_list['sites_web_domain_backup'] = 'Sites Backup functions'; |
| | | $function_list['sites_web_aliasdomain_get,sites_web_aliasdomain_add,sites_web_aliasdomain_update,sites_web_aliasdomain_delete'] = 'Sites Aliasdomain functions'; |
| | | $function_list['sites_web_subdomain_get,sites_web_subdomain_add,sites_web_subdomain_update,sites_web_subdomain_delete'] = 'Sites Subdomain functions'; |
| | | $function_list['sites_aps_update_package_list,sites_aps_available_packages_list,sites_aps_install_package,sites_aps_get_package_details,sites_aps_get_package_file,sites_aps_get_package_settings,sites_aps_instance_get,sites_aps_instance_delete''] = 'Sites APS functions'; |
| | | |
| | | $function_list['sites_aps_update_package_list,sites_aps_available_packages_list,sites_aps_install_package,sites_aps_get_package_details,sites_aps_get_package_file,sites_aps_get_package_settings,sites_aps_instance_get,sites_aps_instance_delete'] = 'Sites APS functions'; |
| | | ?> |
| | |
| | | exec(escapeshellcmd('rm -rf '.$mail_backup_dir)); |
| | | //* cleanup database |
| | | $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?"; |
| | | $app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']); |
| | | $app->db->query($sql, $conf['server_id'], $data['old']['domain_id'], $data['old']['mailuser_id']); |
| | | if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']); |
| | | |
| | | $app->log('Deleted the mail backup directory: '.$mail_backup_dir, LOGLEVEL_DEBUG); |