Commit Graph
1856 Commits
Author SHA1 Message Date
David Goodwin d259544515 ignore config.local.php too 2018-01-25 21:02:11 +00:00
David Goodwin d5c40453ac update debian things, fix patch, move backup.php to public, fix lighttpd config 2018-01-25 20:59:15 +00:00
David Goodwin 63f44c9b2d update INSTALL.TXT to mention public/ etc 2018-01-25 20:58:48 +00:00
David Goodwin 104561c419 change to public/ in apache alias 2018-01-25 20:36:07 +00:00
David Goodwin 3d63d8b9af update debian things to perhaps cope with public/ 2018-01-25 20:32:15 +00:00
David Goodwin 99147d51eb move public facing stuff into public/, this allows us to stop exposing templates_c/ etc to the world 2018-01-25 20:27:09 +00:00
David Goodwin 436bbe87a8 change DATEFUTURE to 2038-01-18 ... - see #126 2018-01-25 20:02:13 +00:00
David Goodwin e1d42ed7d3 rename script commands 2018-01-25 19:57:08 +00:00
David Goodwin 2fc3af0b73 composer.lock 2018-01-25 19:57:00 +00:00
David Goodwin 80d30d81e9 add parallel-lint 2018-01-25 19:56:50 +00:00
David Goodwin d9f66eca4c minimal php_cs.dist file - PSR2 with braces for class opening on the same line 2018-01-25 19:56:21 +00:00
Adrien Crivelli 6f7e75dc63 Introduce PHP-CS-Fixer and Travis to enforce code style
Commands `composer check` and `composer fix` can be used to respectively
check and automatically fix code style in the entire project.
2018-01-25 19:55:51 +00:00
David Goodwin 3593d23c6f remove undefined variable _SERVER[REQUEST_METHOD] when running from the cli 2018-01-25 19:52:40 +00:00
David Goodwin 772a882c74 Merge pull request #124 from sitilge/master
Password reset  - fix invalid DB query (double backtick)
2018-01-22 13:15:12 +00:00
Martins Eglitis 97f0fa2c3d Fix invalid DB query (double backtick) 2018-01-22 15:10:46 +02:00
David Goodwin 938e7dcb7d Merge pull request #122 from dryware-fr/patch-1
Typo correction
2018-01-19 19:32:46 +00:00
dryware-fr e4bfae260b Typo correction
There was a typo in the script, rendering a TCP connection to MySQL or Postgres impossible.
2018-01-19 17:26:56 +01:00
Christian Boltz 75bcf3091b Fix instructions for templates_c directory in UPGRADE.txt
Also add instructions for SELinux, and fix the version number describing
since when templates_c is used.

Fixes: https://github.com/postfixadmin/postfixadmin/issues/119
2018-01-13 18:18:10 +01:00
Christian Boltz 3bd7ef2b0a adjust pgsql $row['v_active'] only if vacation is enabled
This avoids an "Undefined index" warning if vacation is disabled.

Fixes: https://github.com/postfixadmin/postfixadmin/issues/118
2018-01-13 18:10:13 +01:00
David Goodwin 9982783481 Merge pull request #117 from mzch/ja_fix
Remove '# XXX'
2018-01-10 09:27:19 +00:00
Koichi MATSUMOTO 70c839cbc6 Remove '# XXX'
Removed '# XXX' comments
2018-01-10 07:27:51 +09:00
David Goodwin a52eeaf020 Merge pull request #116 from mzch/ja_fix
Ja fix
2018-01-09 15:08:17 +00:00
Koichi MATSUMOTO 9aeec2147e Update ja.lang
Update ja.lang with the latest
2018-01-10 00:00:09 +09:00
Koichi MATSUMOTO 9b7cfdf807 Update ja.lang
in progress...
2018-01-09 22:09:21 +09:00
David Goodwin a320b67508 possible fix for issue in #112 - PostgreSQL does not like backticks (only do them for MySQL) 2018-01-03 16:05:46 +00:00
Christian Boltz 977f335a0f Fix quoting in table_by_key()
This fixes a regression introduced by
https://github.com/postfixadmin/postfixadmin/pull/112
which became only visible when using a $CONF['database_prefix']
2017-12-30 13:42:47 +01:00
Christian Boltz d04c82fbcb change default for vacation.activeuntil to 2038
When adding the activeuntil field during the upgrade, it got set to
2000-01-01 which is a bad idea for existing vacation entries - the new
vacation.pl will consider them as outdated.

Introduce a new {DATEFUTURE}, and set the default value for activeuntil
to 2038 (that's the limit in MySQL for 'timestamp' columns, we'll have to
switch to 'datetime' in 20 years ;-)

Note that sqlite doesn't support changing the field default, so sqlite
users will have to live with the wrong default.

Also note that this fix does not change existing vacation entries if you
already have the activeuntil column.

Reported by Christoph Lechleitner on the mailinglist
2017-12-30 12:51:53 +01:00
Christian Boltz ddb94e24ee rename upgrade_1838_mysql() to upgrade_1839() to keep all databases in sync
better fix for https://github.com/postfixadmin/postfixadmin/issues/89
2017-12-30 12:37:25 +01:00
Christian Boltz 1c0cd61fff Add texts for password recovery to all languages 2017-12-30 11:55:58 +01:00
Christian Boltz ab666b6b7f Fix microtime() usage
By default, microtime() returns a string :-/ which unsurprisingly causes
a warning when doing math on it.
2017-12-30 11:55:58 +01:00
Christian Boltz 8fb67e6fbf Fix broken table names caused by doubled table_by_key() calls
The high-level db_*() functions (like db_update(), and also
_db_add_field() in upgrade.php) call table_by_key() internally, which
also means the unwrangled table name needs to be handed over to them.
If handing over an already table_by_key()'d table name, it gets modified
again and results in something like prefix_prefix_mailbox.
2017-12-30 11:55:55 +01:00
David Goodwin a27f80c01d Merge pull request #113 from er1cs/patch-2
Update upgrade.php
2017-12-24 19:59:08 +00:00
David Goodwin 24b447f8e5 Merge pull request #112 from er1cs/patch-1
Update functions.inc.php
2017-12-24 19:58:49 +00:00
er1cs a4467a7e0b Update upgrade.php 2017-12-24 17:27:24 +02:00
er1cs 7b8626ca81 Update functions.inc.php
I found that Mysql 8 don't like table names without `` in requests. So i make changes in function table_by_key in functions.inc.php and in upgrade.php . Now it works.  FreeBSD 11.1 Apache/2.4.29 (FreeBSD) PHP/7.1.11 Mysql 8
2017-12-24 16:32:06 +02:00
David Goodwin e478eb8b9f Merge pull request #110 from Erwane/syslog-ident
#109 : syslog ident set to "vacation"
2017-12-19 11:10:46 +00:00
Breton Erwane 37d4279c52 syslog ident set to "vacation" 2017-12-19 10:50:05 +01:00
David Goodwin 43fb0bde77 log IP address for failed logins as well - see #105 2017-12-17 20:35:12 +00:00
Christian Boltz b06d25de8f Merge pull request #108 from HLFH/master
favicon within images folder
2017-12-16 18:24:14 +01:00
HLFH 0972df8243 favicon within images folder 2017-12-16 10:36:35 +00:00
David Goodwin 768d29623e patch from https://github.com/bofh16/postfixadmin/blob/master/bg.lang.patch - thanks! 2017-11-26 20:00:26 +00:00
David Goodwin 7afb26fcc8 variables for docker 2017-11-26 19:59:17 +00:00
David Goodwin bdade520f4 Merge pull request #85 from julywind/master
fix invalid value for token_validity
2017-11-24 09:47:06 +00:00
houmingtao 5f1ac12d72 use current time as default token_validity value 2017-11-24 16:04:39 +08:00
David Goodwin 8bd435039b Merge pull request #92 from leeclemens/feature-91/mysql-ssl
Add support for MySQL connections over SSL
2017-11-19 13:48:50 +00:00
Lee Clemens ebbd9025e4 Add support for MySQL connections over SSL 2017-11-14 19:53:59 -05:00
David Goodwin dbbc40b327 add example docker compose settings 2017-11-13 20:07:44 +00:00
David Goodwin ba47f2df2a update docker entrypoint - require db connection params; default to sqlite; revert to using upgrade.php as we do not need the setup.php checks 2017-11-13 20:04:51 +00:00
David Goodwin 72f32f0b3d Merge pull request #90 from pbkwee/patch-1
singular correction.  Update en.lang
2017-11-12 07:30:49 +00:00
pbkwee f217524524 Update en.lang
"Your email address or password are not correct".  Message indicates one thing is wrong.  So use is not are.
2017-11-12 12:40:01 +13:00