From ef1f759a87f38efade96118d9d5f83715bf82399 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 27 Mar 2007 09:50:38 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@721 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/xml_js_filter.js | 2 + common/lang/ko.lang.php | 2 +- modules/member/member.controller.php | 3 + modules/plugin/plugin.model.php | 36 ++--- modules/plugin/tpl.admin/js/admin.js | 2 - .../login_info/skins/default/filter/login.xml | 14 ++ .../skins/default/filter/logout.xml | 7 + .../skins/default/images/icon_key.gif | Bin 0 -> 505 bytes .../skins/default/images/icon_note.gif | Bin 0 -> 534 bytes .../skins/default/images/icon_profile.gif | Bin 0 -> 535 bytes .../login_info/skins/default/login_info.html | 62 +++++++- .../login_info/skins/default/normal/style.css | 140 +++++++++++------- 12 files changed, 187 insertions(+), 81 deletions(-) create mode 100644 plugins/login_info/skins/default/filter/login.xml create mode 100644 plugins/login_info/skins/default/filter/logout.xml create mode 100644 plugins/login_info/skins/default/images/icon_key.gif create mode 100644 plugins/login_info/skins/default/images/icon_note.gif create mode 100644 plugins/login_info/skins/default/images/icon_profile.gif diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index d5c9fe824..d92b38e51 100644 --- a/common/js/xml_js_filter.js +++ b/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;idate = '날짜'; $lang->regdate = '등록일'; $lang->last_update = '최근수정일'; - $lang->last_login = '최종로그인'; + $lang->last_login = '최근로그인'; $lang->first_page = '첫페이지'; $lang->last_page = '끝페이지'; $lang->search_target = '검색대상'; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 46b8ec4fc..2051e3902 100644 --- a/modules/member/member.controller.php +++ b/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 diff --git a/modules/plugin/plugin.model.php b/modules/plugin/plugin.model.php index e88ad381d..ccfaa7826 100644 --- a/modules/plugin/plugin.model.php +++ b/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 = ''; diff --git a/modules/plugin/tpl.admin/js/admin.js b/modules/plugin/tpl.admin/js/admin.js index 7340a40c6..dee27121b 100644 --- a/modules/plugin/tpl.admin/js/admin.js +++ b/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(); } /* 플러그인 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */ diff --git a/plugins/login_info/skins/default/filter/login.xml b/plugins/login_info/skins/default/filter/login.xml new file mode 100644 index 000000000..2188528b8 --- /dev/null +++ b/plugins/login_info/skins/default/filter/login.xml @@ -0,0 +1,14 @@ + +
+ + + + + + + + + + + +
 diff --git a/plugins/login_info/skins/default/filter/logout.xml b/plugins/login_info/skins/default/filter/logout.xml new file mode 100644 index 000000000..45f024d58 --- /dev/null +++ b/plugins/login_info/skins/default/filter/logout.xml @@ -0,0 +1,7 @@ + +
+ + + + + diff --git a/plugins/login_info/skins/default/images/icon_key.gif b/plugins/login_info/skins/default/images/icon_key.gif new file mode 100644 index 0000000000000000000000000000000000000000..152974d402a881178824ca75499f2efef2f084cd GIT binary patch literal 505 zcmZ?wbhEHb+Hd{54!)7!q@2>o^|^m3p3wSJG^-#(q2?)>`1gy*}n-ko3Y z@$SJJ2Ufi~Ipy1GjnT=m>`hL2# z<@?>}m-~|+ADQ}MU&a4_e?DEZ_;%ax&-c$CF4ld!AOH1E@W*RwKHZG_a<}vQ%gg6y zIRAJt>)V5@-=9z3KDzGy(T)HA|7RG=K=CIFBLjm2gAT|Opg3V*4{LB}YHn$5(&u0> zYir^Xw$n4_bfS-Th%l_TNW)e%{^v``e;F-)Fzum;Cd2*T>7Q z-|kg@+Fg0Kk>TB*gf|M z^-&A=&ks#s4z>Jx-v9sq)1NPve!H~d#X5&im;K(X41KlU_xFz#-`_QSIMw&#^0J@T z*8cf@^wYMykC!I?`?vhvhMYeS_I%i!|NZu^UtbqIoA2`P#f4wDw|?By@csI_w_6IH z&h>b^Bj@L*6EBwpeS47md|lv&1AN~fbUkPi`upe9!*+&un{vM2tNC!w_T#>`zyBWm ze6;i9&hj6Rd%oYF_5c6nU$57EIBWA^cg@eIGk-oi`0Y;dyZ!z@o=^MnxccLj&@Xp# z{(}Jn9f9Ic7Dfh!Xa*gSouD{jU@vZnZfb66W)U@DG853!w9siXjhZ}VvSO2wr-DBN zLy)kuY!j=tqYtB7h_bPHlb|1Gn4CCwgc?tihb|w7eR!kCe*gRB-K)n>o=%LC zefa3%jhi>0wQ29(v**Xh*I5TYef{>We$Cso-piTuPTlbm{;9 zKbI_7@_$wEq>1zH-o3kJ%hpdX9t6z(XxVXo|Ni}dKfm0wYx{kmqR;O>+&upH_y6); zAKrccYmnBvfA8McuV3q~{I5FoPiSoDlgCeX@7{g-^y$BU|GvC;`TzeP`WybcPyc`V z^r`=6Cf&MqYuU18|Ni~^4+ac_2`K(#VPs$kV9)_M3KS;{>?I8WP0cOMjFN)#5(c7f zUOr7u{AQ|_T-M_LwoNSVDvs(l8dm5akBVn-f>|zmg8Yy_GM`O*wn~i F4FGYD;bs5; literal 0 HcmV?d00001 diff --git a/plugins/login_info/skins/default/login_info.html b/plugins/login_info/skins/default/login_info.html index 2327b1966..2d75813cd 100644 --- a/plugins/login_info/skins/default/login_info.html +++ b/plugins/login_info/skins/default/login_info.html @@ -1,10 +1,62 @@ + - - +{@debugPrint($logged_info)} + + -