aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-23 16:08:48 -0800
committerFriendika <info@friendika.com>2010-11-23 16:08:48 -0800
commit9be4b3482ed48ecd930105aec00a985cfee184ee (patch)
tree2d8ba950f7851348910f20df614f82565520d317
parent15f011b34c3a6005fc4d0b6230db44e7ccfa4fcc (diff)
downloadvolse-hubzilla-9be4b3482ed48ecd930105aec00a985cfee184ee.tar.gz
volse-hubzilla-9be4b3482ed48ecd930105aec00a985cfee184ee.tar.bz2
volse-hubzilla-9be4b3482ed48ecd930105aec00a985cfee184ee.zip
drop mail delivered flag now that queue is implemented
-rw-r--r--database.sql1
-rw-r--r--include/notifier.php8
-rw-r--r--mod/dfrn_notify.php1
-rw-r--r--mod/message.php15
-rw-r--r--update.php5
5 files changed, 7 insertions, 23 deletions
diff --git a/database.sql b/database.sql
index ea1523e28..8cf724179 100644
--- a/database.sql
+++ b/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,
diff --git a/include/notifier.php b/include/notifier.php
index dde538a6b..871027418 100644
--- a/include/notifier.php
+++ b/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)
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 0a3dac254..f0c4f0c64 100644
--- a/mod/dfrn_notify.php
+++ b/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']));
diff --git a/mod/message.php b/mod/message.php
index 3f5b71cc2..fa4af3f46 100644
--- a/mod/message.php
+++ b/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')) {
diff --git a/update.php b/update.php
index 57020966f..9a829ce8b 100644
--- a/update.php
+++ b/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
+} \ No newline at end of file