--- innwebd/base_active.cpp	2004/07/03 13:56:04	1.2
+++ innwebd/base_active.cpp	2004/07/04 08:04:08	1.4
@@ -1,10 +1,10 @@
 /*******************************************************/
 /*                                                     */
-/*  LeafOK Innd                                        */
+/*  LeafOK Innbbsd                                     */
 /*  Copyright (C) LeafOK.com, 2003-2004                */
 /*                                                     */
 /*  Programmed by Leaf                                 */
-/*  E-mail:leaf@leafok.com  QQ:6049044                 */
+/*  E-mail:leaflet@leafok.com  QQ:6049044              */
 /*                                                     */
 /*  http://bbs.leafok.com                              */
 /*  http://bbs.leafok.net                              */
@@ -33,10 +33,6 @@ base_active::~base_active(void)
 
 int base_active::work(bool get, bool use_ihave)
 {
-	HANDLE hThreadCurrent;
-
-	hThreadCurrent = GetCurrentThread();
-
 	if (this->running)
 		return 1;
 
@@ -480,7 +476,7 @@ int base_active::get_cancel(const char*
 				if (i >= step || cur_art_id >= art_end || rec_count >= step*10)
 				{
 					//Delete article
-					sql.Format("select AID from innd_logfile where msg_id in (%s"
+					sql.Format("select AID from innd_log where msg_id in (%s"
 						") and op='I' and cancel=0",msg_id_list);
 
 					RS.Open(CRecordset::snapshot,sql,CRecordset::forwardOnly | CRecordset::readOnly);
@@ -621,7 +617,7 @@ int base_active::post_article(const char
 
 			if (out.Left(3) == "240") // Post successfully
 			{
-				sql.Format("insert delayed into innd_logfile (AID,art_id,msg_id,op) "
+				sql.Format("insert delayed into innd_log (AID,art_id,msg_id,op) "
 					"values(%ld,0,'%s','O')",aid,msg_id);
 				this->Db.ExecuteSQL(sql);
 
@@ -659,13 +655,13 @@ int base_active::post_cancel(const char*
 		sql.Format("select bbs.nickname,innd_todo.ID,innd_conf.group,innd_todo.SID as doSID,"
 			"user_list.username,innd_todo.AID,"
 			"subdate(innd_todo.dt,interval '8' hour) as dt,"
-			"innd_logfile.msg_id from innd_todo inner join innd_conf on"
+			"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_logfile on"
-			" innd_todo.AID=innd_logfile.AID where innd_conf.out=1 and"
+			" bbs.UID=user_list.UID 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_logfile.cancel=0 order by innd_todo.AID",news_server);
+			" innd_todo.op='C' and innd_log.cancel=0 order by innd_todo.AID",news_server);
 
 		RS.Open(CRecordset::snapshot,sql,CRecordset::forwardOnly | CRecordset::readOnly);
 
@@ -724,7 +720,7 @@ int base_active::post_cancel(const char*
 
 			if (out.Left(3) == "240") // Post successfully
 			{
-				sql.Format("update innd_logfile set cancel=1 where msg_id='%s'",cancel_msg_id);
+				sql.Format("update innd_log set cancel=1 where msg_id='%s'",cancel_msg_id);
 				this->Db.ExecuteSQL(sql);
 
 				sql.Format("delete from innd_todo where ID=%ld",id);
@@ -1007,7 +1003,7 @@ int base_active::ihave_article(const cha
 
 			if (out.Left(3) == "235") // Ihave successfully
 			{
-				sql.Format("insert delayed into innd_logfile (AID,art_id,msg_id,op) "
+				sql.Format("insert delayed into innd_log (AID,art_id,msg_id,op) "
 					"values(%ld,0,'%s','O')",aid,msg_id);
 				this->Db.ExecuteSQL(sql);
 
@@ -1052,13 +1048,13 @@ int base_active::ihave_cancel(const char
 		sql.Format("select bbs.nickname,innd_todo.ID,innd_conf.group,innd_todo.SID as doSID,"
 			"user_list.username,innd_todo.AID,"
 			"subdate(innd_todo.dt,interval '8' hour) as dt,"
-			"innd_logfile.msg_id from innd_todo inner join innd_conf on"
+			"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_logfile on"
-			" innd_todo.AID=innd_logfile.AID where innd_conf.out=1 and"
+			" bbs.UID=user_list.UID 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_logfile.cancel=0 order by innd_todo.AID",news_server);
+			" innd_todo.op='C' and innd_log.cancel=0 order by innd_todo.AID",news_server);
 
 		RS.Open(CRecordset::snapshot,sql,CRecordset::forwardOnly | CRecordset::readOnly);
 
@@ -1117,7 +1113,7 @@ int base_active::ihave_cancel(const char
 
 			if (out.Left(3) == "235") // Ihave successfully
 			{
-				sql.Format("update innd_logfile set cancel=1 where msg_id='%s'",cancel_msg_id);
+				sql.Format("update innd_log set cancel=1 where msg_id='%s'",cancel_msg_id);
 				this->Db.ExecuteSQL(sql);
 
 				sql.Format("delete from innd_todo where ID=%ld",id);