Version 3.4.6
This commit is contained in:
1 parent
e4478369d8
commit
b45ea0dffb
1568 files changed
+155104
-161665
No files matched your search
@@ -2,17 +2,17 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.5
|
||||
* IP.Board v3.4.6
|
||||
* API: Core
|
||||
* Last Updated: $Date: 2013-05-22 09:12:58 -0400 (Wed, 22 May 2013) $
|
||||
* Last Updated: $Date: 2013-10-14 15:30:19 -0400 (Mon, 14 Oct 2013) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: mmecham $
|
||||
* @author $Author: AndyMillne $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 12264 $
|
||||
* @version $Rev: 12376 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -224,7 +224,7 @@ class hanEmail
|
||||
* @return boolean Email sent successfully
|
||||
*/
|
||||
public function sendMail()
|
||||
{
|
||||
{
|
||||
$this->init();
|
||||
|
||||
if( $this->emailer->error )
|
||||
@@ -752,7 +752,7 @@ class hanEmail
|
||||
/**
|
||||
* Convert text email to HTML
|
||||
* Pretty nifty method name too.
|
||||
*
|
||||
*
|
||||
* @param string Plain text email ready to go
|
||||
* @param boolean Raw HTML mode?
|
||||
* @return string We're all HTML'd up in here.
|
||||
@@ -788,7 +788,7 @@ class hanEmail
|
||||
$this->settings['__noTruncateUrl'] = true;
|
||||
|
||||
/* Display */
|
||||
$content = $this->parser->display( $content );
|
||||
$content = $this->parser->display( $content );
|
||||
|
||||
/* Remove emoticons */
|
||||
$content = $this->parser->emoticonImgtoCode( $content );
|
||||
@@ -827,7 +827,7 @@ class hanEmail
|
||||
|
||||
/**
|
||||
* Add <html> tags and such if it doesn't have any already
|
||||
*
|
||||
*
|
||||
* @param string Subject
|
||||
* @param string HTML email
|
||||
* @return string VERY HTML email
|
||||
@@ -845,9 +845,9 @@ class hanEmail
|
||||
* for good reason, but it can then re-apply the wrapper. So we add a unique comment
|
||||
* and then check for this.
|
||||
*/
|
||||
if ( ! stristr( $content, '<!--::ipb.wrapper.added::-->' ) )
|
||||
if ( ! stristr( $content, '<!--ipb.wrapper.added-->' ) )
|
||||
{
|
||||
$content = '<!--::ipb.wrapper.added::-->' . $content;
|
||||
$content = '<!--ipb.wrapper.added-->' . $content;
|
||||
|
||||
/* Inline wrapper */
|
||||
if ( $this->htmlWrapper )
|
||||
@@ -930,7 +930,7 @@ class hanEmail
|
||||
* @param bool Fix up plain text links
|
||||
* @return string Cleaned email content
|
||||
*/
|
||||
public function cleanMessage( $message = "", $skipAngleBrackets=false, $fixPlainTextLinks=true )
|
||||
public function cleanMessage( $message = "", $skipAngleBrackets=false, $fixPlainTextLinks=true )
|
||||
{
|
||||
if ( ! $this->html_email )
|
||||
{
|
||||
@@ -1059,7 +1059,7 @@ class hanEmail
|
||||
* @param array preg_replace matches
|
||||
* @return string Formatted url
|
||||
*/
|
||||
public function _formatUrl( $matches )
|
||||
public function _formatUrl( $matches )
|
||||
{
|
||||
$matches[1] = str_replace( array( '"', "'", '"', ''', ''' ), '', $matches[1] );
|
||||
|
||||
@@ -1157,7 +1157,7 @@ class hanEmail
|
||||
|
||||
/**
|
||||
* Default wrapper for HTML emails - edit the one in '/cache/skin_cache/emailWrapper.php'
|
||||
*
|
||||
*
|
||||
* @param string HTML content
|
||||
* @return string HTML email done
|
||||
*/
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.5
|
||||
* IP.Board v3.4.6
|
||||
* Login handler abstraction
|
||||
* Last Updated: $Date: 2013-05-03 23:09:37 -0400 (Fri, 03 May 2013) $
|
||||
* Last Updated: $Date: 2013-09-05 21:09:43 -0400 (Thu, 05 Sep 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
|
||||
* @link http://www.invisionpower.com
|
||||
* @since Tuesday 1st March 2005 (11:52)
|
||||
* @version $Revision: 12226 $
|
||||
* @version $Revision: 12346 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -33,6 +33,8 @@ class han_login
|
||||
protected $DB;
|
||||
protected $settings;
|
||||
protected $request;
|
||||
protected $cache;
|
||||
protected $caches;
|
||||
|
||||
/**
|
||||
* Login module registry
|
||||
@@ -103,6 +105,8 @@ class han_login
|
||||
$this->DB = $this->registry->DB();
|
||||
$this->settings =& $this->registry->fetchSettings();
|
||||
$this->request =& $this->registry->fetchRequest();
|
||||
$this->cache = $this->registry->cache();
|
||||
$this->caches =& $this->registry->cache()->fetchCaches();
|
||||
|
||||
//-----------------------------------------
|
||||
// Do not set member, memberData or lang
|
||||
@@ -440,6 +444,15 @@ class han_login
|
||||
IPSCookie::set( "member_id" , $member['member_id'] , 1, 0, FALSE, TRUE );
|
||||
IPSCookie::set( "pass_hash" , $member['member_login_key'], $_sticky, $_days, FALSE, TRUE );
|
||||
IPSCookie::set( "ipsconnect_" . md5( $this->settings['board_url'] . '/interface/ipsconnect/ipsconnect.php' ), '1', $_sticky, $_days, FALSE, FALSE );
|
||||
foreach( $this->caches['login_methods'] AS $k => $method )
|
||||
{
|
||||
if ( $method['login_folder_name'] == 'ipsconnect' AND $method['login_enabled'] )
|
||||
{
|
||||
$ipsConnectSettings = unserialize( $method['login_custom_config'] );
|
||||
|
||||
IPSCookie::set( "ipsconnect_" . md5( $ipsConnectSettings['master_url'] ), '1', $_sticky, $_days, FALSE, FALSE );
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -448,6 +461,15 @@ class han_login
|
||||
// IPSCookie::set( "pass_hash" , $member['member_login_key'], 0 );
|
||||
|
||||
IPSCookie::set( "ipsconnect_" . md5( $this->settings['board_url'] . '/interface/ipsconnect/ipsconnect.php' ), '1', 0, 0, FALSE, FALSE );
|
||||
foreach( $this->caches['login_methods'] AS $k => $method )
|
||||
{
|
||||
if ( $method['login_folder_name'] == 'ipsconnect' AND $method['login_enabled'] )
|
||||
{
|
||||
$ipsConnectSettings = unserialize( $method['login_custom_config'] );
|
||||
|
||||
IPSCookie::set( "ipsconnect_" . md5( $ipsConnectSettings['master_url'] ), '1', $_sticky, $_days, FALSE, FALSE );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.5
|
||||
* IP.Board v3.4.6
|
||||
* BBCode parsing gateway.
|
||||
* Last Updated: $Date: 2012-07-12 05:25:08 -0400 (Thu, 12 Jul 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
Reference in new issue
Block a user