Commit Graph

38 Commits (7a7403aa760fc58bfa39a141b1c03d56ea2d8df5)

Author SHA1 Message Date
Christian Boltz 69b3df10e4 config.inc.php
- new config option $CONF['password_validation'] - array with regular
  expressions to check if a password is valid/good enough.
  The default configuration enforces:
  - minimum length 5 characters/digits/whatever
  - at least 2 characters
  - at least 2 digits
- removed $CONF['min_password_length'] - it's now handled in /.{5}/ in
  $CONF['password_validation']

functions.inc.php
- new function validate_password to check a given password against
  $CONF['password_validation']
- generate_password: generated password is always 8 chars long
  (instead of $CONF['min_password_length'])

edit-admin.php, users/password.php, edit-mailbox.php, setup.php:
- use validate_password instead of $CONF['min_password_length']

This implements
https://sourceforge.net/tracker/?func=detail&aid=1785513&group_id=191583&atid=937967


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1192 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz e38ba1f7cf users/password.php, edit-admin.php, edit-mailbox.php, *.lang:
- rename $PALANG['pPasswordTooShort'] to $PALANG['password_too_short']

*.lang:
- add $PALANG['password_no_characters'] and $PALANG['password_no_digits']
  (will be used by my next commit)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1191 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 0656852d4e functions.inc.php:
- new function allowed_quota to get the allowed maximum quota for a mailbox.
  Based on a patch by wvolz (wvolz@SF), but with several enhancements/changes.
  https://sourceforge.net/tracker/index.php?func=detail&aid=2856577&group_id=191583&atid=937966
- added a TODO note

edit-mailbox.php:
- get maximum allowed quota via allowed_quota() instead of just using
  the maxquota of the domain


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1156 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 57d25d3d41 Merge edit-mailbox.tpl and edit-mailbox.tpl:
edit-mailbox.tpl:
- merged with create-mailbox.tpl
- added various {if $mode = ...}
- use $PALANG.pCreate_mailbox_password (text: "Password") instead of
  $PALANG.pEdit_mailbox_password text (text: "New password") for edit mode

create-mailbox.tpl:
- deleted

edit-mailbox.php:
- add smarty mode = edit variable

create-mailbox.php
- add smarty mode = create variable

*.lang:
- marked pEdit_mailbox_password and pEdit_mailbox_password2 as obsolete


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1154 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz a81f3d6506 edit-mailbox.php, edit-mailbox.tpl:
- fixed undefined variables


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1147 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 years ago
Christian Boltz e4c76696de edit-mailbox.php, edit-mailbox.tpl, variables.inc.php
- removed always empty variable $pEdit_mailbox_password_text
- replaced "static" variable $pEdit_mailbox_quota_text with its
  PALANG content in the template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1133 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 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
13 years ago
Christian Boltz 4a29c75938 edit-mailbox.php:
- drop superfluous "modified" field (it's default anyway)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@998 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz c97e5224dc Remove $username parameter from db_log()
functions.inc.php:
- remove $username parameter from function db_log()
  (now auto-detected with authentication_get_username())

various files:
- remove hardcoded username ('CONSOLE', $username etc.) in db_log() calls


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@966 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4a2b40e100 changed db_update parameters for the most common usecase "WHERE col=value" -
column and value are separate parameters now

functions.inc.php:
- changed function db_update() parameters - column name and value for the WHERE
  condition are now two separate parameters. This means we don't need to
  escape_string(), add quotes etc. for most UPDATE queries.
  Example call: db_update('alias', 'address', $this->username, $values_array)
- the previous db_update() is now called db_update_q()

model/UserHandler.php:
- changed db_update call to the new parameters
- removed now unused variables
- renamed $username to $E_username
- call pacrypt directly when setting the $set array, no need for $new_db_password

model/AliasHandler.php
- changed db_update call to the new parameters

edit-mailbox.php
- switched to db_update_q()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@931 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 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
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
David Goodwin 81059ddbdd allow local_part to change (in theory this code serves no purpose, as the username cannot be changed.. but perhaps it will be in the future (part 2 of operation shut-up-libertytek-charles :) )
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@496 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
Christian Boltz 29070cfd59 edit-mailbox:
- password change is now recognized even if only the "new password (again)" 
  field was changed/filled


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@484 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
David Goodwin a29800924e edit-mailbox.php: merge of patch from https://sourceforge.net/tracker/index.php?func=detail&aid=1996052&group_id=191583&atid=937966 ; thanks Sylvain BEUCLER - beuc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@386 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz add0c86cad Applied patch from Michiel van Baak (mvanbaak)
https://sourceforge.net/tracker/index.php?func=detail&aid=1923030&group_id=191583&atid=937966
- added quota parameter in mailbox_postcreation() hook
- new hook to update the quota after editing a mailbox

Modifications to the patch:
- made $quota an required parameter in the mailbox_postedit and 
  mailbox_postcreation functions
- the scripts always get the quota as 4th parameter. In case $quota 
  is <= 0, it is set to 0.


config.inc.php:
- new option $CONF['mailbox_postedit_script']

edit-mailbox.php:
- call mailbox_postedit() after editing the mailbox

functions.inc.php:
- added $quota parameter to mailbox_postcreation()
- new function mailbox_postedit()

create-mailbox.php:
- added $quota parameter on mailbox_postcreation() call


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@373 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin a2c909b6e9 edit-mailbox.php- if the user clicks on cancel, forward them to somewhere else, and not save stuff - see https://sourceforge.net/tracker/index.php?func=detail&aid=1888847&group_id=191583&atid=937964
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@304 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f2c56c9203 edit-mailbox.php
- fix: put the values the user entered in the form again if an error was
  detected (instead of showing the form completely empty)
- fix: do not check for password length when password is not going to be 
  changed (empty password field).
  Thanks to Danilo Montagna (dmontagna) for pointing this out!
  https://sourceforge.net/forum/message.php?msg_id=4709926


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@291 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 07a823ef6a edit-mailbox.php: Closes #1865124 - too short error was not telling the user the minimum size
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@287 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 269c70d330 edit-mailbox.php: random edits - I thought password length check was already in... </confusion>
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@285 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 70dea6ca05 edit-mailbox.php; indentation fix
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@272 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 1df4b68ac8 several *.php files:
- no longer use $incpath - merging admin/ is done
  http://sourceforge.net/tracker/index.php?func=detail&aid=1838327&group_id=191583&atid=937964

Note that $incpath is still used by common.php - removing it would break users/


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@243 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 06537afdbd - fix: password was always changed when editing a mailbox.
Thanks to Ryan Wagoner for pointing this out.
- first usage of db_update function ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@185 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 f91a6641c3 - Fix HTML (<span> is opened inside the error message, close it again)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@119 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin e4f2e45039 edit-mailbox.php; try and make it work properly
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@117 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin dc51d62e15 update license headers
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@107 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 3e70f276c2 final set of refactoring patches (and the rest)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@71 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 0281911724 - merge admin/edit-mailbox.php and edit-mailbox.php
- merge identical parts of GET and POST code
- fix uninitalized variable (was only visible in case of validation errors)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@42 a1433add-5e2c-0410-b055-b7f2511e0802
17 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