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 | |
|---|---|---|
| .. | ||
| bg.lang | 13 years ago | |
| ca.lang | 13 years ago | |
| cn.lang | 13 years ago | |
| cs.lang | 13 years ago | |
| da.lang | 13 years ago | |
| de.lang | 13 years ago | |
| dropspan | 13 years ago | |
| en.lang | 13 years ago | |
| es.lang | 13 years ago | |
| et.lang | 13 years ago | |
| eu.lang | 13 years ago | |
| fi.lang | 13 years ago | |
| fo.lang | 13 years ago | |
| fr.lang | 13 years ago | |
| hr.lang | 13 years ago | |
| hu.lang | 13 years ago | |
| index.php | 18 years ago | |
| is.lang | 13 years ago | |
| it.lang | 13 years ago | |
| ja.lang | 13 years ago | |
| language-update.sh | 13 years ago | |
| language.php | 16 years ago | |
| lt.lang | 13 years ago | |
| mk.lang | 13 years ago | |
| nb.lang | 13 years ago | |
| nl.lang | 13 years ago | |
| nn.lang | 13 years ago | |
| pl.lang | 13 years ago | |
| pt-br.lang | 13 years ago | |
| ru.lang | 13 years ago | |
| sk.lang | 13 years ago | |
| sl.lang | 13 years ago | |
| sv.lang | 13 years ago | |
| tr.lang | 13 years ago | |
| tw.lang | 13 years ago | |