From 117ecd60c809bbc19a3c1f795f6db9e53465cdec Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 19 Jun 2014 07:00:44 -0400
Subject: [PATCH] - autoselect password if you use "Generate Password" function (saves a click if you want to copy the password).

---
 server/plugins-available/getmail_plugin.inc.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index 80424ad..5b1edfb 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -100,7 +100,11 @@
 
 			if($data["new"]["active"] == 'y') {
 				// Open master template
-				$tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+				if(file_exists($conf["rootpath"].'/conf-custom/getmail.conf.master')) {
+					$tpl = file_get_contents($conf["rootpath"].'/conf-custom/getmail.conf.master');
+				} else {
+					$tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+				}
 
 				// Shall emails be deleted after retrieval
 				if($data["new"]["source_delete"] == 'y') {

--
Gitblit v1.9.1