From 111495423c46df986f5baef45b4c9495c280cc26 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 14 Mar 2013 23:15:15 +0100 Subject: [PATCH] Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. --- include/onepoll.php | 18 +++++++++++------- view/theme/vier/style.css | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/onepoll.php b/include/onepoll.php index d5b1668d4f..bd20cfdb53 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -331,13 +331,17 @@ function onepoll_run(&$argv, &$argc){ ); if(count($r)) { - logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); - if($meta->deleted && ! $r[0]['deleted']) { - q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($r[0]['id']) - ); - } + logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG); + + // Only delete when mails aren't automatically moved or deleted + if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3)) + if($meta->deleted && ! $r[0]['deleted']) { + q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($r[0]['id']) + ); + } + switch ($mailconf[0]['action']) { case 0: logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 1595499ee0..29863e744b 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1117,7 +1117,7 @@ border-bottom: 1px solid #D2D2D2; font-size: 14px; } .wall-item-container .wall-item-bottom { - opacity: 0.5; + opacity: 0; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out; -- 2.39.5