refactor drop_item[s]() for containers

4 files changed, 21 insertions, 4 deletions

diff --git a/Zotlabs/Daemon/Channel_purge.php b/Zotlabs/Daemon/Channel_purge.php
index 9fceb0fb9..d25edf8ba 100644
--- a/Zotlabs/Daemon/Channel_purge.php
+++ b/Zotlabs/Daemon/Channel_purge.php
@@ -24,7 +24,7 @@ class Channel_purge {
 			);
 			if ($r) {
 				foreach ($r as $rv) {
-					drop_item($rv['id'], false);
+					drop_item($rv['id']);
 				}
 			}
 		} while ($r);
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 3f5ce28eb..186f3efcf 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -76,7 +76,8 @@ class Cron {
 		if ($r) {
 			require_once('include/items.php');
 			foreach ($r as $rr) {
-				drop_item($rr['id'], false, (($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL));
+				drop_item($rr['id'], (($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL), uid: intval($rr['uid']));
+
 				if ($rr['item_wall']) {
 					// The notifier isn't normally invoked unless item_drop is interactive.
 					Master::Summon(['Notifier', 'drop', $rr['id']]);
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
index ad52a6b71..3ac3dee3a 100644
--- a/Zotlabs/Daemon/Expire.php
+++ b/Zotlabs/Daemon/Expire.php
@@ -29,7 +29,7 @@ class Expire {
 		);
 		if ($r) {
 			foreach ($r as $rr) {
-				drop_item($rr['id'], false, DROPITEM_PHASE2);
+				drop_item($rr['id'], DROPITEM_PHASE2);
 			}
 		}
 
diff --git a/Zotlabs/Daemon/Importdoc.php b/Zotlabs/Daemon/Importdoc.php
index c5a81e50c..8f04e05f8 100644
--- a/Zotlabs/Daemon/Importdoc.php
+++ b/Zotlabs/Daemon/Importdoc.php
@@ -18,9 +18,13 @@ class Importdoc {
 	static public function update_docs_dir($s) {
 		$f = basename($s);
 		$d = dirname($s);
-		if ($s === 'doc/html')
+
+		if ($s === 'doc/html') {
 			return;
+		}
+
 		$files = glob("$d/$f");
+
 		if ($files) {
 			foreach ($files as $fi) {
 				if ($fi === 'doc/html') {
@@ -37,6 +41,18 @@ class Importdoc {
 				}
 			}
 		}
+
+		// remove old files that weren't updated (indicates they were most likely deleted).
+		$i = q("select * from item where item_type = 5 and edited < %s - %s",
+			db_utcnow(),
+			db_quoteinterval('14 DAY', true)
+		);
+
+		if ($i) {
+			foreach ($i as $iv) {
+				drop_item($iv['id'], DROPITEM_NORMAL, true);
+			}
+		}
 	}
 }