Changeset 20377 for branches/version-2_5-dev/data/class/pages

Timestamp:

2011/02/24 15:36:04 (15 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/default/frontparts/bloc/login.tpl 19795@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Ffrontparts%2Fbloc%2Flogin.tpl
data/Smarty/templates/default/mypage/history.tpl 15743@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmypage%2Fhistory.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3105

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/frontparts/bloc/login.tpl [email protected]
data/Smarty/templates/default/mypage/history.tpl [email protected]
data/Smarty/templates/default/shopping/payment.tpl [email protected]
data/Smarty/templates/sphone/shopping/payment.tpl [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-02-24 15:35:41.367000103 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-24T06:35:41.367000Z

Message:

#1049 ([フロント]商品購入（お支払方法指定）：配送業者が複数ある場合の不具合)

• トランザクショントークンを unset しないよう修正
• ajax 通信時にもトランザクショントークンを送信するよう修正

#1032(フロントデザインリニューアル)

• 再注文, ログアウトボタンを修正

File:

• branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -225 +225 @@
     function destroy() {
         parent::destroy();
+    }
+
+    /**
+     * トランザクショントークンを unset しないようオーバーライド.
+     *
+     * @return void
+     */
+    function doValidToken() {
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+            if (!SC_Helper_Session_Ex::isValidToken(false)) {
+                SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR);
+            }
+        }
     }