Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

Merge branch 'master' into 'master'

Master

See merge request !134

 interface/web/tools/resync_do.php

@@ -244,7 +244,7 @@
            $index_field = 'mailuser_id';
            $server_type = 'mail';
            $server_id = $app->functions->intval($this->dataRecord['mailbox_server_id']);
            if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
            if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1');
            $records = $tmp[0];
            $server_name = $tmp[1];
            unset($tmp);

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -117,14 +117,14 @@
            $app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
            $check=false;
        }

        /* dir for dkim-keys writeable? */
        $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
        if (    isset($mail_config['dkim_path']) && 
                !empty($mail_config['dkim_path']) && 
                isset($data['new']['dkim_private']) && 
                !empty($data['new']['dkim_private']) &&
                $mail_config['dkim_path'] != '/' &&
                $app->system->checkpath($mail_config['dkim_path'])
                $mail_config['dkim_path'] != '/' 
        ) {
            if (!is_dir($mail_config['dkim_path'])) {
                $app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
@@ -147,6 +147,11 @@

            if (!is_writeable($mail_config['dkim_path'])) {
                $app->log('DKIM Path '.$mail_config['dkim_path'].' not writeable.', LOGLEVEL_ERROR);
                $check=false;
            }

            if ( !$app->system->checkpath($mail_config['dkim_path']) ) {
                $app->log('DKIM Path '.$mail_config['dkim_path'].' failed in checkpath.', LOGLEVEL_ERROR);
                $check=false;
            }

@@ -184,7 +189,7 @@
     * @param string $key_file full path to the key-file
     * @param string $key_value private-key
     * @param string $key_domain mail-domain
     * @return bool - true when the key is written to disk
     * @return bool - true when the private key was written to disk
     */
    function write_dkim_key($key_file, $key_value, $key_domain) {
        global $app, $mailconfig;