[Svn-src-all:1552] [version-2_5-dev 20448] SC_SiteSessionクラスのclass_extends対応。
shutta
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 20:31:15 JST
Subversion committed to /home/svn/open 20448
http://svn.ec-cube.net/open_trac/changeset/20448
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-28 20:31:14 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
SC_SiteSessionクラスのclass_extends対応。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Customer.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
A branches/version-2_5-dev/data/class_extends/SC_SiteSession_Ex.php
U branches/version-2_5-dev/data/require_classes.php
変更: branches/version-2_5-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Customer.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/SC_Customer.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -213,7 +213,7 @@
unset($_SESSION['customer']);
// トランザクショントークンの破棄
SC_Helper_Session_Ex::destroyToken();
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objSiteSess->unsetUniqId();
// ログに記録する
GC_Utils_Ex::gfPrintLog("logout : user=".$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE );
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -55,7 +55,7 @@
*/
function completeOrder($orderStatus = ORDER_NEW) {
$objQuery =& SC_Query::getSingletonInstance();
- $objSiteSession = new SC_SiteSession();
+ $objSiteSession = new SC_SiteSession_Ex();
$objCartSession = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$customerId = $objCustomer->getValue('customer_id');
@@ -117,7 +117,7 @@
* POSTのユニークIDとセッションのユニークIDを比較
*(ユニークIDがPOSTされていない場合はスルー)
*/
- if(!SC_SiteSession::checkUniqId()) {
+ if(!SC_SiteSession_Ex::checkUniqId()) {
SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE);
exit;
}
@@ -675,10 +675,10 @@
$objQuery->update("dtb_order_temp", array('del_flg' => 1),
"order_temp_id = ?",
- array(SC_SiteSession::getUniqId()));
+ array(SC_SiteSession_Ex::getUniqId()));
$objCartSession->delAllProducts($cartKey);
- SC_SiteSession::unsetUniqId();
+ SC_SiteSession_Ex::unsetUniqId();
return $orderParams['order_id'];
}
変更: branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -76,7 +76,7 @@
*/
function action() {
$objCartSess = new SC_CartSession_Ex();
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer();
$objFormParam = $this->lfInitParam($_REQUEST);
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -75,7 +75,7 @@
* @return void
*/
function action() {
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$objCookie = new SC_Cookie();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -71,7 +71,7 @@
*/
function action() {
$objCartSess = new SC_CartSession_Ex();
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer();
$objQuery = new SC_Query();
$objDb = new SC_Helper_DB_Ex();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -65,7 +65,7 @@
* @return void
*/
function action() {
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer();
$objPurchase = new SC_Helper_Purchase_Ex();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -51,7 +51,7 @@
* @return void
*/
function process() {
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -63,7 +63,7 @@
* @return void
*/
function action() {
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer();
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -74,7 +74,7 @@
* @return void
*/
function action() {
- $objSiteSess = new SC_SiteSession();
+ $objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer();
追加: branches/version-2_5-dev/data/class_extends/SC_SiteSession_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_SiteSession_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_SiteSession_Ex.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_SiteSession.php");
+
+class SC_SiteSession_Ex extends SC_SiteSession {
+}
+
+?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2011-02-28 11:00:39 UTC (rev 20447)
+++ branches/version-2_5-dev/data/require_classes.php 2011-02-28 11:31:14 UTC (rev 20448)
@@ -44,7 +44,7 @@
require_once(CLASS_EX_REALDIR . "SC_SendMail_Ex.php");
require_once(CLASS_REALDIR . "SC_FormParam.php");
require_once(CLASS_EX_REALDIR . "SC_CartSession_Ex.php");
-require_once(CLASS_REALDIR . "SC_SiteSession.php");
+require_once(CLASS_EX_REALDIR . "SC_SiteSession_Ex.php");
require_once(CLASS_REALDIR . "SC_Customer.php");
require_once(CLASS_REALDIR . "SC_CustomerList.php");
require_once(CLASS_REALDIR . "SC_Cookie.php");
Svn-src-all メーリングリストの案内