From 530c489ec4d9c35eee2aecf48a5d732205972ae6 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Fri, 11 Mar 2016 21:19:14 +0000
Subject: [PATCH 1/3] editform.tpl: - add {if} block for description column to
 make customization for   special fields/cases easier

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1829 a1433add-5e2c-0410-b055-b7f2511e0802
---
 templates/editform.tpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/editform.tpl b/templates/editform.tpl
index 600e5b75..01af0a47 100644
--- a/templates/editform.tpl
+++ b/templates/editform.tpl
@@ -55,7 +55,13 @@
 					{/if}
 				{/if}	
 				</td>
-				<td>{$field.desc}</td>
+				<td>
+					{if $table == 'foo' && $key == 'bar'}
+						Special handling (td content) for {$table} / {$key}
+					{else}
+						{$field.desc}
+					{/if}
+				</td>
 				<td class="error_msg">{$fielderror.{$key}}</td>
 			</tr>
 		{/if}

From 6ee6574076ef8a3c724d7e652d36402575cc61e9 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 21 Mar 2016 22:14:29 +0000
Subject: [PATCH 2/3] include_once(config.local.php) instead of include()ing it

This should avoid problems with endless include loops like in
https://sourceforge.net/p/postfixadmin/bugs/367/


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1830 a1433add-5e2c-0410-b055-b7f2511e0802
---
 config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.inc.php b/config.inc.php
index 7bb82861..c88bf2b9 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -574,7 +574,7 @@ $CONF['xmlrpc_enabled'] = false;
 // file (config.local.php) instead of editing this file and override some
 // settings there.
 if (file_exists(dirname(__FILE__) . '/config.local.php')) {
-    include(dirname(__FILE__) . '/config.local.php');
+    include_once(dirname(__FILE__) . '/config.local.php');
 }
 
 //

From ac43e1ad2a3f4f7e15aeeedabcab1e9db27f6a5e Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sun, 27 Mar 2016 20:12:49 +0000
Subject: [PATCH 3/3] update changelog with changes up to r1830

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1831 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index c38acd43..1f6e8880 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -9,6 +9,22 @@
 # Last update:
 # $Id$
 
+Changes since 3.0 beta3
+-------------------------------------------------
+
+  - add sqlite backend option
+  - language update: tw, cs
+  - fix escaping in gen_show_status() (could be used to DOS list-virtual by
+    creating a mail address with special chars)
+  - list.tpl: base edit/editactive/delete links in list.tpl on $RAW_item to
+    avoid double escaping, and fix some corner cases
+  - editform.tpl: add {if} block for description column for easier customization
+  - use smarty html_options instead of select_options()
+  - remove advice about using SetEnv for database password
+  - include_once(config.local.php) instead of include()ing it to prevent include
+    loops if someone copies config.inc.php to config.local.php
+  - vacation.pl: encode wide-chars utf8 in mail body
+
 Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1802
 -------------------------------------------------