[Svn-src-all:2787] [version-2_12-dev 21686] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 26日 (月) 21:56:25 JST
Subversion committed to /home/svn/open 21686
http://svn.ec-cube.net/open_trac/changeset/21686
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-26 21:56:25 +0900 (月, 26 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.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/customer/LC_Page_Admin_Customer_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/products/LC_Page_Admin_Products_UploadCSV.php
U branches/version-2_12-dev/data/class/util/SC_Utils.php
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php 2012-03-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -89,16 +89,16 @@
// このWhereを足さないと無効な規格も出力される。現行仕様と合わせる為追加。
$inner_where = 'dtb_products_class.del_flg = 0';
$sql = $objQuery->getSql($cols, $objProduct->prdclsSQL($inner_where),$where);
- }else if ($csv_id == '2') {
+ } else if ($csv_id == '2') {
// 会員の場合
$sql = 'SELECT ' . $cols . ' FROM dtb_customer ' . $where;
- }else if ($csv_id == '3') {
+ } else if ($csv_id == '3') {
// 注文の場合
$sql = 'SELECT ' . $cols . ' FROM dtb_order ' . $where;
- }else if ($csv_id == '4') {
+ } else if ($csv_id == '4') {
// レビューの場合
$sql = 'SELECT ' . $cols . ' FROM dtb_review AS A INNER JOIN dtb_products AS B on A.product_id = B.product_id ' . $where;
- }else if ($csv_id == '5') {
+ } else if ($csv_id == '5') {
// カテゴリの場合
$sql = 'SELECT ' . $cols . ' FROM dtb_category ' . $where;
}
変更: 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-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -280,7 +280,7 @@
foreach ($arrTable as $table) {
if (substr($table, 0, 4) == 'dtb_') {
$arrRet[ $table ] = 'データテーブル: ' . $table;
- }else if (substr($table, 0, 4) == 'mtb_') {
+ } else if (substr($table, 0, 4) == 'mtb_') {
$arrRet[ $table ] = 'マスターテーブル: ' . $table;
}
}
変更: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2012-03-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -266,14 +266,14 @@
if (!SC_Utils_Ex::isBlank($arrData['email'])) {
if ($arrData['email'] == $objFormParam->getValue('email')) {
$arrErr['email'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用しているアドレスです。';
- }else if ($arrData['email'] == $objFormParam->getValue('email_mobile')) {
+ } else if ($arrData['email'] == $objFormParam->getValue('email_mobile')) {
$arrErr['email_mobile'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用しているアドレスです。';
}
}
if (!SC_Utils_Ex::isBlank($arrData['email_mobile'])) {
if ($arrData['email_mobile'] == $objFormParam->getValue('email_mobile')) {
$arrErr['email_mobile'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。';
- }else if ($arrData['email_mobile'] == $objFormParam->getValue('email')) {
+ } else if ($arrData['email_mobile'] == $objFormParam->getValue('email')) {
if ($arrErr['email'] == '') {
$arrErr['email'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。';
}
変更: 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-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -228,7 +228,7 @@
$month = $objFormParam->getValue('month');
if (!is_numeric($month)) {
$arrErr['month'] = '発行月は数値で入力してください。';
- }else if (0 >= $month && 12 < $month) {
+ } else if (0 >= $month && 12 < $month) {
$arrErr['month'] = '発行月は1〜12の間で入力してください。';
}
@@ -236,7 +236,7 @@
$day = $objFormParam->getValue('day');
if (!is_numeric($day)) {
$arrErr['day'] = '発行日は数値で入力してください。';
- }else if (0 >= $day && 31 < $day) {
+ } else if (0 >= $day && 31 < $day) {
$arrErr['day'] = '発行日は1〜31の間で入力してください。';
}
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2012-03-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -681,7 +681,7 @@
if ($item['stock'] == '') {
if (array_search('stock_unlimited', $this->arrFormKeyList) === FALSE) {
$arrErr['stock'] = '※ 在庫数は必須です（無制限フラグ項目がある場合のみ空欄許可）。';
- }else if ($item['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) {
+ } else if ($item['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) {
$arrErr['stock'] = '※ 在庫数または在庫無制限フラグのいずれかの入力が必須です。';
}
}
変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-26 12:48:25 UTC (rev 21685)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-26 12:56:25 UTC (rev 21686)
@@ -1155,7 +1155,7 @@
$del_file = $dir . '/' . $file;
if (is_file($del_file)) {
$ret = unlink($dir . '/' . $file);
- }else if (is_dir($del_file)) {
+ } else if (is_dir($del_file)) {
$ret = SC_Utils_Ex::sfDelFile($del_file);
}
Svn-src-all メーリングリストの案内