tbrehm
2012-05-10 e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0
refs
author tbrehm <t.brehm@ispconfig.org>
Thursday, May 10, 2012 12:31 -0400
committer tbrehm <t.brehm@ispconfig.org>
Thursday, May 10, 2012 12:31 -0400
commite94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0
tree ff2b2be3a5e4a06c229ca954e4cc5c8bdc90c289 tree | zip | gz
parent 4c28d9c34f5f3e5ccbbed6dbb0ba08bc5235b53b view | diff
Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
78 files added
1 files renamed
139 files modified
2 files deleted
2776 ■■■■■ changed files
install/dist/conf/opensuse110.conf.php 2 ●●● diff | view | raw | blame | history
install/dist/lib/fedora.lib.php 5 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 5 ●●●●● diff | view | raw | blame | history
install/dist/lib/opensuse.lib.php 5 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_client.inc.php 30 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/vm_openvz_plugin.inc.php 1 ●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/client/client_message.php 110 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 6 ●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 6 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr_client.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr_client_message.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr_reseller.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/lib/module.conf.php 10 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_message.htm 31 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_import.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/list/dns_a.list.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/list/dns_slave.list.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_slave_list.htm 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_user.lng 2 ●●● diff | view | raw | blame | history
interface/web/monitor/show_sys_state.php 4 ●●●● diff | view | raw | blame | history
interface/web/tools/dns_import_tupa.php 156 ●●●●● diff | view | raw | blame | history
interface/web/tools/dns_resync.php 84 ●●●●● diff | view | raw | blame | history
interface/web/tools/import_ispconfig.php 303 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr.lng 5 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_import_ispconfig.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_resync.lng 13 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/menu.d/import.menu.php 26 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/menu.d/resync.menu.php 4 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/module.conf.php 2 ●●● diff | view | raw | blame | history
interface/web/tools/resync.php 166 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/dns_import_tupa.htm 56 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/dns_resync.htm 31 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/import_ispconfig.htm 105 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/resync.htm 67 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz.conf.tpl 1 ●●●● diff | view | raw | blame | history
remoting_client/examples/mail_catchall_add.php 2 ●●● diff | view | raw | blame | history
server/conf/sieve_filter.master 3 ●●●● diff | view | raw | blame | history
server/conf/sieve_filter_1.2.master 3 ●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 1 ●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 21 ●●●● diff | view | raw | blame | history