Commit Graph

111 Commits (06d65a32b35e8f939cf80168464f23009fbae37b)

Author SHA1 Message Date
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