Christian Boltz 9bee8d89c1 Merge users/vacation.php and edit-vacation.php into vacation.php
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
2011-08-14 23:12:20 +00:00
2007-10-31 18:24:40 +00:00
2011-07-29 20:20:16 +00:00
2011-08-08 18:39:03 +00:00
2011-07-31 23:15:41 +00:00
2011-07-29 22:06:52 +00:00
2011-07-29 21:48:44 +00:00
2011-02-27 22:56:05 +00:00
2011-06-20 12:51:02 +00:00
2011-07-18 22:05:07 +00:00
2011-08-05 23:05:25 +00:00
2011-08-06 23:37:20 +00:00
2011-07-31 20:29:17 +00:00
2011-07-18 22:13:05 +00:00
2011-07-31 20:33:46 +00:00
2011-07-22 20:33:56 +00:00
2011-07-31 20:33:46 +00:00
2007-03-24 07:27:00 +00:00
2009-04-22 11:31:53 +00:00
2011-01-06 20:01:21 +00:00
2011-04-24 16:15:21 +00:00
2011-07-18 22:23:33 +00:00
2011-07-25 22:59:39 +00:00
2011-07-18 21:59:55 +00:00
2011-07-25 23:28:32 +00:00
2011-07-26 00:33:44 +00:00
S
Description
PostfixAdmin - веб-интерфейс виртуального администрирования пользователей для почтовых серверов Postfix
26 MiB
0 Stars 1 Watchers 0 Forks
Languages
PHP 82.3%
Go Template 8.8%
Shell 4.1%
Perl 4.1%
Python 0.5%