Version 2.2.2

upload/sources/action_public/forums.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-28 23:05:45 +0100 (Thu, 28 Sep 2006) $
+|   INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
++---------------------------------------------------------------------------
+|   INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
+|   Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
+|   Ïðàâà íà ïåðåâîä IBResource (http://www.ibresource.ru)
++---------------------------------------------------------------------------
+|   > $Date: 2006-09-28 17:05:45 -0500 (Thu, 28 Sep 2006) $
 |   > $Revision: 587 $
 |   > $Author: bfarber $
 +---------------------------------------------------------------------------
@@ -28,7 +38,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();
 }
 
@@ -459,7 +469,7 @@ class forums {
 				{
 					if ( $announce['announce_start'] )
 					{
-						$announce['announce_start'] = gmdate( 'jS F Y', $announce['announce_start'] );
+						$announce['announce_start'] = gmdate( 'd.m.Y', $announce['announce_start'] );
 					}
 					else
 					{
@@ -1110,11 +1120,22 @@ class forums {
 				}
 				else
 				{
+					// Better safe than sorry - been seeing a lot of SQL errors popping up about the dup unique key
+					
+					$check = $this->ipsclass->DB->build_and_exec_query( array( 'select' => 'marker_forum_id', 'from' => 'topic_markers', 'where' => 'marker_member_id='.$this->ipsclass->member['id'].' AND marker_forum_id='.$this->forum['id'] ) );
+					
+					if( !$check['marker_forum_id'] )
+					{
 					$save_array['marker_member_id'] = $this->ipsclass->member['id'];
 					$save_array['marker_forum_id']  = $this->forum['id'];
 					
 					$this->ipsclass->DB->do_shutdown_insert( 'topic_markers', $save_array );
 				}
+					else
+					{
+						$this->ipsclass->DB->do_shutdown_update( 'topic_markers', $save_array, 'marker_member_id='.$this->ipsclass->member['id'].' AND marker_forum_id='.$this->forum['id'] );
+					}
+				}
 			}
 		}
 		
@@ -1142,8 +1163,19 @@ class forums {
 			$cut_off = ($this->ipsclass->vars['au_cutoff'] != "") ? $this->ipsclass->vars['au_cutoff'] * 60 : 900;
 			$time    = time() - $cut_off;
 			
-			$this->ipsclass->DB->cache_add_query('forums_get_active_users',  array( 'fid' => $this->forum['id'], 'time' => $time ) );
-			$this->ipsclass->DB->simple_exec();
+			$this->ipsclass->DB->build_query( array( 'select'	=> 's.member_id, s.member_name, s.member_group, s.id, s.login_type, s.location, s.running_time',
+													 'from'		=> array( 'sessions' => 's' ),
+													 'where'	=> "s.location_2_type='forum' AND s.location_2_id={$this->forum['id']} AND s.running_time > {$time}	AND s.in_error=0",
+													 'add_join'	=> array(
+													 					array(
+													 							'type'		=> 'left',
+													 							'select'	=> 't.forum_id',
+													 							'where'		=> 't.tid=s.location_1_id',
+													 							'from'		=> array( 'topics' => 't' ),
+													 						),
+													 					),
+											)		);
+			$this->ipsclass->DB->exec_query();
 			
 			//-----------------------------------------
 			// ACTIVE USERS
@@ -1418,6 +1450,13 @@ class forums {
 		
 		if ($topic['posts'])
 		{
+			$mode = $this->ipsclass->my_getcookie( 'topicmode' );
+			
+			if( $mode == 'threaded' )
+			{
+				$this->ipsclass->vars['display_max_posts'] = $this->ipsclass->vars['threaded_per_page'];
+			}
+			
 			if ( (($topic['posts'] + 1) % $this->ipsclass->vars['display_max_posts']) == 0 )
 			{
 				$pages = ($topic['posts'] + 1) / $this->ipsclass->vars['display_max_posts'];