From c9e711c94af6b050cefd37f694268ecddb2669af Mon Sep 17 00:00:00 2001 From: akasima Date: Thu, 1 May 2014 09:29:13 +0900 Subject: [PATCH 1/4] #680 modify version to 1.7.4.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 72080042e..611c9e32c 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.4.1'); +define('__XE_VERSION__', '1.7.4.2'); /** * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. From c4881ba91553f26508ed035a6b8a996adde36f0c Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 3 Jun 2014 16:16:46 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#769=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.controller.php | 15 ++++++++++++++- modules/member/member.view.php | 9 ++++++++- .../member/skins/default/rechecked_password.html | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index f554a294e..e9e32e80c 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -454,7 +454,14 @@ class memberController extends member $_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD'; - $redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + if(Context::get('success_return_url')) + { + $redirectUrl = Context::get('success_return_url'); + } + else + { + $redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + } $this->setRedirectUrl($redirectUrl); } @@ -2407,6 +2414,12 @@ class memberController extends member $member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail); if($member_srl) return new Object(-1,'msg_exists_email_address'); + if($_SESSION['rechecked_password_step'] != 'INPUT_DATA') + { + return $this->stop('msg_invalid_request'); + } + unset($_SESSION['rechecked_password_step']); + $auth_args = new stdClass; $auth_args->user_id = $newEmail; $auth_args->member_srl = $member_info->member_srl; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 5872d1433..ef318c58e 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -578,7 +578,14 @@ class memberView extends member function dispMemberModifyEmailAddress() { - if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); + if($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA') + { + Context::set('success_return_url', getUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyEmailAddress')); + $this->dispMemberModifyInfoBefore(); + return; + } + + $_SESSION['rechecked_password_step'] = 'INPUT_DATA'; $this->setTemplateFile('modify_email_address'); } diff --git a/modules/member/skins/default/rechecked_password.html b/modules/member/skins/default/rechecked_password.html index 32c49063d..105f95464 100644 --- a/modules/member/skins/default/rechecked_password.html +++ b/modules/member/skins/default/rechecked_password.html @@ -8,6 +8,7 @@ +
From 3c191b8373553a9c1c79e78d531ab16312c1d3d9 Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 4 Jun 2014 23:13:38 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#772=20favicon=20mime=20type=20=EC=9D=84=20?= =?UTF-8?q?x-icon=20=EC=A7=80=EC=9B=90=20=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20favicon=20=ED=81=AC=EA=B8=B0=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EC=95=88=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/install/install.admin.controller.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 250a5e48d..4b38c80ab 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -335,14 +335,10 @@ class installAdminController extends install list($width, $height, $type_no, $attrs) = @getimagesize($target_file); if($iconname == 'favicon.ico') { - if(!preg_match('/^.*\.icon$/i',$type)) { + if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) { Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file')); return; } - if($width && $height && ($width != '16' || $height != '16')) { - Context::set('msg', Context::getLang('msg_invalid_format').' (size : 16x16)'); - return; - } } else if($iconname == 'mobicon.png') { From 295802dcd8ce75ffde185adfdac0cbaacbeab6ad Mon Sep 17 00:00:00 2001 From: akasima Date: Sun, 8 Jun 2014 22:15:42 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#707=20ssl=20=ED=8F=AC=ED=8A=B8=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=20=EB=A6=AC=EB=8B=A4=EC=9D=B4=EB=A0=89?= =?UTF-8?q?=ED=8A=B8=20=EB=AC=B8=EC=A0=9C=EC=A0=90=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 569997d25..75cf81bc1 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -88,7 +88,11 @@ class ModuleHandler extends Handler { if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on') { - header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); + if(Context::get('_https_port')!=null) { + header('location:https://' . $_SERVER['HTTP_HOST'] . ':' . Context::get('_https_port') . $_SERVER['REQUEST_URI']); + } else { + header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); + } return; } }