Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -3,19 +3,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Online list
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-12-13 08:29:08 -0500 (Thu, 13 Dec 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: AndyMillne $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @subpackage Members
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 12th March 2002
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 11713 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -95,12 +95,6 @@ class public_members_messaging_send extends ipsCommand
|
||||
$this->registry->getClass('output')->showError( 'messenger_disabled', 10227, null, null, 404 );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Reset Classes
|
||||
//-----------------------------------------
|
||||
|
||||
IPSText::resetTextClass('bbcode');
|
||||
|
||||
//-----------------------------------------
|
||||
// Load lang file
|
||||
//-----------------------------------------
|
||||
@@ -613,23 +607,12 @@ class public_members_messaging_send extends ipsCommand
|
||||
{
|
||||
if ( $type == 'reply' )
|
||||
{
|
||||
/* Load parser */
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
|
||||
$parser = new $classToLoad();
|
||||
|
||||
/* We're quoting a post... */
|
||||
if ( $_editor->getRteEnabled() )
|
||||
{
|
||||
$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']<br />{$msgData['msg_post']}".'[/quote]'."<br />";
|
||||
}
|
||||
else
|
||||
{
|
||||
IPSText::getTextClass('bbcode')->parse_html = 0;
|
||||
IPSText::getTextClass('bbcode')->parse_nl2br = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_smilies = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_bbcode = 1;
|
||||
IPSText::getTextClass('bbcode')->parsing_section = 'pms';
|
||||
|
||||
$msgData['msg_post'] = IPSText::getTextClass('bbcode')->preEditParse( $msgData['msg_post'] );
|
||||
|
||||
$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']\n{$msgData['msg_post']}".'[/quote]'."\n";
|
||||
}
|
||||
$displayData['message'] = $parser->buildQuoteTag( $msgData['msg_post'], $msgData['members_display_name'], $msgData['msg_date'], 0, 0 );
|
||||
}
|
||||
else if ( $type == 'edit' )
|
||||
{
|
||||
@@ -650,18 +633,18 @@ class public_members_messaging_send extends ipsCommand
|
||||
/* Grab language for attachment previews */
|
||||
$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
|
||||
|
||||
IPSText::getTextClass('bbcode')->parse_html = 0;
|
||||
IPSText::getTextClass('bbcode')->parse_nl2br = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_smilies = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_bbcode = 1;
|
||||
IPSText::getTextClass('bbcode')->parsing_section = 'pms';
|
||||
IPSText::getTextClass( 'bbcode' )->parsing_mgroup = $this->memberData['member_group_id'];
|
||||
IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others = $this->memberData['mgroup_others'];
|
||||
|
||||
$this->settings['max_emos'] = 0;
|
||||
/* Load parser */
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
|
||||
$parser = new $classToLoad();
|
||||
|
||||
$parser->set( array( 'memberData' => $this->memberData,
|
||||
'parseBBCode' => 1,
|
||||
'parseArea' => 'pms',
|
||||
'parseHtml' => 0,
|
||||
'parseEmoticons' => 1 ) );
|
||||
|
||||
$msg = $_editor->process( $_POST['Post-NS'] );
|
||||
$msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $msg ) );
|
||||
$msg = $parser->display( $msg );
|
||||
|
||||
if ( ! is_object( $this->class_attach ) )
|
||||
{
|
||||
@@ -820,27 +803,27 @@ class public_members_messaging_send extends ipsCommand
|
||||
{
|
||||
/* Grab language for attachment previews */
|
||||
$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
|
||||
|
||||
IPSText::getTextClass('bbcode')->parse_html = 0;
|
||||
IPSText::getTextClass('bbcode')->parse_nl2br = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_smilies = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_bbcode = 1;
|
||||
IPSText::getTextClass('bbcode')->parsing_section = 'pms';
|
||||
IPSText::getTextClass( 'bbcode' )->parsing_mgroup = $this->memberData['member_group_id'];
|
||||
IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others = $this->memberData['mgroup_others'];
|
||||
|
||||
$this->settings['max_emos'] = 0;
|
||||
/* Load parser */
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
|
||||
$parser = new $classToLoad();
|
||||
|
||||
$parser->set( array( 'memberData' => $this->memberData,
|
||||
'parseBBCode' => 1,
|
||||
'parseArea' => 'pms',
|
||||
'parseHtml' => 0,
|
||||
'parseEmoticons' => 1 ) );
|
||||
|
||||
if( $this->request['_from'] == 'quickPM' )
|
||||
{
|
||||
$old_msg = $_POST['Post'];
|
||||
$old_msg = $_editor->process( $_editor->fromPlainTextArea( $_POST['Post'] ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
$old_msg = $_editor->process( $_POST['Post'] );
|
||||
}
|
||||
|
||||
$old_msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $old_msg ) );
|
||||
$old_msg = $parser->display( $old_msg );
|
||||
|
||||
if ( ! is_object( $this->class_attach ) )
|
||||
{
|
||||
@@ -938,20 +921,17 @@ class public_members_messaging_send extends ipsCommand
|
||||
$_msg_id = $draftTopic['msg_id'];
|
||||
$this->_postKey = $draftTopic['msg_post_key'];
|
||||
|
||||
IPSText::getTextClass('bbcode')->parse_html = 0;
|
||||
IPSText::getTextClass('bbcode')->parse_nl2br = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_smilies = 1;
|
||||
IPSText::getTextClass('bbcode')->parse_bbcode = 1;
|
||||
IPSText::getTextClass('bbcode')->parsing_section = 'pms';
|
||||
/* Load parser */
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
|
||||
$parser = new $classToLoad();
|
||||
|
||||
if ( $_editor->getRteEnabled() )
|
||||
{
|
||||
$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $draftTopic['msg_post'] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$displayData['message'] = IPSText::getTextClass('bbcode')->preEditParse( $draftTopic['msg_post'] );
|
||||
}
|
||||
$parser->set( array( 'memberData' => $this->memberData,
|
||||
'parseBBCode' => 1,
|
||||
'parseArea' => 'pms',
|
||||
'parseHtml' => 0,
|
||||
'parseEmoticons' => 1 ) );
|
||||
|
||||
$displayData['message'] = $draftTopic['msg_post'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user