Merge pull request #7 from xpressengine/develop

Develop
This commit is contained in:
YJSoft 2014-10-04 17:29:31 +09:00
commit 5b86ea457d
7 changed files with 17 additions and 65 deletions

View file

@ -822,6 +822,9 @@ class documentController extends document
*/
function updateReadedCount(&$oDocument)
{
// Pass if Crawler access
if(isCrawler()) return false;
$document_srl = $oDocument->document_srl;
$member_srl = $oDocument->get('member_srl');
$logged_info = Context::get('logged_info');

View file

@ -1810,8 +1810,6 @@ class memberController extends member
}
}
$_SESSION['session_checkup'] = null;
$this->regenerateSession();
$this->setSessionInfo();
return $output;
@ -1871,37 +1869,6 @@ class memberController extends member
$this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
}
function validateSession()
{
$destory_session = false;
if($_SESSION['destroyed'] === true) $destory_session = true;
if($destory_session)
{
$this->destroySessionInfo();
return false;
}
return true;
}
function regenerateSession()
{
if(!$_SESSION['session_checkup'])
{
$_SESSION['session_checkup'] = time();
}
if(time() - $_SESSION['session_checkup'] > 30)
{
$_SESSION['destroyed'] = true;
session_regenerate_id();
$_SESSION['destroyed'] = false;
$_SESSION['session_checkup'] = time();
}
}
/**
* Logged method for providing a personalized menu
* Login information is used in the output widget, or personalized page

View file

@ -234,12 +234,6 @@ class memberModel extends member
}
Context::set('logged_info', $logged_info);
if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
{
$oMemberController = getController('member');
$oMemberController->regenerateSession();
}
return $logged_info;
}
return NULL;