Version 2.2.2

upload/sources/action_public/moderate.php

@@ -2,16 +2,26 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board
+|   Invision Power Board 2.2.2
 |   =============================================
 |   by Matthew Mecham
 |   (c) 2001 - 2006 Invision Power Services, Inc.
 |   http://www.invisionpower.com
 |   =============================================
 |   Web: http://www.invisionboard.com
+|        http://www.ibresource.ru/products/invisionpowerboard/
+|   Time: Monday 05th of March 2007 10:10:54 PM
+|   Release: e3790216629e5a2aaf37070b32237f06
 |   Licence Info: http://www.invisionboard.com/?license
+|                 http://www.ibresource.ru/license
 +---------------------------------------------------------------------------
-|   > $Date: 2006-09-22 11:28:54 +0100 (Fri, 22 Sep 2006) $
+|   INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
++---------------------------------------------------------------------------
+|   INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
+|   Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
+|   Ïðàâà íà ïåðåâîä IBResource (http://www.ibresource.ru)
++---------------------------------------------------------------------------
+|   > $Date: 2006-09-22 05:28:54 -0500 (Fri, 22 Sep 2006) $
 |   > $Revision: 567 $
 |   > $Author: matt $
 +---------------------------------------------------------------------------
@@ -29,7 +39,7 @@
 
 if ( ! defined( 'IN_IPB' ) )
 {
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	print "<h1>Íåêîððåêòíûé àäðåñ</h1>Âû íå èìååòå äîñòóïà ê ýòîìó ôàéëó íàïðÿìóþ. Åñëè âû íåäàâíî îáíîâëÿëè ôîðóì, âû äîëæíû îáíîâèòü âñå ñîîòâåòñòâóþùèå ôàéëû.";
 	exit();
 }
 
@@ -1442,6 +1452,7 @@ class moderate
 			$new_post_key   = md5(time());
 			$topics         = array();
 			$forums         = array();
+			$append_edit	= 0;
 			
 			$this->ipsclass->DB->cache_add_query( 'moderate_get_topics', array( 'pids' => $this->pids ) );
 			$this->ipsclass->DB->cache_exec_query();
@@ -1462,6 +1473,11 @@ class moderate
 				{
 					$post_to_delete[] = $p['pid'];
 				}
+				
+				if( $p['append_edit'] )
+				{
+					$append_edit = 1;
+				}
 			}
 			
 			//-----------------------------------------
@@ -1472,7 +1488,10 @@ class moderate
 											'author_name' => $author['name'],
 											'post'        => $post,
 											'post_key'    => $new_post_key,
-											'post_parent' => 0
+											'post_parent' => 0, 
+											'edit_time'	  => time(),
+											'edit_name'	  => $this->ipsclass->member['members_display_name'],
+											'append_edit' => ( $append_edit OR !$this->ipsclass->member['g_append_edit'] ) ? 1 : 0,
 										  ), 'pid='.$this->ipsclass->input['postdate']
 						 );
 						 
@@ -1558,6 +1577,8 @@ class moderate
 			}
 			
 			$this->modfunc->stats_recount();
+			
+			$this->moderate_log( sprintf( $this->ipsclass->lang['acp_merged_posts'], implode( ", ", $this->pids ) ) );
 		}
 	}
 	
@@ -1873,8 +1894,6 @@ class moderate
 		
 		$this->modfunc->topic_delete($tid_array);
 		
-		$this->moderate_log( $this->ipsclass->lang['acp_pruned_forum'] );
-		
 		//-----------------------------------------
 		// Show results or refresh..
 		//-----------------------------------------
@@ -1885,6 +1904,8 @@ class moderate
 			// Done...
 			//-----------------------------------------
 			
+			$this->moderate_log( $this->ipsclass->lang['acp_pruned_forum'] );
+			
 			$this->ipsclass->input['check'] = 0;
 			$this->prune_start( $this->ipsclass->compiled_templates['skin_mod']->mod_simple_page( $this->ipsclass->lang['cp_results'], $this->ipsclass->lang['cp_result_del'].($max)  ) );
 		}
@@ -2936,7 +2957,7 @@ class moderate
 		// Get the topic from the DB
 		//-----------------------------------------
 		
-		$this->ipsclass->DB->simple_construct( array( 'select' => 'tid, title, forum_id, last_post, last_poster_id, last_poster_name, posts, views', 'from' => 'topics', 'where' => 'tid='.intval($old_id) ) );
+		$this->ipsclass->DB->simple_construct( array( 'select' => 'tid, title, forum_id, last_post, last_poster_id, last_poster_name, posts, views, topic_hasattach', 'from' => 'topics', 'where' => 'tid='.intval($old_id) ) );
 		$this->ipsclass->DB->simple_exec();
 		
 		if ( ! $old_topic = $this->ipsclass->DB->fetch_row() )
@@ -3032,6 +3053,11 @@ class moderate
 			$updater['last_poster_id']   = $old_topic['last_poster_id'];
 		}
 		
+		if( $old_topic['topic_hasattach'] )
+		{
+			$updater['topic_hasattach'] = $old_topic['topic_hasattach'];
+		}
+		
 		// We need to now count the original post, which isn't in the "posts" field 'cos it was a new topic
 		
 		$old_topic['posts']++;