lets try and get rc5 up and around

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

CHANGELOG.TXT

@@ -11,6 +11,14 @@
 # $Id$
 
 
+Version 2.3rc5 - 2009/05/20 - SVN r658
+--------------------------------------
+
+  - Improvements to the setup process
+  - Far better Debian packaging (we hope!) which should make installation much, much easier.
+  - Various bug fixes 
+  - Performance enhancements (or we fixed the regressions ...) in domain listing etc.
+
 Version 2.3rc4 - 2009/04/18 - SVN r632
 --------------------------------------
 

config.inc.php

@@ -29,12 +29,12 @@ if (ereg ("config.inc.php", $_SERVER['PHP_SELF']))
  * Doing this implies you have changed this file as required.
  * i.e. configuring database etc; specifying setup.php password etc.
  */
-$CONF['configured'] = false;
+$CONF['configured'] = true;
 
 // In order to setup Postfixadmin, you MUST specify a hashed password here.
 // To create the hash, visit setup.php in a browser and type a password into the field,
 // on submission it will be echoed out to you as a hashed value.
-$CONF['setup_password'] = 'changeme';
+$CONF['setup_password'] = 'hello';
 
 // Postfix Admin Path
 // Set the location of your Postfix Admin installation here.
@@ -52,10 +52,10 @@ $CONF['default_language'] = 'en';
 // mysql = MySQL 3.23 and 4.0, 4.1 or 5
 // mysqli = MySQL 4.1+ 
 // pgsql = PostgreSQL
-$CONF['database_type'] = 'mysql';
-$CONF['database_host'] = 'localhost';
-$CONF['database_user'] = 'postfix';
-$CONF['database_password'] = 'postfixadmin';
+$CONF['database_type'] = 'pgsql';
+$CONF['database_host'] = 'mysqlserver';
+$CONF['database_user'] = 'dg';
+$CONF['database_password'] = 'gingerdog';
 $CONF['database_name'] = 'postfix';
 $CONF['database_prefix'] = '';
 
@@ -156,7 +156,7 @@ $CONF['maxquota'] = '10';
 
 // Quota
 // When you want to enforce quota for your mailbox users set this to 'YES'.
-$CONF['quota'] = 'NO';
+$CONF['quota'] = 'YES';
 // You can either use '1024000' or '1048576'
 $CONF['quota_multiplier'] = '1024000';
 
@@ -197,7 +197,7 @@ $CONF['vacation_control_admin'] = 'YES';
 // The reason for this is that when you want catch-all and normal mailboxes
 // to work you need to have the mailbox replicated in the alias table.
 // If you want to take control of these aliases as well set this to 'YES'.
-$CONF['alias_control'] = 'NO';
+$CONF['alias_control'] = 'YES';
 
 // Alias Control for admins
 // Set to 'NO' if your domain admins shouldn't be able to edit user aliases.
@@ -362,7 +362,7 @@ $CONF['create_mailbox_subdirs_prefix']='INBOX.';
 // See: DOCUMENTATION/DOVECOT.txt
 //      http://wiki.dovecot.org/Quota/Dict
 //
-// $CONF['used_quotas'] = 'YES';
+$CONF['used_quotas'] = 'YES';
 
 //
 // Normally, the TCP port number does not have to be specified.

functions.inc.php

@@ -22,7 +22,7 @@ if (ereg ("functions.inc.php", $_SERVER['PHP_SELF']))
     exit;
 }
 
-$version = '2.3 rc4';
+$version = '2.3 rc5';
 
 /**
  * check_session

list-virtual.php

@@ -154,9 +154,16 @@ if ($result['rows'] > 0)
 if ($CONF['vacation_control_admin'] == 'YES')
 {
     if (boolconf('used_quotas'))
-        $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota.current FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username WHERE $table_mailbox.domain='$fDomain' AND $table_quota.path='quota/storage' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
+        $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota.current FROM $table_mailbox 
+            LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email 
+            LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username 
+            WHERE $table_mailbox.domain='$fDomain' 
+            ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
+//    AND $table_quota.path='quota/storage' 
     else
-        $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
+        $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox 
+        LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email 
+        WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
 }
 else
 {