PostfixAdmin for BananaNetwork - to apply required patches before release or release in async to the official version
https://github.com/postfixadmin/postfixadmin
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
9bee8d89c1
vacation.php
- result of merging edit-vacation.php and users/vacation.php
- vacation.php comes with the svn history of edit-vacation.php
- display "vacation already active" (only) in user mode if vacation is active
(would be useful in admin mode too, but needs a text change)
- various comment updates
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] using sprintf
- change compared to Jan Kruis' patch:
- set return url for users to main.php instead of users/main.php
- set return url for admins after setting $fDomain. Otherwise the return url
does not contain the domain.
- removed unused variable $tDomain
users/vacation.php:
- require(../vacation.php)
- remove everything else
- whitespace changes in the license header
- note: this is completely different from Jan Kruis' patch - his intention was
to remove this file and use ../vacation.php. However, with his way all links
in the users menu would point to the wrong place/directory
edit-vacation.php:
- deleted
templates/vacation.tpl
- display username only in admin mode
templates/list-virtual_mailbox.tpl
- link changed to merged vacation.php
languages/en.lang
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] as sprintf variable
- (comments added by Jan Kruis' patch are not part of this commit)
languages/nl.lang
- translation updates
- already contains the sprintf variable in $PALANG[pVacation_result_removed]
and $PALANG[pVacation_result_added]
(updates for other *.lang files follow in another commit)
The following parts of Jan Kruis' patch are not part of this commit:
- rejected:
- variables.inc.php: don't add $Admin_role and $Return_url
If we initialize them, it should be done directly in (edit-)vacation.php,
but the current code always sets them already in all cases.
- templates/users_main.tpl: do not change url for vacation.php
- postponed:
- added comments in en.lang about obsolete texts
Most parts of this commit (see exceptions above) were provided as patch
by Jan Kruis (jan-kruis@SF), see
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1169 a1433add-5e2c-0410-b055-b7f2511e0802
|
13 years ago | |
|---|---|---|
| ADDITIONS | 13 years ago | |
| DOCUMENTS | 13 years ago | |
| VIRTUAL_VACATION | 13 years ago | |
| admin | 17 years ago | |
| configs | 13 years ago | |
| css | 13 years ago | |
| debian | 13 years ago | |
| images | 13 years ago | |
| languages | 13 years ago | |
| model | 13 years ago | |
| scripts | 13 years ago | |
| smarty | 14 years ago | |
| templates | 13 years ago | |
| tests | 13 years ago | |
| users | 13 years ago | |
| CHANGELOG.TXT | 13 years ago | |
| GPL-LICENSE.TXT | 18 years ago | |
| INSTALL.TXT | 14 years ago | |
| LICENSE.TXT | 13 years ago | |
| backup.php | 13 years ago | |
| broadcast-message.php | 13 years ago | |
| calendar.js | 15 years ago | |
| common.php | 14 years ago | |
| config.inc.php | 13 years ago | |
| create-admin.php | 13 years ago | |
| create-alias-domain.php | 13 years ago | |
| create-alias.php | 13 years ago | |
| create-domain.php | 13 years ago | |
| create-mailbox.php | 13 years ago | |
| delete.php | 13 years ago | |
| edit-active-admin.php | 13 years ago | |
| edit-active-domain.php | 13 years ago | |
| edit-active.php | 13 years ago | |
| edit-admin.php | 13 years ago | |
| edit-alias.php | 13 years ago | |
| edit-domain.php | 13 years ago | |
| edit-mailbox.php | 13 years ago | |
| fetchmail.php | 13 years ago | |
| functions.inc.php | 13 years ago | |
| index.php | 15 years ago | |
| list-admin.php | 13 years ago | |
| list-domain.php | 13 years ago | |
| list-virtual.php | 13 years ago | |
| login.php | 13 years ago | |
| logout.php | 16 years ago | |
| main.php | 15 years ago | |
| password.php | 13 years ago | |
| sendmail.php | 13 years ago | |
| setup.php | 13 years ago | |
| smarty.inc.php | 13 years ago | |
| upgrade.php | 13 years ago | |
| vacation.php | 13 years ago | |
| variables.inc.php | 13 years ago | |
| viewlog.php | 13 years ago | |
| xmlrpc.php | 13 years ago | |