[Svn-src-all:2693] [version-2_12-dev 21592] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 5日 (月) 23:00:45 JST
Subversion committed to /home/svn/open 21592
http://svn.ec-cube.net/open_trac/changeset/21592
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-05 23:00:45 +0900 (月, 05 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
U branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
U branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
U branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
U branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php
U branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
U branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
U branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
U branches/version-2_12-dev/data/class/util/SC_Utils.php
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -81,7 +81,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
if ($objDb->sfGetBasisExists()) {
@@ -131,7 +131,7 @@
$regular_holiday_ids = explode('|', $this->arrForm['regular_holiday_ids']);
$this->arrForm['regular_holiday_ids'] = $regular_holiday_ids;
$this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -75,7 +75,7 @@
$objDb = new SC_Helper_DB_Ex();
$mode = $this->getMode();
-
+
if (!empty($_POST)) {
$objFormParam = new SC_FormParam_Ex();
$objFormParam->setParam($_POST);
@@ -91,36 +91,36 @@
case 'delete':
// ランク付きレコードの削除
$objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_delivery_action_delete', array($this));
-
+
$this->objDisplay->reload(); // PRG pattern
break;
case 'up':
$objDb->sfRankUp('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_delivery_action_up', array($this));
-
+
$this->objDisplay->reload(); // PRG pattern
break;
case 'down':
$objDb->sfRankDown('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_delivery_action_down', array($this));
-
+
$this->objDisplay->reload(); // PRG pattern
break;
default:
break;
}
$this->arrDelivList = $this->lfGetDelivList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_delivery_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -73,7 +73,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_deliveryinput_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($this->mode, $objFormParam);
$objFormParam->setParam($_POST);
@@ -100,7 +100,7 @@
}
$this->arrForm = $objFormParam->getFormParamList();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_deliveryinput_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -69,7 +69,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_holiday_action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
$objDate = new SC_Date_Ex();
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -69,7 +69,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_mail_action_start', array($this));
-
+
$masterData = new SC_DB_MasterData_Ex();
$mode = $this->getMode();
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -74,7 +74,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_paymentinput_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
$mode = $this->getMode();
$this->lfInitParam($mode, $objFormParam);
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -72,7 +72,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_tradelaw_action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -97,7 +97,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_basis_zipinstall_action_start', array($this));
-
+
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
// パラメーター情報の初期化
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -142,7 +142,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_action_move', array($this));
-
+
$this->objDisplay->reload();
}
break;
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -108,7 +108,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_csvsql_action_new_page', array($this));
-
+
// リロード
SC_Response_Ex::reload();
break;
@@ -117,11 +117,11 @@
$this->arrErr = $this->lfCheckDeleteError($objFormParam);
if (SC_Utils_Ex::isBlank($this->arrErr)) {
$this->lfDelData($objFormParam->getValue('sql_id'));
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_csvsql_action_delete', array($this));
-
+
SC_Response_Ex::reload();
exit;
}
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -134,7 +134,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_filemanager_action_download', array($this));
-
+
// ファイルダウンロード
$objFileManager->sfDownloadFile($objFormParam->getValue('select_file'));
exit;
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -64,7 +64,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_fileview_action_start', array($this));
-
+
switch ($this->getMode()) {
default:
// フォーム操作クラス
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -71,7 +71,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_contents_recommend_action_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_POST);
変更: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -137,7 +137,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_customer_action_csv', array($this));
-
+
$this->lfDoCSV($objFormParam->getHashArray());
exit;
break;
変更: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -87,7 +87,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_action_new_bloc', array($this));
-
+
SC_Response_Ex::sendRedirect('bloc.php', array('device_type_id' => $this->device_type_id));
exit;
break;
@@ -138,7 +138,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_action_delete', array($this));
-
+
SC_Response_Ex::reload(array('device_type_id' => $this->device_type_id), true);
exit;
}
変更: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -73,7 +73,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_bloc_start', array($this));
-
+
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_REQUEST);
@@ -102,7 +102,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_bloc_confirm', array($this));
-
+
SC_Response_Ex::reload($arrPram, true);
exit;
}
変更: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -112,7 +112,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_mainedit_action_confirm', array($this));
-
+
SC_Response_Ex::reload(array('device_type_id' => $this->device_type_id,
'page_id' => $result,
'msg' => 'on'), true);
変更: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -116,7 +116,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_design_template_action_download', array($this));
-
+
if ($this->doDownload($template_code) !== false) {
// ブラウザに出力し, 終了する
exit;
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -138,11 +138,11 @@
// CSVを送信する。
case 'csv':
$this->doOutputCSV($where, $arrWhereVal, $order);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_order_action_csv', array($this));
-
+
exit;
break;
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -263,7 +263,7 @@
$this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
if ($arrValuesBefore['payment_id'])
$this->arrPayment[$arrValuesBefore['payment_id']] = $arrValuesBefore['payment_method'];
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_order_edit_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -101,7 +101,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_order_pdf_action_confirm', array($this));
-
+
$status = $this->createPdf($this->objFormParam);
if ($status === true) {
exit;
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -73,7 +73,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_order_status_action_start', array($this));
-
+
$objDb = new SC_Helper_DB_Ex();
// パラメーター管理クラス
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -163,7 +163,7 @@
case 'csv':
// CSVを送信する
$objCSV = new SC_Helper_CSV_Ex();
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_products_category_action_csv', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -97,7 +97,7 @@
// 取得範囲を指定(開始行番号、行数のセット)して管理者データを取得
$this->list_data = $this->getMemberData($objNavi->start_row);
-
+
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_system_action_end', array($this));
変更: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -72,7 +72,7 @@
// フックポイント.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
$objPlugin->doAction('lc_page_admin_system_bkup_action_start', array($this));
-
+
$objFormParam = new SC_FormParam;
// パラメーターの初期化
変更: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -371,7 +371,7 @@
$plugin_dir_path = PLUGIN_UPLOAD_REALDIR . $plugin_code . '/';
$this->makeDir($plugin_dir_path);
SC_Utils_Ex::copyDirectory(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $plugin_dir_path);
-
+
// プラグイン情報を取得
$plugin = SC_Helper_Plugin_Ex::getPluginByPluginCode($plugin_code);
@@ -385,7 +385,7 @@
// プラグインhtmlディレクトリ作成
$plugin_html_dir = PLUGIN_HTML_REALDIR . $plugin_code;
$this->makeDir($plugin_html_dir);
-
+
$arrErr = $this->execPlugin($plugin, $plugin['class_name'], 'install');
if ($this->isError($arrErr) === true) {
$this->rollBack(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $plugin['plugin_id'], $plugin_html_dir);
変更: 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-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -149,8 +149,7 @@
// (上に該当せず)バックトレーススタックが指定されている場合
else if (is_array($this->backtrace)) {
$errmsg .= GC_Utils_Ex::toStringBacktrace($this->backtrace);
- }
- else {
+ } else {
$arrBacktrace = GC_Utils_Ex::getDebugBacktrace();
$errmsg .= GC_Utils_Ex::toStringBacktrace($arrBacktrace);
}
変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-05 10:52:39 UTC (rev 21591)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-05 14:00:45 UTC (rev 21592)
@@ -1741,7 +1741,7 @@
$town = $data_list[0]['town'];
$town = preg_replace("/（.*）$/","",$town);
$town = preg_replace('/以下に掲載がない場合/','',$town);
- $town = preg_replace('/(.*?)の次に番地がくる場合/',"",$town);
+ $town = preg_replace('/(.*?)の次に番地がくる場合/','',$town);
$data_list[0]['town'] = $town;
$data_list[0]['state'] = $arrREV_PREF[$data_list[0]['state']];
Svn-src-all メーリングリストの案内