Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #658 from annando/master

Browse source 
Mail importing problems, a small "vier" change
This commit is contained in:
Tobias Diekershoff 2013-03-30 01:46:13 -07:00
parent ad48ab2928 eabefb2f04
commit cda327a368
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/onepoll.php
View file

@ -331,13 +331,17 @@ function onepoll_run(&$argv, &$argc){
); );
if(count($r)) { if(count($r)) {
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); 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']) { if($meta->deleted && ! $r[0]['deleted']) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($r[0]['id']) intval($r[0]['id'])
); );
} }
switch ($mailconf[0]['action']) { switch ($mailconf[0]['action']) {
case 0: case 0:
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);

6
view/theme/vier/style.css
View file

@ -291,9 +291,9 @@ blockquote.shared_content {
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
/* background-color: #ffffff; */ background-color: #ffffff;
/* background-color: #ddd; */ /* background-color: #ddd; */
background-color: #F2F2F2; /* background-color: #F2F2F2; */
color: #2d2d2d; color: #2d2d2d;
/* margin: 37px 0px 0px 0px; */ /* margin: 37px 0px 0px 0px; */
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
@ -1117,7 +1117,7 @@ border-bottom: 1px solid #D2D2D2;
font-size: 14px; font-size: 14px;
} }
.wall-item-container .wall-item-bottom { .wall-item-container .wall-item-bottom {
opacity: 0.5; opacity: 0;
-webkit-transition: all 0.2s ease-in-out; -webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out;