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

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

Revision: 1411
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1411&view=rev
Author:   christian_boltz
Date:     2012-10-31 00:04:31 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
fetchmail.php:
- fix bool and date handling for pgsql
  (patch from Christian Eberl)

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

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2012-10-31 00:01:51 UTC (rev 1410)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2012-10-31 00:04:31 UTC (rev 1411)
@@ -17,6 +17,7 @@
   - fix footer link
   - focus username input field in login form
   - fix double inclusion of config.inc.php in setup.php
+  - fix bool and date handling in fetchmail
 
 Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------

Modified: branches/postfixadmin-2.3/fetchmail.php
===================================================================
--- branches/postfixadmin-2.3/fetchmail.php	2012-10-31 00:01:51 UTC (rev 1410)
+++ branches/postfixadmin-2.3/fetchmail.php	2012-10-31 00:04:31 UTC (rev 1411)
@@ -210,6 +210,11 @@
 } elseif ($edit) { # edit entry form
    $formvars = $edit_row;
    $formvars['src_password'] = '';
+   if ('pgsql'==$CONF['database_type']) {
+      $formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0;
+      $formvars['keep']=('t'==$formvars['keep']) ? 1 : 0;
+      $formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0;
+   }
 } elseif ($new) { # create entry form
    foreach (array_keys($fm_struct) as $value) {
       if (isset($fm_defaults[$value])) {
@@ -226,6 +231,15 @@
    $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE mailbox IN ($user_mailboxes_sql) ORDER BY mailbox,src_server,src_user");
    if ($res['rows'] > 0) {
       while ($row = db_array ($res['result'])) {
+         if ('pgsql'==$CONF['database_type']) {
+            //. at least in my database, $row['modified'] already looks like : 2009-04-11 21:38:10.75586+01,
+            // while gmstrftime expects an integer value. strtotime seems happy though.
+            //$row['date']=gmstrftime('%c %Z',$row['date']);
+            $row['date'] = date('Y-m-d H:i:s', strtotime($row['date']));
+            $row['fetchall']=('t'==$row['fetchall']) ? 1 : 0;
+            $row['keep']=('t'==$row['keep']) ? 1 : 0;
+            $row['usessl']=('t'==$row['usessl']) ? 1 : 0;
+         }
          $tFmail[] = $row;
       }
    }

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