mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
Merge remote-tracking branch 'svnexport/master'
This commit is contained in:
commit
17d1cce041
@ -9,6 +9,12 @@
|
|||||||
# Last update:
|
# Last update:
|
||||||
# $Id$
|
# $Id$
|
||||||
|
|
||||||
|
Version 3.0.1 - 2016/09/19 - SVN r1870
|
||||||
|
-------------------------------------------------
|
||||||
|
|
||||||
|
- add missing Smarty files to Debian package
|
||||||
|
(no changes to PostfixAdmin, therefore only released as Debian packages)
|
||||||
|
|
||||||
Version 3.0 - 2016/09/11 - SVN r1861
|
Version 3.0 - 2016/09/11 - SVN r1861
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
|
||||||
@ -452,8 +458,21 @@ Version 3.0 beta1 (2.91) - 2014/05/06 - SVN r1670
|
|||||||
- postfixadmin.docs: removed redundant changelog file
|
- postfixadmin.docs: removed redundant changelog file
|
||||||
- debian/postfixadmin.postrm: Call wwwconfig scripts only if they are existing
|
- debian/postfixadmin.postrm: Call wwwconfig scripts only if they are existing
|
||||||
|
|
||||||
|
Version 2.3.8 - 2015/10/07 - SVN r1814 (postfixadmin-2.3 branch)
|
||||||
|
----------------------------------------------------------------
|
||||||
|
|
||||||
|
- fix query to enable/disable alias in edit-mailbox for PostgreSQL (#311)
|
||||||
|
- don't prefill username in users/ login on failed logins - fixes (probably
|
||||||
|
harmless) XSS
|
||||||
|
- fix show_gen_status() to properly escape mail addresses in query (#356)
|
||||||
|
- fix escaping in create-admin, create-mailbox and fetchmail templates -
|
||||||
|
fixes (harmless) XSS on form validation errors
|
||||||
|
- don't echo the password back to the browser in the fetchmail form
|
||||||
|
- allow MariaDB in Debian package dependencies
|
||||||
|
|
||||||
Version 2.3.7 - 2014/02/20 - SVN r1651 (postfixadmin-2.3 branch)
|
Version 2.3.7 - 2014/02/20 - SVN r1651 (postfixadmin-2.3 branch)
|
||||||
----------------------------------------------------------------
|
----------------------------------------------------------------
|
||||||
|
|
||||||
- SECURITY: fix SQL injection in show_gen_status()
|
- SECURITY: fix SQL injection in show_gen_status()
|
||||||
- lt.lang, da.lang translation update
|
- lt.lang, da.lang translation update
|
||||||
- when enabling/disabling a mailbox, also update the corresponding alias
|
- when enabling/disabling a mailbox, also update the corresponding alias
|
||||||
|
@ -137,7 +137,7 @@ $CONF['smtp_client'] = '';
|
|||||||
// system = whatever you have set as your PHP system default
|
// system = whatever you have set as your PHP system default
|
||||||
// cleartext = clear text passwords (ouch!)
|
// cleartext = clear text passwords (ouch!)
|
||||||
// mysql_encrypt = useful for PAM integration
|
// mysql_encrypt = useful for PAM integration
|
||||||
// authlib = support for courier-authlib style passwords
|
// authlib = support for courier-authlib style passwords - also set $CONF['authlib_default_flavor']
|
||||||
// dovecot:CRYPT-METHOD = use dovecotpw -s 'CRYPT-METHOD'. Example: dovecot:CRAM-MD5
|
// dovecot:CRYPT-METHOD = use dovecotpw -s 'CRYPT-METHOD'. Example: dovecot:CRAM-MD5
|
||||||
// IMPORTANT:
|
// IMPORTANT:
|
||||||
// - don't use dovecot:* methods that include the username in the hash - you won't be able to login to PostfixAdmin in this case
|
// - don't use dovecot:* methods that include the username in the hash - you won't be able to login to PostfixAdmin in this case
|
||||||
@ -146,6 +146,7 @@ $CONF['smtp_client'] = '';
|
|||||||
$CONF['encrypt'] = 'md5crypt';
|
$CONF['encrypt'] = 'md5crypt';
|
||||||
|
|
||||||
// In what flavor should courier-authlib style passwords be encrypted?
|
// In what flavor should courier-authlib style passwords be encrypted?
|
||||||
|
// (only used if $CONF['encrypt'] == 'authlib')
|
||||||
// md5 = {md5} + base64 encoded md5 hash
|
// md5 = {md5} + base64 encoded md5 hash
|
||||||
// md5raw = {md5raw} + plain encoded md5 hash
|
// md5raw = {md5raw} + plain encoded md5 hash
|
||||||
// SHA = {SHA} + base64-encoded sha1 hash
|
// SHA = {SHA} + base64-encoded sha1 hash
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -11,7 +11,7 @@ Homepage: http://postfixadmin.sourceforge.net
|
|||||||
|
|
||||||
Package: postfixadmin
|
Package: postfixadmin
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php, php-imap, php-mysql | php-pgsql | php-mysqlnd | php-sqlite3, mysql-client | postgresql-client, ${misc:Depends}
|
Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php, php-imap | php5-imap, php-mysql | php5-mysql | php-pgsql | php-mysqlnd | php-sqlite3, mysql-client | postgresql-client, ${misc:Depends}
|
||||||
Recommends: postfix-mysql | postfix-pgsql, virtual-mysql-server | postgresql | sqlite, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql, php-cli
|
Recommends: postfix-mysql | postfix-pgsql, virtual-mysql-server | postgresql | sqlite, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql, php-cli
|
||||||
Description: Virtual mail hosting interface for Postfix
|
Description: Virtual mail hosting interface for Postfix
|
||||||
Postfixadmin is a web interface to manage virtual users and domains
|
Postfixadmin is a web interface to manage virtual users and domains
|
||||||
|
@ -39,7 +39,7 @@ class FetchmailHandler extends PFAHandler {
|
|||||||
'sslfingerprint'=> pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_sslfingerprint','' ),
|
'sslfingerprint'=> pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_sslfingerprint','' ),
|
||||||
'extra_options' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_extra_options', 'pFetchmail_desc_extra_options' ),
|
'extra_options' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_extra_options', 'pFetchmail_desc_extra_options' ),
|
||||||
'mda' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_mda' , 'pFetchmail_desc_mda' ),
|
'mda' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_mda' , 'pFetchmail_desc_mda' ),
|
||||||
'date' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_date' , 'pFetchmail_desc_date' , 1 ),
|
'date' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_date' , 'pFetchmail_desc_date' , '2000-01-01' ),
|
||||||
'returned_text' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_returned_text', 'pFetchmail_desc_returned_text' ),
|
'returned_text' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_returned_text', 'pFetchmail_desc_returned_text' ),
|
||||||
'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ),
|
'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ),
|
||||||
'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ),
|
'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ),
|
||||||
|
Loading…
Reference in New Issue
Block a user