git-svn-id: http://xe-core.googlecode.com/svn/trunk@1566 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/context/Context.class.php

@@ -513,7 +513,6 @@
             }
 
             return $this->path.'?'.htmlspecialchars($url);
-
         }
 
         /**

modules/admin/tpl/layout.html

@@ -6,7 +6,7 @@
 </div>
 
 <div id="admin_sub_menu">
-    <a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a>
+    <a href="{getUrl('','act','dispMemberLogout')}">{$lang->cmd_logout}</a>
 </div>
 
 <div id="admin_main_menu">

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 = '지정된 일자까지 해당 사용자는 로그인을 할 수 없습니다';

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;

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);
 
             // 템플릿 파일 지정

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';

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');

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;
 	}
 }

modules/member/skins/default/login_form.html

@@ -35,6 +35,7 @@
 </form>
 
 <!-- OpenID -->
+<!--@if($member_config->enable_openid=='Y')-->
 <form action="./" method="post" onsubmit="return procFilter(this, openid_login)">
     <table border="1">
     <tr>
@@ -48,6 +49,7 @@
     </tr>
     </table>
 </form>
+<!--@end-->
 
 <script type="text/javascript">
         xAddEventListener(window, "load", function() { doFocusUserId('fo_member_login'); });

modules/member/tpl/member_config.html

@@ -14,6 +14,13 @@
                 </select>
         </td>
     </tr>
+    <tr>
+        <th rowspan="2">{$lang->enable_openid}</th>
+        <td><input type="checkbox" name="enable_openid" value="Y" <!--@if($config->enable_openid=='Y')-->checked="true"<!--@end-->/></td>
+    </tr>
+    <tr>
+        <td>{$lang->about_enable_openid}</td>
+    </tr>
     <tr>
         <th rowspan="2">{$lang->enable_join}</th>
         <td><input type="checkbox" name="enable_join" value="Y" <!--@if($config->enable_join=='Y')-->checked="true"<!--@end-->/></td>