merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-07-06 08:29:10 +00:00
parent 762ebbf445
commit 289973781a
200 changed files with 2296 additions and 1827 deletions

View file

@ -17,6 +17,7 @@
* @brief 사용자 추가 (관리자용)
**/
function procMemberAdminInsert() {
if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
// 필수 정보들을 미리 추출
$args = Context::gets('member_srl','user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');

View file

@ -36,6 +36,12 @@
$config = $oModuleModel->getModuleConfig('member');
if($config->after_login_url) $this->setRedirectUrl($config->after_login_url);
$redirect_url = Context::get('redirect_url');
if($output->toBool() && Context::getRequestMethod() == "POST" && $redirect_url)
{
header("location:" . $redirect_url);
}
return $output;
}
@ -505,6 +511,7 @@
* @brief 회원 가입
**/
function procMemberInsert() {
if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();

View file

@ -0,0 +1,24 @@
<?php
class memberMobile extends member
{
function init() {
// 회원 관리 정보를 받음
$this->setTemplatePath($this->module_path.'tpl');
}
function dispMemberLoginForm() {
if(Context::get('is_logged')) {
Context::set('redirect_url', getUrl('act',''));
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('redirect.html');
return;
}
// 템플릿 파일 지정
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
$this->setTemplateFile('login_form');
}
}
?>

View file

@ -0,0 +1,33 @@
/* Mobile XE */
body{margin:0;background:#fff;color:#000;word-wrap:break-word}
body,input,textarea,select,button,table{font-family:Tahoma, Geneva, sans-serif}
form{margin:0;padding:0}
form ul{margin:0;padding:0;list-style:none}
form li{margin:0 0 10px 0;padding:0 0 10px 0;border-bottom:1px dashed #999}
form li:last-child{border:0}
form p{margin:0}
form p.help{color:#666}
fieldset{border:0;margin:0;padding:0}
input,textarea,select{font-size:16px}
button{font-size:12px;cursor:pointer;background:#eee;border:1px solid #666;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;overflow:visible;padding:3px;text-shadow:1px 1px 0 #fff;box-shadow:0 0 2px #666;-moz-box-shadow:0 0 2px #666;-webkit-box-shadow:0 0 2px #666;text-decoration:none;font-weight:normal}
select{width:90%}
/* Common Class */
.al{text-align:left}
.db{display:block}
.fb{font-weight:bold}
.itx{border:1px solid #ccc;width:90%;font-size:20px;height:30px;padding:5px 10px}
.sn{margin:10px;*zoom:1}
.sn:after{content:"";display:block;clear:both}
/* Body */
.bd{position:relative;overflow:hidden;clear:both}
.bd .h2{font-size:20px;background:#ccc;border:1px solid #aaa}
.bd .h3{font-size:16px;background:#eee;border:1px solid #ccc}
.bd .h2,.bd .h3{position:relative;margin:-1px 0;padding:10px;border:1px solid #aaa;border-left:0;border-right:0;text-shadow:1px 1px #fff}
.bd .h2 em,.bd .h3 em{font-weight:normal;color:#f60;font-size:12px}
.bd .h2 a,.bd .h3 a{color:#000}
.bd .h2 .bn{position:absolute;top:8px;right:10px;font-size:12px;margin:0}
/* Context */
.cm{margin:0;padding:10px;background:#777;color:#fff;text-align:center;list-style:none;border-top:1px solid #555;*zoom:1}
.cm:after{content:"";display:block;clear:both}
.cm .fl{margin:0 5px 0 0}
.cm .fr{margin:0 0 0 5px}

View file

@ -0,0 +1,16 @@
<!--%import("css/mlogin.css")-->
<div class="bd">
<h2 class="h2">{$lang->cmd_login}</h2>
<form action="./" method="POST">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
<ul class="sn">
<li><label for="id" class="db fb al">{$lang->user_id}</label><input name="user_id" type="text" id="id" class="itx" value="" /></li>
<li><label for="pw" class="db fb al">{$lang->password}</label><input name="password" type="password" id="pw" class="itx" value="" /></li>
</ul>
<div class="cm">
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /><label for="autoLogin">{$lang->keep_signed}</label></div>
</div>
</form>
</div>