SF.net SVN: postfixadmin:[969] branches/postfixadmin-2.3

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

Revision: 969
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=969&view=rev
Author:   christian_boltz
Date:     2011-02-19 20:10:22 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
Merging in various fixes from trunk.

upgrade.php:
- change domain.quota, domain.maxquota and mailbox.quota to bigint in PostgreSQL

setup.php:
- strict boolean check for $CONF['configured'] - similar to the check in login.php

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/setup.php
    branches/postfixadmin-2.3/upgrade.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2011-02-18 21:59:42 UTC (rev 968)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2011-02-19 20:10:22 UTC (rev 969)
@@ -21,6 +21,8 @@
   - functions.inc.php: better error messages when database functions are missing
   - create domain: fixed typo in variable name that broke the default value for
     default aliases
+  - postgres: changed mailbox.quota, domain.quota and domain.maxquota fields
+    to bigint to allow mailboxes >4 GB (run setup.php to upgrade your database)
   - vacation.pl logged literal $variable instead of the variable content at two
     places
   - POSTFIX_CONF.txt: fixed filename for quota map

Modified: branches/postfixadmin-2.3/setup.php
===================================================================
--- branches/postfixadmin-2.3/setup.php	2011-02-18 21:59:42 UTC (rev 968)
+++ branches/postfixadmin-2.3/setup.php	2011-02-19 20:10:22 UTC (rev 969)
@@ -125,7 +125,7 @@
 
     require($incpath.'/config.inc.php');
     if(isset($CONF['configured'])) {
-        if($CONF['configured'] == TRUE) {
+        if($CONF['configured'] === TRUE) {
             print "<li>Checking \$CONF['configured'] - OK\n";
         } else {
             print "<li><b>Warning: \$CONF['configured'] is 'false'.<br>\n";

Modified: branches/postfixadmin-2.3/upgrade.php
===================================================================
--- branches/postfixadmin-2.3/upgrade.php	2011-02-18 21:59:42 UTC (rev 968)
+++ branches/postfixadmin-2.3/upgrade.php	2011-02-19 20:10:22 UTC (rev 969)
@@ -108,7 +108,7 @@
 function _do_upgrade($current_version) {
     global $CONF;
     # $target_version = preg_replace('/[^0-9]/', '', '$Revision$');
-    $target_version = 739; # hardcoded target version for 2.3 branch - increase (by one) if database changes in the branch are necessary
+    $target_version = 740; # hardcoded target version for 2.3 branch - increase (by one) if database changes in the branch are necessary
 
     if ($current_version >= $target_version) {
         # already up to date
@@ -1182,3 +1182,13 @@
             FOR EACH ROW EXECUTE PROCEDURE merge_quota2();
     ");
 }
+
+function upgrade_740_pgsql() { # upgrade_968_pgsql() in SVN trunk
+    # pgsql counterpart for upgrade_169_mysql() - allow really big quota
+    $table_domain = table_by_key ('domain');
+    $table_mailbox = table_by_key('mailbox');
+    db_query_parsed("ALTER TABLE $table_domain  ALTER COLUMN quota    type bigint");
+    db_query_parsed("ALTER TABLE $table_domain  ALTER COLUMN maxquota type bigint");
+    db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN quota    type bigint");
+}
+


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