[Svn-src-all:1553] [version-2_5-dev 20449] SC_Sessionクラスのclass_extends対応。
shutta
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 20:58:16 JST
Subversion committed to /home/svn/open 20449
http://svn.ec-cube.net/open_trac/changeset/20449
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-28 20:58:16 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
SC_Sessionクラスのclass_extends対応。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
U branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
A branches/version-2_5-dev/data/class_extends/SC_Session_Ex.php
U branches/version-2_5-dev/data/require_classes.php
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -240,7 +240,7 @@
}
}
if ($is_auth) {
- SC_Utils_Ex::sfIsSuccess(new SC_Session());
+ SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
}
}
}
変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -183,7 +183,7 @@
* @return string $sid 設定したセッションのセッションID
*/
function lfSetLoginSession($member_id, $login_id, $authority, $login_name, $last_login) {
- $objSess = new SC_Session();
+ $objSess = new SC_Session_Ex();
// 認証済みの設定
$objSess->SetSession('cert', CERT_STRING);
$objSess->SetSession('member_id', $member_id);
変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -71,7 +71,7 @@
* @return void
*/
function lfDoLogout() {
- $objSess = new SC_Session();
+ $objSess = new SC_Session_Ex();
$objSess->logout();
}
変更: branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -52,7 +52,7 @@
*/
function process() {
$objView = new SC_SiteView_Ex();
- $objSess = new SC_Session();
+ $objSess = new SC_Session_Ex();
SC_Utils_Ex::sfIsSuccess($objSess);
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -286,7 +286,7 @@
function lfCheckProductId($admin_mode,$product_id) {
// 管理機能からの確認の場合は、非公開の商品も表示する。
if (isset($admin_mode) && $admin_mode == 'on') {
- SC_Utils_Ex::sfIsSuccess(new SC_Session());
+ SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
$status = true;
$where = 'del_flg = 0';
} else {
変更: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -74,7 +74,7 @@
}
function isLoggedInAdminPage() {
- $objSess = new SC_Session;
+ $objSess = new SC_Session_Ex();
if ($objSess->isSuccess() === SUCCESS) {
return true;
追加: branches/version-2_5-dev/data/class_extends/SC_Session_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_Session_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_Session_Ex.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -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_Session.php");
+
+class SC_Session_Ex extends SC_Session {
+}
+
+?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2011-02-28 11:31:14 UTC (rev 20448)
+++ branches/version-2_5-dev/data/require_classes.php 2011-02-28 11:58:16 UTC (rev 20449)
@@ -32,7 +32,7 @@
require_once(CLASS_EX_REALDIR . "SC_InstallView_Ex.php");
require_once(CLASS_EX_REALDIR . "SC_MobileView_Ex.php");
require_once(CLASS_EX_REALDIR . "SC_SmartphoneView_Ex.php");
-require_once(CLASS_REALDIR . "SC_Session.php");
+require_once(CLASS_EX_REALDIR . "SC_Session_Ex.php");
require_once(CLASS_REALDIR . "SC_Query.php");
require_once(CLASS_REALDIR . "SC_SelectSql.php");
require_once(CLASS_REALDIR . "SC_CheckError.php");
Svn-src-all メーリングリストの案内