Commit Graph
3070 Commits
Author SHA1 Message Date
David Goodwin 65aea00a1f see https://github.com/postfixadmin/postfixadmin/issues/667 - re-use smtp_get_admin_email(), try and make sure there is a From: set in password recovery emails 2022-11-30 21:18:06 +00:00
David Goodwin 9fbb2fcc14 see https://github.com/postfixadmin/postfixadmin/issues/683 - add in error_log for e.g. fail2ban to pick up on someone trying to get into setup.php 2022-11-15 16:33:49 +00:00
David Goodwin 78174d8f67 fix fetchmail using wrong arg for pidfile and mixing up state file (-i vs --pidfile) - see https://github.com/postfixadmin/postfixadmin/issues/681 2022-11-13 18:58:29 +00:00
David Goodwin 41614a48de Merge pull request #679 from endelwar/patch-1
Fix invalid PALANG declaration
2022-11-08 11:05:20 +00:00
Manuel Dalla Lana 29a5d59f8d Fix invalid PALANG declaration 2022-11-08 11:15:30 +01:00
David Goodwin aafdb7187d Merge pull request #671 from Jan-Kruis/patch-1
Update nl.lang
2022-11-05 14:52:45 +00:00
Christian Boltz 01f3e2885d Add 'To_Mailbox' and 'To_Forward_Only' to all *.lang files 2022-11-04 22:43:09 +01:00
David Goodwin 9316e9fb45 +; 2022-11-03 21:22:14 +00:00
David Goodwin b4a7e4192e fix php7.2 heredoc formatting (ending token must be the only thing on the line) 2022-11-03 21:12:33 +00:00
David Goodwin 02b5d7c76e Merge pull request #676 from Jan-Kruis/patch-2
Update nl.lang
2022-11-03 20:54:49 +00:00
David Goodwin bbf55dfc63 Merge pull request #675 from Jan-Kruis/master
Translatable Mailbox and Forward only text
2022-11-03 20:54:39 +00:00
Jan Kruis a73c5a8f38 Update nl.lang
Added two text variables
$PALANG['To_Mailbox'] and $PALANG['To_Forward_Only']
to be able to translate Mailbox and Forward Only in templates/list-virtual_mailbox.tpl and replace the fixed text with the above mentioned variables
2022-11-03 21:20:59 +01:00
Jan Kruis 63cb19cc73 Update list-virtual_mailbox.tpl
added two text variables
$PALANG['To_Mailbox'] and $PALANG['To_Forward_Only']
to be able to translate Mailbox and Forward Only in templates/list-virtual_mailbox.tpl and replace the fixed text with the above mentioned variables
2022-11-03 21:09:24 +01:00
Jan Kruis 2dcf6ebe4a Update en.lang
added two text variables
$PALANG['To_Mailbox'] and $PALANG['To_Forward_Only']
to be able to translate Mailbox and Forward Only in templates/list-virtual_mailbox.tpl and replace the fixed text with the above mentioned variables
2022-11-03 21:07:14 +01:00
Jan Kruis 19776304c8 Update nl.lang
Correction in the Dutch text. These didn't have to go in yet
2022-10-29 12:45:52 +02:00
Jan Kruis 81e5e38d80 Update nl.lang
Correction in the Dutch text. These didn't have to go in yet
2022-10-29 12:42:49 +02:00
Christian Boltz 8ea747676e Update $PALANG['pUsersVacation_body_text'] in all languages 2022-10-26 22:15:47 +02:00
David Goodwin caf676b2f9 Merge pull request #666 from Jan-Kruis/master
replacestring and getaccountname
2022-10-26 09:13:59 +01:00
Jan Kruis 7c6daecd12 Merge branch 'postfixadmin:master' into master 2022-10-19 01:54:09 +02:00
Jan Kruis 93d75a98ba Update vacation.pl
replace typo's thanks to christian
2022-10-19 01:34:56 +02:00
Jan Kruis a10414cf15 types 2022-10-19 00:58:12 +02:00
Jan Kruis 5543babe67 Update Contributions.txt
typo
2022-10-19 00:44:57 +02:00
Christian Boltz 43ce9feda1 Fix typos introduced in https://github.com/postfixadmin/postfixadmin/pull/665 / e279c77ca5 2022-10-18 23:24:38 +02:00
Jan Kruis b8256595e9 Update vacation.pl
remove substr now Time::Piece displays the timestamp correctly 
remove quote from date_format if will now display the activeuntil date and not date_format as text in the body
2022-10-17 13:01:26 +02:00
Jan Kruis b9e2741e1d Update en.lang
prep for replace_string in vacation.pl
2022-10-17 03:10:28 +02:00
Jan Kruis f68904f813 Update nl.lang
languages/nl.lang and languages/en.lang adjustment made in $PALANG['UsersVacation_body_text'] default texts for $Replace_From and $Replace_Until in vacation

removed sendonly andn TLS stuff because funktion's still in development
-$PALANG['sendonly'] = 'Alleen zenden';
-$PALANG['pAdminList-tls_policy'] = 'TLS Policy';
etc
2022-10-17 03:01:47 +02:00
Jan Kruis 690380bb28 Merge branch 'postfixadmin:master' into master 2022-10-17 02:43:43 +02:00
Jan Kruis be5dad4d04 add to vacation.pl
function get_accountname

get the variable name from the table mailbox and use it as accountname
if accountname_check is true the accountname is placed in front of the sender's email " Accountname <original@recipient.domain>" and this will be sent as email name and address of the sender.
if the account is not filled with a string then we will be checking if friendly_name is filled with a string and this will be placed in front of the sender's email "Friendlyname <original@recipient.domain>" and this will be sent as the email name and address of the sender.
if not, only the sender's email address will be sent.

function replace_sting together with replace_a_string

replaces in the body text to be sent the texts describing $replace_from and $replace_until with the values ​​of activerom and activeuntil respectively from the vacation table in the date format specified at $date_format
the date format capabilities are described at https://www.tutorialspoint.com/perl/perl_date_time.htm. Variable has been chosen in the config part of vacation.pl so that admin can adjust the search texts for a country version.
in the languages/??.lang file one can see the $PALANG['UsersVacation_body_text'] with the desired replacement texts in $Replace_From and $Replace_Until.

Added library Time::Piece for data format
2022-10-17 02:36:51 +02:00
David Goodwin eb7e449522 build_coverage_report is not important 2022-10-12 21:09:31 +01:00
David Goodwin 3017ea3f3c psalm fixes (drop safeserver() (not used), $_COOKIE always contains strings etc). 2022-10-12 20:52:49 +01:00
David Goodwin 7caf25244a composer format time 2022-10-12 20:41:14 +01:00
David Goodwin 7a99861802 Merge pull request #665 from Jan-Kruis/master
small correction
2022-10-12 20:37:13 +01:00
David Goodwin 8cc19b0adf add @todo for php-imap.com - see also #656 2022-10-12 20:28:53 +01:00
Jan Kruis e279c77ca5 languages/nl.lang translation from english for new function such as dkim and password
public/editactive.php			edit wrong description text it said this module is used for deleting admin domains mailbos etc
					modify templates that it is used

public/list-virtual.php			modify templates that it is used
					modify the remarks behind arguments and internal , the texteditor thought the text after this was still remark text untl is see */

public/vacation.php and
model/VacantionHandel.php		adjust date string actionFrom and activeUntil these are written in the database as e.g. 2020-10-01 15:14:00 and 2020-10-30-15:14:00
					this should be 2020-10-01 00:00:00 and 2020-10-30 23:59:59 so that it contains all day, this happens if no holiday has been set for the account yet
					when adjusting the dates, the seconds of until are set to 00 instead of 59. When the holiday is canceled and then action is taken again, the from time
					to the time when the setting is made.

templates/editform.tpl			remove blank space

templates/list-virtual_mailbox.tpl	remove indent tabs
2022-10-12 17:46:15 +02:00
Jan Kruis ea131a5ea9 Merge branch 'postfixadmin:master' into master 2022-10-01 01:28:35 +02:00
David Goodwin 73106712e0 min_password_length might be integer, so do not be too strict with it 2022-09-27 19:56:28 +01:00
David Goodwin 1855513b57 remove smarty from psalm.xml 2022-09-17 10:55:17 +01:00
David Goodwin 1988a70489 drop local copy of smarty library; use composer for installation of it; allow smarty 4.x which appears to work and also better supports php8 etc 2022-09-17 10:49:57 +01:00
Jan Kruis a42cf3e2f7 adding testfile.php 2022-09-15 00:09:29 +02:00
David Goodwin 93e52c086c Update README.md 2022-09-03 14:18:48 +01:00
David Goodwin 6ffbc9ffe4 update docs, see also https://github.com/postfixadmin/postfixadmin/issues/653 2022-09-01 09:23:07 +01:00
David Goodwin 5a14f4bc1f this might be a more logical approach - only try and call htmlentities on things that are stringy or arrays 2022-08-29 08:35:54 +01:00
David Goodwin f760d2cd3a to not try to sanitise a null - see https://github.com/postfixadmin/postfixadmin/issues/650 2022-08-28 15:01:47 +01:00
David Goodwin 989a709ee5 see https://github.com/postfixadmin/postfixadmin/issues/647 - if configured for sha512.b64 but
we have a hash with a {MD5-CRYPT} prefix, support the MD5-CRYPT form to allow for migration.
2022-08-11 20:23:32 +01:00
David Goodwin 7e514eb6f0 composer format thinks this should change 2022-08-11 20:23:15 +01:00
David Goodwin 6f3c5a73ad add unit test for https://github.com/postfixadmin/postfixadmin/issues/647 2022-08-11 20:21:16 +01:00
David Goodwin b1b4324a5b add commit activity badge
lifted from shields.io / https://github.com/badges/shields/blob/master/README.md
2022-08-02 09:20:01 +01:00
David Goodwin ce05c3e844 see https://github.com/postfixadmin/postfixadmin/issues/646 - add note/comment, doing version parsing in bash to make the script handle it seems clumsy and verbose 2022-08-02 09:15:37 +01:00
David Goodwin 1896ee8ddd Merge pull request #645 from postfixadmin/issue-642-list-virtual-pagination-after-edit
Issue 642 list virtual pagination after edit
2022-07-30 21:24:42 +01:00
David Goodwin 80567e6920 see #642 - do the same pagination restoration stuff in editactive.php 2022-07-30 21:23:57 +01:00