Commit Graph

76 Commits (786a7d665e25fd71e57f1724a1ed3ebf140a0f7a)

Author SHA1 Message Date
Christian Boltz e5c68e2450 Merge edit-alias.tpl and create-alias.tpl
edit-alias.tpl:
- merge with create-alias.tpl
- added various {if $mode = ...}
- for edit mode: used "multiple targets" help text right of textarea
  (instead of having it under the headline)
- use $fGoto instead of array in textarea

create-alias.tpl
- deleted

edit-alias.php:
- fixed $tGoto to contain unmodified $_POST value on error
- dropped $array smarty variable that was used instead of $tGoto
- added mode = edit smarty variable
- add empty pCreate_alias_address_text_error smarty variable to avoid
  "undefined" warning

create-alias.php:
- added mode = create smarty variable
- switched to edit-alias template

*.lang
- marked $PALANG['pCreate_alias_address'] as obsolete


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1153 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 0fe45bca8a Merge admin_edit-admin.tpl and admin_create-admin.tpl
create-admin.php
- switch to edit-admin template
- rename a smarty variable
- add smarty mode = create variable

edit-admin.php:
- rename a smarty variable
- add smarty mode = edit variable

admin_edit-admin.tpl:
- merge with admin_create-admin.tpl
- add some {if $mode == '...'} switches 
- change <form> name to "admin"
- rename a smarty variable

admin_create-admin.tpl:
- deleted

*.lang:
- mark some $PALANG texts as obsolete:
  - $PALANG['pAdminCreate_admin_username']
  - $PALANG['pAdminCreate_admin_password'
  - $PALANG['pAdminCreate_admin_password2']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1151 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 8f2a3f00ad admin_create-domain.tpl:
- replaced lots of PALANG[pAdminCreate_*] with PALANG[pAdminEdit_*]
- this will make merging with the edit-domain template easier

*.lang
- marked several $PALANG variables as obsolete:
  - pAdminCreate_domain_domain
  - pAdminCreate_domain_description
  - pAdminCreate_domain_aliases
  - pAdminCreate_domain_aliases_text
  - pAdminCreate_domain_mailboxes
  - pAdminCreate_domain_mailboxes_text
  - pAdminCreate_domain_maxquota
  - pAdminCreate_domain_maxquota_text
  - pAdminCreate_domain_transport
  - pAdminCreate_domain_transport_text
  - pAdminCreate_domain_backupmx
- added some "please check" translator notes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1149 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 94dbfa2bb4 Mostly merge edit-mailbox.tpl and create-mailbox.tpl
edit-mailbox.php
- report password errors next to the password field instead of flash_error()
- small changes to smarty variables

create-mailbox.php:
- small changes to smarty variables

edit-mailbox.tpl, create-mailbox.tpl:
- merge as good as possible (everything that is still left will probably
  need an {if}
- renamed some smarty variables
- use colspan=3 for buttons

*.lang:
- mark pCreate_mailbox_username, pCreate_mailbox_name, pCreate_mailbox_quota,
  pCreate_mailbox_quota_text and pEdit_mailbox_name_text as obsolete
- added some "please check" notes for translators



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1146 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz b065366a91 Merge template for admin login and user login
login.php, users/login.php:
- set logintype=admin/user smarty variable
- cleanup: move smarty assignments outside of GET/POST handling - it's
  the same for both

users/login.php:
- do not pre-fill username on failed login

templates/login.tpl:
- merge in users_login.tpl
- add some {if} to handle the differences between admin and user login

templates/users_login.tpl:
- deleted

*.lang:
- mark pUsersLogin_username, pUsersLogin_password, pUsersLogin_language 
  and pUsersLogin_button as obsolete
- add some notes if pLogin_* and pUsersLogin differ


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1137 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 7fee8f760a ja.lang:
- translation update

https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3377014&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1124 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz ce7b0d5ff5 *.lang
- removed remaining <br /> in
  - $PALANG['pPassword_password_text_error']
  - $PALANG['pAdminCreate_admin_password_text_error']
  - $PALANG['pAdminEdit_admin_password_text_error']
  - $PALANG['pCreate_alias_catchall_text']
  - $PALANG['pCreate_mailbox_password_text_error']
  - (and some other texts not listed here, but only in one or two languages)
- differences to Dale's patch:
  - use a space as replacement for <br /> (instead of nothing)
  - added a note that the translation needs to be be beautified to most languages
    (except en and de, which are already ok)
  - do not change "MB" -> "in MB" in $PALANG['pAdminCreate_domain_maxquota_text']
    and PALANG['pAdminEdit_domain_maxquota_text']

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@1119 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a0aa16f6b7 *.lang:
- some $PALANG texts contained field description and error message in
  one $PALANG text. Removed the field descriptions so that the text only
  contains the error message.
- affected texts:
  - $PALANG['pCreate_alias_goto_text_error']
  - $PALANG['pCreate_mailbox_password_text_error']
  - $PALANG['pAdminCreate_admin_username_text_error1']
  - $PALANG['pAdminCreate_admin_username_text_error2']
- difference to Dale's patch:
  - removed the field description in all *.lang files instead of only
    removing the <br />. I just did this manually.
    (changes in en.lang were part of Dale's patch)
  - added a "# check" in some languages where I'm not sure if I removed
    the correct part (if the first half of the text differed from the
    field description in another $PALANG text)

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@1118 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 1476d3e420 *.lang:
- added $PALANG['pUsersLogin_language']
- difference to Dale's patch:
  - NOT added $PALANG['pCreate_alias_help'] to avoid text duplication.
    We can use the existing $PALANG['pEdit_alias_help'] instead.

en.lang:
- fixed typo in $PALANG['pCreate_mailbox_quota_text_error']
- fixed typo in $PALANG['pBroadcast_error_empty'] - this also affects
  not yet translated texts in some *.lang

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@1117 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4671b7c081 *.lang:
- removed all <span> tags
- removed several <br> tags
- marked the following stings as obsolete:
  - pDelete_postdelete_error
  - pDelete_domain_alias_error
  - pEdit_alias_address_error
  - pEdit_alias_domain_error
  - pEdit_mailbox_username_error
  - pPassword_admin_text_error

Note: This commit does not contain all *.lang changes from Dale's patch.
There are some interesting[tm] changes left to check/fix.

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@1116 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 0f49fb81b7 - text change to "Logged _in_ as %s" (the 'in' was missing)
pointed out by supa_user in #postfixadmin
- added a german translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1062 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 408c257659 *.lang:
- new texts 'show' and 'all' for list-virtual (see r1054)
- marked 'pOverview_alias_domain_target' as obsolete (no longer needed since r1052)

de.lang:
- added some translations

language-update.sh:
- made --obsolete working


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1055 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 091d15e58f *.lang: Preparations for domain level quotas
- added $PALANG['pAdminList_domain_quota'] and
  $PALANG['pAdminEdit_domain_quota']
- mark $PALANG['pAdminList_domain_maxquota'] as obsolete

en.lang:
- added TODO for text change to pAdminCreate_domain_maxquota and
  pAdminEdit_domain_maxquota

These changed are based on the patch from W. Rossmann (W. Rossmann@SF),
https://sourceforge.net/tracker/index.php?func=detail&aid=2974928&group_id=191583&atid=937966


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1041 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a6cc2a2947 Changed delete.php to use flash_error(), removed some HTML from languages/*
delete.php: 
- replace various $tMessage=... with flash_error()
- always redirect to the relevant page, even if an error happened
- fix error check in delete admin
- removed HTML formatting (<b>, <span>) from some error messages
- replaced check for pgsql + BEGIN/COMMIT/ROLLBACK with db_begin(),
  db_commit() and db_rollback()
- the smarty message.tpl is most probably superfluous

languages/*.lang:
- removed HTML (<span>) from messages used by delete.php

fetchmail.php, scripts/snippets/baseclass.php
- remove superfluous </span>


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1036 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 fb6ee0ea9a sk.lang:
- big translation update by Ondrej Zary (rnbw @sf) - thanks!
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3162501&group_id=191583

*.lang:
- added pViewlog_action_create_domain, pViewlog_action_delete_domain and
  pViewlog_action_edit_domain (was only in en.lang)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@942 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 76dc501a52 *.lang:
- added missing strings

language-update.sh:
- made --forcepatch more robust


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@772 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 2411cd7765 login.php
- put '<span class="error_msg">' and '</span>' into login.php, not in *.lang

languages/*.lang:
- removed pLogin_username_incorrect and pLogin_password_incorrect texts
- added pLogin_failed to all translations (without the wrapping <span>)
- removed the <span> from pLogin_failed in en.lang and fi.lang

translation-update.sh:
- added "--remove string" option to remove texts from language files



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@550 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 6a5cd59785 fetchmail.php:
- allow superadmin to create fetchmail entry for any mailbox, not only for himself
  https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964

upgrade.php, fetchmail.php, fetchmail.pl:
- rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and 
  therefore causes various problems (we would need to quote the field name 
  everywhere)
  https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964

languages/*.lang:
- renamed strings for fetchmail (use)ssl field



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@479 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 77b3627667 Applying the patch from Stefan Breitegger (tuxstef @SF), see
https://sourceforge.net/tracker/index.php?func=detail&aid=1995478&group_id=191583&atid=937966
+ some small changes

fetchmail.php
- add checkbox to allow setting the fetchmail "ssl" option

fetchmail.pl:
- honor ssl option if set

upgrade.php:
- add ssl column to fetchmail table

*.lang:
- added field name and description for fetchmail ssl option


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@439 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 3e5549bfad functions.inc.php:
- move DNS checks from check_email() to check_domain()
- add clear error message on non-resolvable domains (using flash_error() -
  this is probably not the best solution, but better than nothing)
- made error messages translatable

create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
  in functions.inc.php

languages/*:
- added error messages for the above changes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@429 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 c67c3cba00 *.lang:
- included all texts for domain aliases to the *.lang files

language-update.sh:
- new parameter --forcepatch
  Similar to --patch, but applies the patch line by line. Useful if 
  --patch fails because of empty lines etc., but much slower.



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@365 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 1e59f15f96 ja.lang:
- added some missing translation markers


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@331 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz d5f85a7a34 ja.lang:
- NEW: japanese translation added
  by Daisuke Aoyama <aoyama at peach dot ne dot jp> / daoyama @SF

language.php:
- added ja to list of available languages
- added comment about the content of the language list


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@300 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago