From 2e5752c397cc699374a0d3daa07ec3bd2a6d3e36 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Sat, 04 Apr 2015 16:12:30 -0400
Subject: [PATCH] Optimized queries

---
 server/plugins-available/mail_plugin_dkim.inc.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 9fb927e..2842551 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/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);
 			}
 		}

--
Gitblit v1.9.1