Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-05-07 741aa6aa3ec188aa4f37b26dc3314e2d0cd811aa

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -75,9 +75,9 @@
    */
   function get_amavis_config() {
      $pos_config=array(
         '/etc/amavisd.conf',
         '/etc/amavisd.conf/50-user',
         '/etc/amavis/conf.d/50-user',
         '/etc/amavisd.conf',
         '/etc/amavisd/amavisd.conf'
      );
      $amavis_configfile='';
@@ -405,7 +405,7 @@
         }

         /* resync */
         if ($data['new']['active'] == 'y' && $data['new'] == $data['old']) {
         if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
            $this->add_dkim($data);
         }
      }