fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/own-comments

Browse source
This commit is contained in:
Kijin Sung 2017-02-11 14:28:45 +09:00
commit 4b342a2d9c
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/session.php
View file

@ -447,11 +447,13 @@ class Session
*/
public static function destroy()
{
unset($_SESSION['RHYMIX']);
$_SESSION = array();
self::$_started = false;
self::$_autologin_key = false;
self::$_member_info = false;
self::_setKeys();
self::destroyAutologinKeys();
@session_write_close();
@session_destroy();
return true;
}

6
common/legacy.php
View file

@ -187,11 +187,12 @@ function getNextSequence()
*/
function setUserSequence($seq)
{
if(!isset($_SESSION['seq']))
if (!isset($_SESSION['seq']) || !is_array($_SESSION['seq']))
{
$_SESSION['seq'] = array();
}
$_SESSION['seq'][] = $seq;
$seq = intval($seq);
$_SESSION['seq'][$seq] = $seq;
}
/**
@ -202,6 +203,7 @@ function setUserSequence($seq)
*/
function checkUserSequence($seq)
{
$seq = intval($seq);
return isset($_SESSION['seq']) && in_array($seq, $_SESSION['seq']);
}

4
modules/file/file.controller.php
View file

@ -699,6 +699,10 @@ class fileController extends file
*/
function setUploadInfo($editor_sequence, $upload_target_srl=0)
{
if(!isset($_SESSION['upload_info']) || !is_array($_SESSION['upload_info']))
{
$_SESSION['upload_info'] = array();
}
if(!isset($_SESSION['upload_info'][$editor_sequence]))
{
$_SESSION['upload_info'][$editor_sequence] = new stdClass();

9
modules/member/member.controller.php
View file

@ -2637,14 +2637,9 @@ class memberController extends member
*/
function destroySessionInfo()
{
if(!$_SESSION || !is_array($_SESSION)) return;
$memberInfo = Context::get('logged_info');
$memberSrl = $memberInfo->member_srl;
foreach($_SESSION as $key => $val)
if (!Rhymix\Framework\Session::isStarted())
{
$_SESSION[$key] = '';
return;
}
Rhymix\Framework\Session::destroy();

4
tests/unit/framework/SessionTest.php
View file

@ -183,8 +183,8 @@ class SessionTest extends \Codeception\TestCase\Test
Rhymix\Framework\Session::logout();
$this->assertFalse(isset($_SESSION['RHYMIX']['login']));
$this->assertFalse($_SESSION['member_srl']);
$this->assertFalse($_SESSION['is_logged']);
$this->assertFalse(isset($_SESSION['member_srl']));
$this->assertFalse(isset($_SESSION['is_logged']));
Rhymix\Framework\Session::close();
}