From b67344233b509c97ba118a209e82386d698ba068 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 05 Apr 2012 05:09:17 -0400
Subject: [PATCH] Merged revisions 2943-3026 from stable branch.
---
interface/web/sites/lib/lang/el_web_folder_user.lng | 12
interface/web/mail/lib/lang/es_mail_get.lng | 1
interface/web/admin/lib/lang/el_remote_user_list.lng | 2
interface/web/dns/lib/lang/el_dns_mx.lng | 2
interface/web/mail/lib/lang/el_mail_transport_list.lng | 2
interface/web/dashboard/lib/lang/el.lng | 2
interface/lib/lang/id.lng | 1
interface/web/mail/lib/lang/el_mail_content_filter_list.lng | 2
interface/web/admin/lib/lang/el_server_list.lng | 2
interface/web/mail/lib/lang/el_mail_transport.lng | 2
interface/web/mail/lib/lang/el_mail_user_stats_list.lng | 2
interface/web/mail/lib/lang/pl_mail_get.lng | 1
interface/web/admin/lib/lang/el_remote_action.lng | 4
interface/web/mail/lib/lang/id_mail_user.lng | 2
interface/web/admin/lib/lang/el_users.lng | 2
interface/web/client/lib/lang/el_client.lng | 4
interface/web/admin/lib/remote.conf.php | 2
interface/web/designer/lib/lang/el_module_list.lng | 2
interface/web/admin/lib/lang/el_language_list.lng | 2
interface/web/mail/lib/lang/el_mail_forward.lng | 2
interface/web/mail/lib/lang/el_spamfilter_config.lng | 2
interface/web/mail/lib/lang/ro_mail_get.lng | 1
interface/lib/lang/bg.lng | 1
install/sql/incremental/upd_0009.sql | 2
interface/web/sites/lib/lang/el_web_subdomain_list.lng | 2
interface/web/mail/lib/lang/el_mail_alias_list.lng | 2
interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng | 2
interface/web/admin/lib/lang/el_system_config.lng | 2
interface/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/el_spamfilter_users_list.lng | 2
interface/web/help/lib/lang/el_help_faq_list.lng | 1
interface/web/sites/lib/lang/en_webdav_user.lng | 2
interface/web/dns/lib/lang/tr_dns_soa.lng | 1
install/tpl/debian_dovecot-sql.conf.master | 2
interface/web/dns/lib/lang/de_dns_soa.lng | 1
interface/web/mail/lib/lang/el_mail_blacklist.lng | 2
interface/web/admin/lib/lang/el_language_edit.lng | 2
interface/web/tools/lib/lang/el_usersettings.lng | 2
interface/web/client/lib/lang/el.lng | 4
interface/web/dns/lib/lang/el_dns_template.lng | 2
interface/web/admin/lib/lang/el_language_export.lng | 2
interface/web/vm/lib/lang/el_openvz_template_list.lng | 2
interface/web/mail/lib/lang/el_mail_content_filter.lng | 2
interface/web/dns/lib/lang/sk_dns_soa.lng | 1
interface/web/admin/lib/lang/el_firewall.lng | 2
interface/lib/lang/hu.lng | 1
interface/web/admin/lib/lang/el_iptables.lng | 2
interface/web/dns/lib/lang/el_dns_soa_list.lng | 2
interface/lib/lang/nl.lng | 9
interface/lib/lang/ro.lng | 1
interface/web/dns/lib/lang/el_dns_txt.lng | 2
interface/web/admin/lib/lang/el_server_ip.lng | 2
interface/lib/lang/el.lng | 140 ++--
interface/web/dns/lib/lang/el_dns_ptr.lng | 2
interface/web/dns/lib/lang/el.lng | 4
interface/web/sites/lib/lang/el_web_domain_admin_list.lng | 2
interface/web/mail/lib/lang/sk_mail_user.lng | 2
interface/web/dns/lib/lang/se_dns_soa.lng | 1
install/install.php | 2
interface/web/dns/lib/lang/el_dns_hinfo.lng | 2
interface/web/dns/lib/lang/br_dns_soa.lng | 1
interface/web/dns/lib/lang/el_dns_a_list.lng | 2
interface/web/dns/lib/remote.conf.php | 2
interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng | 2
interface/web/mail/lib/lang/tr_mail_get.lng | 1
interface/web/admin/lib/lang/el.lng | 2
interface/web/mail/lib/lang/el_user_quota_stats_list.lng | 2
interface/web/vm/lib/lang/el_openvz_template.lng | 2
interface/web/sites/lib/lang/el_cron_list.lng | 2
interface/lib/lang/es.lng | 1
interface/web/admin/lib/lang/el_groups.lng | 2
interface/web/mail/lib/lang/el_mail_user.lng | 86 +-
interface/web/mail/lib/lang/cz_mail_get.lng | 1
interface/web/mail/lib/lang/ru_mail_user.lng | 2
interface/web/sites/lib/lang/el_web_folder_user_list.lng | 2
interface/web/dns/lib/lang/ru_dns_soa.lng | 1
interface/web/admin/lib/lang/el_language_complete.lng | 2
interface/web/mail/lib/lang/hu_mail_user.lng | 2
interface/lib/lang/ja.lng | 1
interface/web/dns/lib/lang/el_dns_wizard.lng | 2
interface/web/mail/lib/lang/sk_mail_get.lng | 1
interface/web/client/lib/lang/el_client_template_list.lng | 2
interface/lib/lang/pt.lng | 1
interface/web/dns/lib/lang/bg_dns_soa.lng | 1
interface/web/admin/lib/lang/el_language_add.lng | 2
interface/web/sites/webdav_user_edit.php | 4
interface/web/admin/lib/lang/el_server_config.lng | 6
interface/web/mail/lib/lang/se_mail_user.lng | 2
server/plugins-available/apache2_plugin.inc.php | 29
interface/web/sites/lib/lang/en_shell_user.lng | 2
interface/web/mail/lib/lang/el_mail_user_list.lng | 2
interface/web/sites/lib/lang/el_web_domain_list.lng | 2
interface/web/js/scrigo.js.php | 25 +
interface/web/mail/lib/lang/it_mail_get.lng | 1
interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng | 2
interface/web/dns/lib/lang/el_dns_ns.lng | 2
interface/web/mail/lib/lang/el_mail_mailinglist_list.lng | 2
interface/web/dns/lib/lang/ro_dns_soa.lng | 1
interface/web/sites/lib/lang/el_cron.lng | 2
interface/web/dns/lib/lang/fi_dns_soa.lng | 1
interface/web/mail/lib/lang/el_mail_alias.lng | 2
interface/web/dns/lib/lang/el_dns_alias.lng | 2
interface/web/mail/lib/lang/el_mail_whitelist_list.lng | 2
interface/web/dns/lib/lang/el_dns_aaaa.lng | 2
interface/web/admin/lib/lang/el_software_update_list.lng | 2
interface/web/dashboard/lib/lang/el_dashlet_limits.lng | 2
interface/web/client/lib/lang/el_client_template.lng | 2
interface/web/mail/lib/lang/el_spamfilter_blacklist.lng | 2
interface/web/dns/lib/lang/el_dns_soa.lng | 3
interface/web/mail/lib/lang/bg_mail_get.lng | 1
interface/web/mail/lib/lang/el_mail_relay_recipient.lng | 2
interface/web/sites/lib/lang/el_ftp_user.lng | 2
interface/web/mail/lib/lang/el_mail_get_list.lng | 2
interface/web/admin/lib/lang/el_groups_list.lng | 2
interface/web/dns/lib/lang/it_dns_soa.lng | 1
interface/web/help/lib/lang/el_support_message_list.lng | 2
interface/web/sites/lib/lang/el_user_quota_stats_list.lng | 2
interface/web/client/client_edit.php | 8
interface/lib/lang/ru.lng | 142 +++--
interface/web/admin/lib/lang/el_firewall_list.lng | 2
interface/web/admin/lib/lang/el_users_list.lng | 2
interface/web/mail/lib/lang/el_mail_aliasdomain.lng | 2
interface/web/sites/shell_user_edit.php | 2
install/tpl/opensuse_dovecot-sql.conf.master | 2
interface/web/admin/lib/lang/el_server.lng | 2
interface/web/admin/lib/lang/el_software_repo_list.lng | 2
interface/web/admin/lib/lang/el_server_ip_list.lng | 2
interface/web/help/lib/lang/el_help_faq_sections_list.lng | 2
server/plugins-available/nginx_plugin.inc.php | 1
interface/lib/lang/tr.lng | 1
interface/web/mail/lib/lang/el_mail_get.lng | 3
interface/web/sites/lib/lang/el_ftp_user_list.lng | 2
server/cron_daily.php | 4
interface/web/dns/lib/lang/ja_dns_soa.lng | 1
interface/web/mail/lib/lang/el_mail_user_filter.lng | 2
interface/web/admin/lib/lang/el_package_install.lng | 2
interface/web/mail/lib/lang/ja_mail_get.lng | 1
server/plugins-available/cron_plugin.inc.php | 7
interface/web/sites/lib/lang/el_web_aliasdomain_list.lng | 2
interface/web/sites/lib/lang/el_database.lng | 2
interface/lib/lang/hr.lng | 1
server/plugins-available/shelluser_base_plugin.inc.php | 14
interface/web/admin/lib/lang/el_language_import.lng | 2
interface/web/domain/lib/lang/el_domain.lng | 2
interface/web/mail/lib/lang/el_mail_user_filter_list.lng | 2
interface/web/mail/lib/lang/el_mail_domain_catchall.lng | 2
interface/lib/lang/br.lng | 1
interface/web/help/lib/lang/el.lng | 2
interface/web/dns/lib/lang/ar_dns_soa.lng | 1
interface/web/vm/lib/lang/el.lng | 2
interface/web/mail/lib/lang/se_mail_get.lng | 1
interface/web/dns/lib/lang/pt_dns_soa.lng | 1
interface/web/client/lib/lang/el_resellers_list.lng | 2
interface/web/dns/lib/lang/hr_dns_soa.lng | 1
server/mods-available/monitor_core_module.inc.php | 6
interface/web/mail/lib/lang/cz_mail_user.lng | 2
interface/web/help/lib/lang/el_support_message.lng | 2
interface/web/dns/lib/lang/hu_dns_soa.lng | 1
interface/web/dns/lib/lang/el_dns_rp.lng | 2
interface/web/mail/lib/lang/el_spamfilter_users.lng | 2
server/conf/vhost.conf.master | 4
interface/web/dns/lib/lang/el_dns_srv.lng | 2
interface/lib/lang/ar.lng | 1
interface/web/mail/lib/lang/de_mail_get.lng | 1
interface/web/designer/lib/lang/el_module_nav_item_edit.lng | 2
interface/lib/classes/remoting_lib.inc.php | 86 ++
interface/web/login/lib/lang/el.lng | 2
interface/web/admin/lib/lang/el_iptables_list.lng | 2
interface/web/mail/lib/lang/el_mail_forward_list.lng | 2
interface/web/mail/lib/lang/bg_mail_user.lng | 2
interface/web/sites/lib/lang/el_shell_user_list.lng | 2
interface/web/vm/lib/lang/el_openvz_vm_list.lng | 2
interface/web/mail/lib/lang/tr_mail_user.lng | 2
interface/web/dns/lib/lang/id_dns_soa.lng | 1
interface/web/dns/lib/lang/el_dns_a.lng | 2
interface/web/dns/lib/lang/pl_dns_soa.lng | 1
interface/web/mail/lib/lang/de_mail_user.lng | 2
server/plugins-available/ftpuser_base_plugin.inc.php | 12
interface/web/mail/lib/lang/en_mail_user.lng | 2
interface/web/sites/lib/lang/el_shell_user.lng | 2
interface/lib/lang/en.lng | 2
interface/web/designer/lib/lang/el_module_nav_edit.lng | 2
install/tpl/debian6_dovecot-sql.conf.master | 2
interface/web/vm/lib/lang/el_openvz_ip.lng | 2
interface/lib/lang/sk.lng | 1
interface/web/strengthmeter/lib/lang/el_strengthmeter.lng | 2
server/conf/nginx_vhost.conf.master | 27 +
interface/web/designer/lib/lang/el.lng | 2
interface/web/mail/lib/lang/el_mail_spamfilter.lng | 2
interface/lib/classes/plugin.inc.php | 2
interface/web/vm/lib/lang/el_openvz_ostemplate.lng | 2
interface/web/dns/lib/lang/el_dns_cname.lng | 2
interface/web/domain/lib/lang/el_domain_list.lng | 2
interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng | 2
interface/web/mail/lib/lang/el.lng | 2
interface/web/mail/lib/lang/id_mail_get.lng | 1
interface/web/sites/lib/lang/el_web_folder_list.lng | 2
interface/web/mail/lib/lang/ar_mail_user.lng | 2
interface/web/mail/lib/lang/fr_mail_user.lng | 2
interface/web/domain/lib/lang/el.lng | 2
interface/web/sites/lib/lang/el_web_folder.lng | 2
interface/web/mail/lib/lang/pl_mail_user.lng | 2
interface/web/mail/lib/lang/hu_mail_get.lng | 1
interface/web/sites/lib/lang/el_web_sites_stats_list.lng | 2
interface/lib/lang/de.lng | 2
interface/web/mail/lib/lang/ar_mail_get.lng | 1
interface/lib/lang/it.lng | 1
interface/web/dns/lib/lang/el_dns_slave_list.lng | 2
interface/web/help/lib/lang/el_faq_sections_form.lng | 2
interface/web/mail/lib/lang/el_mail_domain.lng | 2
interface/web/mail/lib/lang/fi_mail_user.lng | 2
interface/web/mail/lib/lang/ro_mail_user.lng | 2
interface/web/mail/lib/lang/fi_mail_get.lng | 1
install/dist/lib/opensuse.lib.php | 18
interface/web/sites/web_domain_edit.php | 8
interface/web/mail/lib/lang/el_spamfilter_policy.lng | 2
interface/web/admin/lib/lang/el_software_package_install.lng | 2
interface/web/dns/lib/lang/el_dns_slave.lng | 2
interface/web/vm/lib/lang/el_openvz_action.lng | 2
interface/web/designer/lib/lang/el_form_list.lng | 2
interface/web/mail/lib/lang/br_mail_get.lng | 1
interface/web/mail/lib/lang/ja_mail_user.lng | 2
interface/web/mail/lib/lang/nl_mail_user.lng | 2
interface/web/mail/lib/lang/hr_mail_user.lng | 2
interface/web/mail/lib/lang/el_mail_spamfilter_list.lng | 2
interface/lib/lang/fr.lng | 1
interface/web/mail/lib/lang/pt_mail_user.lng | 2
install/tpl/config.inc.php.master | 2
install/dist/lib/fedora.lib.php | 13
interface/web/dashboard/lib/lang/el_dashlet_modules.lng | 2
interface/web/mail/lib/lang/br_mail_user.lng | 2
interface/web/mail/lib/lang/el_mail_whitelist.lng | 2
install/update.php | 2
interface/web/dns/lib/lang/fr_dns_soa.lng | 1
interface/web/mail/lib/lang/el_spamfilter_whitelist.lng | 2
interface/web/mail/lib/lang/el_mail_blacklist_list.lng | 2
install/lib/installer_base.lib.php | 15
interface/web/help/lib/lang/el_faq_manage_questions_list.lng | 2
interface/web/mail/lib/lang/hr_mail_get.lng | 1
interface/web/vm/lib/lang/el_openvz_ip_list.lng | 2
interface/lib/classes/remoting.inc.php | 162 ++++++
interface/web/mail/lib/lang/el_mail_domain_admin_list.lng | 2
interface/web/vm/lib/lang/el_openvz_vm.lng | 2
interface/web/sites/lib/lang/el_database_admin_list.lng | 2
interface/web/mail/lib/lang/el_mail_mailinglist.lng | 28
interface/web/mail/lib/lang/it_mail_user.lng | 2
interface/web/client/lib/lang/de_client.lng | 4
interface/web/sites/ftp_user_edit.php | 2
interface/web/client/lib/lang/el_client_del.lng | 2
interface/lib/lang/se.lng | 1
interface/web/dns/lib/lang/nl_dns_soa.lng | 1
interface/web/mail/lib/lang/ru_mail_get.lng | 1
interface/web/admin/lib/lang/el_software_package_list.lng | 2
interface/web/mail/form/mail_user.tform.php | 5
interface/web/client/lib/lang/el_clients_list.lng | 2
interface/web/monitor/lib/lang/el.lng | 4
interface/web/dns/lib/lang/el_dns_template_list.lng | 2
interface/web/tools/lib/lang/el.lng | 4
interface/lib/lang/cz.lng | 1
interface/web/admin/lib/lang/el_software_repo.lng | 2
interface/web/designer/lib/lang/el_module_show.lng | 2
interface/web/mail/lib/lang/el_spamfilter_policy_list.lng | 2
interface/web/designer/lib/lang/el_form_edit.lng | 2
interface/lib/lang/fi.lng | 1
interface/web/help/lib/lang/el_faq_form.lng | 10
interface/web/mail/lib/lang/el_mail_domain_list.lng | 2
interface/web/client/lib/lang/el_reseller.lng | 4
interface/web/mail/lib/lang/el_spamfilter_config_list.lng | 2
interface/web/sites/lib/lang/el_webdav_user_list.lng | 2
interface/web/admin/lib/lang/el_server_config_list.lng | 2
interface/web/sites/lib/lang/el_web_domain.lng | 2
interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng | 2
interface/web/sites/lib/lang/el_webdav_user.lng | 2
interface/web/sites/lib/lang/el.lng | 2
interface/web/monitor/lib/lang/el_syslog_list.lng | 2
interface/web/sites/lib/lang/en_ftp_user.lng | 2
interface/web/mail/lib/lang/nl_mail_get.lng | 1
interface/web/sites/lib/lang/el_database_list.lng | 2
install/dist/lib/gentoo.lib.php | 13
interface/web/dns/lib/lang/cz_dns_soa.lng | 1
interface/web/monitor/show_sys_state.php | 11
interface/web/mail/lib/lang/fr_mail_get.lng | 1
interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng | 2
/dev/null | 6
interface/web/admin/lib/lang/el_remote_user.lng | 2
interface/web/dns/lib/lang/es_dns_soa.lng | 1
interface/web/designer/lib/lang/el_module_edit.lng | 2
interface/web/sites/lib/lang/el_web_subdomain.lng | 2
interface/web/mail/lib/lang/pt_mail_get.lng | 1
interface/web/designer/lib/lang/el_form_show.lng | 2
290 files changed, 747 insertions(+), 641 deletions(-)
diff --git a/config/amavis/amavis_sql.conf b/config/amavis/amavis_sql.conf
deleted file mode 100644
index dfcddf1..0000000
--- a/config/amavis/amavis_sql.conf
+++ /dev/null
@@ -1,9 +0,0 @@
- $sql_select_policy =
- 'SELECT *,spamfilter_users.id'.
- ' FROM spamfilter_users LEFT JOIN spamfilter_policy ON spamfilter_users.policy_id=spamfilter_policy.id'.
- ' WHERE spamfilter_users.email IN (%k) ORDER BY spamfilter_users.priority DESC';
-
-
-$sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
- ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' .
- ' ORDER BY spamfilter_wblist.priority DESC';
\ No newline at end of file
diff --git a/config/amavis/amavisd.conf b/config/amavis/amavisd.conf
deleted file mode 100644
index 8dc536a..0000000
--- a/config/amavis/amavisd.conf
+++ /dev/null
@@ -1,1513 +0,0 @@
-use strict;
-
-# Configuration file for amavisd-new
-# Defaults modified for the Debian amavisd-new package
-# $Id: amavisd.conf,v 1.27.2.2 2004/11/18 23:27:55 hmh Exp $
-#
-# This software is licensed under the GNU General Public License (GPL).
-# See comments at the start of amavisd-new for the whole license text.
-
-#Sections:
-# Section I - Essential daemon and MTA settings
-# Section II - MTA specific
-# Section III - Logging
-# Section IV - Notifications/DSN, BOUNCE/REJECT/DROP/PASS destiny, quarantine
-# Section V - Per-recipient and per-sender handling, whitelisting, etc.
-# Section VI - Resource limits
-# Section VII - External programs, virus scanners, SpamAssassin
-# Section VIII - Debugging
-
-#GENERAL NOTES:
-# This file is a normal Perl code, interpreted by Perl itself.
-# - make sure this file (or directory where it resides) is NOT WRITABLE
-# by mere mortals (not even vscan/amavis; best to make it owned by root),
-# otherwise it represents a severe security risk!
-# - for values which are interpreted as booleans, it is recommended
-# to use 1 for true, undef for false.
-# THIS IS DIFFERENT FROM OLD AMAVIS VERSIONS where "no" also meant false,
-# now it means true, like any nonempty string does!
-# - Perl syntax applies. Most notably: strings in "" may include variables
-# (which start with $ or @); to include characters @ and $ in double
-# quoted strings, precede them by a backslash; in single-quoted strings
-# the $ and @ lose their special meaning, so it is usually easier to use
-# single quoted strings (or qw operator) for e-mail addresses.
-# Still, in both cases a backslash needs to be doubled.
-# - variables with names starting with a '@' are lists, the values assigned
-# to them should be lists as well, e.g. ('one@foo', $mydomain, "three");
-# note the comma-separation and parenthesis. If strings in the list
-# do not contain spaces nor variables, a Perl operator qw() may be used
-# as a shorthand to split its argument on whitespace and produce a list
-# of strings, e.g. qw( one@foo example.com three ); Note that the argument
-# to qw is quoted implicitly and no variable interpretation is done within
-# (no '$' variable evaluations). The #-initiated comments can NOT be used
-# within a string. In other words, $ and # lose their special meaning
-# within a qw argument, just like within '...' strings.
-# - all e-mail addresses in this file and as used internally by the daemon
-# are in their raw (rfc2821-unquoted and non-bracketed) form, i.e.
-# Bob "Funny" Dude@example.com, not: "Bob \"Funny\" Dude"@example.com
-# and not <"Bob \"Funny\" Dude"@example.com>; also: '' and not '<>'.
-# - the term 'default value' in examples below refers to the value of a
-# variable pre-assigned to it by the program; any explicit assignment
-# to a variable in this configuration file overrides the default value;
-
-
-#
-# Section I - Essential daemon and MTA settings
-#
-
-# $MYHOME serves as a quick default for some other configuration settings.
-# More refined control is available with each individual setting further down.
-# $MYHOME is not used directly by the program. No trailing slash!
-$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
-
-# $mydomain serves as a quick default for some other configuration settings.
-# More refined control is available with each individual setting further down.
-# $mydomain is never used directly by the program.
-$mydomain = 'example.com'; # (no useful default)
-
-# $myhostname = 'host.example.com'; # fqdn of this host, default by uname(3)
-
-# Set the user and group to which the daemon will change if started as root
-# (otherwise just keeps the UID unchanged, and these settings have no effect):
-$daemon_user = 'amavis'; # (no default (undef))
-$daemon_group = 'amavis'; # (no default (undef))
-
-# Runtime working directory (cwd), and a place where
-# temporary directories for unpacking mail are created.
-# if you change this, you might want to modify the cleanup()
-# function in /etc/init.d/amavisd-new
-# (no trailing slash, may be a scratch file system)
-$TEMPBASE = $MYHOME; # (must be set if other config vars use is)
-#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
-
-# $helpers_home sets environment variable HOME, and is passed as option
-# 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
-# on a normal persistent file system, not a scratch or temporary file system
-#$helpers_home = $MYHOME; # (defaults to $MYHOME)
-
-# Run the daemon in the specified chroot jail if nonempty:
-#$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot)
-
-$pid_file = "/var/run/amavis/amavisd.pid"; # (default: "$MYHOME/amavisd.pid")
-$lock_file = "/var/run/amavis/amavisd.lock"; # (default: "$MYHOME/amavisd.lock")
-
-# set environment variables if you want (no defaults):
-$ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
-#...
-
-
-# MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
-# both $forward_method and $notify_method default to 'smtp:127.0.0.1:10025'
-
-# POSTFIX, or SENDMAIL in dual-MTA setup, or EXIM V4
-# (set host and port number as required; host can be specified
-# as IP address or DNS name (A or CNAME, but MX is ignored)
-$forward_method = 'smtp:127.0.0.1:10025'; # where to forward checked mail
-$notify_method = $forward_method; # where to submit notifications
-
-# NOTE: The defaults (above) are good for Postfix or dual-sendmail. You MUST
-# uncomment the appropriate settings below if using other setups!
-
-# SENDMAIL MILTER, using amavis-milter.c helper program:
-# SEE amavisd-new-milter package docs FOR DEBIAN INSTRUCTIONS
-#$forward_method = undef; # no explicit forwarding, sendmail does it by itself
-# milter; option -odd is needed to avoid deadlocks
-#$notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -Ac -i -odd -f ${sender} -- ${recipient}';
-# just a thought: can we use use -Am instead of -odd ?
-
-# SENDMAIL (old non-milter setup, as relay):
-#$forward_method = 'pipe:flags=q argv=/usr/sbin/sendmail -C/etc/sendmail.orig.cf -i -f ${sender} -- ${recipient}';
-#$notify_method = $forward_method;
-
-# SENDMAIL (old non-milter setup, amavis.c calls local delivery agent):
-#$forward_method = undef; # no explicit forwarding, amavis.c will call LDA
-#$notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -Ac -i -f ${sender} -- ${recipient}';
-
-# EXIM v3 (not recommended with v4 or later, which can use SMTP setup instead):
-#$forward_method = 'pipe:flags=q argv=/usr/sbin/exim -oMr scanned-ok -i -f ${sender} -- ${recipient}';
-#$notify_method = $forward_method;
-
-# prefer to collect mail for forwarding as BSMTP files?
-#$forward_method = "bsmtp:$MYHOME/out-%i-%n.bsmtp";
-#$notify_method = $forward_method;
-
-
-# Net::Server pre-forking settings
-# You may want $max_servers to match the width of your MTA pipe
-# feeding amavisd, e.g. with Postfix the 'Max procs' field in the
-# master.cf file, like the '2' in the: smtp-amavis unix - - n - 2 smtp
-#
-$max_servers = 2; # number of pre-forked children (default 2)
-$max_requests = 10; # retire a child after that many accepts (default 10)
-
-$child_timeout=5*60; # abort child if it does not complete each task in n sec
- # (default: 8*60 seconds)
-
-# Check also the settings of @av_scanners at the end if you want to use
-# virus scanners. If not, you may want to delete the whole long assignment
-# to the variable @av_scanners, which will also remove the virus checking
-# code (e.g. if you only want to do spam scanning).
-
-# Here is a QUICK WAY to completely DISABLE some sections of code
-# that WE DO NOT WANT (it won't even be compiled-in).
-# For more refined controls leave the following two lines commented out,
-# and see further down what these two lookup lists really mean.
-#
-# @bypass_virus_checks_acl = qw( . ); # uncomment to DISABLE anti-virus code
-# @bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code
-#
-# Any setting can be changed with a new assignment, so make sure
-# you do not unintentionally override these settings further down!
-@bypass_spam_checks_acl = qw( . ); # No default dependency on spamassassin
-
-# Lookup list of local domains (see README.lookups for syntax details)
-#
-# NOTE:
-# For backwards compatibility the variable names @local_domains (old) and
-# @local_domains_acl (new) are synonyms. For consistency with other lookups
-# the name @local_domains_acl is now preferred. It also makes it more
-# obviously distinct from the new %local_domains hash lookup table.
-#
-# local_domains* lookup tables are used in deciding whether a recipient
-# is local or not, or in other words, if the message is outgoing or not.
-# This affects inserting spam-related headers for local recipients,
-# limiting recipient virus notifications (if enabled) to local recipients,
-# in deciding if address extension may be appended, and in SQL lookups
-# for non-fqdn addresses. Set it up correctly if you need features
-# that rely on this setting (or just leave empty otherwise).
-#
-# With Postfix (2.0) a quick reminder on what local domains normally are:
-# a union of domains specified in: $mydestination, $virtual_alias_domains,
-# $virtual_mailbox_domains, and $relay_domains.
-#
-@local_domains_acl = ( ".$mydomain" ); # $mydomain and its subdomains
-# @local_domains_acl = ( ".$mydomain", "my.other.domain" );
-# @local_domains_acl = qw(); # default is empty, no recipient treated as local
-# @local_domains_acl = qw( .example.com );
-# @local_domains_acl = qw( .example.com !host.sub.example.net .sub.example.net );
-
-# or alternatively(A), using a Perl hash lookup table, which may be assigned
-# directly, or read from a file, one domain per line; comments and empty lines
-# are ignored, a dot before a domain name implies its subdomains:
-#
-#read_hash(\%local_domains, '/etc/amavis/local_domains');
-
-#or alternatively(B), using a list of regular expressions:
-# $local_domains_re = new_RE( qr'[@.]example\.com$'i );
-#
-# see README.lookups for syntax and semantics
-
-
-#
-# Section II - MTA specific (defaults should be ok)
-#
-
-# if $relayhost_is_client is true, the IP address in $notify_method and
-# $forward_method is dynamically overridden with SMTP client peer address
-# (if available), which makes it possible for several hosts to share one
-# daemon. The static port number is also overridden, and is dynamically
-# calculated as being one above the incoming SMTP/LMTP session port number.
-#
-# These are logged at level 3, so enable logging until you know you got it
-# right.
-$relayhost_is_client = 0; # (defaults to false)
-
-$insert_received_line = 1; # behave like MTA: insert 'Received:' header
- # (does not apply to sendmail/milter)
- # (default is true (1) )
-
-# AMAVIS-CLIENT PROTOCOL INPUT SETTINGS (e.g. with sendmail milter)
-# (used with amavis helper clients like amavis-milter.c and amavis.c,
-# NOT needed for Postfix and Exim or dual-sendmail - keep it undefined.)
-#$unix_socketname = "/var/lib/amavis/amavisd.sock"; # amavis helper protocol socket
-$unix_socketname = undef; # disable listening on a unix socket
- # (default is undef, i.e. disabled)
-
-# Do we receive quoted or raw addresses from the helper program?
-# (does not apply to SMTP; defaults to true)
-#$gets_addr_in_quoted_form = 1; # "Bob \"Funny\" Dude"@example.com
-#$gets_addr_in_quoted_form = 0; # Bob "Funny" Dude@example.com
-
-
-
-# SMTP SERVER (INPUT) PROTOCOL SETTINGS (e.g. with Postfix, Exim v4, ...)
-# (used when MTA is configured to pass mail to amavisd via SMTP or LMTP)
-$inet_socket_port = 10024; # accept SMTP on this local TCP port
- # (default is undef, i.e. disabled)
-# multiple ports may be provided: $inet_socket_port = [10024, 10026, 10028];
-
-# SMTP SERVER (INPUT) access control
-# - do not allow free access to the amavisd SMTP port !!!
-#
-# when MTA is at the same host, use the following (one or the other or both):
-$inet_socket_bind = '127.0.0.1'; # limit socket bind to loopback interface
- # (default is '127.0.0.1')
-@inet_acl = qw( 127.0.0.1 ); # allow SMTP access only from localhost IP
- # (default is qw( 127.0.0.1 ) )
-
-# when MTA (one or more) is on a different host, use the following:
-# @inet_acl = qw(127/8 10.1.0.1 10.1.0.2); # adjust the list as appropriate
-# $inet_socket_bind = undef; # bind to all IP interfaces if undef
-#
-# Example1:
-# @inet_acl = qw( 127/8 10/8 172.16/12 192.168/16 );
-# permit only SMTP access from loopback and rfc1918 private address space
-#
-# Example2:
-# @inet_acl = qw( !192.168.1.12 172.16.3.3 !172.16.3/255.255.255.0
-# 127.0.0.1 10/8 172.16/12 192.168/16 );
-# matches loopback and rfc1918 private address space except host 192.168.1.12
-# and net 172.16.3/24 (but host 172.16.3.3 within 172.16.3/24 still matches)
-#
-# Example3:
-# @inet_acl = qw( 127/8
-# !172.16.3.0 !172.16.3.127 172.16.3.0/25
-# !172.16.3.128 !172.16.3.255 172.16.3.128/25 );
-# matches loopback and both halves of the 172.16.3/24 C-class,
-# split into two subnets, except all four broadcast addresses
-# for these subnets
-#
-# See README.lookups for details on specifying access control lists.
-
-
-#
-# Section III - Logging
-#
-
-# true (e.g. 1) => syslog; false (e.g. 0) => logging to file
-$DO_SYSLOG = 1; # (defaults to false)
-#$SYSLOG_LEVEL = 'user.info'; # (facility.priority, default 'mail.info')
-
-# Log file (if not using syslog)
-$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
-
-#NOTE: levels are not strictly observed and are somewhat arbitrary
-# 0: startup/exit/failure messages, viruses detected
-# 1: args passed from client, some more interesting messages
-# 2: virus scanner output, timing
-# 3: server, client
-# 4: decompose parts
-# 5: more debug details
-#$log_level = 2; # (defaults to 0)
-
-# Customizable template for the most interesting log file entry (e.g. with
-# $log_level=0) (take care to properly quote Perl special characters like '\')
-# For a list of available macros see README.customize .
-
-# only log infected messages (useful with log level 0):
-# $log_templ = '[? %#V |[? %#F ||banned filename ([%F|,])]|infected ([%V|,])]#
-# [? %#V |[? %#F ||, from=[?%o|(?)|<%o>], to=[<%R>|,][? %i ||, quarantine %i]]#
-# |, from=[?%o|(?)|<%o>], to=[<%R>|,][? %i ||, quarantine %i]]';
-
-# log both infected and noninfected messages (default):
-$log_templ = '[? %#V |[? %#F |[?%#D|Not-Delivered|Passed]|BANNED name/type (%F)]|INFECTED (%V)], #
-[?%o|(?)|<%o>] -> [<%R>|,][? %i ||, quarantine %i], Message-ID: %m, Hits: %c';
-
-
-#
-# Section IV - Notifications/DSN, BOUNCE/REJECT/DROP/PASS destiny, quarantine
-#
-
-# Select notifications text encoding when Unicode-aware Perl is converting
-# text from internal character representation to external encoding (charset
-# in MIME terminology). Used as argument to Perl Encode::encode subroutine.
-#
-# to be used in RFC 2047-encoded header field bodies, e.g. in Subject:
-#$hdr_encoding = 'iso-8859-1'; # (default: 'iso-8859-1')
-#
-# to be used in notification body text: its encoding and Content-type.charset
-#$bdy_encoding = 'iso-8859-1'; # (default: 'iso-8859-1')
-
-# Default template texts for notifications may be overruled by directly
-# assigning new text to template variables, or by reading template text
-# from files. A second argument may be specified in a call to read_text(),
-# specifying character encoding layer to be used when reading from the
-# external file, e.g. 'utf8', 'iso-8859-1', or often just $bdy_encoding.
-# Text will be converted to internal character representation by Perl 5.8.0
-# or later; second argument is ignored otherwise. See PerlIO::encoding,
-# Encode::PerlIO and perluniintro man pages.
-#
-# $notify_sender_templ = read_text('/var/amavis/notify_sender.txt');
-# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt');
-# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt');
-# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt');
-# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt');
-# $notify_spam_admin_templ = read_text('/var/amavis/notify_spam_admin.txt');
-
-# If notification template files are collectively available in some directory,
-# use read_l10n_templates which calls read_text for each known template.
-#
-# read_l10n_templates('/etc/amavis/en_US');
-#
-# Debian available locales: en_US, pt_BR, de_DE, it_IT
-read_l10n_templates('en_US', '/etc/amavis');
-
-
-# Here is an overall picture (sequence of events) of how pieces fit together
-# (only virus controls are shown, spam controls work the same way):
-#
-# bypass_virus_checks? ==> PASS
-# no viruses? ==> PASS
-# log virus if $log_templ is nonempty
-# quarantine if $virus_quarantine_to is nonempty
-# notify admin if $virus_admin (lookup) nonempty
-# notify recips if $warnvirusrecip and (recipient is local or $warn_offsite)
-# add address extensions if adding extensions is enabled and virus will pass
-# send (non-)delivery notifications
-# to sender if DSN needed (BOUNCE or ($warn_virus_sender and D_PASS))
-# virus_lovers or final_destiny==D_PASS ==> PASS
-# DISCARD (2xx) or REJECT (5xx) (depending on final_*_destiny)
-#
-# Equivalent flow diagram applies for spam checks.
-# If a virus is detected, spam checking is skipped entirely.
-
-# The following symbolic constants can be used in *destiny settings:
-#
-# D_PASS mail will pass to recipients, regardless of bad contents;
-#
-# D_DISCARD mail will not be delivered to its recipients, sender will NOT be
-# notified. Effectively we lose mail (but will be quarantined
-# unless disabled). Losing mail is not decent for a mailer,
-# but might be desired.
-#
-# D_BOUNCE mail will not be delivered to its recipients, a non-delivery
-# notification (bounce) will be sent to the sender by amavisd-new;
-# Exception: bounce (DSN) will not be sent if a virus name matches
-# $viruses_that_fake_sender_re, or to messages from mailing lists
-# (Precedence: bulk|list|junk);
-#
-# D_REJECT mail will not be delivered to its recipients, sender should
-# preferably get a reject, e.g. SMTP permanent reject response
-# (e.g. with milter), or non-delivery notification from MTA
-# (e.g. Postfix). If this is not possible (e.g. different recipients
-# have different tolerances to bad mail contents and not using LMTP)
-# amavisd-new sends a bounce by itself (same as D_BOUNCE).
-#
-# Notes:
-# D_REJECT and D_BOUNCE are similar, the difference is in who is responsible
-# for informing the sender about non-delivery, and how informative
-# the notification can be (amavisd-new knows more than MTA);
-# With D_REJECT, MTA may reject original SMTP, or send DSN (delivery status
-# notification, colloquially called 'bounce') - depending on MTA;
-# Best suited for sendmail milter, especially for spam.
-# With D_BOUNCE, amavisd-new (not MTA) sends DSN (can better explain the
-# reason for mail non-delivery, but unable to reject the original
-# SMTP session). Best suited to reporting viruses, and for Postfix
-# and other dual-MTA setups, which can't reject original client SMTP
-# session, as the mail has already been enqueued.
-
-$final_virus_destiny = D_DISCARD; # (defaults to D_BOUNCE)
-$final_banned_destiny = D_BOUNCE; # (defaults to D_BOUNCE)
-$final_spam_destiny = D_REJECT; # (defaults to D_REJECT)
-$final_bad_header_destiny = D_PASS; # (defaults to D_PASS), D_BOUNCE suggested
-
-# Alternatives to consider for spam:
-# - use D_PASS if clients will do filtering based on inserted mail headers;
-# - use D_DISCARD, if kill_level is set safely high;
-# - use D_BOUNCE instead of D_REJECT if not using milter;
-#
-# D_BOUNCE is preferred for viruses, but consider:
-# - use D_DISCARD to avoid bothering the rest of the network, it is hopeless
-# to try to keep up with the viruses that faker the envelope sender anyway,
-# and bouncing only increases the network cost of viruses for everyone
-# - use D_PASS (or virus_lovers) and $warnvirussender=1 to deliver viruses;
-# - use D_REJECT instead of D_BOUNCE if using milter and under heavy
-# virus storm;
-#
-# Don't bother to set both D_DISCARD and $warn*sender=1, it will get mapped
-# to D_BOUNCE.
-#
-# The separation of *_destiny values into D_BOUNCE, D_REJECT, D_DISCARD
-# and D_PASS made settings $warnvirussender and $warnspamsender only still
-# useful with D_PASS.
-
-# The following $warn*sender settings are ONLY used when mail is
-# actually passed to recipients ($final_*_destiny=D_PASS, or *_lovers*).
-# Bounces or rejects produce non-delivery status notification anyway.
-
-# Notify virus sender?
-#$warnvirussender = 1; # (defaults to false (undef))
-
-# Notify spam sender?
-#$warnspamsender = 1; # (defaults to false (undef))
-
-# Notify sender of banned files?
-#$warnbannedsender = 1; # (defaults to false (undef))
-
-# Notify sender of syntactically invalid header containing non-ASCII characters?
-#$warnbadhsender = 1; # (defaults to false (undef))
-
-# Notify virus (or banned files) RECIPIENT?
-# (not very useful, but some policies demand it)
-#$warnvirusrecip = 1; # (defaults to false (undef))
-#$warnbannedrecip = 1; # (defaults to false (undef))
-
-# Notify also non-local virus/banned recipients if $warn*recip is true?
-# (including those not matching local_domains*)
-#$warn_offsite = 1; # (defaults to false (undef), i.e. only notify locals)
-
-
-# Treat envelope sender address as unreliable and don't send sender
-# notification / bounces if name(s) of detected virus(es) match the list.
-# Note that virus names are supplied by external virus scanner(s) and are
-# not standardized, so virus names may need to be adjusted.
-# See README.lookups for syntax, check also README.policy-on-notifications
-#
-$viruses_that_fake_sender_re = new_RE(
- qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar'i,
- qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
- qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
- qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
- qr'@mm|@MM', # mass mailing viruses as labeled by f-prot and uvscan
- qr'Worm'i, # worms as labeled by ClamAV, Kaspersky, etc
- [qr'^(EICAR|Joke\.|Junk\.)'i => 0],
- [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i => 0],
- [qr/.*/ => 1], # true by default (remove or comment-out if undesired)
-);
-
-# where to send ADMIN VIRUS NOTIFICATIONS (should be a fully qualified address)
-# - the administrator address may be a simple fixed e-mail address (a scalar),
-# or may depend on the SENDER address (e.g. its domain), in which case
-# a ref to a hash table can be specified (specify lower-cased keys,
-# dot is a catchall, see README.lookups).
-#
-# Empty or undef lookup disables virus admin notifications.
-
-# $virus_admin = undef; # do not send virus admin notifications (default)
-# $virus_admin = {'not.example.com' => '', '.' => 'virusalert@example.com'};
-# $virus_admin = 'virus-admin@example.com';
-$virus_admin = "postmaster\@$mydomain"; # due to D_DISCARD default
-
-# equivalent to $virus_admin, but for spam admin notifications:
-# $spam_admin = "spamalert\@$mydomain";
-# $spam_admin = undef; # do not send spam admin notifications (default)
-# $spam_admin = {'not.example.com' => '', '.' => 'spamalert@example.com'};
-
-#advanced example, using a hash lookup table:
-#$virus_admin = {
-# 'baduser@sub1.example.com' => 'HisBoss@sub1.example.com',
-# '.sub1.example.com' => 'virusalert@sub1.example.com',
-# '.sub2.example.com' => '', # don't send admin notifications
-# 'a.sub3.example.com' => 'abuse@sub3.example.com',
-# '.sub3.example.com' => 'virusalert@sub3.example.com',
-# '.example.com' => 'noc@example.com', # catchall for our virus senders
-# '.' => 'virusalert@hq.example.com', # catchall for the rest
-#};
-
-
-# whom notification reports are sent from (ENVELOPE SENDER);
-# may be a null reverse path, or a fully qualified address:
-# (admin and recip sender addresses default to $mailfrom
-# for compatibility, which in turn defaults to undef (empty) )
-# If using strings in double quotes, don't forget to quote @, i.e. \@
-#
-#$mailfrom_notify_admin = "virusalert\@$mydomain";
-#$mailfrom_notify_recip = "virusalert\@$mydomain";
-#$mailfrom_notify_spamadmin = "spam.police\@$mydomain";
-
-# 'From' HEADER FIELD for sender and admin notifications.
-# This should be a replyable address, see rfc1894. Not to be confused
-# with $mailfrom_notify_sender, which is the envelope return address
-# and should be empty (null reverse path) according to rfc2821.
-#
-# The syntax of the 'From' header field is specified in rfc2822, section
-# '3.4. Address Specification'. Note in particular that display-name must be
-# a quoted-string if it contains any special characters like spaces and dots.
-#
-# $hdrfrom_notify_sender = "amavisd-new <postmaster\@$mydomain>";
-# $hdrfrom_notify_sender = 'amavisd-new <postmaster@example.com>';
-# $hdrfrom_notify_sender = '"Content-Filter Master" <postmaster@example.com>';
-# (defaults to: "amavisd-new <postmaster\@$myhostname>")
-# $hdrfrom_notify_admin = $mailfrom_notify_admin;
-# (defaults to: $mailfrom_notify_admin)
-# $hdrfrom_notify_spamadmin = $mailfrom_notify_spamadmin;
-# (defaults to: $mailfrom_notify_spamadmin)
-
-# whom quarantined messages appear to be sent from (envelope sender);
-# keeps original sender if undef, or set it explicitly, default is undef
-$mailfrom_to_quarantine = ''; # override sender address with null return path
-
-
-# Location to put infected mail into: (applies to 'local:' quarantine method)
-# empty for not quarantining, may be a file (mailbox),
-# or a directory (no trailing slash)
-# (the default value is undef, meaning no quarantine)
-#
-$QUARANTINEDIR = '/var/lib/amavis/virusmails';
-
-#$virus_quarantine_method = "local:virus-%i-%n"; # default
-#$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
-#
-#use the new 'bsmtp:' method as an alternative to the default 'local:'
-#$virus_quarantine_method = "bsmtp:$QUARANTINEDIR/virus-%i-%n.bsmtp";
-#$spam_quarantine_method = "bsmtp:$QUARANTINEDIR/spam-%b-%i-%n.bsmtp";
-
-# When using the 'local:' quarantine method (default), the following applies:
-#
-# A finer control of quarantining is available through variable
-# $virus_quarantine_to/$spam_quarantine_to. It may be a simple scalar string,
-# or a ref to a hash lookup table, or a regexp lookup table object,
-# which makes possible to set up per-recipient quarantine addresses.
-#
-# The value of scalar $virus_quarantine_to/$spam_quarantine_to (or a
-# per-recipient lookup result from the hash table %$virus_quarantine_to)
-# is/are interpreted as follows:
-#
-# VARIANT 1:
-# empty or undef disables quarantine;
-#
-# VARIANT 2:
-# a string NOT containing an '@';
-# amavisd will behave as a local delivery agent (LDA) and will quarantine
-# viruses to local files according to hash %local_delivery_aliases (pseudo
-# aliases map) - see subroutine mail_to_local_mailbox() for details.
-# Some of the predefined aliases are 'virus-quarantine' and 'spam-quarantine'.
-# Setting $virus_quarantine_to ($spam_quarantine_to) to this string will:
-#
-# * if $QUARANTINEDIR is a directory, each quarantined virus will go
-# to a separate file in the $QUARANTINEDIR directory (traditional
-# amavis style, similar to maildir mailbox format);
-#
-# * otherwise $QUARANTINEDIR is treated as a file name of a Unix-style
-# mailbox. All quarantined messages will be appended to this file.
-# Amavisd child process must obtain an exclusive lock on the file during
-# delivery, so this may be less efficient than using individual files
-# or forwarding to MTA, and it may not work across NFS or other non-local
-# file systems (but may be handy for pickup of quarantined files via IMAP
-# for example);
-#
-# VARIANT 3:
-# any email address (must contain '@').
-# The e-mail messages to be quarantined will be handed to MTA
-# for delivery to the specified address. If a recipient address local to MTA
-# is desired, you may leave the domain part empty, e.g. 'infected@', but the
-# '@' character must nevertheless be included to distinguish it from variant 2.
-#
-# This method enables more refined delivery control made available by MTA
-# (e.g. its aliases file, other local delivery agents, dealing with
-# privileges and file locking when delivering to user's mailbox, nonlocal
-# delivery and forwarding, fan-out lists). Make sure the mail-to-be-quarantined
-# will not be handed back to amavisd for checking, as this will cause a loop
-# (hopefully broken at some stage)! If this can be assured, notifications
-# will benefit too from not being unnecessarily virus-scanned.
-#
-# By default this is safe to do with Postfix and Exim v4 and dual-sendmail
-# setup, but probably not safe with sendmail milter interface without
-# precaution.
-
-# (the default value is undef, meaning no quarantine)
-
-$virus_quarantine_to = 'virus-quarantine'; # traditional local quarantine
-#$virus_quarantine_to = 'infected@'; # forward to MTA for delivery
-#$virus_quarantine_to = "virus-quarantine\@$mydomain"; # similar
-#$virus_quarantine_to = 'virus-quarantine@example.com'; # similar
-#$virus_quarantine_to = undef; # no quarantine
-#
-#$virus_quarantine_to = new_RE( # per-recip multiple quarantines
-# [qr'^user@example\.com$'i => 'infected@'],
-# [qr'^(.*)@example\.com$'i => 'virus-${1}@example.com'],
-# [qr'^(.*)(@[^@])?$'i => 'virus-${1}${2}'],
-# [qr/.*/ => 'virus-quarantine'] );
-
-# similar for spam
-# (the default value is undef, meaning no quarantine)
-#
-$spam_quarantine_to = 'spam-quarantine';
-#$spam_quarantine_to = "spam-quarantine\@$mydomain";
-#$spam_quarantine_to = new_RE( # per-recip multiple quarantines
-# [qr'^(.*)@example\.com$'i => 'spam-${1}@example.com'],
-# [qr/.*/ => 'spam-quarantine'] );
-
-# In addition to per-recip quarantine, a by-sender lookup is possible. It is
-# similar to $spam_quarantine_to, but the lookup key is the sender address:
-#$spam_quarantine_bysender_to = undef; # dflt: no by-sender spam quarantine
-
-
-# Add X-Virus-Scanned header field to mail?
-$X_HEADER_TAG = 'X-Virus-Scanned'; # (default: undef)
-# Leave empty to add no header # (default: undef)
-$X_HEADER_LINE = "by $myversion (Debian) at $mydomain";
-
-# a string to prepend to Subject (for local recipients only) if mail could
-# not be decoded or checked entirely, e.g. due to password-protected archives
-$undecipherable_subject_tag = '***UNCHECKED*** '; # undef disables it
-
-$remove_existing_x_scanned_headers = 0; # leave existing X-Virus-Scanned alone
-#$remove_existing_x_scanned_headers= 1; # remove existing headers
- # (defaults to false)
-#$remove_existing_spam_headers = 0; # leave existing X-Spam* headers alone
-$remove_existing_spam_headers = 1; # remove existing spam headers if
- # spam scanning is enabled (default)
-
-# set $bypass_decode_parts to true if you only do spam scanning, or if you
-# have a good virus scanner that can deal with compression and recursively
-# unpacking archives by itself, and save amavisd the trouble.
-# Disabling decoding also causes banned_files checking to only see
-# MIME names and MIME content types, not the content classification types
-# as provided by the file(1) utility.
-# It is a double-edged sword, make sure you know what you are doing!
-#
-#$bypass_decode_parts = 1; # (defaults to false)
-
-# don't trust this file type or corresponding unpacker for this file type,
-# keep both the original and the unpacked file for a virus checker to see
-# (lookup key is what file(1) utility returned):
-#
-$keep_decoded_original_re = new_RE(
-# qr'^MAIL$', # retain full original message for virus checking (can be slow)
- qr'^MAIL-UNDECIPHERABLE$', # retain full mail if it contains undecipherables
- qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
-# qr'^Zip archive data',
-);
-
-# Checking for banned MIME types and names. If any mail part matches,
-# the whole mail is rejected, much like the way viruses are handled.
-# A list in object $banned_filename_re can be defined to provide a list
-# of Perl regular expressions to be matched against each part's:
-#
-# * Content-Type value (both declared and effective mime-type),
-# including the possible security risk content types
-# message/partial and message/external-body, as specified by rfc2046;
-#
-# * declared (i.e. recommended) file names as specified by MIME subfields
-# Content-Disposition.filename and Content-Type.name, both in their
-# raw (encoded) form and in rfc2047-decoded form if applicable;
-#
-# * file content type as guessed by 'file' utility, both the raw
-# result from 'file', as well as short type name, classified
-# into names such as .asc, .txt, .html, .doc, .jpg, .pdf,
-# .zip, .exe, ... - see subroutine determine_file_types().
-# This step is done only if $bypass_decode_parts is not true.
-#
-# * leave $banned_filename_re undefined to disable these checks
-# (giving an empty list to new_RE() will also always return false)
-
-$banned_filename_re = new_RE(
-# qr'^UNDECIPHERABLE$', # is or contains any undecipherable components
- qr'\.[^.]*\.(exe|vbs|pif|scr|bat|cmd|com|dll)$'i, # some double extensions
- qr'[{}]', # curly braces in names (serve as Class ID extensions - CLSID)
-# qr'.\.(exe|vbs|pif|scr|bat|cmd|com)$'i, # banned extension - basic
-# qr'.\.(ade|adp|bas|bat|chm|cmd|com|cpl|crt|exe|hlp|hta|inf|ins|isp|js|
-# jse|lnk|mdb|mde|msc|msi|msp|mst|pcd|pif|reg|scr|sct|shs|shb|vb|
-# vbe|vbs|wsc|wsf|wsh)$'ix, # banned extension - long
-# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i, # banned extension - WinZip vulnerab.
-# qr'^\.(zip|lha|tnef|cab)$'i, # banned file(1) types
-# qr'^\.exe$'i, # banned file(1) types
-# qr'^application/x-msdownload$'i, # banned MIME types
-# qr'^application/x-msdos-program$'i,
- qr'^message/partial$'i, # rfc2046. this one is deadly for Outcrook
-# qr'^message/external-body$'i, # block rfc2046
-);
-# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631
-# and http://www.cknow.com/vtutor/vtextensions.htm
-
-# A little trick: a pattern qr'\.exe$' matches both a short type name '.exe',
-# as well as any file name which happens to end with .exe. If only matching
-# a file name is desired, but not the short name, a pattern qr'.\.exe$'i
-# or similar may be used, which requires that at least one character precedes
-# the '.exe', and so it will never match short file types, which always start
-# with a dot.
-
-
-#
-# Section V - Per-recipient and per-sender handling, whitelisting, etc.
-#
-
-# %virus_lovers, @virus_lovers_acl and $virus_lovers_re lookup tables:
-# (these should be considered policy options, they do not disable checks,
-# see bypass*checks for that!)
-#
-# Exclude certain RECIPIENTS from virus filtering by adding their lower-cased
-# envelope e-mail address (or domain only) to the hash %virus_lovers, or to
-# the access list @virus_lovers_acl - see README.lookups and examples.
-# Make sure the appropriate form (e.g. external/internal) of address
-# is used in case of virtual domains, or when mapping external to internal
-# addresses, etc. - this is MTA-specific.
-#
-# Notifications would still be generated however (see the overall
-# picture above), and infected mail (if passed) gets additional header:
-# X-AMaViS-Alert: INFECTED, message contains virus: ...
-# (header not inserted with milter interface!)
-#
-# NOTE (milter interface only): in case of multiple recipients,
-# it is only possible to drop or accept the message in its entirety - for all
-# recipients. If all of them are virus lovers, we'll accept mail, but if
-# at least one recipient is not a virus lover, we'll discard the message.
-
-
-# %bypass_virus_checks, @bypass_virus_checks_acl and $bypass_virus_checks_re
-# lookup tables:
-# (this is mainly a time-saving option, unlike virus_lovers* !)
-#
-# Similar in concept to %virus_lovers, a hash %bypass_virus_checks,
-# access list @bypass_virus_checks_acl and regexp list $bypass_virus_checks_re
-# are used to skip entirely the decoding, unpacking and virus checking,
-# but only if ALL recipients match the lookup.
-#
-# %bypass_virus_checks/@bypass_virus_checks_acl/$bypass_virus_checks_re
-# do NOT GUARANTEE the message will NOT be checked for viruses - this may
-# still happen when there is more than one recipient for a message, and
-# not all of them match these lookup tables. To guarantee virus delivery,
-# a recipient must also match %virus_lovers/@virus_lovers_acl lookups
-# (but see milter limitations above),
-
-# NOTE: it would not be clever to base virus checks on SENDER address,
-# since there are no guarantees that it is genuine. Many viruses
-# and spam messages fake sender address. To achieve selective filtering
-# based on the source of the mail (e.g. IP address, MTA port number, ...),
-# use mechanisms provided by MTA if available.
-
-
-# Similar to lookup tables controlling virus checking, there exist
-# spam scanning, banned names/types, and headers_checks control counterparts:
-# %spam_lovers, @spam_lovers_acl, $spam_lovers_re
-# %banned_files_lovers, @banned_files_lovers_acl, $banned_files_lovers_re
-# %bad_header_lovers, @bad_header_lovers_acl, $bad_header_lovers_re
-# and:
-# %bypass_spam_checks/@bypass_spam_checks_acl/$bypass_spam_checks_re
-# %bypass_banned_checks/@bypass_banned_checks_acl/$bypass_banned_checks_re
-# %bypass_header_checks/@bypass_header_checks_acl/$bypass_header_checks_re
-# See README.lookups for details about the syntax.
-
-# The following example disables spam checking altogether,
-# since it matches any recipient e-mail address (any address
-# is a subdomain of the top-level root DNS domain):
-# @bypass_spam_checks_acl = qw( . );
-
-# @bypass_header_checks_acl = qw( user@example.com );
-# @bad_header_lovers_acl = qw( user@example.com );
-
-
-# See README.lookups for further detail, and examples below.
-
-# $virus_lovers{lc("postmaster\@$mydomain")} = 1;
-# $virus_lovers{lc('postmaster@example.com')} = 1;
-# $virus_lovers{lc('abuse@example.com')} = 1;
-# $virus_lovers{lc('some.user@')} = 1; # this recipient, regardless of domain
-# $virus_lovers{lc('boss@example.com')} = 0; # never, even if domain matches
-# $virus_lovers{lc('example.com')} = 1; # this domain, but not its subdomains
-# $virus_lovers{lc('.example.com')}= 1; # this domain, including its subdomains
-#or:
-# @virus_lovers_acl = qw( me@lab.xxx.com !lab.xxx.com .xxx.com yyy.org );
-#
-# $bypass_virus_checks{lc('some.user2@butnot.example.com')} = 1;
-# @bypass_virus_checks_acl = qw( some.ddd !butnot.example.com .example.com );
-
-# @virus_lovers_acl = qw( postmaster@example.com );
-# $virus_lovers_re = new_RE( qr'^(helpdesk|postmaster)@example\.com$'i );
-
-# $spam_lovers{lc("postmaster\@$mydomain")} = 1;
-# $spam_lovers{lc('postmaster@example.com')} = 1;
-# $spam_lovers{lc('abuse@example.com')} = 1;
-# @spam_lovers_acl = qw( !.example.com );
-# $spam_lovers_re = new_RE( qr'^user@example\.com$'i );
-
-
-# don't run spam check for these RECIPIENT domains:
-# @bypass_spam_checks_acl = qw( d1.com .d2.com a.d3.com );
-# or the other way around (bypass check for all BUT these):
-# @bypass_spam_checks_acl = qw( !d1.com !.d2.com !a.d3.com . );
-# a practical application: don't check outgoing mail for spam:
-# @bypass_spam_checks_acl = ( "!.$mydomain", "." );
-# (a downside of which is that such mail will not count as ham in SA bayes db)
-
-
-# Where to find SQL server(s) and database to support SQL lookups?
-# A list of triples: (dsn,user,passw). (dsn = data source name)
-# More than one entry may be specified for multiple (backup) SQL servers.
-# See 'man DBI', 'man DBD::mysql', 'man DBD::Pg', ... for details.
-# When chroot-ed, accessing SQL server over inet socket may be more convenient.
-#
-# @lookup_sql_dsn =
-# ( ['DBI:mysql:database=mail;host=127.0.0.1;port=3306', 'user1', 'passwd1'],
-# ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'] );
-#
-
-@lookup_sql_dsn = ( ['DBI:mysql:database=mailserver;host=127.0.0.1;port=3306', 'root', '']);
-
-
-# ('mail' in the example is the database name, choose what you like)
-# With PostgreSQL the dsn (first element of the triple) may look like:
-# 'DBI:Pg:host=host1;dbname=mail'
-
-# The SQL select clause to fetch per-recipient policy settings.
-# The %k will be replaced by a comma-separated list of query addresses
-# (e.g. full address, domain only, catchall). Use ORDER, if there
-# is a chance that multiple records will match - the first match wins.
-# If field names are not unique (e.g. 'id'), the later field overwrites the
-# earlier in a hash returned by lookup, which is why we use '*,users.id'.
-
-$sql_select_policy = 'SELECT *,users.id FROM users,policy'.
- ' WHERE (users.policy_id=policy.id) AND (users.email IN (%k))'.
- ' ORDER BY users.priority DESC';
-
-# The SQL select clause to check sender in per-recipient whitelist/blacklist
-# The first SELECT argument '?' will be users.id from recipient SQL lookup,
-# the %k will be sender addresses (e.g. full address, domain only, catchall).
-$sql_select_white_black_list = 'SELECT wb FROM wblist,mailaddr'.
- ' WHERE (wblist.rid=?) AND (wblist.sid=mailaddr.id)'.
- ' AND (mailaddr.email IN (%k))'.
- ' ORDER BY mailaddr.priority DESC';
-
-# $sql_select_white_black_list = undef; # undef disables SQL white/blacklisting
-
-
-# If you decide to pass viruses (or spam) to certain recipients using the
-# above lookup tables or using $final_virus_destiny=D_PASS, you can set
-# the variable $addr_extension_virus ($addr_extension_spam) to some
-# string, and the recipient address will have this string appended
-# as an address extension to the local-part of the address. This extension
-# can be used by final local delivery agent to place such mail in different
-# folders. Leave these two variables undefined or empty strings to prevent
-# appending address extensions. Setting has no effect on recipient which will
-# not be receiving viruses/spam. Recipients who do not match lookup tables
-# local_domains* are not affected.
-#
-# LDAs usually default to stripping away address extension if no special
-# handling is specified, so having this option enabled normally does no harm,
-# provided the $recipients_delimiter matches the setting on the final
-# MTA's LDA.
-
-# $addr_extension_virus = 'virus'; # (default is undef, same as empty)
-# $addr_extension_spam = 'spam'; # (default is undef, same as empty)
-# $addr_extension_banned = 'banned'; # (default is undef, same as empty)
-
-
-# Delimiter between local part of the recipient address and address extension
-# (which can optionally be added, see variables $addr_extension_virus and
-# $addr_extension_spam). E.g. recipient address <user@example.com> gets changed
-# to <user+virus@example.com>.
-#
-# Delimiter should match equivalent (final) MTA delimiter setting.
-# (e.g. for Postfix add 'recipient_delimiter = +' to main.cf)
-# Setting it to an empty string or to undef disables this feature
-# regardless of $addr_extension_virus and $addr_extension_spam settings.
-
-$recipient_delimiter = '+'; # (default is '+')
-
-# true: replace extension; false: append extension
-$replace_existing_extension = 1; # (default is false)
-
-# Affects matching of localpart of e-mail addresses (left of '@')
-# in lookups: true = case sensitive, false = case insensitive
-$localpart_is_case_sensitive = 0; # (default is false)
-
-
-# ENVELOPE SENDER WHITELISTING / BLACKLISTING - GLOBAL (RECIPIENT-INDEPENDENT)
-# (affects spam checking only, has no effect on virus and other checks)
-
-# WHITELISTING: use ENVELOPE SENDER lookups to ENSURE DELIVERY from whitelisted
-# senders even if the message would be recognized as spam. Effectively, for
-# the specified senders, message recipients temporarily become 'spam_lovers'.
-# To avoid surprises, whitelisted sender also suppresses inserting/editing
-# the tag2-level header fields (X-Spam-*, Subject), appending spam address
-# extension, and quarantining.
-
-# BLACKLISTING: messages from specified SENDERS are DECLARED SPAM.
-# Effectively, for messages from blacklisted senders, spam level
-# is artificially pushed high, and the normal spam processing applies,
-# resulting in 'X-Spam-Flag: YES', high 'X-Spam-Level' bar and other usual
-# reactions to spam, including possible rejection. If the message nevertheless
-# still passes (e.g. for spam loving recipients), it is tagged as BLACKLISTED
-# in the 'X-Spam-Status' header field, but the reported spam value and
-# set of tests in this report header field (if available from SpamAssassin,
-# which may have not been called) is not adjusted.
-#
-# A sender may be both white- and blacklisted at the same time, settings
-# are independent. For example, being both white- and blacklisted, message
-# is delivered to recipients, but is not tagged as spam (X-Spam-Flag: No;
-# X-Spam-Status: No, ...), but the reported spam level (if computed) may
-# still indicate high spam score.
-#
-# If ALL recipients of the message either white- or blacklist the sender,
-# spam scanning (calling the SpamAssassin) is bypassed, saving on time.
-#
-# The following variables (lookup tables) are available, with the semantics
-# and syntax as specified in README.lookups:
-#
-# %whitelist_sender, @whitelist_sender_acl, $whitelist_sender_re
-# %blacklist_sender, @blacklist_sender_acl, $blacklist_sender_re
-
-# SOME EXAMPLES:
-#
-#ACL:
-# @whitelist_sender_acl = qw( .example.com );
-#
-# @whitelist_sender_acl = ( ".$mydomain" ); # $mydomain and its subdomains
-# NOTE: This is not a reliable way of turning off spam checks for
-# locally-originating mail, as sender address can easily be faked.
-# To reliably avoid spam-scanning outgoing mail,
-# use @bypass_spam_checks_acl .
-
-#RE:
-# $whitelist_sender_re = new_RE(
-# qr'^postmaster@.*\bexample\.com$'i,
-# qr'owner-[^@]*@'i, qr'-request@'i,
-# qr'\.example\.com$'i );
-#
-$blacklist_sender_re = new_RE(
- qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou|greatcasino)@'i,
- qr'^(investments|lose_weight_today|market\.alert|money2you|MyGreenCard)@'i,
- qr'^(new\.tld\.registry|opt-out|opt-in|optin|saveonl|smoking2002k)@'i,
- qr'^(specialoffer|specialoffers|stockalert|stopsnoring|wantsome)@'i,
- qr'^(workathome|yesitsfree|your_friend|greatoffers)@'i,
- qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i,
-);
-
-#HASH lookup variant:
-# NOTE: Perl operator qw splits its argument string by whitespace
-# and produces a list. This means that addresses can not contain
-# whitespace, and there is no provision for comments within the string.
-# You can use the normal Perl list syntax if you have special requirements,
-# e.g. map {...} ('one user@bla', '.second.com'), or use read_hash to read
-# addresses from a file.
-#
-
-# a hash lookup table can be read from a file,
-# one address per line, comments and empty lines are permitted:
-#
-# read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
-
-# ... or set directly:
-map { $whitelist_sender{lc($_)}=1 } (qw(
- nobody@cert.org
- owner-alert@iss.net
- slashdot@slashdot.org
- bugtraq@securityfocus.com
- NTBUGTRAQ@LISTSERV.NTBUGTRAQ.COM
- security-alerts@linuxsecurity.com
- amavis-user-admin@lists.sourceforge.net
- razor-users-admin@lists.sourceforge.net
- notification-return@lists.sophos.com
- mailman-announce-admin@python.org
- zope-announce-admin@zope.org
- owner-postfix-users@postfix.org
- owner-postfix-announce@postfix.org
- owner-sendmail-announce@lists.sendmail.org
- sendmail-announce-request@lists.sendmail.org
- ca+envelope@sendmail.org
- owner-technews@postel.ACM.ORG
- lvs-users-admin@LinuxVirtualServer.org
- ietf-123-owner@loki.ietf.org
- cvs-commits-list-admin@gnome.org
- rt-users-admin@lists.fsck.com
- owner-announce@mnogosearch.org
- owner-hackers@ntp.org
- owner-bugs@ntp.org
- clp-request@comp.nus.edu.sg
- surveys-errors@lists.nua.ie
- emailNews@genomeweb.com
- owner-textbreakingnews@CNNIMAIL12.CNN.COM
- yahoo-dev-null@yahoo-inc.com
-));
-
-
-# ENVELOPE SENDER WHITELISTING / BLACKLISTING - PER-RECIPIENT
-
-# The same semantics as for global white/blacklisting applies, but this
-# time each recipient (or its domain, or subdomain, ...) can be given
-# an individual lookup table for matching senders. The per-recipient lookups
-# override the global lookups, which serve as a fallback default.
-
-# Specify a two-level lookup table: the key for the outer table is recipient,
-# and the result should be an inner lookup table (hash or ACL or RE),
-# where the key used will be the sender.
-#
-#$per_recip_blacklist_sender_lookup_tables = {
-# 'user1@my.example.com'=>new_RE(qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i),
-# 'user2@my.example.com'=>[qw( spammer@d1.example,org .d2.example,org )],
-#};
-#$per_recip_whitelist_sender_lookup_tables = {
-# 'user@my.example.com' => [qw( friend@example.org .other.example.org )],
-# '.my1.example.com' => [qw( !foe.other.example,org .other.example,org )],
-# '.my2.example.com' => read_hash('/var/amavis/my2-wl.dat'),
-# 'abuse@' => { 'postmaster@'=>1,
-# 'cert-advisory-owner@cert.org'=>1, 'owner-alert@iss.net'=>1 },
-#};
-
-
-#
-# Section VI - Resource limits
-#
-
-# Sanity limit to the number of allowed recipients per SMTP transaction
-# $smtpd_recipient_limit = 1000; # (default is 1000)
-
-
-# Resource limits to protect unpackers, decompressors and virus scanners
-# against mail bombs (e.g. 42.zip)
-
-# Maximum recursion level for extraction/decoding (0 or undef disables limit)
-$MAXLEVELS = 14; # (default is undef, no limit)
-
-# Maximum number of extracted files (0 or undef disables the limit)
-$MAXFILES = 1500; # (default is undef, no limit)
-
-# For the cumulative total of all decoded mail parts we set max storage size
-# to defend against mail bombs. Even though parts may be deleted (replaced
-# by decoded text) during decoding, the size they occupied is _not_ returned
-# to the quota pool.
-#
-# Parameters to storage quota formula for unpacking/decoding/decompressing
-# Formula:
-# quota = max($MIN_EXPANSION_QUOTA,
-# $mail_size*$MIN_EXPANSION_FACTOR,
-# min($MAX_EXPANSION_QUOTA, $mail_size*$MAX_EXPANSION_FACTOR))
-# In plain words (later condition overrules previous ones):
-# allow MAX_EXPANSION_FACTOR times initial mail size,
-# but not more than MAX_EXPANSION_QUOTA,
-# but not less than MIN_EXPANSION_FACTOR times initial mail size,
-# but never less than MIN_EXPANSION_QUOTA
-#
-$MIN_EXPANSION_QUOTA = 100*1024; # bytes (default undef, not enforced)
-$MAX_EXPANSION_QUOTA = 300*1024*1024; # bytes (default undef, not enforced)
-$MIN_EXPANSION_FACTOR = 5; # times original mail size (must be specified)
-$MAX_EXPANSION_FACTOR = 500; # times original mail size (must be specified)
-
-
-#
-# Section VII - External programs, virus scanners
-#
-
-# Specify a path string, which is a colon-separated string of directories
-# (no trailing slashes!) to be assigned to the environment variable PATH
-# and to serve for locating external programs below.
-
-# NOTE: if $daemon_chroot_dir is nonempty, the directories will be
-# relative to the chroot directory specified;
-
-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
-
-# Specify one string or a search list of strings (first match wins).
-# The string (or: each string in a list) may be an absolute path,
-# or just a program name, to be located via $path;
-# Empty string or undef (=default) disables the use of that external program.
-# Optionally command arguments may be specified - only the first substring
-# up to the whitespace is used for file searching.
-
-$file = 'file'; # file(1) utility; use 3.41 or later to avoid vulnerability
-
-$gzip = 'gzip';
-$bzip2 = 'bzip2';
-$lzop = 'lzop';
-$uncompress = ['uncompress', 'gzip -d', 'zcat'];
-$unfreeze = ['unfreeze', 'freeze -d', 'melt', 'fcat'];
-$arc = ['nomarch', 'arc'];
-$unarj = ['arj', 'unarj']; # both can extract, arj is recommended
-$unrar = ['rar', 'unrar']; # both can extract, same options
-$zoo = 'zoo';
-$lha = 'lha';
-$cpio = 'cpio'; # comment out if cpio does not support GNU options
-
-
-# SpamAssassin settings
-
-# $sa_local_tests_only is passed to Mail::SpamAssassin::new as a value
-# of the option local_tests_only. See Mail::SpamAssassin man page.
-# If set to 1, SA tests are restricted to local tests only, i.e. no tests
-# that require internet access will be performed.
-#
-$sa_local_tests_only = 1; # (default: false)
-#$sa_auto_whitelist = 1; # turn on AWL (default: false)
-
-# Timout for SpamAssassin. This is only used if spamassassin does NOT
-# override it (which it often does if sa_local_tests_only is not true)
-$sa_timeout = 30; # timeout in seconds for a call to SpamAssassin
- # (default is 30 seconds, undef disables it)
-
-# AWL (auto whitelisting), requires spamassassin 2.44 or better
-# $sa_auto_whitelist = 1; # defaults to undef
-
-$sa_mail_body_size_limit = 150*1024; # don't waste time on SA is mail is larger
- # (less than 1% of spam is > 64k)
- # default: undef, no limitations
-
-# default values, can be overridden by more specific lookups, e.g. SQL
-$sa_tag_level_deflt = 4.0; # add spam info headers if at, or above that level
-$sa_tag2_level_deflt = 6.3; # add 'spam detected' headers at that level
-$sa_kill_level_deflt = $sa_tag2_level_deflt; # triggers spam evasive actions
- # at or above that level: bounce/reject/drop,
- # quarantine, and adding mail address extension
-
-$sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent,
- # effectively turning D_BOUNCE into D_DISCARD;
- # undef disables this feature and is a default;
-
-#
-# The $sa_tag_level_deflt, $sa_tag2_level_deflt and $sa_kill_level_deflt
-# may also be hashrefs to hash lookup tables, to make static per-recipient
-# settings possible without having to resort to SQL or LDAP lookups.
-
-# a quick reference:
-# tag_level controls adding the X-Spam-Status and X-Spam-Level headers,
-# tag2_level controls adding 'X-Spam-Flag: YES', and editing Subject,
-# kill_level controls 'evasive actions' (reject, quarantine, extensions);
-# it only makes sense to maintain the relationship:
-# tag_level <= tag2_level <= kill_level < $sa_dsn_cutoff_level
-
-# string to prepend to Subject header field when message exceeds tag2 level
-$sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled)
- # (only seen when spam is not to be rejected
- # and recipient is in local_domains*)
-
-#$sa_spam_modifies_subj = 1; # may be a ref to a lookup table, default is true
-# Example: modify Subject for all local recipients except user@example.com
-#$sa_spam_modifies_subj = [qw( !user@example.com . )];
-
-# stop anti-virus scanning when the first scanner detects a virus?
-$first_infected_stops_scan = 1; # default is false, all scanners are called
-
-# @av_scanners is a list of n-tuples, where fields semantics is:
-# 1. av scanner plain name, to be used in log and reports;
-# 2. scanner program name; this string will be submitted to subroutine
-# find_external_programs(), which will try to find the full program
-# path name; if program is not found, this scanner is disabled.
-# Besides a simple string (full program path name or just the basename
-# to be looked for in PATH), this may be an array ref of alternative
-# program names or full paths - the first match in the list will be used;
-# As a special case for more complex scanners, this field may be
-# a subroutine reference, and the whole n-tuple is passed to it as args.
-# 3. command arguments to be given to the scanner program;
-# a substring {} will be replaced by the directory name to be scanned,
-# i.e. "$tempdir/parts", a "*" will be replaced by file names of parts;
-# 4. an array ref of av scanner exit status values, or a regexp (to be
-# matched against scanner output), indicating NO VIRUSES found;
-# 5. an array ref of av scanner exit status values, or a regexp (to be
-# matched against scanner output), indicating VIRUSES WERE FOUND;
-# Note: the virus match prevails over a 'not found' match, so it is safe
-# even if the no. 4. matches for viruses too;
-# 6. a regexp (to be matched against scanner output), returning a list
-# of virus names found.
-# 7. and 8.: (optional) subroutines to be executed before and after scanner
-# (e.g. to set environment or current directory);
-# see examples for these at KasperskyLab AVP and Sophos sweep.
-
-# NOTES:
-#
-# - NOT DEFINING @av_scanners (e.g. setting it to empty list, or deleting the
-# whole assignment) TURNS OFF LOADING AND COMPILING OF THE ANTIVIRUS CODE
-# (which can be handy if all you want to do is spam scanning);
-#
-# - the order matters: although _all_ available entries from the list are
-# always tried regardless of their verdict, scanners are run in the order
-# specified: the report from the first one detecting a virus will be used
-# (providing virus names and scanner output); REARRANGE THE ORDER TO WILL;
-#
-# - it doesn't hurt to keep an unused command line scanner entry in the list
-# if the program can not be found; the path search is only performed once
-# during the program startup;
-#
-# COROLLARY: to disable a scanner that _does_ exist on your system,
-# comment out its entry or use undef or '' as its program name/path
-# (second parameter). An example where this is almost a must: disable
-# Sophos 'sweep' if you have its daemonized version Sophie or SAVI-Perl
-# (same for Trophie/vscan, and clamd/clamscan), or if another unrelated
-# program happens to have a name matching one of the entries ('sweep'
-# again comes to mind);
-#
-# - it DOES HURT to keep unwanted entries which use INTERNAL SUBROUTINES
-# for interfacing (where the second parameter starts with \&).
-# Keeping such entry and not having a corresponding virus scanner daemon
-# causes an unnecessary connection attempt (which eventually times out,
-# but it wastes precious time). For this reason the daemonized entries
-# are commented in the distribution - just remove the '#' where needed.
-#
-# CERT list of av resources: http://www.cert.org/other_sources/viruses.html
-
-@av_scanners = (
-
-# ### http://www.vanja.com/tools/sophie/
-# ['Sophie',
-# \&ask_daemon, ["{}/\n", '/var/run/sophie'],
-# qr/(?x)^ 0+ ( : | [\000\r\n]* $)/, qr/(?x)^ 1 ( : | [\000\r\n]* $)/,
-# qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/ ],
-
-# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
-# ['Sophos SAVI', \&sophos_savi ],
-
-### http://www.clamav.net/
-['Clam Antivirus-clamd',
- \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.ctl"],
- qr/\bOK$/, qr/\bFOUND$/,
- qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-# NOTE: run clamd under the same user as amavisd; match the socket
-# name (LocalSocket) in clamav.conf to the socket name in this entry
-# When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
-
-# ### http://www.openantivirus.org/
-# ['OpenAntiVirus ScannerDaemon (OAV)',
-# \&ask_daemon, ["SCAN {}\n", '127.0.0.1:8127'],
-# qr/^OK/, qr/^FOUND: /, qr/^FOUND: (.+)/ ],
-
-# ### http://www.vanja.com/tools/trophie/
-# ['Trophie',
-# \&ask_daemon, ["{}/\n", '/var/run/trophie'],
-# qr/(?x)^ 0+ ( : | [\000\r\n]* $)/, qr/(?x)^ 1 ( : | [\000\r\n]* $)/,
-# qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/ ],
-
-# ### http://www.grisoft.com/
-# ['AVG Anti-Virus',
-# \&ask_daemon, ["SCAN {}\n", '127.0.0.1:55555'],
-# qr/^200/, qr/^403/, qr/^403 .*?: (.+)/ ],
-
-# ### http://www.f-prot.com/
-# ['FRISK F-Prot Daemon',
-# \&ask_daemon,
-# ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n",
-# ['127.0.0.1:10200','127.0.0.1:10201','127.0.0.1:10202',
-# '127.0.0.1:10203','127.0.0.1:10204'] ],
-# qr/(?i)<summary[^>]*>clean<\/summary>/,
-# qr/(?i)<summary[^>]*>infected<\/summary>/,
-# qr/(?i)<name>(.+)<\/name>/ ],
-
- ['KasperskyLab AVP - aveclient',
- ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient',
- '/opt/kav/bin/aveclient','aveclient'],
- '-p /var/run/aveserver -s {}/*', [0,3,6,8], qr/\b(INFECTED|SUSPICION)\b/,
- qr/(?:INFECTED|SUSPICION) (.+)/,
- ],
-
- ['KasperskyLab AntiViral Toolkit Pro (AVP)', ['avp'],
- '-* -P -B -Y -O- {}', [0,8,16,24], [2,3,4,5,6, 18,19,20,21,22],
- qr/infected: (.+)/,
- sub {chdir('/opt/AVP') or die "Can't chdir to AVP: $!"},
- sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
- ],
-
- ### The kavdaemon and AVPDaemonClient have been removed from Kasperky
- ### products and replaced by aveserver and aveclient
- ['KasperskyLab AVPDaemonClient',
- [ '/opt/AVP/kavdaemon', 'kavdaemon',
- '/opt/AVP/AvpDaemonClient', 'AvpDaemonClient',
- '/opt/AVP/AvpTeamDream', 'AvpTeamDream',
- '/opt/AVP/avpdc', 'avpdc' ],
- "-f=$TEMPBASE {}", [0,8,16,24], [2,3,4,5,6, 18,19,20,21,22],
- qr/infected: ([^\r\n]+)/ ],
- # change the startup-script in /etc/init.d/kavd to:
- # DPARMS="-* -Y -dl -f=/var/amavis /var/amavis"
- # (or perhaps: DPARMS="-I0 -Y -* /var/amavis" )
- # adjusting /var/amavis above to match your $TEMPBASE.
- # The '-f=/var/amavis' is needed if not running it as root, so it
- # can find, read, and write its pid file, etc., see 'man kavdaemon'.
- # defUnix.prf: there must be an entry "*/var/amavis" (or whatever
- # directory $TEMPBASE specifies) in the 'Names=' section.
- # cd /opt/AVP/DaemonClients; configure; cd Sample; make
- # cp AvpDaemonClient /opt/AVP/
- # su - vscan -c "${PREFIX}/kavdaemon ${DPARMS}"
-
- ### http://www.hbedv.com/ or http://www.centralcommand.com/
- ['H+BEDV AntiVir or CentralCommand Vexira Antivirus',
- ['antivir','vexira'],
- '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/,
- qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) |
- (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/ ],
- # NOTE: if you only have a demo version, remove -z and add 214, as in:
- # '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
-
- ### http://www.commandsoftware.com/
- ['Command AntiVirus for Linux', 'csav',
- '-all -archive -packed {}', [50], [51,52,53],
- qr/Infection: (.+)/ ],
-
- ### http://www.symantec.com/
- ['Symantec CarrierScan via Symantec CommandLineScanner',
- 'cscmdline', '-a scan -i 1 -v -s 127.0.0.1:7777 {}',
- qr/^Files Infected:\s+0$/, qr/^Infected\b/,
- qr/^(?:Info|Virus Name):\s+(.+)/ ],
-
- ### http://www.symantec.com/
- ['Symantec AntiVirus Scan Engine',
- 'savsecls', '-server 127.0.0.1:7777 -mode scanrepair -details -verbose {}',
- [0], qr/^Infected\b/,
- qr/^(?:Info|Virus Name):\s+(.+)/ ],
- # NOTE: check options and patterns to see which entry better applies
-
- ### http://www.sald.com/, http://drweb.imshop.de/
- ['drweb - DrWeb Antivirus',
- ['/usr/local/drweb/drweb', '/opt/drweb/drweb', 'drweb'],
- '-path={} -al -go -ot -cn -upn -ok-',
- [0,32], [1,33], qr' infected (?:with|by)(?: virus)? (.*)$'],
-
-# ### http://www.sald.com/, http://www.dials.ru/english/, http://www.drweb.ru/
-# ['DrWebD', \&ask_daemon, # DrWebD 4.31 or later
-# [pack('N',1). # DRWEBD_SCAN_CMD
-# pack('N',0x00280001). # DONT_CHANGEMAIL, IS_MAIL, RETURN_VIRUSES
-# pack('N', # path length
-# length("$TEMPBASE/amavis-yyyymmddTHHMMSS-xxxxx/parts/part-xxxxx")).
-# '{}/*'. # path
-# pack('N',0). # content size
-# pack('N',0),
-# '/var/drweb/run/drwebd.sock',
-# # '/var/amavis/var/run/drwebd.sock', # suitable for chroot
-# # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default
-# # '127.0.0.1:3000', # or over an inet socket
-# ],
-# qr/\A\x00(\x10|\x11)\x00\x00/s, # IS_CLEAN, EVAL_KEY
-# qr/\A\x00(\x00|\x01)\x00(\x20|\x40|\x80)/s, # KNOWN_V, UNKNOWN_V, V._MODIF
-# qr/\A.{12}(?:infected with )?([^\x00]+)\x00/s,
-# ],
-# # NOTE: If you are using amavis-milter, change length to:
-# # length("$TEMPBASE/amavis-milter-xxxxxxxxxxxxxx/parts/part-xxxxx").
-
- ### http://www.f-secure.com/products/anti-virus/
- ['F-Secure Antivirus', 'fsav',
- '--dumb --mime --archive {}', [0], [3,8],
- qr/(?:infection|Infected|Suspected): (.+)/ ],
-
- ['CAI InoculateIT', 'inocucmd',
- '-sec -nex {}', [0], [100],
- qr/was infected by virus (.+)/ ],
-
- ['MkS_Vir for Linux (beta)', ['mks32','mks'],
- '-s {}/*', [0], [1,2], # any use for options: -a -c ?
- qr/--[ \t]*(.+)/ ],
-
- ### http://www.nod32.com/
- ['ESET Software NOD32', 'nod32',
- '-all -subdir+ {}', [0], [1,2],
- qr/^.+? - (.+?)\s*(?:backdoor|joke|trojan|virus|worm)/ ],
-
- ### http://www.nod32.com/
- ['ESET Software NOD32 - Client/Server Version', 'nod32cli',
- '-a -r -d recurse --heur standard {}', [0], [10,11],
- qr/^\S+\s+infected:\s+(.+)/ ],
-
- ### http://www.norman.com/products_nvc.shtml
- ['Norman Virus Control v5 / Linux', 'nvcc',
- '-c -l:0 -s -u {}', [0], [1],
- qr/(?i).* virus in .* -> \'(.+)\'/ ],
-
- ### http://www.pandasoftware.com/
- ['Panda Antivirus for Linux', ['pavcl'],
- '-aut -aex -heu -cmp -nbr -nor -nso -eng {}',
- qr/Number of files infected[ .]*: 0(?!\d)/,
- qr/Number of files infected[ .]*: 0*[1-9]/,
- qr/Found virus :\s*(\S+)/ ],
-
-# GeCAD AV technology is acquired by Microsoft; RAV has been discontinued.
-# Check your RAV license terms before fiddling with the following two lines!
-# ['GeCAD RAV AntiVirus 8', 'ravav',
-# '--all --archive --mail {}', [1], [2,3,4,5], qr/Infected: (.+)/ ],
-# # NOTE: the command line switches changed with scan engine 8.5 !
-# # (btw, assigning stdin to /dev/null causes RAV to fail)
-
- ### http://www.nai.com/
- ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
- '--secure -rv --mime --summary --noboot - {}', [0], [13],
- qr/(?x) Found (?:
- \ the\ (.+)\ (?:virus|trojan) |
- \ (?:virus|trojan)\ or\ variant\ ([^ ]+) |
- :\ (.+)\ NOT\ a\ virus)/,
- # sub {$ENV{LD_PRELOAD}='/lib/libc.so.6'},
- # sub {delete $ENV{LD_PRELOAD}},
- ],
- # NOTE1: with RH9: force the dynamic linker to look at /lib/libc.so.6 before
- # anything else by setting environment variable LD_PRELOAD=/lib/libc.so.6
- # and then clear it when finished to avoid confusing anything else.
- # NOTE2: to treat encrypted files as viruses replace the [13] with:
- # qr/^\s{5,}(Found|is password-protected|.*(virus|trojan))/
-
- ### http://www.virusbuster.hu/en/
- ['VirusBuster', ['vbuster', 'vbengcl'],
- # VirusBuster Ltd. does not support the daemon version for the workstation
- # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
- # binaries, some parameters AND return codes (from 3 to 1) changed.
- "{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1],
- qr/: '(.*)' - Virus/ ],
-
-# ### http://www.virusbuster.hu/en/
-# ['VirusBuster (Client + Daemon)', 'vbengd',
-# # HINT: for an infected file it returns always 3,
-# # although the man-page tells a different story
-# '-f -log scandir {}', [0], [3],
-# qr/Virus found = (.*);/ ],
-
- ### http://www.cyber.com/
- ['CyberSoft VFind', 'vfind',
- '--vexit {}/*', [0], [23], qr/##==>>>> VIRUS ID: CVDL (.+)/,
- # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'},
- ],
-
- ### http://www.ikarus-software.com/
- ['Ikarus AntiVirus for Linux', 'ikarus',
- '{}', [0], [40], qr/Signature (.+) found/ ],
-
- ### http://www.bitdefender.com/
- ['BitDefender', 'bdc',
- '--all --arc --mail {}', qr/^Infected files *:0(?!\d)/,
- qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/,
- qr/(?:suspected|infected): (.*)(?:\033|$)/ ],
-);
-
-# If no virus scanners from the @av_scanners list produce 'clean' nor
-# 'infected' status (e.g. they all fail to run or the list is empty),
-# then _all_ scanners from the @av_scanners_backup list are tried.
-# When there are both daemonized and command-line scanners available,
-# it is customary to place slower command-line scanners in the
-# @av_scanners_backup list. The default choice is somewhat arbitrary,
-# move entries from one list to another as desired.
-
-@av_scanners_backup = (
-
- ### http://www.clamav.net/
- ['Clam Antivirus - clamscan', 'clamscan',
- "--stdout --no-summary -r --tempdir=$TEMPBASE {}", [0], [1],
- qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-
- ### http://www.f-prot.com/
- ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
- '-dumb -archive -packed {}', [0,8], [3,6],
- qr/Infection: (.+)/ ],
-
- ### http://www.trendmicro.com/
- ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'],
- '-za -a {}', [0], qr/Found virus/, qr/Found virus (.+) in/ ],
-
- ['KasperskyLab kavscanner', ['/opt/kav/bin/kavscanner','kavscanner'],
- '-i1 -xp {}', [0,10,15], [5,20,21,25],
- qr/(?:CURED|INFECTED|CUREFAILED|WARNING|SUSPICION) (.*)/ ,
- sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"},
- sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
- ],
-
-# Commented out because the name 'sweep' clashes with the Debian package of
-# the same name. Make sure the correct sweep is found in the path when enabling
-#
-# ### http://www.sophos.com/
-# ['Sophos Anti Virus (sweep)', 'sweep',
-# '-nb -f -all -rec -ss -sc -archive -cab -tnef --no-reset-atime {}',
-# [0,2], qr/Virus .*? found/,
-# qr/^>>> Virus(?: fragment)? '?(.*?)'? found/,
-# ],
-# # other options to consider: -mime -oe -idedir=/usr/local/sav
-
-# always succeeds (uncomment to consider mail clean if all other scanners fail)
-# ['always-clean', sub {0}],
-
-);
-
-
-#
-# Section VIII - Debugging
-#
-
-# The most useful debugging tool is to run amavisd-new non-detached
-# from a terminal window:
-# amavisd debug
-
-# Some more refined approaches:
-
-# If sender matches ACL, turn log level fully up, just for this one message,
-# and preserve temporary directory
-#@debug_sender_acl = ( "test-sender\@$mydomain" );
-#@debug_sender_acl = qw( debug@example.com );
-
-# May be useful along with @debug_sender_acl:
-# Prevent all decoded originals being deleted (replaced by decoded part)
-#$keep_decoded_original_re = new_RE( qr/.*/ );
-
-# Turn on SpamAssassin debugging (output to STDERR, use with 'amavisd debug')
-#$sa_debug = 1; # defaults to false
-
-#-------------
-1; # insure a defined return
diff --git a/config/courier/authdaemonrc b/config/courier/authdaemonrc
deleted file mode 100644
index fd54d66..0000000
--- a/config/courier/authdaemonrc
+++ /dev/null
@@ -1,68 +0,0 @@
-##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
-#
-# Copyright 2000-2001 Double Precision, Inc. See COPYING for
-# distribution information.
-#
-# authdaemonrc created from authdaemonrc.dist by sysconftool
-#
-# Do not alter lines that begin with ##, they are used when upgrading
-# this configuration.
-#
-# This file configures authdaemond, the resident authentication daemon.
-#
-# Comments in this file are ignored. Although this file is intended to
-# be sourced as a shell script, authdaemond parses it manually, so
-# the acceptable syntax is a bit limited. Multiline variable contents,
-# with the \ continuation character, are not allowed. Everything must
-# fit on one line. Do not use any additional whitespace for indentation,
-# or anything else.
-
-##NAME: authmodulelist:0
-#
-# The authentication modules that are linked into authdaemond. The
-# default list is installed. You may selectively disable modules simply
-# by removing them from the following list. The available modules you
-# can use are: authcustom authcram authuserdb authldap authpgsql authmysql authpam
-
-authmodulelist="authmysql"
-
-##NAME: authmodulelistorig:1
-#
-# This setting is used by Courier's webadmin module, and should be left
-# alone
-
-authmodulelistorig="authcustom authcram authuserdb authldap authpgsql authmysql authpam"
-
-##NAME: daemons:0
-#
-# The number of daemon processes that are started. authdaemon is typically
-# installed where authentication modules are relatively expensive: such
-# as authldap, or authmysql, so it's better to have a number of them running.
-# PLEASE NOTE: Some platforms may experience a problem if there's more than
-# one daemon. Specifically, SystemV derived platforms that use TLI with
-# socket emulation. I'm suspicious of TLI's ability to handle multiple
-# processes accepting connections on the same filesystem domain socket.
-#
-# You may need to increase daemons if as your system load increases. Symptoms
-# include sporadic authentication failures. If you start getting
-# authentication failures, increase daemons. However, the default of 5
-# SHOULD be sufficient. Bumping up daemon count is only a short-term
-# solution. The permanent solution is to add more resources: RAM, faster
-# disks, faster CPUs...
-
-daemons=5
-
-##NAME: version:0
-#
-# When you have multiple versions of authdaemond.* installed, authdaemond
-# just picks the first one it finds. Set "version" to override that.
-# For example: version=authdaemond.plain
-
-version=""
-
-##NAME: authdaemonvar:0
-#
-# authdaemonvar is here, but is not used directly by authdaemond. It's
-# used by various configuration and build scripts, so don't touch it!
-
-authdaemonvar=/var/run/courier/authdaemon
diff --git a/config/courier/authmysqlrc b/config/courier/authmysqlrc
deleted file mode 100644
index 144c57a..0000000
--- a/config/courier/authmysqlrc
+++ /dev/null
@@ -1,265 +0,0 @@
-##VERSION: $Id: authmysqlrc,v 1.17 2004/04/20 01:38:17 mrsam Exp $
-#
-# Copyright 2000-2004 Double Precision, Inc. See COPYING for
-# distribution information.
-#
-# Do not alter lines that begin with ##, they are used when upgrading
-# this configuration.
-#
-# authmysqlrc created from authmysqlrc.dist by sysconftool
-#
-# DO NOT INSTALL THIS FILE with world read permissions. This file
-# might contain the MySQL admin password!
-#
-# Each line in this file must follow the following format:
-#
-# field[spaces|tabs]value
-#
-# That is, the name of the field, followed by spaces or tabs, followed by
-# field value. Trailing spaces are prohibited.
-
-
-##NAME: LOCATION:0
-#
-# The server name, userid, and password used to log in.
-
-MYSQL_SERVER localhost
-MYSQL_USERNAME root
-MYSQL_PASSWORD
-
-##NAME: MYSQL_SOCKET:0
-#
-# MYSQL_SOCKET can be used with MySQL version 3.22 or later, it specifies the
-# filesystem pipe used for the connection
-#
-# MYSQL_SOCKET /var/run/mysqld/mysqld.sock
-
-##NAME: MYSQL_PORT:0
-#
-# MYSQL_PORT can be used with MySQL version 3.22 or later to specify a port to
-# connect to.
-
-MYSQL_PORT 0
-
-##NAME: MYSQL_OPT:0
-#
-# Leave MYSQL_OPT as 0, unless you know what you're doing.
-
-MYSQL_OPT 0
-
-##NAME: MYSQL_DATABASE:0
-#
-# The name of the MySQL database we will open:
-
-MYSQL_DATABASE mailserver
-
-##NAME: MYSQL_USER_TABLE:0
-#
-# The name of the table containing your user data. See README.authmysqlrc
-# for the required fields in this table.
-
-MYSQL_USER_TABLE mail_box
-
-##NAME: MYSQL_CRYPT_PWFIELD:0
-#
-# Either MYSQL_CRYPT_PWFIELD or MYSQL_CLEAR_PWFIELD must be defined. Both
-# are OK too. crypted passwords go into MYSQL_CRYPT_PWFIELD, cleartext
-# passwords go into MYSQL_CLEAR_PWFIELD. Cleartext passwords allow
-# CRAM-MD5 authentication to be implemented.
-
-MYSQL_CRYPT_PWFIELD cryptpwd
-
-##NAME: MYSQL_CLEAR_PWFIELD:0
-#
-#
-# MYSQL_CLEAR_PWFIELD clear
-
-##NAME: MYSQL_DEFAULT_DOMAIN:0
-#
-# If DEFAULT_DOMAIN is defined, and someone tries to log in as 'user',
-# we will look up 'user@DEFAULT_DOMAIN' instead.
-#
-#
-# DEFAULT_DOMAIN example.com
-
-##NAME: MYSQL_UID_FIELD:0
-#
-# Other fields in the mysql table:
-#
-# MYSQL_UID_FIELD - contains the numerical userid of the account
-#
-MYSQL_UID_FIELD 8
-
-##NAME: MYSQL_GID_FIELD:0
-#
-# Numerical groupid of the account
-
-MYSQL_GID_FIELD 8
-
-##NAME: MYSQL_LOGIN_FIELD:0
-#
-# The login id, default is id. Basically the query is:
-#
-# SELECT MYSQL_UID_FIELD, MYSQL_GID_FIELD, ... WHERE id='loginid'
-#
-
-MYSQL_LOGIN_FIELD login
-
-##NAME: MYSQL_HOME_FIELD:0
-#
-
-MYSQL_HOME_FIELD maildir
-
-##NAME: MYSQL_NAME_FIELD:0
-#
-# The user's name (optional)
-
-#MYSQL_NAME_FIELD name
-
-##NAME: MYSQL_MAILDIR_FIELD:0
-#
-# This is an optional field, and can be used to specify an arbitrary
-# location of the maildir for the account, which normally defaults to
-# $HOME/Maildir (where $HOME is read from MYSQL_HOME_FIELD).
-#
-# You still need to provide a MYSQL_HOME_FIELD, even if you uncomment this
-# out.
-#
-# MYSQL_MAILDIR_FIELD maildir
-
-##NAME: MYSQL_DEFAULTDELIVERY:0
-#
-# Courier mail server only: optional field specifies custom mail delivery
-# instructions for this account (if defined) -- essentially overrides
-# DEFAULTDELIVERY from ${sysconfdir}/courierd
-#
-# MYSQL_DEFAULTDELIVERY defaultdelivery
-
-##NAME: MYSQL_QUOTA_FIELD:0
-#
-# Define MYSQL_QUOTA_FIELD to be the name of the field that can optionally
-# specify a maildir quota. See README.maildirquota for more information
-#
-# MYSQL_QUOTA_FIELD quota
-
-##NAME: MYSQL_AUXOPTIONS:0
-#
-# Auxiliary options. The MYSQL_AUXOPTIONS field should be a char field that
-# contains a single string consisting of comma-separated "ATTRIBUTE=NAME"
-# pairs. These names are additional attributes that define various per-account
-# "options", as given in INSTALL's description of the "Account OPTIONS"
-# setting.
-#
-# MYSQL_AUXOPTIONS_FIELD auxoptions
-#
-# You might want to try something like this, if you'd like to use a bunch
-# of individual fields, instead of a single text blob:
-#
-# MYSQL_AUXOPTIONS_FIELD CONCAT("disableimap=",disableimap,",disablepop3=",disablepop3,",disablewebmail=",disablewebmail,",sharedgroup=",sharedgroup)
-#
-# This will let you define fields called "disableimap", etc, with the end result
-# being something that the OPTIONS parser understands.
-
-
-##NAME: MYSQL_WHERE_CLAUSE:0
-#
-# This is optional, MYSQL_WHERE_CLAUSE can be basically set to an arbitrary
-# fixed string that is appended to the WHERE clause of our query
-#
-# MYSQL_WHERE_CLAUSE server='mailhost.example.com'
-
-##NAME: MYSQL_SELECT_CLAUSE:0
-#
-# (EXPERIMENTAL)
-# This is optional, MYSQL_SELECT_CLAUSE can be set when you have a database,
-# which is structuraly different from proposed. The fixed string will
-# be used to do a SELECT operation on database, which should return fields
-# in order specified bellow:
-#
-# username, cryptpw, clearpw, uid, gid, home, maildir, quota, fullname, options
-#
-# The username field should include the domain (see example below).
-#
-# Enabling this option causes ignorance of any other field-related
-# options, excluding default domain.
-#
-# There are two variables, which you can use. Substitution will be made
-# for them, so you can put entered username (local part) and domain name
-# in the right place of your query. These variables are:
-# $(local_part), $(domain), $(service)
-#
-# If a $(domain) is empty (not given by the remote user) the default domain
-# name is used in its place.
-#
-# $(service) will expand out to the service being authenticated: imap, imaps,
-# pop3 or pop3s. Courier mail server only: service will also expand out to
-# "courier", when searching for local mail account's location. In this case,
-# if the "maildir" field is not empty it will be used in place of
-# DEFAULTDELIVERY. Courier mail server will also use esmtp when doing
-# authenticated ESMTP.
-#
-# This example is a little bit modified adaptation of vmail-sql
-# database scheme:
-#
-# MYSQL_SELECT_CLAUSE SELECT CONCAT(popbox.local_part, '@', popbox.domain_name), \
-# CONCAT('{MD5}', popbox.password_hash), \
-# popbox.clearpw, \
-# domain.uid, \
-# domain.gid, \
-# CONCAT(domain.path, '/', popbox.mbox_name), \
-# '', \
-# domain.quota, \
-# '', \
-# CONCAT("disableimap=",disableimap,",disablepop3=", \
-# disablepop3,",disablewebmail=",disablewebmail, \
-# ",sharedgroup=",sharedgroup) \
-# FROM popbox, domain \
-# WHERE popbox.local_part = '$(local_part)' \
-# AND popbox.domain_name = '$(domain)' \
-# AND popbox.domain_name = domain.domain_name
-
-
-##NAME: MYSQL_ENUMERATE_CLAUSE:0
-#
-# {EXPERIMENTAL}
-# Optional custom SQL query used to enumerate accounts for authenumerate,
-# in order to compile a list of accounts for shared folders. The query
-# should return the following fields: name, uid, gid, homedir, maildir
-#
-# Example:
-# MYSQL_ENUMERATE_CLAUSE SELECT CONCAT(popbox.local_part, '@', popbox.domain_name), \
-# domain.uid, \
-# domain.gid, \
-# CONCAT(domain.path, '/', popbox.mbox_name), \
-# '' \
-# FROM popbox, domain \
-# WHERE popbox.local_part = '$(local_part)' \
-# AND popbox.domain_name = '$(domain)' \
-# AND popbox.domain_name = domain.domain_name
-
-
-
-##NAME: MYSQL_CHPASS_CLAUSE:0
-#
-# (EXPERIMENTAL)
-# This is optional, MYSQL_CHPASS_CLAUSE can be set when you have a database,
-# which is structuraly different from proposed. The fixed string will
-# be used to do an UPDATE operation on database. In other words, it is
-# used, when changing password.
-#
-# There are four variables, which you can use. Substitution will be made
-# for them, so you can put entered username (local part) and domain name
-# in the right place of your query. There variables are:
-# $(local_part) , $(domain) , $(newpass) , $(newpass_crypt)
-#
-# If a $(domain) is empty (not given by the remote user) the default domain
-# name is used in its place.
-# $(newpass) contains plain password
-# $(newpass_crypt) contains its crypted form
-#
-# MYSQL_CHPASS_CLAUSE UPDATE popbox \
-# SET clearpw='$(newpass)', \
-# password_hash='$(newpass_crypt)' \
-# WHERE local_part='$(local_part)' \
-# AND domain_name='$(domain)'
-#
diff --git a/config/exim4/readme.txt b/config/exim4/readme.txt
deleted file mode 100644
index 3d1c083..0000000
--- a/config/exim4/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Exim is not officially supported by ISPConfig. If you want to
-try to use it anyway, take a look atbthis thread:
-
-http://www.howtoforge.com/forums/showthread.php?t=52117
-
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 3b0d6cd..d49c51f 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -83,10 +83,8 @@
$command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ //* These postconf commands will be executed on installation and update
$postconf_commands = array (
- 'myhostname = '.$conf['hostname'],
- 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
- 'mynetworks = 127.0.0.0/8 [::1]/128',
'virtual_alias_domains =',
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -118,6 +116,15 @@
'inet_interfaces = all'
);
+ //* These postconf commands will be executed on installation only
+ if($this->is_update == false) {
+ $postconf_commands = array_merge($postconf_commands,array(
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
+ 'mynetworks = 127.0.0.0/8 [::1]/128'
+ ));
+ }
+
//* Create the header and body check files
touch($config_dir.'/header_checks');
touch($config_dir.'/mime_header_checks');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 5b9d5bf..6fa2f55 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -80,10 +80,8 @@
caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
+ //* These postconf commands will be executed on installation and update
$postconf_commands = array (
- 'myhostname = '.$conf['hostname'],
- 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
- 'mynetworks = 127.0.0.0/8 [::1]/128',
'virtual_alias_domains =',
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -113,6 +111,15 @@
'body_checks = regexp:'.$config_dir.'/body_checks'
);
+ //* These postconf commands will be executed on installation only
+ if($this->is_update == false) {
+ $postconf_commands = array_merge($postconf_commands,array(
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
+ 'mynetworks = 127.0.0.0/8 [::1]/128'
+ ));
+ }
+
//* Create the header and body check files
touch($config_dir.'/header_checks');
touch($config_dir.'/mime_header_checks');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index db435ee..5737b24 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -96,11 +96,9 @@
}
if($cf['vmail_mailbox_base'] != '' && strlen($cf['vmail_mailbox_base']) >= 10 && $this->is_update === false) exec('chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base']);
-
+
+ //* These postconf commands will be executed on installation and update
$postconf_commands = array (
- 'myhostname = '.$conf['hostname'],
- 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
- 'mynetworks = 127.0.0.0/8 [::1]/128',
'virtual_alias_domains =',
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -131,6 +129,15 @@
'body_checks = regexp:'.$config_dir.'/body_checks',
'inet_interfaces = all'
);
+
+ //* These postconf commands will be executed on installation only
+ if($this->is_update == false) {
+ $postconf_commands = array_merge($postconf_commands,array(
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
+ 'mynetworks = 127.0.0.0/8 [::1]/128'
+ ));
+ }
//* Create the header and body check files
touch($config_dir.'/header_checks');
@@ -373,8 +380,9 @@
$configfile = 'dovecot-sql.conf';
if(is_file("$config_dir/$configfile")){
copy("$config_dir/$configfile", "$config_dir/$configfile~");
+ exec("chmod 400 $config_dir/$configfile~");
}
- exec("chmod 400 $config_dir/$configfile~");
+
$content = rf("tpl/opensuse_dovecot-sql.conf.master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
diff --git a/install/install.php b/install/install.php
index 7e2fecc..3f86370 100644
--- a/install/install.php
+++ b/install/install.php
@@ -116,7 +116,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
-$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', $tmp_out[0]);
+$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]);
unset($tmp_out);
// Check if the mysql functions are loaded in PHP
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ae279ab..4e6ff40 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -628,7 +628,8 @@
$command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
+ //* These postconf commands will be executed on installation and update
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
unset($server_ini_rec);
@@ -645,9 +646,6 @@
unset($server_ini_array);
$postconf_commands = array (
- 'myhostname = '.$conf['hostname'],
- 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
- 'mynetworks = 127.0.0.0/8 [::1]/128',
'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
'virtual_alias_domains =',
@@ -681,6 +679,15 @@
'body_checks = regexp:'.$config_dir.'/body_checks',
'owner_request_special = no'
);
+
+ //* These postconf commands will be executed on installation only
+ if($this->is_update == false) {
+ $postconf_commands = array_merge($postconf_commands,array(
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
+ 'mynetworks = 127.0.0.0/8 [::1]/128'
+ ));
+ }
//* Create the header and body check files
touch($config_dir.'/header_checks');
diff --git a/install/sql/incremental/upd_0009.sql b/install/sql/incremental/upd_0009.sql
index ba20b6b..5be069c 100644
--- a/install/sql/incremental/upd_0009.sql
+++ b/install/sql/incremental/upd_0009.sql
@@ -63,4 +63,4 @@
alter table `server` add column `proxy_server` tinyint(1) not null after `vserver_server`;
alter table `server` add column `firewall_server` tinyint(1) not null after `proxy_server`;
-alter table `web_domain` add column `nginx_directives` mediumtext not null after `apache_directives`;
+alter table `web_domain` add column `nginx_directives` mediumtext null after `apache_directives`;
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 1ac3c1e..28339e7 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -151,6 +151,8 @@
//** Default Language and Timezone
$conf['language'] = '{language}';
$conf['debug_language'] = false;
+
+//* Complete timezone list: http://php.net/manual/en/timezones.php
$conf['timezone'] = '{timezone}';
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index 380c86b..6729a93 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -15,4 +15,4 @@
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index 8b110e9..8bcd72d 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -122,6 +122,6 @@
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master
index 66bcdc8..11122bc 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -134,4 +134,4 @@
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
diff --git a/install/update.php b/install/update.php
index 8e00a87..32b1ae5 100644
--- a/install/update.php
+++ b/install/update.php
@@ -362,7 +362,7 @@
swriteln('Updating ISPConfig');
-if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
+if ($conf['services']['web'] && $inst->install_ispconfig_interface) {
//** Customise the port ISPConfig runs on
$ispconfig_port_number = get_ispconfig_port_number();
if($conf['webserver']['server_type'] == 'nginx'){
diff --git a/interface/lib/classes/plugin.inc.php b/interface/lib/classes/plugin.inc.php
index 1cc9a06..341b186 100644
--- a/interface/lib/classes/plugin.inc.php
+++ b/interface/lib/classes/plugin.inc.php
@@ -31,7 +31,7 @@
class plugin {
private $subscribed_events = array();
- private $debug = true;
+ private $debug = false;
/*
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 12b9c7e..ca1e001 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -165,6 +165,38 @@
return $all;
}
+ //* Add a IP address record
+ public function server_ip_add($session_id, $client_id, $params)
+ {
+ if(!$this->checkPerm($session_id, 'server_ip_add')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ return $this->insertQuery('../admin/form/server_ip.tform.php',$client_id,$params);
+ }
+
+ //* Update IP address record
+ public function server_ip_update($session_id, $client_id, $ip_id, $params)
+ {
+ if(!$this->checkPerm($session_id, 'server_ip_update')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ $affected_rows = $this->updateQuery('../admin/form/server_ip.tform.php',$client_id,$ip_id,$params);
+ return $affected_rows;
+ }
+
+ //* Delete IP address record
+ public function server_ip_delete($session_id, $ip_id)
+ {
+ if(!$this->checkPerm($session_id, 'server_ip_delete')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ $affected_rows = $this->deleteQuery('../admin/form/server_ip.tform.php',$ip_id);
+ return $affected_rows;
+ }
+
//* Get mail domain details
public function mail_domain_get($session_id, $primary_id)
{
@@ -1003,6 +1035,26 @@
}
+ public function client_get_groupid($session_id, $client_id)
+ {
+ global $app;
+ if(!$this->checkPerm($session_id, 'client_get_id')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $client_id = intval($client_id);
+
+ $rec = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client_id);
+ if(isset($rec['groupid'])) {
+ return intval($rec['groupid']);
+ } else {
+ $this->server->fault('no_group_found', 'There is no group for this client ID.');
+ return false;
+ }
+
+ }
+
public function client_add($session_id, $reseller_id, $params)
{
@@ -1553,6 +1605,116 @@
// DNS Function --------------------------------------------------------------------------------------------------
+ //* Create Zone with Template
+ public function dns_templatezone_add($session_id, $client_id, $template_id, $domain, $ip, $ns1, $ns2, $email)
+ {
+ global $app, $conf;
+ if(!$this->checkPerm($session_id, 'dns_templatezone_add')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $client = $app->db->queryOneRecord("SELECT default_dnsserver FROM client WHERE client_id = ".intval($client_id));
+ $server_id = $client["default_dnsserver"];
+ $template_record = $app->db->queryOneRecord("SELECT * FROM dns_template WHERE template_id = '$template_id'");
+ $fields = explode(',',$template_record['fields']);
+ $tform_def_file = "../../web/dns/form/dns_soa.tform.php";
+ $app->uses('tform');
+ $app->tform->loadFormDef($tform_def_file);
+ $app->uses('tpl,validate_dns');
+
+ //* replace template placeholders
+ $tpl_content = $template_record['template'];
+ if($domain != '') $tpl_content = str_replace('{DOMAIN}',$domain,$tpl_content);
+ if($ip != '') $tpl_content = str_replace('{IP}',$ip,$tpl_content);
+ if($ns1 != '') $tpl_content = str_replace('{NS1}',$ns1,$tpl_content);
+ if($ns2 != '') $tpl_content = str_replace('{NS2}',$ns2,$tpl_content);
+ if($email != '') $tpl_content = str_replace('{EMAIL}',$email,$tpl_content);
+
+ //* Parse the template
+ $tpl_rows = explode("\n",$tpl_content);
+ $section = '';
+ $vars = array();
+ $dns_rr = array();
+ foreach($tpl_rows as $row) {
+ $row = trim($row);
+ if(substr($row,0,1) == '[') {
+ if($row == '[ZONE]') {
+ $section = 'zone';
+ } elseif($row == '[DNS_RECORDS]') {
+ $section = 'dns_records';
+ } else {
+ die('Unknown section type');
+ }
+ } else {
+ if($row != '') {
+ //* Handle zone section
+ if($section == 'zone') {
+ $parts = explode('=',$row);
+ $key = trim($parts[0]);
+ $val = trim($parts[1]);
+ if($key != '') $vars[$key] = $val;
+ }
+ //* Handle DNS Record rows
+ if($section == 'dns_records') {
+ $parts = explode('|',$row);
+ $dns_rr[] = array(
+ 'name' => $app->db->quote($parts[1]),
+ 'type' => $app->db->quote($parts[0]),
+ 'data' => $app->db->quote($parts[2]),
+ 'aux' => $app->db->quote($parts[3]),
+ 'ttl' => $app->db->quote($parts[4])
+ );
+ }
+ }
+ }
+ } // end foreach
+
+ if($vars['origin'] == '') $error .= $app->lng('error_origin_empty').'<br />';
+ if($vars['ns'] == '') $error .= $app->lng('error_ns_empty').'<br />';
+ if($vars['mbox'] == '') $error .= $app->lng('error_mbox_empty').'<br />';
+ if($vars['refresh'] == '') $error .= $app->lng('error_refresh_empty').'<br />';
+ if($vars['retry'] == '') $error .= $app->lng('error_retry_empty').'<br />';
+ if($vars['expire'] == '') $error .= $app->lng('error_expire_empty').'<br />';
+ if($vars['minimum'] == '') $error .= $app->lng('error_minimum_empty').'<br />';
+ if($vars['ttl'] == '') $error .= $app->lng('error_ttl_empty').'<br />';
+
+ if($error == '') {
+ // Insert the soa record
+ $tmp = $app->db->queryOneRecord("SELECT userid,default_group FROM sys_user WHERE client_id = ".intval($client_id));
+ $sys_userid = $tmp['userid'];
+ $sys_groupid = $tmp['default_group'];
+ unset($tmp);
+ $origin = $app->db->quote($vars['origin']);
+ $ns = $app->db->quote($vars['ns']);
+ $mbox = $app->db->quote(str_replace('@','.',$vars['mbox']));
+ $refresh = $app->db->quote($vars['refresh']);
+ $retry = $app->db->quote($vars['retry']);
+ $expire = $app->db->quote($vars['expire']);
+ $minimum = $app->db->quote($vars['minimum']);
+ $ttl = $app->db->quote($vars['ttl']);
+ $xfer = $app->db->quote($vars['xfer']);
+ $also_notify = $app->db->quote($vars['also_notify']);
+ $update_acl = $app->db->quote($vars['update_acl']);
+ $serial = $app->validate_dns->increase_serial(0);
+ $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `origin`, `ns`, `mbox`, `serial`, `refresh`, `retry`, `expire`, `minimum`, `ttl`, `active`, `xfer`, `also_notify`, `update_acl`) VALUES
+ ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$origin', '$ns', '$mbox', '$serial', '$refresh', '$retry', '$expire', '$minimum', '$ttl', 'Y', '$xfer', '$also_notify', '$update_acl')";
+ $dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
+ // Insert the dns_rr records
+ if(is_array($dns_rr) && $dns_soa_id > 0) {
+ foreach($dns_rr as $rr) {
+ $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `zone`, `name`, `type`, `data`, `aux`, `ttl`, `active`) VALUES
+ ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$dns_soa_id', '$rr[name]', '$rr[type]', '$rr[data]', '$rr[aux]', '$rr[ttl]', 'Y')";
+ $dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id');
+ }
+ }
+ exit;
+ } else {
+ $this->server->fault('permission_denied', $error);
+ }
+ }
+
+
//* Get record details
public function dns_zone_get($session_id, $primary_id)
{
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 1d732af..06ca43a 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -412,21 +412,21 @@
if(!preg_match($validator['regex'], $field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
break;
case 'UNIQUE':
- if($this->action == 'INSERT') {
+ if($this->action == 'NEW') {
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
} else {
@@ -434,9 +434,9 @@
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
}
@@ -445,19 +445,19 @@
if(empty($field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
break;
case 'ISEMAIL':
- if(!preg_match("/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) {
+ if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i", $field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
break;
@@ -466,9 +466,9 @@
if($tmpval === 0 and !empty($field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
break;
@@ -476,11 +476,59 @@
if(!is_numeric($field_value) || $field_value <= 0){
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
- $this->errorMessage .= $errmsg."<br>\r\n";
+ $this->errorMessage .= $errmsg."<br />\r\n";
}
}
+ break;
+ case 'ISIPV4':
+ $vip=1;
+ if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+ $groups=explode(".",$field_value);
+ foreach($groups as $group){
+ if($group<0 OR $group>255)
+ $vip=0;
+ }
+ }else{$vip=0;}
+ if($vip==0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
+ break;
+ case 'ISIP':
+ //* Check if its a IPv4 or IPv6 address
+ if(function_exists('filter_var')) {
+ if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
+ } else {
+ //* Check content with regex, if we use php < 5.2
+ $ip_ok = 0;
+ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
+ $ip_ok = 1;
+ }
+ if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+ $ip_ok = 1;
+ }
+ if($ip_ok == 0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
+ }
break;
case 'CUSTOM':
// Calls a custom class to validate this record
@@ -490,7 +538,7 @@
$app->uses($validator_class);
$this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator);
} else {
- $this->errorMessage .= "Custom validator class or function is empty<br>\r\n";
+ $this->errorMessage .= "Custom validator class or function is empty<br />\r\n";
}
break;
default:
@@ -563,6 +611,10 @@
if($field['formtype'] == 'PASSWORD') {
if($field['encryption'] == 'CRYPT') {
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
+ } elseif ($field['encryption'] == 'MYSQL') {
+ $sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
+ } elseif ($field['encryption'] == 'CLEARTEXT') {
+ $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
} else {
$record[$key] = md5($record[$key]);
}
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index 07ebf53..3e4d57e 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -68,4 +68,5 @@
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 3e99a70..cde9994 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -68,4 +68,5 @@
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index 98ed94a..df463c2 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 4963dba..8f63207 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index fbb5207..f9d1968 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,5 +1,6 @@
<?php
$wb['conf_format_dateshort'] = 'd.m.Y';
+$wb['conf_format_dateshort_human_readable'] = 'tt.mm.jjjj';
$wb['conf_format_datelong'] = 'l, d. F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
@@ -68,4 +69,5 @@
$wb['datepicker_nextText'] = 'Vor';
$wb['datepicker_prevText'] = 'Zurück';
$wb['logout_txt'] = 'LOGOUT';
+$wb['submit_confirmation'] = "Wollen Sie diese Aktion wirlich ausführen?";
?>
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index 77b75bb..5234e54 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -1,72 +1,72 @@
<?php
-$wb['conf_format_dateshort'] = "Y-m-d";
-$wb['conf_format_datelong'] = "l dS από F Y";
-$wb['conf_format_timeshort'] = "H:i";
-$wb['conf_format_timelong'] = "H:i:s";
-$wb['conf_format_datetime'] = "Y-m-d H:i";
-$wb['error_301'] = "Απογόρευση χρήσης του αρθρώματος στον τρέχων χρήστη";
-$wb['error_302'] = "Το άρθρωμα δεν είναι έγκυρο";
-$wb['error_1001'] = "Το όνομα χρήστη και ο κωδικός δεν επιτρέπεται να είναι κενά!";
-$wb['error_1002'] = "Το όνομα χρήστη και ο κωδικός δεν είναι σωστά!";
-$wb['error_1003'] = "Το όνομα χρήστη είναι απενεργοποιημένο!";
-$wb['delete_confirmation'] = "Είστε σίγουροι ότι θέλετε να διαγράψετε την εγγραφή;";
-$wb['error_no_view_permission'] = "Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε την εγγραφή ή η εγγραφή δεν υπάρχει!";
-$wb['error_no_delete_permission'] = "Δεν έχετε τα απαραίτητα δικαιώματα για να διαγράψετε την εγγραφή !";
-$wb['page_txt'] = "Σελίδα";
-$wb['page_of_txt'] = "από";
-$wb['page_and_txt'] = "και";
-$wb['page_next_txt'] = "Επόμενη";
-$wb['page_back_txt'] = "Επιστροφή";
-$wb['delete_txt'] = "Διαγραφή";
-$wb['filter_txt'] = "Φίλτρο";
-$wb['add_new_record_txt'] = "Νέα εγγραφή";
-$wb['btn_save_txt'] = "Αποθήκευση";
-$wb['btn_cancel_txt'] = "Επιστροφή";
-$wb['top_menu_system'] = "Σύστημα";
-$wb['top_menu_client'] = "Πελάτης";
-$wb['top_menu_email'] = "Email";
-$wb['top_menu_monitor'] = "Εποπτεία";
-$wb['top_menu_sites'] = "Sites";
-$wb['top_menu_dns'] = "DNS";
-$wb['top_menu_tools'] = "Εργαλεία";
-$wb['top_menu_help'] = "Βοήθεια";
-$wb['top_menu_billing'] = "Χρεώσεις";
-$wb['top_menu_domain'] = "Domains";
-$wb['top_menu_dashboard'] = "Αρχική";
-$wb['toolsarea_head_txt'] = "Εργαλεία";
-$wb['latest_news_txt'] = "Τελευταία Νέα";
-$wb['number_format_decimals'] = "2";
-$wb['number_format_dec_point'] = ".";
-$wb['number_format_thousands_sep'] = "";
-$wb['top_menu_vm'] = "VServer";
-$wb['datepicker_nextText'] = "Επόμ.";
-$wb['datepicker_prevText'] = "Προηγ.";
-$wb['daynamesmin_su'] = "Κυ";
-$wb['daynamesmin_mo'] = "Δε";
-$wb['daynamesmin_tu'] = "Τρ";
-$wb['daynamesmin_we'] = "Τε";
-$wb['daynamesmin_th'] = "Πε";
-$wb['daynamesmin_fr'] = "Πα";
-$wb['daynamesmin_sa'] = "Σα";
-$wb['daynames_sunday'] = "Κυριακή";
-$wb['daynames_monday'] = "Δευτέρα";
-$wb['daynames_tuesday'] = "Τρίτη";
-$wb['daynames_wednesday'] = "Τετάρτη";
-$wb['daynames_thursday'] = "Πέμπτη";
-$wb['daynames_friday'] = "Παρασκευή";
-$wb['daynames_saturday'] = "Σάββατο";
-$wb['monthnamesshort_jan'] = "Ιαν";
-$wb['monthnamesshort_feb'] = "Φεβ";
-$wb['monthnamesshort_mar'] = "Μαρ";
-$wb['monthnamesshort_apr'] = "Απρ";
-$wb['monthnamesshort_may'] = "Μαϊ";
-$wb['monthnamesshort_jun'] = "Ιουν";
-$wb['monthnamesshort_jul'] = "Ιουλ";
-$wb['monthnamesshort_aug'] = "Αυγ";
-$wb['monthnamesshort_sep'] = "Σεπ";
-$wb['monthnamesshort_oct'] = "Οκτ";
-$wb['monthnamesshort_nov'] = "Νοε";
-$wb['monthnamesshort_dec'] = "Δεκ";
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS από F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+$wb['error_301'] = 'Απογόρευση χρήσης του αρθρώματος στον τρέχων χρήστη';
+$wb['error_302'] = 'Το άρθρωμα δεν είναι έγκυρο';
+$wb['error_1001'] = 'Το όνομα χρήστη και ο κωδικός δεν επιτρέπεται να είναι κενά!';
+$wb['error_1002'] = 'Το όνομα χρήστη και ο κωδικός δεν είναι σωστά!';
+$wb['error_1003'] = 'Το όνομα χρήστη είναι απενεργοποιημένο!';
+$wb['delete_confirmation'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε την εγγραφή;';
+$wb['error_no_view_permission'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε την εγγραφή ή η εγγραφή δεν υπάρχει!';
+$wb['error_no_delete_permission'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να διαγράψετε την εγγραφή !';
+$wb['page_txt'] = 'Σελίδα';
+$wb['page_of_txt'] = 'από';
+$wb['page_and_txt'] = 'και';
+$wb['page_next_txt'] = 'Επόμενη';
+$wb['page_back_txt'] = 'Επιστροφή';
+$wb['delete_txt'] = 'Διαγραφή';
+$wb['filter_txt'] = 'Φίλτρο';
+$wb['add_new_record_txt'] = 'Νέα εγγραφή';
+$wb['btn_save_txt'] = 'Αποθήκευση';
+$wb['btn_cancel_txt'] = 'Επιστροφή';
+$wb['top_menu_system'] = 'Σύστημα';
+$wb['top_menu_client'] = 'Πελάτης';
+$wb['top_menu_email'] = 'Email';
+$wb['top_menu_monitor'] = 'Εποπτεία';
+$wb['top_menu_sites'] = 'Sites';
+$wb['top_menu_dns'] = 'DNS';
+$wb['top_menu_tools'] = 'Εργαλεία';
+$wb['top_menu_help'] = 'Βοήθεια';
+$wb['top_menu_billing'] = 'Χρεώσεις';
+$wb['top_menu_domain'] = 'Domains';
+$wb['top_menu_dashboard'] = 'Αρχική';
+$wb['toolsarea_head_txt'] = 'Εργαλεία';
+$wb['latest_news_txt'] = 'Τελευταία Νέα';
+$wb['number_format_decimals'] = '2';
+$wb['number_format_dec_point'] = '.';
+$wb['number_format_thousands_sep'] = '';
+$wb['top_menu_vm'] = 'VServer';
+$wb['datepicker_nextText'] = 'Επόμ.';
+$wb['datepicker_prevText'] = 'Προηγ.';
+$wb['daynamesmin_su'] = 'Κυ';
+$wb['daynamesmin_mo'] = 'Δε';
+$wb['daynamesmin_tu'] = 'Τρ';
+$wb['daynamesmin_we'] = 'Τε';
+$wb['daynamesmin_th'] = 'Πε';
+$wb['daynamesmin_fr'] = 'Πα';
+$wb['daynamesmin_sa'] = 'Σα';
+$wb['daynames_sunday'] = 'Κυριακή';
+$wb['daynames_monday'] = 'Δευτέρα';
+$wb['daynames_tuesday'] = 'Τρίτη';
+$wb['daynames_wednesday'] = 'Τετάρτη';
+$wb['daynames_thursday'] = 'Πέμπτη';
+$wb['daynames_friday'] = 'Παρασκευή';
+$wb['daynames_saturday'] = 'Σάββατο';
+$wb['monthnamesshort_jan'] = 'Ιαν';
+$wb['monthnamesshort_feb'] = 'Φεβ';
+$wb['monthnamesshort_mar'] = 'Μαρ';
+$wb['monthnamesshort_apr'] = 'Απρ';
+$wb['monthnamesshort_may'] = 'Μαϊ';
+$wb['monthnamesshort_jun'] = 'Ιουν';
+$wb['monthnamesshort_jul'] = 'Ιουλ';
+$wb['monthnamesshort_aug'] = 'Αυγ';
+$wb['monthnamesshort_sep'] = 'Σεπ';
+$wb['monthnamesshort_oct'] = 'Οκτ';
+$wb['monthnamesshort_nov'] = 'Νοε';
+$wb['monthnamesshort_dec'] = 'Δεκ';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['logout_txt'] = 'LOGOUT';
?>
-
-
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 511ff5a..bdd5d67 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -1,5 +1,6 @@
<?php
$wb['conf_format_dateshort'] = "Y-m-d";
+$wb['conf_format_dateshort_human_readable'] = "yyyy-mm-dd";
$wb['conf_format_datelong'] = "l dS of F Y";
$wb['conf_format_timeshort'] = "H:i";
$wb['conf_format_timelong'] = "H:i:s";
@@ -69,4 +70,5 @@
$wb['monthnamesshort_dec'] = "Dec";
$wb['datepicker_nextText'] = "Next";
$wb['datepicker_prevText'] = "Prev";
+$wb['submit_confirmation'] = "Do you really want to perform this action?";
?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 5c4627a..5697993 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 45615bc..f3d6d43 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index c75f32b..b744202 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Suivant';
$wb['datepicker_prevText'] = 'Précédent';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 5ff48ac..7299e68 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Naprijed';
$wb['datepicker_prevText'] = 'Natrag';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index de6cf26..71a9a4c 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index 9a9cf11..222b68d 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 92e7ebf..dc8928a 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index cd23480..59c7ef0 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -68,4 +68,5 @@
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index badb322..671c152 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -1,11 +1,11 @@
<?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l d F Y';
+$wb['conf_format_dateshort'] = 'd.m.Y';
+$wb['conf_format_datelong'] = 'l, d. F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
+$wb['conf_format_datetime'] = 'd.m.Y H:i';
$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
+$wb['number_format_dec_point'] = ',';
$wb['number_format_thousands_sep'] = '';
$wb['error_301'] = 'Module niet toegestaan voor de huidige gebruiker.';
$wb['error_302'] = 'Ongeldige module.';
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index d2319c7..3614543 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Nast';
$wb['datepicker_prevText'] = 'Poprz';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index 846979d..35731dc 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 12ff91e..9087866 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 0568b5e..684b007 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -1,70 +1,72 @@
-<?php
-$wb['conf_format_dateshort'] = "Y-m-d";
-$wb['conf_format_datelong'] = "l dS of F Y";
-$wb['conf_format_timeshort'] = "H:i";
-$wb['conf_format_timelong'] = "H:i:s";
-$wb['conf_format_datetime'] = "Y-m-d H:i";
-$wb['number_format_decimals'] = "2";
-$wb['number_format_dec_point'] = ",";
-$wb['number_format_thousands_sep'] = "";
-$wb['delete_confirmation'] = "Вы действительно хотите удалить эту запись?";
-$wb['error_no_view_permission'] = "Вы не имеете прав для удаления или запись отсутсвует!";
-$wb['error_no_delete_permission'] = "Вы не имеете прав для удаления этой записи!";
-$wb['page_txt'] = "Страница";
-$wb['page_of_txt'] = "из";
-$wb['page_next_txt'] = "Далее";
-$wb['page_back_txt'] = "Назад";
-$wb['delete_txt'] = "Удалить";
-$wb['filter_txt'] = "Фильтр";
-$wb['add_new_record_txt'] = "Добавить новую запись";
-$wb['btn_save_txt'] = "Сохранить";
-$wb['btn_cancel_txt'] = "Отмена";
-$wb['toolsarea_head_txt'] = "Утилиты";
-$wb['page_and_txt'] = "и";
-$wb['top_menu_system'] = "Система";
-$wb['top_menu_client'] = "Клиент";
-$wb['top_menu_email'] = "Почта";
-$wb['top_menu_monitor'] = "Монитор";
-$wb['top_menu_sites'] = "Сайты";
-$wb['top_menu_dns'] = "ДНС";
-$wb['top_menu_tools'] = "Утилиты";
-$wb['top_menu_help'] = "Помощь";
-$wb['top_menu_billing'] = "Билинг";
-$wb['top_menu_domain'] = "Домены";
-$wb['top_menu_dashboard'] = "Главная";
-$wb['latest_news_txt'] = "Последние новости";
-$wb['error_301'] = "Модуль не доступен текущему пользователю.";
-$wb['error_302'] = "Модуль неиспарвный.";
-$wb['error_1001'] = "Имя пользователя и пароль не могут быть пустыми!";
-$wb['error_1002'] = "Имя пользователя и/или пароль некорректны !";
-$wb['error_1003'] = "Имя пользователя отключено!";
-$wb['top_menu_vm'] = "VServer";
-$wb['datepicker_nextText'] = "Далее";
-$wb['datepicker_prevText'] = "Назад";
-$wb['daynamesmin_su'] = "Вс";
-$wb['daynamesmin_mo'] = "Пн";
-$wb['daynamesmin_tu'] = "Вт";
-$wb['daynamesmin_we'] = "Ср";
-$wb['daynamesmin_th'] = "Чт";
-$wb['daynamesmin_fr'] = "Пт";
-$wb['daynamesmin_sa'] = "Сб";
-$wb['daynames_sunday'] = "Воскресенье";
-$wb['daynames_monday'] = "Понедельник";
-$wb['daynames_tuesday'] = "Вторник";
-$wb['daynames_wednesday'] = "Среда";
-$wb['daynames_thursday'] = "Черверг";
-$wb['daynames_friday'] = "Пятница";
-$wb['daynames_saturday'] = "Суббота";
-$wb['monthnamesshort_jan'] = "Янв";
-$wb['monthnamesshort_feb'] = "Фев";
-$wb['monthnamesshort_mar'] = "Мар";
-$wb['monthnamesshort_apr'] = "Апр";
-$wb['monthnamesshort_may'] = "Май";
-$wb['monthnamesshort_jun'] = "Июн";
-$wb['monthnamesshort_jul'] = "Июл";
-$wb['monthnamesshort_aug'] = "Авг";
-$wb['monthnamesshort_sep'] = "Сен";
-$wb['monthnamesshort_oct'] = "Окт";
-$wb['monthnamesshort_nov'] = "Ноя";
-$wb['monthnamesshort_dec'] = "Дек";
-?>
\ No newline at end of file
+<?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+$wb['number_format_decimals'] = '2';
+$wb['number_format_dec_point'] = ',';
+$wb['number_format_thousands_sep'] = '';
+$wb['delete_confirmation'] = 'Вы действительно хотите удалить эту запись?';
+$wb['error_no_view_permission'] = 'Вы не имеете прав для удаления или запись отсутсвует!';
+$wb['error_no_delete_permission'] = 'Вы не имеете прав для удаления этой записи!';
+$wb['page_txt'] = 'Страница';
+$wb['page_of_txt'] = 'из';
+$wb['page_next_txt'] = 'Далее';
+$wb['page_back_txt'] = 'Назад';
+$wb['delete_txt'] = 'Удалить';
+$wb['filter_txt'] = 'Фильтр';
+$wb['add_new_record_txt'] = 'Добавить новую запись';
+$wb['btn_save_txt'] = 'Сохранить';
+$wb['btn_cancel_txt'] = 'Отмена';
+$wb['toolsarea_head_txt'] = 'Утилиты';
+$wb['page_and_txt'] = 'и';
+$wb['top_menu_system'] = 'Система';
+$wb['top_menu_client'] = 'Клиент';
+$wb['top_menu_email'] = 'Почта';
+$wb['top_menu_monitor'] = 'Монитор';
+$wb['top_menu_sites'] = 'Сайты';
+$wb['top_menu_dns'] = 'ДНС';
+$wb['top_menu_tools'] = 'Утилиты';
+$wb['top_menu_help'] = 'Помощь';
+$wb['top_menu_billing'] = 'Билинг';
+$wb['top_menu_domain'] = 'Домены';
+$wb['top_menu_dashboard'] = 'Главная';
+$wb['latest_news_txt'] = 'Последние новости';
+$wb['error_301'] = 'Модуль не доступен текущему пользователю.';
+$wb['error_302'] = 'Модуль неиспарвный.';
+$wb['error_1001'] = 'Имя пользователя и пароль не могут быть пустыми!';
+$wb['error_1002'] = 'Имя пользователя и/или пароль некорректны !';
+$wb['error_1003'] = 'Имя пользователя отключено!';
+$wb['top_menu_vm'] = 'VServer';
+$wb['datepicker_nextText'] = 'Далее';
+$wb['datepicker_prevText'] = 'Назад';
+$wb['daynamesmin_su'] = 'Вс';
+$wb['daynamesmin_mo'] = 'Пн';
+$wb['daynamesmin_tu'] = 'Вт';
+$wb['daynamesmin_we'] = 'Ср';
+$wb['daynamesmin_th'] = 'Чт';
+$wb['daynamesmin_fr'] = 'Пт';
+$wb['daynamesmin_sa'] = 'Сб';
+$wb['daynames_sunday'] = 'Воскресенье';
+$wb['daynames_monday'] = 'Понедельник';
+$wb['daynames_tuesday'] = 'Вторник';
+$wb['daynames_wednesday'] = 'Среда';
+$wb['daynames_thursday'] = 'Черверг';
+$wb['daynames_friday'] = 'Пятница';
+$wb['daynames_saturday'] = 'Суббота';
+$wb['monthnamesshort_jan'] = 'Янв';
+$wb['monthnamesshort_feb'] = 'Фев';
+$wb['monthnamesshort_mar'] = 'Мар';
+$wb['monthnamesshort_apr'] = 'Апр';
+$wb['monthnamesshort_may'] = 'Май';
+$wb['monthnamesshort_jun'] = 'Июн';
+$wb['monthnamesshort_jul'] = 'Июл';
+$wb['monthnamesshort_aug'] = 'Авг';
+$wb['monthnamesshort_sep'] = 'Сен';
+$wb['monthnamesshort_oct'] = 'Окт';
+$wb['monthnamesshort_nov'] = 'Ноя';
+$wb['monthnamesshort_dec'] = 'Дек';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
+$wb['logout_txt'] = 'LOGOUT';
+?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 3664fa2..2decd71 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index 4e9f0b0..44ecaa0 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index fdfca9c..8aa1c3c 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -68,4 +68,5 @@
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'LOGOUT';
+$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
?>
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index 6941af2..147e3d1 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -41,5 +41,3 @@
$wb['1001'] = 'Το όνομα χρήστη ή το συνθηματικό είναι κενό.';
$wb['1002'] = 'Το όνομα χρήστη ή το συνθηματικό είναι λάθος.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index c19e09e..ff31bab 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -9,5 +9,3 @@
$wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.';
$wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_firewall_list.lng b/interface/web/admin/lib/lang/el_firewall_list.lng
index 67be85a..bebdcbc 100644
--- a/interface/web/admin/lib/lang/el_firewall_list.lng
+++ b/interface/web/admin/lib/lang/el_firewall_list.lng
@@ -6,5 +6,3 @@
$wb['udp_port_txt'] = 'Ανοιχτές θύρες UDP';
$wb['add_new_record_txt'] = 'Νέα εγγραφή Firewall';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng
index 3a81b51..6805760 100644
--- a/interface/web/admin/lib/lang/el_groups.lng
+++ b/interface/web/admin/lib/lang/el_groups.lng
@@ -3,5 +3,3 @@
$wb['name_txt'] = 'Ομάδα';
$wb['name_err'] = 'Η ομάδα πρέπει να έχει από 1 μέχρι 30 χαρακτήρες.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_groups_list.lng b/interface/web/admin/lib/lang/el_groups_list.lng
index 6022935..977e803 100644
--- a/interface/web/admin/lib/lang/el_groups_list.lng
+++ b/interface/web/admin/lib/lang/el_groups_list.lng
@@ -5,5 +5,3 @@
$wb['add_new_record_txt'] = 'Νέα ομάδα';
$wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng
index aea9270..b2d57db 100644
--- a/interface/web/admin/lib/lang/el_iptables.lng
+++ b/interface/web/admin/lib/lang/el_iptables.lng
@@ -11,5 +11,3 @@
$wb['active_txt'] = 'Ενεργή';
$wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή του firewall για αυτόν τον server.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng
index ebe1310..64abd90 100644
--- a/interface/web/admin/lib/lang/el_iptables_list.lng
+++ b/interface/web/admin/lib/lang/el_iptables_list.lng
@@ -13,5 +13,3 @@
$wb['active_txt'] = 'Ενεργός';
$wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτόν τον server.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng
index f088dc7..604f3a7 100644
--- a/interface/web/admin/lib/lang/el_language_add.lng
+++ b/interface/web/admin/lib/lang/el_language_add.lng
@@ -6,5 +6,3 @@
$wb['btn_save_txt'] = 'Νέα ομάδα αρχείων γλώσσας';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_complete.lng b/interface/web/admin/lib/lang/el_language_complete.lng
index 3da2a83..629d3b2 100644
--- a/interface/web/admin/lib/lang/el_language_complete.lng
+++ b/interface/web/admin/lib/lang/el_language_complete.lng
@@ -5,5 +5,3 @@
$wb['btn_save_txt'] = 'Συγχώνευση Γλώσσας τώρα';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_edit.lng b/interface/web/admin/lib/lang/el_language_edit.lng
index 0b92579..5a76f63 100644
--- a/interface/web/admin/lib/lang/el_language_edit.lng
+++ b/interface/web/admin/lib/lang/el_language_edit.lng
@@ -6,5 +6,3 @@
$wb['btn_save_txt'] = 'Αποθήκευση';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_export.lng b/interface/web/admin/lib/lang/el_language_export.lng
index 34700ed..354b886 100644
--- a/interface/web/admin/lib/lang/el_language_export.lng
+++ b/interface/web/admin/lib/lang/el_language_export.lng
@@ -4,5 +4,3 @@
$wb['btn_save_txt'] = 'Εξαγωγή της επιλεγμένης λίστας αρχείων γλώσσας';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng
index 58d31d8..4bb61c4 100644
--- a/interface/web/admin/lib/lang/el_language_import.lng
+++ b/interface/web/admin/lib/lang/el_language_import.lng
@@ -6,5 +6,3 @@
$wb['btn_cancel_txt'] = 'Επιστροφή';
$wb['ignore_version_txt'] = 'Παράλειψη ελέγχου έκδοσης ISPConfig';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_language_list.lng b/interface/web/admin/lib/lang/el_language_list.lng
index c648437..fa53073 100644
--- a/interface/web/admin/lib/lang/el_language_list.lng
+++ b/interface/web/admin/lib/lang/el_language_list.lng
@@ -5,5 +5,3 @@
$wb['lang_file_txt'] = 'Αρχείο Γλώσσας';
$wb['lang_file_date_txt'] = 'Τελευταία τροποποίηση';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_package_install.lng b/interface/web/admin/lib/lang/el_package_install.lng
index 5bc9709..468a822 100644
--- a/interface/web/admin/lib/lang/el_package_install.lng
+++ b/interface/web/admin/lib/lang/el_package_install.lng
@@ -5,5 +5,3 @@
$wb['repo_password_txt'] = 'Συνθηματικό (προαιρετικό)';
$wb['active_txt'] = 'Ενεργό';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng
index d020ab5..e4f97cb 100644
--- a/interface/web/admin/lib/lang/el_remote_action.lng
+++ b/interface/web/admin/lib/lang/el_remote_action.lng
@@ -7,6 +7,6 @@
$wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβάθμιση στο ISPConfig3 στον επιλεγμένο σας server.<br><br><strong>ΧΡΗΣΙΜΟΠΟΙΗΣΤΕ ΤΟ ΜΕ ΔΙΚΗ ΣΑΣ ΕΥΘΥΝΗ!</strong>';
$wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση';
$wb['select_all_server'] = 'Σε όλους τους servers';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Click here for detailed update instructins</a>';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng
index c979169..78cd091 100644
--- a/interface/web/admin/lib/lang/el_remote_user.lng
+++ b/interface/web/admin/lib/lang/el_remote_user.lng
@@ -41,5 +41,3 @@
$wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS';
$wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_remote_user_list.lng b/interface/web/admin/lib/lang/el_remote_user_list.lng
index a40f313..95522db 100644
--- a/interface/web/admin/lib/lang/el_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/el_remote_user_list.lng
@@ -5,5 +5,3 @@
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Όνομα Χρήστη';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng
index 34d6207..637ee62 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -13,5 +13,3 @@
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 1fec280..51c758b 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -149,6 +149,8 @@
$wb['rescue_description_txt'] = '<b>Πληροφορία:</b> Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.<br>Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!';
$wb['enable_sni_txt'] = 'Ενεργοποίηση SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server_config_list.lng b/interface/web/admin/lib/lang/el_server_config_list.lng
index a9f2d4f..038e329 100644
--- a/interface/web/admin/lib/lang/el_server_config_list.lng
+++ b/interface/web/admin/lib/lang/el_server_config_list.lng
@@ -2,5 +2,3 @@
$wb['list_head_txt'] = 'Ρυθμίσεις Server';
$wb['server_name_txt'] = 'Server';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng
index 823b9f5..212f432 100644
--- a/interface/web/admin/lib/lang/el_server_ip.lng
+++ b/interface/web/admin/lib/lang/el_server_ip.lng
@@ -9,5 +9,3 @@
$wb['virtualhost_port_txt'] = 'Θύρες HTTP';
$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server_ip_list.lng b/interface/web/admin/lib/lang/el_server_ip_list.lng
index 3422184..97107cf 100644
--- a/interface/web/admin/lib/lang/el_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/el_server_ip_list.lng
@@ -8,5 +8,3 @@
$wb['virtualhost_port_txt'] = 'Θύρες HTTP';
$wb['ip_type_txt'] = 'Τύπος';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng
index 549e4cc..4fd50cc 100644
--- a/interface/web/admin/lib/lang/el_server_list.lng
+++ b/interface/web/admin/lib/lang/el_server_list.lng
@@ -11,5 +11,3 @@
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng
index 3a271da..5e3d0fd 100644
--- a/interface/web/admin/lib/lang/el_software_package_install.lng
+++ b/interface/web/admin/lib/lang/el_software_package_install.lng
@@ -4,5 +4,3 @@
$wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης';
$wb['btn_cancel_txt'] = 'Ακύρωση';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
index 148c233..798f6d0 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -8,5 +8,3 @@
$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
$wb['package_id_txt'] = 'τοπικό App-ID';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng
index 9126fec..5b1e222 100644
--- a/interface/web/admin/lib/lang/el_software_repo.lng
+++ b/interface/web/admin/lib/lang/el_software_repo.lng
@@ -5,5 +5,3 @@
$wb['repo_password_txt'] = 'Συνθηματικό (Προαιρετικό)';
$wb['active_txt'] = 'Ενεργό';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng
index a43fdbb..deb896a 100644
--- a/interface/web/admin/lib/lang/el_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/el_software_repo_list.lng
@@ -4,5 +4,3 @@
$wb['repo_name_txt'] = 'Αποθετήριο';
$wb['repo_url_txt'] = 'URL';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
index e5ebe6d..7bdc661 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -6,5 +6,3 @@
$wb['version_txt'] = 'Έκδοση';
$wb['action_txt'] = 'Ενέργεια';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index da1cb30..77eca13 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -28,5 +28,3 @@
$wb['monitor_key_txt'] = 'Monitor keyword';
$wb['admin_name_txt'] = 'Όνομα Administrator';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index e97db54..779a9db 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -26,5 +26,3 @@
$wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα';
$wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.';
?>
-
-
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index be0ffeb..1eb10d2 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -6,5 +6,3 @@
$wb['add_new_record_txt'] = 'Νέος Χρήστης';
$wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
-
-
diff --git a/interface/web/admin/lib/remote.conf.php b/interface/web/admin/lib/remote.conf.php
index 7f2d906..6a87e95 100644
--- a/interface/web/admin/lib/remote.conf.php
+++ b/interface/web/admin/lib/remote.conf.php
@@ -1,5 +1,5 @@
<?php
-$function_list['server_get,get_function_list,client_templates_get_all,server_get_serverid_by_ip'] = 'Server functions';
+$function_list['server_get,get_function_list,client_templates_get_all,server_get_serverid_by_ip,server_ip_add,server_ip_update,server_ip_delete'] = 'Server functions';
?>
\ No newline at end of file
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 5d1f251..13c4322 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -169,13 +169,13 @@
}
//* Set the default servers
- $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1');
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
$default_mailserver = intval($tmp['server_id']);
- $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 LIMIT 0,1');
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
$default_webserver = intval($tmp['server_id']);
- $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 LIMIT 0,1');
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
$default_dnsserver = intval($tmp['server_id']);
- $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 LIMIT 0,1');
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
$default_dbserver = intval($tmp['server_id']);
$sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id;
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index df326f6..51ab88a 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -95,9 +95,9 @@
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
-$wb['customer_no_txt'] = 'Customer No.';
+$wb['customer_no_txt'] = 'Kundennr.';
$wb['vat_id_txt'] = 'VAT ID';
-$wb['required_fields_txt'] = '* Required fields';
+$wb['required_fields_txt'] = '* Benötigte Felder';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['company_id_txt'] = 'Company/Entrepreneur ID';
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index 4359ba7..cc2433a 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -10,6 +10,6 @@
$wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή';
$wb['Resellers'] = 'Μεταπωλητές';
$wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 3361cce..6df5a00 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -104,6 +104,6 @@
$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
+$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng
index e9056cd..ef21bfe 100644
--- a/interface/web/client/lib/lang/el_client_del.lng
+++ b/interface/web/client/lib/lang/el_client_del.lng
@@ -4,5 +4,3 @@
$wb['btn_save_txt'] = 'Διαγραφή πελάτη';
$wb['btn_cancel_txt'] = 'Ακύρωση χωρίς διαγραφή πελάτη';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index d6ad0ff..edc48e7 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -70,5 +70,3 @@
$wb['template_type_txt'] = 'Τύπος προτύπου';
$wb['template_name_txt'] = 'Όνομα προτύπου';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_client_template_list.lng b/interface/web/client/lib/lang/el_client_template_list.lng
index ba8ddd3..1ce866d 100644
--- a/interface/web/client/lib/lang/el_client_template_list.lng
+++ b/interface/web/client/lib/lang/el_client_template_list.lng
@@ -3,5 +3,3 @@
$wb['template_type_txt'] = 'Τύπος';
$wb['template_name_txt'] = 'Όνομα Προτύπου';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng
index 8a51898..5b80e28 100644
--- a/interface/web/client/lib/lang/el_clients_list.lng
+++ b/interface/web/client/lib/lang/el_clients_list.lng
@@ -8,5 +8,3 @@
$wb['add_new_record_txt'] = 'Νέος Πελάτης';
$wb['username_txt'] = 'Username';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 7deacd0..79e54ef 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -104,6 +104,6 @@
$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
+$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
?>
-
-
diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng
index dbd2286..78f7c23 100644
--- a/interface/web/client/lib/lang/el_resellers_list.lng
+++ b/interface/web/client/lib/lang/el_resellers_list.lng
@@ -7,5 +7,3 @@
$wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νεός Μεταπωλητής';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 562b361..144becd 100644
--- a/interface/web/dashboard/lib/lang/el.lng
+++ b/interface/web/dashboard/lib/lang/el.lng
@@ -2,5 +2,3 @@
$wb['welcome_user_txt'] = 'Καλωσήρθατε %s';
$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
index a3553dd..13940bd 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -28,5 +28,3 @@
$wb['limit_database_txt'] = 'Πλήθος Databases';
$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
?>
-
-
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
index 64678ba..95f750a 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,5 +1,3 @@
<?php
$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng
index dd815ad..acb6c35 100644
--- a/interface/web/designer/lib/lang/el.lng
+++ b/interface/web/designer/lib/lang/el.lng
@@ -1,4 +1,2 @@
<?php
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index e4ae9c3..04ebc02 100644
--- a/interface/web/designer/lib/lang/el_form_edit.lng
+++ b/interface/web/designer/lib/lang/el_form_edit.lng
@@ -22,5 +22,3 @@
$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_form_list.lng b/interface/web/designer/lib/lang/el_form_list.lng
index 68a5f47..4cf043a 100644
--- a/interface/web/designer/lib/lang/el_form_list.lng
+++ b/interface/web/designer/lib/lang/el_form_list.lng
@@ -5,5 +5,3 @@
$wb['title_txt'] = 'Τίτλος';
$wb['description_txt'] = 'Περιγραφή';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_form_show.lng b/interface/web/designer/lib/lang/el_form_show.lng
index fff12a7..cf51060 100644
--- a/interface/web/designer/lib/lang/el_form_show.lng
+++ b/interface/web/designer/lib/lang/el_form_show.lng
@@ -16,5 +16,3 @@
$wb['menu_del_txt'] = 'Διαγραφή μενού και όλων των στοιχείων;';
$wb['item_del_txt'] = 'Διαγραφή του στοιχείου μενού';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_module_edit.lng b/interface/web/designer/lib/lang/el_module_edit.lng
index 7abbb08..733e2ae 100644
--- a/interface/web/designer/lib/lang/el_module_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_edit.lng
@@ -10,5 +10,3 @@
$wb['header_txt'] = 'Ιδιότητες αρθρώματος';
$wb['description_txt'] = '<b>Περιγραφή</b> <br><br> <b>Όνομα αρθρώματος:</b> Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.<br> <b>Τίτλος Αρθώματος:</b> Θα εμφανιστεί στο βασικό μενού (επάνω).<br> <b>Αρχείο προτύπου:</b> Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.<br> <b>NaviFrame:</b> Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.<br> <b>Προεπιλεγμένη Σελίδα:</b> Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.<br> <b>Πλάτος Καρτέλας:</b>Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).<br> <b>Βοήθεια:</b> Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο ';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng
index fb598b1..1edbed0 100644
--- a/interface/web/designer/lib/lang/el_module_list.lng
+++ b/interface/web/designer/lib/lang/el_module_list.lng
@@ -3,5 +3,3 @@
$wb['module_txt'] = 'Άρθρωμα';
$wb['title_txt'] = 'Τίτλος';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_module_nav_edit.lng b/interface/web/designer/lib/lang/el_module_nav_edit.lng
index 972c487..02104ad 100644
--- a/interface/web/designer/lib/lang/el_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_edit.lng
@@ -4,5 +4,3 @@
$wb['save_txt'] = 'Αποθήκευση';
$wb['cancel_txt'] = 'Άκυρο';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
index 673d954..06d44b9 100644
--- a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
@@ -6,5 +6,3 @@
$wb['save_txt'] = 'Αποθήκευση';
$wb['cancel_txt'] = 'Ακύρωση';
?>
-
-
diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng
index 450281b..12895cc 100644
--- a/interface/web/designer/lib/lang/el_module_show.lng
+++ b/interface/web/designer/lib/lang/el_module_show.lng
@@ -14,5 +14,3 @@
$wb['menu_del_txt'] = 'Θέλετε να διαγράψετε το μενού και όλα τα στοιχεία του;';
$wb['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;';
?>
-
-
diff --git a/interface/web/dns/lib/lang/ar_dns_soa.lng b/interface/web/dns/lib/lang/ar_dns_soa.lng
index e3a6b7a..0b64c99 100644
--- a/interface/web/dns/lib/lang/ar_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ar_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_soa.lng b/interface/web/dns/lib/lang/bg_dns_soa.lng
index 6bfc82a..e192e01 100644
--- a/interface/web/dns/lib/lang/bg_dns_soa.lng
+++ b/interface/web/dns/lib/lang/bg_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng
index a0d2bb5..e681674 100644
--- a/interface/web/dns/lib/lang/br_dns_soa.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.x. dominio.ext';
$wb['eg_ns1_domain_tld'] = 'e.x. ns1.dominio.ext';
$wb['eg_webmaster_domain_tld'] = 'e.x. webmaster@dominio.ext';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index 0accdef..818ac8e 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'např. domena.cz';
$wb['eg_ns1_domain_tld'] = 'např. ns1.domena.cz';
$wb['eg_webmaster_domain_tld'] = 'např. webmaster@domena.cz';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng
index 1d635de..fd0f6a9 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index 9f513f2..cf2e062 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -20,6 +20,6 @@
$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης εισήχθηκε επιτυχώς!';
$wb['error_no_valid_zone_file_txt'] = 'Το αρχείο ζώνης φαίνεται να μην είναι έγκυρο!';
$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης';
+$wb['Secondary Zones'] = 'Secondary Zones';
+$wb['Import Zone File'] = 'Import Zone File';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_a.lng b/interface/web/dns/lib/lang/el_dns_a.lng
index 6ccc368..4f20e9e 100644
--- a/interface/web/dns/lib/lang/el_dns_a.lng
+++ b/interface/web/dns/lib/lang/el_dns_a.lng
@@ -14,5 +14,3 @@
$wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση';
$wb['data_error_duplicate'] = 'Διπλή εγγραφή A-Record ή CNAME-Record';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_a_list.lng b/interface/web/dns/lib/lang/el_dns_a_list.lng
index 06cd76a..30b3143 100644
--- a/interface/web/dns/lib/lang/el_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_a_list.lng
@@ -12,5 +12,3 @@
$wb['page_of_txt'] = 'από';
$wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγγραφή;';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_aaaa.lng b/interface/web/dns/lib/lang/el_dns_aaaa.lng
index a29de3d..77728e3 100644
--- a/interface/web/dns/lib/lang/el_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/el_dns_aaaa.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Διεύθυνση IP κενή';
$wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng
index ff6f54a..9d29354 100644
--- a/interface/web/dns/lib/lang/el_dns_alias.lng
+++ b/interface/web/dns/lib/lang/el_dns_alias.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί';
$wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_cname.lng b/interface/web/dns/lib/lang/el_dns_cname.lng
index b972d7d..cc10beb 100644
--- a/interface/web/dns/lib/lang/el_dns_cname.lng
+++ b/interface/web/dns/lib/lang/el_dns_cname.lng
@@ -14,5 +14,3 @@
$wb['data_error_regex'] = 'Hostname Προορισμός με μη έγκυρη μορφοποίηση';
$wb['data_error_duplicate'] = 'Διπλοεγγραφή A-Record ή CNAME-Record';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng
index af2c1bb..457213e 100644
--- a/interface/web/dns/lib/lang/el_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές';
$wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 761b5cc..890cfc9 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -14,5 +14,3 @@
$wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_ns.lng b/interface/web/dns/lib/lang/el_dns_ns.lng
index b47c01f..02e1572 100644
--- a/interface/web/dns/lib/lang/el_dns_ns.lng
+++ b/interface/web/dns/lib/lang/el_dns_ns.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Ο Nameserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Η μορφοποίηση του Nameserver δεν είναι σωστή';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_ptr.lng b/interface/web/dns/lib/lang/el_dns_ptr.lng
index 8d3544b..bcd431e 100644
--- a/interface/web/dns/lib/lang/el_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/el_dns_ptr.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Το Κανονικοποιημένο hostname δεν έχει οριστεί';
$wb['data_error_regex'] = 'Κανονικοποιημένο hostname με μη έγκυρη μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_rp.lng b/interface/web/dns/lib/lang/el_dns_rp.lng
index 7d8e522..83fd36d 100644
--- a/interface/web/dns/lib/lang/el_dns_rp.lng
+++ b/interface/web/dns/lib/lang/el_dns_rp.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Το πρόσωπο επικοινωνίας δεν έχει οριστεί.';
$wb['data_error_regex'] = 'Η μορφοποίηση του υπεύθυνου δεν είναι έγκυρη';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 749ef59..90591b1 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -14,5 +14,3 @@
$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_slave_list.lng b/interface/web/dns/lib/lang/el_dns_slave_list.lng
index 1aa01b2..c54d69f 100644
--- a/interface/web/dns/lib/lang/el_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave_list.lng
@@ -7,5 +7,3 @@
$wb['add_new_record_txt'] = 'Νέα Δευτερεύουσα ζώνη DNS';
$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index 59e3f98..cd8e023 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -28,6 +28,5 @@
$wb['eg_domain_tld'] = 'π.χ. domain.tld';
$wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng
index 68a1829..99c1d73 100644
--- a/interface/web/dns/lib/lang/el_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng
@@ -8,5 +8,3 @@
$wb['add_new_record_wizard_txt'] = 'Νέα ζώνη DNS με Οδηγό';
$wb['add_new_record_txt'] = 'Νέα ζώνη DNS (χειροκίνητα)';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng
index 3ba3ae6..01901ce 100644
--- a/interface/web/dns/lib/lang/el_dns_srv.lng
+++ b/interface/web/dns/lib/lang/el_dns_srv.lng
@@ -15,5 +15,3 @@
$wb['data_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση';
$wb['srv_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση. Η εγγραφή Server πρέπει να περιέχει 3 λέξεις χωρισμένες με κενά.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng
index 3930572..20e9bf8 100644
--- a/interface/web/dns/lib/lang/el_dns_template.lng
+++ b/interface/web/dns/lib/lang/el_dns_template.lng
@@ -4,5 +4,3 @@
$wb['template_txt'] = 'Πρότυπο';
$wb['visible_txt'] = 'Ενεργό';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_template_list.lng b/interface/web/dns/lib/lang/el_dns_template_list.lng
index ba73fc8..ff676a1 100644
--- a/interface/web/dns/lib/lang/el_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_template_list.lng
@@ -4,5 +4,3 @@
$wb['name_txt'] = 'Όνομα';
$wb['add_new_record_txt'] = 'Νέα εγγραφή';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_txt.lng b/interface/web/dns/lib/lang/el_dns_txt.lng
index e08978e..62c2dc8 100644
--- a/interface/web/dns/lib/lang/el_dns_txt.lng
+++ b/interface/web/dns/lib/lang/el_dns_txt.lng
@@ -13,5 +13,3 @@
$wb['data_error_empty'] = 'Το κείμενο δεν έχει οριστεί';
$wb['data_error_regex'] = 'Κείμενο με μη έγκυρη μορφοποίηση';
?>
-
-
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index fa060aa..6275c56 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -27,5 +27,3 @@
$wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/es_dns_soa.lng b/interface/web/dns/lib/lang/es_dns_soa.lng
index 5d69506..1cd10e4 100644
--- a/interface/web/dns/lib/lang/es_dns_soa.lng
+++ b/interface/web/dns/lib/lang/es_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng
index ac5d4ed..e78d793 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng
index 4b949d9..c4f7519 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'ex. domain.tld';
$wb['eg_ns1_domain_tld'] = 'ex. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'ex. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng
index dad8dc6..8c0627b 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng
index 3e5d86d..1a8d388 100644
--- a/interface/web/dns/lib/lang/hu_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hu_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_soa.lng b/interface/web/dns/lib/lang/id_dns_soa.lng
index 7c33a8b..ffd19c0 100644
--- a/interface/web/dns/lib/lang/id_dns_soa.lng
+++ b/interface/web/dns/lib/lang/id_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_soa.lng b/interface/web/dns/lib/lang/it_dns_soa.lng
index 6bfc82a..e192e01 100644
--- a/interface/web/dns/lib/lang/it_dns_soa.lng
+++ b/interface/web/dns/lib/lang/it_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_soa.lng b/interface/web/dns/lib/lang/ja_dns_soa.lng
index cd38f1d..1346bf6 100644
--- a/interface/web/dns/lib/lang/ja_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ja_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng
index b107386..7be381e 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index 8c17246..47e11d2 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'np. domena.pl';
$wb['eg_ns1_domain_tld'] = 'np. ns1.domena.pl';
$wb['eg_webmaster_domain_tld'] = 'np. webmaster@domena.pl';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/pt_dns_soa.lng b/interface/web/dns/lib/lang/pt_dns_soa.lng
index a13d92d..221539e 100644
--- a/interface/web/dns/lib/lang/pt_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pt_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_soa.lng b/interface/web/dns/lib/lang/ro_dns_soa.lng
index 95298d4..ea83f52 100644
--- a/interface/web/dns/lib/lang/ro_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ro_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng
index 478fa36..6d1fea7 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_soa.lng b/interface/web/dns/lib/lang/se_dns_soa.lng
index e3a6b7a..0b64c99 100644
--- a/interface/web/dns/lib/lang/se_dns_soa.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_soa.lng b/interface/web/dns/lib/lang/sk_dns_soa.lng
index b2c1f26..b999ee0 100644
--- a/interface/web/dns/lib/lang/sk_dns_soa.lng
+++ b/interface/web/dns/lib/lang/sk_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_soa.lng b/interface/web/dns/lib/lang/tr_dns_soa.lng
index 062eab2..d793e2b 100644
--- a/interface/web/dns/lib/lang/tr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/tr_dns_soa.lng
@@ -28,4 +28,5 @@
$wb['eg_domain_tld'] = 'e.g. domain.tld';
$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
?>
diff --git a/interface/web/dns/lib/remote.conf.php b/interface/web/dns/lib/remote.conf.php
index 4caf53f..e14b5b7 100644
--- a/interface/web/dns/lib/remote.conf.php
+++ b/interface/web/dns/lib/remote.conf.php
@@ -1,6 +1,6 @@
<?php
-$function_list['dns_zone_get,dns_zone_get_id,dns_zone_add,dns_zone_update,dns_zone_delete,dns_zone_set_status'] = 'DNS zone functions';
+$function_list['dns_zone_get,dns_zone_get_id,dns_zone_add,dns_zone_update,dns_zone_delete,dns_zone_set_status,dns_templatezone_add'] = 'DNS zone functions';
$function_list['dns_a_get,dns_a_add,dns_a_update,dns_a_delete'] = 'DNS a functions';
$function_list['dns_aaaa_get,dns_aaaa_add,dns_aaaa_update,dns_aaaa_delete'] = 'DNS aaaa functions';
$function_list['dns_alias_get,dns_alias_add,dns_alias_update,dns_alias_delete'] = 'DNS alias functions';
diff --git a/interface/web/domain/lib/lang/el.lng b/interface/web/domain/lib/lang/el.lng
index af485ae..c1f1284 100644
--- a/interface/web/domain/lib/lang/el.lng
+++ b/interface/web/domain/lib/lang/el.lng
@@ -7,5 +7,3 @@
$wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain';
$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε πελάτη<br>';
?>
-
-
diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng
index 62f7637..696d10d 100644
--- a/interface/web/domain/lib/lang/el_domain.lng
+++ b/interface/web/domain/lib/lang/el_domain.lng
@@ -4,5 +4,3 @@
$wb['domain_error_regex'] = 'Το όνομα domain δεν επιτρέπεται';
$wb['Domain'] = 'Domain';
?>
-
-
diff --git a/interface/web/domain/lib/lang/el_domain_list.lng b/interface/web/domain/lib/lang/el_domain_list.lng
index 1af9826..9430038 100644
--- a/interface/web/domain/lib/lang/el_domain_list.lng
+++ b/interface/web/domain/lib/lang/el_domain_list.lng
@@ -3,5 +3,3 @@
$wb['add_new_record_txt'] = 'Νέο Domain';
$wb['domain_txt'] = 'Domain';
?>
-
-
diff --git a/interface/web/help/lib/lang/el.lng b/interface/web/help/lib/lang/el.lng
index 5274baf..1bd16c8 100644
--- a/interface/web/help/lib/lang/el.lng
+++ b/interface/web/help/lib/lang/el.lng
@@ -12,5 +12,3 @@
$wb['Add a Question & Answer Pair'] = 'Προσθήκη ζεύγους Ερώτησης - Απάντησης';
$wb['Manage Questions'] = 'Διαχείριση Ερωτήσεων';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_faq_form.lng b/interface/web/help/lib/lang/el_faq_form.lng
index fecacec..db46365 100644
--- a/interface/web/help/lib/lang/el_faq_form.lng
+++ b/interface/web/help/lib/lang/el_faq_form.lng
@@ -1,8 +1,6 @@
<?php
-$wb['faq_faq_txt'] = "Συχνές Ερωτήσεις";
-$wb['faq_question_txt'] = "Ερώτηση";
-$wb['faq_answer_txt'] = "Απάντηση";
-$wb['faq_section_txt'] = "Ενότητα";
+$wb['faq_faq_txt'] = 'Συχνές Ερωτήσεις';
+$wb['faq_question_txt'] = 'Ερώτηση';
+$wb['faq_answer_txt'] = 'Απάντηση';
+$wb['faq_section_txt'] = 'Ενότητα';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
index 3432e0c..ac36728 100644
--- a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng
@@ -7,5 +7,3 @@
$wb['faq_faq_questions_txt'] = 'Συχνές Ερωτήσεις';
$wb['faq_new_question_txt'] = 'Προσθήκη ζεύγους Ερώτησης - Απάντησης';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_faq_sections_form.lng b/interface/web/help/lib/lang/el_faq_sections_form.lng
index 1fb687d..5d0534c 100644
--- a/interface/web/help/lib/lang/el_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/el_faq_sections_form.lng
@@ -1,5 +1,3 @@
<?php
$wb['faq_section_name_txt'] = 'Όνομα Ενότητας';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng
index db89761..b6c7b46 100644
--- a/interface/web/help/lib/lang/el_help_faq_list.lng
+++ b/interface/web/help/lib/lang/el_help_faq_list.lng
@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Edit';
?>
-
diff --git a/interface/web/help/lib/lang/el_help_faq_sections_list.lng b/interface/web/help/lib/lang/el_help_faq_sections_list.lng
index 7e5f71b..05c5296 100644
--- a/interface/web/help/lib/lang/el_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/el_help_faq_sections_list.lng
@@ -6,5 +6,3 @@
$wb['faq_faq_sections_txt'] = 'Ενότητες Ερωτήσεων';
$wb['faq_new_section_txt'] = 'Προσθήκη Ενότητας';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_support_message.lng b/interface/web/help/lib/lang/el_support_message.lng
index a46bf8c..4810e08 100644
--- a/interface/web/help/lib/lang/el_support_message.lng
+++ b/interface/web/help/lib/lang/el_support_message.lng
@@ -6,5 +6,3 @@
$wb['tstamp_txt'] = 'Ημερομηνία/Ώρα';
$wb['reply_txt'] = 'Απάντηση';
?>
-
-
diff --git a/interface/web/help/lib/lang/el_support_message_list.lng b/interface/web/help/lib/lang/el_support_message_list.lng
index 58cc6a2..e8b2cf3 100644
--- a/interface/web/help/lib/lang/el_support_message_list.lng
+++ b/interface/web/help/lib/lang/el_support_message_list.lng
@@ -4,5 +4,3 @@
$wb['subject_txt'] = 'Θέμα';
$wb['add_new_record_txt'] = 'Νέο μήνυμα υποστήριξης';
?>
-
-
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index ae0a640..25e2128 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -133,6 +133,31 @@
*/
}
+function submitFormConfirm(formname,target,confirmation) {
+ if(window.confirm(confirmation)) {
+ var submitFormObj = jQuery.ajax({ type: "POST",
+ url: target,
+ data: jQuery('#'+formname).serialize(),
+ dataType: "html",
+ success: function(data, textStatus, jqXHR) {
+ if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+ var parts = jqXHR.responseText.split(':');
+ //alert(parts[1]);
+ loadContent(parts[1]);
+ //redirect = parts[1];
+ //window.setTimeout('loadContent(redirect)', 1000);
+ } else {
+ jQuery('#pageContent').html(jqXHR.responseText);
+ }
+ },
+ error: function(jqXHR, textStatus, errorThrown) {
+ var parts = jqXHR.responseText.split(':');
+ reportError('Ajax Request was not successful. 111');
+ },
+ });
+ }
+}
+
function submitUploadForm(formname,target) {
var handleResponse = function(loadedFrame) {
var response, responseStr = loadedFrame.contentWindow.document.body.innerHTML;
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index 189799b..e9056a4 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -15,5 +15,3 @@
$wb['password_txt'] = 'Συνθηματικό';
$wb['login_button_txt'] = 'Είσοδος';
?>
-
-
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 9948d11..b70d656 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -234,11 +234,6 @@
'autoresponder_start_date' => array (
'datatype' => 'DATETIME',
'formtype' => 'DATETIME',
- 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_autoresponder',
- 'function' => 'start_date',
- 'errmsg'=> 'autoresponder_start_date_isfuture'),
- ),
),
'autoresponder_end_date' => array (
'datatype' => 'DATETIME',
diff --git a/interface/web/mail/lib/lang/ar_mail_get.lng b/interface/web/mail/lib/lang/ar_mail_get.lng
index 1d51045..2ed52d2 100644
--- a/interface/web/mail/lib/lang/ar_mail_get.lng
+++ b/interface/web/mail/lib/lang/ar_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index 5ca20d0..def76bd 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -9,7 +9,7 @@
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'Active';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
diff --git a/interface/web/mail/lib/lang/bg_mail_get.lng b/interface/web/mail/lib/lang/bg_mail_get.lng
index 1d51045..2ed52d2 100644
--- a/interface/web/mail/lib/lang/bg_mail_get.lng
+++ b/interface/web/mail/lib/lang/bg_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 1973c4d..641e78d 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index 5c3ac97..7e69772 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Destino não selecionado.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 99a1390..58dc3c2 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Já existe um aliase o encaminhamento com este endereço de correio.';
$wb['quota_error_value'] = 'Valor de cota inválido. Valores válidos são: 0 para ilimitado ou números > 1';
$wb['autoresponder_start_date_txt'] = 'Início:';
-$wb['autoresponder_start_date_isfuture'] = 'A data de ínicio não pode estar no passado.';
+$wb['autoresponder_start_date_ispast'] = 'A data de ínicio não pode estar no passado.';
$wb['autoresponder_end_date_txt'] = 'Termino:';
$wb['autoresponder_end_date_isgreater'] = 'A data de início deve ser menor que a data de termino.';
$wb['move_junk_txt'] = 'Mover Spam para o diretório JUNK';
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index 64e6764..d23f529 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Nevybrán žádný cíl.';
$wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový název.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index b061023..bc0c3f1 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -9,7 +9,7 @@
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'Aktivní';
$wb['autoresponder_start_date_txt'] = 'Začít od';
-$wb['autoresponder_start_date_isfuture'] = 'Počáteční datum nemůže být v minulosti.';
+$wb['autoresponder_start_date_ispast'] = 'Počáteční datum nemůže být v minulosti.';
$wb['autoresponder_end_date_txt'] = 'Skončit';
$wb['autoresponder_end_date_isgreater'] = 'Konečné datum musí být nastaveno a musí být větší, než počáteční.';
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index 7f71bf5..706af98 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Kein Ziel gewählt.';
$wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 82f7c87..3bed84c 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.';
$wb['quota_error_value'] = 'Ungültige Quota Eingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1';
$wb['autoresponder_start_date_txt'] = 'Startet am';
-$wb['autoresponder_start_date_isfuture'] = 'Startdatum kann nicht in der Vergangenheit liegen.';
+$wb['autoresponder_start_date_ispast'] = 'Startdatum kann nicht in der Vergangenheit liegen.';
$wb['autoresponder_end_date_txt'] = 'Endet am';
$wb['autoresponder_end_date_isgreater'] = 'Enddatum muss angegeben werden und muss später als das Startdatum sein.';
$wb['move_junk_txt'] = 'Spam E-Mails in den Junk Ordner verschieben';
diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng
index 1ddf783..d52562f 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -45,5 +45,3 @@
$wb['Domain Alias'] = 'Ψευδώνυμο Domain';
$wb['Relay Recipients'] = 'Παραλήπτες Relay';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index b1b2b59..767b35a 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -10,5 +10,3 @@
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_alias_list.lng b/interface/web/mail/lib/lang/el_mail_alias_list.lng
index 9579667..f6dc457 100644
--- a/interface/web/mail/lib/lang/el_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias_list.lng
@@ -6,5 +6,3 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Νέο Ψευδώνυμο Email';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
index ab3ae6e..164ff6f 100644
--- a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng
@@ -9,5 +9,3 @@
$wb['source_error_unique'] = 'Το Domain Πηγή πρέπει να είναι μοναδικό';
$wb['source_error_regex'] = 'Μή έγκυρο όνομα για το Domain Εκκίνησης';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
index 2a65ce3..fa50e87 100644
--- a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@
$wb['destination_txt'] = 'Προορισμός';
$wb['add_new_record_txt'] = 'Νέο ψευδωνύμο Domain';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng
index cc252a5..479a3de 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng
@@ -7,5 +7,3 @@
$wb['type_txt'] = 'Τύπος';
$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
index 66c42c2..a2f23fd 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng
@@ -8,5 +8,3 @@
$wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist';
$wb['access_txt'] = 'πρόσβαση';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_content_filter.lng b/interface/web/mail/lib/lang/el_mail_content_filter.lng
index 94c3afe..46c6d80 100644
--- a/interface/web/mail/lib/lang/el_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/el_mail_content_filter.lng
@@ -7,5 +7,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['pattern_error_empty'] = 'Το μοτίβο δεν έχει οριστεί.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
index 7b52950..2103b5c 100644
--- a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng
@@ -6,5 +6,3 @@
$wb['action_txt'] = 'Ενέργεια';
$wb['add_new_record_txt'] = 'Νέο φίλτρο περιεχομένου';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index da0c0bc..7e825ad 100644
--- a/interface/web/mail/lib/lang/el_mail_domain.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain.lng
@@ -11,5 +11,3 @@
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ανενεργό -';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
index 5bb1c51..b3be224 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng
@@ -6,5 +6,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['sys_groupid_txt'] = 'Πελάτης';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
index 5047b0d..2465af0 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
@@ -7,5 +7,3 @@
$wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όνομα περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
index 5c427da..e21ecb7 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng
@@ -7,5 +7,3 @@
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Νέο Catchall';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_domain_list.lng b/interface/web/mail/lib/lang/el_mail_domain_list.lng
index d3ddcbd..89fb44a 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_list.lng
@@ -5,5 +5,3 @@
$wb['add_new_record_txt'] = 'Νέο Domain';
$wb['active_txt'] = 'Ενεργό';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index bfe431b..d9066d2 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -6,5 +6,3 @@
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_forward_list.lng b/interface/web/mail/lib/lang/el_mail_forward_list.lng
index 0e56a2f..623c4f2 100644
--- a/interface/web/mail/lib/lang/el_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward_list.lng
@@ -6,5 +6,3 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Νέα προώθηση Email';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng
index c385429..b4a7784 100644
--- a/interface/web/mail/lib/lang/el_mail_get.lng
+++ b/interface/web/mail/lib/lang/el_mail_get.lng
@@ -14,6 +14,5 @@
$wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.';
$wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.';
$wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_get_list.lng b/interface/web/mail/lib/lang/el_mail_get_list.lng
index 45e2f34..0490889 100644
--- a/interface/web/mail/lib/lang/el_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_get_list.lng
@@ -7,5 +7,3 @@
$wb['destination_txt'] = 'Προορισμός';
$wb['add_new_record_txt'] = 'Νέος Λογαρισμός';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
index 7d74373..f634570 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
@@ -1,17 +1,15 @@
<?php
-$wb['limit_mailmailinglist_txt'] = "Το όριο ξεπεράστηκε.";
-$wb['domain_error_empty'] = "Το Domain είναι άδειο.";
-$wb['listname_error_empty'] = "Η λίστα είναι άδεια.";
-$wb['domain_error_regex'] = "Το όνομα domain δεν είναι έγκυρο/";
-$wb['email_in_use_txt'] = "Το email χρησιμοποιείται ήδη.";
-$wb['no_domain_perm'] = "Δεν έχετε δικαιώματα σε αυτό το domain.";
-$wb['password_strength_txt'] = "Δύναμη συνθηματικού";
-$wb['server_id_txt'] = "Server";
-$wb['domain_txt'] = "Domain";
-$wb['listname_txt'] = "Όνομα λίστας";
-$wb['client_txt'] = "Πελάτης";
-$wb['email_txt'] = "Email";
-$wb['password_txt'] = "Συνθηματικό";
+$wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.';
+$wb['domain_error_empty'] = 'Το Domain είναι άδειο.';
+$wb['listname_error_empty'] = 'Η λίστα είναι άδεια.';
+$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/';
+$wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.';
+$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['listname_txt'] = 'Όνομα λίστας';
+$wb['client_txt'] = 'Πελάτης';
+$wb['email_txt'] = 'Email';
+$wb['password_txt'] = 'Συνθηματικό';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
index c39d88f..8fc67cb 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@
$wb['domain_txt'] = 'Domain';
$wb['listname_txt'] = 'Όνομα Λίστας';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
index 1a33bc3..8a64362 100644
--- a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng
@@ -7,5 +7,3 @@
$wb['type_txt'] = 'Τύπος';
$wb['limit_mailfilter_txt'] = 'Το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας, εξαντλήθηκε.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
index 2ce9b2d..80298c1 100644
--- a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng
@@ -7,5 +7,3 @@
$wb['add_new_record_txt'] = 'Νέος παραλήπτης relay';
$wb['access_txt'] = 'πρόσβαση';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
index 4e53c7c..48c4eaa 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
@@ -15,5 +15,3 @@
$wb['spam_redirect_maildir_purge_txt'] = 'Εκκαθάριση φακέλου mail μετά';
$wb['days_txt'] = 'Ημέρες.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
index e24251b..9468e4e 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Νέα εγγραφή φίλτρου Spam';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng
index 72d812e..ab097e3 100644
--- a/interface/web/mail/lib/lang/el_mail_transport.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport.lng
@@ -8,5 +8,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['limit_mailrouting_txt'] = 'Το μέγιστο πλήθος των δρομολογήσεων email για τον λογαριασμό σας, εξαντλήθηκε.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng
index 425578e..249eee9 100644
--- a/interface/web/mail/lib/lang/el_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng
@@ -7,5 +7,3 @@
$wb['sort_order_txt'] = 'Ταξινόμηση κατά';
$wb['add_new_record_txt'] = 'Νέα μεταφορά';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index cac5297..6e1d6b6 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -1,46 +1,44 @@
<?php
-$wb['custom_mailfilter_txt'] = "Προσαρμοσμένο φίλτρο";
-$wb['email_txt'] = "Email";
-$wb['cryptpwd_txt'] = "Συνθηματικό";
-$wb['password_strength_txt'] = "Δύναμη Συνθηματικού";
-$wb['active_txt'] = "Ενεργό";
-$wb['email_error_isemail'] = "Η διεύθυνση Email δεν είναι έγκυρη.";
-$wb['email_error_unique'] = "Διπλή διεύθυνση Email.";
-$wb['autoresponder_text_txt'] = "Κείμενο";
-$wb['autoresponder_txt'] = "Ενεργό";
-$wb['autoresponder_start_date_txt'] = "Έναρξη";
-$wb['autoresponder_start_date_isfuture'] = "Η ημερ. εκκίνησης δεν μπορεί να είναι στο παρελθόν.";
-$wb['autoresponder_end_date_txt'] = "Λήξη";
-$wb['autoresponder_end_date_isgreater'] = "Η ημερ. τέλους πρέπει να δωθεί και να είναι μεταγενέστερη της ημερ. εκκίνησης";
-$wb['no_domain_perm'] = "Δεν έχετε δικαιώματα σε αυτό το domain.";
-$wb['error_no_pwd'] = "Το συνθηματικό δεν έχει οριστεί.";
-$wb['quota_error_isint'] = "Το μέγεθος της θυρίδας πρέπει να είναι αριθμός.";
-$wb['quota_txt'] = "Όριο χώρου";
-$wb['server_id_txt'] = "Aerver_id";
-$wb['password_txt'] = "Συνθηματικό";
-$wb['maildir_txt'] = "Maildir";
-$wb['postfix_txt'] = "Ενεργοποίηση Λήψης";
-$wb['access_txt'] = "Ενεργοποίηση Πρόσβασης";
-$wb['policy_txt'] = "Φίλτρο Spam";
-$wb['no_policy'] = "- ανενεργή -";
-$wb['limit_mailbox_txt'] = "Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.";
-$wb['limit_mailquota_txt'] = "Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι";
-$wb['disableimap_txt'] = "Απενεργοποίηση IMAP";
-$wb['disablepop3_txt'] = "Απενεργοποίηση POP3";
-$wb['duplicate_alias_or_forward_txt'] = "Υπάρχει ήδη ένα ψευδωνύμο ή μία προώθηση με αυτή τη διεύθυνση email.";
-$wb['quota_error_value'] = "Μη έγκυρη τιμή ορίου χώρου. Επιτρεπόμενες τιμές είναι: 0 για απεριόριστο ή αριθμοί > 1";
-$wb['move_junk_txt'] = "Μετακίνηση των Spam Emails στο φάκελο Junk";
-$wb['name_txt'] = "Πραγματικό Όνομα";
-$wb['name_optional_txt'] = "(Προαιρετικό)";
-$wb['autoresponder_active'] = "Ενεργοποίηση αυτόματης απάντησης";
-$wb['cc_txt'] = "Αποστολή αντιγράφου σε ";
-$wb['cc_error_isemail'] = "Προς";
-$wb['domain_txt'] = "Domain";
-$wb['now_txt'] = "Τώρα";
-$wb['login_error_unique'] = "Το όνομα χρησιμοποιείται ήδη";
-$wb['login_error_regex'] = "Έγγυροι χαρακτήρες είναι οι A-Z, a-z, 0-9, ., _ και -.";
-$wb['login_txt'] = "Login (προαιτερικά)";
-$wb['error_login_email_txt'] = "Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail.";
+$wb['custom_mailfilter_txt'] = 'Προσαρμοσμένο φίλτρο';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Συνθηματικό';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
+$wb['active_txt'] = 'Ενεργό';
+$wb['email_error_isemail'] = 'Η διεύθυνση Email δεν είναι έγκυρη.';
+$wb['email_error_unique'] = 'Διπλή διεύθυνση Email.';
+$wb['autoresponder_text_txt'] = 'Κείμενο';
+$wb['autoresponder_txt'] = 'Ενεργό';
+$wb['autoresponder_start_date_txt'] = 'Έναρξη';
+$wb['autoresponder_start_date_ispast'] = 'Η ημερ. εκκίνησης δεν μπορεί να είναι στο παρελθόν.';
+$wb['autoresponder_end_date_txt'] = 'Λήξη';
+$wb['autoresponder_end_date_isgreater'] = 'Η ημερ. τέλους πρέπει να δωθεί και να είναι μεταγενέστερη της ημερ. εκκίνησης';
+$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';
+$wb['error_no_pwd'] = 'Το συνθηματικό δεν έχει οριστεί.';
+$wb['quota_error_isint'] = 'Το μέγεθος της θυρίδας πρέπει να είναι αριθμός.';
+$wb['quota_txt'] = 'Όριο χώρου';
+$wb['server_id_txt'] = 'Aerver_id';
+$wb['password_txt'] = 'Συνθηματικό';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Ενεργοποίηση Λήψης';
+$wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης';
+$wb['policy_txt'] = 'Φίλτρο Spam';
+$wb['no_policy'] = '- ανενεργή -';
+$wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.';
+$wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι';
+$wb['disableimap_txt'] = 'Απενεργοποίηση IMAP';
+$wb['disablepop3_txt'] = 'Απενεργοποίηση POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'Υπάρχει ήδη ένα ψευδωνύμο ή μία προώθηση με αυτή τη διεύθυνση email.';
+$wb['quota_error_value'] = 'Μη έγκυρη τιμή ορίου χώρου. Επιτρεπόμενες τιμές είναι: 0 για απεριόριστο ή αριθμοί > 1';
+$wb['move_junk_txt'] = 'Μετακίνηση των Spam Emails στο φάκελο Junk';
+$wb['name_txt'] = 'Πραγματικό Όνομα';
+$wb['name_optional_txt'] = '(Προαιρετικό)';
+$wb['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης';
+$wb['cc_txt'] = 'Αποστολή αντιγράφου σε ';
+$wb['cc_error_isemail'] = 'Προς';
+$wb['domain_txt'] = 'Domain';
+$wb['now_txt'] = 'Τώρα';
+$wb['login_error_unique'] = 'Το όνομα χρησιμοποιείται ήδη';
+$wb['login_error_regex'] = 'Έγγυροι χαρακτήρες είναι οι A-Z, a-z, 0-9, ., _ και -.';
+$wb['login_txt'] = 'Login (προαιτερικά)';
+$wb['error_login_email_txt'] = 'Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng
index 1780f85..fb9508c 100644
--- a/interface/web/mail/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng
@@ -18,5 +18,3 @@
$wb['move_to_txt'] = 'Μετακίνηση σε';
$wb['delete_txt'] = 'Διαγραφή';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
index 2c95001..63efeb4 100644
--- a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng
@@ -5,5 +5,3 @@
$wb['page_of_txt'] = 'από';
$wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε το φίλτρο mail;';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng
index 4fbc7a8..7e3f57b 100644
--- a/interface/web/mail/lib/lang/el_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_list.lng
@@ -6,5 +6,3 @@
$wb['name_txt'] = 'Πραγματικό Όνομα';
$wb['login_txt'] = 'Login';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
index 92db1c7..5cfd25e 100644
--- a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng
@@ -6,5 +6,3 @@
$wb['this_year_txt'] = 'Αυτό το χρόνο';
$wb['last_year_txt'] = 'Τον τελευταίο χρόνο';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng
index 1e221e5..6c477f6 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng
@@ -7,5 +7,3 @@
$wb['type_txt'] = 'Τύπος';
$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
index d80490c..5fe38d9 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng
@@ -8,5 +8,3 @@
$wb['add_new_record_txt'] = 'Νέα εγγραφή στην λίστα των επιτρεπόμενων διευθύνσεων';
$wb['access_txt'] = 'πρόσβαση';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
index 9dfc038..2bf1e28 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng
@@ -7,5 +7,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των Whitelist ή Blacklist εγγραφών για τον λογαριασμό σας, έχει εξαντληθεί.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
index bc25acd..c470871 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@
$wb['email_txt'] = 'Blacklisted Email';
$wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_config.lng b/interface/web/mail/lib/lang/el_spamfilter_config.lng
index f6d9ebf..cf7e6df 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_config.lng
@@ -18,5 +18,3 @@
$wb['mailbox_size_limit_txt'] = 'Όριο μεγέθους θυρίδας';
$wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
index 4f2bc7a..94cd6d8 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng
@@ -3,5 +3,3 @@
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'server_id';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy.lng b/interface/web/mail/lib/lang/el_spamfilter_policy.lng
index 3d34164..4ab7291 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_policy.lng
@@ -36,5 +36,3 @@
$wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος';
$wb['banned_rulenames_txt'] = 'Banned rulenames';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
index 162984d..3d10f4d 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@
$wb['bad_header_lover_txt'] = 'Αποδοχή κακών κεφαλίδων';
$wb['add_new_record_txt'] = 'Νέα εγγραφή Πολιτικής';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng
index be56852..39a9273 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng
@@ -6,5 +6,3 @@
$wb['fullname_txt'] = 'Όνομα';
$wb['local_txt'] = 'Τοπικός';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
index 3e620cf..a18e6ce 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng
@@ -8,5 +8,3 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Νέος χρήστης Spamfilter';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
index d9fdabe..1ee4470 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng
@@ -7,5 +7,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των White η Blacklist εγγραφών έχει εξαντληθεί.';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
index abbb516..24febf7 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@
$wb['email_txt'] = 'Whitelisted Email';
$wb['add_new_record_txt'] = 'Νέα εγγραφή Whitelist';
?>
-
-
diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
index 3dca89e..2dfdf3a 100755
--- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
@@ -5,5 +5,3 @@
$wb['email_txt'] = 'Διεύθυνση Email';
$wb['used_txt'] = 'Χώρος σε χρήση';
?>
-
-
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 34dbdcc..b66871d 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -11,7 +11,7 @@
$wb["autoresponder_text_txt"] = 'Text';
$wb["autoresponder_txt"] = 'Active';
$wb["autoresponder_start_date_txt"] = 'Start on';
-$wb["autoresponder_start_date_isfuture"] = 'Start date cannot be in the past.';
+$wb["autoresponder_start_date_ispast"] = 'Start date cannot be in the past.';
$wb["autoresponder_end_date_txt"] = 'End by';
$wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.';
$wb["no_domain_perm"] = 'You have no permission for this domain.';
diff --git a/interface/web/mail/lib/lang/es_mail_get.lng b/interface/web/mail/lib/lang/es_mail_get.lng
index ad67d37..6f9035b 100644
--- a/interface/web/mail/lib/lang/es_mail_get.lng
+++ b/interface/web/mail/lib/lang/es_mail_get.lng
@@ -14,4 +14,5 @@
$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'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 4788a7c..3e58cc1 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Ei kohdetta valittuna.';
$wb['source_server_error_regex'] = 'Pop3/Imap-palvelin ei ole kelvollinen osoite.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index 731210a..41d8874 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Alias- tai edelleenlähetys tälle osoitteelle on jo olemassa.';
$wb['quota_error_value'] = 'Väärä quota-arvo. Sallittuja ovat numerot > 1 tai 0 rajoittamattomalle.';
$wb['autoresponder_start_date_txt'] = 'Aloituspäivä';
-$wb['autoresponder_start_date_isfuture'] = 'Aloituspäivä ei voi olla menneisyydessä.';
+$wb['autoresponder_start_date_ispast'] = 'Aloituspäivä ei voi olla menneisyydessä.';
$wb['autoresponder_end_date_txt'] = 'Lopetuspäivä';
$wb['autoresponder_end_date_isgreater'] = 'Lopetuspäivän pitää olla myöhempi kuin aloituspäivä.';
$wb['move_junk_txt'] = 'Siirrä roskapostit Junk-kansioon';
diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng
index 81aa6e5..700f673 100644
--- a/interface/web/mail/lib/lang/fr_mail_get.lng
+++ b/interface/web/mail/lib/lang/fr_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
$wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 37eb74e..c68a41e 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -25,7 +25,7 @@
$wb['disablepop3_txt'] = 'Désactiver POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d\'email sur cette adresse.';
$wb['autoresponder_start_date_txt'] = 'Démarrer le';
-$wb['autoresponder_start_date_isfuture'] = 'La date de démarrage ne peut être une date passée.';
+$wb['autoresponder_start_date_ispast'] = 'La date de démarrage ne peut être une date passée.';
$wb['autoresponder_end_date_txt'] = 'Terminer le';
$wb['autoresponder_end_date_isgreater'] = 'La date de fin doit être saisie et doit être ultérieure à la date de début.';
$wb['quota_error_value'] = 'Valeur de quota invalide. Les valeurs de quota autorisées sont : 0 pour illimité ou nombres > 1';
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index dcfb4c3..00ed647 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index f34de14..9845fa3 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -9,7 +9,7 @@
$wb['autoresponder_text_txt'] = 'Text';
$wb['autoresponder_txt'] = 'Aktivno';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng
index 277248a..b094544 100644
--- a/interface/web/mail/lib/lang/hu_mail_get.lng
+++ b/interface/web/mail/lib/lang/hu_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Nem választott címzettet.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index e711083..b638e94 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng
index 8d819a0..4518e25 100644
--- a/interface/web/mail/lib/lang/id_mail_get.lng
+++ b/interface/web/mail/lib/lang/id_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Tidak ada tujuan yang dipilih.';
$wb['source_server_error_regex'] = 'Server Pop3/Imap bukan merupakan nama domain yang valid.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index 3eaadba..e9d8cbf 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -9,7 +9,7 @@
$wb['autoresponder_text_txt'] = 'Teks';
$wb['autoresponder_txt'] = 'Aktif';
$wb['autoresponder_start_date_txt'] = 'Dimulai pada';
-$wb['autoresponder_start_date_isfuture'] = 'Tanggal mulai tidak boleh sebelum tanggal hari ini.';
+$wb['autoresponder_start_date_ispast'] = 'Tanggal mulai tidak boleh sebelum tanggal hari ini.';
$wb['autoresponder_end_date_txt'] = 'Selesai pada';
$wb['autoresponder_end_date_isgreater'] = 'Tanggal selesai harus diset dan harus lebih dari tanggal mulai.';
$wb['no_domain_perm'] = 'Anda tidak memiliki hak untuk domain ini.';
diff --git a/interface/web/mail/lib/lang/it_mail_get.lng b/interface/web/mail/lib/lang/it_mail_get.lng
index 1d51045..2ed52d2 100644
--- a/interface/web/mail/lib/lang/it_mail_get.lng
+++ b/interface/web/mail/lib/lang/it_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index 1973c4d..641e78d 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/ja_mail_get.lng b/interface/web/mail/lib/lang/ja_mail_get.lng
index ea88472..87f5410 100644
--- a/interface/web/mail/lib/lang/ja_mail_get.lng
+++ b/interface/web/mail/lib/lang/ja_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = '宛先を選択してください。';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index 49805e9..c51bf1a 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'このメールアドレスには既にエイリアスまたはフォワードが設定されています。';
$wb['quota_error_value'] = '容量の値が不正です。 無制限にする場合は0を、制限する場合は1より大きな整数を指定してください。';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng
index 866f744..a840c3f 100644
--- a/interface/web/mail/lib/lang/nl_mail_get.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Geen bestemming geselecteerd.';
$wb['source_server_error_regex'] = 'Pop3/Imap server is geen geldige domeinnaam.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 9f4d871..4a112f1 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -9,7 +9,7 @@
$wb['autoresponder_text_txt'] = 'Tekst';
$wb['autoresponder_txt'] = 'Actief';
$wb['autoresponder_start_date_txt'] = 'Start op';
-$wb['autoresponder_start_date_isfuture'] = 'Start datum mag niet in het verleden liggen.';
+$wb['autoresponder_start_date_ispast'] = 'Start datum mag niet in het verleden liggen.';
$wb['autoresponder_end_date_txt'] = 'Eindigd op';
$wb['autoresponder_end_date_isgreater'] = 'Einddatum moet later zijn dan de startdatum.';
$wb['no_domain_perm'] = 'U heeft geen toestemming voor dit domein.';
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index 535bf7a..1c241f4 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.';
$wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.';
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index dc9343d..524d455 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Istnieje już alias lub przekierowanie dla tego adresu e-mail.';
$wb['quota_error_value'] = 'Nieprawidłowa wartość limitu. Dozwolone wartości to: 0 dla nielimitowanej pojemności lub liczby > 1';
$wb['autoresponder_start_date_txt'] = 'Uruchom od';
-$wb['autoresponder_start_date_isfuture'] = 'Data uruchomienia nie może być w przeszłości.';
+$wb['autoresponder_start_date_ispast'] = 'Data uruchomienia nie może być w przeszłości.';
$wb['autoresponder_end_date_txt'] = 'Zakończ do';
$wb['autoresponder_end_date_isgreater'] = 'Data zakończenia musi być późniejsza od daty rozpoczęcia';
$wb['move_junk_txt'] = 'Przenoś SPAM do folderu Junk';
diff --git a/interface/web/mail/lib/lang/pt_mail_get.lng b/interface/web/mail/lib/lang/pt_mail_get.lng
index 170cd55..cbd31f0 100644
--- a/interface/web/mail/lib/lang/pt_mail_get.lng
+++ b/interface/web/mail/lib/lang/pt_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Destino não seleccionado.';
$wb['source_server_error_regex'] = 'Servidor Pop3/Imap não é um nome de domínio válido.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 7a3e65f..0b9ed78 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Já existe um alias ou encaminhamento com este endereço de correio.';
$wb['quota_error_value'] = 'Valor de cota inválido. Valores válidos são: 0 para ilimitado ou números > 1';
$wb['autoresponder_start_date_txt'] = 'Início:';
-$wb['autoresponder_start_date_isfuture'] = 'A data de ínicio não pode estar no passado.';
+$wb['autoresponder_start_date_ispast'] = 'A data de ínicio não pode estar no passado.';
$wb['autoresponder_end_date_txt'] = 'Termino:';
$wb['autoresponder_end_date_isgreater'] = 'A data de início deve ser menor que a data de termino.';
$wb['move_junk_txt'] = 'Mover Spam para a pasta JUNK';
diff --git a/interface/web/mail/lib/lang/ro_mail_get.lng b/interface/web/mail/lib/lang/ro_mail_get.lng
index 67348b5..3d084a5 100644
--- a/interface/web/mail/lib/lang/ro_mail_get.lng
+++ b/interface/web/mail/lib/lang/ro_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Nici o destinatie nu e selectata';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index 971f08b..3e8aff9 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -24,7 +24,7 @@
$wb['disableimap_txt'] = 'Blocheaza IMAP';
$wb['disablepop3_txt'] = 'Blocheaza POP3';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index 79518e5..847a8b1 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Не выбран получатель.';
$wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index 9b5019f..e7a5a85 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Алиас или пересылка уже существуют для этого адреса.';
$wb['quota_error_value'] = 'Неверное значение квоты. Допустимые значения: 0 не ограничено, или число больше 1';
$wb['autoresponder_start_date_txt'] = 'Запускать';
-$wb['autoresponder_start_date_isfuture'] = 'Дата запуска не может быть в прошлом.';
+$wb['autoresponder_start_date_ispast'] = 'Дата запуска не может быть в прошлом.';
$wb['autoresponder_end_date_txt'] = 'Окончание';
$wb['autoresponder_end_date_isgreater'] = 'Дата окончания должна быть позже даты запуска.';
$wb['move_junk_txt'] = 'Перемещать спам в директорию Junk';
diff --git a/interface/web/mail/lib/lang/se_mail_get.lng b/interface/web/mail/lib/lang/se_mail_get.lng
index 1d51045..2ed52d2 100644
--- a/interface/web/mail/lib/lang/se_mail_get.lng
+++ b/interface/web/mail/lib/lang/se_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'No destination selected.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index 1973c4d..641e78d 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/sk_mail_get.lng b/interface/web/mail/lib/lang/sk_mail_get.lng
index 18ef7a0..96fc31c 100644
--- a/interface/web/mail/lib/lang/sk_mail_get.lng
+++ b/interface/web/mail/lib/lang/sk_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Žiadny Cieľ nebol vybraný.';
$wb['source_server_error_regex'] = 'Pop3/Imap Server nie je valídne doménové meno.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index 61a96c4..739e0c7 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Existuje už alias alebo preposlanie pre túto e-mailovú adresu.';
$wb['quota_error_value'] = 'Neplatná hodnota kvóty. Povolené hodnoty sú: 0 pre neobmedzený alebo čísla > 1';
$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
$wb['autoresponder_end_date_txt'] = 'End by';
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
diff --git a/interface/web/mail/lib/lang/tr_mail_get.lng b/interface/web/mail/lib/lang/tr_mail_get.lng
index 24a58aa..3d18fac 100644
--- a/interface/web/mail/lib/lang/tr_mail_get.lng
+++ b/interface/web/mail/lib/lang/tr_mail_get.lng
@@ -14,4 +14,5 @@
$wb['destination_error_isemail'] = 'Hedef seçilmedi.';
$wb['source_server_error_regex'] = 'Pop3/Imap Sunucu geçerli bir domaine sahip değil.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \"Delete emails after retrieval\" = no together with \"Retrieve all emails\" = yes';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index 5504da5..48629ea 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -26,7 +26,7 @@
$wb['duplicate_alias_or_forward_txt'] = 'Bu email adresinde alias veya yönlendirme zaten var.';
$wb['quota_error_value'] = 'Geçersiz kota değeri. İzin verilen değerler: Limitsiz için 0 veya 1den büyük';
$wb['autoresponder_start_date_txt'] = 'Başlangıç';
-$wb['autoresponder_start_date_isfuture'] = 'Başlangıç zamanı geçmiş olamaz.';
+$wb['autoresponder_start_date_ispast'] = 'Başlangıç zamanı geçmiş olamaz.';
$wb['autoresponder_end_date_txt'] = 'Bitiş';
$wb['autoresponder_end_date_isgreater'] = 'Bitiş zamanı başlangıç zamanından sonra olmalıdır.';
$wb['move_junk_txt'] = 'Spam Emailleri Junk dizinine taşı';
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index 5e911b1..88e7f12 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -101,7 +101,6 @@
$wb['monitor_serverstate_mailqhighest_txt'] = 'Ο φόρτος της ουράς Mail είναι μέγιστος';
$wb['monitor_serverstate_mailqunknown_txt'] = 'Ουρά Mail: ???';
$wb['monitor_serverstate_raidok_txt'] = 'Η κατάσταση του RAID είναι εντάξει';
-$wb['monitor_serverstate_raid_txt'] = 'Το RAID είναι σε κατάσταση RESYNC';
$wb['monitor_serverstate_raidfault_txt'] = 'Στο RAID υπάρχει ελαττωματικός δίσκος. Αντικαταστήστε τον το συντομότερο δυνατό!';
$wb['monitor_serverstate_raiderror_txt'] = 'Το RAID δεν λειτουργεί πλέον';
$wb['monitor_serverstate_raidunknown_txt'] = 'Κατάσταση RAID: ???';
@@ -146,6 +145,5 @@
$wb['Show fail2ban-Log'] = 'Εμφάνιση fail2ban-Log';
$wb['Show IPTables'] = 'Εμφάνιση IPTables';
$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
+$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
?>
-
-
diff --git a/interface/web/monitor/lib/lang/el_syslog_list.lng b/interface/web/monitor/lib/lang/el_syslog_list.lng
index a2782df..c2db482 100644
--- a/interface/web/monitor/lib/lang/el_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/el_syslog_list.lng
@@ -5,5 +5,3 @@
$wb['loglevel_txt'] = 'Επίπεδο καταγραφής';
$wb['message_txt'] = 'Μήνυμα';
?>
-
-
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 4219fbf..6d30fb9 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -196,7 +196,10 @@
$ispcData = null;
foreach($records as $record) {
/* get the state from the db-data */
- _processDbState($record['type'], $serverId, $serverState, $messages);
+ $tmp = _processDbState($record['type'], $serverId, $serverState, $messages);
+ $serverState = $tmp['serverState'];
+ $messages = $tmp['messages'];
+
/* if we have the os-info, get it */
if ($record['type'] == 'os_info') {
$osData = unserialize($record['data']);
@@ -299,8 +302,8 @@
/*
* gets the state from the db and process it
*/
-function _processDbState($type, $serverId, $serverState, $messages) {
- global $app;
+function _processDbState($type, $serverId) {
+ global $app, $serverState, $messages;
/*
* Always the NEWEST record of each monitoring is responsible for the
@@ -574,6 +577,8 @@
if ($type == 'rkhunter') {
/* this type has no state */
}
+
+ return array('serverState' => $serverState,'messages' => $messages);
}
/*
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index daae650..2e8d4a7 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -106,6 +106,8 @@
if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />';
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />';
parent::onSubmit();
}
diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng
index 90aec30..a43e7e3 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -23,5 +23,3 @@
$wb['Web traffic'] = 'Κίνηση Web';
$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng
index 300ec1b..3e8f7eb 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -19,5 +19,3 @@
$wb['command_error_format'] = 'Η μορφοποίηση για την εντολή δεν είναι έγκυρη. Παρακαλούμε σημειώστε ότι στην περίπτωση του url μόνο τα http/https επιτρέπονται.';
$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_cron_list.lng b/interface/web/sites/lib/lang/el_cron_list.lng
index d2bb97f..a43b9da 100644
--- a/interface/web/sites/lib/lang/el_cron_list.lng
+++ b/interface/web/sites/lib/lang/el_cron_list.lng
@@ -11,5 +11,3 @@
$wb['add_new_cron_txt'] = 'Νέα εργασία Cron';
$wb['parent_domain_id_txt'] = 'Website';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 583786b..dd64d48 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -23,5 +23,3 @@
$wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.';
$wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng
index c8b30ae..f414200 100644
--- a/interface/web/sites/lib/lang/el_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_database_admin_list.lng
@@ -8,5 +8,3 @@
$wb['add_new_record_txt'] = 'Νέα βάση δεδομένων';
$wb['sys_groupid_txt'] = 'Πελάτης';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng
index c277c4d..ce54134 100644
--- a/interface/web/sites/lib/lang/el_database_list.lng
+++ b/interface/web/sites/lib/lang/el_database_list.lng
@@ -7,5 +7,3 @@
$wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων';
$wb['add_new_record_txt'] = 'Νέα Βάσης Δεδομένων';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index e00efa6..d90d4f6 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -26,5 +26,3 @@
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
$wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_ftp_user_list.lng b/interface/web/sites/lib/lang/el_ftp_user_list.lng
index a1983b4..96c98d3 100644
--- a/interface/web/sites/lib/lang/el_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user_list.lng
@@ -6,5 +6,3 @@
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['add_new_record_txt'] = 'Νεός χρήστης FTP';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng
index 7f3f122..10125e2 100644
--- a/interface/web/sites/lib/lang/el_shell_user.lng
+++ b/interface/web/sites/lib/lang/el_shell_user.lng
@@ -21,5 +21,3 @@
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website';
$wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng
index 6dd262c..5468905 100644
--- a/interface/web/sites/lib/lang/el_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/el_shell_user_list.lng
@@ -6,5 +6,3 @@
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['add_new_record_txt'] = 'Νεός χρήστης Shell';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
index 0c54d4f..d93169c 100644
--- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
@@ -6,5 +6,3 @@
$wb['hard_txt'] = 'Απόλυτο όριο';
$wb['soft_txt'] = 'Διαλακτικό όριο';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
index fc2b216..b12aba2 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
@@ -12,5 +12,3 @@
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index 6dcaf80..379ac33 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -90,5 +90,3 @@
$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
index 07e8537..9b20914 100644
--- a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
@@ -7,5 +7,3 @@
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Νέο website';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_domain_list.lng
index ee59654..c3f42a9 100644
--- a/interface/web/sites/lib/lang/el_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_domain_list.lng
@@ -6,5 +6,3 @@
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Νέο website';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_folder.lng b/interface/web/sites/lib/lang/el_web_folder.lng
index 96280a2..afcb846 100644
--- a/interface/web/sites/lib/lang/el_web_folder.lng
+++ b/interface/web/sites/lib/lang/el_web_folder.lng
@@ -5,5 +5,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['path_error_regex'] = 'Μη έγκυρη διαδρομή φακέλου.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_folder_list.lng b/interface/web/sites/lib/lang/el_web_folder_list.lng
index 7951141..86dc18c 100644
--- a/interface/web/sites/lib/lang/el_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_list.lng
@@ -5,5 +5,3 @@
$wb['parent_domain_id_txt'] = 'Website';
$wb['path_txt'] = 'Διαδρομή';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng
index b809fc2..1b00cce 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user.lng
@@ -1,9 +1,7 @@
<?php
-$wb['web_folder_id_txt'] = "Φάκελος";
-$wb['username_txt'] = "Όνομα Χρήστη";
-$wb['password_txt'] = "Συνθηματικό";
-$wb['active_txt'] = "Ενεργός";
-$wb['folder_error_empty'] = "Δεν επιλέχθηκε φάκελος web.";
+$wb['web_folder_id_txt'] = 'Φάκελος';
+$wb['username_txt'] = 'Όνομα Χρήστη';
+$wb['password_txt'] = 'Συνθηματικό';
+$wb['active_txt'] = 'Ενεργός';
+$wb['folder_error_empty'] = 'Δεν επιλέχθηκε φάκελος web.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_folder_user_list.lng b/interface/web/sites/lib/lang/el_web_folder_user_list.lng
index 5668855..2103bcb 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user_list.lng
@@ -4,5 +4,3 @@
$wb['web_folder_id_txt'] = 'Φάκελος';
$wb['username_txt'] = 'Όνομα Χρήστη';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
index a8631ad..0e8c50a 100644
--- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
@@ -6,5 +6,3 @@
$wb['this_year_txt'] = 'Αυτό το χρόνο';
$wb['last_year_txt'] = 'Τον τελευταίο χρόνο';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
index 99c0cdc..792c932 100644
--- a/interface/web/sites/lib/lang/el_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_subdomain.lng
@@ -40,5 +40,3 @@
$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
$wb['no_flag_txt'] = 'Χωρίς Σημαία';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
index 70b1e25..a4426cf 100644
--- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
@@ -6,5 +6,3 @@
$wb['domain_txt'] = 'Subdomain';
$wb['add_new_record_txt'] = 'Νέο subdomain';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng
index 0652d98..423bad5 100644
--- a/interface/web/sites/lib/lang/el_webdav_user.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user.lng
@@ -13,5 +13,3 @@
$wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
?>
-
-
diff --git a/interface/web/sites/lib/lang/el_webdav_user_list.lng b/interface/web/sites/lib/lang/el_webdav_user_list.lng
index 08f44bf..bf19b31 100644
--- a/interface/web/sites/lib/lang/el_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user_list.lng
@@ -6,5 +6,3 @@
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['add_new_record_txt'] = 'Νεός χρήστης Webdav';
?>
-
-
diff --git a/interface/web/sites/lib/lang/en_ftp_user.lng b/interface/web/sites/lib/lang/en_ftp_user.lng
index 88c644e..4598b03 100644
--- a/interface/web/sites/lib/lang/en_ftp_user.lng
+++ b/interface/web/sites/lib/lang/en_ftp_user.lng
@@ -26,4 +26,6 @@
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb["parent_domain_id_error_empty"] = 'No website selected.';
$wb["quota_size_error_regex"] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/en_shell_user.lng b/interface/web/sites/lib/lang/en_shell_user.lng
index e05fd25..b703ad0 100644
--- a/interface/web/sites/lib/lang/en_shell_user.lng
+++ b/interface/web/sites/lib/lang/en_shell_user.lng
@@ -21,4 +21,6 @@
$wb["limit_shell_user_txt"] = 'The max number of shell users is reached.';
$wb["parent_domain_id_error_empty"] = 'No website selected.';
$wb["ssh_rsa_txt"] = 'SSH-RSA Public Key (for key-based logins)';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/lib/lang/en_webdav_user.lng b/interface/web/sites/lib/lang/en_webdav_user.lng
index 09cf6ff..3d43cfc 100644
--- a/interface/web/sites/lib/lang/en_webdav_user.lng
+++ b/interface/web/sites/lib/lang/en_webdav_user.lng
@@ -13,4 +13,6 @@
$wb["directory_error_empty"] = 'Directory empty.';
$wb["parent_domain_id_error_empty"] = 'No website selected.';
$wb['password_strength_txt'] = 'Password strength';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
?>
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index bb93bf2..e09d8dd 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -111,6 +111,8 @@
if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />';
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />';
if(isset($this->dataRecord['ssh_rsa'])) $this->dataRecord['ssh_rsa'] = trim($this->dataRecord['ssh_rsa']);
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index e5a0129..f8dcb97 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -650,10 +650,14 @@
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
$client_id = intval($client["client_id"]);
- } else {
- //$client_id = intval(@$web_rec["client_group_id"]);
+ } elseif (isset($this->dataRecord["client_group_id"])) {
+ $client_group_id = $this->dataRecord["client_group_id"];
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval(@$this->dataRecord["client_group_id"]));
$client_id = intval($client["client_id"]);
+ } else {
+ $client_group_id = $web_rec['sys_groupid'];
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($client_group_id));
+ $client_id = intval($client["client_id"]);
}
if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["sys_groupid"]) {
diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php
index 5d5a617..2d7dc41 100644
--- a/interface/web/sites/webdav_user_edit.php
+++ b/interface/web/sites/webdav_user_edit.php
@@ -114,7 +114,9 @@
*/
if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
-
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />';
+ if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />';
+
parent::onSubmit();
}
diff --git a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
index 3f35583..3e62f1d 100644
--- a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng
@@ -6,5 +6,3 @@
$wb['password_strength_4_txt'] = 'Δυνατό';
$wb['password_strength_5_txt'] = 'Πολύ δυνατό';
?>
-
-
diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng
index 897826e..d473a6e 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -4,6 +4,6 @@
$wb['ISPConfig Tools'] = 'Εργαλεία ISPConfig';
$wb['Password and Language'] = 'Συνθηματικό και Γλώσσα';
$wb['ispconfig_tools_note'] = 'Το άρθρωμα σας επιτρέπει να αλλάξετε το συνθηματικό και την γλώσσα και να ξεκινήσετε έναν επανασυγχρονισμό των εγγραφών DNS.';
+$wb['Dns Tools'] = 'Dns Tools';
+$wb['Resync'] = 'Resync';
?>
-
-
diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng
index 5a43500..ce9c955 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -6,5 +6,3 @@
$wb['Form to edit the user password and language.'] = 'Φόρμα επεξεργασίας συνθηματικού και γλώσσας';
$wb['Settings'] = 'Ρυθμίσεις';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el.lng b/interface/web/vm/lib/lang/el.lng
index 96e1983..f6b13b9 100644
--- a/interface/web/vm/lib/lang/el.lng
+++ b/interface/web/vm/lib/lang/el.lng
@@ -5,5 +5,3 @@
$wb['IP addresses'] = 'Διευθύνσεις IP';
$wb['OpenVZ'] = 'OpenVZ';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_action.lng b/interface/web/vm/lib/lang/el_openvz_action.lng
index 0c6b4e3..d03a007 100644
--- a/interface/web/vm/lib/lang/el_openvz_action.lng
+++ b/interface/web/vm/lib/lang/el_openvz_action.lng
@@ -14,5 +14,3 @@
$wb['ostemplate_name_unique_error'] = 'Υπάρχει ήδη ένα OSTemplate με αυτό το όνομα.';
$wb['ostemplate_exec_txt'] = 'Η εντολή δημιουργίας του OSTemplate εστάλει στον server. Μπορεί να διαρκέσει αρκετά λεπτά η πλήρης δημιουργία του OSTemplate.';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng
index 6839369..8aecd92 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip.lng
@@ -7,5 +7,3 @@
$wb['ip_error_unique'] = 'Η διεύθυνση IP υπάρχει ήδη.';
$wb['IP address'] = 'Διεύθυνση IP';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_ip_list.lng b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
index 270dd4f..accf5d2 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
@@ -4,5 +4,3 @@
$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['reserved_txt'] = 'Reserved';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
index 8e5c825..6f8a98e 100644
--- a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
@@ -9,5 +9,3 @@
$wb['template_file_error_empty'] = 'Το αρχείο του προτύπου δεν έχει καθοριστεί.';
$wb['Template'] = 'Πρότυπο';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
index 9440536..7dbc03f 100644
--- a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@
$wb['allservers_txt'] = 'Υπάρχει σε όλους τους servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index 274693c..afe2bcd 100644
--- a/interface/web/vm/lib/lang/el_openvz_template.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template.lng
@@ -91,5 +91,3 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_template_list.lng b/interface/web/vm/lib/lang/el_openvz_template_list.lng
index 811ebd1..2b05347 100644
--- a/interface/web/vm/lib/lang/el_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template_list.lng
@@ -3,5 +3,3 @@
$wb['active_txt'] = 'Ενεργό';
$wb['template_name_txt'] = 'Όνομα Προτύπου';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index 30690fd..4c7950a 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -38,5 +38,3 @@
$wb['Virtual server'] = 'Εικονικός server';
$wb['Advanced'] = 'Για προχωρημένους';
?>
-
-
diff --git a/interface/web/vm/lib/lang/el_openvz_vm_list.lng b/interface/web/vm/lib/lang/el_openvz_vm_list.lng
index 884d6b1..e4298e6 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm_list.lng
@@ -8,5 +8,3 @@
$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['veid_txt'] = 'VEID';
?>
-
-
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 47b08de..34e9018 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -47,6 +47,31 @@
error_page 500 /error/500.html;
error_page 502 /error/502.html;
error_page 503 /error/503.html;
+ recursive_error_pages on;
+ location = /error/400.html {
+ internal;
+ }
+ location = /error/401.html {
+ internal;
+ }
+ location = /error/403.html {
+ internal;
+ }
+ location = /error/404.html {
+ internal;
+ }
+ location = /error/405.html {
+ internal;
+ }
+ location = /error/500.html {
+ internal;
+ }
+ location = /error/502.html {
+ internal;
+ }
+ location = /error/503.html {
+ internal;
+ }
</tmpl_if>
error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
@@ -76,7 +101,7 @@
auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
}
- location /awstats-icon {
+ location ^~ /awstats-icon {
alias /usr/share/awstats/icon;
}
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 4c698e0..47c5eb2 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -129,7 +129,9 @@
</tmpl_if>
<tmpl_if name='suexec' op='==' value='y'>
# suexec enabled
- SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+ <IfModule mod_suexec.c>
+ SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+ </IfModule>
</tmpl_if>
# Clear PHP settings of this website
<FilesMatch "\.ph(p3?|tml)$">
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 6a652ff..c6a9e00 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -180,7 +180,7 @@
if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
- $sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') AND server_id = ".$conf['server_id'];
+ $sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') AND parent_domain_id = ".$rec['domain_id'];
$aliases = $app->db->queryAllRecords($sql);
$aliasdomain = '';
@@ -194,7 +194,7 @@
$awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
SiteDomain="'.$domain.'"
-HostAliases="www.'.$domain.' localhost 127.0.0.1"'.$aliasdomain;
+HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
file_put_contents($awstats_website_conf_file,$awstats_conf_file_content);
}
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index bfb03be..fa1b189 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -807,8 +807,10 @@
private function _delOldRecords($type, $serverId) {
global $app;
- $now = time();
- $old = $now - (4 * 60); // 4 minutes
+ // $now = time();
+ // $old = $now - (4 * 60); // 4 minutes
+ $old = 'UNIX_TIMESTAMP() - 240';
+
/*
* ATTENTION if i do NOT pay attention of the server id, i delete all data (of the type)
* of ALL servers. This means, if i have a multiserver-environment and a server has a
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 47b889c..69c0f3b 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1593,6 +1593,7 @@
$domain = $sitedata['domain'];
$user = $sitedata['system_user'];
$group = $sitedata['system_group'];
+ $webdav_user_dir = $documentRoot . '/webdav/' . $data['new']['dir'];
/* Check if this is a chrooted setup */
if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
@@ -1601,13 +1602,25 @@
} else {
$apache_chrooted = false;
}
+
+ //* We dont want to have relative paths here
+ if(stristr($webdav_user_dir,'..') || stristr($webdav_user_dir,'./')) {
+ $app->log('Folder path '.$webdav_user_dir.' contains ./ or .. '.$documentRoot,LOGLEVEL_WARN);
+ return false;
+ }
+
+ //* Check if the resulting path exists if yes, if it is inside the docroot
+ if(is_dir($webdav_user_dir) && substr(realpath($webdav_user_dir),0,strlen($documentRoot)) != $documentRoot) {
+ $app->log('Folder path '.$webdav_user_dir.' is outside of docroot '.$documentRoot,LOGLEVEL_WARN);
+ return false;
+ }
/*
* First the webdav-root - folder has to exist
*/
- if(!is_dir($documentRoot . '/webdav/' . $data['new']['dir'])) {
- $app->log('Webdav User directory '.$documentRoot.'/webdav/'.$data['new']['dir'].' does not exist. Creating it now.',LOGLEVEL_DEBUG);
- exec('mkdir -p '.escapeshellcmd($documentRoot . '/webdav/' . $data['new']['dir']));
+ if(!is_dir($webdav_user_dir)) {
+ $app->log('Webdav User directory '.$webdav_user_dir.' does not exist. Creating it now.',LOGLEVEL_DEBUG);
+ exec('mkdir -p '.escapeshellcmd($webdav_user_dir));
}
/*
@@ -1620,19 +1633,19 @@
* The webdav folder (not the webdav-root!) needs the same (not in ONE step, because the
* pwd-files are owned by root)
*/
- $this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($documentRoot . '/webdav/'. $data['new']['dir'] . ' -R'));
- $this->_exec('chmod 770 ' . escapeshellcmd($documentRoot . '/webdav/' . $data['new']['dir'] . ' -R'));
+ $this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($webdav_user_dir.' -R'));
+ $this->_exec('chmod 770 ' . escapeshellcmd($webdav_user_dir.' -R'));
/*
* if the user is active, we have to write/update the password - file
* if the user is inactive, we have to inactivate the user by removing the user from the file
*/
if ($data['new']['active'] == 'y') {
- $this->_writeHtDigestFile( $documentRoot . '/webdav/' . $data['new']['dir'] . '.htdigest', $data['new']['username'], $data['new']['dir'], $data['new']['password']);
+ $this->_writeHtDigestFile( $webdav_user_dir . '.htdigest', $data['new']['username'], $data['new']['dir'], $data['new']['password']);
}
else {
/* empty pwd removes the user! */
- $this->_writeHtDigestFile( $documentRoot . '/webdav/' . $data['new']['dir'] . '.htdigest', $data['new']['username'], $data['new']['dir'], '');
+ $this->_writeHtDigestFile( $webdav_user_dir . '.htdigest', $data['new']['username'], $data['new']['dir'], '');
}
/*
@@ -1784,6 +1797,7 @@
$output .= " Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
$output .= " <Location /webdav/" . $fn . ">\n";
$output .= " DAV On\n";
+ $output .= ' BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On'."\n";
$output .= " AuthType Digest\n";
$output .= " AuthName \"" . $fn . "\"\n";
$output .= " AuthUserFile " . $webdavRoot . '/' . $file . "\n";
@@ -1828,6 +1842,7 @@
$awstats_conf_dir = $web_config['awstats_conf_dir'];
+ if(!is_dir($data['new']['document_root']."/web/stats/")) mkdir($data['new']['document_root']."/web/stats");
if(!@is_file($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index d1e31d1..3ec4717 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -183,8 +183,9 @@
//* try to find customer's mail address
/** TODO: add possibility for client to choose mail notification! **/
- $cron_content = "MAILTO=''\n\n";
- $chr_cron_content = "MAILTO=''\n\n";
+ $cron_content = "MAILTO=''\n";
+ $cron_content .= "SHELL='/bin/sh'\n\n";
+ $chr_cron_content = "MAILTO=''\n";
$chr_cron_content .= "SHELL='/usr/sbin/jk_chrootsh'\n\n";
$cmd_count = 0;
@@ -201,7 +202,7 @@
}
$command .= "\t{$this->parent_domain['system_user']}"; //* running as user
if($job['type'] == 'url') {
- $command .= "\t{$cron_config['wget']} -q -O /dev/null " . escapeshellarg($job['command']) . " >/dev/null 2>&1";
+ $command .= "\t{$cron_config['wget']} -q -t 1 -T 7200 -O /dev/null " . escapeshellarg($job['command']) . " >/dev/null 2>&1";
} else {
if($job['type'] == 'chrooted') {
if(substr($job['command'], 0, strlen($this->parent_domain['document_root'])) == $this->parent_domain['document_root']) {
diff --git a/server/plugins-available/ftpuser_base_plugin.inc.php b/server/plugins-available/ftpuser_base_plugin.inc.php
index 42edbb5..8cd2aa2 100644
--- a/server/plugins-available/ftpuser_base_plugin.inc.php
+++ b/server/plugins-available/ftpuser_base_plugin.inc.php
@@ -74,6 +74,12 @@
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
+ //* Check if the resulting path is inside the docroot
+ if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
+ return false;
+ }
+
exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
@@ -90,6 +96,12 @@
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
+ //* Check if the resulting path is inside the docroot
+ if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
+ return false;
+ }
+
exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 0f3b034..bdf4f15 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1502,6 +1502,7 @@
$awstats_conf_dir = $web_config['awstats_conf_dir'];
+ if(!is_dir($data['new']['document_root']."/web/stats/")) mkdir($data['new']['document_root']."/web/stats");
if(!@is_file($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index f411251..5c41863 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -72,6 +72,13 @@
$app->uses('system');
+ //* Check if the resulting path is inside the docroot
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
+ if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ $app->log('Directory of the shell user is outside of website docroot.',LOGLEVEL_WARN);
+ return false;
+ }
+
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
$uid = intval($app->system->getuid($data['new']['puser']));
@@ -121,6 +128,13 @@
$app->uses('system');
+ //* Check if the resulting path is inside the docroot
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
+ if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ $app->log('Directory of the shell user is outside of website docroot.',LOGLEVEL_WARN);
+ return false;
+ }
+
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
$uid = intval($app->system->getuid($data['new']['puser']));
--
Gitblit v1.9.1