[Svn-src-all:1532] [version-2_5-dev 20428] refs #515
shutta
admin ＠ mail.ec-cube.net
2011年 2月 27日 (日) 01:13:18 JST
Subversion committed to /home/svn/open 20428
http://svn.ec-cube.net/open_trac/changeset/20428
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-27 01:13:17 +0900 (日, 27 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
refs #515
PHP5.3での非推奨関数split()をexplode(),preg_split()へ置き換え。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Customer.php
U branches/version-2_5-dev/data/class/SC_FormParam.php
U branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
U branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
U branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
U branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
U branches/version-2_5-dev/data/class/util/GC_Utils.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
変更: branches/version-2_5-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Customer.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/SC_Customer.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -261,7 +261,7 @@
// 誕生日月であるかどうかの判定
function isBirthMonth() {
if (isset($_SESSION['customer']['birth'])) {
- $arrRet = split("[- :/]", $_SESSION['customer']['birth']);
+ $arrRet = preg_split("|[- :/]|", $_SESSION['customer']['birth']);
$birth_month = intval($arrRet[1]);
$now_month = intval(date("m"));
変更: branches/version-2_5-dev/data/class/SC_FormParam.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_FormParam.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/SC_FormParam.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -140,7 +140,7 @@
function setDBDate($db_date, $year_key = 'year', $month_key = 'month', $day_key = 'day') {
if (!empty($db_date)) {
- list($y, $m, $d) = split("[- ]", $db_date);
+ list($y, $m, $d) = preg_split("/[- ]/", $db_date);
$this->setValue($year_key, $y);
$this->setValue($month_key, $m);
$this->setValue($day_key, $d);
@@ -426,7 +426,7 @@
foreach($this->keyname as $val) {
if($val == $keyname) {
if(isset($this->param[$cnt]) && !is_array($this->param[$cnt])) {
- $this->param[$cnt] = split("-", $this->param[$cnt]);
+ $this->param[$cnt] = explode("-", $this->param[$cnt]);
}
}
$cnt++;
変更: branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
===================================================================
--- branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -47,7 +47,7 @@
function sfGetDBVersion($dsn = "") {
$objQuery =& SC_Query::getSingletonInstance();
$val = $objQuery->getOne("select version()");
- $arrLine = split(" " , $val);
+ $arrLine = explode(" " , $val);
return $arrLine[0] . " " . str_replace(",", "", $arrLine[1]);
}
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -185,8 +185,8 @@
// 誕生日を年月日に分ける
if (isset($arrForm['birth'])){
- $birth = split(" ", $arrForm["birth"]);
- list($arrForm['year'], $arrForm['month'], $arrForm['day']) = split("-",$birth[0]);
+ $birth = explode(" ", $arrForm["birth"]);
+ list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode("-",$birth[0]);
}
if ($mask_flg) {
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -85,7 +85,7 @@
// 正常に接続されている場合
if(!$objQuery->isError()) {
- list($db_type) = split(":", $dsn);
+ list($db_type) = explode(":", $dsn);
// カラムリストを取得
$columns = $objQuery->listTableFields($table_name);
@@ -1241,7 +1241,7 @@
*/
function sfIsRecord($table, $col, $arrval, $addwhere = "") {
$objQuery =& SC_Query::getSingletonInstance();
- $arrCol = split("[, ]", $col);
+ $arrCol = preg_split("/[, ]/", $col);
$where = "del_flg = 0";
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -170,7 +170,7 @@
$cnt = 0;
$arrTree = array();
- $default_rank = count(split('/', $dir));
+ $default_rank = count(explode('/', $dir));
// 文末の/を取り除く
$dir = ereg_replace("/$", "", $dir);
@@ -229,7 +229,7 @@
}
// 階層を割り出す
- $arrCnt = split('/', $path);
+ $arrCnt = explode('/', $path);
$rank = count($arrCnt);
$arrTree[$cnt]['rank'] = $rank - $default_rank + 1;
$arrTree[$cnt]['count'] = $cnt;
@@ -279,7 +279,7 @@
* @return bool 前回開かれた状態の場合 true
*/
function lfIsFileOpen($dir, $tree_status) {
- $arrTreeStatus = split('\|', $tree_status);
+ $arrTreeStatus = explode('\|', $tree_status);
if(in_array($dir, $arrTreeStatus)) {
return true;
}
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -467,7 +467,7 @@
for ($i = $start_day; $i < $max_day; $i++) {
// 基本時間から日数を追加していく
$tmp_time = $now_time + ($i * 24 * 3600);
- list($y, $m, $d, $w) = split(" ", date("Y m d w", $tmp_time));
+ list($y, $m, $d, $w) = explode(" ", date("Y m d w", $tmp_time));
$val = sprintf("%04d/%02d/%02d(%s)", $y, $m, $d, $arrWDAY[$w]);
$arrDate[$val] = $val;
}
@@ -549,7 +549,7 @@
if (!SC_Utils_Ex::isBlank($arrValues['shipping_date'])
&& $convert_shipping_date) {
$d = mb_strcut($arrValues["shipping_date"], 0, 10);
- $arrDate = split("/", $d);
+ $arrDate = explode("/", $d);
$ts = mktime(0, 0, 0, $arrDate[1], $arrDate[2], $arrDate[0]);
$arrValues['shipping_date'] = date("Y-m-d", $ts);
}
変更: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -328,7 +328,7 @@
* @param String $news_date
*/
function splitNewsDate($news_date){
- return split("-", $news_date);
+ return explode("-", $news_date);
}
変更: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -431,7 +431,7 @@
function lfGetParentDir($dir) {
$parent_dir = "";
$dir = ereg_replace("/$", "", $dir);
- $arrDir = split('/', $dir);
+ $arrDir = explode('/', $dir);
array_pop($arrDir);
foreach($arrDir as $val) {
$parent_dir .= "$val/";
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -247,7 +247,7 @@
}
// 改行、タブを1スペースに変換
$sql = preg_replace("/[\r\n\t]/", " " ,$sql);
- $sql_split = split(";", $sql);
+ $sql_split = explode(";", $sql);
foreach($sql_split as $key => $val){
if (trim($val) != "") {
$objQuery->query($val);
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -188,7 +188,7 @@
case 'search_sex':
$arrHidden[$key] = SC_Utils_Ex::sfMergeParamCheckBoxes($val);
if(!is_array($val)) {
- $arrForm[$key] = split("-", $val);
+ $arrForm[$key] = explode("-", $val);
}
break;
default:
変更: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -521,7 +521,7 @@
$arrCsvData = file($csv);
foreach($arrCsvData as $val){
- $arrData = split(",", trim($val));
+ $arrData = explode(",", trim($val));
$objQuery->setval($arrData[0], $arrData[1]);
}
変更: branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -306,8 +306,8 @@
$objGraphLine->setYTitle($ytitle);
// メインタイトル作成
- list($sy, $sm, $sd) = split("[/ ]" , $sdate);
- list($ey, $em, $ed) = split("[/ ]" , $edate);
+ list($sy, $sm, $sd) = preg_split("|[/ ]|" , $sdate);
+ list($ey, $em, $ed) = preg_split("|[/ ]|" , $edate);
$start_date = $sy . "年" . $sm . "月" . $sd . "日";
$end_date = $ey . "年" . $em . "月" . $ed . "日";
$objGraphLine->drawTitle("集計期間：" . $start_date . " - " . $end_date);
@@ -350,8 +350,8 @@
$objGraphPie->setLegend(array_keys($arrList));
// メインタイトル作成
- list($sy, $sm, $sd) = split("[/ ]" , $sdate);
- list($ey, $em, $ed) = split("[/ ]" , $edate);
+ list($sy, $sm, $sd) = preg_split("|[/ ]|" , $sdate);
+ list($ey, $em, $ed) = preg_split("|[/ ]|" , $edate);
$start_date = $sy . "年" . $sm . "月" . $sd . "日";
$end_date = $ey . "年" . $em . "月" . $ed . "日";
$objGraphPie->drawTitle("集計期間：" . $start_date . " - " . $end_date);
@@ -398,8 +398,8 @@
// メインタイトル作成
$arrKey = array_keys($arrList);
- list($sy, $sm, $sd) = split("[/ ]" , $sdate);
- list($ey, $em, $ed) = split("[/ ]" , $edate);
+ list($sy, $sm, $sd) = preg_split("|[/ ]|" , $sdate);
+ list($ey, $em, $ed) = preg_split("|[/ ]|" , $edate);
$start_date = $sy . "年" . $sm . "月" . $sd . "日";
$end_date = $ey . "年" . $em . "月" . $ed . "日";
$objGraphBar->drawTitle("集計期間：" . $start_date . " - " . $end_date);
変更: branches/version-2_5-dev/data/class/util/GC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/GC_Utils.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/util/GC_Utils.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -96,7 +96,7 @@
$ty = date("Y");
$tm = date("m");
$td = date("d");
- list($by, $bm, $bd) = split("[-/ ]", $dbdate);
+ list($by, $bm, $bd) = preg_split("/[-/ ]/", $dbdate);
$age = $ty - $by;
if($tm * 100 + $td < $bm * 100 + $bd) $age--;
return $age;
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-26 15:33:19 UTC (rev 20427)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-26 16:13:17 UTC (rev 20428)
@@ -141,7 +141,7 @@
*/
function getRealURL($url) {
$parse = parse_url($url);
- $tmp = split('/', $parse['path']);
+ $tmp = explode('/', $parse['path']);
$results = array();
foreach ($tmp as $v) {
if ($v == '' || $v == '.') {
@@ -386,7 +386,7 @@
/* 1階層上のディレクトリ名を取得する */
function sfUpDirName() {
$path = $_SERVER['PHP_SELF'];
- $arrVal = split("/", $path);
+ $arrVal = explode("/", $path);
$cnt = count($arrVal);
return $arrVal[($cnt - 2)];
}
@@ -842,7 +842,7 @@
/* DBから取り出した日付の文字列を調整する。*/
function sfDispDBDate($dbdate, $time = true) {
- list($y, $m, $d, $H, $M) = split("[- :]", $dbdate);
+ list($y, $m, $d, $H, $M) = preg_split("/[- :]/", $dbdate);
if(strlen($y) > 0 && strlen($m) > 0 && strlen($d) > 0) {
if ($time) {
@@ -1414,7 +1414,7 @@
while (!feof($src_fp)) {
$line = fgets($src_fp);
if(ereg("@version", $line)) {
- $arrLine = split(" ", $line);
+ $arrLine = explode(" ", $line);
$version = $arrLine[5];
}
}
@@ -1652,7 +1652,7 @@
$cnt = 0;
$arrTree = array();
- $default_rank = count(split('/', $dir));
+ $default_rank = count(explode('/', $dir));
// 文末の/を取り除く
$dir = ereg_replace("/$", "", $dir);
@@ -1708,7 +1708,7 @@
}
// 階層を割り出す
- $arrCnt = split('/', $path);
+ $arrCnt = explode('/', $path);
$rank = count($arrCnt);
$arrTree[$cnt]['rank'] = $rank - $default_rank + 1;
$arrTree[$cnt]['count'] = $cnt;
@@ -1755,7 +1755,7 @@
* 引数2 ：現在のツリーの状態開いているフォルダのパスが | 区切りで格納
*/
function lfIsFileOpen($dir, $tree_status) {
- $arrTreeStatus = split('\|', $tree_status);
+ $arrTreeStatus = explode('\|', $tree_status);
if(in_array($dir, $arrTreeStatus)) {
return true;
}
Svn-src-all メーリングリストの案内