Commit Graph

718 Commits (a46d0c52789552ce440de344915ac6d02a0f026c)
 

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 b73839b123 - remove unused motd text files. They are now within the templates directory.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@797 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 39172bcac7 - small change. Needed to get PFA running with Smarty 3.0
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@795 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 70d09e17ab upgrade.php:
- fix typo in _drop_index and _add_index ($tabe -> $table) that broke 
  changing table names via $CONF


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@794 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 3fd0649a16 CHANGELOG.TXT:
- changelog update
- fix release details for 2.3 (broken by smarty merge)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@793 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 20d2aab24f upgrade.php
- function upgrade_1_mysql(): change default charset of vacation table to
  latin1. Otherwise table creation breaks with MySQL 6.
  Fields that need to be utf-8 are changed to utf-8 later anyways.
  (Found by mechno on #postfixadmin)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@790 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
David Goodwin e041b9a7a7 list-domain.php: do not escape stuff twice
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@788 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 96cb5820a1 a) PHP != python; use brackets :) b) fix invalid SQL (at least for postgresql) - list-virtual is broken though in not displaying any mailboxes/aliases
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@787 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz c070a61ef2 functions.inc.php
- remove obsolete unlink($tmpfile) that was re-introduced by smarty merge


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@785 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz a250b68988 upgrade.php:
- fix issues from smarty merge:
  - re-add {BIGINT} replacement for pgsql
  - convert DOS linebreaks to unix linebreaks


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@784 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 017b062acd extend the Smarty class so when assigning data to it, it is automatically escaped (unless specified otherwise with a 3rd parameter (false) in the assign function call). This will probably cause some breakage esp where translations have html embedded within them - however i would rather this were the case than the application be vulnerable to XSS
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@782 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 9b0a8deb34 login.php: fix up html escaping etc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@781 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
Christian Boltz 16036cfd4d list-virtual.php
- add in_array check to avoid that superadmins can enter invalid domains
- the check_owner check is probably obsolete after this change. I left it
  in (with a clear message) until I'm 100% sure that it's really unneeded.
- move sticky domain code below error checking - the session should only
  include valid domains ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@779 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 3922f6fece after an hour of debugging with Han on #postfixadmin...
functions.inc.php:
- added error message if the check_owner query returns more than one result.
  This can happen with old databases (pre-2.3) where the domain_admins table
  contains "ALL" _and_ a domain for a superadmin - which results in the
  superadmin not able to edit mailboxes etc. for this domain.
  (Error message not translatable - this is a corner case.)

list-virtual.php:
- add "invalid parameter" error message before redirecting to list-domain
  if the user doesn't have permissions for a domain


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@778 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz f1c9e278f5 DOCUMENTS/DOVECOT.txt
- add query for pgsql (thanks s0undt3ch)
- added 'active' check for MySQL query



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@777 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
Christian Boltz 091cd59d77 import_users_from_csv.py
- add known restrictions (MySQL only, hardcoded "domain/username/") to usage()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@774 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz f456d8f9c3 ru.lang
- updated by  Pavel Usischev (pusischev @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2900334&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@773 a1433add-5e2c-0410-b055-b7f2511e0802
15 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 ad5a4fff9f language updates:
- es.lang by virtualminds @SF
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2894512&group_id=191583
- fr.lang by fschmutz @SF
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2898500&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@771 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz cc38342087 config.inc.php
- document commandline parameters for $CONF[*_script] options 


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@770 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
David Goodwin 281dde9cbd adding script as provided by Simone Piccardi via the postfixadmin-devel mailing list
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@767 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 2dca007dbf - add some images
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@765 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 e701d6e756 - improved error message of setup.php
- Use $incpath in setup.php to make sure nobody is doing evil things

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@763 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 8360ca09d0 - fixed one more short open tag.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@762 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Norman Messtorff 7229502738 Small typo fixed...
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@761 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian 0b41887b36 - add <?php tags.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@760 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 cb029a5daf - add images for calendar JavaScript application
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@758 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 9a0e51c11b add missing driver option for dovecot-mysql config file
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@756 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
David Goodwin 7280a2bf80 POSTFIX_CONF.txt: typo fix
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@754 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 188aa2bd5c functions.inc.php:
- handle dovecot passwords without any tempfile (to prevent safe_mode issues)
  Changed based on a patch from Aleksandr @SF,
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2890471&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@752 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
Christian Boltz 7ea19f84ef de.lang:
- fix wrong translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@750 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 2c4cdca5fd edit-alias.php
- get domain name by splitting address parameter instead of relying
  on the domain GET/POST parameter. 
  This makes linking to edit-alias easier.
- simplify reading $_GET/$_POST['address']



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@749 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