Merge branch 'stable-3.1'

Marius Burkard

2016-02-10 88c307b0ef30a94ea5e9b52a1f9078bf04033d29

Merge branch 'stable-3.1'

 docs/autoinstall_samples/autoinstall.conf_sample.php

@@ -1,52 +1,52 @@
<?php

$autoinstall['language'] = 'en'; // de, en (default)

$autoinstall['install_mode'] = 'standard'; // standard (default), expert



$autoinstall['hostname'] = 'server1.example.com'; // default

$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost

$autoinstall['mysql_root_user'] = 'root'; // default: root

$autoinstall['mysql_root_password'] = 'howtoforge';

$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig

$autoinstall['mysql_charset'] = 'utf8'; // default: utf8

$autoinstall['http_server'] = 'nginx'; // apache (default), nginx

$autoinstall['ispconfig_port'] = '8080'; // default: 8080

$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n



/* SSL Settings */

$autoinstall['ssl_cert_country'] = 'AU';

$autoinstall['ssl_cert_state'] = 'Some-State';

$autoinstall['ssl_cert_locality'] = 'Chicago';

$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';

$autoinstall['ssl_cert_organisation_unit'] = 'IT department';

$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];



/* optional expert mode settings, needed only for expert mode */

$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig

$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));

$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)

$autoinstall['mysql_master_hostname'] = 'master.example.com';

$autoinstall['mysql_master_root_user'] = 'root';

$autoinstall['mysql_master_root_password'] = 'howtoforge';

$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig

$autoinstall['configure_mail'] = 'y'; // y (default), n

$autoinstall['configure_jailkit'] = 'y'; // y (default), n

$autoinstall['configure_ftp'] = 'y'; // y (default), n

$autoinstall['configure_dns'] = 'y'; // y (default), n

$autoinstall['configure_apache'] = 'y'; // y (default), n

$autoinstall['configure_nginx'] = 'y'; // y (default), n

$autoinstall['configure_firewall'] = 'y'; // y (default), n

$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n



/* optional update settings, needed only for updates */

$autoupdate['do_backup'] = 'yes'; // yes (default), no

$autoupdate['mysql_root_password'] = 'howtoforge';

$autoupdate['mysql_master_hostname'] = 'master.example.com';

$autoupdate['mysql_master_root_user'] = 'root';

$autoupdate['mysql_master_root_password'] = 'howtoforge';

$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig

$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes

$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no

$autoupdate['ispconfig_port'] = '8080'; // default: 8080

$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes

$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no

<?php
$autoinstall['language'] = 'en'; // de, en (default)
$autoinstall['install_mode'] = 'standard'; // standard (default), expert

$autoinstall['hostname'] = 'server1.example.com'; // default
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
$autoinstall['mysql_root_user'] = 'root'; // default: root
$autoinstall['mysql_root_password'] = 'howtoforge';
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n

/* SSL Settings */
$autoinstall['ssl_cert_country'] = 'AU';
$autoinstall['ssl_cert_state'] = 'Some-State';
$autoinstall['ssl_cert_locality'] = 'Chicago';
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];

/* optional expert mode settings, needed only for expert mode */
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
$autoinstall['mysql_master_hostname'] = 'master.example.com';
$autoinstall['mysql_master_root_user'] = 'root';
$autoinstall['mysql_master_root_password'] = 'howtoforge';
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
$autoinstall['configure_mail'] = 'y'; // y (default), n
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
$autoinstall['configure_ftp'] = 'y'; // y (default), n
$autoinstall['configure_dns'] = 'y'; // y (default), n
$autoinstall['configure_apache'] = 'y'; // y (default), n
$autoinstall['configure_nginx'] = 'y'; // y (default), n
$autoinstall['configure_firewall'] = 'y'; // y (default), n
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n

/* optional update settings, needed only for updates */
$autoupdate['do_backup'] = 'yes'; // yes (default), no
$autoupdate['mysql_root_password'] = 'howtoforge';
$autoupdate['mysql_master_hostname'] = 'master.example.com';
$autoupdate['mysql_master_root_user'] = 'root';
$autoupdate['mysql_master_root_password'] = 'howtoforge';
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
?>

 docs/autoinstall_samples/autoinstall.ini.sample

@@ -1,50 +1,50 @@
[install]

language=en

install_mode=standard

hostname=server1.example.com

mysql_hostname=localhost

mysql_root_user=root

mysql_root_password=ispconfig

mysql_database=dbispconfig

mysql_charset=utf8

http_server=apache

ispconfig_port=8080

ispconfig_use_ssl=y



[ssl_cert]

ssl_cert_country=AU

ssl_cert_state=Some-State

ssl_cert_locality=Chicago

ssl_cert_organisation=Internet Widgits Pty Ltd

ssl_cert_organisation_unit=IT department

ssl_cert_common_name=server1.example.com



[expert]

mysql_ispconfig_user=ispconfig

mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ

join_multiserver_setup=n

mysql_master_hostname=master.example.com

mysql_master_root_user=root

mysql_master_root_password=ispconfig

mysql_master_database=dbispconfig

configure_mail=y

configure_jailkit=y

configure_ftp=y

configure_dns=y

configure_apache=y

configure_nginx=y

configure_firewall=y

install_ispconfig_web_interface=y



[update]

do_backup=yes

mysql_root_password=ispconfig

mysql_master_hostname=master.example.com

mysql_master_root_user=root

mysql_master_root_password=ispconfig

mysql_master_database=dbispconfig

reconfigure_permissions_in_master_database=no

reconfigure_services=yes

ispconfig_port=8080

create_new_ispconfig_ssl_cert=no

[install]
language=en
install_mode=standard
hostname=server1.example.com
mysql_hostname=localhost
mysql_root_user=root
mysql_root_password=ispconfig
mysql_database=dbispconfig
mysql_charset=utf8
http_server=apache
ispconfig_port=8080
ispconfig_use_ssl=y

[ssl_cert]
ssl_cert_country=AU
ssl_cert_state=Some-State
ssl_cert_locality=Chicago
ssl_cert_organisation=Internet Widgits Pty Ltd
ssl_cert_organisation_unit=IT department
ssl_cert_common_name=server1.example.com

[expert]
mysql_ispconfig_user=ispconfig
mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ
join_multiserver_setup=n
mysql_master_hostname=master.example.com
mysql_master_root_user=root
mysql_master_root_password=ispconfig
mysql_master_database=dbispconfig
configure_mail=y
configure_jailkit=y
configure_ftp=y
configure_dns=y
configure_apache=y
configure_nginx=y
configure_firewall=y
install_ispconfig_web_interface=y

[update]
do_backup=yes
mysql_root_password=ispconfig
mysql_master_hostname=master.example.com
mysql_master_root_user=root
mysql_master_root_password=ispconfig
mysql_master_database=dbispconfig
reconfigure_permissions_in_master_database=no
reconfigure_services=yes
ispconfig_port=8080
create_new_ispconfig_ssl_cert=no
reconfigure_crontab=yes

 install/dist/lib/gentoo.lib.php

@@ -774,7 +774,11 @@
            //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
            $content = str_replace('{fpm_socket}', $fpm_socket, $content);
            $content = str_replace('{cgi_socket}', $cgi_socket, $content);

			
            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);
			
            wf($vhost_conf_dir.'/apps.vhost', $content);

            // PHP-FPM

 install/install.php

@@ -208,7 +208,7 @@
    }

    //* Initialize the MySQL server connection
    if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
    if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
        $conf['mysql']['host'] = $tmp_mysql_server_host;
        $conf['mysql']['port'] = $tmp_mysql_server_port;
        $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -217,7 +217,7 @@
        $conf['mysql']['charset'] = $tmp_mysql_server_charset;
        $finished = true;
    } else {
        swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error());
        swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error());
    }
} while ($finished == false);
unset($finished);
@@ -553,7 +553,7 @@
            $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

            //* Initialize the MySQL server connection
            if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
            if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
                $conf['mysql']['master_host'] = $tmp_mysql_server_host;
                $conf['mysql']['master_port'] = $tmp_mysql_server_port;
                $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -561,7 +561,7 @@
                $conf['mysql']['master_database'] = $tmp_mysql_server_database;
                $finished = true;
            } else {
                swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
                swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
            }
        } while ($finished == false);
        unset($finished);

 install/lib/installer_base.lib.php

@@ -2075,6 +2075,10 @@
            }
            $content = str_replace('{use_tcp}', $use_tcp, $content);
            $content = str_replace('{use_socket}', $use_socket, $content);
			
            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);

            wf($vhost_conf_dir.'/apps.vhost', $content);


 install/tpl/mysql-virtual_outgoing_bcc.cf

@@ -1,8 +1,8 @@
user = {mysql_server_ispconfig_user}

password = {mysql_server_ispconfig_password}

dbname = {mysql_server_database}

table = mail_user

select_field = sender_cc

where_field = email

additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$

user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
table = mail_user
select_field = sender_cc
where_field = email
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$
hosts = 127.0.0.1

 install/tpl/mysql-virtual_outgoing_bcc.cf.master

@@ -1,8 +1,8 @@
user = {mysql_server_ispconfig_user}

password = {mysql_server_ispconfig_password}

dbname = {mysql_server_database}

table = mail_user

select_field = sender_cc

where_field = email

additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n'

user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
table = mail_user
select_field = sender_cc
where_field = email
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n'
hosts = 127.0.0.1

 install/update.php

@@ -229,7 +229,7 @@
    if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
        $finished = true;
    } else {
        swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
        swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
        $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
    }
} while ($finished == false);
@@ -255,7 +255,7 @@
        $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

        //* Initialize the MySQL server connection
        if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
        if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
            $conf['mysql']['master_host'] = $tmp_mysql_server_host;
            $conf['mysql']['master_port'] = $tmp_mysql_server_port;
            $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -263,7 +263,7 @@
            $conf['mysql']['master_database'] = $tmp_mysql_server_database;
            $finished = true;
        } else {
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
        }
    } while ($finished == false);
    unset($finished);

 interface/lib/classes/plugin_directive_snippets.inc.php

@@ -1,72 +1,72 @@
<?php





class plugin_directive_snippets extends plugin_base

{

    var $module;

    var $form;

    var $tab;

    var $record_id;

    var $formdef;

    var $options;



    public function onShow()

    {

        global $app;



        $listTpl = new tpl;

        $listTpl->newTemplate('templates/web_directive_snippets.htm');



        //* Loading language file

        $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_web_directive_snippets.lng";



        include $lng_file;

        $listTpl->setVar($wb);



        $message = '';

        $error   = '';



        $server_type = $app->getconf->get_server_config($this->form->dataRecord['server_id'], 'web');

        $server_type = $server_type['server_type'];

        $records = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND type = ? ORDER BY name ASC", $server_type);



        for ($i = 0, $c = count($records); $i < $c; $i++)

        {

            $records[$i]['is_selected'] = false;



            if ($this->form->dataRecord['directive_snippets_id'] === $records[$i]['directive_snippets_id'])

                $records[$i]['is_selected'] = true;

        }



        $listTpl->setLoop('records', $records);



        $list_name = 'directive_snippets_list';

        $_SESSION["s"]["list"][$list_name]["parent_id"] = $this->form->id;

        $_SESSION["s"]["list"][$list_name]["parent_name"] = $app->tform->formDef["name"];

        $_SESSION["s"]["list"][$list_name]["parent_tab"] = $_SESSION["s"]["form"]["tab"];

        $_SESSION["s"]["list"][$list_name]["parent_script"] = $app->tform->formDef["action"];

        $_SESSION["s"]["form"]["return_to"] = $list_name;



        return $listTpl->grab();

    }

	
    public function onUpdate()

    {

        global $app, $conf;



        if (isset($this->form->dataRecord['directive_snippets_id']) && $this->form->oldDataRecord['directive_snippets_id'] !== $this->form->dataRecord['directive_snippets_id']) {

            $app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);

        }

    }



    public function onInsert()

    {

        global $app, $conf;



        if (isset($this->form->dataRecord['directive_snippets_id'])) {

            $app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);

        }

    }



}

<?php


class plugin_directive_snippets extends plugin_base
{
    var $module;
    var $form;
    var $tab;
    var $record_id;
    var $formdef;
    var $options;

    public function onShow()
    {
        global $app;

        $listTpl = new tpl;
        $listTpl->newTemplate('templates/web_directive_snippets.htm');

        //* Loading language file
        $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_web_directive_snippets.lng";

        include $lng_file;
        $listTpl->setVar($wb);

        $message = '';
        $error   = '';

        $server_type = $app->getconf->get_server_config($this->form->dataRecord['server_id'], 'web');
        $server_type = $server_type['server_type'];
        $records = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND type = ? ORDER BY name ASC", $server_type);

        for ($i = 0, $c = count($records); $i < $c; $i++)
        {
            $records[$i]['is_selected'] = false;

            if ($this->form->dataRecord['directive_snippets_id'] === $records[$i]['directive_snippets_id'])
                $records[$i]['is_selected'] = true;
        }

        $listTpl->setLoop('records', $records);

        $list_name = 'directive_snippets_list';
        $_SESSION["s"]["list"][$list_name]["parent_id"] = $this->form->id;
        $_SESSION["s"]["list"][$list_name]["parent_name"] = $app->tform->formDef["name"];
        $_SESSION["s"]["list"][$list_name]["parent_tab"] = $_SESSION["s"]["form"]["tab"];
        $_SESSION["s"]["list"][$list_name]["parent_script"] = $app->tform->formDef["action"];
        $_SESSION["s"]["form"]["return_to"] = $list_name;

        return $listTpl->grab();
    }
	
    public function onUpdate()
    {
        global $app, $conf;

        if (isset($this->form->dataRecord['directive_snippets_id']) && $this->form->oldDataRecord['directive_snippets_id'] !== $this->form->dataRecord['directive_snippets_id']) {
            $app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
        }
    }

    public function onInsert()
    {
        global $app, $conf;

        if (isset($this->form->dataRecord['directive_snippets_id'])) {
            $app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
        }
    }

}
?>

 interface/web/client/lib/lang/en_client_message_template.lng

@@ -1,11 +1,11 @@
<?php

$wb["template_type_txt"] = 'Email type';

$wb["template_name_txt"] = 'Template name';

$wb["subject_txt"] = 'Subject';

$wb["message_txt"] = 'Message';

$wb['Email template'] = 'Email template';

$wb['Settings'] = 'Setting';

$wb['variables_txt'] = 'Variables';

$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';

$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';

<?php
$wb["template_type_txt"] = 'Email type';
$wb["template_name_txt"] = 'Template name';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb['Email template'] = 'Email template';
$wb['Settings'] = 'Setting';
$wb['variables_txt'] = 'Variables';
$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
?>

 interface/web/client/lib/lang/en_client_message_template_list.lng

@@ -1,5 +1,5 @@
<?php

$wb["list_head_txt"] = 'Email templates';

$wb["template_type_txt"] = 'Message for';

$wb["template_name_txt"] = 'Template name';

<?php
$wb["list_head_txt"] = 'Email templates';
$wb["template_type_txt"] = 'Message for';
$wb["template_name_txt"] = 'Template name';
?>

 interface/web/client/templates/message_template_list.htm

@@ -11,21 +11,21 @@
    <table class="table">
        <thead class="dark form-group-sm">
          <tr>
            <th data-column="template_type"><tmpl_var name="template_type_txt"></th>

            <th data-column="template_name"><tmpl_var name="template_name_txt"></th>

            <th data-column="template_type"><tmpl_var name="template_type_txt"></th>
            <th data-column="template_name"><tmpl_var name="template_name_txt"></th>
            <th class="text-right">&nbsp;</th>
          </tr>
          <tr>
            <td><select class="form-control" name="search_template_type" onChange="ISPConfig.submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>

            <td><input class="form-control" type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>

            <td><select class="form-control" name="search_template_type" onChange="ISPConfig.submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
            <td><input class="form-control" type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
            <td class="text-right"><div class="buttons"><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="billing/invoice_message_template_list.php"><span class="icon icon-filter"></span></button></div></td>
          </tr>
        </thead>
        <tbody>
          <tmpl_loop name="records">
          <tr>
            <td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>

            <td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>

            <td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
            <td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
            <td class="text-right">
              <div class="buttons icons16">    
                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('billing/invoice_message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>

 interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng

@@ -1,4 +1,4 @@
<?php

$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';

$wb['edit_txt'] = 'Edit';

?>

<?php
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Edit';
?>

 interface/web/js/scrigo.js.php

@@ -153,9 +153,9 @@
    var maxLength = minLength + 5;
    var length = getRandomInt(minLength, maxLength);
    
    var alphachars = "abcdefghijklmnopqrstuvwxyz";
    var upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
    var numchars = "1234567890";
    var alphachars = "abcdefghijkmnopqrstuvwxyz";
    var upperchars = "ABCDEFGHJKLMNPQRSTUVWXYZ";
    var numchars = "23456789";
    var specialchars = "!@#_";
    
    if(num_special == undefined) num_special = 0;

 interface/web/sites/lib/lang/bg_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/br_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/cz_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/el_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/en_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/es_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/fi_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/hu_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/id_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/it_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/ja_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/nl_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/pl_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/pt_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/ru_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/se_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/sk_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/lib/lang/tr_web_directive_snippets.lng

@@ -1,3 +1,3 @@
<?php

$wb['directive_snippets_id_txt'] = 'Desired configuration';

<?php
$wb['directive_snippets_id_txt'] = 'Desired configuration';
?>

 interface/web/sites/templates/web_directive_snippets.htm

@@ -1,14 +1,14 @@
<div class="form-group">

    <label for="directive_snippets_id" class="col-sm-3 control-label">

        {tmpl_var name='directive_snippets_id_txt'}

    </label>



    <div class="col-sm-9"><select name="directive_snippets_id" id="directive_snippets_id" class="form-control">

        <option value="0"></option>

        <tmpl_loop name="records">

        <option {tmpl_if name='is_selected' op='==' value='true'}selected="selected" {/tmpl_if}value="{tmpl_var name='directive_snippets_id'}">

            {tmpl_var name='name'}

        </option>

        </tmpl_loop>

    </select></div>

<div class="form-group">
    <label for="directive_snippets_id" class="col-sm-3 control-label">
        {tmpl_var name='directive_snippets_id_txt'}
    </label>

    <div class="col-sm-9"><select name="directive_snippets_id" id="directive_snippets_id" class="form-control">
        <option value="0"></option>
        <tmpl_loop name="records">
        <option {tmpl_if name='is_selected' op='==' value='true'}selected="selected" {/tmpl_if}value="{tmpl_var name='directive_snippets_id'}">
            {tmpl_var name='name'}
        </option>
        </tmpl_loop>
    </select></div>
</div>

 server/conf/hhvm_monit.master

@@ -1,3 +1,3 @@
check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid

   start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart"

check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
   start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart"
   stop  program = "/etc/init.d/hhvm_{SYSTEM_USER} stop"

 server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

@@ -129,7 +129,7 @@
        $clamav_outdated_warning = false;
        $clamav_bytecode_updated = false;
        foreach ($lastLog as $line) {
            if (stristr($line,'outdated')) {
            if (stristr($line,"Can't download daily.cvd from")) {
                $clamav_outdated_warning = true;
            }
            if(stristr($line,'main.cld is up to date')) {

 server/lib/classes/cron.d/550-bind_dnssec.inc.php

@@ -1,89 +1,89 @@
<?php



/*

Copyright (c) 2013, Marius Cramer, pixcept KG

All rights reserved.



Redistribution and use in source and binary forms, with or without modification,

are permitted provided that the following conditions are met:



    * Redistributions of source code must retain the above copyright notice,

      this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice,

      this list of conditions and the following disclaimer in the documentation

      and/or other materials provided with the distribution.

    * Neither the name of ISPConfig nor the names of its contributors

      may be used to endorse or promote products derived from this software without

      specific prior written permission.



THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,

EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.





DNSSEC-Implementation by Alexander Täffner aka dark alex

*/



class cronjob_bind_dnssec extends cronjob {



    // job schedule

    protected $_schedule = '30 3 * * *'; //daily at 3:30 a.m.



    public function onRunJob() {

        global $app, $conf;



        //* Load libraries

        $app->uses("getconf,tpl");



        //* load the server configuration options

        $dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');

		
        //TODO : change this when distribution information has been integrated into server record

        $filespre = (file_exists('/etc/gentoo-release')) ? 'pri/' : 'pri.';

		
        $soas = $app->db->queryAllRecords('SELECT * FROM dns_soa WHERE dnssec_wanted=\'Y\' AND dnssec_initialized=\'Y\' AND dnssec_last_signed < '.(time()-(3600*24*5)+900)); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)

		
        foreach ($soas as $data) {

            $domain = substr($data['origin'], 0, strlen($data['origin'])-1);

            if (!file_exists($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain)) return false;

			
            $app->log('DNSSEC Auto-Resign: Resigning zone '.$domain, LOGLEVEL_INFO);

			
            $zonefile = file_get_contents($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain);

            $keycount=0;

            foreach (glob($dns_config['bind_zonefiles_dir'].'/K'.$domain.'*.key') as $keyfile) {

                $includeline = '$INCLUDE '.basename($keyfile);

                if (!preg_match('@'.preg_quote($includeline).'@', $zonefile)) $zonefile .= "\n".$includeline."\n";

                $keycount++;

            }

            if ($keycount != 2) $app->log('DNSSEC Warning: There are more or less than 2 keyfiles for zone '.$domain, LOGLEVEL_WARN);

            file_put_contents($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain, $zonefile);

			
            //Sign the zone and set it valid for max. 16 days

            exec('cd '.escapeshellcmd($dns_config['bind_zonefiles_dir']).';'.

                 '/usr/sbin/dnssec-signzone -A -e +1382400 -3 $(head -c 1000 /dev/random | sha1sum | cut -b 1-16) -N increment -o '.escapeshellcmd($domain).' -t '.$filespre.escapeshellcmd($domain));

				 
            //Write Data back into DB

            $dnssecdata = "DS-Records:\n".file_get_contents($dns_config['bind_zonefiles_dir'].'/dsset-'.$domain.'.');

            $dnssecdata .= "\n------------------------------------\n\nDNSKEY-Records:\n";

            foreach (glob($dns_config['bind_zonefiles_dir'].'/K'.$domain.'*.key') as $keyfile) {

                $dnssecdata .= file_get_contents($keyfile)."\n\n";

            }

			
            $app->db->query('UPDATE dns_soa SET dnssec_info=\''.$dnssecdata.'\', dnssec_initialized=\'Y\', dnssec_last_signed=\''.time().'\' WHERE id='.$data['id']);

            $data = next($soas);

        }

		
        parent::onRunJob();

    }



}



?>

<?php

/*
Copyright (c) 2013, Marius Cramer, pixcept KG
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


DNSSEC-Implementation by Alexander Täffner aka dark alex
*/

class cronjob_bind_dnssec extends cronjob {

    // job schedule
    protected $_schedule = '30 3 * * *'; //daily at 3:30 a.m.

    public function onRunJob() {
        global $app, $conf;

        //* Load libraries
        $app->uses("getconf,tpl");

        //* load the server configuration options
        $dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
		
        //TODO : change this when distribution information has been integrated into server record
        $filespre = (file_exists('/etc/gentoo-release')) ? 'pri/' : 'pri.';
		
        $soas = $app->db->queryAllRecords('SELECT * FROM dns_soa WHERE dnssec_wanted=\'Y\' AND dnssec_initialized=\'Y\' AND dnssec_last_signed < '.(time()-(3600*24*5)+900)); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
		
        foreach ($soas as $data) {
            $domain = substr($data['origin'], 0, strlen($data['origin'])-1);
            if (!file_exists($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain)) return false;
			
            $app->log('DNSSEC Auto-Resign: Resigning zone '.$domain, LOGLEVEL_INFO);
			
            $zonefile = file_get_contents($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain);
            $keycount=0;
            foreach (glob($dns_config['bind_zonefiles_dir'].'/K'.$domain.'*.key') as $keyfile) {
                $includeline = '$INCLUDE '.basename($keyfile);
                if (!preg_match('@'.preg_quote($includeline).'@', $zonefile)) $zonefile .= "\n".$includeline."\n";
                $keycount++;
            }
            if ($keycount != 2) $app->log('DNSSEC Warning: There are more or less than 2 keyfiles for zone '.$domain, LOGLEVEL_WARN);
            file_put_contents($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain, $zonefile);
			
            //Sign the zone and set it valid for max. 16 days
            exec('cd '.escapeshellcmd($dns_config['bind_zonefiles_dir']).';'.
                 '/usr/sbin/dnssec-signzone -A -e +1382400 -3 $(head -c 1000 /dev/random | sha1sum | cut -b 1-16) -N increment -o '.escapeshellcmd($domain).' -t '.$filespre.escapeshellcmd($domain));
				 
            //Write Data back into DB
            $dnssecdata = "DS-Records:\n".file_get_contents($dns_config['bind_zonefiles_dir'].'/dsset-'.$domain.'.');
            $dnssecdata .= "\n------------------------------------\n\nDNSKEY-Records:\n";
            foreach (glob($dns_config['bind_zonefiles_dir'].'/K'.$domain.'*.key') as $keyfile) {
                $dnssecdata .= file_get_contents($keyfile)."\n\n";
            }
			
            $app->db->query('UPDATE dns_soa SET dnssec_info=\''.$dnssecdata.'\', dnssec_initialized=\'Y\', dnssec_last_signed=\''.time().'\' WHERE id='.$data['id']);
            $data = next($soas);
        }
		
        parent::onRunJob();
    }

}

?>

 server/lib/classes/db_mysql.inc.php

@@ -558,7 +558,7 @@
        /* Connect to the database */
        $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
        if (!$link) {
            $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_DEBUG);
            $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
            return;
        }
        /* Get database-size from information_schema */

 server/plugins-available/software_update_plugin.inc.php

@@ -248,7 +248,7 @@
            //* Connect to the database
            $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
            if (!$link) {
                $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_ERROR);
                $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_ERROR);
                return;
            }