From 231e4e0bd64f1fc61ffbce2d3171e97c9d7397ab Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 30 Sep 2014 12:43:51 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EB=B3=B8=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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); From 3d08e371a9077668963e4eb36b2a04341cc30936 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 30 Sep 2014 16:12:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#952=20session=20=EC=9E=AC=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 2 -- modules/member/member.controller.php | 33 -------------------------- modules/member/member.model.php | 6 ----- 3 files changed, 41 deletions(-) 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/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; From 6d5235f9027a06046d33b0ca0fe8ccba27a41648 Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 2 Oct 2014 10:45:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix=20#991=20=EB=B0=B0=EC=97=B4=EB=A1=9C=20?= =?UTF-8?q?=EB=84=98=EA=B2=A8=EC=A7=84=20parameter=EB=A5=BC=20=EC=A0=9C?= =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EB=B0=9B=EC=A7=80=20=EB=AA=BB=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/context/Context.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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]); } } } From 53eb8fbf8f9575b32cf34e1a1be6ec1ec838a3e7 Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 2 Oct 2014 10:46:21 +0900 Subject: [PATCH 4/4] version up to 1.7.7.2 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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));