--- innwebd/base_active.cpp	2004/09/16 15:41:14	1.5
+++ innwebd/base_active.cpp	2005/02/26 16:10:25	1.7
@@ -1,7 +1,7 @@
 /*******************************************************/
 /*                                                     */
 /*  LeafOK Innbbsd                                     */
-/*  Copyright (C) LeafOK.com, 2003-2004                */
+/*  Copyright (C) LeafOK.com, 2003-2005                */
 /*                                                     */
 /*  Programmed by Leaf                                 */
 /*  E-mail:leaflet@leafok.com  QQ:6049044              */
@@ -533,11 +533,10 @@ int base_active::post_article(const char
 	{
 		//Begin post
 		sql.Format("select bbs.*,innd_conf.group,innd_todo.ID,innd_todo.SID as doSID,"
-			"user_list.username,subdate(bbs.sub_dt, interval '8' hour)"
+			"subdate(bbs.sub_dt, interval '8' hour)"
 			" as sub_gmt from innd_todo inner join innd_conf on"
 			" innd_todo.server=innd_conf.server and innd_todo.SID=innd_conf.SID left join bbs on"
-			" innd_todo.AID=bbs.AID inner join user_list on"
-			" bbs.UID=user_list.UID where innd_conf.out=1 and"
+			" innd_todo.AID=bbs.AID where innd_conf.out=1 and"
 			" innd_conf.passive_mode=0 and innd_conf.server='%s' and"
 			" bbs.visible and innd_todo.op='P' order by bbs.AID",news_server);
 
@@ -652,13 +651,12 @@ int base_active::post_cancel(const char*
 	try
 	{
 		//Begin post
-		sql.Format("select bbs.nickname,innd_todo.ID,innd_conf.group,innd_todo.SID as doSID,"
-			"user_list.username,innd_todo.AID,"
+		sql.Format("select bbs.username,bbs.nickname,innd_todo.ID,innd_conf.group,"
+			"innd_todo.SID as doSID,innd_todo.AID,"
 			"subdate(innd_todo.dt,interval '8' hour) as dt,"
 			"innd_log.msg_id from innd_todo inner join innd_conf on"
 			" innd_todo.server=innd_conf.server and innd_todo.SID=innd_conf.SID left join bbs on"
-			" innd_todo.AID=bbs.AID inner join user_list on"
-			" bbs.UID=user_list.UID inner join innd_log on"
+			" innd_todo.AID=bbs.AID inner join innd_log on"
 			" innd_todo.AID=innd_log.AID where innd_conf.out=1 and"
 			" innd_conf.passive_mode=0 and innd_conf.server='%s' and"
 			" innd_todo.op='C' and innd_log.cancel=0 order by innd_todo.AID",news_server);
@@ -919,11 +917,10 @@ int base_active::ihave_article(const cha
 	{
 		//Begin ihave
 		sql.Format("select bbs.*,innd_todo.ID,innd_conf.group,innd_todo.SID as doSID,"
-			"user_list.username,subdate(bbs.sub_dt, interval '8' hour)"
+			"subdate(bbs.sub_dt, interval '8' hour)"
 			" as sub_gmt from innd_todo inner join innd_conf on"
 			" innd_todo.server=innd_conf.server and innd_todo.SID=innd_conf.SID left join bbs on"
-			" innd_todo.AID=bbs.AID inner join user_list on"
-			" bbs.UID=user_list.UID where innd_conf.out=1 and"
+			" innd_todo.AID=bbs.AID where innd_conf.out=1 and"
 			" innd_conf.passive_mode=1 and innd_conf.server='%s' and"
 			" bbs.visible and innd_todo.op='P' order by bbs.AID",news_server);
 
@@ -1045,13 +1042,12 @@ int base_active::ihave_cancel(const char
 	try
 	{
 		//Begin ihave
-		sql.Format("select bbs.nickname,innd_todo.ID,innd_conf.group,innd_todo.SID as doSID,"
-			"user_list.username,innd_todo.AID,"
+		sql.Format("select bbs.username,bbs.nickname,innd_todo.ID,innd_conf.group,"
+			"innd_todo.SID as doSID,innd_todo.AID,"
 			"subdate(innd_todo.dt,interval '8' hour) as dt,"
 			"innd_log.msg_id from innd_todo inner join innd_conf on"
 			" innd_todo.server=innd_conf.server and innd_todo.SID=innd_conf.SID left join bbs on"
-			" innd_todo.AID=bbs.AID inner join user_list on"
-			" bbs.UID=user_list.UID inner join innd_log on"
+			" innd_todo.AID=bbs.AID inner join innd_log on"
 			" innd_todo.AID=innd_log.AID where innd_conf.out=1 and"
 			" innd_conf.passive_mode=1 and innd_conf.server='%s' and"
 			" innd_todo.op='C' and innd_log.cancel=0 order by innd_todo.AID",news_server);