Commit Graph

1659 Commits (e56727fe09e5c74f1bbe06d5feeef7a07f3696bf)
 

Author SHA1 Message Date
Christian Boltz 5cf48d6cb5 (basically the same as in r200, this time for users/vacation.php)
users/vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

users_vacation.tpl:
- encode tSubject with htmlentities() in template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@209 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 3aa9032cd9 list-virtual.tpl
- made '[and x more...]' translatable

*.lang:
- added 'and_x_more'
- added $Id$ keyword
- enabled expansion of $Id$ and $Rev$


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@208 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin d4a840700c vacation.pl: updating spam check bit
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@207 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz b594661356 - do not clear password on editing admins when no new password is entered
Thanks for Benny Pedersen (xpunkt) to find out that this bug reappeared.
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1829564&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@206 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 87ed834c9c updated translations:
- ru.lang updated by Pavel Usischev (pusischev)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828828&group_id=191583
- da.lang updated by Jesper R. Meyer (jespermeyer)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828916&group_id=191583

Thanks!


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@205 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 8f6a9bbecb update debian stuff so i can sign the package
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@204 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 3293ea8082 vacation.pl: do not send a vacation response if the mail has been previously classes as spam - assumes /^x-spam-flag:\s+yes$/i matches in the message
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@203 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz b54e71f235 - rename placeholder {UTF_8} to the more obvious {UTF-8}
This also fixes my last commit ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@202 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f35d0bee7e - completed upgrade_81_mysql() (several changes in vacation table)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@201 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 32a1e93c9f edit-vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

edit-vacation.tpl:
- encode tSubject with htmlentities() in template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@200 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz a00d456084 functions.inc.php
- encode_header(): made charset parameter optional, defaults to utf-8
- db_delete(): escape_string() $where and $delete

create-mailbox.php:
- always encode mail header and insert Content-Type etc. headers
  (previous code never did this, $PALANG['charset'] is not set in any
  language. so this code part was never used)

sendmail.php:
- always encode mail header and insert Content-Type etc. headers
  (had the same bug as create-mailbox.php)
- merge GET and POST

These changes fix
http://sourceforge.net/tracker/index.php?func=detail&aid=1811214&group_id=191583&atid=937964



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@199 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz c47222ac14 - clear float (no, motd right of the menu doesn't look good ;-)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@198 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 85eda998b6 - also read config.local.php when in /users/
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@197 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f25876592c - remove DROP TABLE statements - they can do more harm than good
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@196 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f541634e39 - renamed -$PALANG['pViewlog_action_edit_alias_state'] to
$PALANG['pViewlog_action_edit_alias_active'] - fixes undefined
  messages in viewlog.php
- added some new strings to the language files
- pFetchmail_* strings were at the wrong location in several languages
- enforce at least one line of matching context in language-check.sh
  This might cause rejects (especially if there are empty lines next to
  the change), but avoids that strings are inserted at the wrong position



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@195 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 63fd034532 - removed forgotten debugging code
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@194 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin e2b0f09692 search.php: remove dead code, fix for pgsql
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@193 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin a0833809df list-virtual.tpl: only display vacation stuff if vacation support is enabled
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@192 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 87c97df788 list-virtual.php: fix logic for display of vacation stuff
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@191 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 69dce35307 list-virtual.php: remove unnecessary todo
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@190 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 0f357e7c97 list-virtual.php: fix unnecessary clause for psql query, that is not needed
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@189 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin ade09f577c debian: adding - initial support for creating .debs; run dpkg-buildpakcage -rfakeroot within the trunk dir
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@188 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 5bf5f470a3 edit-vacation.php:
- changed redirect targets to list-virtual.php


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@187 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 61713c260b OOps. Removed forgotten debugging code again.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@186 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 5acd24515f functions.php:
- new function db_update ($table, $where, $values, $timestamp = array())
  to update a database entry with the values given as array
- added optional $timestamp parameter to db_insert()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@184 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz ae74e7a70c - list all domains for superadmins (instead of none)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@183 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 096a5ffbe6 - upgrade_90(): replace spaces with underscore in log.action
(change was caused by translatable logging)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@182 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
David Goodwin ef7b6f0925 setup.php: try and make sure the "ALL" domain exists to start with when creating the super admin user; fix html so li elements are closed
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@180 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin f909eb53a2 functions.inc.php: change doc block formatting
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@179 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 7e76c24df3 SUPERADMIN.TXT: updating docs
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@178 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin a6e0e9e9cc SUPERADMIN.TXT: updating docs
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@177 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 1b0ab9c874 DATABASE_PGSQL.TXT: schema typo fix; thanks to http://sourceforge.net/forum/forum.php?thread_id=1843123&forum_id=676076 and jpalmer on irc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@176 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 29e2d63422 - fixed some SQL syntax errors
- debug output now includes the query


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@175 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 16178cab58 - next try to expand $Revision$ in upgrade.php :-/
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@174 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 7b14ea1b73 fetchmail.php:
- cancel button did not work on $new


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@173 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz ce2689dd4f upgrade.php:
- create config table at startup (not nice, but works)
- changed _do_upgrade to use "for ($i = $current_version +1; 
  $i <= $target_version; $i++)" loop and function_exists()
- added support for upgrade_<number>>_mysql() and 
  upgrade_<number>_pgsql() functions for database-specific changes
- added function db_query_parsed(), idea taken from serendipity's 
  include/db/*.php serendipity_db_schema_import()
- added function _drop_index() - MySQL and PgSQL syntax differs too 
  much on this
- added pre-2.1 database updates (DOCUMENTS/TABLE_BACKUP_MX.TXT and
  DOCUMENTS/TABLE_CHANGES.TXT)
- added all database changes between 2.1 and current SVN.
  Everything since the move to sourceforge has the revision number in 
  the function name.

(still several TODOs left)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@172 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz e6e0e37a5c - added function db_insert()
- added optional $ignore_errors parameter to db_query()
- db_query() now returns 'error' as additional key in the result array
- renamed $setup to $ignore_errors in db_connect()
- added fallback to $table_key to table_by_key()


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@171 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin aa919e242d upgrade.php: test edition of a db upgrade script, based loosely around what Drupal uses
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@170 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 81195c56cc DATABASE_MYSQL.TXT: use bigints for quota - as suggested by xpoint on irc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@169 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 eb7d2d5a9b stylesheet.css
- added styles for CSS-based dropdown menu, based on "Son of Suckerfish"
  http://www.htmldog.com/articles/suckerfish/dropdowns/

menu.tpl
- merged admin_menu.tpl into menu.tpl
- changed menu layout: the "create ..." items are now submenu items

Notes:
- superadmins still see the old menu
- dropdowns don't work in IE yet (requires some JS)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@167 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 39ed97329f - merged admin/delete.php into /delete.php
- the WHERE fieldname is now hardcoded instead of being a $_GET parameter
  This fixes a possible security hole in admin/delete.php (only vulnerabe
  when logged in as global-admin)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@166 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin 30e72a6931 ADDITIONS/fetchmail.pl: typo fix for field name - use poll_time, not pool_time - thanks to xpoint on irc who reported this
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@165 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 8fa1a46a2f - replaced tabs with spaces in fetchmail.php and fetchmail.tpl
- whitespace changes only, no other difference


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@164 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 2f25e8bd42 The work of two nights causes a long changelog. Here we go:
fetchmail.php:
- IMPORTANT: fixed typo in database column name. If you have created the
  fetchmail database already, you have to rename the "pool_time" column
  to "poll_time"
- fixed adding of new entries
- don't display status fields (last poll date and result) in edit mode
- validate and quote the GET and POST variables
- show POSTed data again if invalid values were entered (data to display
  in the edit form is passed to fetchmail.tpl in $formvars)
- check results of database operations and display error/success
  messages
- check owner of target mailbox on all operations
- changed password handling: empty means no change (instead of sending
  "******" around)
- reworked and moved around large code portions
- added some TODO notes

fetchmail.tpl:
- use data from $formvars in edit mode instead of parsing the full array
- moved "new entry" below the table
- replaced delete button with delete links
- Note: the boolean fields need testing with PgSQL. Especially test if
  they are displayed as active correctly in list and edit mode!

*.lang:
- added several fetchmail-related strings, more to follow
- added $PALANG['please_keep_this_as_last_entry'] which always has to be
  the last entry in the language files. This solves the problem that
  language-check.sh mixes up the string order when adding strings at the
  end of the language files.
- added vim:ft=php



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@163 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
David Goodwin c3ae9dd9db functions.inc.php: code cleanups / documentation fixes etc
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@162 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz dc73789c56 - reverted most changes from r151 in fetchmail.tpl, especially:
- removed $display_fields array again after understanding how $fm_struct
  in fetchmail.php works
- added workaround for undefined index warnings in $fm_struct (line 47)
  (for whatever reasons, there seem to be both numeric and named keys)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@161 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 1e5b4c31c0 fetchmail.php
- changed editable and display flags of some columns in $fm_struct
  (this array is pretty useful once you understand how to use it ;-)
- completed support for $CONF['fetchmail_extra_options'] = 'NO'
- added several escape_string() calls
- fixed several $_GET/$_POST undefined index warnings
- fixed some MySQL vs. PgSQL issues
- some small fixes

fetchmail.tpl
- changed layout to separate list and edit view
- fixed an undefined index warning
- replaced ID column with edit link


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