[Svn-src-all:2694] [version-2_12-dev 21593] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 5日 (月) 23:33:00 JST
Subversion committed to /home/svn/open 21593
http://svn.ec-cube.net/open_trac/changeset/21593
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-05 23:32:59 +0900 (月, 05 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/SC_Customer.php
U branches/version-2_12-dev/data/class/SC_FormParam.php
U branches/version-2_12-dev/data/class/SC_SendMail.php
U branches/version-2_12-dev/data/class/SC_UploadFile.php
U branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
U branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
U branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php
U branches/version-2_12-dev/data/class/pages/LC_Page_Index.php
U branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.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/design/LC_Page_Admin_Design_Template.php
U branches/version-2_12-dev/data/class/util/SC_Utils.php
変更: branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CheckError.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/SC_CheckError.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -694,7 +694,7 @@
return;
}
//改行コードが含まれている場合には配列に変換
- $params = str_replace("\r","",$this->arrParam[$value[1]]);
+ $params = str_replace("\r",'',$this->arrParam[$value[1]]);
if (!empty($params)) {
if (strpos($params,"\n") === false) {
$params .= "\n";
変更: branches/version-2_12-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Customer.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/SC_Customer.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -205,7 +205,7 @@
function startSession() {
$_SESSION['customer'] = $this->customer_data;
// セッション情報の保存
- GC_Utils_Ex::gfPrintLog('access : user='.$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
+ GC_Utils_Ex::gfPrintLog('access : user='.$this->customer_data['customer_id'] ."\t".'ip='. $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
}
// ログアウト $_SESSION['customer']を解放し、ログに書き込む
@@ -219,7 +219,7 @@
$objSiteSess = new SC_SiteSession_Ex();
$objSiteSess->unsetUniqId();
// ログに記録する
- GC_Utils_Ex::gfPrintLog('logout : user='.$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
+ GC_Utils_Ex::gfPrintLog('logout : user='.$this->customer_data['customer_id'] ."\t".'ip='. $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
}
// ログインに成功しているか判定する。
変更: branches/version-2_12-dev/data/class/SC_FormParam.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_FormParam.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/SC_FormParam.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -234,7 +234,7 @@
}
if (isset($objErr->arrErr[$val]) && !$br) {
- $objErr->arrErr[$val] = preg_replace("/<br(\s+\/)?>/i", "", $objErr->arrErr[$val]);
+ $objErr->arrErr[$val] = preg_replace("/<br(\s+\/)?>/i", '', $objErr->arrErr[$val]);
}
$cnt++;
}
変更: branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SendMail.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/SC_SendMail.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -143,7 +143,7 @@
$_name = ereg_replace('<','＜', $_name);
$_name = ereg_replace('>','＞', $_name);
$_name = mb_encode_mimeheader($_name, 'JIS', 'B', "\n");
- $name_address = "\"". $_name . "\"<" . $mail_address . ">";
+ $name_address = "\"". $_name . "\"<" . $mail_address . '>';
} else {
$name_address = $mail_address;
}
変更: branches/version-2_12-dev/data/class/SC_UploadFile.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_UploadFile.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/SC_UploadFile.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -58,8 +58,8 @@
// ファイル管理クラス
function SC_UploadFile($temp_dir, $save_dir) {
- $this->temp_dir = (preg_match("|/$|", $temp_dir) == 0) ? $temp_dir. "/" : $temp_dir;
- $this->save_dir = (preg_match("|/$|", $save_dir) == 0) ? $save_dir. "/" : $save_dir;
+ $this->temp_dir = (preg_match("|/$|", $temp_dir) == 0) ? $temp_dir. '/' : $temp_dir;
+ $this->save_dir = (preg_match("|/$|", $save_dir) == 0) ? $save_dir. '/' : $save_dir;
$this->file_max = 0;
}
変更: 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-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -217,15 +217,15 @@
// HTML_REALDIR/DATA_REALDIRの判別
if (preg_match("@\Q".HTML_REALDIR."\E@", $path) > 0) {
- $dir = str_replace("\\", "/", HTML_REALDIR);
- $path = preg_replace("@\Q".HTML_REALDIR."\E@", "", $path);
+ $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);
- $path = preg_replace("@\Q".DATA_REALDIR."\E@", "", $path);
+ $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/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -58,7 +58,7 @@
*/
function sfChangeMySQL($sql) {
// 改行、タブを1スペースに変換
- $sql = preg_replace("/[\r\n\t]/"," ",$sql);
+ $sql = preg_replace("/[\r\n\t]/",' ',$sql);
// ILIKE検索をLIKE検索に変換する
$sql = $this->sfChangeILIKE($sql);
// RANDOM()をRAND()に変換する
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -45,7 +45,7 @@
$cnt = 0;
// 行末の/を取り除く
while (($file = readdir($dh)) !== false) $arrDir[] = $file;
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
// アルファベットと数字でソート
natcasesort($arrDir);
foreach ($arrDir as $file) {
@@ -97,7 +97,7 @@
$handle = opendir($dir);
while ($file = readdir($handle)) {
// 行末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$file;
if ($file != '..' && $file != '.' && !is_dir($path)) {
$bytes += filesize($path);
@@ -170,7 +170,7 @@
$default_rank = count(explode('/', $dir));
// 文末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
// 最上位層を格納(user_data/)
if ($this->sfDirChildExists($dir)) {
$arrTree[$cnt]['type'] = '_parent';
@@ -214,7 +214,7 @@
foreach ($arrDir as $item) {
if ($item != '.' && $item != '..') {
// 文末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$item;
// ディレクトリのみ取得
if (is_dir($path)) {
@@ -255,7 +255,7 @@
$handle = opendir($dir);
while ($file = readdir($handle)) {
// 行末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$file;
if ($file != '..' && $file != '.' && is_dir($path)) {
return true;
@@ -409,7 +409,7 @@
$file_name = basename($path);
// 拡張子を切り取る
- $unpacking_name = preg_replace("/(\.tar|\.tar\.gz)$/", "", $file_name);
+ $unpacking_name = preg_replace("/(\.tar|\.tar\.gz)$/", '', $file_name);
// 指定されたフォルダ内に解凍する
$result = $tar->extractModify($dir. '/', $unpacking_name);
変更: branches/version-2_12-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_Index.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Index.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -53,12 +53,6 @@
function process() {
parent::process();
$this->action();
- // class_exists('xxx');
- // 0/0;
- // new xxx;
- // $objQuery = new SC_Query_Ex();
- // $objQuery->select('***');
- // trigger_error('試験的なエラー発生です。');
$this->sendResponse();
}
変更: branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php 2012-03-05 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -158,7 +158,7 @@
*/
function createSitemap($loc, $lastmod = '', $changefreq = '', $priority = '') {
printf("\t<url>\n");
- printf("\t\t<loc>%s</loc>\n", htmlentities($loc, ENT_QUOTES, "UTF-8"));
+ printf("\t\t<loc>%s</loc>\n", htmlentities($loc, ENT_QUOTES, 'UTF-8'));
if (!empty($lastmod)) {
printf("\t\t<lastmod>%s</lastmod>\n", $lastmod);
}
変更: 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 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -325,7 +325,7 @@
*/
function tryCreateDir($objFileManager, $objFormParam) {
$create_dir_flg = false;
- $create_dir = ereg_replace("/$", "", $objFormParam->getValue('now_dir'));
+ $create_dir = ereg_replace("/$", '', $objFormParam->getValue('now_dir'));
// ファイル作成
if ($objFileManager->sfCreateFile($create_dir.'/'.$objFormParam->getValue('create_file'), 0755)) {
$create_dir_flg = true;
@@ -433,13 +433,13 @@
*/
function lfGetParentDir($dir) {
$parent_dir = '';
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$arrDir = explode('/', $dir);
array_pop($arrDir);
foreach ($arrDir as $val) {
$parent_dir .= "$val/";
}
- $parent_dir = ereg_replace("/$", "", $parent_dir);
+ $parent_dir = ereg_replace("/$", '', $parent_dir);
return $parent_dir;
}
@@ -466,7 +466,7 @@
$arrTree = $objFileManager->sfGetFileTree($objFormParam->getValue('top_dir'), $objFormParam->getValue('tree_status'));
$tpl_javascript .= "arrTree = new Array();\n";
foreach ($arrTree as $arrVal) {
- $tpl_javascript .= 'arrTree['.$arrVal['count'].'] = new Array('.$arrVal['count'].", '".$arrVal['type']."', '".$arrVal['path']."', ".$arrVal['rank'].",";
+ $tpl_javascript .= 'arrTree['.$arrVal['count'].'] = new Array('.$arrVal['count'].", '".$arrVal['type']."', '".$arrVal['path']."', ".$arrVal['rank'].',';
if ($arrVal['open']) {
$tpl_javascript .= "true);\n";
} else {
@@ -486,8 +486,8 @@
// トップディレクトリか調査
$is_top_dir = false;
// 末尾の/をとる
- $top_dir_check = ereg_replace("/$", "", $objFormParam->getValue('top_dir'));
- $now_dir_check = ereg_replace("/$", "", $objFormParam->getValue('now_dir'));
+ $top_dir_check = ereg_replace("/$", '', $objFormParam->getValue('top_dir'));
+ $now_dir_check = ereg_replace("/$", '', $objFormParam->getValue('now_dir'));
if($top_dir_check == $now_dir_check) $is_top_dir = true;
$this->setDispParam('tpl_is_top_dir', $is_top_dir);
}
変更: 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 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -209,7 +209,7 @@
$sql = file_get_contents($filepath);
if ($sql !== false) {
// 改行、タブを1スペースに変換
- $sql = preg_replace("/[\r\n\t]/", " " ,$sql);
+ $sql = preg_replace("/[\r\n\t]/", ' ' ,$sql);
$sql_split = explode(';', $sql);
$objQuery =& SC_Query_Ex::getSingletonInstance();
foreach ($sql_split as $val) {
変更: 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 14:00:45 UTC (rev 21592)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-05 14:32:59 UTC (rev 21593)
@@ -502,9 +502,9 @@
}
}
if ($space) {
- $line = ereg_replace(", $", "", $line);
+ $line = ereg_replace(", $", '', $line);
} else {
- $line = ereg_replace(",$", "", $line);
+ $line = ereg_replace(",$", '', $line);
}
return $line;
} else {
@@ -596,8 +596,8 @@
}
function sfTrim($str) {
- $ret = mb_ereg_replace("^[ \n\r]*", "", $str);
- $ret = mb_ereg_replace("[ \n\r]*$", "", $ret);
+ $ret = mb_ereg_replace("^[ \n\r]*", '', $str);
+ $ret = mb_ereg_replace("[ \n\r]*$", '', $ret);
return $ret;
}
@@ -713,7 +713,7 @@
/* 文末の「/」をなくす */
function sfTrimURL($url) {
- $ret = ereg_replace("[/]+$", "", $url);
+ $ret = ereg_replace("[/]+$", '', $url);
return $ret;
}
@@ -983,7 +983,7 @@
// DB取得日時をタイムに変換
function sfDBDatetoTime($db_date) {
- $date = ereg_replace("\..*$","",$db_date);
+ $date = ereg_replace("\..*$",'',$db_date);
$time = strtotime($date);
return $time;
}
@@ -1319,7 +1319,7 @@
$cnt = 0;
// 行末の/を取り除く
while (($file = readdir($dh)) !== false) $arrDir[] = $file;
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
// アルファベットと数字でソート
natcasesort($arrDir);
foreach ($arrDir as $file) {
@@ -1369,7 +1369,7 @@
$handle = opendir($dir);
while ($file = readdir($handle)) {
// 行末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$file;
if ($file != '..' && $file != '.' && !is_dir($path)) {
$bytes += filesize($path);
@@ -1402,7 +1402,7 @@
$default_rank = count(explode('/', $dir));
// 文末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
// 最上位層を格納(user_data/)
if (sfDirChildExists($dir)) {
$arrTree[$cnt]['type'] = '_parent';
@@ -1443,7 +1443,7 @@
foreach ($arrDir as $item) {
if ($item != '.' && $item != '..') {
// 文末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$item;
// ディレクトリのみ取得
if (is_dir($path)) {
@@ -1483,7 +1483,7 @@
$handle = opendir($dir);
while ($file = readdir($handle)) {
// 行末の/を取り除く
- $dir = ereg_replace("/$", "", $dir);
+ $dir = ereg_replace("/$", '', $dir);
$path = $dir.'/'.$file;
if ($file != '..' && $file != '.' && is_dir($path)) {
return true;
@@ -1739,7 +1739,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;
Svn-src-all メーリングリストの案内