Signing is not working, I need a energy drink to proceed...

Supposed behaviour just committing to have a point to roll back ICoE

And found a small bug (privkeys were not deleted on zone deletion) which is now fixed
Testing successful. Doing last test then if everything goes well this will be the new merge request

final commit? Will test now a last time and if everything works as expected this will be my merge request

Allow domain specific welcom messages:

* In addition to language specific custom welcome messages (when creating a new mail account) this patch will
allow to have a welcome message template for each domain.

* To add a domain specific welcome message, place a file at /usr/local/ispconfig/server/conf-custom/mail/
and name it according the domain, like welcome_email_example.com.txt

* i.e. /usr/local/ispconfig/server/conf-custom/mail/welcome_email_example.com.txt

will be used if a mailbox for example.com is created.

See merge request !263

Master



See merge request !264

Ftp statistics feature

Hi,
I add the ftp traffic support for pure-ftpd.
- Ftp statistics display per hostname in site section (traffic in and out)
- Ftp_traffic table (creation and update patch upd_0081.sql)
- Cronjob
 - Actually pure-ftpd log rotation are configured with /etc/logrotate.d/pure-ftpd-common
 - Maybe replace that per Ispconfig log rotation ?
- Api function for ftp traffic

Thanks

See merge request !266

NOTE: I did only translate de and en!

Conflicts:
	interface/web/client/form/reseller.tform.php