diff --git a/Gruntfile.js b/Gruntfile.js index 9d16eb00b..d78bbea20 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -259,9 +259,10 @@ module.exports = function(grunt) { if(tasks.length === 0) { grunt.util.spawn({ cmd: "tar", - args: ['cfz', 'xe.'+version+'.tar.gz', 'xe/'], + args: ['cfz', '../xe.'+version+'.tar.gz', './'], opts: { - cwd: 'build' + cwd: 'build/xe', + cache: false } }, function (error, result, code) { grunt.log.ok('Archived(full) : ' + build_dir + '/xe.'+version+'.tar.gz'); @@ -269,9 +270,10 @@ module.exports = function(grunt) { grunt.util.spawn({ cmd: "zip", - args: ['-r', 'xe.'+version+'.zip', 'xe/'], + args: ['-r', '../xe.'+version+'.zip', './'], opts: { - cwd: 'build' + cwd: 'build/xe', + cache: false } }, function (error, result, code) { grunt.log.ok('Archived(full) : ' + build_dir + '/xe.'+version+'.zip'); @@ -313,8 +315,8 @@ module.exports = function(grunt) { // changed if(diff.length) { - var args_tar = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.tar.gz', version]; - var args_zip = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.zip', version]; + var args_tar = ['archive', '-o', 'build/xe.'+version+'.changed.tar.gz', version]; + var args_zip = ['archive', '-o', 'build/xe.'+version+'.changed.zip', version]; args_tar = args_tar.concat(diff); args_zip = args_zip.concat(diff); diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 23208af4c..8c2f7788c 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1281,14 +1281,16 @@ class Context } else { + $result[$k] = $v; + if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc()) { - $v = stripslashes($v); + $result[$k] = stripslashes($result[$k]); } - if(!is_array($v)) + if(!is_array($result[$k])) { - $result[$k] = trim($v); + $result[$k] = trim($result[$k]); } } } diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 81ac26e53..0352270ff 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -380,8 +380,6 @@ class ModuleHandler extends Handler if($kind == 'admin') { $oMemberController = ModuleHandler::getModuleInstance('member', 'controller'); - $validate_session = $oMemberController->validateSession(); - $oMemberController->regenerateSession(); if(!$validate_session) { $this->error = 'security_invalid_session'; diff --git a/config/config.inc.php b/config/config.inc.php index 0158c1099..4ac8edf2f 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -29,7 +29,7 @@ define('__ZBXE__', __XE__); /** * Display XE's full version. */ -define('__XE_VERSION__', '1.7.7.1'); +define('__XE_VERSION__', '1.7.7.2'); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index f827aa702..1bd7ee1c2 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1809,8 +1809,6 @@ class memberController extends member } } - $_SESSION['session_checkup'] = null; - $this->regenerateSession(); $this->setSessionInfo(); return $output; @@ -1870,37 +1868,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 diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 1e2d0cd35..ff543158c 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -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;