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

common/js/xml_js_filter.js

@@ -235,6 +235,8 @@ function XmlJsFilterCheckFieldItem() {
 } 
 
 function XmlJsFilterGetParameterParam() {
+    if(!this.fo_obj) return new Array();
+
     var prev_name = '';
     if(this.parameter.length<1) {
         for(var i=0;i<this.fo_obj.length;i++) {

common/lang/ko.lang.php

@@ -101,7 +101,7 @@
     $lang->date = '날짜';
     $lang->regdate = '등록일';
     $lang->last_update = '최근수정일';
-    $lang->last_login = '최종로그인';
+    $lang->last_login = '최근로그인';
     $lang->first_page = '첫페이지';
     $lang->last_page = '끝페이지';
     $lang->search_target = '검색대상';

modules/member/member.controller.php

@@ -18,7 +18,10 @@
          **/
         function procLogin($user_id, $password) {
             // 변수 정리
+            if(!$user_id) $user_id = Context::get('user_id');
             $user_id = trim($user_id);
+
+            if(!$password) $password = Context::get('password');
             $password = trim($password);
 
             // 이메일 주소나 비밀번호가 없을때 오류 return

modules/plugin/plugin.model.php

@@ -100,28 +100,30 @@
             // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
             if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
             else $extra_vars = $xml_obj->extra_vars->var;
-            $extra_var_count = count($extra_vars);
+            if($extra_vars[0]->attrs->id) {
+                $extra_var_count = count($extra_vars);
 
-            $buff .= sprintf('$plugin_info->extra_var_count = "%s";', $extra_var_count);
-            for($i=0;$i<$extra_var_count;$i++) {
-                unset($var);
-                unset($options);
-                $var = $extra_vars[$i];
+                $buff .= sprintf('$plugin_info->extra_var_count = "%s";', $extra_var_count);
+                for($i=0;$i<$extra_var_count;$i++) {
+                    unset($var);
+                    unset($options);
+                    $var = $extra_vars[$i];
 
-                $buff .= sprintf('$plugin_info->extra_var->%s->name = "%s";', $var->attrs->id, $var->name->body);
-                $buff .= sprintf('$plugin_info->extra_var->%s->type = "%s";', $var->attrs->id, $var->type->body);
-                $buff .= sprintf('$plugin_info->extra_var->%s->value = $vars->%s;', $var->attrs->id, $var->attrs->id);
-                $buff .= sprintf('$plugin_info->extra_var->%s->description = "%s";', $var->attrs->id, str_replace('"','\"',$var->description->body));
+                    $buff .= sprintf('$plugin_info->extra_var->%s->name = "%s";', $var->attrs->id, $var->name->body);
+                    $buff .= sprintf('$plugin_info->extra_var->%s->type = "%s";', $var->attrs->id, $var->type->body);
+                    $buff .= sprintf('$plugin_info->extra_var->%s->value = $vars->%s;', $var->attrs->id, $var->attrs->id);
+                    $buff .= sprintf('$plugin_info->extra_var->%s->description = "%s";', $var->attrs->id, str_replace('"','\"',$var->description->body));
 
-                $options = $var->options;
-                if(!$options) continue;
+                    $options = $var->options;
+                    if(!$options) continue;
+
+                    if(!is_array($options)) $options = array($options);
+                    $options_count = count($options);
+                    for($j=0;$j<$options_count;$j++) {
+                        $buff .= sprintf('$plugin_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$j]->value->body, $options[$j]->name->body);
+                    }
 
-                if(!is_array($options)) $options = array($options);
-                $options_count = count($options);
-                for($j=0;$j<$options_count;$j++) {
-                    $buff .= sprintf('$plugin_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$j]->value->body, $options[$j]->name->body);
                 }
-
             }
 
             $buff = '<?php if(!__ZBXE__) exit(); '.$buff.' ?>';

modules/plugin/tpl.admin/js/admin.js

@@ -20,8 +20,6 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     var iframe_obj = opener.editorGetIFrame(module_srl);
     opener.editorReplaceHTML(iframe_obj, plugin_code);
     opener.editorFocus(module_srl);
-
-    window.close();
 } 
 
 /* 플러그인 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */

plugins/login_info/skins/default/filter/login.xml

@@ -0,0 +1,14 @@
+<filter name="login" module="member" act="procLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id"/>
+    <node target="password" required="true" />
+  </form>
+  <parameter>
+    <param name="user_id" target="user_id" />
+    <param name="password" target="password" />
+  </parameter>
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>

plugins/login_info/skins/default/filter/logout.xml

@@ -0,0 +1,7 @@
+<filter name="logout" module="member" act="procLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>

plugins/login_info/skins/default/login_info.html

@@ -1,10 +1,62 @@
+
 <!--@if($colorset=="normal"||!$colorset)-->
     <!--%import("normal/style.css")-->
-<!--@elseif($colorset=="blue")-->
-    <!--%import("blue/style.css")-->
 <!--@end-->
+{@debugPrint($logged_info)}
+<!-- 로그인 사용자일 경우 -->
+<!--@if($logged_info)-->
 
-<div class="login_info_default_{$colorset}">
-    <div class="login_info_default_box">
+    <!--%import("./filter/logout.xml")-->
+    <div class="login_info_default_{$colorset}">
+
+        <!-- 닉네임 + 로그아웃 -->
+        <div class="top_box">
+            <div class="nick_name">
+                {$logged_info->nick_name}
+            </div>
+            <div class="logout">
+                <a href="#" onclick="procFilter(null, logout);return false;">{$lang->cmd_logout}</a>
+            </div>
+        </div>
+
+        <div class="info_box">
+            <!-- 정보 수정 링크 -->
+            <div class="modify_info">
+                <a href="#">{$lang->cmd_modify_member_info}</a>
+            </div>
+
+            <!-- 최종 록그인 시간 -->
+            <div class="last_login">
+                {$lang->last_login} : {zDate($logged_info->last_login, "Y-m-d H:i")}
+            </div>
+
+            <!-- 관리자일 경우 관리자 링크 -->
+            <!--@if($logged_info->is_admin=="Y")-->
+                <div class="link_admin">
+                    <a href="./?module=admin">{$lang->cmd_management}</a>
+                </div>
+            <!--@end-->
+        </div>
     </div>
-</div>
+
+<!-- 비로그인 사용자일 경우 -->
+<!--@else-->
+    <!--%import("./filter/login.xml")-->
+
+    <div class="login_info_default_{$colorset}">
+        <form action="./" method="get" onsubmit="return procFilter(this, login)">
+            <div class="login_box">
+                <div class="header">{$lang->user_id}</div>
+                <div class="body"><input type="text" name="user_id" /></div>
+
+
+                <div class="header">{$lang->password}</div>
+                <div class="body"><input type="password" name="password" /></div>
+            </div>
+
+            <div class="button_area">
+                <input type="submit" value="{$lang->cmd_login}" /> 
+            </div>
+        </form>
+    </div>
+<!--@end-->

plugins/login_info/skins/default/normal/style.css

@@ -1,79 +1,107 @@
-.newest_document_default_normal {
+.login_info_default_normal {
+    border:3px solid #DDDDDD;
+    padding:6px;
+    width:190px;
 }
 
-.newest_document_default_normal .newest_document_default_box {
-    padding:5px;  
-}
-
-.newest_document_default_normal .newest_document_default_box .title_box {
-    border:1px solid #EEEEEE;
-    padding:5px;
-    height:14px;
-    overflow:hidden;
-}
-
-.newest_document_default_normal .newest_document_default_box .title_box .title {
-    background:url(./title_bullet.gif) no-repeat left;
-    font-weight:bold; 
-    height:14px;
-    padding-left:20px;
-    float:left;
-}
-
-.newest_document_default_normal .newest_document_default_box .title_box .more A {
-    float:right;
-    color:#AAAAAA;
-    text-decoration:none;
-    font-family:tahoma;
-    font-weight:bold;
-}
-
-.newest_document_default_normal .newest_document_default_box .document_box {
-    padding:3px 3px 3px 20px;
-    clear:both;
-    border-bottom:1px solid #EEEEEE;
+.login_info_default_normal .top_box {
     height:16px;
-    margin:0px 0px 2px 0px;
+    border-bottom:2px dotted #DDDDDD;
     overflow:hidden;
+    margin-bottom:5px;
 }
 
-.newest_document_default_normal .newest_document_default_box .document {
-    padding:0px 0px 5px 20px;
-    background:url(./document_bullet.gif) no-repeat left;
+.login_info_default_normal .top_box .nick_name {
+    font-weight:bold;
     float:left;
+    color:#555555;
 }
 
-.newest_document_default_normal .newest_document_default_box .document A {
+.login_info_default_normal .top_box .logout {
+    float:right;
+}
+
+.login_info_default_normal .top_box .logout A {
+    font-weight:bold;
     text-decoration:none;
     color:#555555;
 }
 
-.newest_document_default_normal .newest_document_default_box .document A:hover {
+.login_info_default_normal .top_box .logout A:hover {
+    font-weight:bold;
     text-decoration:underline;
-    color:#000000;
+    color:#555555;
 }
 
-.newest_document_default_normal .newest_document_default_box .document A:visited {
-    color:#AAAAAA;
+.login_info_default_normal .info_box {
+    clear:both;
+    color:#555555;
 }
 
-.newest_document_default_normal .newest_document_default_box .document .comment A {
-    font-size:7pt;
-    font-family:tahoma;
-    color:#AAAAAA;
-    letter-spacing:-1px;
+.login_info_default_normal .info_box A {
+    text-decoration:none;
+    color:#555555;
 }
 
-.newest_document_default_normal .newest_document_default_box .document .writer {
-    font-size:9pt;
-    font-family:tahoma;
-    color:#AAAAAA;
+.login_info_default_normal .info_box .modify_info {
+    background:url("../images/icon_profile.gif") no-repeat left;
+    padding-left:15px;
+    margin-bottom:4px;
 }
 
-
-.newest_document_default_normal .newest_document_default_box .regdate {
-    color:#AAAAAA;
-    font-size:8pt;
-    font-family:tahoma;
-    float:right;
+.login_info_default_normal .info_box .last_login {
+    padding-left:15px;
+    margin-bottom:4px;
+}
+
+.login_info_default_normal .info_box .link_admin {
+    background:url("../images/icon_key.gif") no-repeat left;
+    padding-left:15px;
+    margin-bottom:4px;
+}
+
+.login_info_default_normal .info_box .link_admin A {
+    color:#cd0000;
+}
+
+.login_info_default_normal .login_box {
+    height:40px;
+}
+
+.login_info_default_normal .header {
+    float:left;
+    clear:left;
+    width:80px;
+    margin-bottom:5px;
+    font-weight:bold;
+    color:#555555;
+}
+
+.login_info_default_normal .body {
+    float:left;
+    width:100px;
+    margin-bottom:5px;
+}
+
+.login_info_default_normal .body input {
+    width:90px;
+    height:13px;
+    border:1px solid #AAAAAA;
+    color:#555555;
+}
+
+.login_info_default_normal .button_area {
+    clear:both;
+    height:20px;
+    text-align:center;
+}
+
+.login_info_default_normal .button_area input {
+    width:90px;
+    height:18px;
+    border:1px solid #AAAAAA;
+    background-color:#555555;
+    color:#FFFFFF;
+    font-weight:bold;
+    width:100%;
 }