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,18 +3,18 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Admin session handler
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-08-21 11:56:40 -0400 (Tue, 21 Aug 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: mark $
|
||||
* @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 Who knows...
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 11239 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -236,7 +236,7 @@ class adminSessions extends ips_MemberRegistry
|
||||
//------------------------------
|
||||
|
||||
else if ( IPB_ACP_IP_MATCH )
|
||||
{
|
||||
{
|
||||
if (
|
||||
$session_data['session_ip_address'] != self::instance()->ip_address
|
||||
or
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
*~TERABYTE_DOC_READY~
|
||||
* $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
|
||||
* $License: http://www.invisionpower.com/company/standards.php#license$
|
||||
* $Author: bfarber $
|
||||
* $Author: mmecham $
|
||||
* @since Friday 12th November 2010 16:58
|
||||
* $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* @version v3.3.4
|
||||
* $Revision: 10914 $
|
||||
* $LastChangedDate: 2012-08-22 05:05:53 -0400 (Wed, 22 Aug 2012) $
|
||||
* @version v3.4.5
|
||||
* $Revision: 11245 $
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -348,7 +348,7 @@ class session_api
|
||||
}
|
||||
|
||||
/**
|
||||
* Log user in remotely.
|
||||
* Log user in remotely if user is not logged in.
|
||||
* @param array Array of member data (member_id, etc) or Id
|
||||
*/
|
||||
public function logGuestInAsMember( $member )
|
||||
@@ -359,17 +359,31 @@ class session_api
|
||||
}
|
||||
|
||||
/* Check for existing session */
|
||||
$ip = ipsRegistry::member()->ip_address;
|
||||
$ip = ipsRegistry::member()->ip_address;
|
||||
$_session = $this->DB->buildAndFetch( array( 'select' => '*',
|
||||
'from' => 'sessions',
|
||||
'where' => "ip_address='{$ip}'" ) );
|
||||
|
||||
if ( !$_session['id'] or !$_session['member_id'] )
|
||||
if ( ! $_session['id'] or ! $_session['member_id'] )
|
||||
{
|
||||
$this->_getSessionClass()->convertGuestToMember( $member, $member );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Log user in remotely overwriting a different accounts log in if need be.
|
||||
* @param array Array of member data (member_id, etc) or Id
|
||||
*/
|
||||
public function logInAsMember( $member )
|
||||
{
|
||||
if ( is_numeric( $member ) )
|
||||
{
|
||||
$member = IPSMember::load( $member );
|
||||
}
|
||||
|
||||
$this->_getSessionClass()->convertGuestToMember( $member, $member );
|
||||
}
|
||||
|
||||
/**
|
||||
* Load session class if not loaded
|
||||
*/
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* This class overrides parent publicSessions to prevent construct being called
|
||||
* It doesn't do anything else...
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @subpackage IP.Converge
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 22nd May 2008 11:15 AM
|
||||
* @version $Revision: 10914 $
|
||||
*
|
||||
*/
|
||||
|
||||
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.";
|
||||
exit();
|
||||
}
|
||||
|
||||
class convergeSessions extends publicSessions
|
||||
{
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @access public
|
||||
* @param object ipsRegistry reference
|
||||
* @return @e void
|
||||
*/
|
||||
public function __construct( $registry )
|
||||
{
|
||||
/* Make object */
|
||||
$this->registry = ipsRegistry::instance();
|
||||
$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();
|
||||
$this->_member = self::instance();
|
||||
$this->_memberData =& self::instance()->fetchMemberData();
|
||||
|
||||
$this->_userAgent = substr( $this->_member->user_agent, 0, 200 );
|
||||
|
||||
//-----------------------------------------
|
||||
// Fix up app / section / module
|
||||
//-----------------------------------------
|
||||
|
||||
$this->current_appcomponent = IPS_APP_COMPONENT;
|
||||
$this->current_module = IPSText::alphanumericalClean( $this->request['module'] );
|
||||
$this->current_section = IPSText::alphanumericalClean( $this->request['section'] );
|
||||
|
||||
$this->settings['session_expiration'] = ( $this->settings['session_expiration'] ) ? $this->settings['session_expiration'] : 60;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a member session
|
||||
*
|
||||
* @access public
|
||||
* @return string Session id
|
||||
*/
|
||||
public function createMemberSession()
|
||||
{
|
||||
parent::_createMemberSession();
|
||||
|
||||
return $this->session_data['id'];
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -3,9 +3,9 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Sample SSO Class
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -14,7 +14,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 22nd Septmeber 2009
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 10721 $
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Sample Mobile App SSO Class
|
||||
* Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
Reference in new issue
Block a user