update mail_mail_domain_plugin.inc.php

Florian Schaal

2015-09-18 14150027a166de379bd61ba3f15ac8c8a92524d5

update mail_mail_domain_plugin.inc.php

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -122,8 +122,8 @@
        $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']) &&
//                isset($data['new']['dkim_private']) && 
//                !empty($data['new']['dkim_private']) &&
                $mail_config['dkim_path'] != '/' 
        ) {
            if (!is_dir($mail_config['dkim_path'])) {
@@ -199,6 +199,10 @@
    function write_dkim_key($key_file, $key_value, $key_domain) {
        global $app, $mailconfig;
        $success=false;
        if ($key_file == '' || $key_value  == '' || $key_domain == '') {
            $app->log('DKIM internal error for domain '.$key_domain, LOGLEVEL_ERROR);
            return $success;
        }
        if ( $app->system->file_put_contents($key_file.'.private', $key_value) ) {
            $app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
            $success=true;
@@ -211,7 +215,7 @@
                $app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
            else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
        } else {
            $app->log('Unable to save DKIM Privte-key to '.$key_file.'.private', LOGLEVEL_ERROR);
            $app->log('Unable to save DKIM Private-key to '.$key_file.'.private', LOGLEVEL_ERROR);
        }
        return $success;
    }