From b297e9eeee39e0d6fcc8eced4747e2f316a6bca2 Mon Sep 17 00:00:00 2001 From: misol Date: Sat, 30 Jun 2012 17:46:48 +0000 Subject: [PATCH] Issue 2106 Mobile support for Member module fix and apply Mobile member module identity as CSS written. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10810 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/lang/lang.xml | 8 +++ modules/member/member.admin.view.php | 4 +- modules/member/member.controller.php | 6 +- modules/member/member.mobile.php | 36 +++++++++++ modules/member/ruleset/findAccount.xml | 8 +++ .../skins/default/find_member_account.html | 4 +- modules/member/tpl/css/mlogin.css | 5 ++ modules/member/tpl/css/msignup.css | 1 + modules/member/tpl/find_member_account.html | 59 +++++++++++++++++++ modules/member/tpl/find_temp_password.html | 7 +++ modules/member/tpl/login_form.html | 22 +++++++ modules/member/tpl/modify_password.html | 54 +++++++++-------- modules/member/tpl/signup_form.html | 4 +- modules/message/m.skins/default/message.css | 1 + .../m.skins/default/system_message.html | 24 +++++++- 15 files changed, 212 insertions(+), 31 deletions(-) create mode 100644 modules/member/ruleset/findAccount.xml create mode 100644 modules/member/tpl/find_member_account.html create mode 100644 modules/member/tpl/find_temp_password.html diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml index f3c2d99db..1e4786a18 100644 --- a/modules/member/lang/lang.xml +++ b/modules/member/lang/lang.xml @@ -933,6 +933,14 @@ + + + + + + + + diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 7da239f9a..443f47681 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -253,7 +253,7 @@ ,zdate($memberInfo['birthday'], 'Y-m-d', false) ,$lang->cmd_delete); }elseif($formInfo->name == 'find_account_question'){ - $inputTag = '
'; + $inputTag = ''; $optionTag = array(); foreach($lang->find_account_question_items as $key=>$val){ if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"'; @@ -264,7 +264,7 @@ ,$val); } $inputTag = sprintf($inputTag, implode('', $optionTag)); - $inputTag .= '
'; + $inputTag .= ''; }else{ $inputTag = sprintf('' ,$formInfo->name diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index c1200271c..1b069f4a1 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1081,7 +1081,11 @@ $oMail->send(); // Return message $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address); - return new Object(0,$msg); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + $this->setRedirectUrl($returnUrl.'&user_id='.$user_id); + } + return new Object(0,$msg); } diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php index ec95550c3..ea2e9aa96 100644 --- a/modules/member/member.mobile.php +++ b/modules/member/member.mobile.php @@ -99,6 +99,39 @@ class memberMobile extends member $this->setTemplateFile('member_info_mobile'); } + /** + * @brief Find user ID and password + **/ + function dispMemberFindAccount() { + if(Context::get('is_logged')) return $this->stop('already_logged'); + + $oMemberModel = &getModel('member'); + $config = $oMemberModel->getMemberConfig(); + Context::set('identifier', $config->identifier); + + $this->setTemplateFile('find_member_account'); + } + + /** + * @brief Generate a temporary password + **/ + function dispMemberGetTempPassword() { + if(Context::get('is_logged')) return $this->stop('already_logged'); + + $oMemberModel = &getModel('member'); + $config = $oMemberModel->getMemberConfig(); + Context::set('identifier', $config->identifier); + + $user_id = Context::get('user_id'); + $temp_password = $_SESSION['xe_temp_password_'.$user_id]; + unset($_SESSION['xe_temp_password_'.$user_id]); + + if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request'); + Context::set('temp_password', $temp_password); + + $this->setTemplateFile('find_temp_password'); + } + /** * @brief Edit member profile **/ @@ -153,6 +186,9 @@ class memberMobile extends member // A message appears if the user is not logged-in if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged'); + $config = $oMemberModel->getMemberConfig(); + Context::set('identifier', $config->identifier); + $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; diff --git a/modules/member/ruleset/findAccount.xml b/modules/member/ruleset/findAccount.xml new file mode 100644 index 000000000..50f47c6a2 --- /dev/null +++ b/modules/member/ruleset/findAccount.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html index 3136bd80b..0b79c09f4 100644 --- a/modules/member/skins/default/find_member_account.html +++ b/modules/member/skins/default/find_member_account.html @@ -1,6 +1,6 @@ -

{$lang->cmd_find_member_account}

+

{$lang->cmd_find_member_account_with_email}

{$lang->about_find_member_account}

@@ -17,7 +17,7 @@
-

{$lang->cmd_find_member_account}

+

{$lang->cmd_find_member_account_with_email_question}

{$lang->about_find_account_question}

diff --git a/modules/member/tpl/css/mlogin.css b/modules/member/tpl/css/mlogin.css index ef47a88cf..fe604591f 100644 --- a/modules/member/tpl/css/mlogin.css +++ b/modules/member/tpl/css/mlogin.css @@ -31,6 +31,11 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0} .ff label+input[type=text], .ff label+input[type=password], .ff label+textarea{padding:5px} +/* Help */ +.hp{background:#eee;border-top:1px solid #ddd;padding:12px 10px !important;margin:10px -10px !important;} +.hp li{margin:0;display:inline;border-left:1px solid #ccc;padding:0 4px 0 8px;} +.hp li:first-child{border:0;} +.hp a{color:#333;text-decoration:none} /* Button Area */ .bna{text-align:center;padding:0 10px;margin:10px 0} .bna:after{content:"";display:block;clear:both} diff --git a/modules/member/tpl/css/msignup.css b/modules/member/tpl/css/msignup.css index 0798f4df1..9555f31fb 100644 --- a/modules/member/tpl/css/msignup.css +++ b/modules/member/tpl/css/msignup.css @@ -51,3 +51,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0} .bn[href]{height:26px} .bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset} .bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000} +.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../../../common/img/msg.update.png) no-repeat 1em .5em} \ No newline at end of file diff --git a/modules/member/tpl/find_member_account.html b/modules/member/tpl/find_member_account.html new file mode 100644 index 000000000..994080ff2 --- /dev/null +++ b/modules/member/tpl/find_member_account.html @@ -0,0 +1,59 @@ + + + +
+

{$XE_VALIDATOR_MESSAGE}

+
+

{$lang->cmd_find_member_account_with_email}

+ + + + + + + +
    +
  • + + +
    • +
+
+ +
+ + + +

{$lang->cmd_find_member_account_with_email_question}

+

{$lang->about_find_account_question}

+
+ + + + + + +
    +
  • + + +
    • +
  • + + +
    • +
  • + + + +
    • +
+
+ +
+
+ diff --git a/modules/member/tpl/find_temp_password.html b/modules/member/tpl/find_temp_password.html new file mode 100644 index 000000000..34ed3e94f --- /dev/null +++ b/modules/member/tpl/find_temp_password.html @@ -0,0 +1,7 @@ + +
+

{$lang->cmd_find_member_account}

+

{$lang->about_temp_password}

+

{$lang->user_id}{$lang->email_address}: {$user_id}

+

{$lang->temp_password}: {$temp_password}

+
\ No newline at end of file diff --git a/modules/member/tpl/login_form.html b/modules/member/tpl/login_form.html index 75693f263..b949b637d 100644 --- a/modules/member/tpl/login_form.html +++ b/modules/member/tpl/login_form.html @@ -1,3 +1,4 @@ +
@@ -14,9 +15,30 @@
    • +
    +
    + + \ No newline at end of file diff --git a/modules/member/tpl/modify_password.html b/modules/member/tpl/modify_password.html index bdcb797a7..30244586c 100644 --- a/modules/member/tpl/modify_password.html +++ b/modules/member/tpl/modify_password.html @@ -1,30 +1,38 @@ -{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) } -{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) } -{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) } -{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) } -{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) } - - + +
    -

    {$member_title = $lang->cmd_modify_member_password}

    -
    - - - -
    -
      -
    • {htmlspecialchars($member_info->user_id)}
      • -
      • -
    • -
      -

      {$lang->about_password}

      • -
    -
    -
    - {$lang->cmd_back} +
    +

    {$XE_VALIDATOR_MESSAGE}

    +

    {$member_title = $lang->cmd_modify_member_password}

    + + + + + + +
    +
      +
    • + +
      {htmlspecialchars($member_info->user_id)}{htmlspecialchars($member_info->email_address)}
      +
      • +
    • + + +
      • +
    • +
      +
      +

      {$lang->about_password}

      +
      • +
    +
    +
    + +
    \ No newline at end of file diff --git a/modules/member/tpl/signup_form.html b/modules/member/tpl/signup_form.html index 70be0acb4..9b1b38628 100644 --- a/modules/member/tpl/signup_form.html +++ b/modules/member/tpl/signup_form.html @@ -1,3 +1,5 @@ + + @@ -9,7 +11,7 @@

    {$XE_VALIDATOR_MESSAGE}

    -
    + diff --git a/modules/message/m.skins/default/message.css b/modules/message/m.skins/default/message.css index 36d85c0ad..e50fbd456 100644 --- a/modules/message/m.skins/default/message.css +++ b/modules/message/m.skins/default/message.css @@ -58,3 +58,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0} .bn[href]{height:26px} .bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset} .bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000} +.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../../../common/img/msg.update.png) no-repeat 1em .5em} \ No newline at end of file diff --git a/modules/message/m.skins/default/system_message.html b/modules/message/m.skins/default/system_message.html index 9c0b8250f..d3660739c 100644 --- a/modules/message/m.skins/default/system_message.html +++ b/modules/message/m.skins/default/system_message.html @@ -3,6 +3,9 @@

    {$system_message}

    +
    +

    {$XE_VALIDATOR_MESSAGE}

    +
    {@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) } @@ -18,13 +21,16 @@
      -
      • +

    - +

    +
    + + \ No newline at end of file