drop mail delivered flag now that queue is implemented

diff --git a/database.sql b/database.sql
index ea1523e2898107e8490f3ca445dfe4e14631e535..8cf72417906f931592514ffe2cbe2cc3c882bb7e 100644 (file)
--- 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 dde538a6b1b266e7e351eebfbf42c7ec85def81a..8710274185a8640f53dfcf12998df283478dbc30 100644 (file)
--- 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 0a3dac2546da0efb075371eba1ff7f126ca33cb6..f0c4f0c643265d8507ef8587b04ff2ba84564fd5 100644 (file)
--- 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 3f5b71cc2f34bb50eedab36e26648a35b5ff1948..fa4af3f466de0f472681b967899b9e54071fd4af 100644 (file)
--- 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 57020966ffa94a5f14d22144d7d91228bcef1b7e..9a829ce8b4840b8998ec43a3138cde19b9625725 100644 (file)
--- 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