Commit Graph

862 Commits (10368edc90f9a8ce1dd9a572a252f3527b82efb9)
 

Author SHA1 Message Date
Christian Boltz 10368edc90 LICENSE.TXT:
- update list of used licenses
- split list into "shipped/not shipped with PostfixAdmin"


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1056 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 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
13 years ago
Christian Boltz 3ffd496587 list-virtual.php:
- lots of whitespace fixes to use 4 spaces everywhere
  (which list-virtual.php has in its vim: comment since a long time)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1053 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 years ago
Christian Boltz b37811d153 sendmail.php:
- hand over subject and body as separate parameters to smtp_mail()
  instead of cooking the mail headers manually


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1051 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 0247de425a upgrade_1050():
- add index on (domain,timestamp) in log table to make viewlog faster

_add_index():
- fix handling of multi-column aliases in MySQL


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1050 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz f6cb50e914 backup.php:
- add a warning that backup.php is poorly maintained and might contain bugs
- disable HTML escaping for the message - we feed it with HTML tags...


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1049 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 43d1b71d4d smarty.inc.php:
- cleanup flash messages after displaying them

This fixes
https://sourceforge.net/tracker/?func=detail&aid=3232174&group_id=191583&atid=937964
reported by john doe (johndoe64@SF)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1048 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 9f94438a78 model/DomainHandler.php:
- replace $domain with $this->username in add()
- comment cleanup


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1047 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 39fde20ccc vacation.pl:
- skip mails with a List-Unsubscribe header - that's another indication
  for a mailinglist


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1046 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz e61bffe776 scripts/shells/domain.php:
- add handling of domain-level quotas


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1045 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 19bf885fa9 model/DomainHandler.php:
- allow editing and viewing of "quota" (domain-level quota) field.
  Otherwise the CLI can't set it ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1044 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 562f1ac5b8 model/DomainHandler.php:
- get default domain quota from $CONF
- remove unused from "quota" field - it's used now ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1043 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 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
13 years ago
Christian Boltz 3e2b6c506f language-update.sh:
- new parameter --obsolete to mark a text as obsolete


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1040 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 1e71b525c4 css/default.css:
- merge width and margin to a single rule instead of spreading it all around the CSS

This is a small part from the patch from W. Rossmann (W. Rossmann@SF),
https://sourceforge.net/tracker/?func=detail&aid=2974928&group_id=191583&atid=937966
with some adoptions to SVN trunk


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1039 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 721ee60e8d DomainHandler.php:
- convert domain name to lowercase

This is a follow-up to
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3287965&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1038 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz d94b4a6a95 create-domain.php:
- force domain name to lowercase to avoid problems with PgSQL foreign keys

Reported by Munroe Sollog (roe1234@SF),
https://sourceforge.net/tracker/?func=detail&aid=3287965&group_id=191583&atid=937964
after some bughunting on #postfixadmin



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1037 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 years ago
Christian Boltz f503ba1098 functions.inc.php,
- db_delete(): if no row was deleted, return 0 (not true)
  This should not affect any existing code, but makes more sense
  for future usage.
- whitespace changes in db_delete()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1035 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 736074ec12 list-virtual.php: use create_page_browser().
This will speed up pagebrowser creation by about 300 times.

This fixes 
https://sourceforge.net/tracker/?func=detail&aid=2967410&group_id=191583&atid=937964

It also brings back the pagebrowser in search mode and therefore fixes
https://sourceforge.net/tracker/?func=detail&aid=2782818&group_id=191583&atid=937964

Detailed changes:
- create separate query parts for pagebrowser creation
  (without SELECT $fieldlist and LIMIT clause)
- create pagebrowser arrays with create_page_browser()
- cNav_bar class: parameter cleanup in constructor: use count() instead of 
  relying on external counting
- change cNav_bar calls accordingly


functions.inc.php:
- remove pagebrowser generation from get_domain_properties()
  (no longer needed, obsoleted by create_page_browser)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1034 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 799cd9c2f3 functions.inc.php:
- create_page_browser(): added queries for PgSQL (untested!)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1033 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 years ago
Christian Boltz cfd1be04b2 functions.inc.php:
fully working MySQL version of create_page_browser()

- force $page_size to int and die() if it is < 2
- dropped $item_count parameter - the function now counts itsself
- include last row in the query
- return empty array (= no pagebrowser) if all rows fit in one page
- PgSQL queries are still on my TODO list


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1030 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz a10272d1d2 list-domain.php:
- add explicit field list in SELECT to avoid PgSQL problems with custom columns

Reported by ksb (ksb4ever@SF),
https://sourceforge.net/tracker/?func=detail&aid=2859165&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1028 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 63146720d4 functions.inc.php:
- generate_password(): generate more secure random password

Based on a patch from Pierre Fagrell (mrfrenzy@SF),
https://sourceforge.net/tracker/?func=detail&aid=2958698&group_id=191583&atid=937964
(with some modifications)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1026 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 1414617f4e fix typo in variable name
Reported by Gabriele Vivinetto (gabrielev@SF),
https://sourceforge.net/tracker/?func=detail&aid=3266862&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1024 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 8f174d430a postfixadmin-cli: use readlink if $0 is a symlink
- use readlink if $0 is a symlink (for example in /usr/bin) so that
  postfixadmin-cli.php can be found
  Reported by john doe (johndoe64@SF),
  https://sourceforge.net/tracker/?func=detail&aid=3232183&group_id=191583&atid=937964
- add quoting to all variables


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1023 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 67069e07f8 functions.inc.php:
- new function create_page_browser()

Function to create the page browser index ("a-c, d-h, ...") with light
speed (at least when compared with the current code that can take several
minutes(!) for people with lots of mailboxes or aliases).

At the moment, it only works with MySQL, has several big TODO notes 
(including notices how to implement the PostgreSQL query) and is not
yet actively used.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1022 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz d66262f00e Remove usage of $CONF['postfix_admin_url'] in various Location: headers
to avoid problems with wrong values of $CONF['postfix_admin_url'].

https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3039042&group_id=191583
contains the technical details and reasons.

Note: $CONF['postfix_admin_url'] is still used at some places that are
a bit harder to change.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1021 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz b89b94cf83 Renamed UserHandler to MailboxHandler to make clear it's about mailboxes
(as discussed with GingerDog on IRC yesterday).
Also renamed user to mailbox in the CLI.

- renamed model/UserHandler.php to MailboxHandler.php
- renamed scripts/shells/user.php to mailbox.php
- replaced UserHandler / user with MailboxHandler / mailbox in various files

- unrelated cleanup: deleted obsolete scripts/models-ext directory


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1019 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
David Goodwin 3be13f059d this will probably migrate us to phpunit; stupid dev env is misbehaving though so it is hard to test
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1017 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
David Goodwin 820256011f go away; move to use phpunit from pear
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1016 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz d93f3c12c2 Remove the Zend svn:external from trunk and 2.3 branch
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1015 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz fdfcedb621 de.lang:
- remove half/invalid utf-8 char in $PALANG['pCreate_dbLog_createalias']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1014 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 1351953f2c CHANGELOG.TXT:
- merge in correct revision and date for 2.3.3 release


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1013 a1433add-5e2c-0410-b055-b7f2511e0802
13 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
13 years ago
Christian Boltz 5c9e2e772a list-domain.php
- init $domain_properties() to avoid undefined variable warning
  (reported by makomi on IRC)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1002 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 0fa1614dad upgrade.php:
- fix syntax error


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1001 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 22f023511c CHANGELOG.TXT:
- merge in changes from 2.3.3 (2.3 branch)
- small whitespace fix


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1000 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
13 years ago
Christian Boltz c75022ad50 VacationHandler.php:
- set_away() killed the existing aliases and replaced them with the vacation 
  alias instead of adding it. Fixed.
- remove array() from db_update calls for vacation table (introduced by valkum
  in r981) - the vacation table has created/modified columns since r945


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@988 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Valkum 179f195bf1 *fixed db_insert - duplicate $timestamp
*fixed VacationHandler.php
*changed edit-vacation to us VacationHandler
*added todopoint to upgrade.php
*fixed problem in AliasHandler


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@981 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 8560012db8 For reference: the baseclass I was talking about in my previous commit
+ implementation of fetchmail with this class.

Note that those files were last edited on Aug 14 2008, so they probably
contain some outdated stuff ;-)  Nevertheless the baseclass implementation
and the comments it contains are still useful IMHO.

Feedback welcome ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@979 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 51262b7675 DomainHander: on the way to a common interface for all classes and
easy-to-edit field lists. With lots of inspiration from fetchmail.php
and a base class I started 2.5 years ago.

model/DomainHandler.php
- base on PFAHandler (see below)
- new protected variables
  - $id_field (column that contains $username)
  - $struct (field list)
  - $defaults (default values, option lists)
  - $new (switch between new and edit mode)
- change $username to protected (preparation for move to PFAHandler)
- add optional $new parameter to __construct. Targets (not yet implemented):
  - early validation of $username (domain name in this case)
  - if $new == 1, check that item does NOT exist and is a valid domain
  - else: check if item exists. error out if not.
- new function initStruct to fill $id_field, $struct, $defaults
- add():
  - use an array as parameter instead of single parameters
    Advantage: this makes it easy to add another field
  - use _inp_* base validation 
  - create default aliases only in create mode, not in edit mode
- view(): fix error message
- added various TODO notes. Some affect design questions - feedback welcome ;-)

scripts/shells/domain.php:
- change $handler->add call to array usage
- add some TODO notes
- some whitespace fixes in execute()

model/PFAHandler.php:
- new base class for *Handler classes
- contains only some generic input validation for now
- more code will be moved from DomainHandler to PFAHandler later


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@978 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 62eee67aee delete.php:
- fix various db_delete calls - use default table name, not table_by_key() result


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@977 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz d0327cbbc7 setup.php:
- make check for $CONF['configured'] more strict (=== instead of ==)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@976 a1433add-5e2c-0410-b055-b7f2511e0802
13 years ago
Christian Boltz 6225e555f4 model/AliasHandler.php:
- fix comment for delete() - it no longer has a param

model/*:
- add svn $Id line


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