ISPConfig3 devel
parent: bdbad5 | patch | commitdiff
tbrehm
2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473
refs
author tbrehm <t.brehm@ispconfig.org>
Wednesday, July 31, 2013 09:33 -0400
committer tbrehm <t.brehm@ispconfig.org>
Wednesday, July 31, 2013 09:33 -0400
commit615a0a96618fa99e7e452523145d6c0f238d4473
tree 8fc76719a110e2265cc5969f43320353282311ea tree | zip | gz
parent bdbad50c83d649f89264c2a388bbd40f8fe9d781 view | diff 
Merged revisions 3960-4065 from stable branch.
33 files added
198 files modified
8052 ■■■■■ changed files
install/dist/lib/centos52.lib.php 12 ●●●●● diff | view | raw | blame | history
install/dist/lib/centos53.lib.php 12 ●●●●● diff | view | raw | blame | history
install/dist/lib/debian60.lib.php 14 ●●●●● diff | view | raw | blame | history
install/dist/lib/fedora.lib.php 110 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 52 ●●●●● diff | view | raw | blame | history
install/dist/lib/opensuse.lib.php 104 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 8 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 149 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0051.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0052.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0053.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0054.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 9 ●●●●● diff | view | raw | blame | history
install/tpl/apache_ispconfig.vhost.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/debian6_dovecot2.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/debian_dovecot2.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/debian_postfix.conf.master 33 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_dovecot2.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_postfix.conf.master 30 ●●●●● diff | view | raw | blame | history
install/tpl/gentoo_postfix.conf.master 30 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_dovecot2.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_postfix.conf.master 30 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 21 ●●●●● diff | view | raw | blame | history
interface/lib/classes/functions.inc.php 17 ●●●●● diff | view | raw | blame | history
interface/lib/classes/ispcmail.inc.php 56 ●●●●● diff | view | raw | blame | history
interface/lib/classes/listform.inc.php 21 ●●●●● diff | view | raw | blame | history
interface/lib/classes/listform_actions.inc.php 190 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remoting.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remoting_lib.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/lib/classes/sites_database_plugin.inc.php 50 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tpl.inc.php 14 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_ftpuser.inc.php 7 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/sites_web_database_user_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 121 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_ip.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_php.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/software_package.tform.php 116 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/software_repo.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 23 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_install.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_update_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 27 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_software_package.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_software_package_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_software_repo.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_php_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_package_edit.php 59 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_package_list.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_update_list.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/remote_user_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_mail_edit.htm 22 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_server_edit.htm 30 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 22 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/software_package_edit.htm 27 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/software_package_list.htm 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_mail_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_sites_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/users_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_circle_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_del.php 1 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/client/client_template_edit.php 194 ●●●●● diff | view | raw | blame | history
interface/web/client/client_template_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/domain_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 35 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 11 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_del.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_template_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_del.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_template_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_del.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashboard.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/mailquota.php 93 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/quota.php 116 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/templates/mailquota.htm 29 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/templates/quota.htm 29 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/de_dashlet_quota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/en_dashlet_quota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/templates/dashboard.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_a_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 12 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 15 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_srv_edit.php 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_template_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 12 ●●●●● diff | view | raw | blame | history
interface/web/help/faq_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/help/form/support_message.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de_support_message.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de_support_message_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/en_support_message.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/en_support_message_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/help/list/support_message.list.php 9 ●●●●● diff | view | raw | blame | history
interface/web/help/support_message_edit.php 58 ●●●●● diff | view | raw | blame | history
interface/web/help/support_message_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/help/templates/support_message_list.htm 7 ●●●●● diff | view | raw | blame | history
interface/web/help/templates/support_message_view.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery.tipsy.js 11 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/templates/index.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/login/templates/password_reset.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_policy.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_users.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_user_quota_stats_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_users.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_user_quota_stats_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/user_quota_stats.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_alias_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_aliasdomain_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_blacklist_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_catchall_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_forward_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_mailinglist_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_stats.php 80 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_whitelist_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_blacklist_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_whitelist_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/user_quota_stats_list.htm 105 ●●●●● diff | view | raw | blame | history
interface/web/mail/user_quota_stats.php 20 ●●●●● diff | view | raw | blame | history
interface/web/mail/webmailer.php 11 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_autoresponder_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_filter_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/datalog_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/de.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/en.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/module.conf.php 10 ●●●●● diff | view | raw | blame | history
interface/web/monitor/log_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/show_monit.php 82 ●●●●● diff | view | raw | blame | history
interface/web/monitor/show_munin.php 82 ●●●●● diff | view | raw | blame | history
interface/web/monitor/templates/show_monit.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/monitor/templates/show_munin.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_json.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/aps_availablepackages_list.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/cron_edit.php 13 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_del.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_phpmyadmin.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_del.php 7 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_edit.php 18 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/database_user.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/shell_user.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/ftp_user_edit.php 17 ●●●●● diff | view | raw | blame | history
interface/web/sites/ftp_user_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/aps_installedpackages.list.php 174 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/user_quota_stats.list.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/user_quota_stats_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_redirect.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/user_quota_stats.php 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_aliasdomain_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 75 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_sites_stats.php 90 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_subdomain_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/webdav_user_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/styles.css 3707 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_ip_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 12 ●●●●● diff | view | raw | blame | history
server/conf/getmail.conf.master 2 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_notification_de.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_notification_en.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_ok_notification_de.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_ok_notification_en.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_notification_de.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_notification_en.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_ok_notification_de.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_ok_notification_en.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_traffic_notification_de.txt 8 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_traffic_notification_en.txt 7 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 4 ●●●●● diff | view | raw | blame | history
server/cron_daily.php 444 ●●●●● diff | view | raw | blame | history
server/lib/app.inc.php 45 ●●●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 9 ●●●●● diff | view | raw | blame | history
server/lib/classes/services.inc.php 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl.inc.php 4 ●●●●● diff | view | raw | blame | history
server/mods-available/dns_module.inc.php 11 ●●●●● diff | view | raw | blame | history
server/mods-available/monitor_core_module.inc.php 20 ●●●●● diff | view | raw | blame | history
server/mods-available/web_module.inc.php 11 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 63 ●●●●● diff | view | raw | blame | history
server/plugins-available/bind_plugin.inc.php 5 ●●●●● diff | view | raw | blame | history
server/plugins-available/cron_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/ftpuser_base_plugin.inc.php 12 ●●●●● diff | view | raw | blame | history
server/plugins-available/getmail_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/mysql_clientdb_plugin.inc.php 120 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 60 ●●●●● diff | view | raw | blame | history
server/scripts/run-getmail.sh 2 ●●●●● diff | view | raw | blame | history
server/server.php 10 ●●●●● diff | view | raw | blame | history