Commit Graph

303 Commits (74002bbf57ebf3d61f32f591e50c777f3c7dfec5)

Author SHA1 Message Date
Christian Boltz 0e33c90fa1 message.tpl:
- remove $tMessage - it is no longer used/filled anywhere
- replaced with a TODO note that message.tpl usage and the file itsself
  has to be removed (not part of Dale's patch)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1126 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz ee5c1cc239 create-alias.tpl:
- add "multiple targets" help text


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1121 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz cd894a7835 list-virtual.tpl:
- change <h3> to <th>

list-virtual_alias_domain.tpl
- style "create new" link as button

These changes were forgotten by Dale :-P


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1115 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 043fd5520d list-virtual.tpl:
- replace & with &amp; in links
- replaced <h3> with <th>
- style "create new" links as button

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1114 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 767faf95b2 menu.tpl, users_menu.tpl:
- add class="logout" to logout menu item to allow special styling

menu.tpl:
- remove <br clear=all>

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1113 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 3de3aaefff adminlistadmin.tpl, adminlistdomain.tpl:
- style "create new" links as button

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1112 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 2991a1334f fetchmail.tpl:
- change <h3> to <th>
- style "new fetchmail entry" link as button
- changes compared to Dale's patch:
  - do not change colspan +2 to +4 in <th>
  - use colspan=2 instead of 4 in empty cell of <th>
  (both changes were wrong and don't match the table body)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1111 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4d33437cd2 variables.inc.php,
admin_edit-domain.tpl, create-alias-domain.tpl, edit-alias.tpl, 
edit-vacation.tpl, password.tpl:
- remove now unused $tMessage
  (the change in variables.inc.php was not contained in Dale's patch)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1110 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz dc782512a3 overview-get.tpl, viewlog.tpl:
- changed <h3> to <th>

overview-get.tpl:
- removed class="flat" from domain dropdown

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1109 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 7203639886 create-mailbox.php:
- renamed $pCreate_mailbox_*_text to $pCreate_mailbox_*_text_error
- replaced $tMessage with flash_error() / flash_info()

templates/create-mailbox.tpl:
- added 4th column for error messaegs
- replaced <h3> with <th>
- marked lables with <label>
- aligned button with input fields
- removed tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1107 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 99dce81fa3 create-alias.php:
- fixed syntax error introduced in the last revision
- removed $pCreate_alias_goto_text and $pCreate_alias_address_text
  (replaced by PALANG texts in the template)

templates/create-alias.tpl:
- removed colspan to allow helptext in "alias" row
- moved PALANG.pCreate_alias_catchall_text to alias row
- removed pCreate_alias_address_text (always empty)
- replaced PALANG.pCreate_alias_help (empty) with PALANG.pCreate_alias_goto_text
- some whitespace fixes

variables.inc.php
- removed now unused $pCreate_alias_address_text and $pCreate_alias_goto_text

(These changes are _not_ part of Dale's patch ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1105 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 1467a959ed create-alias.php:
- renamed $pCreate_alias_address_text to $pCreate_alias_address_text_error
- replaced $tMessage with flash_error() / flash_info()
- changes compared to Dale's patch:
  - do not add $fAddress and $fGoto to $PALANG['pCreate_alias_goto_text_error']
    error message

templates/create-alias.tpl:
- added 4th column for error messages
- replace <h3> with <th>
- mark labels with <label>
- aligned button with input fields
- added $PALANG[pCreate_alias_help]
- removed tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1104 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 12694a420f create-domain.php:
- renamed $pAdminCreate_domain_domain_text to $pAdminCreate_domain_domain_text_error 
- replaced $tMessage with flash_error(), flash_info() and 
  $pAdminCreate_domain_domain_text_error 
- differences to Dale's patch:
  - removed now always empty smarty->assign for $pAdminCreate_domain_domain_text

templates/admin_create-domain.tpl:
- added 4th column for error messages
- marked labels as <label>
- aligned button to input fields
- removed tMessage
- differences to Dale's patch:
  - removed now unused $pAdminCreate_domain_domain_text

variables.inc.php:
- removed now unused $pAdminCreate_domain_domain_text
  (this was not part of Dale's patch)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1102 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 5f4f20accf edit-mailbox.php:
- replace $tMessaeg with flash_error()
- use pEdit_mailbox_quota_text_error instead of pEdit_mailbox_quota_text
  for error message

templates/edit-mailbox.tpl:
- added 4th column for error messages
- replaced <h3> with <th>
- marked labels with <label>
- marked non-editable fields with <em>
- aligned buttons with input fields
- removed tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1101 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 310d22bb6e create-admin.php
- renamed $pAdminCreate_admin_username_text to $pAdminCreate_admin_username_text_error
- renamed $pAdminCreate_admin_password_text to $pAdminCreate_admin_password_text_error
- replaced $tMessage with $infoMessage (displayed via flash_info)
- additional change compared to Dale's patch: removed unused variable 
  $pAdminCreate_admin_username_text

variables.inc.php:
- removed now unused variables $pAdminCreate_admin_password_text and
  $pAdminCreate_admin_username_text

templates/admin_create-admin.tpl:
- added 4th column for error messages
- replaced <h3> with <th>
- marked labels with <label>
- align button with input fields
- remove tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1099 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 1786099b17 edit-admin.php:
- use additional column for error messages
- renamed $pAdminEdit_admin_password_text to $pAdminEdit_admin_password_text_error
- removed $tMessage

variables.inc.php:
- remove now unused $pAdminEdit_admin_password_text
  (this change was not contained in Dale's patch)

templates/admin_edit-admin.tpl
- added a 4th column for error messages
- HTML cleanup
- changed <h3> to <th>
- marked labels as <label>
- removed tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1098 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 6e5deede3b edit-alias.tpl:
(forgot to include this one in r1095, same commit message)
- replaced <h3> with <th>
- marked labels with <label>
- marked non-editable fields with <em>
- align buttons with input fields
- note: removal of tMessage intentionally postponed

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1096 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz b648510548 admin_edit-domain.tpl create-alias-domain.tpl, edit-vacation.tpl,
list-virtual_alias_domain.tpl, password.tpl:
- replaced <h3> with <th>
- marked labels with <label>
- marked non-editable fields with <em>
- align buttons with input fields
- note: removal of tMessage intentionally postponed

password.tpl:
- move error message formatting to template (language changes will follow
  in a later commit)
  - difference to Dale's patch: use <td class="error_msg"> instead of 
    <td><span class="error_msg">

edit-vacation.tpl:
- added language="JavaScript to <script> tags
- removed reference to calendar.css (now @import'ed in default.css)
- added class="flat" to activefrom and activeuntil input fields

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1095 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz f0a153f0fc sendmail.php, broadcast-message.php:
- use smtp_get_admin_email() to determinate the mail sender
- rename $SESSID_USERNAME to $smtp_from_email
- replaced tMessage with flash_error() / flash_info()

sendmail.php:
- changes compared to Dale's patch:
  - use flash_info() for $PALANG['pSendmail_result_success']

broadcast-message.php:
- use flash_error() for $PALANG['pBroadcast_error_empty'] instead of
  hardcoding it in the template


sendmail.tpl,templates/broadcast-message.tpl:
- replace <h3> with <th>
- replaced $SESSID_USERNAME / $CONF[admin_email] with $smtp_from_email
- mark labels with <label>
- mark non-editable fields with <em>
- align buttons with input fields
- remove tMessage

sendmail.tpl:
- changes compared to Dale's patch:
  - fixed colspan for buttons cell

templates/broadcast-message.tpl:
- remove hardcoded error message (see broadcast-message.php change above)
- changes compared to Dale's patch:
  - fixed colspan for <th>

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1094 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 75a9aabc70 config.inc.php:
- new config option $CONF['theme_custom_css']. This allows to add another
  CSS file that is loaded after $CONF['theme_css']. Useful if someone wants to
  do some small changes, but doesn't want to edit default.css
 
templates/header.tpl:
- include $CONF[theme_custom_css] if set

Changes compared to Dale's patch:
- $CONF['theme_custom_css'] is empty by default
- only include $CONF[theme_custom_css] if not empty

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1092 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 8e9b423120 users_main.tpl:
- do not display username on main page. The user should know who he is ;-)
  and even if not, his name is displayed in the footer

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1091 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz ce5f6ce559 users_edit-alias.tpl, users_password.tpl, users_vacation.tpl:
- replaced <h3> with <th>
- marked labels as <label>
- mark non-editable fields with <em>
- removed tMessage
- aligned buttons with input fields

users_password.tpl:
- put class=error_msg in template (will be removed from $PALANG strings)
  - change compared to Dale's patch: use <td class="error_msg"> instead of
    <td><span class="error_msg">

users_vacation.tpl:
- added class="flat" to fActiveFrom and fActiveUntil
- added language="JavaScript" to <script>
- removed reference to calendar.css (now included via default.css)

default.css
- added @import calendar.css

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1090 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 2b1f3e4102 login.tpl, users_login.tpl:
- changed <h4> to <th>
- mark labels with <label>
- added a label to the language selector
- removed tMessage

languages/*:
- added PALANG[pLogin_language]

changes compared to Dale's patch:
- users_login.tpl:
  - do not add the <div class="field_container"> ... </div> wraps
  - use PALANG[pLogin_language] instead of PALANG[pUsersLogin_language]
    to avoid a superfluous string/translation
- login.tpl:
  - removed wrong colspan for language selector and login button
- de.lang: added german translation for PALANG[pLogin_language]

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1089 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 3f46cdfc13 footer.tpl:
- swapped order of "update check" and "logged in as" to be more logical
  (we now have $version | update check | logged in as | $CONF['footer_text'])
- added a </div>

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1087 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 27ce979678 header.tpl, index.tpl, flash_error.tpl:
- move flash_error and flash_info output from header.tpl to separate 
  flash_error.tpl file
- some HTML whitespace fixing in header.tpl

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1077 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 5451b536d3 The link target of the "Main" menu item in users/ was configurable in
$CONF['user_footer_link']. This doesn't really make sense - it should
always be a link to users/main.php.

configs/menu.conf:
- added url_user_main = main.php

templates/users_menu.tpl:
- replaced $CONF.user_footer_link with #url_user_main#

config.inc.php:
- removed (now unused) $CONF['user_footer_link']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1059 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz bf1883ebd7 list-virtual:
new option 'all' to display domain aliases, mailboxes and aliases on
one page (like in 2.3.x)

The question is: what do we want as default?
-> feedback please!
(personally, I'd prefer "all")

templates/list-virtual.tpl:
- new submenu option "all"
- changed subnav to a more lightweight design

css/default.css:
- new style ".subnav p" for submenu
- new style "span.active"


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1054 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 23e3330003 display alias domains less confusing (from/to instead of "is an alias domain for ...)
This fixes 
https://sourceforge.net/tracker/?func=detail&aid=2890375&group_id=191583&atid=937967

list-virtual.php:
- merge queries for from and to side of alias domains
- use a mostly common query for MySQL and PgSQL
- move "can create alias domain" logic to PHP

list-virtual_alias_domain.tpl:
- merge "from" and "to" view to one table
- add "To" column to the merged table
- do not link to $fDomain (which would lead to the currently displayed page)
- drop the second table / "is an alias domain for ..."



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1052 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz af6a1b6626 Add support for domain-level quota (total quota for a domain)
Based on a patch from W. Rossmann (W. Rossmann@SF),
https://sourceforge.net/tracker/index.php?func=detail&aid=2974928&group_id=191583&atid=937966
with some modifications, cleanup and adoptions to trunk (especially templates)

config.inc.php:
- new config option $CONF['domain_quota'] to enable/disable domain-level
  quota (default: enabled)
- new config option $CONF['domain_quota_default'] (default: 2 GB)

functions.inc.php - check_quota():
- add code to check the quota sum on a domain
- add optional parameter $username (to exclude that username from quota
  calculation, used by edit-mailbox)

edit-domain.php, create-domain.php,
admin_edit-domain.tpl, admin_create-domain.tpl:
- add input field and handling for domain-level quota

list-domain.php, overview-get.tpl, adminlistdomain.tpl:
- display allocated and allowed domain quota
- beautify quota and max_quota fields - display "unlimited" instead of "-1"

edit-mailbox.php:
- hand over username to check_quota()



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1042 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz cf1fde5194 languages/*:
several text changes to be more clear (see the en.lang diff for details)

This commit implements most changes from Chris H. (dharmachris@SF) posted at
https://sourceforge.net/tracker/?func=detail&aid=3186094&group_id=191583&atid=937964


Related template changes:

templates/admin_edit-admin.tpl:
- use PALANG.save instead of PALANG.pAdminEdit_admin_button

templates/users_edit-alias.tpl, templates/edit-alias.tpl:
- split PALANG.pEdit_alias_welcome - second half is now PALANG.pEdit_alias_help
  (this avoids the <br /> in the text)
- use PALANG.save instead of PALANG.pEdit_alias_button

templates/edit-mailbox.tpl:
- use PALANG.save instead of $PALANG.pEdit_mailbox_button

templates/admin_edit-domain.tpl:
- use PALANG.save instead of $PALANG.pAdminEdit_domain_button


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1031 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz f8cd54a468 variables.inc.php:
- cleanup: move some vars to password.php and users/password.php
- drop $pPassword_admin_text - was always empty

password.php, users/password.php:
- init $pPassword_password_text and $pPassword_password_current_text
  (previously in variables.inc.php)

templates/password.tpl, templates/users_password.tpl:
- drop $pPassword_admin_text - was always empty

These changes should also fix some undefined variable warnings reported 
by makomi on IRC.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1004 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4be543e313 adminlistadmin.tpl, adminlistdomain.tpl:
- fix undefined variables (by using $PALANG.* instead)

footer.tpl:
- remove undefined variable because the correct one is already included


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@963 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz e8beac17d0 index.tpl:
- footer.tpl was accidently lost in r951, added again


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@955 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
David Goodwin a7942d7059 move this to common.php; i dislike inline php in templates
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@952 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
David Goodwin d798138d1d i prefer english... ;-)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@951 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
David Goodwin 43a150941b check if a variable is populated...
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@950 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz ea6a7cef79 footer.tpl: remove escaping of $CONF[footer_link]
url-escaping $CONF[footer_link] makes the link look like
"http%3A%2F%2Fexample.com". Browsers interpret this as file name 
relative to the current domain and directory, not as full 
http://example.com URL. Removed escaping.

Thanks to jan-kruis @SF for pointing this out.
https://sourceforge.net/tracker/?func=detail&aid=3153035&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@940 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 80412e4d60 list-virtual_alias.tpl: fix editing of aliases with $CONF[special_alias_control] == NO
- with special_alias_control = NO, no alias was editable.
  Fixed - only default_aliases should be locked (looks like == instead 
  of === needs to be used in smarty for bool comparison)
- merged conditions, simplified code


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@936 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a0fbff5377 create-alias: support multiple alias targets
- support multiple alias targets, patch by anexius@SF,
  http://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/4004442
  The patch fixes
  https://sourceforge.net/tracker/?func=detail&aid=2706290&group_id=191583&atid=937964

additional small fixes:
- replace spaces only at the start and end of a line, not in the
  middle of an (BTW: invalid) mail address
- allow multiple error messages (separated by <br />)
- prevent input data loss on validation errors




git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@900 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz d0a3cd62e8 overview-get.tpl:
- removed a space that caused a smarty syntax error


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@890 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Sebastian a057830b84 - make template Smarty >= 3.x compatible. Tested with Smarty 3.0.5
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@883 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 98c0252a08 common.php:
- store language in session variable
  (BTW: storing it only at login instead of calling check_language() on 
  every page would save some processor cycles ;-)

templates/header.tpl:
- add   class="lang-XY"   (where XY is the language to the body tag.
  This allows language-specific CSS code: .lang-XY table {...}

This commit implements the feature request from J.Kruis (jan-kruis)
https://sourceforge.net/tracker/?func=detail&aid=2903088&group_id=191583&atid=937967



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@872 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a46d0c5278 Another step in code cleanup: replaced search.php with search mode in
list-virtual.php. We now have two file less to maintain without loosing
functionality :-)

Only remaining bug: in search mode, no page browser is displayed.
This means that you'll only see the first $CONF['page_size'] search results
*without* the possibility to see the next page of results.
(BTW: search.php simply ignored $CONF['page_size'] ;-)


search.php, templates/search.tpl:
- deleted, RIP ;-)

configs/menu.conf:
- change search form to use list-virtual.php instead of search.php

list-virtual.php:
- added TODO note about the "no page browser in search mode" bug

templates/list-virtual.tpl:
- hand over $search to all tabs



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@869 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4c912f1da8 list-virtual.php:
- hand over $search to smarty templates

templates/list-virtual_alias.tpl, templates/list-virtual_alias_domain.tpl:
- add search result highlighting

templates/list-virtual_mailbox.tpl:
- add search result highlighting
- move output of "Mailbox" / "Forward only" outside the foreach loop
  (was displayed once per mailbox alias target)

css/default.css:
- add style for ".searchresult"



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@868 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Sebastian e85c0ab2b4 - fix encoding problem in menu.tpl which prevented adding Mailbox from menu.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@799 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 852397d285 - small fixes for Smarty 3.0 compatibility
- Postfixadmin now works with Smarty >= 3.0b7

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@798 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 610009cb50 - fix bug that no admins and domains can be edited.
- workaround for filename problem.

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@796 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 9ddf15439f - fix some display errors after rev. 788, found and patch supplied by Jan-Kruis, thx.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@791 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz ec6ac581e6 list-virtual_alias_domain.tpl
- fix delete link for alias domains (when on target domain - delete link
  must contain the "from" domain)
  Reported by roe_ on #postfixadmin, also affects 2.3


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@789 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 232bc42d63 - Fix small typo.
- Fix small table/link layout problem.

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@780 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 42bf87bb58 - fixed minor table error.
- default text alignment is now "left"
- fixed variable assignment in templates/menu.tpl


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@775 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 3271b2d822 - fix templates to honour $CONF['sendmail'] and $CONF['fetchmail'] settings
- fix some small undefined errors

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@769 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 4a3e525f24 - small fix to smarty.inc.php. Really use our compile and templates directory
- Fix in menu.tpl to honor "show fetchmail tab"

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@768 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 283c563d84 - small bugfix. Display date correctly
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@766 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 5275e17c20 - add ability to choose activation date for vacation message in user module
- add files to user module
TODO: clean up whole user module, use VacationHandler in admin module

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@764 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian cf40467570 - accidentially deleted header.php. Needed for setup
- add some error checks.

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@759 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian b1287d97e2 - big merge of Postfixadmin smarty into trunk
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@757 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 6220b6d85c after a long weekend...
list-virtual.php:
- merge search functionality into list-virtual.php (even more performant
  for domain admins now - search.php checked domain ownership after
  querying all domains...)
  (Use list-virtual.php?search=searchterm to test searching)
- allow to display mailbox alias targets in mailbox list
  Fields added to the mailbox list array:
  * goto_mailbox (mailbox (=1) or forward-only (=0))
  * goto_other (array with aliases not pointing to the mailbox)
  * (vacation alias is skipped)
  open question: is $display_mailbox_aliases = boolconf('special_alias_control')
  correct? I'm slightly confused with alias_control, alias_control_admin
  and special_alias_control...
- build mailbox query step by step instead of having several variants
  which overlap 90% (and include a high bug potential, as already
  demonstrated by me ;-)

templates/list-virtual.php
- added search result highlighting
- added displaying of mailbox aliases (goto_mailbox and goto_other)
- removed ?domain= parameter for edit-alias.php, other edit-*.php have
  to follow (otherwise we'll have to extract the domain from the address
  to avoid incorrect parameters in search mode)

functions.inc.php
- added db_in_clause() which builds a "field in(x, y)" clause for
  database queries



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@751 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 7f4f8fd996 remove short open tags etc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@748 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 9cbb2a5d57 list-virtual.php + its template
- better fix for used quota not showing up (SELECT quota2.bytes _as current_)
- this includes reverting the template patch from r746, patch from
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2889335&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@747 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 1b59229f11 fix quota display - as per http://sourceforge.net/tracker/?func=detail&atid=937964&aid=2889335&group_id=191583 - thanks for the patch
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@746 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 0eb3cb9acf templates/create-mailbox.php
- always tick the "create mailbox" - even if $CONF['create_mailbox_subdirs'] is set
  https://sourceforge.net/tracker/?func=detail&aid=2834441&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@731 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 6f653b1697 fix boolean handling for postgres - see https://sourceforge.net/tracker/?func=detail&aid=2830001&group_id=191583&atid=937964
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@701 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz b23620cd8a templates/search.php, templates/list-virtual.php:
- replaced the remaining ereg_* calls with preg_* calls


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@688 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin dfe10bf036 try and be a bit more intelligent over which domain is selected by default in list-virtual & the menu
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@687 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz de447795da templates/list-virtual.php:
- fix mixed up unlimited vs. disabled
  https://sourceforge.net/tracker/?func=detail&aid=2790969&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@656 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 84a5203fe1 list-domain.php:
- replace get_domain_properties() calls with two SQL queries that fetch
  the domain data and count the number of mailboxes and aliases per domain.
  This change speeds up list-domain extremely on setups with lots of domains,
  mailboxes and aliases. The old code took several minutes on my test data
  (that's about 55000 mailboxes and their aliases), the new code only needs
  some seconds.
- $domain_properties now uses the domain name as index key instead of a
  serial number

templates/admin_list-domain.php:
- replace usage of $list_domains with $domain_properties
- change main loop to use the domain name as $domain_properties array key 
  instead of a serial number

upgrade.php:
- upgrade_655(): add index on domain column in mailbox and alias table.
  This speeds up list-domain from 14s to about 1s on my test data in MySQL
  (the 14s were _after_ the changes in list_domain.php)
- added _add_index() function to hide the database specific details in 
  upgrade functions

This commit should fix the performance problems reported on
http://sourceforge.net/forum/forum.php?thread_id=2343349&forum_id=676076



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@655 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz ab1162ca84 templates/list-virtual.php:
- fixed boolconf() call
  "if (boolconf('used_quotas') == 'YES')" will never match, because 
  boolconf() returns boolean TRUE or FALSE


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@651 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 13aa17f463 templates/search.php:
- fix several "stristr(): Empty delimiter" warnings when empty search field is submitted


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@647 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 15632ea274 alias editing - ensure template uses correct list of aliases
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@645 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 6bd6c99835 templates/search.php:
- fix displaying of vacation status in search results - was broken for
  a) super admins (wrong nesting of if statements)
  b) mailboxes with vacation switched off (empty and therefore invisible link)

templates/admin_search.php:
- deleted unused file


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@622 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 1bb29c849c templates/users_password.php:
- fix undefined variable $USERID_USERNAME by using $username instead


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@621 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin f335850e8f remove logic from users template
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@578 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 11c39af699 - added/fixed vim: lines to nearly all *.php files (exception: templates/*)
(ts=3 or ts=4 depending on the file content)
- several whitespace fixes
- (no code changes)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@566 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 69034b38c9 see https://sourceforge.net/tracker/index.php?func=detail&aid=2567397&group_id=191583&atid=937966 - correct link to delete alias
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@563 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 8a9b6cb310 templates/list-virtual.php:
- switch to boolconf() to avoid "undefined variable" warning


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@552 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 049a9ecc96 merge patch for dovecot quota viewing - see https://sourceforge.net/tracker/index.php?func=detail&aid=2060309&group_id=191583&atid=937966 - thank you shario; sorry it took so long to merge!
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@518 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 826ec87d83 checked=checked is more proper, right?
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@503 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 514d2df060 create-domain.php: try and remove code duplication, expand use of $form_fields (defaults etc); only allow valid transport values through
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@502 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 4df62240fd add table defintion to the delete url - see https://sourceforge.net/forum/forum.php?thread_id=2283853&forum_id=676076
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@494 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 2a555bcd75 edit-mailbox.php, templates/edit-mailbox.php:
- revert r482 (show password when editing mailboxes) because it does more
  harm than good (see mailinglist for details).
  Also opened a feature request to bring this back in a way that works for
  everybody:
  https://sourceforge.net/tracker/index.php?func=detail&aid=2332595&group_id=191583&atid=937967


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@485 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 8cc2b74a64 patch from int on irc - if $CONF[show_passwords] then do so
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@482 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 75c5c62ed0 config.inc.php, functions.inc.php, templates/list-virtual.php:
- dropped $CONF['show_custom_count'], it can easily be calculated with
  count($CONF['show_custom_domains']). This fixes part (6) of
  https://sourceforge.net/tracker2/?func=detail&aid=1951926&group_id=191583&atid=937967

config.inc.php:
- added some comments explaining $CONF['show_undeliverable_exceptions'] 
  and $CONF['show_custom_domains']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@471 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 2d47ca4764 patch from https://sourceforge.net/tracker/index.php?func=detail&aid=2049843&group_id=191583&atid=937964 ; thanks
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@445 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin e7ed314f50 list-virtual.php: fix from https://sourceforge.net/tracker/index.php?func=detail&aid=2050952&group_id=191583&atid=937964
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@443 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 41d5ee4ecb create-alias-domain.php:
- filter available alias and target domains (and print an error message
  if none is available)
- print success message via flash_info, not inside the form and do a
  redirect afterwards. We would have to update the list of domains
  available for aliasing otherwise.
- added vim: settings
 
templates/create-alias-domain.php:
- hide form if no domains are available for aliasing
- move logic of skipping non-available domains to /create-alias-domain.php
- added vim: settings

templates/list-virtual.php:
- show "create alias domain" link (only) if it makes sence (not perfect
  yet, but better than before)
- don't create empty <div> etc. if domain has no mailboxes
- intentionally skipped most whitespace fixes (added a comment instead),
  they would make the patch unreadable

languages/*:
- additional error message for alias domains: 'All domains are already 
  aliased.'


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@422 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 5fa76d73d9 config.inc.php + all files related to alias domains
- added $CONF['alias_domain'] switch to disable alias domains
  (includes lots of whitespace changes in list-virtual.php)

functions.php:
- added some comments to boolconf()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@419 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin b4ae6473d6 templates/edit-vacation.php: unquote ' before display - see https://sourceforge.net/tracker/index.php?func=detail&aid=1995119&group_id=191583&atid=937966 - thanks (again) to Beuc; I presume subject also needs stripslashes on it
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@387 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin fe21fd84e8 templates: add @ signs to make it more obvious what the user should type in when creating aliases/mailboxes; thanks to Kurushiyama on irc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@378 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 875a65cba2 menu.php:
- add "create alias domain" to "virtual" menu


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@367 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 370e8fef6c inital merge of lenix's patch for domain aliasing; I think list-virtual.php needs some attention, but I've run out of time right now; upgrade.php has been updated to create the tables correctly (tested on pgsql and mysql); functionality or php scripts not tested yet
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@363 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 601d44bb12 templates/header.php: force UTF8 via Apache/http - as per https://sourceforge.net/tracker/index.php?func=detail&aid=1959206&group_id=191583&atid=937964 and https://sourceforge.net/forum/forum.php?thread_id=2030718&forum_id=676076 - thanks
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@359 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 99ee9f0176 applied patch from lenix - theme support for postfixadmin; see http://sourceforge.net/tracker/index.php?func=detail&aid=1898481&group_id=191583&atid=937966 - thank you
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@299 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 56968abc0c templates/menu.php:
- added JS to enable dropdowns in IE
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1859556&group_id=191583

stylesheet.css:
- dupliated the menu :hover styles as .sfhover for IE


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@281 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f217f0c1bb Summary: Added language selector to login form
functions.inc.php:
- function check_language
  - new optional parameter $use_post (needed by login.php)
  - check for language cookie
  - check for $_POST['lang']
  - removed substr() call because it made pt-br translation unuseable
- new function language_selector
  - returns a HTML dropdown language selector
- new function safecookie
  - similar to safeget, but for cookies

templates/login.php, templates/users_login.php:
- display language selector dropdown

login.php, users/login.php:
- check for selected language
- set cookie if user selected non-default language

languages/language.php: (NEW FILE)
- list of supported languages
- language names taken from phpMyAdmin login form

common.php:
- include languages/language.php
 


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@280 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 7a914cd66a templates/users_vacation.php:
- whitespace changes to match vim: comment (ts=4)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@276 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 8c6f6fc8ee templates/search.php:
- removed superfluous and buggy superadmin check. Fixes
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1844063&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@266 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin a463f4865a templates/footer.php: change target for version check (does not exist yet)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@260 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 02195254d7 common.php
- define('POSTFIXADMIN', 1)

templates/*.php
- check if POSTFIXADMIN is defined to prevent direct access to the
  template files


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@256 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 9a33ceb628 templates/users_vacation.php: everyone knows a "tab" is 4 spaces..
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@255 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 6fa88019ab try and stop it (the browser) remembering stuff
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@252 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 39953d029d rename templates to .php instead of .tpl
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@250 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 8f0b75feda users_edit-alias.tpl:
- fix: mailbox not removed from alias targets
  https://sourceforge.net/tracker/index.php?func=detail&aid=1839063&group_id=191583&atid=937964
- don't list mailbox in "to" field. We have option fields for this
  below the textarea.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@246 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 024fc15d29 menu.tpl:
- make broadcast a submenu of send "Send Email"
  Thanks to Jan Örnstedt (ornstedt @sf) for the suggestion


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@235 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 18cebb5622 fetchmail.php:
- made edit form labels and descriptions translatable. This means that
  $fm_struct no longer holds the labels and descriptions
- fixed HTML error (missing > for </span>
- added some comments to document the main "if" block

fetchmail.tpl:
- changed button order and placement to make <enter> saving the entry
- made save and cancel buttons translatable
  Thanks to Johan for the reminder
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1830326&group_id=191583
- made edit form labels and descriptions translatable. This also means
  reworking of some list(...) = $fm_struct[$row] sections

*.lang:
- added translations for "Save" and "Cancel" buttons
- added translations for edit form labels and descriptions

de.lang:
- translated fetchmail-related texts


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@220 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz de82d65615 menu.tpl.orig:
- removed superfluous, unused menu.tpl.orig file


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@215 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 29b143bee9 users/password.php
- merged GET and POST code
- make cancel button working
- redirect to main page on success
- displaying success note with flash_info()

templates/users_password.tpl:
- rename cancel button to fCancel to make it work

users/vacation.php
- redirect to main page on success
- displaying success note with flash_info()
- merge GET and POST code


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@213 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 5cf48d6cb5 (basically the same as in r200, this time for users/vacation.php)
users/vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

users_vacation.tpl:
- encode tSubject with htmlentities() in template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@209 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 3aa9032cd9 list-virtual.tpl
- made '[and x more...]' translatable

*.lang:
- added 'and_x_more'
- added $Id$ keyword
- enabled expansion of $Id$ and $Rev$


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@208 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 32a1e93c9f edit-vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

edit-vacation.tpl:
- encode tSubject with htmlentities() in template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@200 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz c47222ac14 - clear float (no, motd right of the menu doesn't look good ;-)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@198 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin a0833809df list-virtual.tpl: only display vacation stuff if vacation support is enabled
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@192 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz c51b27a9c9 merged overview.php into list-domain.php and list-virtual.php
list-domain.php:
- added several admin/superadmin switches and permission checks
- merged GET and POST code
- Note: still different templates for superadmins (admin_list-domain.tpl)
  and admins (overview-get.tpl) because of large layout difference

list-virtual.php:
- added several admin/superadmin switches and permission checks
- added check for admins without any domains (redirects to domain list,
  which can handle this situation)
- migrated FIXME from overview.php 
  -> David, please review the query and remove the FIXME afterwards

overview.php:
- DELETED - no longer needed

overview.tpl:
- RENAMED overview.tpl to list-virtual.tpl
- removed admin/superadmin filename switch
- removed $incpath switch for images

menu.tpl:
- menu for domain admins now has "domain list" and "virtual list"
  instead of "overview"

delete.php, edit-active.php, edit-alias.php, edit-mailbox.php, search.php:
- changed redirect to list-virtual.php

overview-get.tpl:
- changed link to list-virtual.php

main.tpl:
- changed overview link to list-domain.php



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@181 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 1132b958e5 Finally got rid of admin/ :-)
- moved admin-only scripts from admin/ to /
- removed all merged files ("require('../$file')") from admin/
- changed include paths - no more admin/superadmin switching needed
- admin_menu.tpl is also gone
- removed all menu.tpl / admin_menu.tpl switches - no more needed
- admin/index.php still exists and redirects to /



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@168 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz eb7d2d5a9b stylesheet.css
- added styles for CSS-based dropdown menu, based on "Son of Suckerfish"
  http://www.htmldog.com/articles/suckerfish/dropdowns/

menu.tpl
- merged admin_menu.tpl into menu.tpl
- changed menu layout: the "create ..." items are now submenu items

Notes:
- superadmins still see the old menu
- dropdowns don't work in IE yet (requires some JS)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@167 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 39ed97329f - merged admin/delete.php into /delete.php
- the WHERE fieldname is now hardcoded instead of being a $_GET parameter
  This fixes a possible security hole in admin/delete.php (only vulnerabe
  when logged in as global-admin)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@166 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 8fa1a46a2f - replaced tabs with spaces in fetchmail.php and fetchmail.tpl
- whitespace changes only, no other difference


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@164 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 2f25e8bd42 The work of two nights causes a long changelog. Here we go:
fetchmail.php:
- IMPORTANT: fixed typo in database column name. If you have created the
  fetchmail database already, you have to rename the "pool_time" column
  to "poll_time"
- fixed adding of new entries
- don't display status fields (last poll date and result) in edit mode
- validate and quote the GET and POST variables
- show POSTed data again if invalid values were entered (data to display
  in the edit form is passed to fetchmail.tpl in $formvars)
- check results of database operations and display error/success
  messages
- check owner of target mailbox on all operations
- changed password handling: empty means no change (instead of sending
  "******" around)
- reworked and moved around large code portions
- added some TODO notes

fetchmail.tpl:
- use data from $formvars in edit mode instead of parsing the full array
- moved "new entry" below the table
- replaced delete button with delete links
- Note: the boolean fields need testing with PgSQL. Especially test if
  they are displayed as active correctly in list and edit mode!

*.lang:
- added several fetchmail-related strings, more to follow
- added $PALANG['please_keep_this_as_last_entry'] which always has to be
  the last entry in the language files. This solves the problem that
  language-check.sh mixes up the string order when adding strings at the
  end of the language files.
- added vim:ft=php



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@163 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz dc73789c56 - reverted most changes from r151 in fetchmail.tpl, especially:
- removed $display_fields array again after understanding how $fm_struct
  in fetchmail.php works
- added workaround for undefined index warnings in $fm_struct (line 47)
  (for whatever reasons, there seem to be both numeric and named keys)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@161 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 1e5b4c31c0 fetchmail.php
- changed editable and display flags of some columns in $fm_struct
  (this array is pretty useful once you understand how to use it ;-)
- completed support for $CONF['fetchmail_extra_options'] = 'NO'
- added several escape_string() calls
- fixed several $_GET/$_POST undefined index warnings
- fixed some MySQL vs. PgSQL issues
- some small fixes

fetchmail.tpl
- changed layout to separate list and edit view
- fixed an undefined index warning
- replaced ID column with edit link


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@160 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz b424d39574 - added fetchmail.php to menu.tpl (only displayed if $CONF['fetchmail'] == 'YES')
- shortened german menu text for fetchmail
- config.inc.php:
  - added $CONF['fetchmail'] and $CONF['fetchmail_extra_options'], including
    a big warning for the latter one.
  - include config.inc.php at the end if it exists. This can make future
    updates easier because you don't have to edit config.inc.php itsself.
    It should also make development easier because you don't need to undo
    local changes before commiting config.inc.php
- fetchmail.tpl:
  - new array display_fields, contains the list of fields to display in the
    table. This also solves most "undefined index" warnings.

Note: editing fetchmail does not honor $CONF['fetchmail_extra_options'] = 'NO' yet.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@151 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 31c73f9256 fix edit-admin to not use the db password to pre-populate the field - as per emails with Christian Boltz
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@143 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz c4040c8227 - initial version of fetchmail support (by Viktor Gotwig,info AT symateam.de)
(see postfixadmin-devel mailinglist for detailed description and known 
  problems, subject "fetchmail support")
- encoded some german umlauts as htmlentities


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@140 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin e94a7c4e33 try and stop ff from autocompleting the field; put the encrypted password in the field...
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@131 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 57df6f53ea - added 'create admin' link
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@125 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 5712070060 - merge admin_list-virtual.tpl into overview.tpl
- deleted admin_list-virtual.tpl
- admin/list-virtual.php now uses overview.tpl template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@121 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 644997d8b0 - fix colspan in table headlines
- fix: display create mailbox link even if no mailbox exists yet


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@120 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 4b84ff82bf templates/edit-vacation.tpl: explicit action url
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@116 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin c1f25dce38 make links for adding mailbox and adding alias dependant on controller logic
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@111 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 4e58481b8b fix template for edit-admin
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@106 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin cb66e25ba4 templates/header.tpl: basic flash messaging, basic capability for info and error messages; needs css styling
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@103 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 9c0a7f4ad3 - fix: edit links contained <span ...>...</span> from search highlighting.
(see forum post: https://sourceforge.net/forum/message.php?msg_id=4540915)
  Now using separate variables for highlighting in strings that end up in links.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@100 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 14bd1d6cd9 - removed forgotten TODO
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@95 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 075d15b4b1 db_log patch from amsys - make db logging translatable
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@90 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 2d3058ed9c patch from amsys - see http://sourceforge.net/tracker/index.php?func=detail&aid=1800367&group_id=191583&atid=937966 - thank you!
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@72 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 2539dc47a4 templates/: refactoring and some fixes
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@68 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 86c40569ab templates/header.tpl: unicode patch - thanks to amsys
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@60 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Greg 411e4fae3c Search highlights matches. Click on log entries for full data field pop-up. Other bug fixes.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@49 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Greg 97aeb7a567 Added optional feature to indicate broken aliases and where mailboxes deliver to. Includes
new language variables:
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
$PALANG['pStatus_custom'] = 'Delivers to ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';

Some bug fixes. Maybe some new bugs added.



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@46 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 65d830b1d2 - merged admin_search.tpl into search.tpl (using some check_admin() switches)
- admin_search.tpl now simply require()s search.tpl
- admin_search.tpl still contains the old code for reference (commented out)

- note: maybe some cleanup about the admin/superadmin diffs can/should be done
  in search.tpl. I just did the merge for now.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@34 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
David Goodwin 8b027b53f0 templates/admin_menu.tpl: add link to broadcast message
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@27 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
David Goodwin a6ef4587e6 adding broadcast-message template; see also r25
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@26 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
David Goodwin ac7edf744d templates/admin_list-virtual.tpl : move some html outside of php
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@24 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg cecbdd1660 Greatly enhanced the multi-page experience for list-virtual.php and overview.php
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@15 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg 3a240d9693 More functional search results
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@14 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg e41d0e7e8a Enhanced the way multipage alias and mailbox results are handled
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@13 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg 889ab4c976 changed word 'search' to $PALANG['pSearch']
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@12 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg 339aa49f82 End user improvements
Overview no longer lists aliases for mailboxes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@8 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg 9481a093a6 user Autoresponse edits function like the admin interfaces
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@5 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg fc7bc9529a Search enhancements
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@4 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg d7cca670cb patches by Christian Boltz applied
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@3 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Greg a5ce5620cf Made it possible for admins and superadmins to set a vacation message,
edit vacation messages, and remove them.

main.php added to admin directory so admin and / can share more
templates.

the new edit-vacation.php in admin and / are identical except
for template references

languages/en.lang and languages/default.lang are in sync now

I attempted to add some of the new .lang variables I created to
the spanish file (I don't know it that well, hope its OK)

fixed a bug in users/vacation.php

Added a "Main" menu item to the admin menu that gets you back to where
you started when you log in.



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@2 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago
Mischa Peters 85dc57beee Initial Import in SourceForge
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1 a1433add-5e2c-0410-b055-b7f2511e0802
18 years ago