remove deprecated table

6 files changed, 2 insertions, 39 deletions

diff --git a/doc/database.bb b/doc/database.bb
index 001acd220..d327adbdc 100644
--- a/doc/database.bb
+++ b/doc/database.bb
@@ -29,7 +29,6 @@
 [tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td]other identifiers on other services for posts[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_manage]manage[/zrl][/td][td]Deprecated table of accounts that can "su" each other[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_menu_item]menu_item[/zrl][/td][td]entries for webpage menus[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_notify]notify[/zrl][/td][td]notifications[/td][/tr]
diff --git a/doc/database/db_manage.bb b/doc/database/db_manage.bb
deleted file mode 100644
index a0fdf5aa6..000000000
--- a/doc/database/db_manage.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-[table]
-[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra
-[/th][/tr]
-[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment
-[/td][/tr]
-[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
-[/td][/tr]
-[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
-[/td][/tr]
-[/table]
-
-Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
\ No newline at end of file
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
index 205ac84e8..99dd8f8f3 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/intro_for_developers.bb
@@ -63,7 +63,6 @@
     [li]item_id - other identifiers on other services for posts[/li]

     [li]likes - likes of 'things'[/li]

     [li]mail - private messages[/li]

-    [li]manage - deprecated table of accounts that can "su" each other[/li]

     [li]menu - channel menu data[/li]

     [li]menu_item - items uses by channel menus[/li]

     [li]notify - notifications[/li]

diff --git a/include/deliver.php b/include/deliver.php
index a333e6fe3..cef8f7912 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -41,17 +41,12 @@ function deliver_run($argv, $argc) {
 					);
 					if($y) {
 						if(intval($y[0]['site_dead'])) {
-							q("delete from outq where outq_posturl = '%s'",
-								dbesc($r[0]['outq_posturl'])
-							);
+							remove_queue_by_posturl($r[0]['outq_posturl']);
 							logger('dead site ignored ' . $base);
 							continue;							
 						}
 						if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
-							q("update outq set outq_priority = %d where outq_hash = '%s'",
-								intval($r[0]['outq_priority'] + 10),
-								dbesc($r[0]['outq_hash'])
-							);
+							update_queue_item($r[0]['outq_hash'],10);
 							logger('immediate delivery deferred for site ' . $base);
 							continue;
 						}
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 9c24cbd94..3d7ea41df 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -772,15 +772,6 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `mail_obscured` (`mail_obscured`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `manage` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `uid` int(11) NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`id`),
-  KEY `uid` (`uid`),
-  KEY `xchan` (`xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 0214c0c2a..5cabbc2c9 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -767,15 +767,6 @@ create index "mail_isreply" on mail ("mail_isreply");
 create index "mail_seen" on mail ("mail_seen");
 create index "mail_recalled" on mail ("mail_recalled");
 create index "mail_obscured" on mail ("mail_obscured");
-CREATE TABLE "manage" (
-  "id" serial NOT NULL,
-  "uid" bigint NOT NULL,
-  "xchan" text NOT NULL DEFAULT '',
-  PRIMARY KEY ("id")
-
-);
-create index "manage_uid" on manage ("uid");
-create index "manage_xchan" on manage ("xchan");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
   "menu_channel_id" bigint  NOT NULL DEFAULT '0',