sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.4.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:40:53 -08:00
1 parent e4478369d8
commit b45ea0dffb
1568 files changed
+155104 -161665
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/applications/forums/modules_public/ajax/attachments.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Grab attachments and return via AJAX (AJAX)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/ajax/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 14th May 2003
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.5
* @version v3.4.6
* $Revision: 8655 $
*/
upload/admin/applications/forums/modules_public/ajax/emoticons.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Ourputs emoticon list via AJAX (AJAX)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/ajax/forums.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Fetch topics and other data from the forum
* Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
* </pre>
upload/admin/applications/forums/modules_public/ajax/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/ajax/markasread.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Ajax Functions For Topics
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/ajax/stats.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Retrieve who posted stats
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/ajax/topics.php
+48 -48
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Ajax Functions For Topics
* Last Updated: $Date: 2013-05-28 21:40:33 -0400 (Tue, 28 May 2013) $
* Last Updated: $Date: 2013-10-16 19:11:24 -0400 (Wed, 16 Oct 2013) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: rashbrook $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @subpackage Forums
* @link http://www.invisionpower.com
* @version $Revision: 12274 $
* @version $Revision: 12381 $
*/
if ( ! defined( 'IN_IPB' ) )
@@ -30,7 +30,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
* @param object Registry reference
* @return @e void [Outputs for the ajax handler]
*/
public function doExecute( ipsRegistry $registry )
public function doExecute( ipsRegistry $registry )
{
/* Load topic class */
if ( ! $this->registry->isClassLoaded('topics') )
@@ -104,7 +104,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
/**
* The pop-up modal yodal
*
*
*/
protected function _postShareModal()
{
@@ -139,7 +139,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
return $this->returnHtml( $this->lang->words['no_permission'] );
}
$url = $this->registry->output->buildSEOUrl( 'showtopic=' . $tid . '&p=' . $pid, 'public', $topic['title_seo'], 'showtopic' );
$url = $this->registry->output->buildSEOUrl( 'showtopic=' . $tid . '&p=' . $pid, 'public', $topic['title_seo'], 'showtopic' );
$forum = $this->registry->getClass('class_forums')->getForumById( $topic['forum_id'] );
@@ -237,7 +237,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$this->returnJsonArray( array( 'count' => 0 ) );
}
/* Get posts */
/* Get posts */
$posts = $this->_getPosts( $topicId, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
/* Got anything sailor? */
@@ -268,7 +268,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$this->returnHtml( '' );
}
/* Get posts */
/* Get posts */
$posts = $this->_getPosts( $topicId, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
/* Got anything sailor? */
@@ -366,7 +366,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
//-----------------------------------------
if ( ! is_object( $this->class_attach ) )
{
{
$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
$this->class_attach = new $classToLoad( $this->registry );
}
@@ -556,10 +556,10 @@ class public_forums_ajax_topics extends ipsAjaxCommand
if ( $_lastPost['topic_id'] == $tid )
{
$this->returnJsonError( $this->lang->words['topic_duplicate_post'] );
}
}
}
/* Regular group flood check */
/* Regular group flood check */
if ( $this->settings['flood_control'] > 0 && $this->memberData['g_avoid_flood'] != 1 )
{
if ( ( time() - $this->memberData['last_post'] < $this->settings['flood_control'] ) OR time() < $this->memberData['last_post'] )
@@ -636,7 +636,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$topic = $this->registry->getClass('topics')->setUpTopic( $this->registry->getClass('topics')->getTopicData() );
$topic['_canReport'] = $reports->canReport( 'post' );
/* Get posts */
/* Get posts */
$posts = $this->_getPosts( $tid, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
IPSDebug::fireBug( 'info', array( 'Found ' . count($posts) . ' posts...' ) );
@@ -670,6 +670,8 @@ class public_forums_ajax_topics extends ipsAjaxCommand
( $data['queued'] == 2 and $this->memberData['forumsModeratorData'][ $forumData['id'] ]['bw_mod_un_soft_delete'] )
or
( $data['queued'] == 0 and $this->memberData['forumsModeratorData'][ $forumData['id'] ]['bw_mod_soft_delete'] )
or
$this->memberData['forumsModeratorData'][ $forumData['id'] ]['split_merge']
)
)
)
@@ -689,7 +691,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
{
$this->returnHtml( $html );
}
}
}
}
catch ( Exception $error )
{
@@ -838,7 +840,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
foreach( $_posts as $pid => $r )
foreach( $_posts as $postid => $r )
{
$r['tid'] = $topic['tid'];
$r['title_seo'] = $topic['title_seo'];
@@ -875,23 +877,22 @@ class public_forums_ajax_topics extends ipsAjaxCommand
'postId' => array( $pid ),
'archiveToNative' => true,
'isArchivedTopic' => $this->registry->topics->isArchived( $topic ) ) );
$posts['search'] = array_pop( $_posts );
}
$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
$parser = new $classToLoad();
/* Set up some settings */
$parser->set( array( 'parseArea' => 'topics',
'memberData' => $this->memberData,
'parseBBCode' => $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_ibc'],
'parseHtml' => ( $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_html'] and $this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'] and $data['post_htmlstate'] ) ? 1 : 0,
'parseEmoticons' => $data['use_emo'] ) );
/* Still here? */
foreach( $posts as $k => $data )
{
/* Set up settings for this post */
$parser->set( array( 'parseArea' => 'topics',
'memberData' => $this->memberData,
'parseBBCode' => $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_ibc'],
'parseHtml' => ( $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_html'] and $this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'] and $data['post_htmlstate'] ) ? 1 : 0,
'parseEmoticons' => $data['use_emo'] ) );
$data = IPSMember::buildDisplayData( $data );
$data['post'] = $parser->stripQuotes( $data['post'] );
@@ -977,7 +978,6 @@ class public_forums_ajax_topics extends ipsAjaxCommand
/* INIT */
$topic_id = intval( $this->request['t'] );
$rating_id = intval( $this->request['rating'] );
$vote_cast = array();
IPSDebug::fireBug( 'info', array( 'The topic rating request has been received...' ) );
@@ -996,7 +996,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
IPSDebug::fireBug( 'error', array( 'The topic is not open' ) );
$this->returnJsonArray( array( 'error_key' => 'topic_rate_locked', 'error_code' => 10348 ) );
}
}
/* Query Forum */
$forum_data = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'forums', 'where' => "id={$topic_data['forum_id']}" ) );
@@ -1012,7 +1012,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
exit();
}
/* Sneaky members rating topic more than 5? */
/* Sneaky members rating topic more than 5? */
if( $rating_id > 5 )
{
$rating_id = 5;
@@ -1060,22 +1060,22 @@ class public_forums_ajax_topics extends ipsAjaxCommand
/* NEW RATING! */
else
{
$this->DB->insert( 'topic_ratings', array(
$this->DB->insert( 'topic_ratings', array(
'rating_tid' => $topic_data['tid'],
'rating_member_id' => $this->memberData['member_id'],
'rating_value' => $rating_id,
'rating_ip_address' => $this->member->ip_address
)
'rating_ip_address' => $this->member->ip_address
)
);
$this->DB->update( 'topics', array(
$this->DB->update( 'topics', array(
'topic_rating_hits' => intval( $topic_data['topic_rating_hits'] ) + 1,
'topic_rating_total' => intval( $topic_data['topic_rating_total'] ) + $rating_id
'topic_rating_total' => intval( $topic_data['topic_rating_total'] ) + $rating_id
), 'tid='.$topic_data['tid'] );
IPSDebug::fireBug( 'info', array( 'The rating was inserted' ) );
$this->returnJsonArray( array(
$this->returnJsonArray( array(
'rated' => 'new',
'message' => $this->lang->words['topic_rating_done'],
'topic_rating_total' => intval( $topic_data['topic_rating_total'] ) + $rating_id ,
@@ -1083,7 +1083,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
'_rate_int' => round( (intval( $topic_data['topic_rating_total'] ) + $rating_id) / (intval( $topic_data['topic_rating_hits'] ) + 1) )
) );
}
}
}
/**
* Saves a ajax topic title edit
@@ -1099,7 +1099,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
/* Check ID */
if( ! $tid )
{
{
$this->returnJsonError( $this->lang->words['ajax_no_topic_id'] );
}
@@ -1107,7 +1107,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid=' . $tid ) );
if( ! $topic['tid'] )
{
{
$this->returnJsonError( $this->lang->words['ajax_topic_not_found'] );
}
@@ -1135,7 +1135,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
}
/* Clean */
if( $this->settings['etfilter_shout'] && mb_strtoupper($this->_topicTitle) == $this->_topicTitle )
if( $this->settings['etfilter_shout'] )
{
if( function_exists('mb_convert_case') )
{
@@ -1145,12 +1145,12 @@ class public_forums_ajax_topics extends ipsAjaxCommand
}
else
{
$name = ucwords( mb_strtolower($name) );
$name = ucwords( strtolower($name) );
}
}
else
{
$name = ucwords( mb_strtolower($name) );
$name = ucwords( strtolower($name) );
}
}
@@ -1173,7 +1173,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
'topic_title' => $name,
'action' => sprintf( $this->lang->words['ajax_topictitle'], $topic['title'], $name),
'query_string' => htmlspecialchars( my_getenv('QUERY_STRING') ),
) );
) );
/* Update the last topic title? */
if ( $topic['tid'] == $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['last_id'] )
@@ -1184,7 +1184,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
if ( $topic['tid'] == $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['newest_id'] )
{
$this->DB->update( 'forums', array( 'newest_title' => $name ), 'id=' . $topic['forum_id'] );
}
}
/* All Done */
$this->returnJsonArray( array( 'title' => $name, 'url' => $this->registry->output->buildSEOUrl( 'showtopic=' . $tid, 'public', $title_seo, 'showtopic' ) ) );
@@ -1200,7 +1200,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
{
if( $this->settings['etfilter_punct'] )
{
$title = preg_replace( '/\?{1,}/' , "?" , $title );
$title = preg_replace( '/\?{1,}/' , "?" , $title );
$title = preg_replace( '/(&#33;){1,}/' , "&#33;", $title );
}
@@ -1216,7 +1216,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$title = trim( $title );
return $title;
}
}
/**
* Saves the post
@@ -1282,15 +1282,15 @@ class public_forums_ajax_topics extends ipsAjaxCommand
$this->postClass->setForumID( $fid );
$this->postClass->setPublished( 'reply' );
$this->postClass->setSettings( array( 'post_htmlstatus' => intval( $this->request['post_htmlstatus'] ) ) );
$this->postClass->setSettings( array( 'post_htmlstatus' => intval( $this->request['post_htmlstatus'] ) ) );
/* Topic Data */
$this->postClass->setTopicData( $this->DB->buildAndFetch( array(
'select' => 't.*, p.poll_only',
'from' => array( 'topics' => 't' ),
$this->postClass->setTopicData( $this->DB->buildAndFetch( array(
'select' => 't.*, p.poll_only',
'from' => array( 'topics' => 't' ),
'where' => "t.forum_id={$fid} AND t.tid={$tid}",
'add_join' => array(
array(
array(
'type' => 'left',
'from' => array( 'polls' => 'p' ),
'where' => 'p.tid=t.tid'
@@ -1342,7 +1342,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
if ( IPSText::getTextClass( 'bbcode' )->error )
{
$this->returnJsonError( $this->lang->words[ IPSText::getTextClass( 'bbcode' )->error ] );
}
}
$edit_by = '';
upload/admin/applications/forums/modules_public/extras/answer.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* QA system methods (Matt mecham)
* Last Updated: $Date: 2012-08-28 22:56:22 +0100 (Tue, 28 Aug 2012) $
* </pre>
upload/admin/applications/forums/modules_public/extras/boardrules.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Board Rules
* Last Updated: $Date: 2012-10-10 17:49:08 -0400 (Wed, 10 Oct 2012) $
* </pre>
upload/admin/applications/forums/modules_public/extras/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.5
* @version v3.4.6
* $Revision: 8655 $
*/
upload/admin/applications/forums/modules_public/extras/forward.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Forward a topic to someone
* Last Updated: $Date: 2013-04-15 17:26:30 -0400 (Mon, 15 Apr 2013) $
* </pre>
upload/admin/applications/forums/modules_public/extras/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/extras/legends.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Emoticon and BBCode Legends
* Last Updated: $Date: 2013-03-26 09:06:10 -0400 (Tue, 26 Mar 2013) $
* </pre>
upload/admin/applications/forums/modules_public/extras/rating.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Add rating fallback
* Last Updated: $Date: 2013-03-19 10:12:37 -0400 (Tue, 19 Mar 2013) $
* </pre>
upload/admin/applications/forums/modules_public/extras/stats.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Member stats functions
* Last Updated: $Date: 2012-11-08 12:08:29 -0500 (Thu, 08 Nov 2012) $
* </pre>
upload/admin/applications/forums/modules_public/extras/toggle.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Silly toggle function(?s{0,})
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/extras/vote.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Poll voting
* Last Updated: $Date: 2012-11-06 04:19:50 -0500 (Tue, 06 Nov 2012) $
* </pre>
upload/admin/applications/forums/modules_public/forums/announcements.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Announcement View
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/forums/attach.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* View Topic Attachments
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/forums/modules_public/forums/boards.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Board Index View
* Last Updated: $Date: 2013-05-15 22:23:38 -0400 (Wed, 15 May 2013) $
* </pre>
upload/admin/applications/forums/modules_public/forums/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 14th May 2003
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.5
* @version v3.4.6
* $Revision: 8655 $
*/
upload/admin/applications/forums/modules_public/forums/findpost.php
+4 -4
View File
@@ -3,9 +3,9 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Bounces a user to the right post
* Last Updated: $Date: 2013-05-08 12:08:00 -0400 (Wed, 08 May 2013) $
* Last Updated: $Date: 2013-06-14 11:15:45 -0400 (Fri, 14 Jun 2013) $
* </pre>
*
* @author $Author: bfarber $
@@ -14,7 +14,7 @@
* @package IP.Board
* @subpackage Forums
* @link http://www.invisionpower.com
* @version $Rev: 12237 $
* @version $Rev: 12310 $
* @since 14th April 2004
*
* | > Interesting Fact: I've had iTunes playing every Radiohead tune
@@ -71,7 +71,7 @@ class public_forums_forums_findpost extends ipsCommand
if ( ! $post['pid'] OR
( !$this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $post['forum_id'] ) && $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'sdelete' ) OR
( $this->registry->getClass('class_forums')->canQueuePosts( $post['forum_id'] ) && $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'hidden' )
( !$this->registry->getClass('class_forums')->canQueuePosts( $post['forum_id'] ) && $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'hidden' )
)
{
/* Could not get the post (could be hidden, could be deleted, could be stolen by ninja aliens) */
upload/admin/applications/forums/modules_public/forums/forums.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Forum Viewing
* Last Updated: $Date: 2013-05-06 14:16:05 -0400 (Mon, 06 May 2013) $
* </pre>
upload/admin/applications/forums/modules_public/forums/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/forums/markasread.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Forums -> Mark As Read command class
* Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
* </pre>
upload/admin/applications/forums/modules_public/forums/rules.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Show forum rules
* Last Updated: $Date: 2012-12-13 08:29:08 -0500 (Thu, 13 Dec 2012) $
* </pre>
upload/admin/applications/forums/modules_public/forums/topics.php
+79 -78
View File
@@ -2,9 +2,9 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Topic View
* Last Updated: $Date: 2013-05-02 11:20:01 -0400 (Thu, 02 May 2013) $
* Last Updated: $Date: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
* </pre>
*
* @author $Author: AndyMillne $
@@ -13,7 +13,7 @@
* @package IP.Board
* @subpackage Forums
* @link http://www.invisionpower.com
* @version $Rev: 12213 $
* @version $Rev: 12380 $
*/
if ( ! defined( 'IN_IPB' ) )
@@ -68,7 +68,7 @@ class public_forums_forums_topics extends ipsCommand
/**
* Can we edit at least one post?
*
*
* @var boolean
*/
protected $_canEditAPost = false;
@@ -93,13 +93,13 @@ class public_forums_forums_topics extends ipsCommand
/**
* Max post date for this page
*
*
*/
protected $_maxPostDate = 0;
/**
* Parser object
*
*
*/
protected $_textParser = '';
@@ -184,9 +184,6 @@ class public_forums_forums_topics extends ipsCommand
/* Set up topic */
$topicData = $this->topicSetUp( $topicData );
/* Specific view? */
$this->_doViewCheck();
/* Get Posts */
$_NOW = IPSDebug::getMemoryDebugFlag();
@@ -225,9 +222,11 @@ class public_forums_forums_topics extends ipsCommand
{
/* Go find it */
$this->request['view'] = 'findpost';
$this->_doViewCheck();
/* Exits above */
/* Do view check is called next */
}
/* Specific view? */
$this->_doViewCheck();
unset( $this->cached_members );
@@ -539,7 +538,7 @@ class public_forums_forums_topics extends ipsCommand
$this->DB->build( array( 'select' => 'MIN(pid) as pid',
'from' => 'posts',
'where' => "topic_id={$topicData['tid']} AND post_date > " . intval( $last_time ) . $query,
'limit' => array( 0,1 ) ) );
'limit' => array( 0,1 ) ) );
$this->DB->execute();
$post = $this->DB->fetch();
@@ -548,7 +547,7 @@ class public_forums_forums_topics extends ipsCommand
{
$pid = "#entry".$post['pid'];
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND pid <= {$post['pid']}" . $query ) );
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND pid <= {$post['pid']}" . $query ) );
$this->DB->execute();
$cposts = $this->DB->fetch();
@@ -568,7 +567,7 @@ class public_forums_forums_topics extends ipsCommand
if( $this->settings['post_order_sort'] == 'desc' )
{
$st = (ceil(($topicData['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
}
}
$stUrlParam = ( $st ) ? '&page=' . $this->registry->getClass('topics')->stToPage( $st ) : '';
@@ -929,7 +928,7 @@ class public_forums_forums_topics extends ipsCommand
}
if( !is_array($poll_answers) OR !count($poll_answers) )
{
$poll_answers = '';
$poll_answers = array();
}
reset($poll_answers);
@@ -1088,10 +1087,10 @@ class public_forums_forums_topics extends ipsCommand
else if ($this->request['view'] == 'new')
{
//-----------------------------------------
// Newer
// Newer
//-----------------------------------------
$this->DB->build( array(
$this->DB->build( array(
'select' => 'tid, title_seo',
'from' => 'topics',
'where' => "forum_id={$forumData['id']} AND {$_approved} AND state <> 'link' AND last_post > {$topicData['last_post']}",
@@ -1117,7 +1116,7 @@ class public_forums_forums_topics extends ipsCommand
// Older
//-----------------------------------------
$this->DB->build( array(
$this->DB->build( array(
'select' => 'tid, title_seo',
'from' => 'topics',
'where' => "forum_id={$forumData['id']} AND {$_approved} AND state <> 'link' AND last_post < {$topicData['last_post']}",
@@ -1152,35 +1151,35 @@ class public_forums_forums_topics extends ipsCommand
}
else if ($this->request['view'] == 'findpost')
{
//-----------------------------------------
// Find a post
//-----------------------------------------
// Find a post
//-----------------------------------------
$pid = intval($this->request['p']);
$search_hl = '';
if ( ! empty( $this->request['hl'] ) )
{
$search_hl .= "&amp;hl=" . urlencode( $this->request['hl'] );
$search_hl = '';
if ( ! empty( $this->request['hl'] ) )
{
$search_hl .= "&amp;hl=" . urlencode( $this->request['hl'] );
}
/* Can we deal with hidden posts? */
$_perms = array( 'visible' );
if ( $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( false ) )
{
$_perms[] = 'sdelete';
}
if ( $this->registry->getClass('class_forums')->canQueuePosts( false ) )
{
$_perms[] = 'hidden';
/* Can we deal with hidden posts? */
$_perms = array( 'visible' );
if ( $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( false ) )
{
$_perms[] = 'sdelete';
}
if ( $this->registry->getClass('class_forums')->canQueuePosts( false ) )
{
$_perms[] = 'hidden';
}
if ( $this->registry->getClass('topics')->isArchived( $topicData ) && $this->registry->class_forums->fetchArchiveTopicType( $topicData ) != 'working' )
{
$cposts['posts'] = $this->archiveReader->getPostCount( $topicData['tid'], $_perms );
if ( $this->registry->getClass('topics')->isArchived( $topicData ) && $this->registry->class_forums->fetchArchiveTopicType( $topicData ) != 'working' )
{
$cposts['posts'] = $this->archiveReader->getPostCount( $topicData['tid'], $_perms );
}
else
{
@@ -1200,7 +1199,7 @@ class public_forums_forums_topics extends ipsCommand
$sort_value = $date['post_date'];
}
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND {$sort_field} <=" . intval( $sort_value ) . ' AND ' . $query ) );
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND {$sort_field} <=" . intval( $sort_value ) . ' AND ' . $query ) );
$this->DB->execute();
$cposts = $this->DB->fetch();
@@ -1211,26 +1210,26 @@ class public_forums_forums_topics extends ipsCommand
}
}
if ( (($cposts['posts']) % $this->settings['display_max_posts']) == 0 )
{
$pages = ($cposts['posts']) / $this->settings['display_max_posts'];
}
else
{
$number = ( ($cposts['posts']) / $this->settings['display_max_posts'] );
$pages = ceil($number);
}
$st = ($pages - 1) * $this->settings['display_max_posts'];
if( $this->settings['post_order_sort'] == 'desc' )
{
$st = (ceil(($topicData['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
}
$stUrlParam = ( $st ) ? '&page=' . $this->registry->getClass('topics')->stToPage( $st ) : '';
if ( (($cposts['posts']) % $this->settings['display_max_posts']) == 0 )
{
$pages = ($cposts['posts']) / $this->settings['display_max_posts'];
}
else
{
$number = ( ($cposts['posts']) / $this->settings['display_max_posts'] );
$pages = ceil($number);
}
$st = ($pages - 1) * $this->settings['display_max_posts'];
if( $this->settings['post_order_sort'] == 'desc' )
{
$st = (ceil(($topicData['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
}
$stUrlParam = ( $st ) ? '&page=' . $this->registry->getClass('topics')->stToPage( $st ) : '';
$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$topicData['tid']."{$stUrlParam}{$search_hl}"."#entry".$pid, $topicData['title_seo'], 302, 'showtopic' );
}
}
@@ -1294,7 +1293,7 @@ class public_forums_forums_topics extends ipsCommand
if( $_data['starter_id'] ) {
$loadIds[ $_data['starter_id'] ] = $_data['starter_id']; }
$results[ $_data['tid'] ] = $_data;
$results[ $_data['tid'] ] = $_data;
/* Alreay got our 5 results? */
if ( count( $results ) == 5 )
{
@@ -1317,7 +1316,7 @@ class public_forums_forums_topics extends ipsCommand
else
{
$data['_starter'] = IPSMember::buildDisplayData( IPSMember::setUpGuest( $data['starter_name'] ? $this->settings['guest_name_pre'] . $data['starter_name'] . $this->settings['guest_name_suf'] : '' ) );
}
}
$data = $this->registry->topics->parseTopicForLineEntry( $data );
@@ -1332,7 +1331,7 @@ class public_forums_forums_topics extends ipsCommand
{
$final[ $data['tid'] ] = $data;
}
}
}
}
return $final;
@@ -1395,7 +1394,7 @@ class public_forums_forums_topics extends ipsCommand
$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
$show = false;
if (
if (
( $this->registry->permissions->check( 'reply', $forumData ) == TRUE )
and ( $topicData['state'] != 'closed' OR $this->memberData['g_post_closed'] )
and ( $topicData['_ppd_ok'] === TRUE )
@@ -1445,7 +1444,7 @@ class public_forums_forums_topics extends ipsCommand
/**
* Generate the moderation panel
* $skcusgej, still. After all this time
* $skcusgej, still. After all this time
*
* @return array
*/
@@ -1488,7 +1487,7 @@ class public_forums_forums_topics extends ipsCommand
// Add on approve/unapprove topic fing
//-----------------------------------------
if ( $this->registry->class_forums->canQueuePosts( $forumData['id'] ) )
if ( $this->registry->class_forums->canQueuePosts( $forumData['id'] ) )
{
if ( $topicData['approved'] != 1 )
{
@@ -1657,7 +1656,7 @@ class public_forums_forums_topics extends ipsCommand
//-----------------------------------------
// Joins
//-----------------------------------------
//-----------------------------------------
$_extraMember = ( is_array($dataHook['members']) && count($dataHook['members']) ) ? ',m.'.implode(',m.', $dataHook['members']) : '';
@@ -1678,10 +1677,10 @@ class public_forums_forums_topics extends ipsCommand
'from' => array( 'profile_portal' => 'pp' ),
'where' => 'm.member_id=pp.pp_member_id',
'type' => 'left'
)
)
);
/* Warn system enabled? */
/* Warn system enabled? */
if( $this->settings['warn_on'] == 1 )
{
$_post_joins[] = array( 'select' => 'w.wl_id',
@@ -1689,7 +1688,7 @@ class public_forums_forums_topics extends ipsCommand
'where' => 'w.wl_content_app=\'forums\' and w.wl_content_id1=p.pid' );
}
/* Add data hook joins */
/* Add data hook joins */
if ( is_array($dataHook['postJoins']) && count($dataHook['postJoins']) )
{
$_post_joins = array_merge( $_post_joins, $dataHook['postJoins'] );
@@ -1702,7 +1701,7 @@ class public_forums_forums_topics extends ipsCommand
'from' => array( 'pfields_content' => 'pc' ),
'where' => 'pc.member_id=p.author_id',
'type' => 'left' );
}
}
/* Reputation system enabled? */
if( $this->settings['reputation_enabled'] )
@@ -1769,7 +1768,7 @@ class public_forums_forums_topics extends ipsCommand
$this->DB->flushQuery();
$this->DB->allow_sub_select = TRUE;
$this->DB->allow_sub_select = TRUE;
$oq = $this->DB->query( $query );
@@ -1841,6 +1840,8 @@ class public_forums_forums_topics extends ipsCommand
( $row['queued'] == 2 and $this->memberData['forumsModeratorData'][ $forumData['id'] ]['bw_mod_un_soft_delete'] )
or
( $row['queued'] == 0 and $this->memberData['forumsModeratorData'][ $forumData['id'] ]['bw_mod_soft_delete'] )
or
$this->memberData['forumsModeratorData'][ $forumData['id'] ]['split_merge']
)
)
)
@@ -1854,7 +1855,7 @@ class public_forums_forums_topics extends ipsCommand
}
/* Return */
return $posts;
return $posts;
}
/**
@@ -2016,7 +2017,7 @@ class public_forums_forums_topics extends ipsCommand
$this->DB->update( 'topics', array( 'state' => 'closed' ), 'tid='.$topicData['tid'], true );
}
}
}
}
else if ( $topicData['state'] == 'closed' )
{
@@ -2038,7 +2039,7 @@ class public_forums_forums_topics extends ipsCommand
$this->DB->update( 'topics', array( 'state' => 'open' ), 'tid='.$topicData['tid'], true );
}
}
}
}
//-----------------------------------------
@@ -2088,10 +2089,10 @@ class public_forums_forums_topics extends ipsCommand
else
{
$topicData['_allow_rate'] = 0;
}
}
//-----------------------------------------
// If this forum is a link, then
// If this forum is a link, then
// redirect them to the new location
//-----------------------------------------
@@ -2102,7 +2103,7 @@ class public_forums_forums_topics extends ipsCommand
/**
* Mark redirect links as read too
*
*
* @link http://community.invisionpower.com/tracker/issue-36985-linked-topics-readunread-status/
*/
$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $forumData['id'], 'itemID' => $topicData['tid'] ), 'forums' );
upload/admin/applications/forums/modules_public/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/moderate/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 14th May 2003
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.5
* @version v3.4.6
* $Revision: 8655 $
*/
upload/admin/applications/forums/modules_public/moderate/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/moderate/moderate.php
+2 -2
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Moderator actions
* Last Updated: $Date: 2013-05-01 17:35:09 -0400 (Wed, 01 May 2013) $
* </pre>
@@ -1362,7 +1362,7 @@ class public_forums_moderate_moderate extends ipsCommand
{
if( function_exists('mb_convert_case') )
{
if( in_array( mb_strtolower( $this->settings['gb_char_set'] ), array_map( 'mb_strtolower', mb_list_encodings() ) ) )
if( in_array( strtolower( $this->settings['gb_char_set'] ), array_map( 'strtolower', mb_list_encodings() ) ) )
{
$this->request['title'] = mb_convert_case( $this->request['title'], MB_CASE_TITLE, $this->settings['gb_char_set'] );
}
upload/admin/applications/forums/modules_public/moderate/multimod.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Moderator actions
* Last Updated: $Date: 2013-01-17 15:51:17 -0500 (Thu, 17 Jan 2013) $
* </pre>
upload/admin/applications/forums/modules_public/post/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 14th May 2003
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.5
* @version v3.4.6
* $Revision: 8655 $
*/
upload/admin/applications/forums/modules_public/post/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
<a href="http://www.invisionpower.com">IP.Board</a>
IP.Board
</body>
</html>
upload/admin/applications/forums/modules_public/post/post.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Posting
* Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
* </pre>