SF.net SVN: postfixadmin:[414] branches
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[414] branches
|
From: <Gin...@us...> - 2008-07-23 11:41:37
|
Revision: 414
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=414&view=rev
Author: GingerDog
Date: 2008-07-23 11:41:45 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
yeah, clearly I should have created the branch before merging stuff into 2.2.1...
Added Paths:
-----------
branches/postfixadmin-2.2.1.1/
branches/postfixadmin-2.2.1.1/CHANGELOG.TXT
branches/postfixadmin-2.2.1.1/create-mailbox.php
branches/postfixadmin-2.2.1.1/debian/changelog
branches/postfixadmin-2.2.1.1/functions.inc.php
Removed Paths:
-------------
branches/postfixadmin-2.2.1.1/CHANGELOG.TXT
branches/postfixadmin-2.2.1.1/create-mailbox.php
branches/postfixadmin-2.2.1.1/debian/changelog
branches/postfixadmin-2.2.1.1/functions.inc.php
Deleted: branches/postfixadmin-2.2.1.1/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.2.1/CHANGELOG.TXT 2008-07-22 23:35:20 UTC (rev 411)
+++ branches/postfixadmin-2.2.1.1/CHANGELOG.TXT 2008-07-23 11:41:45 UTC (rev 414)
@@ -1,292 +0,0 @@
-#
-# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
-#
-#
-Version 2.2.0
---------------------
-
- <Far more changes than those listed here; thanks to all the community who have provided
- patches and time to help us get here!>
- - Unicode support for vacation messages
- - More language translations
- - Merged the two vacation scripts (PostgreSQL version won :) )
- - Added setup.php/upgrade.php scripts to handle upgrades
- - See also new 'config' database table
- - Added support for 'fetchmail' so mail from a remote server can be retrieved.
- - Many, many bug fixes
-
- - Added: Feature to show status of aliases/mailboxes (GregC)
- - Fixed: Many admin/*.php files merged with /*.php
- - Fixed: 'alias' instead of '$table_alias' being used by some .php files (GregC)
- - Fixed: Overview no longer lists alias entries for mailboxes (GregC)
- - Changed: Added exit buttons to several edit options. (GregC)
- - Fixed: user options are a little more idiot-proof, templates are consistent (GregC)
- - Changed: Users can view and edit their vacation config (GregC)
- - Added: Slovakian language posted on SourceForge by eszabo
- - Changed: searches include mailbox.name matches (GregC)
- - Fixed: function check_email will ignore vacation_domain if vacation==YES (GregC)
- - Changed: applied patches from Christian Boltz posted at
- http://www.cboltz.de/tmp/postfixadmin-3.patch, referenced at
- https://sourceforge.net/tracker/index.php?func=detail&aid=1696647&group_id=191583&atid=937966 (GregC)
- - Added: main.php to admin dirctory (GregC)
- - Added: Item "Main" on admin menu (GregC)
- - Changed: Edit-vacation now edits for admins/superadmins (GregC)
- - Added: Do not store local copy when forward mail. (Mihau) [24]
- - Added: Virtual Vacation for PostgreSQL. (Tarvin)
- - Added: Virtual Vacation 3.2 (Thanx David)
- - Added: SUBJECT tag for Virtual Vacation.
- - Added: Dovecot setup document for Postfix Admin. (Thanx Massimo)
- - Added: SquirrelMail plugin to change_password.
- - Changed: Starting to merge /admin in root. (Mihau)
- - Changed: Moved some TXT files to DOCUMENTS.
- - Changed: Updated tw.lang. (Thanx Bruce)
- - Fixed: Usage of mysql_real_escape_string(). (Mihau)
- - Fixed: Calculating of quotas. (Mihau)
- - Fixed: Password generation when creating a new account. (Mihau)
- - Fixed: PostgreSQL patches. (Tarvin)
- - Fixed: Adding of multiple aliases. (Mihau)
- - Fixed: CSS Menu width. (Mihau)
- - Fixed: Overview when upgrading from 2.0.4. (Mihau)
- - Fixed: smtp_mail() to wait for response from server.
- - Fixed: pacrypt() so system works properly. (Thanx Npaufler)
- - Fixed: quoting an email address when sending mail in vacation.pl. (Thanx Marc)
- - Fixed: vacation.pl has a clean exit when it encounters an error. (Thanx Brian)
- - Fixed: descriptions for quota={-1|0} in admin section (Mihau)
-
-
-Version 2.1.0 -- 2005/01/07
----------------------------
- - Added: Traditional Chinese language. (Thanx Bruce)
- - Added: Traditional Bulgarian language. (Thanx Plamen)
- - Added: Macedonian language. (Thanx Damjan)
- - Added: Estonian language. (Thanx Peeter)
- - Added: Slovenian language. (Thanx Nejc)
- - Added: Check for update link in footer.
- - Added: Additional language strings. Check LANGUAGE.TXT
- - Added: Transport support. (read postfix transport for more information)
- - Added: Additional language string for transport support.
- - Added: MySQL 4.1 support.
- - Added: PostgreSQL support. (Big Thanx WhiteFox!)
- - Added: Setup Checker script. (Thanx Fenrir)
- - Added: Database prefix. (Thanx Decramy)
- - Added: Template tags. (Thanx Nelson)
- - Added: admin/domain/alias/mailbox in delete dialog box.
- - Added: $CONF['postfix_admin_url'] variable.
- - Added: $CONF['postfix_admin_path'] variable.
- - Added: $CONF['vacation_domain'] variable.
- - Added: $CONF['welcome_text'] variable.
- - Added: $CONF['special_alias_control'] variable. (Thanx Mihau)
- - Added: Virtual Vacation 3.1 (Thanx David)
- - Added: ADDITIONS directory with third party scripts and plugins.
- - Added: Search function for aliases and mailboxes.
- - Changed: Postfix Admin has now it's own license.
- - Changed: New menu and color scheme. (Thanx Nelson)
- - Changed: Disable number and unlimited number for aliases/mailboxes/quota.
- - Changed: Virtual Vacation to have it's own transport. (Big Thanx Npaufler!)
- - Changed: Removed the welcome text for a new mailbox from the language files.
- - Changed: backup.php to be a more secure. (Thanx John)
- - Fixed: Cleaned up stylesheet.
- - Fixed: Default quota multiplier.
- - Fixed: All POST/GET strings are escaped.
- - Fixed: Corrected smtp_mail() to wait for result. (Thanx Patrice)
- - Fixed: Pagination with alias_control switched on.
- - Fixed: Swedish language. (Thanx Bjorne)
- - Fixed: Polish language. (Thanx Piotr)
- - Fixed: Minor Virtual Vacation bugs. (Thanx David)
- - Fixed: check_quota().
- - Fixed: Minor encode_header() issue. (Thanx Matthew)
- - Fixed: edit-alias.php when running with magic_quotes_gpc = off
-
-
-Version 2.0.5 -- 2004/08/21
----------------------------
- - Added: Chinese language. (Thanx Matthew)
- - Added: Catalan language. (Thanx Jaume)
- - Added: Czech language. (Thanx Jakub)
- - Added: Dynamic language detection.
- - Added: Header in header.tpl to set charset header from language file.
- - Added: More subroutines and alias checking for Vacation. (Thanx David)
- - Added: Domain pass-through with certain pages.
- - Added: Backup MX option for domain.
- - Added: Log contains IP address of admin.
- - Added: Pagination for alias/mailbox listing.
- - Added: 2 additional language strings to support Backup MX.
- - Added: Support for motd.txt (Domain Admins only).
- - Added: Support for motd-admin.txt (Site Admins only).
- - Added: Support for motd-users.txt (Users only).
- - Added: Optional hostname for vacation.
- - Added: generate_password() to generating random passwords for mailboxes.
- - Changed: dk -> da, se -> sv, no-nn -> nn
- - Changed: All email addresses are now converted to lowercase, strtolower().
- - Changed: Moved onMouseOver to the CSS stylesheet.
- - Changed: Moved font color to the CSS styleheet.
- - Changed: PHP mail() is replaced by an internal function, smtp_mail().
- - Changed: mysql_fetch_array() replaced with internal function db_array().
- - Changed: mysql_fetch_assoc() replaced with internal function db_assoc().
- - Changed: mysql_fetch_row() replaced with internal function db_row().
- - Changed: Quota multiplier is now a configuration option.
- - Fixed: Login didn't check for active flag.
- - Fixed: Minor html table errors.
- - Fixed: Row count by using COUNT(*).
- - Fixed: Locked down subdirectories.
- - Fixed: Create admin properly populates the domain_admins table.
- - Fixed: Cleaned up stylesheet.css.
- - Fixed: Delete mailbox properly removes vacation entries.
-
-
-Version 2.0.4 -- 2004/02/26
-----------------------------
- - Added: Euskara language. (Thanx Julen)
- - Added: Hungarian language. (Thanx Christian)
- - Added: Icelandic language. (Thanx Gestur)
- - Added: Italian language. (Thanx Stucchi)
- - Added: Norwegian - Nynorsk language. (Thanx Paul)
- - Added: Polish language. (Thanx Jarek)
- - Added: Portuguese - Brazil language. (Thanx Roberto)
- - Added: Rusian language. (Thanx Paul)
- - Added: Turkish language (Thanx Onuryalazi)
- - Added: Encode a string according to RFC 1522 for use in headers if it
- contains 8-bit characters. (Thanx Evgeniy)
- - Added: One click active change of mailbox/domain/admin. (Thanx Marcin)
- - Changed: Header in header.tpl to read charset header from language file.
- - Fixed: Some form values are now parsed through htmlspecialchars().
- (Thanx Marcin)
- - Fixed: admin/delete.php ignored $CONF['vacation'].
- - Fixed: More minor fixes to Virtual Vacation.
-
-
-Version 2.0.3 -- 2004/01/14
-----------------------------
- - Added: Site Admin email address.
- - Added: Danish language. (Thanx Lars)
- - Added: Dutch language. (Thanx Mourik)
- - Added: Faroese language. (Thanx Danial)
- - Added: Finnish language. (Thanx Palo)
- - Added: French language. (Thanx Kuthz)
- - Added: Swedish language. (Thanx Slite)
- - Added: Ignoring of MAILER-DAEMON type emails for Vacation.
- - Fixed: Minor issues regarding mail().
- - Fixed: Minor issues regarding crypt().
- - Fixed: Strip issue of email address for Vacation.
-
-
-Version 2.0.2 -- 2004/01/06
-----------------------------
- - Added: German language. (Thanx Tobias)
- - Added: Spanish language. (Thanx Alvaro)
- - Fixed: The body was not included using sendmail.php.
- - Fixed: Undefined variables.
- - Fixed: Minor HTML cleanup.
-
-
-Version 2.0.1 -- 2004/01/04
-----------------------------
- - Fixed: The language variable caused a problem on some systems.
-
-
-Version 2.0.0 -- 2004/01/03
-----------------------------
- - Added: The ability for one domain admin to maintain multiple domains.
- - Added: Domain to domain forwarding.
- - Added: Mailboxes can now be activated or deactivated.
- - Added: Configurable welcome message for new mailboxes.
- - Added: Optional sending of welcome message.
- - Added: Create alias "To" defaults to current domain.
- - Added: Logging of admin / user actions.
- - Added: Limit for aliases and/or mailboxes per domain.
- - Added: Disable aliases and/or mailboxes per domain.
- - Added: Max quota per mailbox per domain.
- - Added: Multi-Language support.
- - Added: Statistics overview for all domains.
- - Added: User .forwarding for mailbox users.
- - Added: Logo for Postfix Admin (Thanx Andrew).
- - Added: Extra MySQL debugging capabilities.
- - Added: Clear text password support.
- - Added: PHP crypt() support.
- - Changed: Separated logic and SQL from content.
- - Changed: config.inc.php doesn't point to example.com anymore.
- - Changed: Virtual Vacation no longer requires procmail.
- - Changed: Complete re-write.
-
-
-Version 1.5.4 -- 2003/06/16
-----------------------------
- - Added: Option for "Back to".
- - Added: Option for Vacation module.
- - Added: Table declaration for the use of Quota in the INSTALL.TXT.
- This requires an additional local delivery agent.
- Quotas are not supported by Postfix!
- - Changed: The word "View" to "List".
-
-
-Version 1.5.3 -- 2003/06/06
-----------------------------
- - Fixed: Even more minor bugs in regards to declaration of variables.
- (Thanx Aquilante and Kyle_m)
-
-
-Version 1.5.2 -- 2003/06/05
-----------------------------
- - Fixed: Minor bugs in regards to declaration of variables.
-
-
-Version 1.5.1 -- 2003/06/04
-----------------------------
- - Added: Optional mailbox per domain directory structure. (Thanx Jim)
- - Added: Option to completely control the stored aliases. (Thanx Alex)
- - Changed: config.inc.php is renamed to config.inc.php.sample. (Thanx Alex)
- - Fixed: $PHP_SELF in config.inc.php and my_lib.php. (Thanx Jim)
-
-
-Version 1.5.0 -- 2003/05/28
-----------------------------
- - Added: Support for "Back to Main Site"
- - Added: config.inc.php as the main configuration file.
- - Added: Drop down box for domain selection when adding a new admin.
- - Added: Resend of test email to newly created mailbox.
- - Added: Mailbox and Aliases count for domainview.
- - Added: Change description of domain without deleting the complete
- domain.
- - Added: Change name of mailbox user without deleting the mailbox.
- - Added: Expire headers for unnecessary reloads. (Thanx Alex)
- - Fixed: Code clean up.
- - Fixed: Minor bugs and cosmetic fixes.
- - Fixed: Modified check_string() to check numbers and returns false if not
- matched. (Thanx btaber)
- - Fixed: Correct session handling in login.php (Thanx Yen-Wei Liu)
- - Fixed: Correct deletion of RFC822 email addresses. (Thanx Yen-Wei Liu)
- - Removed: Completely removed the site_lib.php.
- - Removed: my_lib.php from the admin directory.
- - Removed: Symlink to index.php.
-
-
-Version 1.4.0 -- 2003/04/07
-----------------------------
- - Added: When deleting a domain, all aliases and mailboxes for that domain
- are also deleted from the database.
- - Added: Add standard aliases for every domain that is created.
- These aliases can point to the main "local" administrator.
- The aliases are configured in the config.php in the admin directory.
- - Changed: The layout of my_lib.php and site_lib.php have been changed.
- - Changed: Modifying an alias is now done with TEXTAREA for more
- flexibility.
- - Fixed: Minor bugs and cosmetic fixes.
-
-
-Version 1.3.8a -- 2003/03/31
-----------------------------
- - Fixed: After deletion of a domain it would not return to the correct page.
-
-
-Version 1.3.8 -- 2003/03/25
-----------------------------
- - Added: Admin password change. No longer needed to delete and re-enter
- the admin user for a specific domain.
-
-
-Version 1.3.7 -- 2002/12/24
-----------------------------
- - Initial public release of Postfix Admin.
Copied: branches/postfixadmin-2.2.1.1/CHANGELOG.TXT (from rev 412, branches/postfixadmin-2.2.1/CHANGELOG.TXT)
===================================================================
--- branches/postfixadmin-2.2.1.1/CHANGELOG.TXT (rev 0)
+++ branches/postfixadmin-2.2.1.1/CHANGELOG.TXT 2008-07-23 11:41:45 UTC (rev 414)
@@ -0,0 +1,319 @@
+# Postfix Admin
+#
+# LICENSE
+# This source file is subject to the GPL license that is bundled with
+# this package in the file LICENSE.TXT.
+#
+# Further details on the project are available at :
+# http://www.postfixadmin.com or http://postfixadmin.sf.net
+#
+# Last update:
+# $Id$
+
+
+Only in SVN trunk
+--------------------
+
+ - added support for domain aliases (from lenix)
+ - updated postfix example configuration for domain aliases and to use the new mysql map format
+
+
+Version 2.2.1
+--------------------
+
+ - added quota parameter to mailbox_postcreation hook
+ - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script'])
+ - fixed subfolder creation order and timing
+ - allow smtp server to be specified in vacation.pl
+ - fixed MySQL charset issues
+ - several small bugfixes
+ - Norwegian (bokmal) translation added
+ - several translation updates
+ - SVN revision 408
+
+
+Version 2.2.0
+--------------------
+
+ <Far more changes than those listed here; thanks to all the community who have provided
+ patches and time to help us get here!>
+ - Unicode support for vacation messages
+ - More language translations
+ - Merged the two vacation scripts (PostgreSQL version won :) )
+ - Added setup.php/upgrade.php scripts to handle upgrades
+ - See also new 'config' database table
+ - Added support for 'fetchmail' so mail from a remote server can be retrieved.
+ - Many, many bug fixes
+
+ - Added: Feature to show status of aliases/mailboxes (GregC)
+ - Fixed: Many admin/*.php files merged with /*.php
+ - Fixed: 'alias' instead of '$table_alias' being used by some .php files (GregC)
+ - Fixed: Overview no longer lists alias entries for mailboxes (GregC)
+ - Changed: Added exit buttons to several edit options. (GregC)
+ - Fixed: user options are a little more idiot-proof, templates are consistent (GregC)
+ - Changed: Users can view and edit their vacation config (GregC)
+ - Added: Slovakian language posted on SourceForge by eszabo
+ - Changed: searches include mailbox.name matches (GregC)
+ - Fixed: function check_email will ignore vacation_domain if vacation==YES (GregC)
+ - Changed: applied patches from Christian Boltz posted at
+ http://www.cboltz.de/tmp/postfixadmin-3.patch, referenced at
+ https://sourceforge.net/tracker/index.php?func=detail&aid=1696647&group_id=191583&atid=937966 (GregC)
+ - Added: main.php to admin dirctory (GregC)
+ - Added: Item "Main" on admin menu (GregC)
+ - Changed: Edit-vacation now edits for admins/superadmins (GregC)
+ - Added: Do not store local copy when forward mail. (Mihau) [24]
+ - Added: Virtual Vacation for PostgreSQL. (Tarvin)
+ - Added: Virtual Vacation 3.2 (Thanx David)
+ - Added: SUBJECT tag for Virtual Vacation.
+ - Added: Dovecot setup document for Postfix Admin. (Thanx Massimo)
+ - Added: SquirrelMail plugin to change_password.
+ - Changed: Starting to merge /admin in root. (Mihau)
+ - Changed: Moved some TXT files to DOCUMENTS.
+ - Changed: Updated tw.lang. (Thanx Bruce)
+ - Fixed: Usage of mysql_real_escape_string(). (Mihau)
+ - Fixed: Calculating of quotas. (Mihau)
+ - Fixed: Password generation when creating a new account. (Mihau)
+ - Fixed: PostgreSQL patches. (Tarvin)
+ - Fixed: Adding of multiple aliases. (Mihau)
+ - Fixed: CSS Menu width. (Mihau)
+ - Fixed: Overview when upgrading from 2.0.4. (Mihau)
+ - Fixed: smtp_mail() to wait for response from server.
+ - Fixed: pacrypt() so system works properly. (Thanx Npaufler)
+ - Fixed: quoting an email address when sending mail in vacation.pl. (Thanx Marc)
+ - Fixed: vacation.pl has a clean exit when it encounters an error. (Thanx Brian)
+ - Fixed: descriptions for quota={-1|0} in admin section (Mihau)
+
+
+Version 2.1.0 -- 2005/01/07
+---------------------------
+ - Added: Traditional Chinese language. (Thanx Bruce)
+ - Added: Traditional Bulgarian language. (Thanx Plamen)
+ - Added: Macedonian language. (Thanx Damjan)
+ - Added: Estonian language. (Thanx Peeter)
+ - Added: Slovenian language. (Thanx Nejc)
+ - Added: Check for update link in footer.
+ - Added: Additional language strings. Check LANGUAGE.TXT
+ - Added: Transport support. (read postfix transport for more information)
+ - Added: Additional language string for transport support.
+ - Added: MySQL 4.1 support.
+ - Added: PostgreSQL support. (Big Thanx WhiteFox!)
+ - Added: Setup Checker script. (Thanx Fenrir)
+ - Added: Database prefix. (Thanx Decramy)
+ - Added: Template tags. (Thanx Nelson)
+ - Added: admin/domain/alias/mailbox in delete dialog box.
+ - Added: $CONF['postfix_admin_url'] variable.
+ - Added: $CONF['postfix_admin_path'] variable.
+ - Added: $CONF['vacation_domain'] variable.
+ - Added: $CONF['welcome_text'] variable.
+ - Added: $CONF['special_alias_control'] variable. (Thanx Mihau)
+ - Added: Virtual Vacation 3.1 (Thanx David)
+ - Added: ADDITIONS directory with third party scripts and plugins.
+ - Added: Search function for aliases and mailboxes.
+ - Changed: Postfix Admin has now it's own license.
+ - Changed: New menu and color scheme. (Thanx Nelson)
+ - Changed: Disable number and unlimited number for aliases/mailboxes/quota.
+ - Changed: Virtual Vacation to have it's own transport. (Big Thanx Npaufler!)
+ - Changed: Removed the welcome text for a new mailbox from the language files.
+ - Changed: backup.php to be a more secure. (Thanx John)
+ - Fixed: Cleaned up stylesheet.
+ - Fixed: Default quota multiplier.
+ - Fixed: All POST/GET strings are escaped.
+ - Fixed: Corrected smtp_mail() to wait for result. (Thanx Patrice)
+ - Fixed: Pagination with alias_control switched on.
+ - Fixed: Swedish language. (Thanx Bjorne)
+ - Fixed: Polish language. (Thanx Piotr)
+ - Fixed: Minor Virtual Vacation bugs. (Thanx David)
+ - Fixed: check_quota().
+ - Fixed: Minor encode_header() issue. (Thanx Matthew)
+ - Fixed: edit-alias.php when running with magic_quotes_gpc = off
+
+
+Version 2.0.5 -- 2004/08/21
+---------------------------
+ - Added: Chinese language. (Thanx Matthew)
+ - Added: Catalan language. (Thanx Jaume)
+ - Added: Czech language. (Thanx Jakub)
+ - Added: Dynamic language detection.
+ - Added: Header in header.tpl to set charset header from language file.
+ - Added: More subroutines and alias checking for Vacation. (Thanx David)
+ - Added: Domain pass-through with certain pages.
+ - Added: Backup MX option for domain.
+ - Added: Log contains IP address of admin.
+ - Added: Pagination for alias/mailbox listing.
+ - Added: 2 additional language strings to support Backup MX.
+ - Added: Support for motd.txt (Domain Admins only).
+ - Added: Support for motd-admin.txt (Site Admins only).
+ - Added: Support for motd-users.txt (Users only).
+ - Added: Optional hostname for vacation.
+ - Added: generate_password() to generating random passwords for mailboxes.
+ - Changed: dk -> da, se -> sv, no-nn -> nn
+ - Changed: All email addresses are now converted to lowercase, strtolower().
+ - Changed: Moved onMouseOver to the CSS stylesheet.
+ - Changed: Moved font color to the CSS styleheet.
+ - Changed: PHP mail() is replaced by an internal function, smtp_mail().
+ - Changed: mysql_fetch_array() replaced with internal function db_array().
+ - Changed: mysql_fetch_assoc() replaced with internal function db_assoc().
+ - Changed: mysql_fetch_row() replaced with internal function db_row().
+ - Changed: Quota multiplier is now a configuration option.
+ - Fixed: Login didn't check for active flag.
+ - Fixed: Minor html table errors.
+ - Fixed: Row count by using COUNT(*).
+ - Fixed: Locked down subdirectories.
+ - Fixed: Create admin properly populates the domain_admins table.
+ - Fixed: Cleaned up stylesheet.css.
+ - Fixed: Delete mailbox properly removes vacation entries.
+
+
+Version 2.0.4 -- 2004/02/26
+----------------------------
+ - Added: Euskara language. (Thanx Julen)
+ - Added: Hungarian language. (Thanx Christian)
+ - Added: Icelandic language. (Thanx Gestur)
+ - Added: Italian language. (Thanx Stucchi)
+ - Added: Norwegian - Nynorsk language. (Thanx Paul)
+ - Added: Polish language. (Thanx Jarek)
+ - Added: Portuguese - Brazil language. (Thanx Roberto)
+ - Added: Rusian language. (Thanx Paul)
+ - Added: Turkish language (Thanx Onuryalazi)
+ - Added: Encode a string according to RFC 1522 for use in headers if it
+ contains 8-bit characters. (Thanx Evgeniy)
+ - Added: One click active change of mailbox/domain/admin. (Thanx Marcin)
+ - Changed: Header in header.tpl to read charset header from language file.
+ - Fixed: Some form values are now parsed through htmlspecialchars().
+ (Thanx Marcin)
+ - Fixed: admin/delete.php ignored $CONF['vacation'].
+ - Fixed: More minor fixes to Virtual Vacation.
+
+
+Version 2.0.3 -- 2004/01/14
+----------------------------
+ - Added: Site Admin email address.
+ - Added: Danish language. (Thanx Lars)
+ - Added: Dutch language. (Thanx Mourik)
+ - Added: Faroese language. (Thanx Danial)
+ - Added: Finnish language. (Thanx Palo)
+ - Added: French language. (Thanx Kuthz)
+ - Added: Swedish language. (Thanx Slite)
+ - Added: Ignoring of MAILER-DAEMON type emails for Vacation.
+ - Fixed: Minor issues regarding mail().
+ - Fixed: Minor issues regarding crypt().
+ - Fixed: Strip issue of email address for Vacation.
+
+
+Version 2.0.2 -- 2004/01/06
+----------------------------
+ - Added: German language. (Thanx Tobias)
+ - Added: Spanish language. (Thanx Alvaro)
+ - Fixed: The body was not included using sendmail.php.
+ - Fixed: Undefined variables.
+ - Fixed: Minor HTML cleanup.
+
+
+Version 2.0.1 -- 2004/01/04
+----------------------------
+ - Fixed: The language variable caused a problem on some systems.
+
+
+Version 2.0.0 -- 2004/01/03
+----------------------------
+ - Added: The ability for one domain admin to maintain multiple domains.
+ - Added: Domain to domain forwarding.
+ - Added: Mailboxes can now be activated or deactivated.
+ - Added: Configurable welcome message for new mailboxes.
+ - Added: Optional sending of welcome message.
+ - Added: Create alias "To" defaults to current domain.
+ - Added: Logging of admin / user actions.
+ - Added: Limit for aliases and/or mailboxes per domain.
+ - Added: Disable aliases and/or mailboxes per domain.
+ - Added: Max quota per mailbox per domain.
+ - Added: Multi-Language support.
+ - Added: Statistics overview for all domains.
+ - Added: User .forwarding for mailbox users.
+ - Added: Logo for Postfix Admin (Thanx Andrew).
+ - Added: Extra MySQL debugging capabilities.
+ - Added: Clear text password support.
+ - Added: PHP crypt() support.
+ - Changed: Separated logic and SQL from content.
+ - Changed: config.inc.php doesn't point to example.com anymore.
+ - Changed: Virtual Vacation no longer requires procmail.
+ - Changed: Complete re-write.
+
+
+Version 1.5.4 -- 2003/06/16
+----------------------------
+ - Added: Option for "Back to".
+ - Added: Option for Vacation module.
+ - Added: Table declaration for the use of Quota in the INSTALL.TXT.
+ This requires an additional local delivery agent.
+ Quotas are not supported by Postfix!
+ - Changed: The word "View" to "List".
+
+
+Version 1.5.3 -- 2003/06/06
+----------------------------
+ - Fixed: Even more minor bugs in regards to declaration of variables.
+ (Thanx Aquilante and Kyle_m)
+
+
+Version 1.5.2 -- 2003/06/05
+----------------------------
+ - Fixed: Minor bugs in regards to declaration of variables.
+
+
+Version 1.5.1 -- 2003/06/04
+----------------------------
+ - Added: Optional mailbox per domain directory structure. (Thanx Jim)
+ - Added: Option to completely control the stored aliases. (Thanx Alex)
+ - Changed: config.inc.php is renamed to config.inc.php.sample. (Thanx Alex)
+ - Fixed: $PHP_SELF in config.inc.php and my_lib.php. (Thanx Jim)
+
+
+Version 1.5.0 -- 2003/05/28
+----------------------------
+ - Added: Support for "Back to Main Site"
+ - Added: config.inc.php as the main configuration file.
+ - Added: Drop down box for domain selection when adding a new admin.
+ - Added: Resend of test email to newly created mailbox.
+ - Added: Mailbox and Aliases count for domainview.
+ - Added: Change description of domain without deleting the complete
+ domain.
+ - Added: Change name of mailbox user without deleting the mailbox.
+ - Added: Expire headers for unnecessary reloads. (Thanx Alex)
+ - Fixed: Code clean up.
+ - Fixed: Minor bugs and cosmetic fixes.
+ - Fixed: Modified check_string() to check numbers and returns false if not
+ matched. (Thanx btaber)
+ - Fixed: Correct session handling in login.php (Thanx Yen-Wei Liu)
+ - Fixed: Correct deletion of RFC822 email addresses. (Thanx Yen-Wei Liu)
+ - Removed: Completely removed the site_lib.php.
+ - Removed: my_lib.php from the admin directory.
+ - Removed: Symlink to index.php.
+
+
+Version 1.4.0 -- 2003/04/07
+----------------------------
+ - Added: When deleting a domain, all aliases and mailboxes for that domain
+ are also deleted from the database.
+ - Added: Add standard aliases for every domain that is created.
+ These aliases can point to the main "local" administrator.
+ The aliases are configured in the config.php in the admin directory.
+ - Changed: The layout of my_lib.php and site_lib.php have been changed.
+ - Changed: Modifying an alias is now done with TEXTAREA for more
+ flexibility.
+ - Fixed: Minor bugs and cosmetic fixes.
+
+
+Version 1.3.8a -- 2003/03/31
+----------------------------
+ - Fixed: After deletion of a domain it would not return to the correct page.
+
+
+Version 1.3.8 -- 2003/03/25
+----------------------------
+ - Added: Admin password change. No longer needed to delete and re-enter
+ the admin user for a specific domain.
+
+
+Version 1.3.7 -- 2002/12/24
+----------------------------
+ - Initial public release of Postfix Admin.
Deleted: branches/postfixadmin-2.2.1.1/create-mailbox.php
===================================================================
--- branches/postfixadmin-2.2.1/create-mailbox.php 2008-07-22 23:35:20 UTC (rev 411)
+++ branches/postfixadmin-2.2.1.1/create-mailbox.php 2008-07-23 11:41:45 UTC (rev 414)
@@ -1,340 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: create-mailbox.php
- * Responsible for allowing for the creation of mail boxes
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * Template Variables:
- *
- * tMessage
- * tUsername
- * tName
- * tQuota
- * tDomain
- *
- * Form POST \ GET Variables:
- *
- * fUsername
- * fPassword
- * fPassword2
- * fName
- * fQuota
- * fDomain
- * fActive
- * fMail
- */
-
-require_once('common.php');
-
-authentication_require_role('admin');
-$SESSID_USERNAME = authentication_get_username();
-if(authentication_has_role('global-admin')) {
- $list_domains = list_domains ();
-}
-else {
- $list_domains = list_domains_for_admin($SESSID_USERNAME);
-}
-
-
-$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
-$pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text'];
-$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- $fDomain = $list_domains[0];
- if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
-
- if(!in_array($fDomain, $list_domains)) {
- die("Invalid domain name selected, or you tried to select a domain you are not an admin for");
- }
- $tDomain = $fDomain;
- $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
- if ($result['rows'] == 1)
- {
- $row = db_array ($result['result']);
- $tQuota = $row['maxquota'];
- }
-}
-
-if ($_SERVER['REQUEST_METHOD'] == "POST")
-{
-
- if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string ($_POST['fUsername']) . "@" . escape_string ($_POST['fDomain']);
- $fUsername = strtolower ($fUsername);
- if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
- if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
- isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = "";
- if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
- isset ($_POST['fQuota']) ? $fQuota = intval($_POST['fQuota']) : $fQuota = 0;
- isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1";
- if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']);
-
-
- if ( (!check_owner ($SESSID_USERNAME, $fDomain)) && (!authentication_has_role('global-admin')) )
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
- }
-
- if (!check_mailbox ($fDomain))
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3'];
- }
-
- if (empty ($fUsername) or !check_email ($fUsername))
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
- }
-
- if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
- {
- if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES")
- {
- $fPassword = generate_password ();
- }
- else
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error'];
- }
- }
-
- if ($CONF['quota'] == "YES")
- {
- if (!check_quota ($fQuota, $fDomain))
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error'];
- }
- }
-
- $result = db_query ("SELECT * FROM $table_alias WHERE address='$fUsername'");
- if ($result['rows'] == 1)
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- $tName = $fName;
- $tQuota = $fQuota;
- $tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2'];
- }
-
- if ($error != 1)
- {
- $password = pacrypt ($fPassword);
-
- if ($CONF['domain_path'] == "YES")
- {
- if ($CONF['domain_in_mailbox'] == "YES")
- {
- $maildir = $fDomain . "/" . $fUsername . "/";
- }
- else
- {
- $maildir = $fDomain . "/" . escape_string (strtolower($_POST['fUsername'])) . "/";
- }
- }
- else
- {
- $maildir = $fUsername . "/";
- }
-
- if (!empty ($fQuota))
- {
- $quota = multiply_quota ($fQuota);
- }
- else
- {
- $quota = 0;
- }
-
- if ($fActive == "on")
- {
- $sqlActive = db_get_boolean(True);
- }
- else
- {
- $sqlActive = db_get_boolean(False);
- }
- if ('pgsql'==$CONF['database_type'])
- {
- db_query('BEGIN');
- }
-
- $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fUsername','$fUsername','$fDomain',NOW(),NOW(),'$sqlActive')");
- if ($result['rows'] != 1)
- {
- $tDomain = $fDomain;
- $tMessage = $PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)</br />";
- }
-
-/*
-# TODO: The following code segment is from admin/create-mailbox.php. To be compared/merged with the code from /create-mailbox.php.
- Lines starting with /* were inserted to keep this section in commented mode.
-
-
- if ($result['rows'] != 1)
- {
- $tDomain = $fDomain;
- $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
- }
- else
- {
-
- $error=TRUE; // Being pessimistic
- if (mailbox_postcreation($fUsername,$fDomain,$maildir))
- {
- if ('pgsql'==$CONF['database_type'])
- {
- $result=db_query("COMMIT");
-
-/* should really not be possible: */
-/*
- if (!$result) die('COMMIT-query failed.');
- }
- $error=FALSE;
- } else {
- $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
- if ('pgsql'==$CONF['database_type'])
- {
- $result=db_query("ROLLBACK");
-
-/* should really not be possible: */
-/*
- if (!$result) die('ROLLBACK-query failed.');
- } else {
- /*
- When we cannot count on transactions, we need to move forward, despite
- the problems.
- */
-/*
- $error=FALSE;
- }
- }
-
-
- if (!$error)
- {
- db_log ($CONF['admin_email'], $fDomain, 'create_mailbox', $fUsername);
-
- */
-
-/*
-TODO: this is the start of /create-mailbox code segment that was originally used in /create-mailbox.php instead
- of the above from admin/create-mailbox.php.
- To be compared / merged.
- */
-
- $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
- if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
- {
- $tDomain = $fDomain;
- $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
- db_query('ROLLBACK');
- }
- else
- {
- db_query('COMMIT');
- db_log ($SESSID_USERNAME, $fDomain, 'create_mailbox', "$fUsername");
-/*
-TODO: this is the end of /create-mailbox.php code segment
- */
- $tDomain = $fDomain;
-
- if ($CONF['generate_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- if ($CONF['show_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- $tMessage .= ")</br />";
- }
- }
-
- $tQuota = $CONF['maxquota'];
-
- if ($fMail == "on")
- {
- $fTo = $fUsername;
- $fFrom = $SESSID_USERNAME;
- $fHeaders = "To: " . $fTo . "\n";
- $fHeaders .= "From: " . $fFrom . "\n";
-
- $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
- $fHeaders .= "MIME-Version: 1.0\n";
- $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
- $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-
- $fHeaders .= $CONF['welcome_text'];
-
- if (!smtp_mail ($fTo, $fFrom, $fHeaders))
- {
- $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
- }
- else
- {
- $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
- }
- }
-
- if (create_mailbox_subfolders($fUsername,$fPassword))
- {
- $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
- } else {
- $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
- }
-
- }
- }
-}
-
-include ("templates/header.php");
-include ("templates/menu.php");
-include ("templates/create-mailbox.php");
-include ("templates/footer.php");
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
Copied: branches/postfixadmin-2.2.1.1/create-mailbox.php (from rev 412, branches/postfixadmin-2.2.1/create-mailbox.php)
===================================================================
--- branches/postfixadmin-2.2.1.1/create-mailbox.php (rev 0)
+++ branches/postfixadmin-2.2.1.1/create-mailbox.php 2008-07-23 11:41:45 UTC (rev 414)
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at :
+ * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ *
+ * File: create-mailbox.php
+ * Responsible for allowing for the creation of mail boxes
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tUsername
+ * tName
+ * tQuota
+ * tDomain
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fPassword
+ * fPassword2
+ * fName
+ * fQuota
+ * fDomain
+ * fActive
+ * fMail
+ */
+
+require_once('common.php');
+
+authentication_require_role('admin');
+$SESSID_USERNAME = authentication_get_username();
+if(authentication_has_role('global-admin')) {
+ $list_domains = list_domains ();
+}
+else {
+ $list_domains = list_domains_for_admin($SESSID_USERNAME);
+}
+
+
+$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
+$pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text'];
+$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
+
+if ($_SERVER['REQUEST_METHOD'] == "GET")
+{
+ $fDomain = $list_domains[0];
+ if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+
+ if(!in_array($fDomain, $list_domains)) {
+ die("Invalid domain name selected, or you tried to select a domain you are not an admin for");
+ }
+ $tDomain = $fDomain;
+ $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
+ if ($result['rows'] == 1)
+ {
+ $row = db_array ($result['result']);
+ $tQuota = $row['maxquota'];
+ }
+}
+
+if ($_SERVER['REQUEST_METHOD'] == "POST")
+{
+
+ if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string ($_POST['fUsername']) . "@" . escape_string ($_POST['fDomain']);
+ $fUsername = strtolower ($fUsername);
+ if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
+ if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
+ isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = "";
+ if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
+ isset ($_POST['fQuota']) ? $fQuota = intval($_POST['fQuota']) : $fQuota = 0;
+ isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1";
+ if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']);
+
+
+ if ( (!check_owner ($SESSID_USERNAME, $fDomain)) && (!authentication_has_role('global-admin')) )
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
+ }
+
+ if (!check_mailbox ($fDomain))
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3'];
+ }
+
+ if (empty ($fUsername) or !check_email ($fUsername))
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
+ }
+
+ if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
+ {
+ if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES")
+ {
+ $fPassword = generate_password ();
+ }
+ else
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error'];
+ }
+ }
+
+ if ($CONF['quota'] == "YES")
+ {
+ if (!check_quota ($fQuota, $fDomain))
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error'];
+ }
+ }
+
+ $result = db_query ("SELECT * FROM $table_alias WHERE address='$fUsername'");
+ if ($result['rows'] == 1)
+ {
+ $error = 1;
+ $tUsername = escape_string ($_POST['fUsername']);
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tDomain = $fDomain;
+ $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2'];
+ }
+
+ if ($error != 1)
+ {
+ $password = pacrypt ($fPassword);
+
+ if ($CONF['domain_path'] == "YES")
+ {
+ if ($CONF['domain_in_mailbox'] == "YES")
+ {
+ $maildir = $fDomain . "/" . $fUsername . "/";
+ }
+ else
+ {
+ $maildir = $fDomain . "/" . escape_string (strtolower($_POST['fUsername'])) . "/";
+ }
+ }
+ else
+ {
+ $maildir = $fUsername . "/";
+ }
+
+ if (!empty ($fQuota))
+ {
+ $quota = multiply_quota ($fQuota);
+ }
+ else
+ {
+ $quota = 0;
+ }
+
+ if ($fActive == "on")
+ {
+ $sqlActive = db_get_boolean(True);
+ }
+ else
+ {
+ $sqlActive = db_get_boolean(False);
+ }
+ if ('pgsql'==$CONF['database_type'])
+ {
+ db_query('BEGIN');
+ }
+
+ $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fUsername','$fUsername','$fDomain',NOW(),NOW(),'$sqlActive')");
+ if ($result['rows'] != 1)
+ {
+ $tDomain = $fDomain;
+ $tMessage = $PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)</br />";
+ }
+
+/*
+# TODO: The following code segment is from admin/create-mailbox.php. To be compared/merged with the code from /create-mailbox.php.
+ Lines starting with /* were inserted to keep this section in commented mode.
+
+
+ if ($result['rows'] != 1)
+ {
+ $tDomain = $fDomain;
+ $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
+ }
+ else
+ {
+
+ $error=TRUE; // Being pessimistic
+ if (mailbox_postcreation($fUsername,$fDomain,$maildir))
+ {
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $result=db_query("COMMIT");
+
+/* should really not be possible: */
+/*
+ if (!$result) die('COMMIT-query failed.');
+ }
+ $error=FALSE;
+ } else {
+ $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $result=db_query("ROLLBACK");
+
+/* should really not be possible: */
+/*
+ if (!$result) die('ROLLBACK-query failed.');
+ } else {
+ /*
+ When we cannot count on transactions, we need to move forward, despite
+ the problems.
+ */
+/*
+ $error=FALSE;
+ }
+ }
+
+
+ if (!$error)
+ {
+ db_log ($CONF['admin_email'], $fDomain, 'create_mailbox', $fUsername);
+
+ */
+
+/*
+TODO: this is the start of /create-mailbox code segment that was originally used in /create-mailbox.php instead
+ of the above from admin/create-mailbox.php.
+ To be compared / merged.
+ */
+
+ $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
+ if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
+ {
+ $tDomain = $fDomain;
+ $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
+ db_query('ROLLBACK');
+ }
+ else
+ {
+ db_query('COMMIT');
+ db_log ($SESSID_USERNAME, $fDomain, 'create_mailbox', "$fUsername");
+/*
+TODO: this is the end of /create-mailbox.php code segment
+ */
+ $tDomain = $fDomain;
+
+ if ($CONF['generate_password'] == "YES")
+ {
+ $tMessage .= " / $fPassword)</br />";
+ }
+ else
+ {
+ if ($CONF['show_password'] == "YES")
+ {
+ $tMessage .= " / $fPassword)</br />";
+ }
+ else
+ {
+ $tMessage .= ")</br />";
+ }
+ }
+
+ $tQuota = $CONF['maxquota'];
+
+ if ($fMail == "on")
+ {
+ $fTo = $fUsername;
+ $fFrom = $SESSID_USERNAME;
+ $fHeaders = "To: " . $fTo . "\n";
+ $fHeaders .= "From: " . $fFrom . "\n";
+
+ $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
+ $fHeaders .= "MIME-Version: 1.0\n";
+ $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+ $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
+
+ $fHeaders .= $CONF['welcome_text'];
+
+ if (!smtp_mail ($fTo, $fFrom, $fHeaders))
+ {
+ $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+ }
+ else
+ {
+ $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+ }
+ }
+
+ if (create_mailbox_subfolders($fUsername,$fPassword))
+ {
+ $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
+ } else {
+ $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
+ }
+
+ }
+ }
+}
+
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-mailbox.php");
+include ("templates/footer.php");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
+?>
Deleted: branches/postfixadmin-2.2.1.1/debian/changelog
===================================================================
--- branches/postfixadmin-2.2.1/debian/changelog 2008-07-22 23:35:20 UTC (rev 411)
+++ branches/postfixadmin-2.2.1.1/debian/changelog 2008-07-23 11:41:45 UTC (rev 414)
@@ -1,57 +0,0 @@
-postfixadmin (2.2.1) unstable; urgency=low
-
- * Various bug fixes (MySQL charset issue(s))
- * Updated translations (pl, bg, ru, nb, tw etc)
- * Subversion revision 408
-
- -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000
-postfixadmin (2.2.0) unstable; urgency=low
-
- * 2.2.0 Released.
- * Fix fetchmail script to work with PostgreSQL
- * Fix fetchmail table creation in MySQL and PostgreSQL
- * Documentation fixups
- * Subversion revision 356
-
- -- David Goodwin <dav...@pa...> Thu, 29 Apr 2008 15:47:00 +0000
-
-postfixadmin (2.2.0-rc5) unstable; urgency=low
-
- * Fix MySQL installation issues (schema not being created!)
- * Fix MySQL vacation_notification timestamp issue
- * SVN revision: 340
-
- -- David Goodwin <dav...@pa...> Wed, 23 Apr 2008 16:27:00 +0000
-
-postfixadmin (2.2.0-1rc4) unstable; urgency=low
-
- * Removal of standalone database schema files (see upgrade.php)
- * Various bug fixes
- * Better/Move documentation on installation
- * setup.php/upgrade.php works for PostgreSQL and MySQL
- * MySQL Unicode problems fixed
- * I think this is effectively v2.2.0
- * SVN revision: 336
-
- -- David Goodwin <dav...@pa...> Sun, 20 Apr 2008 20:19:00 +0000
-
-postfixadmin (2.2.0-1rc3) unstable; urgency=low
-
- * Various bug fixes
-
- -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000
-
-postfixadmin (2.2.0-1rc2) unstable; urgency=low
-
- * Improved CSS
- * Improved upgrade procedure (should work for PGSQL) (see upgrade.php)
- * Various bug fixes
-
- -- David Goodwin <dav...@pa...> Sat, 29 Dec 2007 21:14:00 +0000
-
-postfixadmin (2.2.0-1rc1) unstable; urgency=low
-
- * Initial Release (via dpkg)
-
- -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000
-
Copied: branches/postfixadmin-2.2.1.1/debian/changelog (from rev 413, branches/postfixadmin-2.2.1/debian/changelog)
===================================================================
--- branches/postfixadmin-2.2.1.1/debian/changelog (rev 0)
+++ branches/postfixadmin-2.2.1.1/debian/changelog 2008-07-23 11:41:45 UTC (rev 414)
@@ -0,0 +1,75 @@
+postfixadmin (2.2.1.1) unstable; urgency=low
+
+ * Various bug fixes (MySQL charset issue(s))
+ * Updated translations (pl, bg, ru, nb, tw etc)
+ * added quota parameter to mailbox_postcreation hook
+ * new hook to update the quota after editing a mailbox
+ ($CONF['mailbox_postedi
+t_script'])
+ * fixed subfolder creation order and timing
+ * allow smtp server to be specified in vacation.pl
+ * fixed MySQL charset issues
+ * several small bugfixes
+ * Norwegian (bokmal) translation added
+ * Subversion revision 412 (from branches/postfixadmin-2.2.1)
+ * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored)
+
+ -- David Goodwin <dav...@pa...> Wed, 23 Jul 2008 12:37:00 +0000
+
+postfixadmin (2.2.1) unstable; urgency=low
+
+ * Various bug fixes (MySQL charset issue(s))
+ * Updated translations (pl, bg, ru, nb, tw etc)
+ * Subversion revision 408
+
+ -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000
+postfixadmin (2.2.0) unstable; urgency=low
+
+ * 2.2.0 Released.
+ * Fix fetchmail script to work with PostgreSQL
+ * Fix fetchmail table creation in MySQL and PostgreSQL
+ * Documentation fixups
+ * Subversion revision 356
+
+ -- David Goodwin <dav...@pa...> Thu, 29 Apr 2008 15:47:00 +0000
+
+postfixadmin (2.2.0-rc5) unstable; urgency=low
+
+ * Fix MySQL installation issues (schema not being created!)
+ * Fix MySQL vacation_notification timestamp issue
+ * SVN revision: 340
+
+ -- David Goodwin <dav...@pa...> Wed, 23 Apr 2008 16:27:00 +0000
+
+postfixadmin (2.2.0-1rc4) unstable; urgency=low
+
+ * Removal of standalone database schema files (see upgrade.php)
+ * Various bug fixes
+ * Better/Move documentation on installation
+ * setup.php/upgrade.php works for PostgreSQL and MySQL
+ * MySQL Unicode problems fixed
+ * I think this is effectively v2.2.0
+ * SVN revision: 336
+
+ -- David Goodwin <dav...@pa...> Sun, 20 Apr 2008 20:19:00 +0000
+
+postfixadmin (2.2.0-1rc3) unstable; urgency=low
+
+ * Various bug fixes
+
+ -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000
+
+postfixadmin (2.2.0-1rc2) unstable; urgency=low
+
+ * Improved CSS
+ * Improved upgrade procedure (should work for PGSQL) (see upgrade.php)
+ * Various bug fixes
+
+ -- David Goodwin <dav...@pa...> Sat, 29 Dec 2007 21:14:00 +0000
+
+postfixadmin (2.2.0-1rc1) unstable; urgency=low
+
+ * Initial Release (via dpkg)
+
+ -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000
+
Deleted: branches/postfixadmin-2.2.1.1/functions.inc.php
===================================================================
--- branches/postfixadmin-2.2.1/functions.inc.php 2008-07-22 23:35:20 UTC (rev 411)
+++ branches/postfixadmin-2.2.1.1/functions.inc.php 2008-07-23 11:41:45 UTC (rev 414)
@@ -1,2157 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: functions.inc.php
- * Contains re-usable code.
- */
-
-if (ereg ("functions.inc.php", $_SERVER['PHP_SELF']))
-{
- header ("Location: login.php");
- exit;
-}
-
-$version = '2.2.0';
-
-/**
- * check_session
- * Action: Check if a session already exists, if not redirect to login.php
- * Call: check_session ()
- * @return String username (e.g. fo...@ex...)
- */
-function authentication_get_username()
-{
- global $CONF;
- if (!isset($_SESSION['sessid'])) {
- header ("Location: " . $CONF['postfix_admin_url'] . "/login.php");
- exit(0);
- }
- $SESSID_USERNAME = $_SESSION['sessid']['username'];
- return $SESSID_USERNAME;
-}
-
-/**
- * Returns the type of user - either 'user' or 'admin'
- * Returns false if neither (E.g. if not logged in)
- * @return String admin or user or (boolean) false.
- */
-function authentication_get_usertype() {
- if(isset($_SESSION['sessid'])) {
- if(isset($_SESSION['sessid']['type'])) {
- return $_SESSION['sessid']['type'];
- }
- }
- return false;
-}
-/**
- *
- * Used to determine whether a user has a particular role.
- * @param String role-name. (E.g. admin, global-admin or user)
- * @return boolean True if they have the requested role in their session.
- * Note, user < admin < global-admin
- */
-function authentication_has_role($role) {
- global $CONF;
- if(isset($_SESSION['sessid'])) {
- if(isset($_SESSION['sessid']['roles'])) {
- if(in_array($role, $_SESSION['sessid']['roles'])) {
- return true;
- }
- }
- }
- return false;
-}
-
-/**
- * Used to enforce that $user has a particular role when
- * viewing a page.
- * If they are lacking a role, redirect them to
- * $CONF['postfix_admin_url']/login.php
- *
- * Note, user < admin < global-admin
- */
-function authentication_require_role($role) {
- global $CONF;
- // redirect to appropriate page?
- if(authentication_has_role($role)) {
- return True;
- }
- header("Location: " . $CONF['postfix_admin_url'] . "/login.php");
- exit(0);
-}
-/**
- * @return boolean TRUE if a admin, FALSE otherwise.
- */
-function authentication_is_admin() {
- return authentication_get_usertype() == 'admin';
-}
-
-/**
- * @return boolean TRUE if a user, FALSE otherwise.
- */
-function authentication_is_user() {
- return authentication_get_usertype() == 'user';
-}
-
-
-/**
- * Add an error message for display on the next page that is rendered.
- * @param String message to show.
- *
- * Stores string in session. Flushed through header template.
- * @see _flash_string()
- */
-function flash_error($string) {
- _flash_string('error', $string);
-}
-
-/**
- * Used to display an info message on successful update.
- * @param String $string
- * Stores data in sessio.
- * @see _flash_string()
- */
-function flash_info($string) {
- _flash_string('info', $string);
-}
-/**
- * 'Private' method used for flash_info() and flash_error().
- */
-function _flash_string($type, $string) {
- if(!isset($_SESSION['flash'])) {
- $_SESSION['flash'] = array();
- }
- if(!isset($_SESSION['flash'][$type])) {
- $_SESSION['flash'][$type] = array();
- }
- $_SESSION['flash'][$type][] = $string;
-}
-
-//
-// check_language
-// Action: checks what language the browser uses
-// Call: check_language
-// Parameter: $use_post - set to 0 if $_POST should NOT be read
-//
-function check_language ($use_post = 1)
-{
- global $CONF;
- global $supported_languages; # from languages/languages.php
-
- $lang = $CONF['default_language'];
-
- if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
- {
- $lang_array = preg_split ('/(\s*,\s*)/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
- if (safecookie('lang')) {
- array_unshift($lang_array, safecookie('lang')); # prefer language from cookie
- }
- if ( $use_post && safepost('lang')) {
- array_unshift($lang_array, safepost('lang')); # but prefer $_POST['lang'] even more
- }
-
- for($i = 0; $i < count($lang_array); $i++)
- {
- $lang_next = $lang_array[$i];
- $lang_next = strtolower(trim($lang_next));
- if(array_key_exists($lang_next, $supported_languages))
- {
- $lang = $lang_next;
- break;
- }
- }
- }
- return $lang;
-}
-
-//
-// language_selector
-// Action: returns a language selector dropdown with the browser (or cookie) language preselected
-// Call: language_selector()
-//
-function language_selector()
-{
- global $supported_languages; # from languages/languages.php
-
- $current_lang = check_language();
-
- $selector = '<select name="lang" xml:lang="en" dir="ltr">';
-
- foreach($supported_languages as $lang => $lang_name) {
- if ($lang == $current_lang) {
- $selected = ' selected="selected"';
- } else {
- $selected = '';
- }
- $selector .= "<option value='$lang'$selected>$lang_name</option>";
- }
- $selector .= "</select>";
- return $selector;
-}
-
-//
-// check_string
-// Action: chec...
[truncated message content] |
