mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
fetchmail.php:
- fix bool and date handling for pgsql (patch from Christian Eberl) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1411 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
e0f8d2d8b4
commit
dc86351af6
@ -17,6 +17,7 @@ changes since the 2.3.5 release (postfixadmin-2.3 branch)
|
|||||||
- fix footer link
|
- fix footer link
|
||||||
- focus username input field in login form
|
- focus username input field in login form
|
||||||
- fix double inclusion of config.inc.php in setup.php
|
- 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)
|
Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
|
||||||
----------------------------------------------------------------
|
----------------------------------------------------------------
|
||||||
|
@ -210,6 +210,11 @@ if ($cancel) { # cancel $new or $edit
|
|||||||
} elseif ($edit) { # edit entry form
|
} elseif ($edit) { # edit entry form
|
||||||
$formvars = $edit_row;
|
$formvars = $edit_row;
|
||||||
$formvars['src_password'] = '';
|
$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
|
} elseif ($new) { # create entry form
|
||||||
foreach (array_keys($fm_struct) as $value) {
|
foreach (array_keys($fm_struct) as $value) {
|
||||||
if (isset($fm_defaults[$value])) {
|
if (isset($fm_defaults[$value])) {
|
||||||
@ -226,6 +231,15 @@ if ($edit + $new == 0) { # display list
|
|||||||
$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");
|
$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) {
|
if ($res['rows'] > 0) {
|
||||||
while ($row = db_array ($res['result'])) {
|
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;
|
$tFmail[] = $row;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user