Changeset 21144 for branches

Timestamp:

2011/08/08 14:25:53 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21143

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/sphone/mypage/login.tpl login.tpl-20101209134550-lsv02w9wikfx9cj3-22
data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2FLC_Page_FrontParts_LoginCheck.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110808052447-3ycohnin9dx0r9l9

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110808052550-xv2dl1dt6p95bgjf

bzr:revno:

3847

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110808052550-xv2dl1dt6p95bgjf
sha1: 0b5745575a51ec3c912b3586a44bd5056ca01a93

bzr:text-parents:

data/Smarty/templates/sphone/mypage/login.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21107
data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php ohkouchi@loop-az.jp-20110805141429-q4uvtjkhv4f7km3u

bzr:timestamp:

2011-08-08 14:25:50.316999912 +0900

bzr:user-agent:

bzr2.3.1+bzr-svn1.1.0dev0

Message:

#1413 ログインエラーを alert に

• mypage/login.php を対応

Location:

branches/version-2_11-dev/data

Files:

• Smarty/templates/sphone/mypage/login.tpl (modified) (1 diff)
• class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (modified) (2 diffs)

branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/login.tpl

@@ -23 +23 @@
 *}-->
 <!--▼CONTENTS-->
+<script>
+  function ajaxLogin() {
+      var postData = new Object;
+      postData['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = "<!--{$transactionid}-->";
+      postData['mode'] = 'login';
+      postData['login_email'] = $('input[type=email]').val();
+      postData['login_pass'] = $('input[type=password]').val();
+      postData['url'] = $('input[name=url]').val();
+
+      $.ajax({
+          type: "POST",
+          url: "<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php",
+          data: postData,
+          cache: false,
+          dataType: "json",
+          error: function(XMLHttpRequest, textStatus, errorThrown){
+              alert(textStatus);
+          },
+          success: function(result){
+              if (result.success) {
+                  location.href = result.success;
+              } else {
+                  alert(result.login_error);
+              }
+          }
+      });
+  }
+</script>
 <section id="slidewindow">
 
 <h2 class="title"><!--{$tpl_title|h}--></h2>
-     <form name="login_mypage" id="login_mypage" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_mypage')">
+     <form name="login_mypage" id="login_mypage" method="post" action="javascript:;" onsubmit="return ajaxLogin();">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
         <input type="hidden" name="mode" value="login" />
-        <input type="hidden" name="url" value="<!--{$smarty.server.PHP_SELF|h}-->" />
+        <input type="hidden" name="url" value="<!--{$smarty.server.REQUEST_URI|h}-->" />
+
 <div class="login_area">
 

branches/version-2_11-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

@@ -140 +140 @@
 
                     // --- ログインに成功した場合
-                    SC_Response_Ex::sendRedirect($_POST['url']);
+                    if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) {
+                        echo SC_Utils_Ex::jsonEncode(array('success' => $_POST['url']));
+                    } else {
+                        SC_Response_Ex::sendRedirect($_POST['url']);
+                    }
                     exit;
                 } else {
@@ -156 +160 @@
                 }
             } else {
+                // XXX 到達しない？
                 // 入力エラーの場合、元のアドレスに戻す。
                 SC_Response_Ex::sendRedirect($_POST['url']);