[Svn-src-all:2697] [version-2_12-dev 21596] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin @ mail.ec-cube.net
2012年 3月 6日 (火) 22:37:31 JST
Subversion committed to /home/svn/open 21596
http://svn.ec-cube.net/open_trac/changeset/21596
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-06 22:37:30 +0900 (火, 06 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正,A:追加,D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/SC_CheckError.php
U branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
U branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php
U branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php
U branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php
U branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
U branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
U branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
U branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
U branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php
U branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php
U branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
U branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php
U branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
U branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
U branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
U branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php
U branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php
U branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
U branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php
U branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
変更: branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CheckError.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/SC_CheckError.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -810,7 +810,7 @@
return;
}
$this->createParam($value);
- if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $this->arrParam[$value[1]]) || preg_match("/[\\]/" ,$this->arrParam[$value[1]])) {
+ if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $this->arrParam[$value[1]]) || preg_match('/[\\]/' ,$this->arrParam[$value[1]])) {
$this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイル名に日本語やスペースは使用しないで下さい。<br />';
}
}
変更: branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -217,15 +217,15 @@
// HTML_REALDIR/DATA_REALDIRの判別
if (preg_match("@\Q".HTML_REALDIR."\E@", $path) > 0) {
- $dir = str_replace("\\", '/', HTML_REALDIR);
+ $dir = str_replace('\\', '/', HTML_REALDIR);
$path = preg_replace("@\Q".HTML_REALDIR."\E@", '', $path);
} elseif (preg_match("@\Q".DATA_REALDIR."\E@", $path) > 0) {
- $dir = str_replace("\\", '/', DATA_REALDIR);
+ $dir = str_replace('\\', '/', DATA_REALDIR);
$path = preg_replace("@\Q".DATA_REALDIR."\E@", '', $path);
} else {
$dir = '';
}
- $arrDirs = explode('/', str_replace("\\", '/', $path));
+ $arrDirs = explode('/', str_replace('\\', '/', $path));
foreach ($arrDirs as $n) {
$dir .= $n . '/';
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -103,7 +103,7 @@
$cur_idx = 0;
// ツリーを初めから全検索する
- for($iLoop=0; $iLoop < count($this->arrElementTree); $iLoop++){
+ for ($iLoop=0; $iLoop < count($this->arrElementTree); $iLoop++) {
if (preg_match($regex, $this->arrElementTree[$iLoop][0])) {
// インデックスが指定されていない(見つけたエレメント全て)、もしくは指定されたインデックスなら選択する
if (is_null($index) || $cur_idx == $index) {
@@ -145,7 +145,7 @@
$cur_idx = 0;
// 親エレメント位置からツリーを検索する
- for($iLoop=$objElement[0]; $iLoop < count($this->arrElementTree); $iLoop++){
+ for ($iLoop=$objElement[0]; $iLoop < count($this->arrElementTree); $iLoop++) {
if (preg_match($regex, $this->arrElementTree[$iLoop][0])) {
// インデックスが指定されていない(見つけたエレメント全て)、もしくは指定されたインデックスなら選択する
if (is_null($index) || $cur_idx == $index) {
@@ -178,7 +178,7 @@
public function end($back_num = 1) {
if ($this->search_depth >= $back_num) {
$this->search_depth -= $back_num;
- }else{
+ } else {
$this->search_depth = 0;
}
@@ -277,15 +277,15 @@
public function getHTML() {
if (count($this->arrErr)) {
// エラーメッセージ組み立て
- $err_msg = "";
+ $err_msg = '';
foreach ($this->arrErr as $arrErr) {
if ($arrErr['err_msg']) {
- $err_msg .= "<br />".$arrErr['err_msg'];
+ $err_msg .= '<br />'.$arrErr['err_msg'];
} else {
if ($arrErr['type'] == self::ERR_TARGET_ELEMENT_NOT_FOUND) {
$err_msg .= "<br />${arrErr['selector']} が存在しません";
} else {
- $err_msg .= "<br />".print_r($arrErr, true);
+ $err_msg .= '<br />'.print_r($arrErr, true);
}
}
}
@@ -506,14 +506,14 @@
$objSnip->appendXML($substitute_tag);
$objElement = false;
- if(isset($this->arrElementTree[$target_key]) && $this->arrElementTree[$target_key][0]){
+ if (isset($this->arrElementTree[$target_key]) && $this->arrElementTree[$target_key][0]) {
$objElement = &$this->arrElementTree[$target_key][1];
}
if (!$objElement) return false;
try {
- switch ($mode){
+ switch ($mode) {
case 'appendFirst':
if ($objElement->hasChildNodes()) {
$objElement->insertBefore($objSnip, $objElement->firstChild);
@@ -531,8 +531,7 @@
case 'insertAfter':
if ($objElement->nextSibling) {
$objElement->parentNode->insertBefore($objSnip, $objElement->nextSibling);
- }
- else {
+ } else {
$objElement->parentNode->appendChild($objSnip);
}
break;
@@ -569,5 +568,3 @@
);
}
}
-
-?>
変更: branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -69,12 +69,12 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_abouts_action_start', array($this));
-
+
$this->objSiteInfo->data = SC_Helper_DB_Ex::sfGetBasisData();
$this->objSiteInfo->data['pref'] =
isset($this->arrPref[$this->objSiteInfo->data['pref']])
? $this->arrPref[$this->objSiteInfo->data['pref']] : '';
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_abouts_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -77,7 +77,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_start', array($this));
-
+
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer_Ex();
@@ -104,11 +104,11 @@
if (count($cartList) > 0) {
// カートを購入モードに設定
$this->lfSetCurrentCart($objSiteSess, $objCartSess, $cartKey);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_confirm', array($this));
-
+
// 購入ページへ
SC_Response_Ex::sendRedirect(SHOPPING_URL);
exit;
@@ -116,41 +116,41 @@
break;
case 'up'://1個追加
$objCartSess->upQuantity($cart_no, $cartKey);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_up', array($this));
-
+
SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
exit;
break;
case 'down'://1個減らす
$objCartSess->downQuantity($cart_no, $cartKey);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_down', array($this));
-
+
SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
exit;
break;
case 'setQuantity'://数量変更
$objCartSess->setQuantity($objFormParam->getValue('quantity'), $cart_no, $cartKey);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_setQuantity', array($this));
-
+
SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
exit;
break;
case 'delete'://カートから削除
$objCartSess->delProduct($cart_no, $cartKey);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_delete', array($this));
-
+
SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
exit;
break;
@@ -200,7 +200,7 @@
// すべてのカートの内容を取得する
$this->cartItems = $objCartSess->getAllCartList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_cart_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -80,7 +80,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_contact__action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -120,11 +120,11 @@
$this->arrForm = $objFormParam->getFormParamList();
if (SC_Utils_Ex::isBlank($this->arrErr)) {
$this->lfSendMail($this);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_contact__action_complete', array($this));
-
+
// 完了ページへ移動する
SC_Response_Ex::sendRedirect('complete.php');
exit;
変更: branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -67,9 +67,9 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_contact_complete_start', array($this));
-
+
// do nothing...
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_contact_complete_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -77,7 +77,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam);
変更: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,7 +66,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_complete_action_start', array($this));
-
+
// カートが空かどうかを確認する。
$objCartSess = new SC_CartSession_Ex();
$arrCartKeys = $objCartSess->getKeys();
変更: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,7 +66,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_emailmobile_action_start', array($this));
-
+
$objCustomer = new SC_Customer;
$objFormParam = new SC_FormParam_Ex();
@@ -88,7 +88,7 @@
$this->tpl_name = $objCustomer->getValue('name01');
$this->arrForm = $objFormParam->getFormParamList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_emailmobile_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,7 +66,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_kiyaku_action_start', array($this));
-
+
$arrKiyaku = $this->lfGetKiyakuData();
$this->max = count($arrKiyaku);
@@ -76,7 +76,7 @@
}
$this->tpl_kiyaku_text = $this->lfMakeKiyakuText($arrKiyaku, $this->max, $this->offset);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_entry_kiyaku_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -87,7 +87,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_error_action_start', array($this));
-
+
switch ($this->type) {
case PRODUCT_NOT_FOUND:
$this->tpl_error='ご指定のページはございません。';
変更: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -71,7 +71,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_error_disperror_start', array($this));
-
+
switch ($this->type) {
case LOGIN_ERROR:
$this->tpl_error='IDまたはパスワードが正しくありません。<br />もう一度ご確認のうえ、再度入力してください。';
変更: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -75,7 +75,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_error_systemerror_start', array($this));
-
+
$this->tpl_error = 'システムエラーが発生しました。<br />大変お手数ですが、サイト管理者までご連絡ください。';
if (DEBUG_MODE) {
@@ -87,7 +87,7 @@
echo '<div>▲▲▲ デバッグ情報ここまで ▲▲▲</div>';
echo '</div>';
}
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_error_systemerror_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -89,7 +89,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_forgot_start', array($this));
-
+
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
変更: branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -67,7 +67,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_start', array($this));
-
+
// 会員管理クラス
$objCustomer = new SC_Customer_Ex();
// クッキー管理クラス
@@ -146,25 +146,25 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_login_mobile', array($this));
-
+
SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php');
exit;
}
}
}
-
+
// --- ログインに成功した場合
if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) {
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_login_smartphone', array($this));
-
+
echo SC_Utils_Ex::jsonEncode(array('success' => $_POST['url']));
} else {
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_login_pc', array($this));
-
+
SC_Response_Ex::sendRedirect($_POST['url']);
}
exit;
@@ -212,14 +212,14 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_logout_mypage', array($this));
-
+
// マイページログイン中はログイン画面へ移行
SC_Response_Ex::sendRedirectFromUrlPath('mypage/login.php');
} else {
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_logincheck_action_logout_toppage', array($this));
-
+
// 上記以外の場合、トップへ遷移
SC_Response_Ex::sendRedirect(HTTP_URL);
}
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,14 +65,14 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_calendar_action_start', array($this));
-
+
// 休日取得取得
$this->arrHoliday = $this->lfGetHoliday();
// 定休日取得取得
$this->arrRegularHoliday = $this->lfGetRegularHoliday();
// カレンダーデータ取得
$this->arrCalendar = $this->lfGetCalendar(2);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_calendar_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,13 +66,13 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_cart_action_start', array($this));
-
+
$objCart = new SC_CartSession_Ex();
$this->isMultiple = $objCart->isMultiple();
$this->hasDownload = $objCart->hasProductType(PRODUCT_TYPE_DOWNLOAD);
// 旧仕様との互換のため、不自然なセットとなっている
$this->arrCartList = array(0 => $this->lfGetCartData($objCart));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_cart_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_category_action_start', array($this));
-
+
// モバイル判定
switch (SC_Display_Ex::detectDevice()) {
case DEVICE_TYPE_MOBILE:
@@ -78,7 +78,7 @@
$this->arrTree = $this->lfGetCatTree($this->tpl_category_id, true);
break;
}
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_category_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -67,7 +67,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_login_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
// クッキー管理クラス
$objCookie = new SC_Cookie_Ex(COOKIE_EXPIRE);
@@ -93,7 +93,7 @@
$this->tpl_disable_logout = $this->lfCheckDisableLogout();
//スマートフォン版ログアウト処理で不正なページ移動エラーを防ぐ為、トークンをセット
$this->transactionid = SC_Helper_Session_Ex::getToken();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_login_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_news_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
switch ($this->getMode()) {
case 'getList':
@@ -76,7 +76,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_news_action_getList', array($this));
-
+
$json = $this->lfGetNewsForJson($objFormParam);
echo $json;
exit;
@@ -94,7 +94,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_news_action_getDetail', array($this));
-
+
$json = $this->lfGetNewsDetailForJson($objFormParam);
echo $json;
exit;
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,14 +64,14 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_recommend_action_start', array($this));
-
+
// 基本情報を渡す
$objSiteInfo = SC_Helper_DB_Ex::sfGetBasisData();
$this->arrInfo = $objSiteInfo->data;
//おすすめ商品表示
$this->arrBestProducts = $this->lfGetRanking();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_recommend_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_searchproducts_action_start', array($this));
-
+
// 商品ID取得
$product_id = $this -> lfGetProductId();
// カテゴリID取得
@@ -79,7 +79,7 @@
$this->maker_id = $this->lfGetSelectedMakerId($product_id, $maker_id);
// メーカー検索用選択リスト
$this->arrMakerList = $this->lfGetMakerList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_frontparts_bloc_searchproducts_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -67,7 +67,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_about_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_about_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_charge_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_charge_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,9 +65,9 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_kiyaku_action_start', array($this));
-
+
$this->lfGetKiyaku(intval($_GET['page']), $this);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_kiyaku_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_privacy_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_privacy_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_usage_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_guide_usage_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -58,7 +58,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_abstractmypage_action_start', array($this));
-
+
parent::process();
// ログインチェック
$objCustomer = new SC_Customer_Ex();
@@ -95,11 +95,11 @@
$this->CustomerPoint = $objCustomer->getvalue('point');
$this->action();
}
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_abstractmypage_action_end', array($this));
-
+
$this->sendResponse();
}
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -75,7 +75,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getvalue('customer_id');
@@ -103,7 +103,7 @@
// 1ページあたりの件数
$this->dispNumber = SEARCH_PMAX;
break;
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -78,7 +78,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_change_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
@@ -117,7 +117,7 @@
if (empty($this->arrErr)) {
// 会員情報の登録
$this->lfRegistCustomerData($objFormParam, $customer_id);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_change_action_complete', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,11 +65,11 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_changecomplete_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
//セッション情報を最新の状態に更新する
$objCustomer->updateSession();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_changecomplete_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -68,7 +68,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_delivery_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
$objFormParam = new SC_FormParam_Ex();
@@ -98,11 +98,11 @@
$arrOtherDeliv = $this->setPref($arrOtherDeliv, $this->arrPref);
$arrOtherDeliv['delivCount'] = count($arrOtherDeliv);
$this->arrOtherDeliv = $arrOtherDeliv;
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_delivery_action_getList', array($this));
-
+
echo SC_Utils_Ex::jsonEncode($this->arrOtherDeliv);
exit;
break;
@@ -120,7 +120,7 @@
// 1ページあたりの件数
$this->dispNumber = SEARCH_PMAX;
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_delivery_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -72,7 +72,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_deliveryaddr_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
$ParentPage = MYPAGE_DELIVADDR_URLPATH;
@@ -127,7 +127,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_deliveryaddr_action_edit', array($this));
-
+
// モバイルの場合、元のページに遷移
SC_Response_Ex::sendRedirect($this->getLocation($_POST['ParentPage']));
exit;
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -81,7 +81,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_download_action_start', array($this));
-
+
// ログインチェック
$objCustomer = new SC_Customer_Ex();
if (!$objCustomer->isLoginSuccess(true)) {
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -70,7 +70,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_favorite_action_start', array($this));
-
+
$objProduct = new SC_Product_Ex();
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
@@ -88,11 +88,11 @@
}
$this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
$this->arrFavorite = $objProduct->setPriceTaxTo($this->arrFavorite);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_favorite_action_getList', array($this));
-
+
echo SC_Utils_Ex::jsonEncode($this->arrFavorite);
exit;
break;
@@ -105,7 +105,7 @@
$this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
// 1ページあたりの件数
$this->dispNumber = SEARCH_PMAX;
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_favorite_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -72,7 +72,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_history_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
$objDb = new SC_Helper_DB_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
@@ -103,7 +103,7 @@
$this->lfSetAU($this->tpl_arrOrderDetail);
// 受注メール送信履歴の取得
$this->tpl_arrMailHistory = $this->lfGetMailHistory($order_id);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_history_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,11 +64,11 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_login_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_login_action_end', array($this));
-
+
SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
}
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_mailview_action_start', array($this));
-
+
$objCustomer = new SC_Customer_Ex();
if (!SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
@@ -91,7 +91,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_mailview_action_getDetail', array($this));
-
+
echo SC_Utils_Ex::jsonEncode($arrMailView);
exit;
break;
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -74,7 +74,7 @@
$this->lfAddCartProducts($arrOrderDetail);
SC_Response_Ex::sendRedirect(CART_URLPATH);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_order_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_refusal_action_start', array($this));
-
+
switch ($this->getMode()) {
case 'confirm':
$this->tpl_mainpage = 'mypage/refusal_confirm.tpl';
@@ -76,11 +76,11 @@
$objCustomer = new SC_Customer_Ex();
$this->lfDeleteCustomer($objCustomer->getValue('customer_id'));
$objCustomer->EndSession();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_refusal_action_complete', array($this));
-
+
SC_Response_Ex::sendRedirect('refusal_complete.php');
default:
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -75,7 +75,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_refusalcomplete_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_mypage_refusalcomplete_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -69,10 +69,10 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_order_action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
$this->arrOrder = $objDb->sfGetBasisData();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_order_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_categorylist_action_start', array($this));
-
+
// カテゴリIDの正当性チェック
$this->lfCheckCategoryId();
@@ -74,7 +74,7 @@
$this->arrCategory = $arrCategoryData['arrCategory'];
$this->arrChildren = $arrCategoryData['arrChildren'];
$this->tpl_subtitle = $this->arrCategory['category_name'];
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_categorylist_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -94,7 +94,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_detail_action_start', array($this));
-
+
// 会員クラス
$objCustomer = new SC_Customer_Ex();
@@ -160,7 +160,7 @@
$product_class_id = $this->objFormParam->getValue('product_class_id');
$objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_detail_action_cart', array($this));
@@ -178,7 +178,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_detail_action_add_favorite', array($this));
-
+
exit;
}
}
@@ -194,7 +194,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_detail_action_add_favorite_sphone', array($this));
-
+
print 'true';
exit;
}
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -97,7 +97,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_list_action_start', array($this));
-
+
$objProduct = new SC_Product_Ex();
$this->arrForm = $_REQUEST;//時間が無いのでコレで勘弁してください。 tao_s
@@ -142,7 +142,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_list_action_json', array($this));
-
+
echo SC_Utils_Ex::jsonEncode($this->arrProducts);
exit;
break;
@@ -196,11 +196,11 @@
$arrErr = $this->lfCheckError($target_product_id, $this->arrForm, $this->tpl_classcat_find1, $this->tpl_classcat_find2);
if (empty($arrErr)) {
$this->lfAddCart($this->arrForm, $_SERVER['HTTP_REFERER']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_list_action_cart', array($this));
-
+
SC_Response_Ex::sendRedirect(CART_URLPATH);
exit;
}
@@ -221,7 +221,7 @@
$objPlugin->doAction('lc_page_products_list_action_end',array($this));
$this->tpl_rnd = SC_Utils_Ex::sfGetRandomString(3);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_list_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -81,7 +81,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_review_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_POST);
@@ -107,7 +107,7 @@
if (empty($this->arrErr)) {
//登録実行
$this->lfRegistRecommendData($objFormParam);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_review_action_complete', array($this));
@@ -133,7 +133,7 @@
}
$this->setTemplate($this->tpl_mainpage);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_review_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,9 +65,9 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_reviewcomplete_action_start', array($this));
-
+
$this->setTemplate('products/review_complete.tpl');
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_reviewcomplete_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -65,7 +65,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_search_action_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_products_search_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -85,7 +85,7 @@
SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', true, '無効なアクセスです。');
break;
}
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_regist_action_regist', array($this));
変更: branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,7 +66,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_regist_action_regist_complete_start', array($this));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_regist_action_regist_complete_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -57,7 +57,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_rss_action_start', array($this));
-
+
$objQuery = SC_Query_Ex::getSingletonInstance();
$objView = new SC_SiteView_Ex(false);
@@ -85,7 +85,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_rss_action_end', array($this));
-
+
//画面表示
$objView->display($this->tpl_mainpage, true);
}
変更: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,7 +66,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_rss_products_action_start', array($this));
-
+
$objView = new SC_SiteView_Ex();
//店舗情報をセット
@@ -115,7 +115,7 @@
//XMLテキスト(これがないと正常にRSSとして認識してくれないツールがあるため)
header('Content-type: application/xml');
P_DETAIL_URLPATH;
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_rss_products_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -78,7 +78,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_start', array($this));
-
+
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
@@ -99,7 +99,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_logined', array($this));
-
+
SC_Response_Ex::sendRedirect(
$this->getNextlocation($this->cartKey, $this->tpl_uniqid,
$objCustomer, $objPurchase,
@@ -138,7 +138,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_login_mobile', array($this));
-
+
SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php');
exit;
}
@@ -148,7 +148,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_login_smartphone', array($this));
-
+
echo SC_Utils_Ex::jsonEncode(array('success' =>
$this->getNextLocation($this->cartKey, $this->tpl_uniqid,
$objCustomer, $objPurchase,
@@ -201,11 +201,11 @@
$objPurchase->setShipmentItemTempForSole($objCartSess);
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_nonmember_confirm', array($this));
-
+
SC_Response_Ex::sendRedirect(SHOPPING_PAYMENT_URLPATH);
exit;
}
@@ -216,7 +216,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_return', array($this));
-
+
SC_Response_Ex::sendRedirect(CART_URLPATH);
exit;
break;
@@ -237,11 +237,11 @@
$this->lfRegistData($this->tpl_uniqid, $objPurchase, $objCustomer, $objFormParam, true);
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_action_multiple', array($this));
-
+
SC_Response_Ex::sendRedirect(MULTIPLE_URLPATH);
exit;
}
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -66,10 +66,10 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_complete_action_start', array($this));
-
+
$this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
unset($_SESSION['order_id']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_complete_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -73,7 +73,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_confirm_action_start', array($this));
-
+
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer_Ex();
@@ -99,7 +99,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_confirm_action_isblank', array($this));
-
+
SC_Response_Ex::sendRedirect(CART_URLPATH);
exit;
}
@@ -140,11 +140,11 @@
case 'return':
// 正常な推移であることを記録しておく
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_confirm_action_return', array($this));
-
+
SC_Response_Ex::sendRedirect(SHOPPING_PAYMENT_URLPATH);
exit;
break;
@@ -165,22 +165,22 @@
// 決済モジュールを使用する場合
if ($this->use_module) {
$objPurchase->completeOrder(ORDER_PENDING);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_confirm_action_confirm_module', array($this));
-
+
SC_Response_Ex::sendRedirect(SHOPPING_MODULE_URLPATH);
}
// 購入完了ページ
else {
$objPurchase->completeOrder(ORDER_NEW);
$objPurchase->sendOrderMail($this->arrForm['order_id']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_confirm_action_confirm', array($this));
-
+
SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH);
}
exit;
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -69,7 +69,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_deliv_action_start', array($this));
-
+
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
@@ -95,7 +95,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_deliv_action_download', array($this));
-
+
SC_Response_Ex::sendRedirect('payment.php');
exit;
}
@@ -137,7 +137,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_deliv_action_return', array($this));
-
+
// 確認ページへ移動
SC_Response_Ex::sendRedirect(CART_URLPATH);
exit;
@@ -164,7 +164,7 @@
// 登録済み住所を取得
$this->arrAddr = $objCustomer->getCustomerAddress($objCustomer->getValue('customer_id'));
$this->tpl_addrmax = count($this->arrAddr);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_deliv_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -67,7 +67,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_multiple_action_start', array($this));
-
+
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
@@ -100,11 +100,11 @@
$objCustomer, $objPurchase,
$objCartSess);
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_multiple_action_confirm', array($this));
-
+
SC_Response_Ex::sendRedirect('payment.php');
exit;
}
@@ -119,7 +119,7 @@
$objFormParam->setParam($_SESSION['multiple_temp']);
}
$this->arrForm = $objFormParam->getFormParamList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_multiple_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2012-03-06 11:18:18 UTC (rev 21595)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2012-03-06 13:37:30 UTC (rev 21596)
@@ -154,7 +154,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_payment_action_select_deliv', array($this));
-
+
echo SC_Utils_Ex::jsonEncode($arrSelectedDeliv);
exit;
} else {
@@ -181,11 +181,11 @@
// 正常に登録されたことを記録しておく
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_payment_action_confirm', array($this));
-
+
// 確認ページへ移動
SC_Response_Ex::sendRedirect(SHOPPING_CONFIRM_URLPATH);
exit;
@@ -201,11 +201,11 @@
// 正常な推移であることを記録しておく
$objSiteSess->setRegistFlag();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_payment_action_return', array($this));
-
+
SC_Response_Ex::sendRedirect(SHOPPING_URL);
exit;
break;
@@ -237,7 +237,7 @@
}
$this->arrForm = $objFormParam->getFormParamList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('lc_page_shopping_payment_end', array($this));
Svn-src-all メーリングリストの案内