setup.php:

- recommend PHP >= 5.2.3
- beautify some mysql/pgsql messages

CHANGELOG.TXT
- add vacation.pl "$SUBJECT"
- remove TODO for setup.php
- add "Changes since 2.3.6 release" (from 2.3 branch)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1617 a1433add-5e2c-0410-b055-b7f2511e0802

CHANGELOG.TXT

@@ -205,6 +205,8 @@ Version ***svn*** - 2013/12/09 - SVN r***
     vacation message - http://sourceforge.net/p/postfixadmin/patches/111/
 
   vacation.pl:
+  - allow to use original subject in vacation reply subject ("Re: $SUBJECT")
+    http://sourceforge.net/p/postfixadmin/patches/117/
   - encode subject - https://sourceforge.net/p/postfixadmin/bugs/272/ ,
     https://sourceforge.net/p/postfixadmin/patches/119/
   - add a friendly from address to vacation messages ($friendly_from)
@@ -248,11 +250,6 @@ Version ***svn*** - 2013/12/09 - SVN r***
     Note: The ALL domain is not (yet) deleted to stay backwards-compatible
     for now (will be done in a later upgrade function)
 
-  setup.php:
-****** TODO: fix the TODO ;-)
-  - add TODO note to check for PHP >= 5.2.3 because smarty uses
-    htmlentities with 4 parameters (4th param added in PHP 5.2.3)
-
   login.php
   - when login.php is requested, logout the current admin/user
     https://sourceforge.net/p/postfixadmin/bugs/284/
@@ -293,6 +290,17 @@ Version ***svn*** - 2013/12/09 - SVN r***
   - postfixadmin.docs: removed redundant changelog file
   - debian/postfixadmin.postrm: Call wwwconfig scripts only if they are existing
 
+Changes since 2.3.6 release (from 2.3 branch)
+----------------------------------------------------------------
+  - lt.lang, da.lang translation update
+  - when enabling/disabling a mailbox, also update the corresponding alias
+  - fix creating superadmin in setup.php with MariaDB (more strict SQL)
+  - trim() localpart in create-mailbox to avoid mailbox names with leading space
+  - mark vacation_notification.notified field as latin1 to avoid overlong index
+  - vacation.pl: encode subject
+  - vacation.pl: disable use of TLS by default due to a bug in Mail::Sender 0.8.22
+    (you can re-enable it with $smtp_tls_allowed)
+
 Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
 

setup.php

@@ -64,8 +64,12 @@ if ($f_phpversion == 1)
     if (phpversion() < 5) {
         print "<li><b>Error: Depends on: PHP v5</b><br /></li>\n";
         $error += 1;
-    }
-    if (phpversion() >= 5) { 
+    } elseif (version_compare(phpversion(), '5.2.3') < 0) {
+        # smarty uses htmlentities() with 4 parameters, the 4th parameter was introduced in PHP 5.2.3
+        # older PHP versions will cause warnings
+        $phpversion = 5;
+        print "<li><b>Recommended PHP version: >= 5.2.3, you have " . phpversion () . "</b></li>\n";
+    } else {
         $phpversion = 5;
         print "<li>PHP version " . phpversion () . "</li>\n";
     }
@@ -198,7 +202,7 @@ if ($phpversion >= 5)
     {
         print "<li>Depends on: MySQL 4.1 - OK\n";
         if ( !($config_loaded && $CONF['database_type'] == 'mysqli') ) {
-            print "(change the database_type to 'mysqli' in config.inc.php!!)\n";
+            print "<br>(change the database_type to 'mysqli' in config.inc.php if you want to use MySQL)\n";
         }
         print "</li>";
     }
@@ -211,7 +215,7 @@ if ($f_pg_connect == 1)
 {
     print "<li>Depends on: PostgreSQL - OK \n";
     if ( !($config_loaded && $CONF['database_type'] == 'pgsql') ) {
-        print "(change the database_type to 'pgsql' in config.inc.php!!)\n";
+        print "<br>(change the database_type to 'pgsql' in config.inc.php if you want to use PostgreSQL)\n";
     }
     print "</li>";
 }