diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 8c70dc192..afc78333e 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -37,6 +37,7 @@
$lang->image_mark = '이미지 마크';
$lang->image_mark_max_width = '가로 제한 크기';
$lang->image_mark_max_height = '세로 제한 크기';
+ $lang->enable_openid = 'OpenID 지원';
$lang->enable_join = '회원 가입 허가';
$lang->limit_day = '임시 제한 일자';
$lang->limit_date = '제한일';
@@ -143,6 +144,7 @@
$lang->about_form_description = '설명란에 입력을 하시면 가입시 표시가 됩니다';
$lang->about_required = '체크하시면 회원가입시 필수항목으로 입력하도록 됩니다';
+ $lang->about_enable_openid = 'OpenID 지원을 할 경우 체크하시면 됩니다';
$lang->about_enable_join = '체크를 하셔야 사용자들이 회원가입을 할 수 있습니다';
$lang->about_limit_day = '회원 가입후 정해진 일자동안 인증 제한을 할 수 있습니다';
$lang->about_limit_date = '지정된 일자까지 해당 사용자는 로그인을 할 수 없습니다';
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index cd44be729..11b2e9b5e 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -83,8 +83,9 @@
**/
function procMemberAdminInsertConfig() {
// 기본 정보를 받음
- $args = Context::gets('enable_join','limit_day','redirect_url','content','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height');
+ $args = Context::gets('enable_openid','enable_join','limit_day','redirect_url','content','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height');
if($args->enable_join!='Y') $args->enable_join = 'N';
+ if($args->enable_openid!='Y') $args->enable_openid= 'N';
if($args->image_name!='Y') $args->image_name = 'N';
if($args->image_mark!='Y') $args->image_mark = 'N';
$args->limit_day = (int)$args->limit_day;
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index a6d1b8875..1ad1a3014 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -72,7 +72,7 @@
// 에디터를 받음
$oEditorModel = &getModel('editor');
- $editor = $oEditorModel->getEditor(0, false, true);
+ $editor = $oEditorModel->getEditor(0, false, false);
Context::set('editor', $editor);
// 템플릿 파일 지정
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index c9e2218a7..44a698191 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -45,6 +45,7 @@
// 기본 정보를 세팅
$args->enable_join = 'Y';
+ $args->enable_openid = 'N';
$args->image_name = 'Y';
$args->image_mark = 'Y';
$args->image_name_max_width = '90';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index fc294a6c5..55851c7c6 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -35,6 +35,10 @@
* @brief openid로그인
**/
function procMemberOpenIDLogin() {
+ $oModuleModel = &getModel('module');
+ $config = $oModuleModel->getModuleConfig('member');
+ if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
+
ob_start();
require('./modules/member/openid_lib/class.openid.php');
require_once('./modules/member/openid_lib/libcurlemu.inc.php');
@@ -64,6 +68,10 @@
* @brief openid 인증 체크
**/
function procMemberOpenIDValidate() {
+ $oModuleModel = &getModel('module');
+ $config = $oModuleModel->getModuleConfig('member');
+ if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
+
ob_start();
require('./modules/member/openid_lib/class.openid.php');
require_once('./modules/member/openid_lib/libcurlemu.inc.php');
diff --git a/modules/member/openid_lib/libcurlnative.inc.php b/modules/member/openid_lib/libcurlnative.inc.php
index 805733f23..d1c3884a3 100755
--- a/modules/member/openid_lib/libcurlnative.inc.php
+++ b/modules/member/openid_lib/libcurlnative.inc.php
@@ -325,7 +325,7 @@ function curl_setopt($ch,$option,$value) {
case CURLOPT_VERBOSE:
case CURLOPT_NETRC:
default:
- trigger_error("CURL emulation does not implement CURL option "._curlopt_name($option),E_USER_WARNING);
+ //trigger_error("CURL emulation does not implement CURL option "._curlopt_name($option),E_USER_WARNING);
break;
}
}
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 945833735..18ad2030c 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -35,6 +35,7 @@
+
+