Browse Source

drop mail delivered flag now that queue is implemented

pull/1/head
Friendika 11 years ago
parent
commit
9be4b3482e
  1. 1
      database.sql
  2. 8
      include/notifier.php
  3. 1
      mod/dfrn_notify.php
  4. 15
      mod/message.php
  5. 5
      update.php

1
database.sql

@ -227,7 +227,6 @@ CREATE TABLE IF NOT EXISTS `mail` (
`contact-id` char(255) NOT NULL,
`title` char(255) NOT NULL,
`body` text NOT NULL,
`delivered` tinyint(1) NOT NULL,
`seen` tinyint(1) NOT NULL,
`replied` tinyint(1) NOT NULL,
`uri` char(255) NOT NULL,

8
include/notifier.php

@ -313,14 +313,6 @@
}
break;
}
if(($cmd === 'mail') && ($deliver_status == 0)) {
$r = q("UPDATE `mail` SET `delivered` = 1 WHERE `id` = %d LIMIT 1",
intval($item_id)
);
}
}
// send additional slaps to mentioned remote tags (@foo@example.com)

1
mod/dfrn_notify.php

@ -105,7 +105,6 @@ function dfrn_notify_post(&$a) {
$msg['contact-id'] = $importer['id'];
$msg['title'] = notags(unxmlify($base['subject'][0]['data']));
$msg['body'] = escape_tags(unxmlify($base['content'][0]['data']));
$msg['delivered'] = 1;
$msg['seen'] = 0;
$msg['replied'] = 0;
$msg['uri'] = notags(unxmlify($base['id'][0]['data']));

15
mod/message.php

@ -47,8 +47,8 @@ function message_post(&$a) {
$replyto = $uri;
$r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`,
`contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
`contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
intval(local_user()),
dbesc($me[0]['name']),
dbesc($me[0]['thumb']),
@ -56,7 +56,6 @@ function message_post(&$a) {
intval($recipient),
dbesc($subject),
dbesc($body),
0,
1,
0,
dbesc($uri),
@ -138,16 +137,6 @@ function message_content(&$a) {
}
}
if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
$post_id = intval($a->argv[2]);
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" & ",
array(),$foo));
goaway($a->get_baseurl() . '/message' );
}
if(($a->argc > 1) && ($a->argv[1] === 'new')) {

5
update.php

@ -176,3 +176,8 @@ function update_1018() {
`content` MEDIUMTEXT NOT NULL
) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
}
function update_1019() {
q("ALTER TABLE `mail` DROP `delivered`");
// leaving open for more updates as this isn't critical enough to roll the build number
}
Loading…
Cancel
Save