[Svn-src-all:2784] [version-2_12-dev 21683] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 26日 (月) 21:11:25 JST
Subversion committed to /home/svn/open 21683
http://svn.ec-cube.net/open_trac/changeset/21683
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-26 21:11:24 +0900 (月, 26 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
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/entry/LC_Page_Entry.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/products/LC_Page_Products_Detail.php
U branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php
U branches/version-2_12-dev/html/admin/load_plugin_config.php
変更: 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-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -855,9 +855,9 @@
$conflictPlugins = $objQuery->select('T1.plugin_id, T2.plugin_name', $table, $where, array($hookPoint['hook_point'], $hookPoint['plugin_id']));
// プラグイン名重複を削除する為、専用の配列に格納し直す.
- foreach($conflictPlugins as $conflictPlugin){
+ foreach ($conflictPlugins as $conflictPlugin) {
// プラグイン名が見つからなければ配列に格納
- if( !in_array( $conflictPlugin['plugin_name'], $arrConflictPluginName ) ) {
+ if (!in_array($conflictPlugin['plugin_name'], $arrConflictPluginName)) {
$arrConflictPluginName[] = $conflictPlugin['plugin_name'];
}
}
@@ -881,7 +881,7 @@
}
return false;
}
-
+
/**
* プラグインIDからフックポイントを取得します,
*
@@ -890,7 +890,7 @@
*/
function getHookPoint($plugin_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
$table = 'dtb_plugin_hookpoint';
$where = 'plugin_id = ?';
return $objQuery->select('*', $table, $where, array($plugin_id));
変更: 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-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -96,7 +96,7 @@
switch ($this->getMode()) {
case 'confirm':
- if(isset($_POST['submit_address'])){
+ if (isset($_POST['submit_address'])) {
// 入力エラーチェック
$this->arrErr = $this->fnErrorCheck($_POST);
// 入力エラーの場合は終了
@@ -106,21 +106,21 @@
// 郵便番号検索
$arrAdsList = SC_Utils_Ex::sfGetAddress($zipcode);
-
+
// 郵便番号が発見された場合
if (!empty($arrAdsList)) {
$data['pref'] = $arrAdsList[0]['state'];
$data['addr01'] = $arrAdsList[0]['city']. $arrAdsList[0]['town'];
- $objFormParam->setParam($data);
+ $objFormParam->setParam($data);
// 該当無し
} else {
$this->arrErr['zip01'] = '※該当する住所が見つかりませんでした。<br>';
}
}
- $this->arrForm = $objFormParam->getHashArray();
- break;
- }
+ $this->arrForm = $objFormParam->getHashArray();
+ break;
+ }
//-- 確認
$this->arrErr = SC_Helper_Customer_Ex::sfCustomerEntryErrorCheck($objFormParam);
@@ -315,8 +315,8 @@
$objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_COUNT_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_COUNT_CHECK', 'NUM_CHECK'));
// // リクエスト値をセット
- $arrData['zip01'] = $arrRequest['zip01'];
- $arrData['zip02'] = $arrRequest['zip02'];
+ $arrData['zip01'] = $arrRequest['zip01'];
+ $arrData['zip02'] = $arrRequest['zip02'];
$objFormParam->setParam($arrData);
// エラーチェック
$arrErr = $objFormParam->checkError();
変更: 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-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -95,7 +95,7 @@
switch ($this->getMode()) {
// 確認
case 'confirm':
- if(isset($_POST['submit_address'])){
+ if (isset($_POST['submit_address'])) {
// 入力エラーチェック
$this->arrErr = $this->fnErrorCheck($_POST);
// 入力エラーの場合は終了
@@ -105,21 +105,22 @@
// 郵便番号検索
$arrAdsList = SC_Utils_Ex::sfGetAddress($zipcode);
-
+
// 郵便番号が発見された場合
if (!empty($arrAdsList)) {
$data['pref'] = $arrAdsList[0]['state'];
$data['addr01'] = $arrAdsList[0]['city']. $arrAdsList[0]['town'];
- $objFormParam->setParam($data);
+ $objFormParam->setParam($data);
- // 該当無し
- } else {
+ }
+ // 該当無し
+ else {
$this->arrErr['zip01'] = '※該当する住所が見つかりませんでした。<br>';
}
}
- $this->arrForm = $objFormParam->getHashArray();
- break;
- }
+ $this->arrForm = $objFormParam->getHashArray();
+ break;
+ }
$this->arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam);
$this->arrForm = $objFormParam->getHashArray();
@@ -202,8 +203,8 @@
$objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_COUNT_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_COUNT_CHECK', 'NUM_CHECK'));
// // リクエスト値をセット
- $arrData['zip01'] = $arrRequest['zip01'];
- $arrData['zip02'] = $arrRequest['zip02'];
+ $arrData['zip01'] = $arrRequest['zip01'];
+ $arrData['zip02'] = $arrRequest['zip02'];
$objFormParam->setParam($arrData);
// エラーチェック
$arrErr = $objFormParam->checkError();
変更: 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-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -465,7 +465,7 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setOrder('rank DESC');
- $arrRecommendData = $objQuery->select("recommend_product_id, comment", "dtb_recommend_products as t1 left join dtb_products as t2 on t1.recommend_product_id = t2.product_id", "t1.product_id = ? and t2.del_flg = 0 and t2.status = 1", array($product_id));
+ $arrRecommendData = $objQuery->select('recommend_product_id, comment', 'dtb_recommend_products as t1 left join dtb_products as t2 on t1.recommend_product_id = t2.product_id', 't1.product_id = ? and t2.del_flg = 0 and t2.status = 1', array($product_id));
$arrRecommendProductId = array();
foreach ($arrRecommendData as $recommend) {
変更: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php
===================================================================
--- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php 2012-03-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -23,9 +23,9 @@
// 棒グラフ生成クラス
class SC_Plugin_Util {
-
-
-
+
+
+
/**
* 稼働中のプラグインを取得する。
*/
@@ -75,8 +75,8 @@
$plugin = $objQuery->getRow($col, $table, $where, array($plugin_id));
return $plugin;
}
-
-
+
+
/**
* プラグインコードをキーにプラグインを取得する。
*
変更: branches/version-2_12-dev/html/admin/load_plugin_config.php
===================================================================
--- branches/version-2_12-dev/html/admin/load_plugin_config.php 2012-03-26 12:06:10 UTC (rev 21682)
+++ branches/version-2_12-dev/html/admin/load_plugin_config.php 2012-03-26 12:11:24 UTC (rev 21683)
@@ -40,10 +40,10 @@
GC_Utils::gfPrintLog('loading plugin ====> plugin_id = ' . $plugin_id);
$plugin = SC_Plugin_Util_Ex::getPluginByPluginId($plugin_id);
-
+
if (isset($plugin['plugin_code'])) {
$config_path = PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'] . '/config.php';
-
+
if (file_exists($config_path)) {
require_once $config_path;
exit;
Svn-src-all メーリングリストの案内