postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!

SF.net SVN: postfixadmin: [358] tags

[<Gin...@us...>]

Revision: 358
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=358&view=rev
Author:   GingerDog
Date:     2008-04-30 14:06:20 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
add tag for postfixadmin-2.2.0

Added Paths:
-----------
    tags/postfixadmin-2.2.0/
    tags/postfixadmin-2.2.0/debian/changelog

Removed Paths:
-------------
    tags/postfixadmin-2.2.0/debian/changelog

Copied: tags/postfixadmin-2.2.0 (from rev 355, trunk)

Deleted: tags/postfixadmin-2.2.0/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-29 14:39:39 UTC (rev 355)
+++ tags/postfixadmin-2.2.0/debian/changelog	2008-04-30 21:06:20 UTC (rev 358)
@@ -1,40 +0,0 @@
-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: tags/postfixadmin-2.2.0/debian/changelog (from rev 356, trunk/debian/changelog)
===================================================================
--- tags/postfixadmin-2.2.0/debian/changelog	                        (rev 0)
+++ tags/postfixadmin-2.2.0/debian/changelog	2008-04-30 21:06:20 UTC (rev 358)
@@ -0,0 +1,50 @@
+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
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [357] website/index.php

[<gin...@us...>]

Revision: 357
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=357&view=rev
Author:   gingerdog
Date:     2008-04-29 08:20:30 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
index.php: fix link to download

Modified Paths:
--------------
    website/index.php

Modified: website/index.php
===================================================================
--- website/index.php	2008-04-29 14:50:26 UTC (rev 356)
+++ website/index.php	2008-04-29 15:20:30 UTC (rev 357)
@@ -36,7 +36,7 @@
 <p>This should be judged as being a <b>snapshot</b>, and although it <u>should work</u> - it may not - or some features may be lacking suitable documentation.</p>
 <p>As this is based on the development branch, it's setup is slightly different from that for v2.1.0; but you should be able to figure that out when you visit http://yoursever/postfixadmin after installing it. Note, the .deb does not setup your database in any useful way - so you'll need to do this manually (see /usr/share/doc/postfixadmin)</p>
 
-<p><a href="http://downloads.sourceforge.net/postfixadmin/postfixadmin_2.2.0-1rc4_all.deb?use_mirror=osdn">GingerDog's experimental .deb</a> for installation (based on Subversion revision 337) (built on 20th April 2008)</p>
+<p><a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300">GingerDog's experimental .deb</a> for installation</p>
 <p><a href="http://software.opensuse.org/search?q=postfixadmin">RPM packages for openSUSE and Fedora</a> (usually latest Subversion revision).</p>
 
 <h3>Download - Previous stable release</h3>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [356] trunk/debian/changelog

[<Gin...@us...>]

Revision: 356
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=356&view=rev
Author:   GingerDog
Date:     2008-04-29 07:50:26 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
debian/changelog: bump up 

Modified Paths:
--------------
    trunk/debian/changelog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-29 14:39:39 UTC (rev 355)
+++ trunk/debian/changelog	2008-04-29 14:50:26 UTC (rev 356)
@@ -1,3 +1,13 @@
+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!)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [355] trunk/functions.inc.php

[<Gin...@us...>]

Revision: 355
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=355&view=rev
Author:   GingerDog
Date:     2008-04-29 07:39:39 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
functions.inc.php: 2.2.0.... 

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2008-04-29 14:38:07 UTC (rev 354)
+++ trunk/functions.inc.php	2008-04-29 14:39:39 UTC (rev 355)
@@ -22,7 +22,7 @@
    exit;
 }
 
-$version = '2.2 SVN';
+$version = '2.2.0';
 
 /**
  * check_session


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [354] website/update-check.php

[<gin...@us...>]

Revision: 354
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=354&view=rev
Author:   gingerdog
Date:     2008-04-29 07:38:07 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
update-check.php: adding

Added Paths:
-----------
    website/update-check.php

Added: website/update-check.php
===================================================================
--- website/update-check.php	                        (rev 0)
+++ website/update-check.php	2008-04-29 14:38:07 UTC (rev 354)
@@ -0,0 +1,20 @@
+<?php
+require_once('header.php');
+
+$latest = "2.2.0";
+
+if(!isset($_GET['version'])) {
+	echo "Invalid usage";	
+}
+else {
+	$version = $_GET['version'];
+}
+if(strcmp($version,$latest) >= 0) {
+	echo "Congratulations - you're running the latest stable version of PostfixAdmin";
+}
+else {
+	echo "Upgrade available - the latest version is $latest"; 
+}
+
+require_once('footer.php');
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [353] trunk/functions.inc.php

[<Gin...@us...>]

Revision: 353
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=353&view=rev
Author:   GingerDog
Date:     2008-04-26 15:02:49 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
functions.inc.php: checkdnsrr may not exist; try and be graceful

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2008-04-26 21:56:02 UTC (rev 352)
+++ trunk/functions.inc.php	2008-04-26 22:02:49 UTC (rev 353)
@@ -282,15 +282,15 @@
 
             // Look for an AAAA, A, or MX record for the domain
 
-            // AAAA (IPv6) is only available in PHP v. >= 5
-            if (version_compare(phpversion(), "5.0.0", ">="))
-            {
-               if (checkdnsrr($domain,'AAAA')) return true;
+            if(function_exists('checkdnsrr')) {
+                // AAAA (IPv6) is only available in PHP v. >= 5
+                if (version_compare(phpversion(), "5.0.0", ">="))
+                {
+                   if (checkdnsrr($domain,'AAAA')) return true;
+                }
+                if (checkdnsrr($domain,'A')) return true;
+                if (checkdnsrr($domain,'MX')) return true;
             }
-
-            if (checkdnsrr($domain,'A')) return true;
-            if (checkdnsrr($domain,'MX')) return true;
-
             # TODO: different error message for non-existing domains (instead of "email is invalid")
             return false;
          }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [352] trunk/upgrade.php

[<Gin...@us...>]

Revision: 352
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=352&view=rev
Author:   GingerDog
Date:     2008-04-26 14:56:02 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
upgrade.php: reindent; fix postgresql fetchmail stuff

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2008-04-26 21:55:16 UTC (rev 351)
+++ trunk/upgrade.php	2008-04-26 21:56:02 UTC (rev 352)
@@ -320,8 +320,8 @@
 }
 
 function upgrade_2_mysql() {
-# upgrade pre-2.1 database
-# from TABLE_BACKUP_MX.TXT
+    # upgrade pre-2.1 database
+    # from TABLE_BACKUP_MX.TXT
     $table_domain = table_by_key ('domain');
     $result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN transport VARCHAR(255) AFTER maxquota;", TRUE);
     // don't think PGSQL supports 'AFTER transport'
@@ -469,7 +469,7 @@
     // these will not work on PostgreSQL; syntax is :
     // ALTER TABLE foo RENAME f1 TO f2 
     $all_sql = split("\n", trim("
-        ALTER TABLE $table_admin {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+    ALTER TABLE $table_admin {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
     ALTER TABLE $table_admin {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
     ALTER TABLE $table_alias {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
     ALTER TABLE $table_alias {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
@@ -487,8 +487,8 @@
     ALTER TABLE $table_vacation ADD COLUMN created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL AFTER domain;
     ALTER TABLE $table_vacation ADD COLUMN active TINYINT(1) DEFAULT '1' NOT NULL AFTER created;
     ALTER TABLE $table_vacation DROP PRIMARY KEY
-        ALTER TABLE $table_vacation ADD PRIMARY KEY(email)
-        UPDATE $table_vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
+    ALTER TABLE $table_vacation ADD PRIMARY KEY(email)
+    UPDATE $table_vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
     "));
 
     foreach ($all_sql as $sql) {
@@ -539,57 +539,56 @@
     $result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
 
     $result = db_query_parsed("
-BEGIN;
-ALTER TABLE $table_log RENAME COLUMN data TO data_old;
-ALTER TABLE $table_log ADD COLUMN data text NOT NULL default '';
-UPDATE $table_log SET data = CAST(data_old AS text);
-ALTER TABLE $table_log DROP COLUMN data_old;
-COMMIT;");
+        BEGIN;
+            ALTER TABLE $table_log RENAME COLUMN data TO data_old;
+            ALTER TABLE $table_log ADD COLUMN data text NOT NULL default '';
+            UPDATE $table_log SET data = CAST(data_old AS text);
+            ALTER TABLE $table_log DROP COLUMN data_old;
+        COMMIT;");
 
-$result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN username DROP DEFAULT");
-$result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN domain DROP DEFAULT");
+    $result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN username DROP DEFAULT");
+    $result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN domain DROP DEFAULT");
 
-$result = db_query_parsed("
-BEGIN;
-ALTER TABLE $table_mailbox RENAME COLUMN domain TO domain_old;
-ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES domain (domain);
-UPDATE $table_mailbox SET domain = domain_old;
-ALTER TABLE $table_mailbox DROP COLUMN domain_old;
-COMMIT;"
-);
-if(!_pgsql_object_exists('mailbox_username_active')) {
-    db_query_parsed('CREATE INDEX mailbox_username_active ON mailbox(username,active)');
-}
+    $result = db_query_parsed("
+        BEGIN;
+            ALTER TABLE $table_mailbox RENAME COLUMN domain TO domain_old;
+            ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES domain (domain);
+            UPDATE $table_mailbox SET domain = domain_old;
+            ALTER TABLE $table_mailbox DROP COLUMN domain_old;
+        COMMIT;"
+    );
+    if(!_pgsql_object_exists('mailbox_username_active')) {
+        db_query_parsed('CREATE INDEX mailbox_username_active ON mailbox(username,active)');
+    }
 
 
-$result = db_query_parsed("ALTER TABLE $table_vacation ALTER COLUMN body SET DEFAULT ''");
-if(_pgsql_field_exists($table_vacation, 'cache')) {
-    $result = db_query_parsed("ALTER TABLE $table_vacation DROP COLUMN cache");
-}
+    $result = db_query_parsed("ALTER TABLE $table_vacation ALTER COLUMN body SET DEFAULT ''");
+    if(_pgsql_field_exists($table_vacation, 'cache')) {
+        $result = db_query_parsed("ALTER TABLE $table_vacation DROP COLUMN cache");
+    }
 
-$result = db_query_parsed("
-BEGIN;
-ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
-ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES domain;
-UPDATE $table_vacation SET domain = domain_old;
-ALTER TABLE $table_vacation DROP COLUMN domain_old;
-COMMIT;
-");
+    $result = db_query_parsed("
+        BEGIN;
+            ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
+            ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES domain;
+            UPDATE $table_vacation SET domain = domain_old;
+            ALTER TABLE $table_vacation DROP COLUMN domain_old;
+        COMMIT;
+    ");
 
-if(!_pgsql_object_exists('vacation_email_active')) {
-    $result = db_query_parsed("CREATE INDEX vacation_email_active ON vacation(email,active)");
-}
+    if(!_pgsql_object_exists('vacation_email_active')) {
+        $result = db_query_parsed("CREATE INDEX vacation_email_active ON vacation(email,active)");
+    }
 
-if(!_pgsql_object_exists('vacation_notification')) {
-    $result = db_query_parsed("
-        CREATE TABLE vacation_notification (
-            on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
-            notified character varying(255) NOT NULL,
-            notified_at timestamp with time zone NOT NULL DEFAULT now(),
-    CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
-);");
+    if(!_pgsql_object_exists('vacation_notification')) {
+        $result = db_query_parsed("
+            CREATE TABLE vacation_notification (
+                on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
+                notified character varying(255) NOT NULL,
+                notified_at timestamp with time zone NOT NULL DEFAULT now(),
+        CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified));");
+    }
 }
-}
 
 
 # Possible errors that can be ignored:
@@ -616,90 +615,89 @@
             `active` tinyint(1) NOT NULL default '1',
             PRIMARY KEY  (`username`),
     KEY username (`username`)
-) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Admins';
-");
+) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Admins'; ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('alias') . "` (
-        `address` varchar(255) NOT NULL default '',
-        `goto` text NOT NULL,
-        `domain` varchar(255) NOT NULL default '',
-        `created` datetime NOT NULL default '0000-00-00 00:00:00',
-        `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-        `active` tinyint(1) NOT NULL default '1',
-        PRIMARY KEY  (`address`),
-KEY address (`address`)
-        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Aliases';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('alias') . "` (
+            `address` varchar(255) NOT NULL default '',
+            `goto` text NOT NULL,
+            `domain` varchar(255) NOT NULL default '',
+            `created` datetime NOT NULL default '0000-00-00 00:00:00',
+            `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+            `active` tinyint(1) NOT NULL default '1',
+            PRIMARY KEY  (`address`),
+    KEY address (`address`)
+            ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Aliases';
+    ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain') . "` (
-        `domain` varchar(255) NOT NULL default '',
-        `description` varchar(255) NOT NULL default '',
-        `aliases` int(10) NOT NULL default '0',
-        `mailboxes` int(10) NOT NULL default '0',
-        `maxquota` int(10) NOT NULL default '0',
-        `quota` int(10) NOT NULL default '0',
-        `transport` varchar(255) default NULL,
-        `backupmx` tinyint(1) NOT NULL default '0',
-        `created` datetime NOT NULL default '0000-00-00 00:00:00',
-        `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-        `active` tinyint(1) NOT NULL default '1',
-        PRIMARY KEY  (`domain`),
-KEY domain (`domain`)
-        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Domains';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain') . "` (
+            `domain` varchar(255) NOT NULL default '',
+            `description` varchar(255) NOT NULL default '',
+            `aliases` int(10) NOT NULL default '0',
+            `mailboxes` int(10) NOT NULL default '0',
+            `maxquota` int(10) NOT NULL default '0',
+            `quota` int(10) NOT NULL default '0',
+            `transport` varchar(255) default NULL,
+            `backupmx` tinyint(1) NOT NULL default '0',
+            `created` datetime NOT NULL default '0000-00-00 00:00:00',
+            `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+            `active` tinyint(1) NOT NULL default '1',
+            PRIMARY KEY  (`domain`),
+    KEY domain (`domain`)
+            ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Domains';
+    ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain_admins') . "` (
-        `username` varchar(255) NOT NULL default '',
-        `domain` varchar(255) NOT NULL default '',
-        `created` datetime NOT NULL default '0000-00-00 00:00:00',
-        `active` tinyint(1) NOT NULL default '1',
-        KEY username (`username`)
-    ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Domain Admins';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain_admins') . "` (
+            `username` varchar(255) NOT NULL default '',
+            `domain` varchar(255) NOT NULL default '',
+            `created` datetime NOT NULL default '0000-00-00 00:00:00',
+            `active` tinyint(1) NOT NULL default '1',
+            KEY username (`username`)
+        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Domain Admins';
+    ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('log') . "` (
-        `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
-        `username` varchar(255) NOT NULL default '',
-        `domain` varchar(255) NOT NULL default '',
-        `action` varchar(255) NOT NULL default '',
-        `data` varchar(255) NOT NULL default '',
-        KEY timestamp (`timestamp`)
-    ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Log';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('log') . "` (
+            `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+            `username` varchar(255) NOT NULL default '',
+            `domain` varchar(255) NOT NULL default '',
+            `action` varchar(255) NOT NULL default '',
+            `data` varchar(255) NOT NULL default '',
+            KEY timestamp (`timestamp`)
+        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Log';
+    ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('mailbox') . "` (
-        `username` varchar(255) NOT NULL default '',
-        `password` varchar(255) NOT NULL default '',
-        `name` varchar(255) NOT NULL default '',
-        `maildir` varchar(255) NOT NULL default '',
-        `quota` int(10) NOT NULL default '0',
-        `domain` varchar(255) NOT NULL default '',
-        `created` datetime NOT NULL default '0000-00-00 00:00:00',
-        `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-        `active` tinyint(1) NOT NULL default '1',
-        PRIMARY KEY  (`username`),
-KEY username (`username`)
-        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Mailboxes';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('mailbox') . "` (
+            `username` varchar(255) NOT NULL default '',
+            `password` varchar(255) NOT NULL default '',
+            `name` varchar(255) NOT NULL default '',
+            `maildir` varchar(255) NOT NULL default '',
+            `quota` int(10) NOT NULL default '0',
+            `domain` varchar(255) NOT NULL default '',
+            `created` datetime NOT NULL default '0000-00-00 00:00:00',
+            `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+            `active` tinyint(1) NOT NULL default '1',
+            PRIMARY KEY  (`username`),
+    KEY username (`username`)
+            ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Mailboxes';
+    ");
 
-$result = db_query_parsed("
-    CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` (
-        `email` varchar(255) NOT NULL default '',
-        `subject` varchar(255) NOT NULL default '',
-        `body` text NOT NULL default '',
-        `cache` text NOT NULL default '',
-        `domain` varchar(255) NOT NULL default '',
-        `created` datetime NOT NULL default '0000-00-00 00:00:00',
-        `active` tinyint(1) NOT NULL default '1',
-        PRIMARY KEY  (`email`),
-KEY email (`email`)
-        ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Vacation';
-");
+    $result = db_query_parsed("
+        CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` (
+            `email` varchar(255) NOT NULL default '',
+            `subject` varchar(255) NOT NULL default '',
+            `body` text NOT NULL default '',
+            `cache` text NOT NULL default '',
+            `domain` varchar(255) NOT NULL default '',
+            `created` datetime NOT NULL default '0000-00-00 00:00:00',
+            `active` tinyint(1) NOT NULL default '1',
+            PRIMARY KEY  (`email`),
+    KEY email (`email`)
+            ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Vacation';
+    ");
 }
 
 /**
@@ -724,7 +722,7 @@
         ALTER TABLE `$table_vacation` CHANGE `domain`   `domain`  VARCHAR( 255 ) {LATIN1} NOT NULL
         ALTER TABLE `$table_vacation` CHANGE `active`   `active`  TINYINT( 1 )            NOT NULL DEFAULT '1'
         ALTER TABLE `$table_vacation` DEFAULT                                    {LATIN1}
-    ALTER TABLE `$table_vacation` ENGINE = INNODB
+        ALTER TABLE `$table_vacation` ENGINE = INNODB
     "));
 
     foreach ($all_sql as $sql) {
@@ -771,34 +769,33 @@
             notified varchar(255) NOT NULL,
             notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
             PRIMARY KEY on_vacation (`on_vacation`, `notified`),
-    CONSTRAINT `vacation_notification_pkey` 
-    FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB 
-COMMENT='Postfix Admin - Virtual Vacation Notifications'
-");
+        CONSTRAINT `vacation_notification_pkey` 
+        FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
+    )
+    ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB 
+    COMMENT='Postfix Admin - Virtual Vacation Notifications'
+    ");
 
-# in case someone has manually created the table with utf8 fields before:
-$all_sql = split("\n", trim("
-    ALTER TABLE `$table_vacation_notification` DROP FOREIGN KEY `vacation_notification_pkey`
-    ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) {LATIN1} NOT NULL
-    ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) {LATIN1} NOT NULL
-    ALTER TABLE `$table_vacation_notification` DEFAULT                                           {LATIN1}
-"));
-# Possible errors that can be ignored:
-# None.
-# If something goes wrong, the user should drop the vacation_notification table 
-# (not a great loss) and re-create it using this function.
+    # in case someone has manually created the table with utf8 fields before:
+    $all_sql = split("\n", trim("
+        ALTER TABLE `$table_vacation_notification` DROP FOREIGN KEY `vacation_notification_pkey`
+        ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) {LATIN1} NOT NULL
+        ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) {LATIN1} NOT NULL
+        ALTER TABLE `$table_vacation_notification` DEFAULT                                           {LATIN1}
+    "));
+    # Possible errors that can be ignored:
+    # None.
+    # If something goes wrong, the user should drop the vacation_notification table 
+    # (not a great loss) and re-create it using this function.
 
-foreach ($all_sql as $sql) {
-    $result = db_query_parsed($sql);
-}
+    foreach ($all_sql as $sql) {
+        $result = db_query_parsed($sql);
+    }
 
-# create constraint...
-$result = db_query_parsed("
-    ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey` 
-    FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
-    ");
+    # create constraint...
+    $result = db_query_parsed("
+        ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey` 
+        FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE ");
 }
 
 
@@ -807,10 +804,10 @@
  */
 function upgrade_344_mysql() {
 
-    $table_vacation_notification = table_by_key('vacation_notification');
+    $table_fetchmail = table_by_key('fetchmail');
 
     db_query_parsed( "
-        create table fetchmail(
+        create table $table_fetchmail(
          id int(11) unsigned not null auto_increment,
          mailbox varchar(255) not null default '',
          src_server varchar(255) not null default '',
@@ -832,6 +829,38 @@
 }
 
 function upgrade_344_pgsql() {
-	# TODO: create fetchmail table for PgSQL
+    $fetchmail = table_by_key('fetchmail');
+     // a field name called 'date' is probably a bad idea.
+    if(!_pgsql_object_exists('fetchmail')) {
+        db_query_parsed( "
+            create table $fetchmail(
+             id serial,
+             mailbox varchar(255) not null default '',
+             src_server varchar(255) not null default '',
+             src_auth varchar(15) NOT NULL,
+             src_user varchar(255) not null default '',
+             src_password varchar(255) not null default '',
+             src_folder varchar(255) not null default '',
+             poll_time integer not null default 10,
+             fetchall boolean not null default false,
+             keep boolean not null default false,
+             protocol varchar(15) NOT NULL,
+             extra_options text,
+             returned_text text,
+             mda varchar(255) not null default '',
+             date timestamp with time zone default now(),
+            primary key(id),
+            CHECK (src_auth IN ('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any')),
+            CHECK (protocol IN ('POP3', 'IMAP', 'POP2', 'ETRN', 'AUTO'))
+        );
+        ");
+    }
+    // MySQL expects sequences to start at 1. Stupid database.
+    // fetchmail.php requires id parameters to be > 0, as it does if($id) like logic... hence if we don't
+    // fudge the sequence starting point, you cannot delete/edit the first entry if using PostgreSQL.
+    // I'm sure there's a more elegant way of fixing it properly.... but this should work for now.
+    if(_pgsql_object_exists('fetchmail_id_seq')) {
+        db_query_parsed("SELECT nextval('{$fetchmail}_id_seq')"); // I don't care about number waste. 
+    }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [351] trunk/fetchmail.php

[<Gin...@us...>]

Revision: 351
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=351&view=rev
Author:   GingerDog
Date:     2008-04-26 14:55:16 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
fetchmail.php: PostgreSQL does not need the next autoincrement value to be asigned fo rit

Modified Paths:
--------------
    trunk/fetchmail.php

Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php	2008-04-26 21:01:13 UTC (rev 350)
+++ trunk/fetchmail.php	2008-04-26 21:55:16 UTC (rev 351)
@@ -153,6 +153,10 @@
       }
    }
    $formvars['id'] = $edit; # results in 0 on $new
+   if($CONF['database_type'] == 'pgsql' && $new) {
+      // skip - shouldn't need to specify this as it will default to the next available value anyway.
+      unset($formvars['id']);
+   }
 
    if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) {
       flash_error($PALANG['pFetchmail_invalid_mailbox']);
@@ -173,8 +177,8 @@
    }
 
    if ($save) {
-      if ($new) {
-         $sql="INSERT fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')";
+       if ($new) {
+         $sql="INSERT INTO fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')";
       } else { # $edit
          foreach(array_keys($formvars) as $key) {
             $formvars[$key] = escape_string($key) . "='" . escape_string($formvars[$key]) . "'";
@@ -221,7 +225,7 @@
 }
 
 function _inp_bool($val){
-   return $val?db_get_boolean(true):db_get_boolean(false);
+   return $val ? db_get_boolean(true): db_get_boolean(false);
 }
 
 function _inp_password($val){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [350] trunk/DOCUMENTS/POSTFIXADMIN.txt

[<Gin...@us...>]

Revision: 350
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=350&view=rev
Author:   GingerDog
Date:     2008-04-26 14:01:13 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
DOCUMENTS/POSTFIXADMIN.txt: updated

Modified Paths:
--------------
    trunk/DOCUMENTS/POSTFIXADMIN.txt

Modified: trunk/DOCUMENTS/POSTFIXADMIN.txt
===================================================================
--- trunk/DOCUMENTS/POSTFIXADMIN.txt	2008-04-26 20:54:26 UTC (rev 349)
+++ trunk/DOCUMENTS/POSTFIXADMIN.txt	2008-04-26 21:01:13 UTC (rev 350)
@@ -1,20 +1,26 @@
-
 ---------------------------------------
   The different parts of PostfixAdmin
 
-/admin directory scripts are used by superadmins, also known as 'site admins'.
-When you log in as a superadmin you'll be running scripts from /admin that
-won't bother checking to see if you are allowed to admin for a domain.  As
-a superadmin you can add and remove domains, mailboxes, aliases, domain admins,
-and create more superadmins.  A superadmin will be not stopped from doing
-anything, so be careful, you can delete your our login account.
 
-login.php sorts out what type of admin you are and sends you to the right place.
-The scripts in / are used by domain admins and always check to see if you are
-an admin for the domain (or user within a domain) you are attempting to change.
+Postfix Admin has a concept of a "global" administrator (think 'root') and 
+domain administrators.  When you install PostfixAdmin, the setup.php file 
+will ask you to create the global administrators account. Using this global
+account, you can (if you so wish) create domain administrators who are 
+limited to making changes within the domains you specify for them.
 
-End user scripts only do operations on the currently logged in user. 
-If the end user options provide more than you want your users to have,
-check the user options in config.inc.php, or, even better, edit the
-user templates and remove the options.
+Historically when you logged in as the 'global' (or superadmin) user, you'd
+access /admin; with version 2.2.0, this 'functionality' was removed (as there
+was excessive code duplication) and everyone uses the same login.php script.
 
+
+Needless to say, as a global administrator, you can do all kinds of bad things -
+like deleting domains and stopping delivery of mail to a particular mailbox. So
+- take care, and if you're unsure take semi-regular backups.
+
+
+If you login, and you are not an administrator (i.e. you are a 'regular' user
+who just has a mailbox on the server), then you will only see functionality to 
+modify your own account - e.g. change password, edit forward records and specify 
+whether you are on vacation (out of office) or not.
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [349] trunk/LICENSE.TXT

[<Gin...@us...>]

Revision: 349
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=349&view=rev
Author:   GingerDog
Date:     2008-04-26 13:54:26 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
LICENSE.TXT: updated contributors

Modified Paths:
--------------
    trunk/LICENSE.TXT

Modified: trunk/LICENSE.TXT
===================================================================
--- trunk/LICENSE.TXT	2008-04-26 20:53:00 UTC (rev 348)
+++ trunk/LICENSE.TXT	2008-04-26 20:54:26 UTC (rev 349)
@@ -27,4 +27,6 @@
     `Postfix Admin' (which makes passes at Postfix, PHP and MySQL) written
     by Wietse Venema, PHP Group and MYSQL AB.
 
-    Contributors: Mihau, Tarvin, SteveB, DJTremors, WhiteFox, David Osborn
\ No newline at end of file
+    Contributors: Mihau, Tarvin, SteveB, DJTremors, WhiteFox, David Osborn, 
+                  David Goodwin (GingerDog), Christian Boltz (cboltz) and GregC and others.
+   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [348] trunk/CHANGELOG.TXT

[<Gin...@us...>]

Revision: 348
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=348&view=rev
Author:   GingerDog
Date:     2008-04-26 13:53:00 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
CHANGELOG.TXT: Addded mention for fetchmail as some people seem to use it!

Modified Paths:
--------------
    trunk/CHANGELOG.TXT

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2008-04-26 20:51:23 UTC (rev 347)
+++ trunk/CHANGELOG.TXT	2008-04-26 20:53:00 UTC (rev 348)
@@ -4,6 +4,7 @@
 # Copyright (c) 2002 - 2005 High5!
 # Licensed under GPL for more info check GPL-LICENSE.TXT
 #
+#
 Version 2.2.0
 --------------------
 
@@ -14,6 +15,7 @@
   - 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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [347] trunk/CHANGELOG.TXT

[<Gin...@us...>]

Revision: 347
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=347&view=rev
Author:   GingerDog
Date:     2008-04-26 13:51:23 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
CHANGELOG.TXT: tried to update; my memory isn't that good, so this is not really up to date

Modified Paths:
--------------
    trunk/CHANGELOG.TXT

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2008-04-26 20:08:41 UTC (rev 346)
+++ trunk/CHANGELOG.TXT	2008-04-26 20:51:23 UTC (rev 347)
@@ -4,8 +4,18 @@
 # Copyright (c) 2002 - 2005 High5!
 # Licensed under GPL for more info check GPL-LICENSE.TXT
 #
-Version 2.1.1 -- TBD
+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
+  - 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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [346] trunk/languages/cs.lang

[<Gin...@us...>]

Revision: 346
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=346&view=rev
Author:   GingerDog
Date:     2008-04-26 13:08:41 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
cs.lang: update from amsys; thanks

Modified Paths:
--------------
    trunk/languages/cs.lang

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2008-04-26 11:50:36 UTC (rev 345)
+++ trunk/languages/cs.lang	2008-04-26 20:08:41 UTC (rev 346)
@@ -1,9 +1,11 @@
 <?php
 # $Id$
 //
-// Language file Czech
+// Czech Language Translation of PostfixAdmin
 // by Jakub
 // updated by Martin Ambroz (am...@tr...)
+//  * 2007-12-06
+//  * 2008-04-26
 //
 
 
@@ -11,13 +13,13 @@
 $PALANG['NO'] = 'NE';
 $PALANG['edit'] = 'upravit';
 $PALANG['del'] = 'smazat';
-$PALANG['exit'] = 'Zrušit';
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
+$PALANG['exit'] = 'Odejít';
+$PALANG['cancel'] = 'Zrušit';
+$PALANG['save'] = 'Uložit';
 $PALANG['confirm'] = 'Jste si jistí?\n';
 $PALANG['confirm_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n';
 $PALANG['check_update'] = 'Zkontrolovat aktualizace';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
+$PALANG['invalid_parameter'] = 'Neplatný parametr!';
 
 $PALANG['pFooter_logged_as'] = 'Přihlášen jako %s';
 
@@ -33,10 +35,10 @@
 $PALANG['pMenu_overview'] = 'Přehled';
 $PALANG['pMenu_create_alias'] = 'Přidat přesměrování';
 $PALANG['pMenu_create_mailbox'] = 'Přidat schránku';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
+$PALANG['pMenu_fetchmail'] = 'Stahování pošty';
 $PALANG['pMenu_sendmail'] = 'Poslat email';
 $PALANG['pMenu_password'] = 'Změnit heslo';
-$PALANG['pMenu_viewlog'] = 'Prohlížet záznam';
+$PALANG['pMenu_viewlog'] = 'Prohlížet log';
 $PALANG['pMenu_logout'] = 'Odhlásit.';
 
 $PALANG['pMain_welcome'] = 'Vítejte v Postfix Adminu!';
@@ -65,7 +67,7 @@
 $PALANG['pOverview_alias_modified'] = 'Naposledy změněno';
 $PALANG['pOverview_alias_active'] = 'Aktivní';
 $PALANG['pOverview_alias_edit'] = 'Přesměrování';
-$PALANG['and_x_more'] = '[and %s more...]'; # XXX
+$PALANG['and_x_more'] = '[a %s dalších...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Jméno';
 $PALANG['pOverview_mailbox_quota'] = 'Místo (MB)';
@@ -81,12 +83,12 @@
 $PALANG['pOverview_get_modified'] = 'Naposledy změněno';
 
 $PALANG['pDelete_delete_error'] = '<span class="error_msg">Nelze smazat položku ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s odstraněn.';
 $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nelze odstranit schránku ';
 $PALANG['pDelete_domain_error'] = '<span class="error_msg">Tato doména není vaše ';
 $PALANG['pDelete_alias_error'] = '<span class="error_msg">Nelze odstranit přesměrování ';
 
-$PALANG['pCreate_alias_welcome'] = 'Vytvořit novýé přesměrování ve vaší doméně.';
+$PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.';
 $PALANG['pCreate_alias_address'] = 'Přesměrování';
 $PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Adresa neni platná!</span>';
 $PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Taková emailová adresa již existuje!</span>';
@@ -165,8 +167,8 @@
 $PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepřítomnosti';
 
 $PALANG['pVacation_result_error'] = '<span class="error_msg">Nebylo možné aktualizovat nastavení automatické odpověďi!</span>';
-$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
-$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
+$PALANG['pVacation_result_removed'] = 'Automatická odpověď byla odstraněna!';
+$PALANG['pVacation_result_added'] = 'Automatická odpověd byla zapnuta!';
 
 $PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro ';
 $PALANG['pViewlog_timestamp'] = 'Časová značka';
@@ -175,7 +177,7 @@
 $PALANG['pViewlog_action'] = 'Akce';
 $PALANG['pViewlog_data'] = 'Poznámka';
 
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_create_mailbox'] = 'vytrořena schránka';
 $PALANG['pViewlog_action_delete_mailbox'] = 'smazána schránka';
 $PALANG['pViewlog_action_edit_mailbox'] = 'úprava schránky';
 $PALANG['pViewlog_action_edit_mailbox_state'] = 'změna stavu schránky';
@@ -196,14 +198,14 @@
 $PALANG['pSendmail_subject_text'] = 'Vítejte';
 $PALANG['pSendmail_body'] = 'Obsah';
 $PALANG['pSendmail_button'] = 'Poslat email';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nepodařilo se vytvořit schránku!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span>
-$PALANG['pSendmail_result_success'] = 'Schránka byla vytvořena!'; # XXX text change - new: Email sent!
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nepodařilo se odeslat email!</span>';
+$PALANG['pSendmail_result_success'] = 'Email odeslán!';
 
-$PALANG['pAdminMenu_list_admin'] = 'Administrátoři';
+$PALANG['pAdminMenu_list_admin'] = 'Administrátoři domén';
 $PALANG['pAdminMenu_list_domain'] = 'Domény';
 $PALANG['pAdminMenu_list_virtual'] = 'Schránky';
 $PALANG['pAdminMenu_viewlog'] = 'Prohlížet Log';
-$PALANG['pAdminMenu_backup'] = 'Záloha';
+$PALANG['pAdminMenu_backup'] = 'Vytvořit zálohu';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administrátoři'; // unused
 $PALANG['pAdminMenu_create_admin'] = 'Nový Administrátor';
 $PALANG['pAdminMenu_create_domain'] = 'Nová Doména';
@@ -352,52 +354,52 @@
 $PALANG['pBroadcast_message'] = 'Zpráva';
 $PALANG['pBroadcast_send'] = 'Odeslat zprávu';
 $PALANG['pBroadcast_success'] = 'Zpráva pro všechny schránky byla odeslána.';
-$PALANG['pAdminMenu_broadcast_message'] = 'Zpráva Všem';
+$PALANG['pAdminMenu_broadcast_message'] = 'Poslat email všem';
 $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné !';
 
 $PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
 $PALANG['pStatus_custom'] = 'Doručeno do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
-$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
-$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
-$PALANG['pFetchmail_field_id']              = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
-$PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
-$PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
-$PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
-$PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
-$PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
-$PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX
-$PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
-$PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
-$PALANG['pFetchmail_field_date']            = 'Date'; # XXX
-$PALANG['pFetchmail_field_returned_text']   = 'Returned Text'; # XXX
-$PALANG['pFetchmail_desc_id']               = 'Record ID'; # XXX
-$PALANG['pFetchmail_desc_mailbox']          = 'Local mailbox'; # XXX
-$PALANG['pFetchmail_desc_src_server']       = 'Remote Server'; # XXX
-$PALANG['pFetchmail_desc_src_auth']         = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX
-$PALANG['pFetchmail_desc_src_user']         = 'Remote User'; # XXX
-$PALANG['pFetchmail_desc_src_password']     = 'Remote Password'; # XXX
-$PALANG['pFetchmail_desc_src_folder']       = 'Remote Folder'; # XXX
-$PALANG['pFetchmail_desc_poll_time']        = 'Poll every ... minutes'; # XXX
-$PALANG['pFetchmail_desc_fetchall']         = 'Retrieve  both old (seen) and new messages'; # XXX
-$PALANG['pFetchmail_desc_keep']             = 'Keep retrieved messages on the remote mailserver'; # XXX
-$PALANG['pFetchmail_desc_protocol']         = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_extra_options']    = 'Extra fetchmail Options'; # XXX
-$PALANG['pFetchmail_desc_mda']              = 'Mail Delivery Agent'; # XXX
-$PALANG['pFetchmail_desc_date']             = 'Date of last polling/configuration change'; # XXX
-$PALANG['pFetchmail_desc_returned_text']    = 'Text message from last polling'; # XXX
+$PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
+$PALANG['pFetchmail_new_entry'] = 'Nová položka';
+$PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!';
+$PALANG['pFetchmail_database_save_success'] = 'Položka byla uložena do databáze.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Položka s ID %s nebyla nalezena!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Nesprávná schránka!';
+$PALANG['pFetchmail_server_missing'] = 'Prosím zadejte jméno serveru ze kterého stahovat poštu!';
+$PALANG['pFetchmail_user_missing'] = 'Prosím zadejte přihlašovací jméno k serveru!';
+$PALANG['pFetchmail_password_missing'] = 'Prosím zadejte heslo ke vzdálené schránce!';
+$PALANG['pFetchmail_field_id']              = 'ID';
+$PALANG['pFetchmail_field_mailbox']         = 'Schránka';
+$PALANG['pFetchmail_field_src_server']      = 'Server';
+$PALANG['pFetchmail_field_src_auth']        = 'Typ autentizace';
+$PALANG['pFetchmail_field_src_user']        = 'Uživatel';
+$PALANG['pFetchmail_field_src_password']    = 'Heslo';
+$PALANG['pFetchmail_field_src_folder']      = 'Složka';
+$PALANG['pFetchmail_field_poll_time']       = 'Interval';
+$PALANG['pFetchmail_field_fetchall']        = 'Stahovat vše';
+$PALANG['pFetchmail_field_keep']            = 'Nemazat';
+$PALANG['pFetchmail_field_protocol']        = 'Protokol';
+$PALANG['pFetchmail_field_extra_options']   = 'Extra Parametry';
+$PALANG['pFetchmail_field_mda']             = 'MDA';
+$PALANG['pFetchmail_field_date']            = 'Datum';
+$PALANG['pFetchmail_field_returned_text']   = 'Výstupní Text';
+$PALANG['pFetchmail_desc_id']               = 'ID záznamu';
+$PALANG['pFetchmail_desc_mailbox']          = 'Místní schránka';
+$PALANG['pFetchmail_desc_src_server']       = 'Vzdálený Server';
+$PALANG['pFetchmail_desc_src_auth']         = 'Většinou \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user']         = 'Vzdálený Uživatel';
+$PALANG['pFetchmail_desc_src_password']     = 'Heslo Vzdáleného Uživatele';
+$PALANG['pFetchmail_desc_src_folder']       = 'Vzdálená Složka';
+$PALANG['pFetchmail_desc_poll_time']        = 'Stahovat každých ... minut';
+$PALANG['pFetchmail_desc_fetchall']         = 'Získávat všechny staré (přečtené) i nové zprávy';
+$PALANG['pFetchmail_desc_keep']             = 'Ponechávat stažené zprávy na vzdáleném mailserveru';
+$PALANG['pFetchmail_desc_protocol']         = 'Použitý protokol';
+$PALANG['pFetchmail_desc_extra_options']    = 'Extra parametry pro fetchmail';
+$PALANG['pFetchmail_desc_mda']              = 'Program pro doručení pošty do schránky (MDA)';
+$PALANG['pFetchmail_desc_date']             = 'Datum posledního stažení pošty/změny konfigurace';
+$PALANG['pFetchmail_desc_returned_text']    = 'Výstupní textový záznam posledního stahování pošty';
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [345] trunk/DOCUMENTS/UPGRADE.txt

[<chr...@us...>]

Revision: 345
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=345&view=rev
Author:   christian_boltz
Date:     2008-04-26 04:50:36 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
UPGRADE.txt
- replace upgrade.php with setup.php
- some small text changes

Modified Paths:
--------------
    trunk/DOCUMENTS/UPGRADE.txt

Modified: trunk/DOCUMENTS/UPGRADE.txt
===================================================================
--- trunk/DOCUMENTS/UPGRADE.txt	2008-04-25 23:31:21 UTC (rev 344)
+++ trunk/DOCUMENTS/UPGRADE.txt	2008-04-26 11:50:36 UTC (rev 345)
@@ -70,13 +70,12 @@
 5. Perform appropriate database upgrades
 ----------------------------------------
 
-Since version 2.2 of Postfixadmin, upgrade.php has existed which should do the below 
-for you automatically.
+Since version 2.2 of Postfixadmin, setup.php can perform the needed database 
+updates automatically .
 
-Open upgrade.php in your browser to update your database scheme.
+Open setup.php in your browser to update your database scheme.
 
-If you update from 2.1 or older, also open setup.php to create a superadmin
-account.
+If you update from 2.1 or older, also create a superadmin account using setup.php.
 
 Note that admin/ has been merged into the main directory. Login with the
 superadmin account to setup domains and domain admins.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [344] trunk

[<chr...@us...>]

Revision: 344
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=344&view=rev
Author:   christian_boltz
Date:     2008-04-25 16:31:21 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
upgrade.php:
- create fetchmail table (upgrade_344_mysql)
- TODO: create fetchmail table for pgsql (empty function already included ;-)

fetchmail.php:
- removed CREATE TABLE statement - it's now created by upgrade.php

Modified Paths:
--------------
    trunk/fetchmail.php
    trunk/upgrade.php

Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php	2008-04-25 20:35:55 UTC (rev 343)
+++ trunk/fetchmail.php	2008-04-25 23:31:21 UTC (rev 344)
@@ -33,29 +33,6 @@
  * - all editable form values, see $fm_struct
  */
 
-/* new sql table: fetchmail
-
-create table fetchmail(
- id int(11) unsigned not null auto_increment,
- mailbox varchar(255) not null default '',
- src_server varchar(255) not null default '',
- src_auth enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
- src_user varchar(255) not null default '',
- src_password varchar(255) not null default '',
- src_folder varchar(255) not null default '',
- poll_time int(11) unsigned not null default 10,
- fetchall tinyint(1) unsigned not null default 0,
- keep tinyint(1) unsigned not null default 0,
- protocol enum('POP3','IMAP','POP2','ETRN','AUTO'),
- extra_options text,
- returned_text text,
- mda varchar(255) not null default '',
- date timestamp(14),
- primary key(id)
-);
-
-*/
-
 require_once('common.php');
 
 authentication_require_role('admin');

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2008-04-25 20:35:55 UTC (rev 343)
+++ trunk/upgrade.php	2008-04-25 23:31:21 UTC (rev 344)
@@ -800,3 +800,38 @@
     FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
     ");
 }
+
+
+/**
+ * Create fetchmail table
+ */
+function upgrade_344_mysql() {
+
+    $table_vacation_notification = table_by_key('vacation_notification');
+
+    db_query_parsed( "
+        create table fetchmail(
+         id int(11) unsigned not null auto_increment,
+         mailbox varchar(255) not null default '',
+         src_server varchar(255) not null default '',
+         src_auth enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
+         src_user varchar(255) not null default '',
+         src_password varchar(255) not null default '',
+         src_folder varchar(255) not null default '',
+         poll_time int(11) unsigned not null default 10,
+         fetchall tinyint(1) unsigned not null default 0,
+         keep tinyint(1) unsigned not null default 0,
+         protocol enum('POP3','IMAP','POP2','ETRN','AUTO'),
+         extra_options text,
+         returned_text text,
+         mda varchar(255) not null default '',
+         date timestamp(14),
+         primary key(id)
+        );
+    ");
+}
+
+function upgrade_344_pgsql() {
+	# TODO: create fetchmail table for PgSQL
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [343] trunk/common.php

[<chr...@us...>]

Revision: 343
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=343&view=rev
Author:   christian_boltz
Date:     2008-04-25 13:35:55 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
common.php:
- common.php is indirectly included in setup.php (via upgrade.php),
  avoid endless redirect loop from setup.php to setup.php
  (just found some minutes ago, had blocker quality...)

Modified Paths:
--------------
    trunk/common.php

Modified: trunk/common.php
===================================================================
--- trunk/common.php	2008-04-23 15:54:48 UTC (rev 342)
+++ trunk/common.php	2008-04-25 20:35:55 UTC (rev 343)
@@ -28,9 +28,12 @@
     if(!is_file("$incpath/setup.php")) {
         die ("config.inc.php does not exist or is not configured correctly. Please re-install setup.php and create/fix your config.");
     } else {
-        header("Location: setup.php");    
-        exit(0);
-    }
+        # common.php is indirectly included in setup.php (via upgrade.php) - avoid endless redirect loop
+        if (!preg_match('/setup\.php$/', $_SERVER['SCRIPT_NAME'])) { 
+            header("Location: setup.php");
+            exit(0);
+        }
+     }
 }
 
 $incpath = dirname(__FILE__);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [342] trunk/debian/changelog

[<Gin...@us...>]

Revision: 342
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=342&view=rev
Author:   GingerDog
Date:     2008-04-23 08:54:48 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
change version number

Modified Paths:
--------------
    trunk/debian/changelog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-23 15:27:46 UTC (rev 341)
+++ trunk/debian/changelog	2008-04-23 15:54:48 UTC (rev 342)
@@ -1,4 +1,4 @@
-postfixadmin (2.2.0-1rc5) unstable; urgency=low
+postfixadmin (2.2.0-rc5) unstable; urgency=low
 
   * Fix MySQL installation issues (schema not being created!)
   * Fix MySQL vacation_notification timestamp issue


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [341] trunk/debian/changelog

[<Gin...@us...>]

Revision: 341
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=341&view=rev
Author:   GingerDog
Date:     2008-04-23 08:27:46 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
debian/changelog: new release - fix mysql db creation issues

Modified Paths:
--------------
    trunk/debian/changelog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-23 15:25:31 UTC (rev 340)
+++ trunk/debian/changelog	2008-04-23 15:27:46 UTC (rev 341)
@@ -1,3 +1,11 @@
+postfixadmin (2.2.0-1rc5) 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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [340] trunk/upgrade.php

[<Gin...@us...>]

Revision: 340
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=340&view=rev
Author:   GingerDog
Date:     2008-04-23 08:25:31 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
upgrade.php: fix issue of mysql tables not being created on initial install

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2008-04-22 23:05:29 UTC (rev 339)
+++ trunk/upgrade.php	2008-04-23 15:25:31 UTC (rev 340)
@@ -220,6 +220,105 @@
     echo "upgrade_1";
 }
 
+function upgrade_1_mysql() {
+    // CREATE MYSQL DATABASE TABLES.
+    $admin = table_by_key('admin');
+    $alias = table_by_key('alias');
+    $domain = table_by_key('domain');
+    $domain_admins = table_by_key('domain_admins');
+    $log = table_by_key('log');
+    $mailbox = table_by_key('mailbox');
+    $vacation = table_by_key('vacation');
+
+    $sql = array();
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $admin (
+      `username` varchar(255) NOT NULL default '',
+      `password` varchar(255) NOT NULL default '',
+      `created` datetime NOT NULL default '0000-00-00 00:00:00',
+      `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+      `active` tinyint(1) NOT NULL default '1',
+      PRIMARY KEY  (`username`)
+  ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $alias (
+      `address` varchar(255) NOT NULL default '',
+      `goto` text NOT NULL,
+      `domain` varchar(255) NOT NULL default '',
+      `created` datetime NOT NULL default '0000-00-00 00:00:00',
+      `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+      `active` tinyint(1) NOT NULL default '1',
+      PRIMARY KEY  (`address`)
+    ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases'; ";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $domain (
+      `domain` varchar(255) NOT NULL default '',
+      `description` varchar(255) NOT NULL default '',
+      `aliases` int(10) NOT NULL default '0',
+      `mailboxes` int(10) NOT NULL default '0',
+      `maxquota` bigint(20) NOT NULL default '0',
+      `quota` bigint(20) NOT NULL default '0',
+      `transport` varchar(255) default NULL,
+      `backupmx` tinyint(1) NOT NULL default '0',
+      `created` datetime NOT NULL default '0000-00-00 00:00:00',
+      `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+      `active` tinyint(1) NOT NULL default '1',
+      PRIMARY KEY  (`domain`)
+    ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains'; ";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $domain_admins (
+      `username` varchar(255) NOT NULL default '',
+      `domain` varchar(255) NOT NULL default '',
+      `created` datetime NOT NULL default '0000-00-00 00:00:00',
+      `active` tinyint(1) NOT NULL default '1',
+      KEY username (`username`)
+    ) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins';";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $log (
+      `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+      `username` varchar(255) NOT NULL default '',
+      `domain` varchar(255) NOT NULL default '',
+      `action` varchar(255) NOT NULL default '',
+      `data` varchar(255) NOT NULL default '',
+      KEY timestamp (`timestamp`)
+    ) TYPE=MyISAM COMMENT='Postfix Admin - Log';";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $mailbox (
+      `username` varchar(255) NOT NULL default '',
+      `password` varchar(255) NOT NULL default '',
+      `name` varchar(255) NOT NULL default '',
+      `maildir` varchar(255) NOT NULL default '',
+      `quota` bigint(20) NOT NULL default '0',
+      `domain` varchar(255) NOT NULL default '',
+      `created` datetime NOT NULL default '0000-00-00 00:00:00',
+      `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+      `active` tinyint(1) NOT NULL default '1',
+      PRIMARY KEY  (`username`)
+    ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';";
+
+    $sql[] = "
+    CREATE TABLE {IF_NOT_EXISTS} $vacation ( 
+        email varchar(255) NOT NULL default '', 
+        subject varchar(255) NOT NULL default '', 
+        body text NOT NULL, 
+        cache text NOT NULL, 
+        domain varchar(255) NOT NULL default '', 
+        created datetime NOT NULL default '0000-00-00 00:00:00', 
+        active tinyint(4) NOT NULL default '1', 
+        PRIMARY KEY (email), 
+        KEY email (email) 
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation' ;";
+
+    foreach($sql as $query) {
+        db_query_parsed($query);
+    }
+}
+
 function upgrade_2_mysql() {
 # upgrade pre-2.1 database
 # from TABLE_BACKUP_MX.TXT
@@ -671,7 +770,7 @@
             on_vacation varchar(255) NOT NULL,
             notified varchar(255) NOT NULL,
             notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
-    PRIMARY KEY on_vacation (`on_vacation`, `notified`),
+            PRIMARY KEY on_vacation (`on_vacation`, `notified`),
     CONSTRAINT `vacation_notification_pkey` 
     FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
 )
@@ -701,18 +800,3 @@
     FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
     ");
 }
-
-/*
-   TODO
-
-   Database changes that should be done:
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-MySQL:
-* vacation: 
- - DROP INDEX email
- - 'cache' field might be obsolete with vacation_notification - needs to be checked!
-* charset of equal fields MUST be the same (see bugreport)
- */
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [339] trunk/upgrade.php

[<Gin...@us...>]

Revision: 339
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=339&view=rev
Author:   GingerDog
Date:     2008-04-22 16:05:29 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
upgrade.php: fix bug in mysql vacation notification table as reported by gabbs on irc (thanks!)

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2008-04-20 19:59:06 UTC (rev 338)
+++ trunk/upgrade.php	2008-04-22 23:05:29 UTC (rev 339)
@@ -670,7 +670,7 @@
         CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
             on_vacation varchar(255) NOT NULL,
             notified varchar(255) NOT NULL,
-            notified_at timestamp NOT NULL default now(),
+            notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
     PRIMARY KEY on_vacation (`on_vacation`, `notified`),
     CONSTRAINT `vacation_notification_pkey` 
     FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [338] website/index.php

[<gin...@us...>]

Revision: 338
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=338&view=rev
Author:   gingerdog
Date:     2008-04-20 12:59:06 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
index.php - updated

Modified Paths:
--------------
    website/index.php

Modified: website/index.php
===================================================================
--- website/index.php	2008-04-20 19:36:34 UTC (rev 337)
+++ website/index.php	2008-04-20 19:59:06 UTC (rev 338)
@@ -23,32 +23,35 @@
 
 <h3>Requirements</h3>
 <ul>
-<li><a href="http://www.postfix.org">Postfix</a> (success has been reported with Exim!)</li>
-<li><a href="http://mysql.org">MySQL</a> or <a href="http://postgresql.org">PostgreSQL</a></li>
-<li><a href="http://php.net">PHP</a></li>
-<li>And presumably a compatible IMAP/POP3 server (dovecot, courier or cyrus?)</li>
+	<li><a href="http://www.postfix.org">Postfix</a> (success has been reported with Exim!)</li>
+	<li><a href="http://mysql.org">MySQL</a> or <a href="http://postgresql.org">PostgreSQL</a></li>
+	<li><a href="http://php.net">PHP</a></li>
+	<li>And presumably a compatible IMAP/POP3 server (dovecot, courier or cyrus?)</li>
 </ul>
-<h3>Download - Stable release</h3>
 
-<p>The latest stable release is 2.1.0. You can download it <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300&release_id=495972">here</a></p>
+<h3>Download - Nearly stable release</h3>
 
-<h3>Download - Not so stable release</h3>
-
-<p>We've created a .deb package to make installation slightly easier, based on revision 207 of Subversion (11th November 2007). </p>
+<p>We've created a .deb and .rpm packages to try and make installation easier. </p>
 <p>RPM packages for Fedora and openSUSE are available via openSUSE buildservice and usually contain the latest Subversion version.</p>
 <p>This should be judged as being a <b>snapshot</b>, and although it <u>should work</u> - it may not - or some features may be lacking suitable documentation.</p>
 <p>As this is based on the development branch, it's setup is slightly different from that for v2.1.0; but you should be able to figure that out when you visit http://yoursever/postfixadmin after installing it. Note, the .deb does not setup your database in any useful way - so you'll need to do this manually (see /usr/share/doc/postfixadmin)</p>
 
-<p><a href="http://downloads.sourceforge.net/postfixadmin/postfixadmin_2.2.0-1rc1_all.deb?use_mirror=osdn">GingerDog's experimental .deb</a> for installation (based on Subversion revision 207).</p>
+<p><a href="http://downloads.sourceforge.net/postfixadmin/postfixadmin_2.2.0-1rc4_all.deb?use_mirror=osdn">GingerDog's experimental .deb</a> for installation (based on Subversion revision 337) (built on 20th April 2008)</p>
 <p><a href="http://software.opensuse.org/search?q=postfixadmin">RPM packages for openSUSE and Fedora</a> (usually latest Subversion revision).</p>
 
-<h3>Download - Development release</h3>
+<h3>Download - Previous stable release</h3>
 
-<p>The development team expect the codebase in Subversion to become 2.2.0 before the end of 2007. There are a number of show stopping bugs still in place (for instance, no automated way of performing an upgrade, and a number of translations are missing). It should however work!</p>
+<p>Note: This version is pretty much unsupported; you are strongly encouraged to use one of the newer builds off the 2.2 development cycle.</p>
 
-<p>We would recommend that all new users use the version from Subversion, as it has a number of new features and bug fixes. However, it <strong>may contain bugs</strong>. </p>
+<p>If you still want to use it, try <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300&release_id=495972">here</a></p>
 
+<h3>Download - Development/Subversion release</h3>
 
+<p>The development team expected the codebase in Subversion to become 2.2.0 before the end of 2007. Suffice to say, they're not very good at estimating release dates, but as of April 2008, they think 2.2.0rc4 is probably pretty close to the final release.</p>
+
+<p>We would recommend that all new users use one of the 2.2.0rc releases, or run from Subversion. Use of v2.1.0 will probably cause you unnecessary headaches. </p>
+
+
 <p>You can download the source code to Postfixadmin using Subversion :</p>
 
 <code>svn co https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin postfixadmin</code>
@@ -56,8 +59,7 @@
 
 <h3>Upgrading Postfixadmin</h3>
 
-<p>The database schema between version 2.1.0 and what is in Subversion has changed - mostly for vacation related tables, and with the addition of UTF8 support. If you use neither, you <em>probably</em> won't need to do anything.</p>
-<p>We are currently working on an 'upgrade.php' script which will take care of the database changes between revisions. This is still work in progress, and at the time of writing only MySQL is supported for this (due to GingerDog being lazy, and not doing the PostgreSQL changes)</p>
+<p>The database schema between version 2.1.0 and anything later has changed in a number of ways, you should therefore run the 'upgrade.php' script which should take care of all database changes between revisions. </p>
 
 <h3>Other Relevant links and related projects</h3>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [337] trunk/debian/control

[<Gin...@us...>]

Revision: 337
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=337&view=rev
Author:   GingerDog
Date:     2008-04-20 12:36:34 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
pinched vcs lines from squirrelmail

Modified Paths:
--------------
    trunk/debian/control

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-04-20 19:22:54 UTC (rev 336)
+++ trunk/debian/control	2008-04-20 19:36:34 UTC (rev 337)
@@ -4,6 +4,8 @@
 Maintainer: David Goodwin <dav...@pa...>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
+XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
+XS-Vcs-Browse: http://postfixadmin.svn.sourceforge.net/viewvc/postfixadmin/trunk/
 
 Package: postfixadmin
 Architecture: all


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [336] trunk/debian/changelog

[<Gin...@us...>]

Revision: 336
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=336&view=rev
Author:   GingerDog
Date:     2008-04-20 12:22:54 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
changelog: note about svn revision

Modified Paths:
--------------
    trunk/debian/changelog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-20 19:22:14 UTC (rev 335)
+++ trunk/debian/changelog	2008-04-20 19:22:54 UTC (rev 336)
@@ -6,6 +6,7 @@
   * 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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [335] trunk/debian/rules

[<Gin...@us...>]

Revision: 335
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=335&view=rev
Author:   GingerDog
Date:     2008-04-20 12:22:14 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
rules: add motd files in

Modified Paths:
--------------
    trunk/debian/rules

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-04-20 19:21:01 UTC (rev 334)
+++ trunk/debian/rules	2008-04-20 19:22:14 UTC (rev 335)
@@ -21,6 +21,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
+	cp motd* debian/postfixadmin/usr/share/postfixadmin
 	cp *.php debian/postfixadmin/usr/share/postfixadmin
 	mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
 	ln -s /etc/postfixadmin/config.inc.php debian/postfixadmin/usr/share/postfixadmin/config.inc.php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [334] trunk/debian/changelog

[<Gin...@us...>]

Revision: 334
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=334&view=rev
Author:   GingerDog
Date:     2008-04-20 12:21:01 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
changelog: new release - rc4

Modified Paths:
--------------
    trunk/debian/changelog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-17 22:58:36 UTC (rev 333)
+++ trunk/debian/changelog	2008-04-20 19:21:01 UTC (rev 334)
@@ -1,3 +1,14 @@
+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
+
+ -- David Goodwin <dav...@pa...>  Sun, 20 Apr 2008 20:19:00 +0000
+
 postfixadmin (2.2.0-1rc3) unstable; urgency=low
 
   * Various bug fixes


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.